From patchwork Wed Aug 2 02:36:21 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: 129561 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp157858vqx; Tue, 1 Aug 2023 19:37:13 -0700 (PDT) X-Google-Smtp-Source: APBJJlF6QccbYgWC+jXDlehAn6Oy9HsnAS3f/+Hz+rkrMryKbpUDFlKDN9HXijhK8lk24G+ZOb/g X-Received: by 2002:a17:906:8a57:b0:999:37ff:be94 with SMTP id gx23-20020a1709068a5700b0099937ffbe94mr3557031ejc.71.1690943833429; Tue, 01 Aug 2023 19:37:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690943833; cv=none; d=google.com; s=arc-20160816; b=S2hksb6UzDrFPP7ilXasDva+tTbP0Pf7Zy89TdKs/hqeWByu3puWbYqvtRneKNhFeO zVEWW8HPhW+8UU84ufLN57K+f2V/Ul7cID7z0d7+ShBIdkZT4nklaMwE30Gdpo7xwdnr S0t6ZmENGUE3PDhIejrM4ESfIFfBJIY9WU6Q40hfk1CfvuK2qM5gdUsnIGWtYWOMsUax il2Q6QIr3lPHZI2+hhAsy1s9P+gLarLge0c/AMpVhug0GZLTj2gGo3sEvjne0Y89yj2g 1asDtwsSBfvUfrPzI2bEsPqLynPZVt0Sof3xVKOJOSe/vWS+J62V0SBR8vimqbrkGqCv G2rA== 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=uq5abZSl3cIZRNlkv4wM/yEDyBMSVsOcGaBgmA2I3bQ=; fh=9EZcvfVI324lLsRm78AR5trG4A9hqVpSpoTtyXFX1N4=; b=u9/ufDDglwtDn4l1Gs8GkHeBJ4Bl23kF9La9W2Ah9bCFql8dp3c8DkYIXdntTA0VtK i+a21ED1lJy7pOUBttUNoCAUVLRnpmFlBH8b6k2AXwRumzQImC67kJiIQrx2OkKmp3mX +pvV8djT1kzDHogvo+E7fKz3cvDVaMk994BS8XLYCjkmu+c3Co23oD+1ofdf7Nl8vNlo GNNd8lgGzHnYrxTjQ6ns0wCPSIpdiXywV4hMBdtPC3Ifbg1vKP2C77ekiUZ8VBmFA/Fv GMBcgHnS8iJ+Lvhf7miV5xrSW07XK72HHgfaz+Mw7208q991QoqZ5oJU/CUszK7Cons9 h3eA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=maZsIeR9; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 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 (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id i9-20020a17090685c900b0099b422f9c93si9170995ejy.524.2023.08.01.19.37.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Aug 2023 19:37:13 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=maZsIeR9; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 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 398123858434 for ; Wed, 2 Aug 2023 02:37:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 398123858434 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1690943832; bh=uq5abZSl3cIZRNlkv4wM/yEDyBMSVsOcGaBgmA2I3bQ=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=maZsIeR9uV/dM9LcSm5tMif+YTiKIEKt4RmuRj+Fum+5E+y4cEIttObEhstJp2Scb NJFSVA0nsvsAXmsxWWAhBfJt1pmpvVc9PWergo8f15aK8ZvmOl/Z1qX+OUGhc9ja2a GFZyt+jBf/gx6ikApidKMTmc9ca5PpvJZZQzb8Z4= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mgamail.intel.com (unknown [134.134.136.24]) by sourceware.org (Postfix) with ESMTPS id 1E57B3858D39 for ; Wed, 2 Aug 2023 02:36:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1E57B3858D39 X-IronPort-AV: E=McAfee;i="6600,9927,10789"; a="372191124" X-IronPort-AV: E=Sophos;i="6.01,248,1684825200"; d="scan'208";a="372191124" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Aug 2023 19:36:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10789"; a="798906105" X-IronPort-AV: E=Sophos;i="6.01,248,1684825200"; d="scan'208";a="798906105" Received: from shvmail02.sh.intel.com ([10.239.244.9]) by fmsmga004.fm.intel.com with ESMTP; 01 Aug 2023 19:36:23 -0700 Received: from pli-ubuntu.sh.intel.com (pli-ubuntu.sh.intel.com [10.239.159.47]) by shvmail02.sh.intel.com (Postfix) with ESMTP id E88131006F2F; Wed, 2 Aug 2023 10:36:22 +0800 (CST) To: gcc-patches@gcc.gnu.org Cc: juzhe.zhong@rivai.ai, pan2.li@intel.com, yanzhang.wang@intel.com, kito.cheng@gmail.com Subject: [PATCH v1] RISC-V: Support RVV VFWADD rounding mode intrinsic API Date: Wed, 2 Aug 2023 10:36:21 +0800 Message-Id: <20230802023621.1954111-1-pan2.li@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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: 1773083120968319165 X-GMAIL-MSGID: 1773083120968319165 From: Pan Li This patch would like to support the rounding mode API for the VFWADD VFSUB and VFRSUB as below samples. * __riscv_vfwadd_vv_f64m2_rm * __riscv_vfwadd_vv_f64m2_rm_m * __riscv_vfwadd_vf_f64m2_rm * __riscv_vfwadd_vf_f64m2_rm_m * __riscv_vfwadd_wv_f64m2_rm * __riscv_vfwadd_wv_f64m2_rm_m * __riscv_vfwadd_wf_f64m2_rm * __riscv_vfwadd_wf_f64m2_rm_m Signed-off-by: Pan Li gcc/ChangeLog: * config/riscv/riscv-vector-builtins-bases.cc (class widen_binop_frm): New class for binop frm. (BASE): Add vfwadd_frm. * config/riscv/riscv-vector-builtins-bases.h: New declaration. * config/riscv/riscv-vector-builtins-functions.def (vfwadd_frm): New function definition. * config/riscv/riscv-vector-builtins-shapes.cc (BASE_NAME_MAX_LEN): New macro. (struct alu_frm_def): Leverage new base class. (struct build_frm_base): New build base for frm. (struct widen_alu_frm_def): New struct for widen alu frm. (SHAPE): Add widen_alu_frm shape. * config/riscv/riscv-vector-builtins-shapes.h: New declaration. gcc/testsuite/ChangeLog: * gcc.target/riscv/rvv/base/float-point-widening-add.c: New test. --- .../riscv/riscv-vector-builtins-bases.cc | 37 +++++++++++ .../riscv/riscv-vector-builtins-bases.h | 1 + .../riscv/riscv-vector-builtins-functions.def | 4 ++ .../riscv/riscv-vector-builtins-shapes.cc | 66 +++++++++++++++---- .../riscv/riscv-vector-builtins-shapes.h | 1 + .../riscv/rvv/base/float-point-widening-add.c | 52 +++++++++++++++ 6 files changed, 149 insertions(+), 12 deletions(-) create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/float-point-widening-add.c diff --git a/gcc/config/riscv/riscv-vector-builtins-bases.cc b/gcc/config/riscv/riscv-vector-builtins-bases.cc index 035cafc43b3..981a4a7ede8 100644 --- a/gcc/config/riscv/riscv-vector-builtins-bases.cc +++ b/gcc/config/riscv/riscv-vector-builtins-bases.cc @@ -315,6 +315,41 @@ public: } }; +/* Implements below instructions for frm + - vfwadd +*/ +template +class widen_binop_frm : public function_base +{ +public: + bool has_rounding_mode_operand_p () const override { return true; } + + rtx expand (function_expander &e) const override + { + switch (e.op_info->op) + { + case OP_TYPE_vv: + return e.use_exact_insn ( + code_for_pred_dual_widen (CODE, e.vector_mode ())); + case OP_TYPE_vf: + return e.use_exact_insn ( + code_for_pred_dual_widen_scalar (CODE, e.vector_mode ())); + case OP_TYPE_wv: + if (CODE == PLUS) + return e.use_exact_insn ( + code_for_pred_single_widen_add (e.vector_mode ())); + else + return e.use_exact_insn ( + code_for_pred_single_widen_sub (e.vector_mode ())); + case OP_TYPE_wf: + return e.use_exact_insn ( + code_for_pred_single_widen_scalar (CODE, e.vector_mode ())); + default: + gcc_unreachable (); + } + } +}; + /* Implements vrsub. */ class vrsub : public function_base { @@ -2063,6 +2098,7 @@ static CONSTEXPR const binop_frm vfsub_frm_obj; static CONSTEXPR const reverse_binop vfrsub_obj; static CONSTEXPR const reverse_binop_frm vfrsub_frm_obj; static CONSTEXPR const widen_binop vfwadd_obj; +static CONSTEXPR const widen_binop_frm vfwadd_frm_obj; static CONSTEXPR const widen_binop vfwsub_obj; static CONSTEXPR const binop vfmul_obj; static CONSTEXPR const binop
vfdiv_obj; @@ -2292,6 +2328,7 @@ BASE (vfsub_frm) BASE (vfrsub) BASE (vfrsub_frm) BASE (vfwadd) +BASE (vfwadd_frm) BASE (vfwsub) BASE (vfmul) BASE (vfdiv) diff --git a/gcc/config/riscv/riscv-vector-builtins-bases.h b/gcc/config/riscv/riscv-vector-builtins-bases.h index 5c6b239c274..f9e1df5fe75 100644 --- a/gcc/config/riscv/riscv-vector-builtins-bases.h +++ b/gcc/config/riscv/riscv-vector-builtins-bases.h @@ -148,6 +148,7 @@ extern const function_base *const vfsub_frm; extern const function_base *const vfrsub; extern const function_base *const vfrsub_frm; extern const function_base *const vfwadd; +extern const function_base *const vfwadd_frm; extern const function_base *const vfwsub; extern const function_base *const vfmul; extern const function_base *const vfmul; diff --git a/gcc/config/riscv/riscv-vector-builtins-functions.def b/gcc/config/riscv/riscv-vector-builtins-functions.def index fa1c2cef970..743205a9b97 100644 --- a/gcc/config/riscv/riscv-vector-builtins-functions.def +++ b/gcc/config/riscv/riscv-vector-builtins-functions.def @@ -304,6 +304,10 @@ DEF_RVV_FUNCTION (vfwadd, widen_alu, full_preds, f_wwv_ops) DEF_RVV_FUNCTION (vfwadd, widen_alu, full_preds, f_wwf_ops) DEF_RVV_FUNCTION (vfwsub, widen_alu, full_preds, f_wwv_ops) DEF_RVV_FUNCTION (vfwsub, widen_alu, full_preds, f_wwf_ops) +DEF_RVV_FUNCTION (vfwadd_frm, widen_alu_frm, full_preds, f_wvv_ops) +DEF_RVV_FUNCTION (vfwadd_frm, widen_alu_frm, full_preds, f_wvf_ops) +DEF_RVV_FUNCTION (vfwadd_frm, widen_alu_frm, full_preds, f_wwv_ops) +DEF_RVV_FUNCTION (vfwadd_frm, widen_alu_frm, full_preds, f_wwf_ops) // 13.4. Vector Single-Width Floating-Point Multiply/Divide Instructions DEF_RVV_FUNCTION (vfmul, alu, full_preds, f_vvv_ops) diff --git a/gcc/config/riscv/riscv-vector-builtins-shapes.cc b/gcc/config/riscv/riscv-vector-builtins-shapes.cc index 6af57c22bfb..1d14fa21e81 100644 --- a/gcc/config/riscv/riscv-vector-builtins-shapes.cc +++ b/gcc/config/riscv/riscv-vector-builtins-shapes.cc @@ -75,6 +75,8 @@ build_all (function_builder &b, const function_group_info &group) static CONSTEXPR const DEF##_def VAR##_obj; \ namespace shapes { const function_shape *const VAR = &VAR##_obj; } +#define BASE_NAME_MAX_LEN 16 + /* Base class for for build. */ struct build_base : public function_shape { @@ -226,8 +228,8 @@ struct alu_def : public build_base } }; -/* alu_frm_def class. */ -struct alu_frm_def : public build_base +/* The base class for frm build. */ +struct build_frm_base : public build_base { /* Normalize vf_frm to vf. */ static void normalize_base_name (char *to, const char *from, int limit) @@ -241,10 +243,29 @@ struct alu_frm_def : public build_base to[limit - 1] = '\0'; } + bool check (function_checker &c) const override + { + gcc_assert (c.any_type_float_p ()); + + /* Check whether rounding mode argument is a valid immediate. */ + if (c.base->has_rounding_mode_operand_p ()) + { + unsigned int frm_num = c.arg_num () - 2; + + return c.require_immediate (frm_num, FRM_STATIC_MIN, FRM_STATIC_MAX); + } + + return true; + } +}; + +/* alu_frm_def class. */ +struct alu_frm_def : public build_frm_base +{ char *get_name (function_builder &b, const function_instance &instance, bool overloaded_p) const override { - char base_name[16] = {}; + char base_name[BASE_NAME_MAX_LEN] = {}; /* Return nullptr if it can not be overloaded. */ if (overloaded_p && !instance.base->can_be_overloaded_p (instance.pred)) @@ -275,20 +296,40 @@ struct alu_frm_def : public build_base return b.finish_name (); } +}; - bool check (function_checker &c) const override +/* widen_alu_frm_def class. */ +struct widen_alu_frm_def : public build_frm_base +{ + char *get_name (function_builder &b, const function_instance &instance, + bool overloaded_p) const override { - gcc_assert (c.any_type_float_p ()); + char base_name[BASE_NAME_MAX_LEN] = {}; - /* Check whether rounding mode argument is a valid immediate. */ - if (c.base->has_rounding_mode_operand_p ()) - { - unsigned int frm_num = c.arg_num () - 2; + normalize_base_name (base_name, instance.base_name, sizeof (base_name)); - return c.require_immediate (frm_num, FRM_STATIC_MIN, FRM_STATIC_MAX); - } + b.append_base_name (base_name); - return true; + /* vop --> vop_. */ + b.append_name (operand_suffixes[instance.op_info->op]); + + /* vop_ --> vop__. */ + if (!overloaded_p) + b.append_name (type_suffixes[instance.type.index].vector); + + /* According to rvv-intrinsic-doc, it does not add "_rm" suffix + for vop_rm C++ overloaded API. */ + if (!overloaded_p) + b.append_name ("_rm"); + + /* According to rvv-intrinsic-doc, it does not add "_m" suffix + for vop_m C++ overloaded API. */ + if (overloaded_p && instance.pred == PRED_TYPE_m) + return b.finish_name (); + + b.append_name (predication_suffixes[instance.pred]); + + return b.finish_name (); } }; @@ -811,6 +852,7 @@ SHAPE(indexed_loadstore, indexed_loadstore) SHAPE(alu, alu) SHAPE(alu_frm, alu_frm) SHAPE(widen_alu, widen_alu) +SHAPE(widen_alu_frm, widen_alu_frm) SHAPE(no_mask_policy, no_mask_policy) SHAPE(return_mask, return_mask) SHAPE(narrow_alu, narrow_alu) diff --git a/gcc/config/riscv/riscv-vector-builtins-shapes.h b/gcc/config/riscv/riscv-vector-builtins-shapes.h index 15fef8342ec..841b930b547 100644 --- a/gcc/config/riscv/riscv-vector-builtins-shapes.h +++ b/gcc/config/riscv/riscv-vector-builtins-shapes.h @@ -31,6 +31,7 @@ extern const function_shape *const indexed_loadstore; extern const function_shape *const alu; extern const function_shape *const alu_frm; extern const function_shape *const widen_alu; +extern const function_shape *const widen_alu_frm; extern const function_shape *const no_mask_policy; extern const function_shape *const return_mask; extern const function_shape *const narrow_alu; diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/float-point-widening-add.c b/gcc/testsuite/gcc.target/riscv/rvv/base/float-point-widening-add.c new file mode 100644 index 00000000000..1a562a4aada --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/rvv/base/float-point-widening-add.c @@ -0,0 +1,52 @@ +/* { dg-do compile } */ +/* { dg-options "-march=rv64gcv -mabi=lp64 -O3 -Wno-psabi" } */ + +#include "riscv_vector.h" + +typedef float float32_t; + +vfloat64m2_t +test_vfwadd_vv_f32m1_rm (vfloat32m1_t op1, vfloat32m1_t op2, size_t vl) { + return __riscv_vfwadd_vv_f64m2_rm (op1, op2, 0, vl); +} + +vfloat64m2_t +test_vfwadd_vv_f32m1_rm_m (vbool32_t mask, vfloat32m1_t op1, vfloat32m1_t op2, + size_t vl) { + return __riscv_vfwadd_vv_f64m2_rm_m (mask, op1, op2, 1, vl); +} + +vfloat64m2_t +test_vfwadd_vf_f32m1_rm (vfloat32m1_t op1, float32_t op2, size_t vl) { + return __riscv_vfwadd_vf_f64m2_rm (op1, op2, 2, vl); +} + +vfloat64m2_t +test_vfwadd_vf_f32m1_rm_m (vbool32_t mask, vfloat32m1_t op1, float32_t op2, + size_t vl) { + return __riscv_vfwadd_vf_f64m2_rm_m (mask, op1, op2, 3, vl); +} + +vfloat64m2_t +test_vfwadd_wv_f32m1_rm (vfloat64m2_t op1, vfloat32m1_t op2, size_t vl) { + return __riscv_vfwadd_wv_f64m2_rm (op1, op2, 0, vl); +} + +vfloat64m2_t +test_vfwadd_wv_f32m1_rm_m (vbool32_t mask, vfloat64m2_t op1, vfloat32m1_t op2, + size_t vl) { + return __riscv_vfwadd_wv_f64m2_rm_m (mask, op1, op2, 1, vl); +} + +vfloat64m2_t +test_vfwadd_wf_f32m1_rm (vfloat64m2_t op1, float32_t op2, size_t vl) { + return __riscv_vfwadd_wf_f64m2_rm (op1, op2, 2, vl); +} + +vfloat64m2_t +test_vfwadd_wf_f32m1_rm_m (vbool32_t mask, vfloat64m2_t op1, float32_t op2, + size_t vl) { + return __riscv_vfwadd_wf_f64m2_rm_m (mask, op1, op2, 3, vl); +} + +/* { dg-final { scan-assembler-times {vfwadd\.[vw][vf]\s+v[0-9]+,\s*v[0-9]+,\s*[fav]+[0-9]+} 8 } } */