2 files changed, 111 insertions, 110 deletions

diff --git a/gcc/config/riscv/riscv-vector-builtins-shapes.cc b/gcc/config/riscv/riscv-vector-builtins-shapes.cc
index 24fc1c0..bb2ee87 100644
--- a/gcc/config/riscv/riscv-vector-builtins-shapes.cc
+++ b/gcc/config/riscv/riscv-vector-builtins-shapes.cc
@@ -93,6 +93,7 @@ struct vsetvl_def : public build_base
     /* vsetvl* instruction doesn't have C++ overloaded functions.  */
     if (overloaded_p)
       return nullptr;
+    b.append_name ("__riscv_");
     b.append_name (instance.base_name);
     b.append_name (type_suffixes[instance.type.index].vsetvl);
     return b.finish_name ();
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vsetvl-1.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vsetvl-1.c
index 7921f12..dbf2c1b 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/base/vsetvl-1.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vsetvl-1.c
@@ -6,657 +6,657 @@
 
 size_t test_vsetvl_e8mf8_imm0()
 {
-  size_t vl = vsetvl_e8mf8(0);
+  size_t vl = __riscv_vsetvl_e8mf8(0);
   return vl;
 }
 
 size_t test_vsetvl_e8mf8_imm31()
 {
-  size_t vl = vsetvl_e8mf8(31);
+  size_t vl = __riscv_vsetvl_e8mf8(31);
   return vl;
 }
 
 size_t test_vsetvl_e8mf8_imm32()
 {
-  size_t vl = vsetvl_e8mf8(32);
+  size_t vl = __riscv_vsetvl_e8mf8(32);
   return vl;
 }
 
 size_t test_vsetvl_e8mf8(size_t avl)
 {
-  size_t vl = vsetvl_e8mf8(avl);
+  size_t vl = __riscv_vsetvl_e8mf8(avl);
   return vl;
 }
 
 size_t test_vsetvlmax_e8mf8()
 {
-  size_t vl = vsetvlmax_e8mf8();
+  size_t vl = __riscv_vsetvlmax_e8mf8();
   return vl;
 }
 
 size_t test_vsetvl_e8mf4_imm0()
 {
-  size_t vl = vsetvl_e8mf4(0);
+  size_t vl = __riscv_vsetvl_e8mf4(0);
   return vl;
 }
 
 size_t test_vsetvl_e8mf4_imm31()
 {
-  size_t vl = vsetvl_e8mf4(31);
+  size_t vl = __riscv_vsetvl_e8mf4(31);
   return vl;
 }
 
 size_t test_vsetvl_e8mf4_imm32()
 {
-  size_t vl = vsetvl_e8mf4(32);
+  size_t vl = __riscv_vsetvl_e8mf4(32);
   return vl;
 }
 
 size_t test_vsetvl_e8mf4(size_t avl)
 {
-  size_t vl = vsetvl_e8mf4(avl);
+  size_t vl = __riscv_vsetvl_e8mf4(avl);
   return vl;
 }
 
 size_t test_vsetvlmax_e8mf4()
 {
-  size_t vl = vsetvlmax_e8mf4();
+  size_t vl = __riscv_vsetvlmax_e8mf4();
   return vl;
 }
 
 size_t test_vsetvl_e8mf2_imm0()
 {
-  size_t vl = vsetvl_e8mf2(0);
+  size_t vl = __riscv_vsetvl_e8mf2(0);
   return vl;
 }
 
 size_t test_vsetvl_e8mf2_imm31()
 {
-  size_t vl = vsetvl_e8mf2(31);
+  size_t vl = __riscv_vsetvl_e8mf2(31);
   return vl;
 }
 
 size_t test_vsetvl_e8mf2_imm32()
 {
-  size_t vl = vsetvl_e8mf2(32);
+  size_t vl = __riscv_vsetvl_e8mf2(32);
   return vl;
 }
 
 size_t test_vsetvl_e8mf2(size_t avl)
 {
-  size_t vl = vsetvl_e8mf2(avl);
+  size_t vl = __riscv_vsetvl_e8mf2(avl);
   return vl;
 }
 
 size_t test_vsetvlmax_e8mf2()
 {
-  size_t vl = vsetvlmax_e8mf2();
+  size_t vl = __riscv_vsetvlmax_e8mf2();
   return vl;
 }
 
 size_t test_vsetvl_e8m1_imm0()
 {
-  size_t vl = vsetvl_e8m1(0);
+  size_t vl = __riscv_vsetvl_e8m1(0);
   return vl;
 }
 
 size_t test_vsetvl_e8m1_imm31()
 {
-  size_t vl = vsetvl_e8m1(31);
+  size_t vl = __riscv_vsetvl_e8m1(31);
   return vl;
 }
 
 size_t test_vsetvl_e8m1_imm32()
 {
-  size_t vl = vsetvl_e8m1(32);
+  size_t vl = __riscv_vsetvl_e8m1(32);
   return vl;
 }
 
 size_t test_vsetvl_e8m1(size_t avl)
 {
-  size_t vl = vsetvl_e8m1(avl);
+  size_t vl = __riscv_vsetvl_e8m1(avl);
   return vl;
 }
 
 size_t test_vsetvlmax_e8m1()
 {
-  size_t vl = vsetvlmax_e8m1();
+  size_t vl = __riscv_vsetvlmax_e8m1();
   return vl;
 }
 
 size_t test_vsetvl_e8m2_imm0()
 {
-  size_t vl = vsetvl_e8m2(0);
+  size_t vl = __riscv_vsetvl_e8m2(0);
   return vl;
 }
 
 size_t test_vsetvl_e8m2_imm31()
 {
-  size_t vl = vsetvl_e8m2(31);
+  size_t vl = __riscv_vsetvl_e8m2(31);
   return vl;
 }
 
 size_t test_vsetvl_e8m2_imm32()
 {
-  size_t vl = vsetvl_e8m2(32);
+  size_t vl = __riscv_vsetvl_e8m2(32);
   return vl;
 }
 
 size_t test_vsetvl_e8m2(size_t avl)
 {
-  size_t vl = vsetvl_e8m2(avl);
+  size_t vl = __riscv_vsetvl_e8m2(avl);
   return vl;
 }
 
 size_t test_vsetvlmax_e8m2()
 {
-  size_t vl = vsetvlmax_e8m2();
+  size_t vl = __riscv_vsetvlmax_e8m2();
   return vl;
 }
 
 size_t test_vsetvl_e8m4_imm0()
 {
-  size_t vl = vsetvl_e8m4(0);
+  size_t vl = __riscv_vsetvl_e8m4(0);
   return vl;
 }
 
 size_t test_vsetvl_e8m4_imm31()
 {
-  size_t vl = vsetvl_e8m4(31);
+  size_t vl = __riscv_vsetvl_e8m4(31);
   return vl;
 }
 
 size_t test_vsetvl_e8m4_imm32()
 {
-  size_t vl = vsetvl_e8m4(32);
+  size_t vl = __riscv_vsetvl_e8m4(32);
   return vl;
 }
 size_t test_vsetvl_e8m4(size_t avl)
 {
-  size_t vl = vsetvl_e8m4(avl);
+  size_t vl = __riscv_vsetvl_e8m4(avl);
   return vl;
 }
 
 size_t test_vsetvlmax_e8m4()
 {
-  size_t vl = vsetvlmax_e8m4();
+  size_t vl = __riscv_vsetvlmax_e8m4();
   return vl;
 }
 
 size_t test_vsetvl_e8m8_imm0()
 {
-  size_t vl = vsetvl_e8m8(0);
+  size_t vl = __riscv_vsetvl_e8m8(0);
   return vl;
 }
 
 size_t test_vsetvl_e8m8_imm31()
 {
-  size_t vl = vsetvl_e8m8(31);
+  size_t vl = __riscv_vsetvl_e8m8(31);
   return vl;
 }
 
 size_t test_vsetvl_e8m8_imm32()
 {
-  size_t vl = vsetvl_e8m8(32);
+  size_t vl = __riscv_vsetvl_e8m8(32);
   return vl;
 }
 
 size_t test_vsetvl_e8m8(size_t avl)
 {
-  size_t vl = vsetvl_e8m8(avl);
+  size_t vl = __riscv_vsetvl_e8m8(avl);
   return vl;
 }
 
 size_t test_vsetvlmax_e8m8()
 {
-  size_t vl = vsetvlmax_e8m8();
+  size_t vl = __riscv_vsetvlmax_e8m8();
   return vl;
 }
 
 size_t test_vsetvl_e16mf4_imm0()
 {
-  size_t vl = vsetvl_e16mf4(0);
+  size_t vl = __riscv_vsetvl_e16mf4(0);
   return vl;
 }
 
 size_t test_vsetvl_e16mf4_imm31()
 {
-  size_t vl = vsetvl_e16mf4(31);
+  size_t vl = __riscv_vsetvl_e16mf4(31);
   return vl;
 }
 
 size_t test_vsetvl_e16mf4_imm32()
 {
-  size_t vl = vsetvl_e16mf4(32);
+  size_t vl = __riscv_vsetvl_e16mf4(32);
   return vl;
 }
 
 size_t test_vsetvl_e16mf4(size_t avl)
 {
-  size_t vl = vsetvl_e16mf4(avl);
+  size_t vl = __riscv_vsetvl_e16mf4(avl);
   return vl;
 }
 
 size_t test_vsetvlmax_e16mf4()
 {
-  size_t vl = vsetvlmax_e16mf4();
+  size_t vl = __riscv_vsetvlmax_e16mf4();
   return vl;
 }
 
 size_t test_vsetvl_e16mf2_imm0()
 {
-  size_t vl = vsetvl_e16mf2(0);
+  size_t vl = __riscv_vsetvl_e16mf2(0);
   return vl;
 }
 
 size_t test_vsetvl_e16mf2_imm31()
 {
-  size_t vl = vsetvl_e16mf2(31);
+  size_t vl = __riscv_vsetvl_e16mf2(31);
   return vl;
 }
 
 size_t test_vsetvl_e16mf2_imm32()
 {
-  size_t vl = vsetvl_e16mf2(32);
+  size_t vl = __riscv_vsetvl_e16mf2(32);
   return vl;
 }
 
 size_t test_vsetvl_e16mf2(size_t avl)
 {
-  size_t vl = vsetvl_e16mf2(avl);
+  size_t vl = __riscv_vsetvl_e16mf2(avl);
   return vl;
 }
 
 size_t test_vsetvlmax_e16mf2()
 {
-  size_t vl = vsetvlmax_e16mf2();
+  size_t vl = __riscv_vsetvlmax_e16mf2();
   return vl;
 }
 
 size_t test_vsetvl_e16m1_imm0()
 {
-  size_t vl = vsetvl_e16m1(0);
+  size_t vl = __riscv_vsetvl_e16m1(0);
   return vl;
 }
 
 size_t test_vsetvl_e16m1_imm31()
 {
-  size_t vl = vsetvl_e16m1(31);
+  size_t vl = __riscv_vsetvl_e16m1(31);
   return vl;
 }
 
 size_t test_vsetvl_e16m1_imm32()
 {
-  size_t vl = vsetvl_e16m1(32);
+  size_t vl = __riscv_vsetvl_e16m1(32);
   return vl;
 }
 
 size_t test_vsetvl_e16m1(size_t avl)
 {
-  size_t vl = vsetvl_e16m1(avl);
+  size_t vl = __riscv_vsetvl_e16m1(avl);
   return vl;
 }
 
 size_t test_vsetvlmax_e16m1()
 {
-  size_t vl = vsetvlmax_e16m1();
+  size_t vl = __riscv_vsetvlmax_e16m1();
   return vl;
 }
 
 size_t test_vsetvl_e16m2_imm0()
 {
-  size_t vl = vsetvl_e16m2(0);
+  size_t vl = __riscv_vsetvl_e16m2(0);
   return vl;
 }
 
 size_t test_vsetvl_e16m2_imm31()
 {
-  size_t vl = vsetvl_e16m2(31);
+  size_t vl = __riscv_vsetvl_e16m2(31);
   return vl;
 }
 
 size_t test_vsetvl_e16m2_imm32()
 {
-  size_t vl = vsetvl_e16m2(32);
+  size_t vl = __riscv_vsetvl_e16m2(32);
   return vl;
 }
 
 size_t test_vsetvl_e16m2(size_t avl)
 {
-  size_t vl = vsetvl_e16m2(avl);
+  size_t vl = __riscv_vsetvl_e16m2(avl);
   return vl;
 }
 
 size_t test_vsetvlmax_e16m2()
 {
-  size_t vl = vsetvlmax_e16m2();
+  size_t vl = __riscv_vsetvlmax_e16m2();
   return vl;
 }
 
 size_t test_vsetvl_e16m4_imm0()
 {
-  size_t vl = vsetvl_e16m4(0);
+  size_t vl = __riscv_vsetvl_e16m4(0);
   return vl;
 }
 
 size_t test_vsetvl_e16m4_imm31()
 {
-  size_t vl = vsetvl_e16m4(31);
+  size_t vl = __riscv_vsetvl_e16m4(31);
   return vl;
 }
 
 size_t test_vsetvl_e16m4_imm32()
 {
-  size_t vl = vsetvl_e16m4(32);
+  size_t vl = __riscv_vsetvl_e16m4(32);
   return vl;
 }
 
 size_t test_vsetvl_e16m4(size_t avl)
 {
-  size_t vl = vsetvl_e16m4(avl);
+  size_t vl = __riscv_vsetvl_e16m4(avl);
   return vl;
 }
 
 size_t test_vsetvlmax_e16m4()
 {
-  size_t vl = vsetvlmax_e16m4();
+  size_t vl = __riscv_vsetvlmax_e16m4();
   return vl;
 }
 
 size_t test_vsetvl_e16m8_imm0()
 {
-  size_t vl = vsetvl_e16m8(0);
+  size_t vl = __riscv_vsetvl_e16m8(0);
   return vl;
 }
 
 size_t test_vsetvl_e16m8_imm31()
 {
-  size_t vl = vsetvl_e16m8(31);
+  size_t vl = __riscv_vsetvl_e16m8(31);
   return vl;
 }
 
 size_t test_vsetvl_e16m8_imm32()
 {
-  size_t vl = vsetvl_e16m8(32);
+  size_t vl = __riscv_vsetvl_e16m8(32);
   return vl;
 }
 
 size_t test_vsetvl_e16m8(size_t avl)
 {
-  size_t vl = vsetvl_e16m8(avl);
+  size_t vl = __riscv_vsetvl_e16m8(avl);
   return vl;
 }
 
 size_t test_vsetvlmax_e16m8()
 {
-  size_t vl = vsetvlmax_e16m8();
+  size_t vl = __riscv_vsetvlmax_e16m8();
   return vl;
 }
 
 size_t test_vsetvl_e32mf2_imm0()
 {
-  size_t vl = vsetvl_e32mf2(0);
+  size_t vl = __riscv_vsetvl_e32mf2(0);
   return vl;
 }
 
 size_t test_vsetvl_e32mf2_imm31()
 {
-  size_t vl = vsetvl_e32mf2(31);
+  size_t vl = __riscv_vsetvl_e32mf2(31);
   return vl;
 }
 
 size_t test_vsetvl_e32mf2_imm32()
 {
-  size_t vl = vsetvl_e32mf2(32);
+  size_t vl = __riscv_vsetvl_e32mf2(32);
   return vl;
 }
 
 size_t test_vsetvl_e32mf2(size_t avl)
 {
-  size_t vl = vsetvl_e32mf2(avl);
+  size_t vl = __riscv_vsetvl_e32mf2(avl);
   return vl;
 }
 
 size_t test_vsetvlmax_e32mf2()
 {
-  size_t vl = vsetvlmax_e32mf2();
+  size_t vl = __riscv_vsetvlmax_e32mf2();
   return vl;
 }
 
 size_t test_vsetvl_e32m1_imm0()
 {
-  size_t vl = vsetvl_e32m1(0);
+  size_t vl = __riscv_vsetvl_e32m1(0);
   return vl;
 }
 
 size_t test_vsetvl_e32m1_imm31()
 {
-  size_t vl = vsetvl_e32m1(31);
+  size_t vl = __riscv_vsetvl_e32m1(31);
   return vl;
 }
 
 size_t test_vsetvl_e32m1_imm32()
 {
-  size_t vl = vsetvl_e32m1(32);
+  size_t vl = __riscv_vsetvl_e32m1(32);
   return vl;
 }
 
 size_t test_vsetvl_e32m1(size_t avl)
 {
-  size_t vl = vsetvl_e32m1(avl);
+  size_t vl = __riscv_vsetvl_e32m1(avl);
   return vl;
 }
 
 size_t test_vsetvlmax_e32m1()
 {
-  size_t vl = vsetvlmax_e32m1();
+  size_t vl = __riscv_vsetvlmax_e32m1();
   return vl;
 }
 
 size_t test_vsetvl_e32m2_imm0()
 {
-  size_t vl = vsetvl_e32m2(0);
+  size_t vl = __riscv_vsetvl_e32m2(0);
   return vl;
 }
 
 size_t test_vsetvl_e32m2_imm31()
 {
-  size_t vl = vsetvl_e32m2(31);
+  size_t vl = __riscv_vsetvl_e32m2(31);
   return vl;
 }
 
 size_t test_vsetvl_e32m2_imm32()
 {
-  size_t vl = vsetvl_e32m2(32);
+  size_t vl = __riscv_vsetvl_e32m2(32);
   return vl;
 }
 
 size_t test_vsetvl_e32m2(size_t avl)
 {
-  size_t vl = vsetvl_e32m2(avl);
+  size_t vl = __riscv_vsetvl_e32m2(avl);
   return vl;
 }
 
 size_t test_vsetvlmax_e32m2()
 {
-  size_t vl = vsetvlmax_e32m2();
+  size_t vl = __riscv_vsetvlmax_e32m2();
   return vl;
 }
 
 size_t test_vsetvl_e32m4_imm0()
 {
-  size_t vl = vsetvl_e32m4(0);
+  size_t vl = __riscv_vsetvl_e32m4(0);
   return vl;
 }
 
 size_t test_vsetvl_e32m4_imm31()
 {
-  size_t vl = vsetvl_e32m4(31);
+  size_t vl = __riscv_vsetvl_e32m4(31);
   return vl;
 }
 
 size_t test_vsetvl_e32m4_imm32()
 {
-  size_t vl = vsetvl_e32m4(32);
+  size_t vl = __riscv_vsetvl_e32m4(32);
   return vl;
 }
 
 size_t test_vsetvl_e32m4(size_t avl)
 {
-  size_t vl = vsetvl_e32m4(avl);
+  size_t vl = __riscv_vsetvl_e32m4(avl);
   return vl;
 }
 
 size_t test_vsetvlmax_e32m4()
 {
-  size_t vl = vsetvlmax_e32m4();
+  size_t vl = __riscv_vsetvlmax_e32m4();
   return vl;
 }
 
 size_t test_vsetvl_e32m8_imm0()
 {
-  size_t vl = vsetvl_e32m8(0);
+  size_t vl = __riscv_vsetvl_e32m8(0);
   return vl;
 }
 
 size_t test_vsetvl_e32m8_imm31()
 {
-  size_t vl = vsetvl_e32m8(31);
+  size_t vl = __riscv_vsetvl_e32m8(31);
   return vl;
 }
 
 size_t test_vsetvl_e32m8_imm32()
 {
-  size_t vl = vsetvl_e32m8(32);
+  size_t vl = __riscv_vsetvl_e32m8(32);
   return vl;
 }
 size_t test_vsetvl_e32m8(size_t avl)
 {
-  size_t vl = vsetvl_e32m8(avl);
+  size_t vl = __riscv_vsetvl_e32m8(avl);
   return vl;
 }
 
 size_t test_vsetvlmax_e32m8()
 {
-  size_t vl = vsetvlmax_e32m8();
+  size_t vl = __riscv_vsetvlmax_e32m8();
   return vl;
 }
 
 size_t test_vsetvl_e64m1_imm0()
 {
-  size_t vl = vsetvl_e64m1(0);
+  size_t vl = __riscv_vsetvl_e64m1(0);
   return vl;
 }
 
 size_t test_vsetvl_e64m1_imm31()
 {
-  size_t vl = vsetvl_e64m1(31);
+  size_t vl = __riscv_vsetvl_e64m1(31);
   return vl;
 }
 
 size_t test_vsetvl_e64m1_imm32()
 {
-  size_t vl = vsetvl_e64m1(32);
+  size_t vl = __riscv_vsetvl_e64m1(32);
   return vl;
 }
 
 size_t test_vsetvl_e64m1(size_t avl)
 {
-  size_t vl = vsetvl_e64m1(avl);
+  size_t vl = __riscv_vsetvl_e64m1(avl);
   return vl;
 }
 
 size_t test_vsetvlmax_e64m1()
 {
-  size_t vl = vsetvlmax_e64m1();
+  size_t vl = __riscv_vsetvlmax_e64m1();
   return vl;
 }
 
 size_t test_vsetvl_e64m2_imm0()
 {
-  size_t vl = vsetvl_e64m2(0);
+  size_t vl = __riscv_vsetvl_e64m2(0);
   return vl;
 }
 
 size_t test_vsetvl_e64m2_imm31()
 {
-  size_t vl = vsetvl_e64m2(31);
+  size_t vl = __riscv_vsetvl_e64m2(31);
   return vl;
 }
 
 size_t test_vsetvl_e64m2_imm32()
 {
-  size_t vl = vsetvl_e64m2(32);
+  size_t vl = __riscv_vsetvl_e64m2(32);
   return vl;
 }
 size_t test_vsetvl_e64m2(size_t avl)
 {
-  size_t vl = vsetvl_e64m2(avl);
+  size_t vl = __riscv_vsetvl_e64m2(avl);
   return vl;
 }
 
 size_t test_vsetvlmax_e64m2()
 {
-  size_t vl = vsetvlmax_e64m2();
+  size_t vl = __riscv_vsetvlmax_e64m2();
   return vl;
 }
 
 size_t test_vsetvl_e64m4_imm0()
 {
-  size_t vl = vsetvl_e64m4(0);
+  size_t vl = __riscv_vsetvl_e64m4(0);
   return vl;
 }
 
 size_t test_vsetvl_e64m4_imm31()
 {
-  size_t vl = vsetvl_e64m4(31);
+  size_t vl = __riscv_vsetvl_e64m4(31);
   return vl;
 }
 
 size_t test_vsetvl_e64m4_imm32()
 {
-  size_t vl = vsetvl_e64m4(32);
+  size_t vl = __riscv_vsetvl_e64m4(32);
   return vl;
 }
 
 size_t test_vsetvl_e64m4(size_t avl)
 {
-  size_t vl = vsetvl_e64m4(avl);
+  size_t vl = __riscv_vsetvl_e64m4(avl);
   return vl;
 }
 
 size_t test_vsetvlmax_e64m4()
 {
-  size_t vl = vsetvlmax_e64m4();
+  size_t vl = __riscv_vsetvlmax_e64m4();
   return vl;
 }
 
 size_t test_vsetvl_e64m8_imm0()
 {
-  size_t vl = vsetvl_e64m8(0);
+  size_t vl = __riscv_vsetvl_e64m8(0);
   return vl;
 }
 
 size_t test_vsetvl_e64m8_imm31()
 {
-  size_t vl = vsetvl_e64m8(31);
+  size_t vl = __riscv_vsetvl_e64m8(31);
   return vl;
 }
 
 size_t test_vsetvl_e64m8_imm32()
 {
-  size_t vl = vsetvl_e64m8(32);
+  size_t vl = __riscv_vsetvl_e64m8(32);
   return vl;
 }
 size_t test_vsetvl_e64m8(size_t avl)
 {
-  size_t vl = vsetvl_e64m8(avl);
+  size_t vl = __riscv_vsetvl_e64m8(avl);
   return vl;
 }
 
 size_t test_vsetvlmax_e64m8()
 {
-  size_t vl = vsetvlmax_e64m8();
+  size_t vl = __riscv_vsetvlmax_e64m8();
   return vl;
 }