From: Christoph Muellner <christoph.muellner@vrull.eu>
To: gcc-patches@gcc.gnu.org, Kito Cheng <kito.cheng@sifive.com>,
Jim Wilson <jim.wilson.gcc@gmail.com>,
Palmer Dabbelt <palmer@dabbelt.com>,
Andrew Waterman <andrew@sifive.com>,
Philipp Tomsich <philipp.tomsich@vrull.eu>,
Cooper Qu <cooper.qu@linux.alibaba.com>,
Lifang Xia <lifang_xia@linux.alibaba.com>,
Yunhai Shang <yunhai@linux.alibaba.com>,
Zhiwei Liu <zhiwei_liu@linux.alibaba.com>,
Andrew Pinski <pinskia@gmail.com>,
Hans-Peter Nilsson <hp@bitrange.com>
Cc: "Christoph Müllner" <christoph.muellner@vrull.eu>
Subject: [PATCH v4 7/9] riscv: thead: Add support for the XTheadMac ISA extension
Date: Thu, 2 Mar 2023 09:35:32 +0100 [thread overview]
Message-ID: <20230302083534.4076244-8-christoph.muellner@vrull.eu> (raw)
In-Reply-To: <20230302083534.4076244-1-christoph.muellner@vrull.eu>
From: Christoph Müllner <christoph.muellner@vrull.eu>
The XTheadMac ISA extension provides multiply-accumulate/subtract
instructions:
* mula/mulaw/mulah
* muls/mulsw/mulsh
To benefit from middle-end passes, we expand the following named
patterns in riscv.md (as they are not T-Head-specific):
* maddhisi4
* msubhisi4
gcc/ChangeLog:
* config/riscv/riscv.md (maddhisi4): New expand.
(msubhisi4): New expand.
* config/riscv/thead.md (*th_mula<mode>): New pattern.
(*th_mulawsi): New pattern.
(*th_mulawsi2): New pattern.
(*th_maddhisi4): New pattern.
(*th_sextw_maddhisi4): New pattern.
(*th_muls<mode>): New pattern.
(*th_mulswsi): New pattern.
(*th_mulswsi2): New pattern.
(*th_msubhisi4): New pattern.
(*th_sextw_msubhisi4): New pattern.
gcc/testsuite/ChangeLog:
* gcc.target/riscv/thead-mula-muls.c: New test.
Co-Developed-by: Xianmiao Qu <cooper.qu@linux.alibaba.com>
Signed-off-by: Xianmiao Qu <cooper.qu@linux.alibaba.com>
Signed-off-by: Christoph Müllner <christoph.muellner@vrull.eu>
Changed in v2:
- Add missing prefix in on INSN
---
gcc/config/riscv/riscv.md | 18 +++
gcc/config/riscv/thead.md | 121 ++++++++++++++++++
.../gcc.target/riscv/xtheadmac-mula-muls.c | 43 +++++++
3 files changed, 182 insertions(+)
create mode 100644 gcc/testsuite/gcc.target/riscv/xtheadmac-mula-muls.c
diff --git a/gcc/config/riscv/riscv.md b/gcc/config/riscv/riscv.md
index 5562e5621fa..112c93f733e 100644
--- a/gcc/config/riscv/riscv.md
+++ b/gcc/config/riscv/riscv.md
@@ -3106,6 +3106,24 @@ (define_expand "extzv<mode>"
FAIL;
})
+(define_expand "maddhisi4"
+ [(set (match_operand:SI 0 "register_operand")
+ (plus:SI
+ (mult:SI (sign_extend:SI (match_operand:HI 1 "register_operand"))
+ (sign_extend:SI (match_operand:HI 2 "register_operand")))
+ (match_operand:SI 3 "register_operand")))]
+ "TARGET_XTHEADMAC"
+)
+
+(define_expand "msubhisi4"
+ [(set (match_operand:SI 0 "register_operand")
+ (minus:SI
+ (match_operand:SI 3 "register_operand")
+ (mult:SI (sign_extend:SI (match_operand:HI 1 "register_operand"))
+ (sign_extend:SI (match_operand:HI 2 "register_operand")))))]
+ "TARGET_XTHEADMAC"
+)
+
(include "bitmanip.md")
(include "sync.md")
(include "peephole.md")
diff --git a/gcc/config/riscv/thead.md b/gcc/config/riscv/thead.md
index 88b6a95e993..ce709ca79a4 100644
--- a/gcc/config/riscv/thead.md
+++ b/gcc/config/riscv/thead.md
@@ -138,3 +138,124 @@ (define_insn "*th_cond_gpr_mov<GPR:mode><GPR2:mode>"
th.mveqz\t%0,%z3,%1"
[(set_attr "type" "condmove")
(set_attr "mode" "<GPR:MODE>")])
+
+;; XTheadMac
+
+(define_insn "*th_mula<mode>"
+ [(set (match_operand:X 0 "register_operand" "=r")
+ (plus:X (mult:X (match_operand:X 1 "register_operand" "r")
+ (match_operand:X 2 "register_operand" "r"))
+ (match_operand:X 3 "register_operand" "0")))]
+ "TARGET_XTHEADMAC"
+ "th.mula\\t%0,%1,%2"
+ [(set_attr "type" "imul")
+ (set_attr "mode" "<MODE>")]
+)
+
+(define_insn "*th_mulawsi"
+ [(set (match_operand:DI 0 "register_operand" "=r")
+ (sign_extend:DI
+ (plus:SI (mult:SI (match_operand:SI 1 "register_operand" "r")
+ (match_operand:SI 2 "register_operand" "r"))
+ (match_operand:SI 3 "register_operand" "0"))))]
+ "TARGET_XTHEADMAC && TARGET_64BIT"
+ "th.mulaw\\t%0,%1,%2"
+ [(set_attr "type" "imul")
+ (set_attr "mode" "SI")]
+)
+
+(define_insn "*th_mulawsi2"
+ [(set (match_operand:SI 0 "register_operand" "=r")
+ (plus:SI (mult:SI (match_operand:SI 1 "register_operand" "r")
+ (match_operand:SI 2 "register_operand" "r"))
+ (match_operand:SI 3 "register_operand" "0")))]
+ "TARGET_XTHEADMAC && TARGET_64BIT"
+ "th.mulaw\\t%0,%1,%2"
+ [(set_attr "type" "imul")
+ (set_attr "mode" "SI")]
+)
+
+(define_insn "*th_maddhisi4"
+ [(set (match_operand:SI 0 "register_operand" "=r")
+ (plus:SI
+ (mult:SI
+ (sign_extend:SI (match_operand:HI 1 "register_operand" " r"))
+ (sign_extend:SI (match_operand:HI 2 "register_operand" " r")))
+ (match_operand:SI 3 "register_operand" " 0")))]
+ "TARGET_XTHEADMAC"
+ "th.mulah\\t%0,%1,%2"
+ [(set_attr "type" "imul")
+ (set_attr "mode" "SI")]
+)
+
+(define_insn "*th_sextw_maddhisi4"
+ [(set (match_operand:DI 0 "register_operand" "=r")
+ (sign_extend:DI
+ (plus:SI
+ (mult:SI
+ (sign_extend:SI (match_operand:HI 1 "register_operand" " r"))
+ (sign_extend:SI (match_operand:HI 2 "register_operand" " r")))
+ (match_operand:SI 3 "register_operand" " 0"))))]
+ "TARGET_XTHEADMAC && TARGET_64BIT"
+ "th.mulah\\t%0,%1,%2"
+ [(set_attr "type" "imul")
+ (set_attr "mode" "SI")]
+)
+
+(define_insn "*th_muls<mode>"
+ [(set (match_operand:X 0 "register_operand" "=r")
+ (minus:X (match_operand:X 3 "register_operand" "0")
+ (mult:X (match_operand:X 1 "register_operand" "r")
+ (match_operand:X 2 "register_operand" "r"))))]
+ "TARGET_XTHEADMAC"
+ "th.muls\\t%0,%1,%2"
+ [(set_attr "type" "imul")
+ (set_attr "mode" "<MODE>")]
+)
+
+(define_insn "*th_mulswsi"
+ [(set (match_operand:DI 0 "register_operand" "=r")
+ (sign_extend:DI
+ (minus:SI (match_operand:SI 3 "register_operand" "0")
+ (mult:SI (match_operand:SI 1 "register_operand" "r")
+ (match_operand:SI 2 "register_operand" "r")))))]
+ "TARGET_XTHEADMAC && TARGET_64BIT"
+ "th.mulsw\\t%0,%1,%2"
+ [(set_attr "type" "imul")
+ (set_attr "mode" "SI")]
+)
+
+(define_insn "*th_mulswsi2"
+ [(set (match_operand:SI 0 "register_operand" "=r")
+ (minus:SI (match_operand:SI 3 "register_operand" "0")
+ (mult:SI (match_operand:SI 1 "register_operand" "r")
+ (match_operand:SI 2 "register_operand" "r"))))]
+ "TARGET_XTHEADMAC && TARGET_64BIT"
+ "th.mulsw\\t%0,%1,%2"
+ [(set_attr "type" "imul")
+ (set_attr "mode" "SI")]
+)
+
+(define_insn "*th_msubhisi4"
+ [(set (match_operand:SI 0 "register_operand" "=r")
+ (minus:SI (match_operand:SI 3 "register_operand" " 0")
+ (mult:SI (sign_extend:SI (match_operand:HI 1 "register_operand" " r"))
+ (sign_extend:SI (match_operand:HI 2 "register_operand" " r")))))]
+ "TARGET_XTHEADMAC"
+ "th.mulsh\\t%0,%1,%2"
+ [(set_attr "type" "imul")
+ (set_attr "mode" "SI")]
+)
+
+(define_insn "*th_sextw_msubhisi4"
+ [(set (match_operand:DI 0 "register_operand" "=r")
+ (sign_extend:DI
+ (minus:SI (match_operand:SI 3 "register_operand" " 0")
+ (mult:SI
+ (sign_extend:SI (match_operand:HI 1 "register_operand" " r"))
+ (sign_extend:SI (match_operand:HI 2 "register_operand" " r"))))))]
+ "TARGET_XTHEADMAC && TARGET_64BIT"
+ "th.mulsh\\t%0,%1,%2"
+ [(set_attr "type" "imul")
+ (set_attr "mode" "SI")]
+)
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadmac-mula-muls.c b/gcc/testsuite/gcc.target/riscv/xtheadmac-mula-muls.c
new file mode 100644
index 00000000000..751a4be5091
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/xtheadmac-mula-muls.c
@@ -0,0 +1,43 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gc_xtheadmac" { target { rv32 } } } */
+/* { dg-options "-march=rv64gc_xtheadmac" { target { rv64 } } } */
+/* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" } } */
+
+long f_mula(long a, long b, long c)
+{
+ return a + b * c;
+}
+
+long f_muls(long a, long b, long c)
+{
+ return a - b * c;
+}
+
+#if __riscv_xlen == 64
+int f_mulaw(int a, int b, int c)
+{
+ return a + b * c;
+}
+
+int f_mulsw(int a, int b, int c)
+{
+ return a - b * c;
+}
+#endif
+
+long f_mulah(int a, unsigned short b, unsigned short c)
+{
+ return a + (int)(short)b * (int)(short)c;
+}
+
+long f_mulsh(int a, unsigned short b, unsigned short c)
+{
+ return a - (int)(short)b * (int)(short)c;
+}
+
+/* { dg-final { scan-assembler-times "th.mula\t" 1 } } */
+/* { dg-final { scan-assembler-times "th.muls\t" 1 } } */
+/* { dg-final { scan-assembler-times "th.mulaw\t" 1 { target { rv64 } } } } */
+/* { dg-final { scan-assembler-times "th.mulsw\t" 1 { target { rv64 } } } } */
+/* { dg-final { scan-assembler-times "th.mulah\t" 1 } } */
+/* { dg-final { scan-assembler-times "th.mulsh\t" 1 } } */
--
2.39.2
next prev parent reply other threads:[~2023-03-02 8:35 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-02 8:35 [PATCH v4 0/9] RISC-V: Add XThead* extension support Christoph Muellner
2023-03-02 8:35 ` [PATCH v4 1/9] riscv: Add basic XThead* vendor " Christoph Muellner
2023-03-02 8:35 ` [PATCH v4 2/9] riscv: riscv-cores.def: Add T-Head XuanTie C906 Christoph Muellner
2023-03-02 8:35 ` [PATCH v4 3/9] riscv: thead: Add support for the XTheadBa ISA extension Christoph Muellner
2023-03-02 8:35 ` [PATCH v4 4/9] riscv: thead: Add support for the XTheadBs " Christoph Muellner
2023-03-02 8:35 ` [PATCH v4 5/9] riscv: thead: Add support for the XTheadBb " Christoph Muellner
2023-03-05 17:41 ` Jeff Law
2023-03-02 8:35 ` [PATCH v4 6/9] riscv: thead: Add support for the XTheadCondMov ISA extensions Christoph Muellner
2023-03-02 8:35 ` Christoph Muellner [this message]
2023-03-02 8:35 ` [PATCH v4 8/9] riscv: thead: Add support for the XTheadFmv ISA extension Christoph Muellner
2023-03-02 8:35 ` [PATCH v4 9/9] riscv: thead: Add support for the XTheadMemPair " Christoph Muellner
2023-03-05 10:18 ` [PATCH v4 0/9] RISC-V: Add XThead* extension support Kito Cheng
2023-03-15 9:02 ` Philipp Tomsich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230302083534.4076244-8-christoph.muellner@vrull.eu \
--to=christoph.muellner@vrull.eu \
--cc=andrew@sifive.com \
--cc=cooper.qu@linux.alibaba.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=hp@bitrange.com \
--cc=jim.wilson.gcc@gmail.com \
--cc=kito.cheng@sifive.com \
--cc=lifang_xia@linux.alibaba.com \
--cc=palmer@dabbelt.com \
--cc=philipp.tomsich@vrull.eu \
--cc=pinskia@gmail.com \
--cc=yunhai@linux.alibaba.com \
--cc=zhiwei_liu@linux.alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).