]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
[PATCH] [RISC-V] Fix shift type for RVV interleaved stepped patterns [PR120356]
authorAlexey Merzlyakov <alexey.merzlyakov@samsung.com>
Wed, 2 Jul 2025 17:29:00 +0000 (11:29 -0600)
committerJeff Law <jlaw@ventanamicro.com>
Sun, 13 Jul 2025 13:34:27 +0000 (07:34 -0600)
It corrects the shift type of interleaved stepped patterns for const vector
expanding in LRA. The shift instruction was initially LSHIFTRT, and it seems
still should be the same type for both LRA and other cases.

PR target/120356

gcc/ChangeLog:

* config/riscv/riscv-v.cc
(expand_const_vector_interleaved_stepped_npatterns):
Fix ASHIFT to LSHIFTRT insn.

gcc/testsuite/ChangeLog:

* gcc.target/riscv/rvv/autovec/pr120356.c: New test.

(cherry picked from commit 9c1ed63e4c6b0f80dd47ce421dd7d80d52c38fd3)

gcc/config/riscv/riscv-v.cc
gcc/testsuite/gcc.target/riscv/rvv/autovec/pr120356.c [new file with mode: 0644]

index aae2d274336eb833b047472b99e77b3280060588..d04665319ab314e74afaa41e370e07d56a575c2c 100644 (file)
@@ -1587,7 +1587,7 @@ expand_const_vector (rtx target, rtx src)
                  rtx shift = gen_int_mode (1, Xmode);
                  rtx shift_ops[] = {shifted_vid, vid, shift};
                  emit_vlmax_insn (code_for_pred_scalar
-                                  (ASHIFT, mode), BINARY_OP,
+                                  (LSHIFTRT, mode), BINARY_OP,
                                   shift_ops);
                }
              else
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/pr120356.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/pr120356.c
new file mode 100644 (file)
index 0000000..2913f04
--- /dev/null
@@ -0,0 +1,26 @@
+/* { dg-do run } */
+/* { dg-require-effective-target rvv_zvl256b_ok } */
+/* { dg-options "-march=rv64gcv_zvl256b -mabi=lp64d -mrvv-vector-bits=zvl -O2" } */
+
+unsigned char a = 5;
+long long c[18];
+
+static void d ()
+{
+  for (short i = 0; i < 60; i += 65413)
+    for (char j = 0; j < 18; j++)
+      {
+       for (char k = 0; k < 18; k++)
+         a *= 143;
+       for (char k = 0; k < 6; k++)
+         for (char l = 0; l < 18; l++)
+           c[l] = 0;
+      }
+}
+
+int main ()
+{
+  d ();
+  if (a + c[0] != 69)
+    __builtin_abort ();
+}