Make VLS (fixed-length) vector modes use the same LMUL cost scaling as
VLA modes. This makes the vectorizer to pick smaller LMULs sometimes.
Here is how I update the testsuite which failed in regression test:
- dyn-lmul-conv-[1-2].c: The cost model now prefers smaller LMULs,
so update expectations.
- pr123414.c: This test relies on large LMULs to trigger a specific bug,
can be fixed by adding -fno-vect-cost-model.
gcc/ChangeLog:
* config/riscv/riscv-vector-costs.cc (get_lmul_cost_scaling):
Enable scaling for all vector modes (VLA and VLS).
gcc/testsuite/ChangeLog:
* gcc.target/riscv/rvv/autovec/dyn-lmul-conv-1.c: Update expected LMUL
counts.
* gcc.target/riscv/rvv/autovec/dyn-lmul-conv-2.c: Likewise.
* gcc.target/riscv/rvv/autovec/pr123414.c: Disable vector cost model.
Signed-off-by: Zhongyao Chen <[email protected]>
---
gcc/config/riscv/riscv-vector-costs.cc | 3 ---
.../gcc.target/riscv/rvv/autovec/dyn-lmul-conv-1.c | 6 +++---
.../gcc.target/riscv/rvv/autovec/dyn-lmul-conv-2.c | 4 ++--
gcc/testsuite/gcc.target/riscv/rvv/autovec/pr123414.c | 2 +-
4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/gcc/config/riscv/riscv-vector-costs.cc
b/gcc/config/riscv/riscv-vector-costs.cc
index 833a525abd6..8e602752664 100644
--- a/gcc/config/riscv/riscv-vector-costs.cc
+++ b/gcc/config/riscv/riscv-vector-costs.cc
@@ -1334,9 +1334,6 @@ segment_loadstore_group_size (enum vect_cost_for_stmt
kind,
static unsigned
get_lmul_cost_scaling (machine_mode mode)
{
- if (!riscv_vla_mode_p (mode))
- return 1;
-
enum vlmul_type vlmul = get_vlmul (mode);
/* Cost scaling based on LMUL and data processed.
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/dyn-lmul-conv-1.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/dyn-lmul-conv-1.c
index 91d777a58a7..e04f16a9d93 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/dyn-lmul-conv-1.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/dyn-lmul-conv-1.c
@@ -37,7 +37,7 @@ void foo8x (long *restrict a, char *restrict b, int n)
a[i] = b[i];
}
-/* { dg-final { scan-assembler-times ",m1," 3 } } */
+/* { dg-final { scan-assembler-not ",m1," } } */
/* { dg-final { scan-assembler-times ",m2," 3 } } */
-/* { dg-final { scan-assembler-times ",m4," 4 } } */
-/* { dg-final { scan-assembler-times ",m8," 2 } } */
+/* { dg-final { scan-assembler-times ",m4," 2 } } */
+/* { dg-final { scan-assembler-times ",m8," 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/dyn-lmul-conv-2.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/dyn-lmul-conv-2.c
index 468f061e3b1..4ed92b9e5a9 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/dyn-lmul-conv-2.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/dyn-lmul-conv-2.c
@@ -37,8 +37,8 @@ void foo8x (unsigned char *restrict a, unsigned long
*restrict b, int n)
a[i] = b[i];
}
-/* { dg-final { scan-assembler-times ",m1," 7 } } */
+/* { dg-final { scan-assembler-times ",m1," 6 } } */
/* { dg-final { scan-assembler-times ",m2," 3 } } */
/* { dg-final { scan-assembler-times ",m4," 1 } } */
-/* { dg-final { scan-assembler-times ",m8," 1 } } */
+/* { dg-final { scan-assembler-not ",m8," } } */
/* { dg-final { scan-assembler-not ",mf2," } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/pr123414.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/pr123414.c
index 9e3bf6bca81..44ca8ef8dda 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/pr123414.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/pr123414.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-march=rv64gcv_zvl256b -mabi=lp64d -mrvv-max-lmul=m8 -O3
-fsigned-char -fno-strict-aliasing -fwrapv -fdump-tree-optimized -std=gnu99" }
*/
+/* { dg-options "-march=rv64gcv_zvl256b -mabi=lp64d -mrvv-max-lmul=m8 -O3
-fsigned-char -fno-strict-aliasing -fwrapv -fdump-tree-optimized -std=gnu99
-fno-vect-cost-model" } */
signed char a=2;
long long b;
--
2.43.0
