From patchwork Thu Oct 21 16:08:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Chang X-Patchwork-Id: 12575751 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8ADB9C433EF for ; Thu, 21 Oct 2021 16:17:22 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3603160E05 for ; Thu, 21 Oct 2021 16:17:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3603160E05 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:54980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mdakr-0003qA-9M for qemu-devel@archiver.kernel.org; Thu, 21 Oct 2021 12:17:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mdacq-00034s-DC for qemu-devel@nongnu.org; Thu, 21 Oct 2021 12:09:05 -0400 Received: from mail-pg1-x52d.google.com ([2607:f8b0:4864:20::52d]:40712) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mdaco-0003M5-Kt for qemu-devel@nongnu.org; Thu, 21 Oct 2021 12:09:04 -0400 Received: by mail-pg1-x52d.google.com with SMTP id q5so737845pgr.7 for ; Thu, 21 Oct 2021 09:09:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9tEcUEbq/W7hoeVzwLuM0tbgOGVONjT5DUAf8eknZOQ=; b=D+f5WkBZWVpod5UZRTOAZUAkJ9ZJpL1pCYvhNfZZbWmvvWLB8k2wGF6iXIQayvEyv2 NGcU6uIw7uqqTzLW/0bK3QpwOxWTDl8FCXjbnIMCl1uy/RddNTQm4tMdAx45zueCA3HC cGe8SEGuTNX2sCPn5Qd13/fUytSxDxpjh4gZGpDaIrSX4gI9jsLhfHmoMBTy9FcGD4Z5 BJ9PJmhVu/85CiIItPGHsLygqr34eLUiSqC0LAotWIbHhkT5H1GJQK6DNZI0oKA2E83Y Bc/xXYRXoPzhReAUv1hNIzClW/SA5ainiLWUcCq9pJThgkDUJIKKi1JUp10XasOIfmnc x/Lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9tEcUEbq/W7hoeVzwLuM0tbgOGVONjT5DUAf8eknZOQ=; b=03eVp2p7M9HW006jytnE0I/1kzwOW7jPTWMM0DZEntdzmgXUQCBy/v0TvNnBGsZ+9Q l/M5PDcJMOr6SI+tkFOXXKVSmrT4BbiTGBLiMmLN7oxnHHnmYKIPrgoIivMn8c5+dRlX 3ik82Rd5fpzXGEdbj9xjfUrb8m3tvrYdVFsCmJGLjudTCS7+e/3c7fN8RDBNyW7IlBRW fwnyfSq9bBE7O7qdMdivHla1k2sIuzsAETByn9xparsqPXg834PkAo76ii4Fv9gU/SsE V6oabQKiwvbmrFi/gMonDTWb9AKAWEEDewmm5IOHfwJTGo721nYUgLuCSFp9ocAs/st+ qCJA== X-Gm-Message-State: AOAM531Y9GndyuNNTOWfEAVEU+fRabZAWKydMkBCDhTrv0FrLCZwu/bQ XvwhUItymbczse1QJTpo3fhbmw== X-Google-Smtp-Source: ABdhPJxZuiBBmL6Zjiby5o74CvkLl7C7Q0fAyHut8YQPQSKlSh4oFX3vs92jjt7PSST0hCCUvvgEUg== X-Received: by 2002:a63:710d:: with SMTP id m13mr5110788pgc.115.1634832541208; Thu, 21 Oct 2021 09:09:01 -0700 (PDT) Received: from localhost.localdomain (123-193-74-252.dynamic.kbronet.com.tw. [123.193.74.252]) by smtp.gmail.com with ESMTPSA id r13sm5752505pgv.21.2021.10.21.09.08.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Oct 2021 09:09:00 -0700 (PDT) From: frank.chang@sifive.com To: qemu-riscv@nongnu.org Subject: [PATCH v5 2/2] target/riscv: change the api for RVF/RVD fmin/fmax Date: Fri, 22 Oct 2021 00:08:46 +0800 Message-Id: <20211021160847.2748577-3-frank.chang@sifive.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211021160847.2748577-1-frank.chang@sifive.com> References: <20211021160847.2748577-1-frank.chang@sifive.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52d; envelope-from=frank.chang@sifive.com; helo=mail-pg1-x52d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Frank Chang , Bin Meng , qemu-devel@nongnu.org, Chih-Min Chao , Alistair Francis , Palmer Dabbelt Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Chih-Min Chao The sNaN propagation behavior has been changed since cd20cee7 in https://github.com/riscv/riscv-isa-manual. In Priv spec v1.10, RVF is v2.0. fmin.s and fmax.s are implemented with IEEE 754-2008 minNum and maxNum operations. In Priv spec v1.11, RVF is v2.2. fmin.s and fmax.s are amended to implement IEEE 754-2019 minimumNumber and maximumNumber operations. Therefore, to prevent the risk of having too many version variables. Instead of introducing an extra *fext_ver* variable, we tie RVF version to Priv version. Though it's not completely accurate but is close enough. Signed-off-by: Chih-Min Chao Signed-off-by: Frank Chang Acked-by: Alistair Francis --- target/riscv/fpu_helper.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/target/riscv/fpu_helper.c b/target/riscv/fpu_helper.c index 8700516a14c..d62f4709002 100644 --- a/target/riscv/fpu_helper.c +++ b/target/riscv/fpu_helper.c @@ -174,14 +174,18 @@ uint64_t helper_fmin_s(CPURISCVState *env, uint64_t rs1, uint64_t rs2) { float32 frs1 = check_nanbox_s(rs1); float32 frs2 = check_nanbox_s(rs2); - return nanbox_s(float32_minnum(frs1, frs2, &env->fp_status)); + return nanbox_s(env->priv_ver < PRIV_VERSION_1_11_0 ? + float32_minnum(frs1, frs2, &env->fp_status) : + float32_minimum_number(frs1, frs2, &env->fp_status)); } uint64_t helper_fmax_s(CPURISCVState *env, uint64_t rs1, uint64_t rs2) { float32 frs1 = check_nanbox_s(rs1); float32 frs2 = check_nanbox_s(rs2); - return nanbox_s(float32_maxnum(frs1, frs2, &env->fp_status)); + return nanbox_s(env->priv_ver < PRIV_VERSION_1_11_0 ? + float32_maxnum(frs1, frs2, &env->fp_status) : + float32_maximum_number(frs1, frs2, &env->fp_status)); } uint64_t helper_fsqrt_s(CPURISCVState *env, uint64_t rs1) @@ -283,12 +287,16 @@ uint64_t helper_fdiv_d(CPURISCVState *env, uint64_t frs1, uint64_t frs2) uint64_t helper_fmin_d(CPURISCVState *env, uint64_t frs1, uint64_t frs2) { - return float64_minnum(frs1, frs2, &env->fp_status); + return env->priv_ver < PRIV_VERSION_1_11_0 ? + float64_minnum(frs1, frs2, &env->fp_status) : + float64_minimum_number(frs1, frs2, &env->fp_status); } uint64_t helper_fmax_d(CPURISCVState *env, uint64_t frs1, uint64_t frs2) { - return float64_maxnum(frs1, frs2, &env->fp_status); + return env->priv_ver < PRIV_VERSION_1_11_0 ? + float64_maxnum(frs1, frs2, &env->fp_status) : + float64_maximum_number(frs1, frs2, &env->fp_status); } uint64_t helper_fcvt_s_d(CPURISCVState *env, uint64_t rs1)