From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by sourceware.org (Postfix) with ESMTPS id C1B75385737C for ; Mon, 6 Jun 2022 09:05:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C1B75385737C Received: by mail-ed1-x535.google.com with SMTP id h19so17934771edj.0 for ; Mon, 06 Jun 2022 02:05:58 -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=yvq5sxxlXW13GWoBN3EpV1kHUWNIdjkqcb7UVosbiTA=; b=rWOhimcmQOrWyyvL0562mVCft5elwwvWGip9f2v9fHdNMfTnVW87Nz9/MwCrzR+fIY OLDl44DpB+wrWY+GtVEO5OrZVH3yV0Dx2nVJOkGHP5Q8uquLgB3JVx+UVYxHiO5dY1aw Gm3DDaIWyW5SsuSySEfbD6vMyR0Q8GESOgNv4/r5a4kGbRj0/Ftbl23ZhJnoy0dUNTbD XBjAI/2AGNgFoORuT/OxUFUXPVTX/2AoMokaGHU1MOVfm9C1mWAapRKdcETOs1dNRMU4 GSBnxaIZI8NmkzvJS+pW7vWHlI+BQQolgXNxMBAUuSN86d64E7iHm0q+BGfsk+/jccm5 rN6g== X-Gm-Message-State: AOAM532EyQVEYUFBGhb/12E+jJ/zlsLKNEzjGexeST4qcmr5N3PQC9Us LnM1NyEGiE86vlupTfxKv7/cUwNvbnQCCAapdZg= X-Google-Smtp-Source: ABdhPJzaukB7gYeCvwgcNQOkq2e7C6kqMy5PAP57Fj3JPg8kjkI9ahZwPkKtT7YwaL5CZU/bx8Hfh2zqmAqLrB4HC9c= X-Received: by 2002:a05:6402:23a3:b0:42e:251a:c963 with SMTP id j35-20020a05640223a300b0042e251ac963mr20600591eda.173.1654506357297; Mon, 06 Jun 2022 02:05:57 -0700 (PDT) MIME-Version: 1.0 References: <20220606072909.23673-1-shiyulong@iscas.ac.cn> In-Reply-To: <20220606072909.23673-1-shiyulong@iscas.ac.cn> From: Kito Cheng Date: Mon, 6 Jun 2022 17:05:45 +0800 Message-ID: Subject: Re: [PATCH] RISC-V:Fix a bug that is the CMO builtins are missing parameter To: =?UTF-8?B?5Y+y546J6b6Z?= Cc: GCC Patches , Andrew Waterman , jiawei , wuwei2016@iscas.ac.cn, =?UTF-8?B?5buW5LuV5Y2O?= Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-8.2 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 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, 06 Jun 2022 09:06:01 -0000 On Mon, Jun 6, 2022 at 3:29 PM wrote: > > From: yulong > > We changed the RTL mode and builtins format about zicbom and zicboz subextensions. > > gcc/ChangeLog: > > * config/riscv/riscv-cmo.def (RISCV_BUILTIN): changed "RISCV_SI(DI)_FTYPE" to "RISCV_SI(DI)_FTPYE_SI(DI)" > * config/riscv/riscv-ftypes.def (0): deleted DEF_RISCV_FTYPE (0,(SI)) and DEF_RISCV_FTYPE (0,(DI)) > * config/riscv/riscv.md: added a immediate_operand about cbo.clean, cbo.flush, cbo.inval and cbo.zero instructions > > gcc/testsuite/ChangeLog: > > * gcc.target/riscv/cmo-zicbom-1.c: added a parameter > * gcc.target/riscv/cmo-zicbom-2.c: added a parameter > * gcc.target/riscv/cmo-zicboz-1.c: added a parameter > * gcc.target/riscv/cmo-zicboz-2.c: added a parameter > > --- > gcc/config/riscv/riscv-cmo.def | 16 ++++++++-------- > gcc/config/riscv/riscv-ftypes.def | 2 -- > gcc/config/riscv/riscv.md | 12 ++++++++---- > gcc/testsuite/gcc.target/riscv/cmo-zicbom-1.c | 6 +++--- > gcc/testsuite/gcc.target/riscv/cmo-zicbom-2.c | 6 +++--- > gcc/testsuite/gcc.target/riscv/cmo-zicboz-1.c | 2 +- > gcc/testsuite/gcc.target/riscv/cmo-zicboz-2.c | 2 +- > 7 files changed, 24 insertions(+), 22 deletions(-) > > diff --git a/gcc/config/riscv/riscv-cmo.def b/gcc/config/riscv/riscv-cmo.def > index b30ecf96ec1..d43cbf62954 100644 > --- a/gcc/config/riscv/riscv-cmo.def > +++ b/gcc/config/riscv/riscv-cmo.def > @@ -1,16 +1,16 @@ > // zicbom > -RISCV_BUILTIN (clean_si, "zicbom_cbo_clean", RISCV_BUILTIN_DIRECT, RISCV_SI_FTYPE, clean32), > -RISCV_BUILTIN (clean_di, "zicbom_cbo_clean", RISCV_BUILTIN_DIRECT, RISCV_DI_FTYPE, clean64), > +RISCV_BUILTIN (clean_si, "zicbom_cbo_clean", RISCV_BUILTIN_DIRECT, RISCV_SI_FTYPE_SI, clean32), > +RISCV_BUILTIN (clean_di, "zicbom_cbo_clean", RISCV_BUILTIN_DIRECT, RISCV_DI_FTYPE_DI, clean64), That should be RISCV_VOID_FTYPE_SI and RISCV_VOID_FTYPE_DI, it takes one argument but no return value. > > -RISCV_BUILTIN (flush_si, "zicbom_cbo_flush", RISCV_BUILTIN_DIRECT, RISCV_SI_FTYPE, flush32), > -RISCV_BUILTIN (flush_di, "zicbom_cbo_flush", RISCV_BUILTIN_DIRECT, RISCV_DI_FTYPE, flush64), > +RISCV_BUILTIN (flush_si, "zicbom_cbo_flush", RISCV_BUILTIN_DIRECT, RISCV_SI_FTYPE_SI, flush32), > +RISCV_BUILTIN (flush_di, "zicbom_cbo_flush", RISCV_BUILTIN_DIRECT, RISCV_DI_FTYPE_DI, flush64), > > -RISCV_BUILTIN (inval_si, "zicbom_cbo_inval", RISCV_BUILTIN_DIRECT, RISCV_SI_FTYPE, inval32), > -RISCV_BUILTIN (inval_di, "zicbom_cbo_inval", RISCV_BUILTIN_DIRECT, RISCV_DI_FTYPE, inval64), > +RISCV_BUILTIN (inval_si, "zicbom_cbo_inval", RISCV_BUILTIN_DIRECT, RISCV_SI_FTYPE_SI, inval32), > +RISCV_BUILTIN (inval_di, "zicbom_cbo_inval", RISCV_BUILTIN_DIRECT, RISCV_DI_FTYPE_DI, inval64), > > // zicboz > -RISCV_BUILTIN (zero_si, "zicboz_cbo_zero", RISCV_BUILTIN_DIRECT, RISCV_SI_FTYPE, zero32), > -RISCV_BUILTIN (zero_di, "zicboz_cbo_zero", RISCV_BUILTIN_DIRECT, RISCV_DI_FTYPE, zero64), > +RISCV_BUILTIN (zero_si, "zicboz_cbo_zero", RISCV_BUILTIN_DIRECT, RISCV_SI_FTYPE_SI, zero32), > +RISCV_BUILTIN (zero_di, "zicboz_cbo_zero", RISCV_BUILTIN_DIRECT, RISCV_DI_FTYPE_DI, zero64), > > // zicbop > RISCV_BUILTIN (prefetchi_si, "zicbop_cbo_prefetchi", RISCV_BUILTIN_DIRECT, RISCV_SI_FTYPE_SI, prefetchi32), > diff --git a/gcc/config/riscv/riscv-ftypes.def b/gcc/config/riscv/riscv-ftypes.def > index 62421292ce7..445eb8ee05d 100644 > --- a/gcc/config/riscv/riscv-ftypes.def > +++ b/gcc/config/riscv/riscv-ftypes.def > @@ -28,7 +28,5 @@ along with GCC; see the file COPYING3. If not see > > DEF_RISCV_FTYPE (0, (USI)) > DEF_RISCV_FTYPE (1, (VOID, USI)) > -DEF_RISCV_FTYPE (0, (SI)) > -DEF_RISCV_FTYPE (0, (DI)) > DEF_RISCV_FTYPE (1, (SI, SI)) > DEF_RISCV_FTYPE (1, (DI, DI)) > diff --git a/gcc/config/riscv/riscv.md b/gcc/config/riscv/riscv.md > index b8ab0cf169a..2d7d94eebd3 100644 > --- a/gcc/config/riscv/riscv.md > +++ b/gcc/config/riscv/riscv.md > @@ -2893,28 +2893,32 @@ > [(set_attr "length" "12")]) > > (define_insn "riscv_clean_" > - [(unspec_volatile:X [(match_operand:X 0 "register_operand" "r")] > + [(unspec_volatile:X [(match_operand:X 0 "register_operand" "r") > + (match_operand:X 1 "immediate_operand" "i")] No need for a second input operand. > UNSPECV_CLEAN)] > "TARGET_ZICBOM" > "cbo.clean\t%a0" > ) > > (define_insn "riscv_flush_" > - [(unspec_volatile:X [(match_operand:X 0 "register_operand" "r")] > + [(unspec_volatile:X [(match_operand:X 0 "register_operand" "r") > + (match_operand:X 1 "immediate_operand" "i")] > UNSPECV_FLUSH)] > "TARGET_ZICBOM" > "cbo.flush\t%a0" > ) > > (define_insn "riscv_inval_" > - [(unspec_volatile:X [(match_operand:X 0 "register_operand" "r")] > + [(unspec_volatile:X [(match_operand:X 0 "register_operand" "r") > + (match_operand:X 1 "immediate_operand" "i")] > UNSPECV_INVAL)] > "TARGET_ZICBOM" > "cbo.inval\t%a0" > ) > > (define_insn "riscv_zero_" > - [(unspec_volatile:X [(match_operand:X 0 "register_operand" "r")] > + [(unspec_volatile:X [(match_operand:X 0 "register_operand" "r") > + (match_operand:X 1 "immediate_operand" "i")] > UNSPECV_ZERO)] > "TARGET_ZICBOZ" > "cbo.zero\t%a0" > diff --git a/gcc/testsuite/gcc.target/riscv/cmo-zicbom-1.c b/gcc/testsuite/gcc.target/riscv/cmo-zicbom-1.c > index e2ba2183511..eb68944418b 100644 > --- a/gcc/testsuite/gcc.target/riscv/cmo-zicbom-1.c > +++ b/gcc/testsuite/gcc.target/riscv/cmo-zicbom-1.c > @@ -3,17 +3,17 @@ > > int foo1() > { > - return __builtin_riscv_zicbom_cbo_clean(); > + return __builtin_riscv_zicbom_cbo_clean(0); No return value for those cbo operations, and could you try to pass some address other than 0 to the argument? e.g. int var; void foo1() { __builtin_riscv_zicbom_cbo_clean(0); __builtin_riscv_zicbom_cbo_clean(&var); __builtin_riscv_zicbom_cbo_clean((void*)0x1234) } And also for cmo.flush, cmo.inval and cmo.zero. > } > > int foo2() > { > - return __builtin_riscv_zicbom_cbo_flush(); > + return __builtin_riscv_zicbom_cbo_flush(0); > } > > int foo3() > { > - return __builtin_riscv_zicbom_cbo_inval(); > + return __builtin_riscv_zicbom_cbo_inval(0); > } > > /* { dg-final { scan-assembler-times "cbo.clean" 1 } } */ > diff --git a/gcc/testsuite/gcc.target/riscv/cmo-zicbom-2.c b/gcc/testsuite/gcc.target/riscv/cmo-zicbom-2.c > index a605e8b1bdc..3dc0f6d3368 100644 > --- a/gcc/testsuite/gcc.target/riscv/cmo-zicbom-2.c > +++ b/gcc/testsuite/gcc.target/riscv/cmo-zicbom-2.c > @@ -3,17 +3,17 @@ > > int foo1() > { > - return __builtin_riscv_zicbom_cbo_clean(); > + return __builtin_riscv_zicbom_cbo_clean(0); > } > > int foo2() > { > - return __builtin_riscv_zicbom_cbo_flush(); > + return __builtin_riscv_zicbom_cbo_flush(0); > } > > int foo3() > { > - return __builtin_riscv_zicbom_cbo_inval(); > + return __builtin_riscv_zicbom_cbo_inval(0); > } > > /* { dg-final { scan-assembler-times "cbo.clean" 1 } } */ > diff --git a/gcc/testsuite/gcc.target/riscv/cmo-zicboz-1.c b/gcc/testsuite/gcc.target/riscv/cmo-zicboz-1.c > index 96c1674ef2d..4726577f119 100644 > --- a/gcc/testsuite/gcc.target/riscv/cmo-zicboz-1.c > +++ b/gcc/testsuite/gcc.target/riscv/cmo-zicboz-1.c > @@ -3,7 +3,7 @@ > > int foo1() > { > - return __builtin_riscv_zicboz_cbo_zero(); > + return __builtin_riscv_zicboz_cbo_zero(0); > } > > /* { dg-final { scan-assembler-times "cbo.zero" 1 } } */ > diff --git a/gcc/testsuite/gcc.target/riscv/cmo-zicboz-2.c b/gcc/testsuite/gcc.target/riscv/cmo-zicboz-2.c > index 9d99839b1e7..18d66b88515 100644 > --- a/gcc/testsuite/gcc.target/riscv/cmo-zicboz-2.c > +++ b/gcc/testsuite/gcc.target/riscv/cmo-zicboz-2.c > @@ -3,7 +3,7 @@ > > int foo1() > { > - return __builtin_riscv_zicboz_cbo_zero(); > + return __builtin_riscv_zicboz_cbo_zero(0); > } > > /* { dg-final { scan-assembler-times "cbo.zero" 1 } } */ > -- > 2.17.1 >