From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1923) id 2109F3898397; Tue, 15 Nov 2022 15:00:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2109F3898397 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1668524438; bh=RXsgZg0rPGXDkXke7/9McqENNIys8kARVDfTfIjEWOA=; h=From:To:Subject:Date:From; b=mezGu054TIfn0XSxGfBMt+6D+wLlkIVtXJO82aCAwbYn1zzZhqy6dRIb42bz6aQ4u qGTy4AIcE06400ouHIYfqUogzFXEZ1jd8fHtrDZvQhe6bHD7U43LGNJCgjq+NNhMlV JP2Xd55kkdanAHuOPY7GzXZCy+VcY4zRF5km8tCc= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Philipp Tomsich To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/vendors/vrull/heads/for-upstream)] RISC-V: Zihintpause: add __builtin_riscv_pause X-Act-Checkin: gcc X-Git-Author: Philipp Tomsich X-Git-Refname: refs/vendors/vrull/heads/for-upstream X-Git-Oldrev: 4c3df1ee1d9f3f1bfbb8e2527b70f229beda0f1f X-Git-Newrev: 11a36c1747d267a114553f55b5d43f4f8f28ec90 Message-Id: <20221115150038.2109F3898397@sourceware.org> Date: Tue, 15 Nov 2022 15:00:38 +0000 (GMT) List-Id: https://gcc.gnu.org/g:11a36c1747d267a114553f55b5d43f4f8f28ec90 commit 11a36c1747d267a114553f55b5d43f4f8f28ec90 Author: Philipp Tomsich Date: Thu Dec 17 00:44:11 2020 +0100 RISC-V: Zihintpause: add __builtin_riscv_pause The Zihintpause extension uses an opcode from the 'fence' opcode range to add a true hint instruction (i.e. if it is not supported on any given platform, the 'fence' that is encoded will not enforce any specific ordering on memory accesses) for entering a low-power state (e.g. in an idle thread). We expose this new instruction through a machine-dependent builtin to allow generating it without a requirement for any inline assembly. Given that the encoding of 'pause' is valid (as a 'fence' encoding) even for processors that do not (yet) support Zihintpause, we make this builtin available without any further TARGET_* constraints. gcc/ChangeLog: * config/riscv/riscv-builtins.cc (struct riscv_builtin_description): add the pause machine-dependent builtin with no result and no arguments; mark it as always present (pause is a true hint that encodes into a fence-insn, if not supported with the new pause semantics). * config/riscv/riscv-ftypes.def: Add type for void -> void. * config/riscv/riscv.md (riscv_pause): Add risc_pause and UNSPECV_PAUSE * doc/gcc/extensions-to-the-c-language-family/target-builtins/risc-v-built-in-functions.rst: Document. * optabs.cc (maybe_gen_insn): Allow nops == 0 (void -> void). gcc/testsuite/ChangeLog: * gcc.target/riscv/builtin_pause.c: New test. Series-to: gcc-patches@gcc.gnu.org Series-cc: Palmer Dabbelt Series-cc: Vineet Gupta Series-cc: Christoph Muellner Series-cc: Kito Cheng Series-cc: Jeff Law Diff: --- gcc/config/riscv/riscv-builtins.cc | 6 +++--- gcc/config/riscv/riscv-ftypes.def | 1 + gcc/config/riscv/riscv.md | 8 ++++++++ gcc/doc/extend.texi | 4 ++++ gcc/optabs.cc | 2 ++ gcc/testsuite/gcc.target/riscv/builtin_pause.c | 10 ++++++++++ 6 files changed, 28 insertions(+), 3 deletions(-) diff --git a/gcc/config/riscv/riscv-builtins.cc b/gcc/config/riscv/riscv-builtins.cc index 021f6c6b69a6..24ae22c99cd4 100644 --- a/gcc/config/riscv/riscv-builtins.cc +++ b/gcc/config/riscv/riscv-builtins.cc @@ -88,8 +88,6 @@ struct riscv_builtin_description { }; AVAIL (hard_float, TARGET_HARD_FLOAT || TARGET_ZFINX) - - AVAIL (clean32, TARGET_ZICBOM && !TARGET_64BIT) AVAIL (clean64, TARGET_ZICBOM && TARGET_64BIT) AVAIL (flush32, TARGET_ZICBOM && !TARGET_64BIT) @@ -100,6 +98,7 @@ AVAIL (zero32, TARGET_ZICBOZ && !TARGET_64BIT) AVAIL (zero64, TARGET_ZICBOZ && TARGET_64BIT) AVAIL (prefetchi32, TARGET_ZICBOP && !TARGET_64BIT) AVAIL (prefetchi64, TARGET_ZICBOP && TARGET_64BIT) +AVAIL (always, (!0)) /* Construct a riscv_builtin_description from the given arguments. @@ -148,7 +147,8 @@ static const struct riscv_builtin_description riscv_builtins[] = { #include "riscv-cmo.def" DIRECT_BUILTIN (frflags, RISCV_USI_FTYPE, hard_float), - DIRECT_NO_TARGET_BUILTIN (fsflags, RISCV_VOID_FTYPE_USI, hard_float) + DIRECT_NO_TARGET_BUILTIN (fsflags, RISCV_VOID_FTYPE_USI, hard_float), + DIRECT_NO_TARGET_BUILTIN (pause, RISCV_VOID_FTYPE, always), }; /* Index I is the function declaration for riscv_builtins[I], or null if the diff --git a/gcc/config/riscv/riscv-ftypes.def b/gcc/config/riscv/riscv-ftypes.def index c2b45c63ea17..bf2d30782d9e 100644 --- a/gcc/config/riscv/riscv-ftypes.def +++ b/gcc/config/riscv/riscv-ftypes.def @@ -27,6 +27,7 @@ along with GCC; see the file COPYING3. If not see argument type. */ DEF_RISCV_FTYPE (0, (USI)) +DEF_RISCV_FTYPE (0, (VOID)) DEF_RISCV_FTYPE (1, (VOID, USI)) DEF_RISCV_FTYPE (1, (VOID, VOID_PTR)) DEF_RISCV_FTYPE (1, (SI, SI)) diff --git a/gcc/config/riscv/riscv.md b/gcc/config/riscv/riscv.md index 88183cea87d8..7d2fd12d58fb 100644 --- a/gcc/config/riscv/riscv.md +++ b/gcc/config/riscv/riscv.md @@ -97,6 +97,9 @@ UNSPECV_INVAL UNSPECV_ZERO UNSPECV_PREI + + ;; Zihintpause unspec + UNSPECV_PAUSE ]) (define_constants @@ -1985,6 +1988,11 @@ "TARGET_ZIFENCEI" "fence.i") +(define_insn "riscv_pause" + [(unspec_volatile [(const_int 0)] UNSPECV_PAUSE)] + "" + "pause") + ;; ;; .................... ;; diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi index 608bbe1699c7..b1dd39e64b84 100644 --- a/gcc/doc/extend.texi +++ b/gcc/doc/extend.texi @@ -21102,6 +21102,10 @@ processors. Returns the value that is currently set in the @samp{tp} register. @end deftypefn +@deftypefn {Built-in Function} void __builtin_riscv_pause (void) +Generates the @code{pause} (hint) machine instruction. +@end deftypefn + @node RX Built-in Functions @subsection RX Built-in Functions GCC supports some of the RX instructions which cannot be expressed in diff --git a/gcc/optabs.cc b/gcc/optabs.cc index 2d9ca4e56ab5..bbe3bd79ca10 100644 --- a/gcc/optabs.cc +++ b/gcc/optabs.cc @@ -7962,6 +7962,8 @@ maybe_gen_insn (enum insn_code icode, unsigned int nops, switch (nops) { + case 0: + return GEN_FCN (icode) (); case 1: return GEN_FCN (icode) (ops[0].value); case 2: diff --git a/gcc/testsuite/gcc.target/riscv/builtin_pause.c b/gcc/testsuite/gcc.target/riscv/builtin_pause.c new file mode 100644 index 000000000000..9250937cabb9 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/builtin_pause.c @@ -0,0 +1,10 @@ +/* { dg-do compile } */ +/* { dg-options "-O2" } */ + +void test_pause() +{ + __builtin_riscv_pause (); +} + +/* { dg-final { scan-assembler "pause" } } */ +