From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=tDBu=4S=rivai.ai=juzhe.zhong@sourceware.org>
Received: from smtpbgjp3.qq.com (smtpbgjp3.qq.com [54.92.39.34])
	by sourceware.org (Postfix) with ESMTPS id E92593858421
	for <gcc-patches@gcc.gnu.org>; Tue, 20 Dec 2022 14:58:53 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E92593858421
Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=rivai.ai
Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=rivai.ai
X-QQ-mid: bizesmtp78t1671548329tu5q6fu1
Received: from rios-cad5.localdomain ( [58.60.1.11])
	by bizesmtp.qq.com (ESMTP) with 
	id ; Tue, 20 Dec 2022 22:58:48 +0800 (CST)
X-QQ-SSF: 01400000002000E0L000B00A0000000
X-QQ-FEAT: zT6n3Y95oi1fMpjhZWs2CMHOADMxBDifjSrzqMqepGe4iA+dENsolyAS878Si
	QerqaNkWiEj0Qmieq6TTtLaeAxiN90QhbZhWSjMpkeS/s69DZ7X8jX3hKhTMWhK8yjincWI
	0+F8PvGLoctvYoYhxvQ0bOTv8uRGorD5vPjnfwNevR16ui0P2yRuolWTStNXivShLEW8vql
	AuZG46OjRXD3Xg8FXjikYNyWaDNDo/mUEfor6+WEvp29KKR7FezJI2ZMRYT4Aa4xICwz5OW
	2OJhLggFe3F4IC0WM0sETrz03+3Fm0Nrd1pSG3Bsb/PzNUBI9FjENXnJdr0GwBjaVS4run1
	7UrgwXyqQqyhfxlBn2rjIa1xJRgh0Qe+Y1CLzzIl3VSE5l/Rw1Lr4I29nMgTCmmTewDkOoJ
X-QQ-GoodBg: 2
From: juzhe.zhong@rivai.ai
To: gcc-patches@gcc.gnu.org
Cc: kito.cheng@gmail.com,
	palmer@dabbelt.com,
	Ju-Zhe Zhong <juzhe.zhong@rivai.ai>
Subject: [PATCH] RISC-V: Update vsetvl/vsetvlmax intrinsics to the latest api name.
Date: Tue, 20 Dec 2022 22:58:47 +0800
Message-Id: <20221220145847.234303-1-juzhe.zhong@rivai.ai>
X-Mailer: git-send-email 2.36.3
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-QQ-SENDSIZE: 520
Feedback-ID: bizesmtp:rivai.ai:qybglogicsvr:qybglogicsvr7
X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_STATUS,KAM_SHORT,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org
List-Id: <gcc-patches.gcc.gnu.org>

From: Ju-Zhe Zhong <juzhe.zhong@rivai.ai>

gcc/ChangeLog:

        * config/riscv/riscv-vector-builtins-shapes.cc (struct vsetvl_def): Add "__riscv_" prefix.

gcc/testsuite/ChangeLog:

        * gcc.target/riscv/rvv/base/vsetvl-1.c: Add "__riscv_" prefix.

---
 .../riscv/riscv-vector-builtins-shapes.cc     |   1 +
 .../gcc.target/riscv/rvv/base/vsetvl-1.c      | 220 +++++++++---------
 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 24fc1c02341..bb2ee8767a0 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 661f2c9170e..72f308433ef 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;
 }
 
-- 
2.36.3