From patchwork Sat Aug 12 04:48:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Pan2 via Gcc-patches" X-Patchwork-Id: 134813 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp1519426vqi; Fri, 11 Aug 2023 21:49:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEQNNdek/AtSvKIqMk3VV4ge0MOalD4knXNYy6SQF2aUp5cxGFxPOifLmtoCidI1AnbkNnu X-Received: by 2002:a17:906:53d3:b0:99b:627b:e96d with SMTP id p19-20020a17090653d300b0099b627be96dmr3446569ejo.44.1691815757259; Fri, 11 Aug 2023 21:49:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691815757; cv=none; d=google.com; s=arc-20160816; b=XvLceaP6KccYgVooTqbUZMrakowt5x/WyvPv8EhPOBE5nVZqP7sVucejRIQ/l1W7fY 201ajJKAqfCMjXTx9+ZaDkrnnmlSVPnZa/SPehuIRUujtYwkhJNXli0r2bo5BGq8iOVg rqIkTqn3PQ0RcrtV7wNnB6viEtelyIeb3mbTPGqBOao460HVC/G2H/a0fy5ewWULTlLY fuEVA1Taq40fRqsTi9z+p2NO8EKtsszHwQ8CeaGaVOEQ1tFKpeBb96ZHlbXMBcm4ic3o ektX0fFSYML+WS+juUjMU+bM+yoRNo0F5VlBTQySZgxTpTqB4xwoM3zinz78QU3ZZXSi 4kpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=okxc/Fh/9amADsMklp0wgbCjJzC1sLoHKgyTcc5YmGI=; fh=PmVSnvRlVeKkg+dPKzMCyvykdI2+tUdRpMZVt54Vt9k=; b=CYTEu9dJm5aBn2LP+KsnwbVX+xxh0oncdMVJjTng8Avl7gJ82Q/HodL46bW/+fPYBh iOeboL0KAGi8kMV51sE2jSryAc4q0vBPvdAnZuHCaghGS3lzeDid0UjobD8ibfl25osR 5Pl2mCN7tW5frhJjsAGm+3dquao4TgW8aKrMhtt8cqPUqgKcfDIM4I8AZwohqZtm/2Xt iopLN+9+hbZZv9OgyrYjDMc2EFHBAUonFoce8a6yUnmRzZ5iCh5wOlMQ5JKi21ALQI4n q+pFnlnTm79SHV8IqWep2BacZhc6wpEfsQ7eBluXh3F/VqjIKkSW1ERIzto6jpGhESFl TzEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=hWlYeyJl; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id s17-20020a170906169100b0099251942e1bsi4257791ejd.82.2023.08.11.21.49.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Aug 2023 21:49:17 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=hWlYeyJl; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 27B073858C74 for ; Sat, 12 Aug 2023 04:49:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 27B073858C74 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1691815754; bh=okxc/Fh/9amADsMklp0wgbCjJzC1sLoHKgyTcc5YmGI=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=hWlYeyJlC1R3FpfjxbRrvkAB0iAaHxJk6IRMqP7Qe5aufxO2Xoq1YZaJx5NO5n+oi xgj5nYA58j1AlkITZEzerGdH+/peejUFmgtGL9PgMoC2yAjzhcsfRMzjV7QuoUmanF qyj0jf0M5YkOJkfdsue8Z1iJJQgmFogaGAZp/y+I= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by sourceware.org (Postfix) with ESMTPS id E06DC3858D1E for ; Sat, 12 Aug 2023 04:48:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E06DC3858D1E X-IronPort-AV: E=McAfee;i="6600,9927,10799"; a="435696995" X-IronPort-AV: E=Sophos;i="6.01,167,1684825200"; d="scan'208";a="435696995" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Aug 2023 21:48:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10799"; a="709743357" X-IronPort-AV: E=Sophos;i="6.01,167,1684825200"; d="scan'208";a="709743357" Received: from shvmail03.sh.intel.com ([10.239.245.20]) by orsmga006.jf.intel.com with ESMTP; 11 Aug 2023 21:48:24 -0700 Received: from pli-ubuntu.sh.intel.com (pli-ubuntu.sh.intel.com [10.239.159.47]) by shvmail03.sh.intel.com (Postfix) with ESMTP id 95BF0100781E; Sat, 12 Aug 2023 12:48:23 +0800 (CST) To: gcc-patches@gcc.gnu.org Cc: juzhe.zhong@rivai.ai, jeffreyalaw@gmail.com, pan2.li@intel.com, yanzhang.wang@intel.com, kito.cheng@gmail.com Subject: [PATCH v1] RISC-V: Support RVV VFNMSUB rounding mode intrinsic API Date: Sat, 12 Aug 2023 12:48:22 +0800 Message-Id: <20230812044822.2351566-1-pan2.li@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Pan Li via Gcc-patches From: "Li, Pan2 via Gcc-patches" Reply-To: pan2.li@intel.com Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773997399278760795 X-GMAIL-MSGID: 1773997399278760795 From: Pan Li This patch would like to support the rounding mode API for the VFNMSUB as the below samples. * __riscv_vfnmsub_vv_f32m1_rm * __riscv_vfnmsub_vv_f32m1_rm_m * __riscv_vfnmsub_vf_f32m1_rm * __riscv_vfnmsub_vf_f32m1_rm_m Signed-off-by: Pan Li gcc/ChangeLog: * config/riscv/riscv-vector-builtins-bases.cc (class vfnmsub_frm): New class for vfnmsub frm. (vfnmsub_frm): New declaration. (BASE): Ditto. * config/riscv/riscv-vector-builtins-bases.h: Ditto. * config/riscv/riscv-vector-builtins-functions.def (vfnmsub_frm): New function declaration. gcc/testsuite/ChangeLog: * gcc.target/riscv/rvv/base/float-point-nmsub.c: New test. Signed-off-by: Pan Li --- .../riscv/riscv-vector-builtins-bases.cc | 25 ++++++++++ .../riscv/riscv-vector-builtins-bases.h | 1 + .../riscv/riscv-vector-builtins-functions.def | 2 + .../riscv/rvv/base/float-point-nmsub.c | 47 +++++++++++++++++++ 4 files changed, 75 insertions(+) create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-nmsub.c diff --git a/gcc/config/riscv/riscv-vector-builtins-bases.cc b/gcc/config/riscv/riscv-vector-builtins-bases.cc index 381bc72c784..e14e9aa7809 100644 --- a/gcc/config/riscv/riscv-vector-builtins-bases.cc +++ b/gcc/config/riscv/riscv-vector-builtins-bases.cc @@ -516,6 +516,29 @@ public: } }; +/* Implements below instructions for frm + - vfnmsub +*/ +class vfnmsub_frm : public function_base +{ +public: + bool has_rounding_mode_operand_p () const override { return true; } + + bool has_merge_operand_p () const override { return false; } + + rtx expand (function_expander &e) const override + { + if (e.op_info->op == OP_TYPE_vf) + return e.use_ternop_insn ( + false, code_for_pred_mul_neg_scalar (PLUS, e.vector_mode ())); + if (e.op_info->op == OP_TYPE_vv) + return e.use_ternop_insn ( + false, code_for_pred_mul_neg (PLUS, e.vector_mode ())); + + gcc_unreachable (); + } +}; + /* Implements vrsub. */ class vrsub : public function_base { @@ -2282,6 +2305,7 @@ static CONSTEXPR const vfnmsac_frm vfnmsac_frm_obj; static CONSTEXPR const vfmadd vfmadd_obj; static CONSTEXPR const vfmadd_frm vfmadd_frm_obj; static CONSTEXPR const vfnmsub vfnmsub_obj; +static CONSTEXPR const vfnmsub_frm vfnmsub_frm_obj; static CONSTEXPR const vfnmacc vfnmacc_obj; static CONSTEXPR const vfnmacc_frm vfnmacc_frm_obj; static CONSTEXPR const vfmsac vfmsac_obj; @@ -2524,6 +2548,7 @@ BASE (vfnmsac_frm) BASE (vfmadd) BASE (vfmadd_frm) BASE (vfnmsub) +BASE (vfnmsub_frm) BASE (vfnmacc) BASE (vfnmacc_frm) BASE (vfmsac) diff --git a/gcc/config/riscv/riscv-vector-builtins-bases.h b/gcc/config/riscv/riscv-vector-builtins-bases.h index 99cfbfd78c8..e60cebab4ae 100644 --- a/gcc/config/riscv/riscv-vector-builtins-bases.h +++ b/gcc/config/riscv/riscv-vector-builtins-bases.h @@ -166,6 +166,7 @@ extern const function_base *const vfnmsac_frm; extern const function_base *const vfmadd; extern const function_base *const vfmadd_frm; extern const function_base *const vfnmsub; +extern const function_base *const vfnmsub_frm; extern const function_base *const vfnmacc; extern const function_base *const vfnmacc_frm; extern const function_base *const vfmsac; diff --git a/gcc/config/riscv/riscv-vector-builtins-functions.def b/gcc/config/riscv/riscv-vector-builtins-functions.def index 75235ec01d3..d75b281eebe 100644 --- a/gcc/config/riscv/riscv-vector-builtins-functions.def +++ b/gcc/config/riscv/riscv-vector-builtins-functions.def @@ -363,6 +363,8 @@ DEF_RVV_FUNCTION (vfnmadd_frm, alu_frm, full_preds, f_vvvv_ops) DEF_RVV_FUNCTION (vfnmadd_frm, alu_frm, full_preds, f_vvfv_ops) DEF_RVV_FUNCTION (vfmsub_frm, alu_frm, full_preds, f_vvvv_ops) DEF_RVV_FUNCTION (vfmsub_frm, alu_frm, full_preds, f_vvfv_ops) +DEF_RVV_FUNCTION (vfnmsub_frm, alu_frm, full_preds, f_vvvv_ops) +DEF_RVV_FUNCTION (vfnmsub_frm, alu_frm, full_preds, f_vvfv_ops) // 13.7. Vector Widening Floating-Point Fused Multiply-Add Instructions DEF_RVV_FUNCTION (vfwmacc, alu, full_preds, f_wwvv_ops) diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/float-point-nmsub.c b/gcc/testsuite/gcc.target/riscv/rvv/base/float-point-nmsub.c new file mode 100644 index 00000000000..1b3e939b1e1 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/rvv/base/float-point-nmsub.c @@ -0,0 +1,47 @@ +/* { dg-do compile } */ +/* { dg-options "-march=rv64gcv -mabi=lp64 -O3 -Wno-psabi" } */ + +#include "riscv_vector.h" + +typedef float float32_t; + +vfloat32m1_t +test_riscv_vfnmsub_vv_f32m1_rm (vfloat32m1_t vd, vfloat32m1_t op1, + vfloat32m1_t op2, size_t vl) { + return __riscv_vfnmsub_vv_f32m1_rm (vd, op1, op2, 0, vl); +} + +vfloat32m1_t +test_vfnmsub_vv_f32m1_rm_m (vbool32_t mask, vfloat32m1_t vd, vfloat32m1_t op1, + vfloat32m1_t op2, size_t vl) { + return __riscv_vfnmsub_vv_f32m1_rm_m (mask, vd, op1, op2, 1, vl); +} + +vfloat32m1_t +test_vfnmsub_vf_f32m1_rm (vfloat32m1_t vd, float32_t op1, vfloat32m1_t op2, + size_t vl) { + return __riscv_vfnmsub_vf_f32m1_rm (vd, op1, op2, 2, vl); +} + +vfloat32m1_t +test_vfnmsub_vf_f32m1_rm_m (vfloat32m1_t vd, vbool32_t mask, float32_t op1, + vfloat32m1_t op2, size_t vl) { + return __riscv_vfnmsub_vf_f32m1_rm_m (mask, vd, op1, op2, 3, vl); +} + +vfloat32m1_t +test_riscv_vfnmsub_vv_f32m1 (vfloat32m1_t vd, vfloat32m1_t op1, + vfloat32m1_t op2, size_t vl) { + return __riscv_vfnmsub_vv_f32m1 (vd, op1, op2, vl); +} + +vfloat32m1_t +test_vfnmsub_vv_f32m1_m (vbool32_t mask, vfloat32m1_t vd, vfloat32m1_t op1, + vfloat32m1_t op2, size_t vl) { + return __riscv_vfnmsub_vv_f32m1_m (mask, vd, op1, op2, vl); +} + +/* { dg-final { scan-assembler-times {vfnmsub\.v[vf]\s+v[0-9]+,\s*[fav]+[0-9]+,\s*v[0-9]+} 6 } } */ +/* { dg-final { scan-assembler-times {frrm\s+[axs][0-9]+} 4 } } */ +/* { dg-final { scan-assembler-times {fsrm\s+[axs][0-9]+} 4 } } */ +/* { dg-final { scan-assembler-times {fsrmi\s+[01234]} 4 } } */