From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by sourceware.org (Postfix) with ESMTPS id 8B5F73858412 for ; Mon, 11 Jul 2022 09:10:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8B5F73858412 Received: by mail-ej1-x634.google.com with SMTP id u12so7733944eja.8 for ; Mon, 11 Jul 2022 02:10:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=xaFyY8ydrxZfbgKNaKWIu6N/4ChmfEJ0/TXqOWcqnLg=; b=MJyERvXX2/ZsLtmIiXCzEpI0Ev6+dwoCN6zyAN2xyiktjrEQn9hQqFlZt2wRSK+y5p oV06qZRxOhrFzUQSeKVrl3cHrJDLO3DzPuRBhQT/WUPbmUdM/tphWsSzkrRYZsxVJIj4 OC2k7bcMV8skJbdCU+E14o+CLXcHytp9vjK3BHFIGKCLRCHyiyh5ZMeGzY37FpeVWBLs 0+Iw0x8yp2M6x4iU0vh5J+XjebZkFhXpryAL1aCnSzi3Z+lIBReCse0s9Eo7073LobHM OTSrJGNMrmK2BsWOY6/vkTlArOt++4X4+jHcDPk4K8K2MWb48BWU0vPem8JPIzcnuVqC BRsA== X-Gm-Message-State: AJIora/KXuhfRQdo/n50SOAsPW0TFI2J/4SWSCqm9QeR/Zsw9qMbSFiO 8v6URViQq5fqVx/hYC89w386duarWKMBpdAaRRs= X-Google-Smtp-Source: AGRyM1tRv0IXhKYC5qToM+K8AA6Y1t6mecK6PqCnvldUO6WZNqMlumICosEZhZ0UaGCVMEeR5iOGApXgwMuerMMCM1c= X-Received: by 2002:a17:907:c14:b0:72b:6762:de34 with SMTP id ga20-20020a1709070c1400b0072b6762de34mr1252872ejc.94.1657530606917; Mon, 11 Jul 2022 02:10:06 -0700 (PDT) MIME-Version: 1.0 References: <20220711071435.1851-1-shihua@iscas.ac.cn> <20220711071435.1851-2-shihua@iscas.ac.cn> In-Reply-To: <20220711071435.1851-2-shihua@iscas.ac.cn> From: Kito Cheng Date: Mon, 11 Jul 2022 17:09:54 +0800 Message-ID: Subject: Re: [PATCH 1/1 V3] RISC-V: Support Zmmul extension To: =?UTF-8?B?5buW5LuV5Y2O?= Cc: GCC Patches , Christoph Muellner , =?UTF-8?B?5Y+y546J6b6Z?= , jiawei , anku.anand@gmail.com Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, URIBL_BLACK 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-List-Received-Date: Mon, 11 Jul 2022 09:10:11 -0000 On Mon, Jul 11, 2022 at 3:15 PM wrote: > > From: LiaoShihua > > gcc/ChangeLog: > > * common/config/riscv/riscv-common.cc: > * config/riscv/riscv-c.cc (riscv_cpu_cpp_builtins): > * config/riscv/riscv-opts.h (MASK_ZMMUL): > (TARGET_ZMMUL): > * config/riscv/riscv.cc (riscv_option_override): > * config/riscv/riscv.md: > * config/riscv/riscv.opt: > > gcc/testsuite/ChangeLog: > > * gcc.target/riscv/zmmul-1.c: New test. > * gcc.target/riscv/zmmul-2.c: New test. > > --- > gcc/common/config/riscv/riscv-common.cc | 3 +++ > gcc/config/riscv/riscv-c.cc | 4 ++-- > gcc/config/riscv/riscv-opts.h | 3 +++ > gcc/config/riscv/riscv.cc | 4 +++- > gcc/config/riscv/riscv.md | 28 ++++++++++++------------ > gcc/config/riscv/riscv.opt | 3 +++ > gcc/testsuite/gcc.target/riscv/zmmul-1.c | 20 +++++++++++++++++ > gcc/testsuite/gcc.target/riscv/zmmul-2.c | 20 +++++++++++++++++ > 8 files changed, 68 insertions(+), 17 deletions(-) > create mode 100644 gcc/testsuite/gcc.target/riscv/zmmul-1.c > create mode 100644 gcc/testsuite/gcc.target/riscv/zmmul-2.c > > diff --git a/gcc/common/config/riscv/riscv-common.cc b/gcc/common/config/riscv/riscv-common.cc > index 0e5be2ce105..a4539067403 100644 > --- a/gcc/common/config/riscv/riscv-common.cc > +++ b/gcc/common/config/riscv/riscv-common.cc > @@ -193,6 +193,8 @@ static const struct riscv_ext_version riscv_ext_version_table[] = > {"zvl32768b", ISA_SPEC_CLASS_NONE, 1, 0}, > {"zvl65536b", ISA_SPEC_CLASS_NONE, 1, 0}, > > + {"zmmul", ISA_SPEC_CLASS_NONE, 1, 0}, > + > /* Terminate the list. */ > {NULL, ISA_SPEC_CLASS_NONE, 0, 0} > }; > @@ -1148,6 +1150,7 @@ static const riscv_ext_flag_table_t riscv_ext_flag_table[] = > {"zvl32768b", &gcc_options::x_riscv_zvl_flags, MASK_ZVL32768B}, > {"zvl65536b", &gcc_options::x_riscv_zvl_flags, MASK_ZVL65536B}, > > + {"zmmul", &gcc_options::x_riscv_zmmul_subext, MASK_ZMMUL}, > > {NULL, NULL, 0} > }; > diff --git a/gcc/config/riscv/riscv-c.cc b/gcc/config/riscv/riscv-c.cc > index eb7ef09297e..fb52f69c44c 100644 > --- a/gcc/config/riscv/riscv-c.cc > +++ b/gcc/config/riscv/riscv-c.cc > @@ -47,11 +47,11 @@ riscv_cpu_cpp_builtins (cpp_reader *pfile) > if (TARGET_ATOMIC) > builtin_define ("__riscv_atomic"); > > - if (TARGET_MUL) > + if (TARGET_MUL || TARGET_ZMMUL) > builtin_define ("__riscv_mul"); > if (TARGET_DIV) > builtin_define ("__riscv_div"); > - if (TARGET_DIV && TARGET_MUL) > + if (!TARGET_ZMMUL && TARGET_DIV && TARGET_MUL) This should checked in riscv_option_override, so no need to check TARGET_ZMMUL again here > builtin_define ("__riscv_muldiv"); > > builtin_define_with_int_value ("__riscv_xlen", UNITS_PER_WORD * 8); > diff --git a/gcc/config/riscv/riscv-opts.h b/gcc/config/riscv/riscv-opts.h > index 1e153b3a6e7..55d9fa49782 100644 > --- a/gcc/config/riscv/riscv-opts.h > +++ b/gcc/config/riscv/riscv-opts.h > @@ -153,6 +153,9 @@ enum stack_protector_guard { > #define TARGET_ZICBOM ((riscv_zicmo_subext & MASK_ZICBOM) != 0) > #define TARGET_ZICBOP ((riscv_zicmo_subext & MASK_ZICBOP) != 0) > > +#define MASK_ZMMUL (1 << 0) > +#define TARGET_ZMMUL ((riscv_zmmul_subext & MASK_ZMMUL) != 0) > + > /* Bit of riscv_zvl_flags will set contintuly, N-1 bit will set if N-bit is > set, e.g. MASK_ZVL64B has set then MASK_ZVL32B is set, so we can use > popcount to caclulate the minimal VLEN. */ > diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc > index 2e83ca07394..f11941e1653 100644 > --- a/gcc/config/riscv/riscv.cc > +++ b/gcc/config/riscv/riscv.cc > @@ -4998,8 +4998,10 @@ riscv_option_override (void) > > /* The presence of the M extension implies that division instructions > are present, so include them unless explicitly disabled. */ > - if (TARGET_MUL && (target_flags_explicit & MASK_DIV) == 0) > + if (!TARGET_ZMMUL && TARGET_MUL && (target_flags_explicit & MASK_DIV) == 0) > target_flags |= MASK_DIV; > + else if(TARGET_ZMMUL && TARGET_MUL) m and zmmul are not incompatible > + warning (0, "%<-mdiv%> cannot use when the % extension is present"); Move it to a standalone check e.g. if (TARGET_DIV && TARGET_ZMMUL && !TARGET_MUL). > else if (!TARGET_MUL && TARGET_DIV) > error ("%<-mdiv%> requires %<-march%> to subsume the % extension"); > > diff --git a/gcc/config/riscv/riscv.md b/gcc/config/riscv/riscv.md > index 308b64dd30d..d4e171464ea 100644 > --- a/gcc/config/riscv/riscv.md > +++ b/gcc/config/riscv/riscv.md > @@ -763,7 +763,7 @@ > [(set (match_operand:SI 0 "register_operand" "=r") > (mult:SI (match_operand:SI 1 "register_operand" " r") > (match_operand:SI 2 "register_operand" " r")))] > - "TARGET_MUL" > + "TARGET_ZMMUL || TARGET_MUL" > { return TARGET_64BIT ? "mulw\t%0,%1,%2" : "mul\t%0,%1,%2"; } > [(set_attr "type" "imul") > (set_attr "mode" "SI")]) > @@ -772,7 +772,7 @@ > [(set (match_operand:DI 0 "register_operand" "=r") > (mult:DI (match_operand:DI 1 "register_operand" " r") > (match_operand:DI 2 "register_operand" " r")))] > - "TARGET_MUL && TARGET_64BIT" > + "TARGET_ZMMUL || TARGET_MUL && TARGET_64BIT" > "mul\t%0,%1,%2" > [(set_attr "type" "imul") > (set_attr "mode" "DI")]) > @@ -782,7 +782,7 @@ > (mult:GPR (match_operand:GPR 1 "register_operand" " r") > (match_operand:GPR 2 "register_operand" " r"))) > (label_ref (match_operand 3 "" ""))] > - "TARGET_MUL" > + "TARGET_ZMMUL || TARGET_MUL" > { > if (TARGET_64BIT && mode == SImode) > { > @@ -827,7 +827,7 @@ > (mult:GPR (match_operand:GPR 1 "register_operand" " r") > (match_operand:GPR 2 "register_operand" " r"))) > (label_ref (match_operand 3 "" ""))] > - "TARGET_MUL" > + "TARGET_ZMMUL || TARGET_MUL" > { > if (TARGET_64BIT && mode == SImode) > { > @@ -873,7 +873,7 @@ > (sign_extend:DI > (mult:SI (match_operand:SI 1 "register_operand" " r") > (match_operand:SI 2 "register_operand" " r"))))] > - "TARGET_MUL && TARGET_64BIT" > + "(TARGET_ZMMUL || TARGET_MUL) && TARGET_64BIT" > "mulw\t%0,%1,%2" > [(set_attr "type" "imul") > (set_attr "mode" "SI")]) > @@ -884,7 +884,7 @@ > (match_operator:SI 3 "subreg_lowpart_operator" > [(mult:DI (match_operand:DI 1 "register_operand" " r") > (match_operand:DI 2 "register_operand" " r"))])))] > - "TARGET_MUL && TARGET_64BIT" > + "(TARGET_ZMMUL || TARGET_MUL) && TARGET_64BIT" > "mulw\t%0,%1,%2" > [(set_attr "type" "imul") > (set_attr "mode" "SI")]) > @@ -902,7 +902,7 @@ > [(set (match_operand:TI 0 "register_operand") > (mult:TI (any_extend:TI (match_operand:DI 1 "register_operand")) > (any_extend:TI (match_operand:DI 2 "register_operand"))))] > - "TARGET_MUL && TARGET_64BIT" > + "(TARGET_ZMMUL || TARGET_MUL) && TARGET_64BIT" > { > rtx low = gen_reg_rtx (DImode); > emit_insn (gen_muldi3 (low, operands[1], operands[2])); > @@ -924,7 +924,7 @@ > (any_extend:TI > (match_operand:DI 2 "register_operand" " r"))) > (const_int 64))))] > - "TARGET_MUL && TARGET_64BIT" > + "(TARGET_ZMMUL || TARGET_MUL) && TARGET_64BIT" > "mulh\t%0,%1,%2" > [(set_attr "type" "imul") > (set_attr "mode" "DI")]) > @@ -933,7 +933,7 @@ > [(set (match_operand:TI 0 "register_operand") > (mult:TI (zero_extend:TI (match_operand:DI 1 "register_operand")) > (sign_extend:TI (match_operand:DI 2 "register_operand"))))] > - "TARGET_MUL && TARGET_64BIT" > + "(TARGET_ZMMUL || TARGET_MUL) && TARGET_64BIT" > { > rtx low = gen_reg_rtx (DImode); > emit_insn (gen_muldi3 (low, operands[1], operands[2])); > @@ -955,7 +955,7 @@ > (sign_extend:TI > (match_operand:DI 2 "register_operand" " r"))) > (const_int 64))))] > - "TARGET_MUL && TARGET_64BIT" > + "(TARGET_ZMMUL || TARGET_MUL) && TARGET_64BIT" > "mulhsu\t%0,%2,%1" > [(set_attr "type" "imul") > (set_attr "mode" "DI")]) > @@ -966,7 +966,7 @@ > (match_operand:SI 1 "register_operand" " r")) > (any_extend:DI > (match_operand:SI 2 "register_operand" " r"))))] > - "TARGET_MUL && !TARGET_64BIT" > + "(TARGET_ZMMUL || TARGET_MUL) && !TARGET_64BIT" > { > rtx temp = gen_reg_rtx (SImode); > emit_insn (gen_mulsi3 (temp, operands[1], operands[2])); > @@ -985,7 +985,7 @@ > (any_extend:DI > (match_operand:SI 2 "register_operand" " r"))) > (const_int 32))))] > - "TARGET_MUL && !TARGET_64BIT" > + "(TARGET_ZMMUL || TARGET_MUL) && !TARGET_64BIT" > "mulh\t%0,%1,%2" > [(set_attr "type" "imul") > (set_attr "mode" "SI")]) > @@ -997,7 +997,7 @@ > (match_operand:SI 1 "register_operand" " r")) > (sign_extend:DI > (match_operand:SI 2 "register_operand" " r"))))] > - "TARGET_MUL && !TARGET_64BIT" > + "(TARGET_ZMMUL || TARGET_MUL) && !TARGET_64BIT" > { > rtx temp = gen_reg_rtx (SImode); > emit_insn (gen_mulsi3 (temp, operands[1], operands[2])); > @@ -1016,7 +1016,7 @@ > (sign_extend:DI > (match_operand:SI 2 "register_operand" " r"))) > (const_int 32))))] > - "TARGET_MUL && !TARGET_64BIT" > + "(TARGET_ZMMUL || TARGET_MUL) && !TARGET_64BIT" > "mulhsu\t%0,%2,%1" > [(set_attr "type" "imul") > (set_attr "mode" "SI")]) > diff --git a/gcc/config/riscv/riscv.opt b/gcc/config/riscv/riscv.opt > index 9e9fe6d8ccd..89aa9e1118c 100644 > --- a/gcc/config/riscv/riscv.opt > +++ b/gcc/config/riscv/riscv.opt > @@ -212,6 +212,9 @@ int riscv_zvl_flags > TargetVariable > int riscv_zicmo_subext > > +TargetVariable > +int riscv_zmmul_subext I would suggest using riscv_zm_subext instead of riscv_zmmul_subext, then we could use that for other zm in future. > + > Enum > Name(isa_spec_class) Type(enum riscv_isa_spec_class) > Supported ISA specs (for use with the -misa-spec= option): > diff --git a/gcc/testsuite/gcc.target/riscv/zmmul-1.c b/gcc/testsuite/gcc.target/riscv/zmmul-1.c > new file mode 100644 > index 00000000000..cdae2cb55df > --- /dev/null > +++ b/gcc/testsuite/gcc.target/riscv/zmmul-1.c > @@ -0,0 +1,20 @@ > +/* { dg-do compile } */ > +/* { dg-options "-march=rv64iafdc_zmmul -mabi=lp64" } */ > +int foo1(int a, int b) > +{ > + return a*b; > +} > + > +int foo2(int a, int b) > +{ > + return a/b; > +} > + > +int foo3(int a, int b) > +{ > + return a%b; > +} > + > +/* { dg-final { scan-assembler-times "mulw\t" 1 } } */ > +/* { dg-final { scan-assembler-not "div\t" } } */ > +/* { dg-final { scan-assembler-not "rem\t" } } */ > \ No newline at end of file > diff --git a/gcc/testsuite/gcc.target/riscv/zmmul-2.c b/gcc/testsuite/gcc.target/riscv/zmmul-2.c > new file mode 100644 > index 00000000000..dc6829da92e > --- /dev/null > +++ b/gcc/testsuite/gcc.target/riscv/zmmul-2.c > @@ -0,0 +1,20 @@ > +/* { dg-do compile } */ > +/* { dg-options "-march=rv32iafdc_zmmul -mabi=ilp32" } */ > +int foo1(int a, int b) > +{ > + return a*b; > +} > + > +int foo2(int a, int b) > +{ > + return a/b; > +} > + > +int foo3(int a, int b) > +{ > + return a%b; > +} > + > +/* { dg-final { scan-assembler-times "mul\t" 1 } } */ > +/* { dg-final { scan-assembler-not "div\t" } } */ > +/* { dg-final { scan-assembler-not "rem\t" } } */ > \ No newline at end of file > -- > 2.31.1.windows.1 >