aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPan Li <pan2.li@intel.com>2024-08-17 09:25:58 -0600
committerJeff Law <jlaw@ventanamicro.com>2024-08-17 09:25:58 -0600
commit06ae7bc1345a31a5f23dc86b348a1bef59bb3cc1 (patch)
tree3c438c0663db0365b8086a232599265c5fcad55e
parent54b228d80c54d32ab49cee6148cfd1364b2bc817 (diff)
downloadgcc-06ae7bc1345a31a5f23dc86b348a1bef59bb3cc1.zip
gcc-06ae7bc1345a31a5f23dc86b348a1bef59bb3cc1.tar.gz
gcc-06ae7bc1345a31a5f23dc86b348a1bef59bb3cc1.tar.bz2
RISC-V: Bugfix incorrect operand for vwsll auto-vect
This patch would like to fix one ICE when rv64gcv_zvbb for vwsll. Consider below example. void vwsll_vv_test (short *restrict dst, char *restrict a, int *restrict b, int n) { for (int i = 0; i < n; i++) dst[i] = a[i] << b[i]; } It will hit the vwsll pattern with following operands. operand 0 -> (reg:RVVMF2HI 146 [ vect__7.13 ]) operand 1 -> (reg:RVVMF4QI 165 [ vect_cst__33 ]) operand 2 -> (reg:RVVM1SI 171 [ vect_cst__36 ]) According to the ISA, operand 2 should be the same as operand 1. Aka operand 2 should have RVVMF4QI mode as above. Thus, add quad truncation for operand 2 before emit vwsll. The below test suites are passed for this patch. * The rv64gcv fully regression test. PR target/116280 gcc/ChangeLog: * config/riscv/autovec-opt.md: Add quad truncation to align the mode requirement for vwsll. gcc/testsuite/ChangeLog: * gcc.target/riscv/rvv/base/pr116280-1.c: New test. * gcc.target/riscv/rvv/base/pr116280-2.c: New test.
-rw-r--r--gcc/config/riscv/autovec-opt.md4
-rw-r--r--gcc/testsuite/gcc.target/riscv/rvv/base/pr116280-1.c14
-rw-r--r--gcc/testsuite/gcc.target/riscv/rvv/base/pr116280-2.c10
3 files changed, 28 insertions, 0 deletions
diff --git a/gcc/config/riscv/autovec-opt.md b/gcc/config/riscv/autovec-opt.md
index d7a3cfd..4b33a14 100644
--- a/gcc/config/riscv/autovec-opt.md
+++ b/gcc/config/riscv/autovec-opt.md
@@ -1546,6 +1546,10 @@
"&& 1"
[(const_int 0)]
{
+ rtx truncated = gen_reg_rtx (<V_QUAD_TRUNC>mode);
+ emit_insn (gen_trunc<mode><v_quad_trunc>2 (truncated, operands[2]));
+ operands[2] = truncated;
+
insn_code icode = code_for_pred_vwsll (<V_DOUBLE_TRUNC>mode);
riscv_vector::emit_vlmax_insn (icode, riscv_vector::BINARY_OP, operands);
DONE;
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/pr116280-1.c b/gcc/testsuite/gcc.target/riscv/rvv/base/pr116280-1.c
new file mode 100644
index 0000000..8b8547e
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/pr116280-1.c
@@ -0,0 +1,14 @@
+/* Test there is no ICE when compile. */
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv_zvbb -mabi=lp64d -O3" } */
+
+short a;
+char b;
+
+void
+test (int e[][1][1], char f[][1][1][1][1]) {
+ for (int g; b;)
+ for (;;)
+ for (int h; h < 4073709551572ULL; h += 18446744073709551612U)
+ a = f[2][2][1][4073709551612][1] << e[1][1][g];
+}
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/pr116280-2.c b/gcc/testsuite/gcc.target/riscv/rvv/base/pr116280-2.c
new file mode 100644
index 0000000..02f2de6
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/pr116280-2.c
@@ -0,0 +1,10 @@
+/* Test there is no ICE when compile. */
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv_zvbb -mabi=lp64d -O3" } */
+
+void
+test (short *restrict dst, char *restrict a, int *restrict b, int n)
+{
+ for (int i = 0; i < n; i++)
+ dst[i] = a[i] << b[i];
+}