[PATCH v1 4/5] RISC-V: Adjust the scan asm for v[sz]ext.vf2 for v[123]

Sat, 11 Jul 2026 19:48:23 -0700 

From: Pan Li <[email protected]>

The previous match v1 may match the v12 as well, therefore
add the non-num boundary.

gcc/testsuite/ChangeLog:

        * gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u16-m1.c:
        Add non-number boundary for reg num check.
        * gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u16-m2.c:
        Ditto.
        * gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u16-mf2.c:
        Ditto.
        * gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u16-mf4.c:
        Ditto.
        * gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u32-m1.c:
        Ditto.
        * gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u32-mf2.c:
        Ditto.
        * gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u8-m1.c:
        Ditto.
        * gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u8-m2.c:
        Ditto.
        * gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u8-mf2.c:
        Ditto.
        * gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u8-mf4.c:
        Ditto.
        * gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u8-mf8.c:
        Ditto.

Signed-off-by: Pan Li <[email protected]>
---
 .../riscv/rvv/autovec/group_overlap/vzext_vf2-u16-m1.c        | 4 ++--
 .../riscv/rvv/autovec/group_overlap/vzext_vf2-u16-m2.c        | 2 +-
 .../riscv/rvv/autovec/group_overlap/vzext_vf2-u16-mf2.c       | 4 ++--
 .../riscv/rvv/autovec/group_overlap/vzext_vf2-u16-mf4.c       | 4 ++--
 .../riscv/rvv/autovec/group_overlap/vzext_vf2-u32-m1.c        | 4 ++--
 .../riscv/rvv/autovec/group_overlap/vzext_vf2-u32-mf2.c       | 4 ++--
 .../riscv/rvv/autovec/group_overlap/vzext_vf2-u8-m1.c         | 4 ++--
 .../riscv/rvv/autovec/group_overlap/vzext_vf2-u8-m2.c         | 2 +-
 .../riscv/rvv/autovec/group_overlap/vzext_vf2-u8-mf2.c        | 4 ++--
 .../riscv/rvv/autovec/group_overlap/vzext_vf2-u8-mf4.c        | 4 ++--
 .../riscv/rvv/autovec/group_overlap/vzext_vf2-u8-mf8.c        | 4 ++--
 11 files changed, 20 insertions(+), 20 deletions(-)

diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u16-m1.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u16-m1.c
index 63e395bac8d..dcfcfa804d9 100644
--- 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u16-m1.c
+++ 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u16-m1.c
@@ -13,5 +13,5 @@ DEF_GROUP_OVERLAP_UNARY_0(
   vzext_vf,
   LOOP_UNARY_BODY_X16)
 
-/* { dg-final { scan-assembler-times {vzext\.vf2\s+v0,v1} 1 } } */
-/* { dg-final { scan-assembler-times {vzext\.vf2\s+v2,v3} 1 } } */
+/* { dg-final { scan-assembler-times {vzext\.vf2\s+v0,v1([^0-9]|$)} 1 } } */
+/* { dg-final { scan-assembler-times {vzext\.vf2\s+v2,v3([^0-9]|$)} 1 } } */
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u16-m2.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u16-m2.c
index 907d42a16a8..0e9331cfe50 100644
--- 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u16-m2.c
+++ 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u16-m2.c
@@ -13,5 +13,5 @@ DEF_GROUP_OVERLAP_UNARY_0(
   vzext_vf,
   LOOP_UNARY_BODY_X8)
 
-/* { dg-final { scan-assembler-times {vzext\.vf2\s+v0,v2} 1 } } */
+/* { dg-final { scan-assembler-times {vzext\.vf2\s+v0,v2([^0-9]|$)} 1 } } */
 /* { dg-final { scan-assembler-times {vzext\.vf2\s+v4,v6} 1 } } */
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u16-mf2.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u16-mf2.c
index 5f6789bb1df..dc7b8bfd6e0 100644
--- 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u16-mf2.c
+++ 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u16-mf2.c
@@ -13,8 +13,8 @@ DEF_GROUP_OVERLAP_UNARY_0(
   vzext_vf,
   LOOP_UNARY_BODY_X16)
 
-/* { dg-final { scan-assembler-not {vzext\.vf2\s+v0,v1} } } */
-/* { dg-final { scan-assembler-not {vzext\.vf2\s+v2,v3} } } */
+/* { dg-final { scan-assembler-not {vzext\.vf2\s+v0,v1([^0-9]|$)} } } */
+/* { dg-final { scan-assembler-not {vzext\.vf2\s+v2,v3([^0-9]|$)} } } */
 /* { dg-final { scan-assembler-not {vzext\.vf2\s+v4,v5} } } */
 /* { dg-final { scan-assembler-not {vzext\.vf2\s+v6,v7} } } */
 /* { dg-final { scan-assembler-not {vzext\.vf2\s+v8,v9} } } */
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u16-mf4.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u16-mf4.c
index 245fc3c85e4..b3cfcc2e523 100644
--- 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u16-mf4.c
+++ 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u16-mf4.c
@@ -13,8 +13,8 @@ DEF_GROUP_OVERLAP_UNARY_0(
   vzext_vf,
   LOOP_UNARY_BODY_X16)
 
-/* { dg-final { scan-assembler-not {vzext\.vf2\s+v0,v1} } } */
-/* { dg-final { scan-assembler-not {vzext\.vf2\s+v2,v3} } } */
+/* { dg-final { scan-assembler-not {vzext\.vf2\s+v0,v1([^0-9]|$)} } } */
+/* { dg-final { scan-assembler-not {vzext\.vf2\s+v2,v3([^0-9]|$)} } } */
 /* { dg-final { scan-assembler-not {vzext\.vf2\s+v4,v5} } } */
 /* { dg-final { scan-assembler-not {vzext\.vf2\s+v6,v7} } } */
 /* { dg-final { scan-assembler-not {vzext\.vf2\s+v8,v9} } } */
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u32-m1.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u32-m1.c
index db3143e35fc..c4d2ca535c1 100644
--- 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u32-m1.c
+++ 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u32-m1.c
@@ -13,5 +13,5 @@ DEF_GROUP_OVERLAP_UNARY_0(
   vzext_vf,
   LOOP_UNARY_BODY_X16)
 
-/* { dg-final { scan-assembler-times {vzext\.vf2\s+v0,v1} 1 } } */
-/* { dg-final { scan-assembler-times {vzext\.vf2\s+v2,v3} 1 } } */
+/* { dg-final { scan-assembler-times {vzext\.vf2\s+v0,v1([^0-9]|$)} 1 } } */
+/* { dg-final { scan-assembler-times {vzext\.vf2\s+v2,v3([^0-9]|$)} 1 } } */
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u32-mf2.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u32-mf2.c
index e467ee3264f..7b963c748d2 100644
--- 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u32-mf2.c
+++ 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u32-mf2.c
@@ -13,8 +13,8 @@ DEF_GROUP_OVERLAP_UNARY_0(
   vzext_vf,
   LOOP_UNARY_BODY_X16)
 
-/* { dg-final { scan-assembler-not {vzext\.vf2\s+v0,v1} } } */
-/* { dg-final { scan-assembler-not {vzext\.vf2\s+v2,v3} } } */
+/* { dg-final { scan-assembler-not {vzext\.vf2\s+v0,v1([^0-9]|$)} } } */
+/* { dg-final { scan-assembler-not {vzext\.vf2\s+v2,v3([^0-9]|$)} } } */
 /* { dg-final { scan-assembler-not {vzext\.vf2\s+v4,v5} } } */
 /* { dg-final { scan-assembler-not {vzext\.vf2\s+v6,v7} } } */
 /* { dg-final { scan-assembler-not {vzext\.vf2\s+v8,v9} } } */
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u8-m1.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u8-m1.c
index b72b9e2ffe7..7a63bdf898f 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u8-m1.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u8-m1.c
@@ -13,5 +13,5 @@ DEF_GROUP_OVERLAP_UNARY_0(
   vzext_vf,
   LOOP_UNARY_BODY_X16)
 
-/* { dg-final { scan-assembler-times {vzext\.vf2\s+v0,v1} 1 } } */
-/* { dg-final { scan-assembler-times {vzext\.vf2\s+v2,v3} 1 } } */
+/* { dg-final { scan-assembler-times {vzext\.vf2\s+v0,v1([^0-9]|$)} 1 } } */
+/* { dg-final { scan-assembler-times {vzext\.vf2\s+v2,v3([^0-9]|$)} 1 } } */
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u8-m2.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u8-m2.c
index 767caebcf94..c04c88bc9fd 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u8-m2.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u8-m2.c
@@ -13,5 +13,5 @@ DEF_GROUP_OVERLAP_UNARY_0(
   vzext_vf,
   LOOP_UNARY_BODY_X8)
 
-/* { dg-final { scan-assembler-times {vzext\.vf2\s+v0,v2} 1 } } */
+/* { dg-final { scan-assembler-times {vzext\.vf2\s+v0,v2([^0-9]|$)} 1 } } */
 /* { dg-final { scan-assembler-times {vzext\.vf2\s+v4,v6} 1 } } */
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u8-mf2.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u8-mf2.c
index 4a61f2c433a..0465b31f15e 100644
--- 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u8-mf2.c
+++ 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u8-mf2.c
@@ -13,8 +13,8 @@ DEF_GROUP_OVERLAP_UNARY_0(
   vzext_vf,
   LOOP_UNARY_BODY_X16)
 
-/* { dg-final { scan-assembler-not {vzext\.vf2\s+v0,v1} } } */
-/* { dg-final { scan-assembler-not {vzext\.vf2\s+v2,v3} } } */
+/* { dg-final { scan-assembler-not {vzext\.vf2\s+v0,v1([^0-9]|$)} } } */
+/* { dg-final { scan-assembler-not {vzext\.vf2\s+v2,v3([^0-9]|$)} } } */
 /* { dg-final { scan-assembler-not {vzext\.vf2\s+v4,v5} } } */
 /* { dg-final { scan-assembler-not {vzext\.vf2\s+v6,v7} } } */
 /* { dg-final { scan-assembler-not {vzext\.vf2\s+v8,v9} } } */
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u8-mf4.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u8-mf4.c
index 2f75f3f906a..a8a1dc95899 100644
--- 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u8-mf4.c
+++ 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u8-mf4.c
@@ -13,8 +13,8 @@ DEF_GROUP_OVERLAP_UNARY_0(
   vzext_vf,
   LOOP_UNARY_BODY_X16)
 
-/* { dg-final { scan-assembler-not {vzext\.vf2\s+v0,v1} } } */
-/* { dg-final { scan-assembler-not {vzext\.vf2\s+v2,v3} } } */
+/* { dg-final { scan-assembler-not {vzext\.vf2\s+v0,v1([^0-9]|$)} } } */
+/* { dg-final { scan-assembler-not {vzext\.vf2\s+v2,v3([^0-9]|$)} } } */
 /* { dg-final { scan-assembler-not {vzext\.vf2\s+v4,v5} } } */
 /* { dg-final { scan-assembler-not {vzext\.vf2\s+v6,v7} } } */
 /* { dg-final { scan-assembler-not {vzext\.vf2\s+v8,v9} } } */
diff --git 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u8-mf8.c 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u8-mf8.c
index b248e14a641..819942b74da 100644
--- 
a/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u8-mf8.c
+++ 
b/gcc/testsuite/gcc.target/riscv/rvv/autovec/group_overlap/vzext_vf2-u8-mf8.c
@@ -13,8 +13,8 @@ DEF_GROUP_OVERLAP_UNARY_0(
   vzext_vf,
   LOOP_UNARY_BODY_X16)
 
-/* { dg-final { scan-assembler-not {vzext\.vf2\s+v0,v1} } } */
-/* { dg-final { scan-assembler-not {vzext\.vf2\s+v2,v3} } } */
+/* { dg-final { scan-assembler-not {vzext\.vf2\s+v0,v1([^0-9]|$)} } } */
+/* { dg-final { scan-assembler-not {vzext\.vf2\s+v2,v3([^0-9]|$)} } } */
 /* { dg-final { scan-assembler-not {vzext\.vf2\s+v4,v5} } } */
 /* { dg-final { scan-assembler-not {vzext\.vf2\s+v6,v7} } } */
 /* { dg-final { scan-assembler-not {vzext\.vf2\s+v8,v9} } } */
-- 
2.43.0

Reply via email to