From 68970f9c486e500c6552dd13f00766a1801bfa0a Mon Sep 17 00:00:00 2001
From: Craig Topper <craig.topper@sifive.com>
Date: Mon, 10 Jun 2024 14:16:08 -0700
Subject: [PATCH] Revert "[Auto-gen] Update tests under ../auto-generated.
 (make git-commit-autogen-test)"

This reverts commit 26057454d3e25b1ae82b07bcbc53deda0790a1c4.
---
 auto-generated/api-testing/vcpop.c            | 28 +++++++++----------
 auto-generated/api-testing/vfirst.c           | 28 +++++++++----------
 auto-generated/gnu-api-tests/vcpop.c          | 28 +++++++++----------
 auto-generated/gnu-api-tests/vfirst.c         | 28 +++++++++----------
 auto-generated/gnu-overloaded-tests/vcpop.c   | 28 +++++++++----------
 auto-generated/gnu-overloaded-tests/vfirst.c  | 28 +++++++++----------
 auto-generated/llvm-api-tests/vcpop.c         | 28 +++++++++----------
 auto-generated/llvm-api-tests/vfirst.c        | 28 +++++++++----------
 auto-generated/llvm-overloaded-tests/vcpop.c  | 28 +++++++++----------
 auto-generated/llvm-overloaded-tests/vfirst.c | 28 +++++++++----------
 auto-generated/overloaded-api-testing/vcpop.c | 28 +++++++++----------
 .../overloaded-api-testing/vfirst.c           | 28 +++++++++----------
 12 files changed, 168 insertions(+), 168 deletions(-)

diff --git a/auto-generated/api-testing/vcpop.c b/auto-generated/api-testing/vcpop.c
index 06e64c836..11f2e55ac 100644
--- a/auto-generated/api-testing/vcpop.c
+++ b/auto-generated/api-testing/vcpop.c
@@ -1,58 +1,58 @@
 #include <riscv_vector.h>
 #include <stdint.h>
 
-unsigned int test_vcpop_m_b1(vbool1_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b1(vbool1_t vs2, size_t vl) {
   return __riscv_vcpop_m_b1(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b2(vbool2_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b2(vbool2_t vs2, size_t vl) {
   return __riscv_vcpop_m_b2(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b4(vbool4_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b4(vbool4_t vs2, size_t vl) {
   return __riscv_vcpop_m_b4(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b8(vbool8_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b8(vbool8_t vs2, size_t vl) {
   return __riscv_vcpop_m_b8(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b16(vbool16_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b16(vbool16_t vs2, size_t vl) {
   return __riscv_vcpop_m_b16(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b32(vbool32_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b32(vbool32_t vs2, size_t vl) {
   return __riscv_vcpop_m_b32(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b64(vbool64_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b64(vbool64_t vs2, size_t vl) {
   return __riscv_vcpop_m_b64(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b1_m(vbool1_t vm, vbool1_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b1_m(vbool1_t vm, vbool1_t vs2, size_t vl) {
   return __riscv_vcpop_m_b1_m(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b2_m(vbool2_t vm, vbool2_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b2_m(vbool2_t vm, vbool2_t vs2, size_t vl) {
   return __riscv_vcpop_m_b2_m(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b4_m(vbool4_t vm, vbool4_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b4_m(vbool4_t vm, vbool4_t vs2, size_t vl) {
   return __riscv_vcpop_m_b4_m(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b8_m(vbool8_t vm, vbool8_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b8_m(vbool8_t vm, vbool8_t vs2, size_t vl) {
   return __riscv_vcpop_m_b8_m(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b16_m(vbool16_t vm, vbool16_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b16_m(vbool16_t vm, vbool16_t vs2, size_t vl) {
   return __riscv_vcpop_m_b16_m(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b32_m(vbool32_t vm, vbool32_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b32_m(vbool32_t vm, vbool32_t vs2, size_t vl) {
   return __riscv_vcpop_m_b32_m(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b64_m(vbool64_t vm, vbool64_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b64_m(vbool64_t vm, vbool64_t vs2, size_t vl) {
   return __riscv_vcpop_m_b64_m(vm, vs2, vl);
 }
diff --git a/auto-generated/api-testing/vfirst.c b/auto-generated/api-testing/vfirst.c
index 508967af6..96e72970f 100644
--- a/auto-generated/api-testing/vfirst.c
+++ b/auto-generated/api-testing/vfirst.c
@@ -1,58 +1,58 @@
 #include <riscv_vector.h>
 #include <stdint.h>
 
-int test_vfirst_m_b1(vbool1_t vs2, size_t vl) {
+long test_vfirst_m_b1(vbool1_t vs2, size_t vl) {
   return __riscv_vfirst_m_b1(vs2, vl);
 }
 
-int test_vfirst_m_b2(vbool2_t vs2, size_t vl) {
+long test_vfirst_m_b2(vbool2_t vs2, size_t vl) {
   return __riscv_vfirst_m_b2(vs2, vl);
 }
 
-int test_vfirst_m_b4(vbool4_t vs2, size_t vl) {
+long test_vfirst_m_b4(vbool4_t vs2, size_t vl) {
   return __riscv_vfirst_m_b4(vs2, vl);
 }
 
-int test_vfirst_m_b8(vbool8_t vs2, size_t vl) {
+long test_vfirst_m_b8(vbool8_t vs2, size_t vl) {
   return __riscv_vfirst_m_b8(vs2, vl);
 }
 
-int test_vfirst_m_b16(vbool16_t vs2, size_t vl) {
+long test_vfirst_m_b16(vbool16_t vs2, size_t vl) {
   return __riscv_vfirst_m_b16(vs2, vl);
 }
 
-int test_vfirst_m_b32(vbool32_t vs2, size_t vl) {
+long test_vfirst_m_b32(vbool32_t vs2, size_t vl) {
   return __riscv_vfirst_m_b32(vs2, vl);
 }
 
-int test_vfirst_m_b64(vbool64_t vs2, size_t vl) {
+long test_vfirst_m_b64(vbool64_t vs2, size_t vl) {
   return __riscv_vfirst_m_b64(vs2, vl);
 }
 
-int test_vfirst_m_b1_m(vbool1_t vm, vbool1_t vs2, size_t vl) {
+long test_vfirst_m_b1_m(vbool1_t vm, vbool1_t vs2, size_t vl) {
   return __riscv_vfirst_m_b1_m(vm, vs2, vl);
 }
 
-int test_vfirst_m_b2_m(vbool2_t vm, vbool2_t vs2, size_t vl) {
+long test_vfirst_m_b2_m(vbool2_t vm, vbool2_t vs2, size_t vl) {
   return __riscv_vfirst_m_b2_m(vm, vs2, vl);
 }
 
-int test_vfirst_m_b4_m(vbool4_t vm, vbool4_t vs2, size_t vl) {
+long test_vfirst_m_b4_m(vbool4_t vm, vbool4_t vs2, size_t vl) {
   return __riscv_vfirst_m_b4_m(vm, vs2, vl);
 }
 
-int test_vfirst_m_b8_m(vbool8_t vm, vbool8_t vs2, size_t vl) {
+long test_vfirst_m_b8_m(vbool8_t vm, vbool8_t vs2, size_t vl) {
   return __riscv_vfirst_m_b8_m(vm, vs2, vl);
 }
 
-int test_vfirst_m_b16_m(vbool16_t vm, vbool16_t vs2, size_t vl) {
+long test_vfirst_m_b16_m(vbool16_t vm, vbool16_t vs2, size_t vl) {
   return __riscv_vfirst_m_b16_m(vm, vs2, vl);
 }
 
-int test_vfirst_m_b32_m(vbool32_t vm, vbool32_t vs2, size_t vl) {
+long test_vfirst_m_b32_m(vbool32_t vm, vbool32_t vs2, size_t vl) {
   return __riscv_vfirst_m_b32_m(vm, vs2, vl);
 }
 
-int test_vfirst_m_b64_m(vbool64_t vm, vbool64_t vs2, size_t vl) {
+long test_vfirst_m_b64_m(vbool64_t vm, vbool64_t vs2, size_t vl) {
   return __riscv_vfirst_m_b64_m(vm, vs2, vl);
 }
diff --git a/auto-generated/gnu-api-tests/vcpop.c b/auto-generated/gnu-api-tests/vcpop.c
index 7ebc6140c..038d03754 100644
--- a/auto-generated/gnu-api-tests/vcpop.c
+++ b/auto-generated/gnu-api-tests/vcpop.c
@@ -3,59 +3,59 @@
 
 #include <riscv_vector.h>
 
-unsigned int test_vcpop_m_b1(vbool1_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b1(vbool1_t vs2, size_t vl) {
   return __riscv_vcpop_m_b1(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b2(vbool2_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b2(vbool2_t vs2, size_t vl) {
   return __riscv_vcpop_m_b2(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b4(vbool4_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b4(vbool4_t vs2, size_t vl) {
   return __riscv_vcpop_m_b4(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b8(vbool8_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b8(vbool8_t vs2, size_t vl) {
   return __riscv_vcpop_m_b8(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b16(vbool16_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b16(vbool16_t vs2, size_t vl) {
   return __riscv_vcpop_m_b16(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b32(vbool32_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b32(vbool32_t vs2, size_t vl) {
   return __riscv_vcpop_m_b32(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b64(vbool64_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b64(vbool64_t vs2, size_t vl) {
   return __riscv_vcpop_m_b64(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b1_m(vbool1_t vm, vbool1_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b1_m(vbool1_t vm, vbool1_t vs2, size_t vl) {
   return __riscv_vcpop_m_b1_m(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b2_m(vbool2_t vm, vbool2_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b2_m(vbool2_t vm, vbool2_t vs2, size_t vl) {
   return __riscv_vcpop_m_b2_m(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b4_m(vbool4_t vm, vbool4_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b4_m(vbool4_t vm, vbool4_t vs2, size_t vl) {
   return __riscv_vcpop_m_b4_m(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b8_m(vbool8_t vm, vbool8_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b8_m(vbool8_t vm, vbool8_t vs2, size_t vl) {
   return __riscv_vcpop_m_b8_m(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b16_m(vbool16_t vm, vbool16_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b16_m(vbool16_t vm, vbool16_t vs2, size_t vl) {
   return __riscv_vcpop_m_b16_m(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b32_m(vbool32_t vm, vbool32_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b32_m(vbool32_t vm, vbool32_t vs2, size_t vl) {
   return __riscv_vcpop_m_b32_m(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b64_m(vbool64_t vm, vbool64_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b64_m(vbool64_t vm, vbool64_t vs2, size_t vl) {
   return __riscv_vcpop_m_b64_m(vm, vs2, vl);
 }
 /* { dg-final { scan-assembler-times {vseti?vli\s+[a-z0-9]+,\s*[a-z0-9]+,\s*e[0-9]+,\s*mf?[1248],\s*t[au],\s*m[au]\s+vcpop\.[ivxfswum.]+\s+} 14 } } */
diff --git a/auto-generated/gnu-api-tests/vfirst.c b/auto-generated/gnu-api-tests/vfirst.c
index e2de33c9b..37a4a8f15 100644
--- a/auto-generated/gnu-api-tests/vfirst.c
+++ b/auto-generated/gnu-api-tests/vfirst.c
@@ -3,59 +3,59 @@
 
 #include <riscv_vector.h>
 
-int test_vfirst_m_b1(vbool1_t vs2, size_t vl) {
+long test_vfirst_m_b1(vbool1_t vs2, size_t vl) {
   return __riscv_vfirst_m_b1(vs2, vl);
 }
 
-int test_vfirst_m_b2(vbool2_t vs2, size_t vl) {
+long test_vfirst_m_b2(vbool2_t vs2, size_t vl) {
   return __riscv_vfirst_m_b2(vs2, vl);
 }
 
-int test_vfirst_m_b4(vbool4_t vs2, size_t vl) {
+long test_vfirst_m_b4(vbool4_t vs2, size_t vl) {
   return __riscv_vfirst_m_b4(vs2, vl);
 }
 
-int test_vfirst_m_b8(vbool8_t vs2, size_t vl) {
+long test_vfirst_m_b8(vbool8_t vs2, size_t vl) {
   return __riscv_vfirst_m_b8(vs2, vl);
 }
 
-int test_vfirst_m_b16(vbool16_t vs2, size_t vl) {
+long test_vfirst_m_b16(vbool16_t vs2, size_t vl) {
   return __riscv_vfirst_m_b16(vs2, vl);
 }
 
-int test_vfirst_m_b32(vbool32_t vs2, size_t vl) {
+long test_vfirst_m_b32(vbool32_t vs2, size_t vl) {
   return __riscv_vfirst_m_b32(vs2, vl);
 }
 
-int test_vfirst_m_b64(vbool64_t vs2, size_t vl) {
+long test_vfirst_m_b64(vbool64_t vs2, size_t vl) {
   return __riscv_vfirst_m_b64(vs2, vl);
 }
 
-int test_vfirst_m_b1_m(vbool1_t vm, vbool1_t vs2, size_t vl) {
+long test_vfirst_m_b1_m(vbool1_t vm, vbool1_t vs2, size_t vl) {
   return __riscv_vfirst_m_b1_m(vm, vs2, vl);
 }
 
-int test_vfirst_m_b2_m(vbool2_t vm, vbool2_t vs2, size_t vl) {
+long test_vfirst_m_b2_m(vbool2_t vm, vbool2_t vs2, size_t vl) {
   return __riscv_vfirst_m_b2_m(vm, vs2, vl);
 }
 
-int test_vfirst_m_b4_m(vbool4_t vm, vbool4_t vs2, size_t vl) {
+long test_vfirst_m_b4_m(vbool4_t vm, vbool4_t vs2, size_t vl) {
   return __riscv_vfirst_m_b4_m(vm, vs2, vl);
 }
 
-int test_vfirst_m_b8_m(vbool8_t vm, vbool8_t vs2, size_t vl) {
+long test_vfirst_m_b8_m(vbool8_t vm, vbool8_t vs2, size_t vl) {
   return __riscv_vfirst_m_b8_m(vm, vs2, vl);
 }
 
-int test_vfirst_m_b16_m(vbool16_t vm, vbool16_t vs2, size_t vl) {
+long test_vfirst_m_b16_m(vbool16_t vm, vbool16_t vs2, size_t vl) {
   return __riscv_vfirst_m_b16_m(vm, vs2, vl);
 }
 
-int test_vfirst_m_b32_m(vbool32_t vm, vbool32_t vs2, size_t vl) {
+long test_vfirst_m_b32_m(vbool32_t vm, vbool32_t vs2, size_t vl) {
   return __riscv_vfirst_m_b32_m(vm, vs2, vl);
 }
 
-int test_vfirst_m_b64_m(vbool64_t vm, vbool64_t vs2, size_t vl) {
+long test_vfirst_m_b64_m(vbool64_t vm, vbool64_t vs2, size_t vl) {
   return __riscv_vfirst_m_b64_m(vm, vs2, vl);
 }
 /* { dg-final { scan-assembler-times {vseti?vli\s+[a-z0-9]+,\s*[a-z0-9]+,\s*e[0-9]+,\s*mf?[1248],\s*t[au],\s*m[au]\s+vfirst\.[ivxfswum.]+\s+} 14 } } */
diff --git a/auto-generated/gnu-overloaded-tests/vcpop.c b/auto-generated/gnu-overloaded-tests/vcpop.c
index c0e42e89a..b6bb5a6fb 100644
--- a/auto-generated/gnu-overloaded-tests/vcpop.c
+++ b/auto-generated/gnu-overloaded-tests/vcpop.c
@@ -3,59 +3,59 @@
 
 #include <riscv_vector.h>
 
-unsigned int test_vcpop_m_b1(vbool1_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b1(vbool1_t vs2, size_t vl) {
   return __riscv_vcpop(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b2(vbool2_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b2(vbool2_t vs2, size_t vl) {
   return __riscv_vcpop(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b4(vbool4_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b4(vbool4_t vs2, size_t vl) {
   return __riscv_vcpop(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b8(vbool8_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b8(vbool8_t vs2, size_t vl) {
   return __riscv_vcpop(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b16(vbool16_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b16(vbool16_t vs2, size_t vl) {
   return __riscv_vcpop(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b32(vbool32_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b32(vbool32_t vs2, size_t vl) {
   return __riscv_vcpop(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b64(vbool64_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b64(vbool64_t vs2, size_t vl) {
   return __riscv_vcpop(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b1_m(vbool1_t vm, vbool1_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b1_m(vbool1_t vm, vbool1_t vs2, size_t vl) {
   return __riscv_vcpop(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b2_m(vbool2_t vm, vbool2_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b2_m(vbool2_t vm, vbool2_t vs2, size_t vl) {
   return __riscv_vcpop(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b4_m(vbool4_t vm, vbool4_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b4_m(vbool4_t vm, vbool4_t vs2, size_t vl) {
   return __riscv_vcpop(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b8_m(vbool8_t vm, vbool8_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b8_m(vbool8_t vm, vbool8_t vs2, size_t vl) {
   return __riscv_vcpop(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b16_m(vbool16_t vm, vbool16_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b16_m(vbool16_t vm, vbool16_t vs2, size_t vl) {
   return __riscv_vcpop(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b32_m(vbool32_t vm, vbool32_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b32_m(vbool32_t vm, vbool32_t vs2, size_t vl) {
   return __riscv_vcpop(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b64_m(vbool64_t vm, vbool64_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b64_m(vbool64_t vm, vbool64_t vs2, size_t vl) {
   return __riscv_vcpop(vm, vs2, vl);
 }
 /* { dg-final { scan-assembler-times {vseti?vli\s+[a-z0-9]+,\s*[a-z0-9]+,\s*e[0-9]+,\s*mf?[1248],\s*t[au],\s*m[au]\s+vcpop\.[ivxfswum.]+\s+} 14 } } */
diff --git a/auto-generated/gnu-overloaded-tests/vfirst.c b/auto-generated/gnu-overloaded-tests/vfirst.c
index ea2a7b730..e215b4fcf 100644
--- a/auto-generated/gnu-overloaded-tests/vfirst.c
+++ b/auto-generated/gnu-overloaded-tests/vfirst.c
@@ -3,59 +3,59 @@
 
 #include <riscv_vector.h>
 
-int test_vfirst_m_b1(vbool1_t vs2, size_t vl) {
+long test_vfirst_m_b1(vbool1_t vs2, size_t vl) {
   return __riscv_vfirst(vs2, vl);
 }
 
-int test_vfirst_m_b2(vbool2_t vs2, size_t vl) {
+long test_vfirst_m_b2(vbool2_t vs2, size_t vl) {
   return __riscv_vfirst(vs2, vl);
 }
 
-int test_vfirst_m_b4(vbool4_t vs2, size_t vl) {
+long test_vfirst_m_b4(vbool4_t vs2, size_t vl) {
   return __riscv_vfirst(vs2, vl);
 }
 
-int test_vfirst_m_b8(vbool8_t vs2, size_t vl) {
+long test_vfirst_m_b8(vbool8_t vs2, size_t vl) {
   return __riscv_vfirst(vs2, vl);
 }
 
-int test_vfirst_m_b16(vbool16_t vs2, size_t vl) {
+long test_vfirst_m_b16(vbool16_t vs2, size_t vl) {
   return __riscv_vfirst(vs2, vl);
 }
 
-int test_vfirst_m_b32(vbool32_t vs2, size_t vl) {
+long test_vfirst_m_b32(vbool32_t vs2, size_t vl) {
   return __riscv_vfirst(vs2, vl);
 }
 
-int test_vfirst_m_b64(vbool64_t vs2, size_t vl) {
+long test_vfirst_m_b64(vbool64_t vs2, size_t vl) {
   return __riscv_vfirst(vs2, vl);
 }
 
-int test_vfirst_m_b1_m(vbool1_t vm, vbool1_t vs2, size_t vl) {
+long test_vfirst_m_b1_m(vbool1_t vm, vbool1_t vs2, size_t vl) {
   return __riscv_vfirst(vm, vs2, vl);
 }
 
-int test_vfirst_m_b2_m(vbool2_t vm, vbool2_t vs2, size_t vl) {
+long test_vfirst_m_b2_m(vbool2_t vm, vbool2_t vs2, size_t vl) {
   return __riscv_vfirst(vm, vs2, vl);
 }
 
-int test_vfirst_m_b4_m(vbool4_t vm, vbool4_t vs2, size_t vl) {
+long test_vfirst_m_b4_m(vbool4_t vm, vbool4_t vs2, size_t vl) {
   return __riscv_vfirst(vm, vs2, vl);
 }
 
-int test_vfirst_m_b8_m(vbool8_t vm, vbool8_t vs2, size_t vl) {
+long test_vfirst_m_b8_m(vbool8_t vm, vbool8_t vs2, size_t vl) {
   return __riscv_vfirst(vm, vs2, vl);
 }
 
-int test_vfirst_m_b16_m(vbool16_t vm, vbool16_t vs2, size_t vl) {
+long test_vfirst_m_b16_m(vbool16_t vm, vbool16_t vs2, size_t vl) {
   return __riscv_vfirst(vm, vs2, vl);
 }
 
-int test_vfirst_m_b32_m(vbool32_t vm, vbool32_t vs2, size_t vl) {
+long test_vfirst_m_b32_m(vbool32_t vm, vbool32_t vs2, size_t vl) {
   return __riscv_vfirst(vm, vs2, vl);
 }
 
-int test_vfirst_m_b64_m(vbool64_t vm, vbool64_t vs2, size_t vl) {
+long test_vfirst_m_b64_m(vbool64_t vm, vbool64_t vs2, size_t vl) {
   return __riscv_vfirst(vm, vs2, vl);
 }
 /* { dg-final { scan-assembler-times {vseti?vli\s+[a-z0-9]+,\s*[a-z0-9]+,\s*e[0-9]+,\s*mf?[1248],\s*t[au],\s*m[au]\s+vfirst\.[ivxfswum.]+\s+} 14 } } */
diff --git a/auto-generated/llvm-api-tests/vcpop.c b/auto-generated/llvm-api-tests/vcpop.c
index 215a2443e..1c0ff63ca 100644
--- a/auto-generated/llvm-api-tests/vcpop.c
+++ b/auto-generated/llvm-api-tests/vcpop.c
@@ -6,58 +6,58 @@
 
 #include <riscv_vector.h>
 
-unsigned int test_vcpop_m_b1(vbool1_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b1(vbool1_t vs2, size_t vl) {
   return __riscv_vcpop_m_b1(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b2(vbool2_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b2(vbool2_t vs2, size_t vl) {
   return __riscv_vcpop_m_b2(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b4(vbool4_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b4(vbool4_t vs2, size_t vl) {
   return __riscv_vcpop_m_b4(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b8(vbool8_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b8(vbool8_t vs2, size_t vl) {
   return __riscv_vcpop_m_b8(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b16(vbool16_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b16(vbool16_t vs2, size_t vl) {
   return __riscv_vcpop_m_b16(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b32(vbool32_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b32(vbool32_t vs2, size_t vl) {
   return __riscv_vcpop_m_b32(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b64(vbool64_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b64(vbool64_t vs2, size_t vl) {
   return __riscv_vcpop_m_b64(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b1_m(vbool1_t vm, vbool1_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b1_m(vbool1_t vm, vbool1_t vs2, size_t vl) {
   return __riscv_vcpop_m_b1_m(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b2_m(vbool2_t vm, vbool2_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b2_m(vbool2_t vm, vbool2_t vs2, size_t vl) {
   return __riscv_vcpop_m_b2_m(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b4_m(vbool4_t vm, vbool4_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b4_m(vbool4_t vm, vbool4_t vs2, size_t vl) {
   return __riscv_vcpop_m_b4_m(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b8_m(vbool8_t vm, vbool8_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b8_m(vbool8_t vm, vbool8_t vs2, size_t vl) {
   return __riscv_vcpop_m_b8_m(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b16_m(vbool16_t vm, vbool16_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b16_m(vbool16_t vm, vbool16_t vs2, size_t vl) {
   return __riscv_vcpop_m_b16_m(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b32_m(vbool32_t vm, vbool32_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b32_m(vbool32_t vm, vbool32_t vs2, size_t vl) {
   return __riscv_vcpop_m_b32_m(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b64_m(vbool64_t vm, vbool64_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b64_m(vbool64_t vm, vbool64_t vs2, size_t vl) {
   return __riscv_vcpop_m_b64_m(vm, vs2, vl);
 }
diff --git a/auto-generated/llvm-api-tests/vfirst.c b/auto-generated/llvm-api-tests/vfirst.c
index e0c651c03..770afdb2d 100644
--- a/auto-generated/llvm-api-tests/vfirst.c
+++ b/auto-generated/llvm-api-tests/vfirst.c
@@ -5,58 +5,58 @@
 
 #include <riscv_vector.h>
 
-int test_vfirst_m_b1(vbool1_t vs2, size_t vl) {
+long test_vfirst_m_b1(vbool1_t vs2, size_t vl) {
   return __riscv_vfirst_m_b1(vs2, vl);
 }
 
-int test_vfirst_m_b2(vbool2_t vs2, size_t vl) {
+long test_vfirst_m_b2(vbool2_t vs2, size_t vl) {
   return __riscv_vfirst_m_b2(vs2, vl);
 }
 
-int test_vfirst_m_b4(vbool4_t vs2, size_t vl) {
+long test_vfirst_m_b4(vbool4_t vs2, size_t vl) {
   return __riscv_vfirst_m_b4(vs2, vl);
 }
 
-int test_vfirst_m_b8(vbool8_t vs2, size_t vl) {
+long test_vfirst_m_b8(vbool8_t vs2, size_t vl) {
   return __riscv_vfirst_m_b8(vs2, vl);
 }
 
-int test_vfirst_m_b16(vbool16_t vs2, size_t vl) {
+long test_vfirst_m_b16(vbool16_t vs2, size_t vl) {
   return __riscv_vfirst_m_b16(vs2, vl);
 }
 
-int test_vfirst_m_b32(vbool32_t vs2, size_t vl) {
+long test_vfirst_m_b32(vbool32_t vs2, size_t vl) {
   return __riscv_vfirst_m_b32(vs2, vl);
 }
 
-int test_vfirst_m_b64(vbool64_t vs2, size_t vl) {
+long test_vfirst_m_b64(vbool64_t vs2, size_t vl) {
   return __riscv_vfirst_m_b64(vs2, vl);
 }
 
-int test_vfirst_m_b1_m(vbool1_t vm, vbool1_t vs2, size_t vl) {
+long test_vfirst_m_b1_m(vbool1_t vm, vbool1_t vs2, size_t vl) {
   return __riscv_vfirst_m_b1_m(vm, vs2, vl);
 }
 
-int test_vfirst_m_b2_m(vbool2_t vm, vbool2_t vs2, size_t vl) {
+long test_vfirst_m_b2_m(vbool2_t vm, vbool2_t vs2, size_t vl) {
   return __riscv_vfirst_m_b2_m(vm, vs2, vl);
 }
 
-int test_vfirst_m_b4_m(vbool4_t vm, vbool4_t vs2, size_t vl) {
+long test_vfirst_m_b4_m(vbool4_t vm, vbool4_t vs2, size_t vl) {
   return __riscv_vfirst_m_b4_m(vm, vs2, vl);
 }
 
-int test_vfirst_m_b8_m(vbool8_t vm, vbool8_t vs2, size_t vl) {
+long test_vfirst_m_b8_m(vbool8_t vm, vbool8_t vs2, size_t vl) {
   return __riscv_vfirst_m_b8_m(vm, vs2, vl);
 }
 
-int test_vfirst_m_b16_m(vbool16_t vm, vbool16_t vs2, size_t vl) {
+long test_vfirst_m_b16_m(vbool16_t vm, vbool16_t vs2, size_t vl) {
   return __riscv_vfirst_m_b16_m(vm, vs2, vl);
 }
 
-int test_vfirst_m_b32_m(vbool32_t vm, vbool32_t vs2, size_t vl) {
+long test_vfirst_m_b32_m(vbool32_t vm, vbool32_t vs2, size_t vl) {
   return __riscv_vfirst_m_b32_m(vm, vs2, vl);
 }
 
-int test_vfirst_m_b64_m(vbool64_t vm, vbool64_t vs2, size_t vl) {
+long test_vfirst_m_b64_m(vbool64_t vm, vbool64_t vs2, size_t vl) {
   return __riscv_vfirst_m_b64_m(vm, vs2, vl);
 }
diff --git a/auto-generated/llvm-overloaded-tests/vcpop.c b/auto-generated/llvm-overloaded-tests/vcpop.c
index 1b3ed7bec..1735b9838 100644
--- a/auto-generated/llvm-overloaded-tests/vcpop.c
+++ b/auto-generated/llvm-overloaded-tests/vcpop.c
@@ -6,58 +6,58 @@
 
 #include <riscv_vector.h>
 
-unsigned int test_vcpop_m_b1(vbool1_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b1(vbool1_t vs2, size_t vl) {
   return __riscv_vcpop(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b2(vbool2_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b2(vbool2_t vs2, size_t vl) {
   return __riscv_vcpop(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b4(vbool4_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b4(vbool4_t vs2, size_t vl) {
   return __riscv_vcpop(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b8(vbool8_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b8(vbool8_t vs2, size_t vl) {
   return __riscv_vcpop(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b16(vbool16_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b16(vbool16_t vs2, size_t vl) {
   return __riscv_vcpop(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b32(vbool32_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b32(vbool32_t vs2, size_t vl) {
   return __riscv_vcpop(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b64(vbool64_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b64(vbool64_t vs2, size_t vl) {
   return __riscv_vcpop(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b1_m(vbool1_t vm, vbool1_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b1_m(vbool1_t vm, vbool1_t vs2, size_t vl) {
   return __riscv_vcpop(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b2_m(vbool2_t vm, vbool2_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b2_m(vbool2_t vm, vbool2_t vs2, size_t vl) {
   return __riscv_vcpop(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b4_m(vbool4_t vm, vbool4_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b4_m(vbool4_t vm, vbool4_t vs2, size_t vl) {
   return __riscv_vcpop(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b8_m(vbool8_t vm, vbool8_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b8_m(vbool8_t vm, vbool8_t vs2, size_t vl) {
   return __riscv_vcpop(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b16_m(vbool16_t vm, vbool16_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b16_m(vbool16_t vm, vbool16_t vs2, size_t vl) {
   return __riscv_vcpop(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b32_m(vbool32_t vm, vbool32_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b32_m(vbool32_t vm, vbool32_t vs2, size_t vl) {
   return __riscv_vcpop(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b64_m(vbool64_t vm, vbool64_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b64_m(vbool64_t vm, vbool64_t vs2, size_t vl) {
   return __riscv_vcpop(vm, vs2, vl);
 }
diff --git a/auto-generated/llvm-overloaded-tests/vfirst.c b/auto-generated/llvm-overloaded-tests/vfirst.c
index 481e07716..c8f2b1b12 100644
--- a/auto-generated/llvm-overloaded-tests/vfirst.c
+++ b/auto-generated/llvm-overloaded-tests/vfirst.c
@@ -5,58 +5,58 @@
 
 #include <riscv_vector.h>
 
-int test_vfirst_m_b1(vbool1_t vs2, size_t vl) {
+long test_vfirst_m_b1(vbool1_t vs2, size_t vl) {
   return __riscv_vfirst(vs2, vl);
 }
 
-int test_vfirst_m_b2(vbool2_t vs2, size_t vl) {
+long test_vfirst_m_b2(vbool2_t vs2, size_t vl) {
   return __riscv_vfirst(vs2, vl);
 }
 
-int test_vfirst_m_b4(vbool4_t vs2, size_t vl) {
+long test_vfirst_m_b4(vbool4_t vs2, size_t vl) {
   return __riscv_vfirst(vs2, vl);
 }
 
-int test_vfirst_m_b8(vbool8_t vs2, size_t vl) {
+long test_vfirst_m_b8(vbool8_t vs2, size_t vl) {
   return __riscv_vfirst(vs2, vl);
 }
 
-int test_vfirst_m_b16(vbool16_t vs2, size_t vl) {
+long test_vfirst_m_b16(vbool16_t vs2, size_t vl) {
   return __riscv_vfirst(vs2, vl);
 }
 
-int test_vfirst_m_b32(vbool32_t vs2, size_t vl) {
+long test_vfirst_m_b32(vbool32_t vs2, size_t vl) {
   return __riscv_vfirst(vs2, vl);
 }
 
-int test_vfirst_m_b64(vbool64_t vs2, size_t vl) {
+long test_vfirst_m_b64(vbool64_t vs2, size_t vl) {
   return __riscv_vfirst(vs2, vl);
 }
 
-int test_vfirst_m_b1_m(vbool1_t vm, vbool1_t vs2, size_t vl) {
+long test_vfirst_m_b1_m(vbool1_t vm, vbool1_t vs2, size_t vl) {
   return __riscv_vfirst(vm, vs2, vl);
 }
 
-int test_vfirst_m_b2_m(vbool2_t vm, vbool2_t vs2, size_t vl) {
+long test_vfirst_m_b2_m(vbool2_t vm, vbool2_t vs2, size_t vl) {
   return __riscv_vfirst(vm, vs2, vl);
 }
 
-int test_vfirst_m_b4_m(vbool4_t vm, vbool4_t vs2, size_t vl) {
+long test_vfirst_m_b4_m(vbool4_t vm, vbool4_t vs2, size_t vl) {
   return __riscv_vfirst(vm, vs2, vl);
 }
 
-int test_vfirst_m_b8_m(vbool8_t vm, vbool8_t vs2, size_t vl) {
+long test_vfirst_m_b8_m(vbool8_t vm, vbool8_t vs2, size_t vl) {
   return __riscv_vfirst(vm, vs2, vl);
 }
 
-int test_vfirst_m_b16_m(vbool16_t vm, vbool16_t vs2, size_t vl) {
+long test_vfirst_m_b16_m(vbool16_t vm, vbool16_t vs2, size_t vl) {
   return __riscv_vfirst(vm, vs2, vl);
 }
 
-int test_vfirst_m_b32_m(vbool32_t vm, vbool32_t vs2, size_t vl) {
+long test_vfirst_m_b32_m(vbool32_t vm, vbool32_t vs2, size_t vl) {
   return __riscv_vfirst(vm, vs2, vl);
 }
 
-int test_vfirst_m_b64_m(vbool64_t vm, vbool64_t vs2, size_t vl) {
+long test_vfirst_m_b64_m(vbool64_t vm, vbool64_t vs2, size_t vl) {
   return __riscv_vfirst(vm, vs2, vl);
 }
diff --git a/auto-generated/overloaded-api-testing/vcpop.c b/auto-generated/overloaded-api-testing/vcpop.c
index f52439d1f..aeeeeb878 100644
--- a/auto-generated/overloaded-api-testing/vcpop.c
+++ b/auto-generated/overloaded-api-testing/vcpop.c
@@ -1,58 +1,58 @@
 #include <riscv_vector.h>
 #include <stdint.h>
 
-unsigned int test_vcpop_m_b1(vbool1_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b1(vbool1_t vs2, size_t vl) {
   return __riscv_vcpop(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b2(vbool2_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b2(vbool2_t vs2, size_t vl) {
   return __riscv_vcpop(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b4(vbool4_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b4(vbool4_t vs2, size_t vl) {
   return __riscv_vcpop(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b8(vbool8_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b8(vbool8_t vs2, size_t vl) {
   return __riscv_vcpop(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b16(vbool16_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b16(vbool16_t vs2, size_t vl) {
   return __riscv_vcpop(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b32(vbool32_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b32(vbool32_t vs2, size_t vl) {
   return __riscv_vcpop(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b64(vbool64_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b64(vbool64_t vs2, size_t vl) {
   return __riscv_vcpop(vs2, vl);
 }
 
-unsigned int test_vcpop_m_b1_m(vbool1_t vm, vbool1_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b1_m(vbool1_t vm, vbool1_t vs2, size_t vl) {
   return __riscv_vcpop(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b2_m(vbool2_t vm, vbool2_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b2_m(vbool2_t vm, vbool2_t vs2, size_t vl) {
   return __riscv_vcpop(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b4_m(vbool4_t vm, vbool4_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b4_m(vbool4_t vm, vbool4_t vs2, size_t vl) {
   return __riscv_vcpop(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b8_m(vbool8_t vm, vbool8_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b8_m(vbool8_t vm, vbool8_t vs2, size_t vl) {
   return __riscv_vcpop(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b16_m(vbool16_t vm, vbool16_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b16_m(vbool16_t vm, vbool16_t vs2, size_t vl) {
   return __riscv_vcpop(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b32_m(vbool32_t vm, vbool32_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b32_m(vbool32_t vm, vbool32_t vs2, size_t vl) {
   return __riscv_vcpop(vm, vs2, vl);
 }
 
-unsigned int test_vcpop_m_b64_m(vbool64_t vm, vbool64_t vs2, size_t vl) {
+unsigned long test_vcpop_m_b64_m(vbool64_t vm, vbool64_t vs2, size_t vl) {
   return __riscv_vcpop(vm, vs2, vl);
 }
diff --git a/auto-generated/overloaded-api-testing/vfirst.c b/auto-generated/overloaded-api-testing/vfirst.c
index 72fdc0a2a..aa45333f4 100644
--- a/auto-generated/overloaded-api-testing/vfirst.c
+++ b/auto-generated/overloaded-api-testing/vfirst.c
@@ -1,58 +1,58 @@
 #include <riscv_vector.h>
 #include <stdint.h>
 
-int test_vfirst_m_b1(vbool1_t vs2, size_t vl) {
+long test_vfirst_m_b1(vbool1_t vs2, size_t vl) {
   return __riscv_vfirst(vs2, vl);
 }
 
-int test_vfirst_m_b2(vbool2_t vs2, size_t vl) {
+long test_vfirst_m_b2(vbool2_t vs2, size_t vl) {
   return __riscv_vfirst(vs2, vl);
 }
 
-int test_vfirst_m_b4(vbool4_t vs2, size_t vl) {
+long test_vfirst_m_b4(vbool4_t vs2, size_t vl) {
   return __riscv_vfirst(vs2, vl);
 }
 
-int test_vfirst_m_b8(vbool8_t vs2, size_t vl) {
+long test_vfirst_m_b8(vbool8_t vs2, size_t vl) {
   return __riscv_vfirst(vs2, vl);
 }
 
-int test_vfirst_m_b16(vbool16_t vs2, size_t vl) {
+long test_vfirst_m_b16(vbool16_t vs2, size_t vl) {
   return __riscv_vfirst(vs2, vl);
 }
 
-int test_vfirst_m_b32(vbool32_t vs2, size_t vl) {
+long test_vfirst_m_b32(vbool32_t vs2, size_t vl) {
   return __riscv_vfirst(vs2, vl);
 }
 
-int test_vfirst_m_b64(vbool64_t vs2, size_t vl) {
+long test_vfirst_m_b64(vbool64_t vs2, size_t vl) {
   return __riscv_vfirst(vs2, vl);
 }
 
-int test_vfirst_m_b1_m(vbool1_t vm, vbool1_t vs2, size_t vl) {
+long test_vfirst_m_b1_m(vbool1_t vm, vbool1_t vs2, size_t vl) {
   return __riscv_vfirst(vm, vs2, vl);
 }
 
-int test_vfirst_m_b2_m(vbool2_t vm, vbool2_t vs2, size_t vl) {
+long test_vfirst_m_b2_m(vbool2_t vm, vbool2_t vs2, size_t vl) {
   return __riscv_vfirst(vm, vs2, vl);
 }
 
-int test_vfirst_m_b4_m(vbool4_t vm, vbool4_t vs2, size_t vl) {
+long test_vfirst_m_b4_m(vbool4_t vm, vbool4_t vs2, size_t vl) {
   return __riscv_vfirst(vm, vs2, vl);
 }
 
-int test_vfirst_m_b8_m(vbool8_t vm, vbool8_t vs2, size_t vl) {
+long test_vfirst_m_b8_m(vbool8_t vm, vbool8_t vs2, size_t vl) {
   return __riscv_vfirst(vm, vs2, vl);
 }
 
-int test_vfirst_m_b16_m(vbool16_t vm, vbool16_t vs2, size_t vl) {
+long test_vfirst_m_b16_m(vbool16_t vm, vbool16_t vs2, size_t vl) {
   return __riscv_vfirst(vm, vs2, vl);
 }
 
-int test_vfirst_m_b32_m(vbool32_t vm, vbool32_t vs2, size_t vl) {
+long test_vfirst_m_b32_m(vbool32_t vm, vbool32_t vs2, size_t vl) {
   return __riscv_vfirst(vm, vs2, vl);
 }
 
-int test_vfirst_m_b64_m(vbool64_t vm, vbool64_t vs2, size_t vl) {
+long test_vfirst_m_b64_m(vbool64_t vm, vbool64_t vs2, size_t vl) {
   return __riscv_vfirst(vm, vs2, vl);
 }