Hi,
The vectorizer expects scatters to write in an ordered fashion.
Only the ordered indexed stores offer this, so use them instead of the
unordered ones.
Regtested on rv64gcv_zvl512b.
Regards
Robin
gcc/ChangeLog:
* config/riscv/riscv-v.cc (get_gather_scatter_code): Use ordered
indexed stores.
gcc/testsuite/ChangeLog:
* gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-1.c:
Adjust test expectations.
* gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-10.c:
Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-11.c:
Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-12.c:
Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-2.c: Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-3.c: Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-4.c: Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-5.c: Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-6.c: Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-7.c: Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-8.c: Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-9.c: Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-1.c:
Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-10.c:
Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-11.c:
Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-2.c:
Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-3.c:
Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-4.c:
Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-5.c:
Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-6.c:
Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-7.c:
Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-8.c:
Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-9.c:
Ditto.
*
gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-1.c: Ditto.
*
gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-10.c: Ditto.
*
gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-2.c: Ditto.
*
gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-3.c: Ditto.
*
gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-4.c: Ditto.
*
gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-5.c: Ditto.
*
gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-6.c: Ditto.
*
gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-7.c: Ditto.
*
gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-8.c: Ditto.
*
gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-9.c: Ditto.
*
gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-1.c: Ditto.
*
gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-10.c: Ditto.
*
gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-2.c: Ditto.
*
gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-3.c: Ditto.
*
gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-4.c: Ditto.
*
gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-5.c: Ditto.
*
gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-6.c: Ditto.
*
gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-7.c: Ditto.
*
gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-8.c: Ditto.
*
gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-9.c: Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-1.c:
Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-10.c:
Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-2.c:
Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-4.c:
Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-5.c:
Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-6.c:
Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-7.c:
Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-8.c:
Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-9.c:
Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-1.c:
Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-10.c:
Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-2.c:
Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-3.c:
Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-4.c:
Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-5.c:
Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-6.c:
Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-7.c:
Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-8.c:
Ditto.
* gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-9.c:
Ditto.
---
gcc/config/riscv/riscv-v.cc | 14 +++++++-------
.../rvv/autovec/gather-scatter/gather_load_32-1.c | 2 +-
.../rvv/autovec/gather-scatter/gather_load_32-10.c | 2 +-
.../rvv/autovec/gather-scatter/gather_load_32-11.c | 2 +-
.../rvv/autovec/gather-scatter/gather_load_32-12.c | 2 +-
.../rvv/autovec/gather-scatter/gather_load_32-2.c | 2 +-
.../rvv/autovec/gather-scatter/gather_load_32-3.c | 2 +-
.../rvv/autovec/gather-scatter/gather_load_32-4.c | 2 +-
.../rvv/autovec/gather-scatter/gather_load_32-5.c | 2 +-
.../rvv/autovec/gather-scatter/gather_load_32-6.c | 2 +-
.../rvv/autovec/gather-scatter/gather_load_32-7.c | 2 +-
.../rvv/autovec/gather-scatter/gather_load_32-8.c | 2 +-
.../rvv/autovec/gather-scatter/gather_load_32-9.c | 2 +-
.../autovec/gather-scatter/mask_gather_load_32-1.c | 2 +-
.../gather-scatter/mask_gather_load_32-10.c | 2 +-
.../gather-scatter/mask_gather_load_32-11.c | 2 +-
.../autovec/gather-scatter/mask_gather_load_32-2.c | 2 +-
.../autovec/gather-scatter/mask_gather_load_32-3.c | 2 +-
.../autovec/gather-scatter/mask_gather_load_32-4.c | 2 +-
.../autovec/gather-scatter/mask_gather_load_32-5.c | 2 +-
.../autovec/gather-scatter/mask_gather_load_32-6.c | 2 +-
.../autovec/gather-scatter/mask_gather_load_32-7.c | 2 +-
.../autovec/gather-scatter/mask_gather_load_32-8.c | 2 +-
.../autovec/gather-scatter/mask_gather_load_32-9.c | 2 +-
.../gather-scatter/mask_scatter_store_32-1.c | 3 ++-
.../gather-scatter/mask_scatter_store_32-10.c | 3 ++-
.../gather-scatter/mask_scatter_store_32-2.c | 3 ++-
.../gather-scatter/mask_scatter_store_32-3.c | 3 ++-
.../gather-scatter/mask_scatter_store_32-4.c | 3 ++-
.../gather-scatter/mask_scatter_store_32-5.c | 3 ++-
.../gather-scatter/mask_scatter_store_32-6.c | 3 ++-
.../gather-scatter/mask_scatter_store_32-7.c | 3 ++-
.../gather-scatter/mask_scatter_store_32-8.c | 3 ++-
.../gather-scatter/mask_scatter_store_32-9.c | 3 ++-
.../gather-scatter/mask_scatter_store_64-1.c | 1 +
.../gather-scatter/mask_scatter_store_64-10.c | 1 +
.../gather-scatter/mask_scatter_store_64-2.c | 1 +
.../gather-scatter/mask_scatter_store_64-3.c | 1 +
.../gather-scatter/mask_scatter_store_64-4.c | 1 +
.../gather-scatter/mask_scatter_store_64-5.c | 1 +
.../gather-scatter/mask_scatter_store_64-6.c | 1 +
.../gather-scatter/mask_scatter_store_64-7.c | 1 +
.../gather-scatter/mask_scatter_store_64-8.c | 1 +
.../gather-scatter/mask_scatter_store_64-9.c | 1 +
.../autovec/gather-scatter/scatter_store_32-1.c | 3 ++-
.../autovec/gather-scatter/scatter_store_32-10.c | 3 ++-
.../autovec/gather-scatter/scatter_store_32-2.c | 3 ++-
.../autovec/gather-scatter/scatter_store_32-4.c | 3 ++-
.../autovec/gather-scatter/scatter_store_32-5.c | 3 ++-
.../autovec/gather-scatter/scatter_store_32-6.c | 3 ++-
.../autovec/gather-scatter/scatter_store_32-7.c | 3 ++-
.../autovec/gather-scatter/scatter_store_32-8.c | 3 ++-
.../autovec/gather-scatter/scatter_store_32-9.c | 3 ++-
.../autovec/gather-scatter/scatter_store_64-1.c | 1 +
.../autovec/gather-scatter/scatter_store_64-10.c | 1 +
.../autovec/gather-scatter/scatter_store_64-2.c | 1 +
.../autovec/gather-scatter/scatter_store_64-3.c | 1 +
.../autovec/gather-scatter/scatter_store_64-4.c | 1 +
.../autovec/gather-scatter/scatter_store_64-5.c | 1 +
.../autovec/gather-scatter/scatter_store_64-6.c | 1 +
.../autovec/gather-scatter/scatter_store_64-7.c | 1 +
.../autovec/gather-scatter/scatter_store_64-8.c | 1 +
.../autovec/gather-scatter/scatter_store_64-9.c | 1 +
63 files changed, 88 insertions(+), 49 deletions(-)
diff --git a/gcc/config/riscv/riscv-v.cc b/gcc/config/riscv/riscv-v.cc
index 4e5f011dc61..e582714cb5e 100644
--- a/gcc/config/riscv/riscv-v.cc
+++ b/gcc/config/riscv/riscv-v.cc
@@ -4780,7 +4780,7 @@ get_gather_scatter_code (machine_mode vec_mode,
machine_mode idx_mode,
(UNSPEC_UNORDERED, vec_mode);
else
return code_for_pred_indexed_store_same_eew
- (UNSPEC_UNORDERED, vec_mode);
+ (UNSPEC_ORDERED, vec_mode);
}
else if (dst_eew_bitsize > src_eew_bitsize)
{
@@ -4795,21 +4795,21 @@ get_gather_scatter_code (machine_mode vec_mode,
machine_mode idx_mode,
else
return
code_for_pred_indexed_store_x2_greater_eew
- (UNSPEC_UNORDERED, vec_mode);
+ (UNSPEC_ORDERED, vec_mode);
case 4:
if (is_load)
return code_for_pred_indexed_load_x4_greater_eew
(UNSPEC_UNORDERED, vec_mode);
else
return code_for_pred_indexed_store_x4_greater_eew
- (UNSPEC_UNORDERED, vec_mode);
+ (UNSPEC_ORDERED, vec_mode);
case 8:
if (is_load)
return code_for_pred_indexed_load_x8_greater_eew
(UNSPEC_UNORDERED, vec_mode);
else
return code_for_pred_indexed_store_x8_greater_eew
- (UNSPEC_UNORDERED, vec_mode);
+ (UNSPEC_ORDERED, vec_mode);
default:
gcc_unreachable ();
}
@@ -4825,21 +4825,21 @@ get_gather_scatter_code (machine_mode vec_mode,
machine_mode idx_mode,
(UNSPEC_UNORDERED, vec_mode);
else
return code_for_pred_indexed_store_x2_smaller_eew
- (UNSPEC_UNORDERED, vec_mode);
+ (UNSPEC_ORDERED, vec_mode);
case 4:
if (is_load)
return code_for_pred_indexed_load_x4_smaller_eew
(UNSPEC_UNORDERED, vec_mode);
else
return code_for_pred_indexed_store_x4_smaller_eew
- (UNSPEC_UNORDERED, vec_mode);
+ (UNSPEC_ORDERED, vec_mode);
case 8:
if (is_load)
return code_for_pred_indexed_load_x8_smaller_eew
(UNSPEC_UNORDERED, vec_mode);
else
return code_for_pred_indexed_store_x8_smaller_eew
- (UNSPEC_UNORDERED, vec_mode);
+ (UNSPEC_ORDERED, vec_mode);
default:
gcc_unreachable ();
}
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-1.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-1.c
index 8ae5106b8a0..61579909a96 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-1.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-1.c
@@ -37,4 +37,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.GATHER_LOAD" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_GATHER_LOAD" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-10.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-10.c
index d705c920a2b..c6aa8165065 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-10.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-10.c
@@ -34,4 +34,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.GATHER_LOAD" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_GATHER_LOAD" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-11.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-11.c
index 4e183cd9170..1f351627a8d 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-11.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-11.c
@@ -31,4 +31,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.GATHER_LOAD" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_GATHER_LOAD" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-12.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-12.c
index 6277682e529..0f9fc62aaa3 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-12.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-12.c
@@ -109,4 +109,4 @@ TEST_LOOP (double, uint64_t)
/* { dg-final { scan-tree-dump-not " \.GATHER_LOAD" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_GATHER_LOAD" "vect" } } */
/* { dg-final { scan-assembler-not "vluxei64\.v" } } */
-/* { dg-final { scan-assembler-not "vsuxei64\.v" } } */
+/* { dg-final { scan-assembler-not "vsoxei64\.v" } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-2.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-2.c
index e4e42fef972..22e86765d51 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-2.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-2.c
@@ -37,4 +37,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.GATHER_LOAD" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_GATHER_LOAD" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-3.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-3.c
index e385fee109d..471494b68c8 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-3.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-3.c
@@ -34,4 +34,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.GATHER_LOAD" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_GATHER_LOAD" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-4.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-4.c
index e5cb19de42f..bd874d9e19c 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-4.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-4.c
@@ -34,4 +34,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.GATHER_LOAD" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_GATHER_LOAD" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-5.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-5.c
index a437e7393ee..3d2879296e5 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-5.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-5.c
@@ -34,4 +34,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.GATHER_LOAD" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_GATHER_LOAD" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-6.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-6.c
index 487dca9928b..121f3bd1404 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-6.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-6.c
@@ -34,4 +34,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.GATHER_LOAD" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_GATHER_LOAD" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-7.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-7.c
index ff91929b8e7..51ba792b266 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-7.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-7.c
@@ -34,4 +34,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.GATHER_LOAD" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_GATHER_LOAD" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-8.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-8.c
index 81df57fcbd2..decbfc6c6db 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-8.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-8.c
@@ -34,4 +34,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.GATHER_LOAD" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_GATHER_LOAD" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-9.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-9.c
index 238b6bce042..dfb51a1af37 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-9.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/gather_load_32-9.c
@@ -34,4 +34,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.GATHER_LOAD" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_GATHER_LOAD" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-1.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-1.c
index c0b583354ad..d5b233fd815 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-1.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-1.c
@@ -38,4 +38,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.GATHER_LOAD" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_GATHER_LOAD" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-10.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-10.c
index 9e4fcee19ff..25cf4bf1d7e 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-10.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-10.c
@@ -35,4 +35,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.GATHER_LOAD" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_GATHER_LOAD" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-11.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-11.c
index e5741812b21..49568f65448 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-11.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-11.c
@@ -112,5 +112,5 @@ TEST_LOOP (double, uint64_t)
/* { dg-final { scan-tree-dump-not " \.GATHER_LOAD" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_GATHER_LOAD" "vect" } } */
/* { dg-final { scan-assembler-not "vluxei64\.v" } } */
-/* { dg-final { scan-assembler-not "vsuxei64\.v" } } */
+/* { dg-final { scan-assembler-not "vsoxei64\.v" } } */
/* { dg-final { scan-assembler-not
{vlse64\.v\s+v[0-9]+,\s*0\([a-x0-9]+\),\s*zero} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-2.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-2.c
index aadc0206f2e..c69130e57c5 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-2.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-2.c
@@ -38,4 +38,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.GATHER_LOAD" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_GATHER_LOAD" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-3.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-3.c
index b547dd61616..99e686b2b17 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-3.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-3.c
@@ -35,4 +35,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.GATHER_LOAD" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_GATHER_LOAD" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-4.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-4.c
index ac601255879..b1ca99cda76 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-4.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-4.c
@@ -35,4 +35,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.GATHER_LOAD" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_GATHER_LOAD" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-5.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-5.c
index f003a17ec31..fa0a2f6f1b8 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-5.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-5.c
@@ -35,4 +35,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.GATHER_LOAD" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_GATHER_LOAD" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-6.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-6.c
index d1d9581e81d..23fdefcfb5b 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-6.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-6.c
@@ -35,4 +35,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.GATHER_LOAD" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_GATHER_LOAD" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-7.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-7.c
index c8b5cea359f..97d75ceb3cb 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-7.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-7.c
@@ -35,4 +35,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.GATHER_LOAD" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_GATHER_LOAD" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-8.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-8.c
index dfb8a93626a..c9832330ec4 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-8.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-8.c
@@ -35,4 +35,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.GATHER_LOAD" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_GATHER_LOAD" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-9.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-9.c
index 32ddba6c167..40ae9b45898 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-9.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_gather_load_32-9.c
@@ -35,4 +35,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.GATHER_LOAD" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_GATHER_LOAD" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-1.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-1.c
index 39e09f45640..fce72afa789 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-1.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-1.c
@@ -38,4 +38,5 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsuxei} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-10.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-10.c
index b1a234441eb..27432c60137 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-10.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-10.c
@@ -35,4 +35,5 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsuxei} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-2.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-2.c
index b52219366ad..fa89d997462 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-2.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-2.c
@@ -38,4 +38,5 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsuxei} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-3.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-3.c
index 4706d0f15d9..351ca111aff 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-3.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-3.c
@@ -35,4 +35,5 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsuxei} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-4.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-4.c
index aec7a930c5e..42084f62291 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-4.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-4.c
@@ -35,4 +35,5 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsuxei} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-5.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-5.c
index 286e2db19cf..a17f6a640a4 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-5.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-5.c
@@ -35,4 +35,5 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsuxei} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-6.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-6.c
index 7674e2a7c80..f2d7ac0c067 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-6.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-6.c
@@ -35,4 +35,5 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsuxei} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-7.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-7.c
index 1738f7367b0..b21f23dd9c6 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-7.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-7.c
@@ -35,4 +35,5 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsuxei} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-8.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-8.c
index d819a1a7515..87e90c448be 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-8.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-8.c
@@ -35,4 +35,5 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsuxei} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-9.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-9.c
index ee453e5e4c9..0c6c7a0ce27 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-9.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_32-9.c
@@ -40,4 +40,5 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsuxei} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-1.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-1.c
index 27c982aa354..61ea7de72e3 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-1.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-1.c
@@ -37,3 +37,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump " \.MASK_LEN_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
+/* { dg-final { scan-assembler-not "vsuxei" } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-10.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-10.c
index 93f33696a20..480c9543a79 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-10.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-10.c
@@ -34,3 +34,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump " \.MASK_LEN_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
+/* { dg-final { scan-assembler-not "vsuxei" } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-2.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-2.c
index cbb22507ad3..f5e98c68558 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-2.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-2.c
@@ -37,3 +37,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump " \.MASK_LEN_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
+/* { dg-final { scan-assembler-not "vsuxei" } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-3.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-3.c
index 93a84056b92..ad39056327e 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-3.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-3.c
@@ -34,3 +34,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump " \.MASK_LEN_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
+/* { dg-final { scan-assembler-not "vsuxei" } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-4.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-4.c
index c5816e06fdd..f87100c1b0f 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-4.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-4.c
@@ -34,3 +34,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump " \.MASK_LEN_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
+/* { dg-final { scan-assembler-not "vsuxei" } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-5.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-5.c
index c140d05b15e..37e3df9d037 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-5.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-5.c
@@ -34,3 +34,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump " \.MASK_LEN_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
+/* { dg-final { scan-assembler-not "vsuxei" } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-6.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-6.c
index 41a03d31b70..b340e4da945 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-6.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-6.c
@@ -34,3 +34,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump " \.MASK_LEN_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
+/* { dg-final { scan-assembler-not "vsuxei" } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-7.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-7.c
index f29ae25e8cc..a82a29a7193 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-7.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-7.c
@@ -34,3 +34,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump " \.MASK_LEN_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
+/* { dg-final { scan-assembler-not "vsuxei" } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-8.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-8.c
index 8d72d98fb49..ed9cf262ae6 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-8.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-8.c
@@ -34,3 +34,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump " \.MASK_LEN_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
+/* { dg-final { scan-assembler-not "vsuxei" } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-9.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-9.c
index dfd9412376d..052c82543ba 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-9.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/mask_scatter_store_64-9.c
@@ -39,3 +39,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump " \.MASK_LEN_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
+/* { dg-final { scan-assembler-not "vsuxei" } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-1.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-1.c
index 4ad244b8e83..8748b2664d7 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-1.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-1.c
@@ -37,4 +37,5 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsuxei32\.v} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-10.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-10.c
index a44cbc18b68..65d97346749 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-10.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-10.c
@@ -34,4 +34,5 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsuxei32\.v} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-2.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-2.c
index 35e97012469..b424b894562 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-2.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-2.c
@@ -34,4 +34,5 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsuxei32\.v} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-4.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-4.c
index fb72b092b7c..444254ea19b 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-4.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-4.c
@@ -34,4 +34,5 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsuxei32\.v} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-5.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-5.c
index 7b562bd94a9..36159a46db1 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-5.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-5.c
@@ -34,4 +34,5 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsuxei32\.v} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-6.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-6.c
index 67ea0e005f1..f822f6378e1 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-6.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-6.c
@@ -34,4 +34,5 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsuxei32\.v} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-7.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-7.c
index 76f84850b2b..0336028c0af 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-7.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-7.c
@@ -34,4 +34,5 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsuxei32\.v} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-8.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-8.c
index e6e49019fb1..3b71e95b9f6 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-8.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-8.c
@@ -34,4 +34,5 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsuxei32\.v} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-9.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-9.c
index 81eb9352598..37ad2fa321f 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-9.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_32-9.c
@@ -34,4 +34,5 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-assembler-not {vluxei64\.v} } } */
-/* { dg-final { scan-assembler-not {vsuxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsoxei64\.v} } } */
+/* { dg-final { scan-assembler-not {vsuxei32\.v} } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-1.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-1.c
index 343a3658396..01caf5bdc4f 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-1.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-1.c
@@ -36,3 +36,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump " \.MASK_LEN_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
+/* { dg-final { scan-assembler-not "vsuxei" } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-10.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-10.c
index 76b0b075ba3..1c12ab13625 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-10.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-10.c
@@ -33,3 +33,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump " \.MASK_LEN_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
+/* { dg-final { scan-assembler-not "vsuxei" } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-2.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-2.c
index 7eb881989b3..448666fdc4b 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-2.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-2.c
@@ -36,3 +36,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump " \.MASK_LEN_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
+/* { dg-final { scan-assembler-not "vsuxei" } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-3.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-3.c
index 47e8ce3e186..d49bb18e728 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-3.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-3.c
@@ -33,3 +33,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump " \.MASK_LEN_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
+/* { dg-final { scan-assembler-not "vsuxei" } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-4.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-4.c
index 5c51741e892..253f2d36abc 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-4.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-4.c
@@ -33,3 +33,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump " \.MASK_LEN_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
+/* { dg-final { scan-assembler-not "vsuxei" } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-5.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-5.c
index cc0b2fe15c4..5a5d233c25e 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-5.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-5.c
@@ -33,3 +33,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump " \.MASK_LEN_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
+/* { dg-final { scan-assembler-not "vsuxei" } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-6.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-6.c
index 3408cbd88d6..8a96bd9e20f 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-6.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-6.c
@@ -33,3 +33,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump " \.MASK_LEN_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
+/* { dg-final { scan-assembler-not "vsuxei" } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-7.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-7.c
index f45c9bc6727..a6fae802464 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-7.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-7.c
@@ -33,3 +33,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump " \.MASK_LEN_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
+/* { dg-final { scan-assembler-not "vsuxei" } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-8.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-8.c
index 64fe30548cb..ee5a507f258 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-8.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-8.c
@@ -33,3 +33,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump " \.MASK_LEN_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
+/* { dg-final { scan-assembler-not "vsuxei" } } */
diff --git
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-9.c
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-9.c
index bd1538db045..5f36eb8b37a 100644
---
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-9.c
+++
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/gather-scatter/scatter_store_64-9.c
@@ -33,3 +33,4 @@ TEST_ALL (TEST_LOOP)
/* { dg-final { scan-tree-dump " \.MASK_LEN_SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.SCATTER_STORE" "vect" } } */
/* { dg-final { scan-tree-dump-not " \.MASK_SCATTER_STORE" "vect" } } */
+/* { dg-final { scan-assembler-not "vsuxei" } } */
--
2.54.0
