Switch to safe integer types from Berberis base in vector intrinsics (1/3)

Test: m berberis_all

Change-Id: I9133e01d2d416ec037f94b9f44540e9521e005db
diff --git a/intrinsics/riscv64/vector_intrinsics_test.cc b/intrinsics/riscv64/vector_intrinsics_test.cc
index f50382d..9fcc8c1 100644
--- a/intrinsics/riscv64/vector_intrinsics_test.cc
+++ b/intrinsics/riscv64/vector_intrinsics_test.cc
@@ -28,6 +28,11 @@
 
 namespace {
 
+using UInt8 = uint8_t;
+using UInt16 = uint16_t;
+using UInt32 = uint32_t;
+using UInt64 = uint64_t;
+
 // Easily recognizable bit pattern for target register.
 constexpr __m128i kUndisturbedResult = {0x5555'5555'5555'5555, 0x5555'5555'5555'5555};
 
@@ -38,75 +43,76 @@
     ASSERT_EQ(Vaddvvm(0, 16, 0xffff, kUndisturbedResult, __m128i{-1, -1}, arg2),
               std::tuple{result_to_check});
   };
-  Verify(Vaddvv<uint8_t, TailProcessing::kAgnostic>,
-         Vaddvvm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+  Verify(Vaddvv<UInt8, TailProcessing::kAgnostic>,
+         Vaddvvm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
          __v16qu{0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1},
          __v16qu{255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0});
-  Verify(Vaddvv<uint8_t, TailProcessing::kAgnostic>,
-         Vaddvvm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+  Verify(Vaddvv<UInt8, TailProcessing::kAgnostic>,
+         Vaddvvm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
          __v16qu{1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0},
          __v16qu{0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255});
-  Verify(Vaddvv<uint16_t, TailProcessing::kAgnostic>,
-         Vaddvvm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+  Verify(Vaddvv<UInt16, TailProcessing::kAgnostic>,
+         Vaddvvm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
          __v8hu{0, 1, 0, 1, 0, 1, 0, 1},
          __v8hu{0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000});
-  Verify(Vaddvv<uint16_t, TailProcessing::kAgnostic>,
-         Vaddvvm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+  Verify(Vaddvv<UInt16, TailProcessing::kAgnostic>,
+         Vaddvvm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
          __v8hu{1, 0, 1, 0, 1, 0, 1, 0},
          __v8hu{0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff});
-  Verify(Vaddvv<uint32_t, TailProcessing::kAgnostic>,
-         Vaddvvm<uint32_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+  Verify(Vaddvv<UInt32, TailProcessing::kAgnostic>,
+         Vaddvvm<UInt32, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
          __v4su{0, 1, 0, 1},
          __v4su{0xffff'ffff, 0x0000'0000, 0xffff'ffff, 0x0000'0000});
-  Verify(Vaddvv<uint32_t, TailProcessing::kAgnostic>,
-         Vaddvvm<uint32_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+  Verify(Vaddvv<UInt32, TailProcessing::kAgnostic>,
+         Vaddvvm<UInt32, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
          __v4su{1, 0, 1, 0},
          __v4su{0x0000'0000, 0xffff'ffff, 0x0000'0000, 0xffff'ffff});
-  Verify(Vaddvv<uint64_t, TailProcessing::kAgnostic>,
-         Vaddvvm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+  Verify(Vaddvv<UInt64, TailProcessing::kAgnostic>,
+         Vaddvvm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
          __v2du{0, 1},
          __v2du{0xffff'ffff'ffff'ffff, 0x0000'0000'0000'0000});
-  Verify(Vaddvv<uint64_t, TailProcessing::kAgnostic>,
-         Vaddvvm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+  Verify(Vaddvv<UInt64, TailProcessing::kAgnostic>,
+         Vaddvvm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
          __v2du{1, 0},
          __v2du{0x0000'0000'0000'0000, 0xffff'ffff'ffff'ffff});
 }
 
 TEST(VectorIntrinsics, Vaddvx) {
   auto Verify = [](auto Vaddvx, auto Vaddvxm, SIMD128Register arg1, auto result_to_check) {
-    ASSERT_EQ(Vaddvx(0, 16, kUndisturbedResult, arg1, 1), std::tuple{result_to_check});
-    ASSERT_EQ(Vaddvxm(0, 16, 0xffff, kUndisturbedResult, arg1, 1), std::tuple{result_to_check});
+    ASSERT_EQ(Vaddvx(0, 16, kUndisturbedResult, arg1, UInt8{1}), std::tuple{result_to_check});
+    ASSERT_EQ(Vaddvxm(0, 16, 0xffff, kUndisturbedResult, arg1, UInt8{1}),
+              std::tuple{result_to_check});
   };
-  Verify(Vaddvx<uint8_t, TailProcessing::kAgnostic>,
-         Vaddvxm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+  Verify(Vaddvx<UInt8, TailProcessing::kAgnostic>,
+         Vaddvxm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
          __v16qu{254, 255, 254, 255, 254, 255, 254, 255, 254, 255, 254, 255, 254, 255, 254, 255},
          __v16qu{255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0});
-  Verify(Vaddvx<uint8_t, TailProcessing::kAgnostic>,
-         Vaddvxm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+  Verify(Vaddvx<UInt8, TailProcessing::kAgnostic>,
+         Vaddvxm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
          __v16qu{255, 254, 255, 254, 255, 254, 255, 254, 255, 254, 255, 254, 255, 254, 255, 254},
          __v16qu{0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255});
-  Verify(Vaddvx<uint16_t, TailProcessing::kAgnostic>,
-         Vaddvxm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+  Verify(Vaddvx<UInt16, TailProcessing::kAgnostic>,
+         Vaddvxm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
          __v8hu{0xfffe, 0xffff, 0xfffe, 0xffff, 0xfffe, 0xffff, 0xfffe, 0xffff},
          __v8hu{0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000});
-  Verify(Vaddvx<uint16_t, TailProcessing::kAgnostic>,
-         Vaddvxm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+  Verify(Vaddvx<UInt16, TailProcessing::kAgnostic>,
+         Vaddvxm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
          __v8hu{0xffff, 0xfffe, 0xffff, 0xfffe, 0xffff, 0xfffe, 0xffff, 0xfffe},
          __v8hu{0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff});
-  Verify(Vaddvx<uint32_t, TailProcessing::kAgnostic>,
-         Vaddvxm<uint32_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+  Verify(Vaddvx<UInt32, TailProcessing::kAgnostic>,
+         Vaddvxm<UInt32, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
          __v4su{0xffff'fffe, 0xffff'ffff, 0xffff'fffe, 0xffff'ffff},
          __v4su{0xffff'ffff, 0x0000'0000, 0xffff'ffff, 0x0000'0000});
-  Verify(Vaddvx<uint32_t, TailProcessing::kAgnostic>,
-         Vaddvxm<uint32_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+  Verify(Vaddvx<UInt32, TailProcessing::kAgnostic>,
+         Vaddvxm<UInt32, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
          __v4su{0xffff'ffff, 0xffff'fffe, 0xffff'ffff, 0xffff'fffe},
          __v4su{0x0000'0000, 0xffff'ffff, 0x0000'0000, 0xffff'ffff});
-  Verify(Vaddvx<uint64_t, TailProcessing::kAgnostic>,
-         Vaddvxm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+  Verify(Vaddvx<UInt64, TailProcessing::kAgnostic>,
+         Vaddvxm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
          __v2du{0xffff'ffff'ffff'fffe, 0xffff'ffff'ffff'ffff},
          __v2du{0xffff'ffff'ffff'ffff, 0x0000'0000'0000'0000});
-  Verify(Vaddvx<uint64_t, TailProcessing::kAgnostic>,
-         Vaddvxm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+  Verify(Vaddvx<UInt64, TailProcessing::kAgnostic>,
+         Vaddvxm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
          __v2du{0xffff'ffff'ffff'ffff, 0xffff'ffff'ffff'fffe},
          __v2du{0x0000'0000'0000'0000, 0xffff'ffff'ffff'ffff});
 }
@@ -138,75 +144,75 @@
     ASSERT_EQ(Vaddvvmuu(0, kHalfLen, 0xffff, kUndisturbedResult, __m128i{-1, -1}, arg2),
               std::tuple{result_to_check_undisturbed});
   };
-  Verify(Vaddvv<uint8_t, TailProcessing::kAgnostic>,
-         Vaddvv<uint8_t, TailProcessing::kUndisturbed>,
-         Vaddvvm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvvm<uint8_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint8_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvv<UInt8, TailProcessing::kAgnostic>,
+         Vaddvv<UInt8, TailProcessing::kUndisturbed>,
+         Vaddvvm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvvm<UInt8, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt8, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v16qu{0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1},
          __v16qu{255, 0, 255, 0, 255, 0, 255, 0, 255, 255, 255, 255, 255, 255, 255, 255},
          __v16qu{255, 0, 255, 0, 255, 0, 255, 0, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55});
-  Verify(Vaddvv<uint8_t, TailProcessing::kAgnostic>,
-         Vaddvv<uint8_t, TailProcessing::kUndisturbed>,
-         Vaddvvm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvvm<uint8_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint8_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvv<UInt8, TailProcessing::kAgnostic>,
+         Vaddvv<UInt8, TailProcessing::kUndisturbed>,
+         Vaddvvm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvvm<UInt8, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt8, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v16qu{1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0},
          __v16qu{0, 255, 0, 255, 0, 255, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255},
          __v16qu{0, 255, 0, 255, 0, 255, 0, 255, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55});
-  Verify(Vaddvv<uint16_t, TailProcessing::kAgnostic>,
-         Vaddvv<uint16_t, TailProcessing::kUndisturbed>,
-         Vaddvvm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvvm<uint16_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint16_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvv<UInt16, TailProcessing::kAgnostic>,
+         Vaddvv<UInt16, TailProcessing::kUndisturbed>,
+         Vaddvvm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvvm<UInt16, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt16, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v8hu{0, 1, 0, 1, 0, 1, 0, 1},
          __v8hu{0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0xffff, 0xffff, 0xffff},
          __v8hu{0xffff, 0x0000, 0xffff, 0x0000, 0x5555, 0x5555, 0x5555, 0x5555});
-  Verify(Vaddvv<uint16_t, TailProcessing::kAgnostic>,
-         Vaddvv<uint16_t, TailProcessing::kUndisturbed>,
-         Vaddvvm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvvm<uint16_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint16_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvv<UInt16, TailProcessing::kAgnostic>,
+         Vaddvv<UInt16, TailProcessing::kUndisturbed>,
+         Vaddvvm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvvm<UInt16, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt16, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v8hu{1, 0, 1, 0, 1, 0, 1, 0},
          __v8hu{0x0000, 0xffff, 0x0000, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff},
          __v8hu{0x0000, 0xffff, 0x0000, 0xffff, 0x5555, 0x5555, 0x5555, 0x5555});
-  Verify(Vaddvv<uint32_t, TailProcessing::kAgnostic>,
-         Vaddvv<uint32_t, TailProcessing::kUndisturbed>,
-         Vaddvvm<uint32_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint32_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvvm<uint32_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint32_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvv<UInt32, TailProcessing::kAgnostic>,
+         Vaddvv<UInt32, TailProcessing::kUndisturbed>,
+         Vaddvvm<UInt32, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt32, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvvm<UInt32, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt32, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v4su{0, 1, 0, 1},
          __v4su{0xffff'ffff, 0x0000'0000, 0xffff'ffff, 0xffff'ffff},
          __v4su{0xffff'ffff, 0x0000'0000, 0x5555'5555, 0x5555'5555});
-  Verify(Vaddvv<uint32_t, TailProcessing::kAgnostic>,
-         Vaddvv<uint32_t, TailProcessing::kUndisturbed>,
-         Vaddvvm<uint32_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint32_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvvm<uint32_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint32_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvv<UInt32, TailProcessing::kAgnostic>,
+         Vaddvv<UInt32, TailProcessing::kUndisturbed>,
+         Vaddvvm<UInt32, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt32, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvvm<UInt32, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt32, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v4su{1, 0, 1, 0},
          __v4su{0x0000'0000, 0xffff'ffff, 0xffff'ffff, 0xffff'ffff},
          __v4su{0x0000'0000, 0xffff'ffff, 0x5555'5555, 0x5555'5555});
-  Verify(Vaddvv<uint64_t, TailProcessing::kAgnostic>,
-         Vaddvv<uint64_t, TailProcessing::kUndisturbed>,
-         Vaddvvm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvvm<uint64_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint64_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvv<UInt64, TailProcessing::kAgnostic>,
+         Vaddvv<UInt64, TailProcessing::kUndisturbed>,
+         Vaddvvm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvvm<UInt64, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt64, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v2du{0, 1},
          __v2du{0xffff'ffff'ffff'ffff, 0xffff'ffff'ffff'ffff},
          __v2du{0xffff'ffff'ffff'ffff, 0x5555'5555'5555'5555});
-  Verify(Vaddvv<uint64_t, TailProcessing::kAgnostic>,
-         Vaddvv<uint64_t, TailProcessing::kUndisturbed>,
-         Vaddvvm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvvm<uint64_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint64_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvv<UInt64, TailProcessing::kAgnostic>,
+         Vaddvv<UInt64, TailProcessing::kUndisturbed>,
+         Vaddvvm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvvm<UInt64, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt64, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v2du{1, 0},
          __v2du{0x0000'0000'0000'0000, 0xffff'ffff'ffff'ffff},
          __v2du{0x0000'0000'0000'0000, 0x5555'5555'5555'5555});
@@ -226,88 +232,88 @@
         std::is_same_v<decltype(result_to_check_agnostic), decltype(result_to_check_undisturbed)>);
     constexpr size_t kHalfLen =
         sizeof(result_to_check_agnostic) / sizeof(result_to_check_agnostic[0]) / 2;
-    ASSERT_EQ(Vaddvxa(0, kHalfLen, kUndisturbedResult, arg1, 1),
+    ASSERT_EQ(Vaddvxa(0, kHalfLen, kUndisturbedResult, arg1, UInt8{1}),
               std::tuple{result_to_check_agnostic});
-    ASSERT_EQ(Vaddvxu(0, kHalfLen, kUndisturbedResult, arg1, 1),
+    ASSERT_EQ(Vaddvxu(0, kHalfLen, kUndisturbedResult, arg1, UInt8{1}),
               std::tuple{result_to_check_undisturbed});
-    ASSERT_EQ(Vaddvxmaa(0, kHalfLen, 0xffff, kUndisturbedResult, arg1, 1),
+    ASSERT_EQ(Vaddvxmaa(0, kHalfLen, 0xffff, kUndisturbedResult, arg1, UInt8{1}),
               std::tuple{result_to_check_agnostic});
-    ASSERT_EQ(Vaddvxmau(0, kHalfLen, 0xffff, kUndisturbedResult, arg1, 1),
+    ASSERT_EQ(Vaddvxmau(0, kHalfLen, 0xffff, kUndisturbedResult, arg1, UInt8{1}),
               std::tuple{result_to_check_agnostic});
-    ASSERT_EQ(Vaddvxmua(0, kHalfLen, 0xffff, kUndisturbedResult, arg1, 1),
+    ASSERT_EQ(Vaddvxmua(0, kHalfLen, 0xffff, kUndisturbedResult, arg1, UInt8{1}),
               std::tuple{result_to_check_undisturbed});
-    ASSERT_EQ(Vaddvxmuu(0, kHalfLen, 0xffff, kUndisturbedResult, arg1, 1),
+    ASSERT_EQ(Vaddvxmuu(0, kHalfLen, 0xffff, kUndisturbedResult, arg1, UInt8{1}),
               std::tuple{result_to_check_undisturbed});
   };
-  Verify(Vaddvx<uint8_t, TailProcessing::kAgnostic>,
-         Vaddvx<uint8_t, TailProcessing::kUndisturbed>,
-         Vaddvxm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvxm<uint8_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint8_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvx<UInt8, TailProcessing::kAgnostic>,
+         Vaddvx<UInt8, TailProcessing::kUndisturbed>,
+         Vaddvxm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvxm<UInt8, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt8, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v16qu{254, 255, 254, 255, 254, 255, 254, 255, 254, 255, 254, 255, 254, 255, 254, 255},
          __v16qu{255, 0, 255, 0, 255, 0, 255, 0, 255, 255, 255, 255, 255, 255, 255, 255},
          __v16qu{255, 0, 255, 0, 255, 0, 255, 0, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55});
-  Verify(Vaddvx<uint8_t, TailProcessing::kAgnostic>,
-         Vaddvx<uint8_t, TailProcessing::kUndisturbed>,
-         Vaddvxm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvxm<uint8_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint8_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvx<UInt8, TailProcessing::kAgnostic>,
+         Vaddvx<UInt8, TailProcessing::kUndisturbed>,
+         Vaddvxm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvxm<UInt8, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt8, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v16qu{255, 254, 255, 254, 255, 254, 255, 254, 255, 254, 255, 254, 255, 254, 255, 254},
          __v16qu{0, 255, 0, 255, 0, 255, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255},
          __v16qu{0, 255, 0, 255, 0, 255, 0, 255, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55});
-  Verify(Vaddvx<uint16_t, TailProcessing::kAgnostic>,
-         Vaddvx<uint16_t, TailProcessing::kUndisturbed>,
-         Vaddvxm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvxm<uint16_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint16_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvx<UInt16, TailProcessing::kAgnostic>,
+         Vaddvx<UInt16, TailProcessing::kUndisturbed>,
+         Vaddvxm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvxm<UInt16, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt16, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v8hu{0xfffe, 0xffff, 0xfffe, 0xffff, 0xfffe, 0xffff, 0xfffe, 0xffff},
          __v8hu{0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0xffff, 0xffff, 0xffff},
          __v8hu{0xffff, 0x0000, 0xffff, 0x0000, 0x5555, 0x5555, 0x5555, 0x5555});
-  Verify(Vaddvx<uint16_t, TailProcessing::kAgnostic>,
-         Vaddvx<uint16_t, TailProcessing::kUndisturbed>,
-         Vaddvxm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvxm<uint16_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint16_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvx<UInt16, TailProcessing::kAgnostic>,
+         Vaddvx<UInt16, TailProcessing::kUndisturbed>,
+         Vaddvxm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvxm<UInt16, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt16, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v8hu{0xffff, 0xfffe, 0xffff, 0xfffe, 0xffff, 0xfffe, 0xffff, 0xfffe},
          __v8hu{0x0000, 0xffff, 0x0000, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff},
          __v8hu{0x0000, 0xffff, 0x0000, 0xffff, 0x5555, 0x5555, 0x5555, 0x5555});
-  Verify(Vaddvx<uint32_t, TailProcessing::kAgnostic>,
-         Vaddvx<uint32_t, TailProcessing::kUndisturbed>,
-         Vaddvxm<uint32_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint32_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvxm<uint32_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint32_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvx<UInt32, TailProcessing::kAgnostic>,
+         Vaddvx<UInt32, TailProcessing::kUndisturbed>,
+         Vaddvxm<UInt32, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt32, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvxm<UInt32, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt32, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v4su{0xffff'fffe, 0xffff'ffff, 0xffff'fffe, 0xffff'ffff},
          __v4su{0xffff'ffff, 0x0000'0000, 0xffff'ffff, 0xffff'ffff},
          __v4su{0xffff'ffff, 0x0000'0000, 0x5555'5555, 0x5555'5555});
-  Verify(Vaddvx<uint32_t, TailProcessing::kAgnostic>,
-         Vaddvx<uint32_t, TailProcessing::kUndisturbed>,
-         Vaddvxm<uint32_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint32_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvxm<uint32_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint32_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvx<UInt32, TailProcessing::kAgnostic>,
+         Vaddvx<UInt32, TailProcessing::kUndisturbed>,
+         Vaddvxm<UInt32, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt32, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvxm<UInt32, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt32, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v4su{0xffff'ffff, 0xffff'fffe, 0xffff'ffff, 0xffff'fffe},
          __v4su{0x0000'0000, 0xffff'ffff, 0xffff'ffff, 0xffff'ffff},
          __v4su{0x0000'0000, 0xffff'ffff, 0x5555'5555, 0x5555'5555});
-  Verify(Vaddvx<uint64_t, TailProcessing::kAgnostic>,
-         Vaddvx<uint64_t, TailProcessing::kUndisturbed>,
-         Vaddvxm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvxm<uint64_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint64_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvx<UInt64, TailProcessing::kAgnostic>,
+         Vaddvx<UInt64, TailProcessing::kUndisturbed>,
+         Vaddvxm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvxm<UInt64, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt64, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v2du{0xffff'ffff'ffff'fffe, 0xffff'ffff'ffff'ffff},
          __v2du{0xffff'ffff'ffff'ffff, 0xffff'ffff'ffff'ffff},
          __v2du{0xffff'ffff'ffff'ffff, 0x5555'5555'5555'5555});
-  Verify(Vaddvx<uint64_t, TailProcessing::kAgnostic>,
-         Vaddvx<uint64_t, TailProcessing::kUndisturbed>,
-         Vaddvxm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvxm<uint64_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint64_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvx<UInt64, TailProcessing::kAgnostic>,
+         Vaddvx<UInt64, TailProcessing::kUndisturbed>,
+         Vaddvxm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvxm<UInt64, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt64, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v2du{0xffff'ffff'ffff'ffff, 0xffff'ffff'ffff'fffe},
          __v2du{0x0000'0000'0000'0000, 0xffff'ffff'ffff'ffff},
          __v2du{0x0000'0000'0000'0000, 0x5555'5555'5555'5555});
@@ -342,74 +348,75 @@
               std::tuple{result_to_check_undisturbed_undisturbed});
   };
   Verify(
-      Vaddvvm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-      Vaddvvm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-      Vaddvvm<uint8_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-      Vaddvvm<uint8_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+      Vaddvvm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+      Vaddvvm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+      Vaddvvm<UInt8, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+      Vaddvvm<UInt8, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
       __v16qu{0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1},
       __v16qu{255, 0, 255, 0, 255, 255, 255, 0, 255, 255, 255, 255, 255, 255, 255, 255},
       __v16qu{0x55, 0, 0x55, 0, 255, 0x55, 255, 0, 255, 255, 255, 255, 255, 255, 255, 255},
       __v16qu{255, 0, 255, 0, 255, 255, 255, 0, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55},
       __v16qu{0x55, 0, 0x55, 0, 255, 0x55, 255, 0, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55});
   Verify(
-      Vaddvvm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-      Vaddvvm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-      Vaddvvm<uint8_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-      Vaddvvm<uint8_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+      Vaddvvm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+      Vaddvvm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+      Vaddvvm<UInt8, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+      Vaddvvm<UInt8, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
       __v16qu{1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0},
       __v16qu{255, 255, 255, 255, 0, 255, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255},
       __v16qu{0x55, 255, 0x55, 255, 0, 0x55, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255},
       __v16qu{255, 255, 255, 255, 0, 255, 0, 255, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55},
-      __v16qu{0x55, 255, 0x55, 255, 0, 0x55, 0, 255, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55});
-  Verify(Vaddvvm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvvm<uint16_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint16_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+      __v16qu{
+          0x55, 255, 0x55, 255, 0, 0x55, 0, 255, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55});
+  Verify(Vaddvvm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvvm<UInt16, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt16, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v8hu{0, 1, 0, 1, 0, 1, 0, 1},
          __v8hu{0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0xffff, 0xffff, 0xffff},
          __v8hu{0x5555, 0x0000, 0x5555, 0x0000, 0xffff, 0xffff, 0xffff, 0xffff},
          __v8hu{0xffff, 0x0000, 0xffff, 0x0000, 0x5555, 0x5555, 0x5555, 0x5555},
          __v8hu{0x5555, 0x0000, 0x5555, 0x0000, 0x5555, 0x5555, 0x5555, 0x5555});
-  Verify(Vaddvvm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvvm<uint16_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint16_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvvm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvvm<UInt16, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt16, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v8hu{1, 0, 1, 0, 1, 0, 1, 0},
          __v8hu{0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff},
          __v8hu{0x5555, 0xffff, 0x5555, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff},
          __v8hu{0xffff, 0xffff, 0xffff, 0xffff, 0x5555, 0x5555, 0x5555, 0x5555},
          __v8hu{0x5555, 0xffff, 0x5555, 0xffff, 0x5555, 0x5555, 0x5555, 0x5555});
-  Verify(Vaddvvm<uint32_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint32_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvvm<uint32_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint32_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvvm<UInt32, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt32, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvvm<UInt32, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt32, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v4su{0, 1, 0, 1},
          __v4su{0xffff'ffff, 0x0000'0000, 0xffff'ffff, 0xffff'ffff},
          __v4su{0x5555'5555, 0x0000'0000, 0xffff'ffff, 0xffff'ffff},
          __v4su{0xffff'ffff, 0x0000'0000, 0x5555'5555, 0x5555'5555},
          __v4su{0x5555'5555, 0x0000'0000, 0x5555'5555, 0x5555'5555});
-  Verify(Vaddvvm<uint32_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint32_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvvm<uint32_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint32_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvvm<UInt32, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt32, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvvm<UInt32, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt32, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v4su{1, 0, 1, 0},
          __v4su{0xffff'ffff, 0xffff'ffff, 0xffff'ffff, 0xffff'ffff},
          __v4su{0x5555'5555, 0xffff'ffff, 0xffff'ffff, 0xffff'ffff},
          __v4su{0xffff'ffff, 0xffff'ffff, 0x5555'5555, 0x5555'5555},
          __v4su{0x5555'5555, 0xffff'ffff, 0x5555'5555, 0x5555'5555});
-  Verify(Vaddvvm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvvm<uint64_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint64_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvvm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvvm<UInt64, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt64, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v2du{0, 1},
          __v2du{0xffff'ffff'ffff'ffff, 0xffff'ffff'ffff'ffff},
          __v2du{0x5555'5555'5555'5555, 0xffff'ffff'ffff'ffff},
          __v2du{0xffff'ffff'ffff'ffff, 0x5555'5555'5555'5555},
          __v2du{0x5555'5555'5555'5555, 0x5555'5555'5555'5555});
-  Verify(Vaddvvm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvvm<uint64_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint64_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvvm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvvm<UInt64, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt64, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v2du{1, 0},
          __v2du{0xffff'ffff'ffff'ffff, 0xffff'ffff'ffff'ffff},
          __v2du{0x5555'5555'5555'5555, 0xffff'ffff'ffff'ffff},
@@ -435,85 +442,85 @@
                                  decltype(result_to_check_undisturbed_undisturbed)>);
     constexpr size_t kHalfLen = sizeof(result_to_check_agnostic_agnostic) /
                                 sizeof(result_to_check_agnostic_agnostic[0]) / 2;
-    ASSERT_EQ(Vaddvxmaa(0, kHalfLen, 0xfdda, kUndisturbedResult, arg1, 1),
+    ASSERT_EQ(Vaddvxmaa(0, kHalfLen, 0xfdda, kUndisturbedResult, arg1, UInt8{1}),
               std::tuple{result_to_check_agnostic_agnostic});
-    ASSERT_EQ(Vaddvxmau(0, kHalfLen, 0xfdda, kUndisturbedResult, arg1, 1),
+    ASSERT_EQ(Vaddvxmau(0, kHalfLen, 0xfdda, kUndisturbedResult, arg1, UInt8{1}),
               std::tuple{result_to_check_agnostic_undisturbed});
-    ASSERT_EQ(Vaddvxmua(0, kHalfLen, 0xfdda, kUndisturbedResult, arg1, 1),
+    ASSERT_EQ(Vaddvxmua(0, kHalfLen, 0xfdda, kUndisturbedResult, arg1, UInt8{1}),
               std::tuple{result_to_check_undisturbed_agnostic});
-    ASSERT_EQ(Vaddvxmuu(0, kHalfLen, 0xfdda, kUndisturbedResult, arg1, 1),
+    ASSERT_EQ(Vaddvxmuu(0, kHalfLen, 0xfdda, kUndisturbedResult, arg1, UInt8{1}),
               std::tuple{result_to_check_undisturbed_undisturbed});
   };
   Verify(
-      Vaddvxm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-      Vaddvxm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-      Vaddvxm<uint8_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-      Vaddvxm<uint8_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+      Vaddvxm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+      Vaddvxm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+      Vaddvxm<UInt8, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+      Vaddvxm<UInt8, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
       __v16qu{254, 255, 254, 255, 254, 255, 254, 255, 254, 255, 254, 255, 254, 255, 254, 255},
       __v16qu{255, 0, 255, 0, 255, 255, 255, 0, 255, 255, 255, 255, 255, 255, 255, 255},
       __v16qu{0x55, 0, 0x55, 0, 255, 0x55, 255, 0, 255, 255, 255, 255, 255, 255, 255, 255},
       __v16qu{255, 0, 255, 0, 255, 255, 255, 0, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55},
       __v16qu{0x55, 0, 0x55, 0, 255, 0x55, 255, 0, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55});
   Verify(
-      Vaddvxm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-      Vaddvxm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-      Vaddvxm<uint8_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-      Vaddvxm<uint8_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+      Vaddvxm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+      Vaddvxm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+      Vaddvxm<UInt8, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+      Vaddvxm<UInt8, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
       __v16qu{255, 254, 255, 254, 255, 254, 255, 254, 255, 254, 255, 254, 255, 254, 255, 254},
       __v16qu{255, 255, 255, 255, 0, 255, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255},
       __v16qu{0x55, 255, 0x55, 255, 0, 0x55, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255},
       __v16qu{255, 255, 255, 255, 0, 255, 0, 255, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55},
       __v16qu{
           0x55, 255, 0x55, 255, 0, 0x55, 0, 255, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55});
-  Verify(Vaddvxm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvxm<uint16_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint16_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvxm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvxm<UInt16, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt16, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v8hu{0xfffe, 0xffff, 0xfffe, 0xffff, 0xfffe, 0xffff, 0xfffe, 0xffff},
          __v8hu{0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0xffff, 0xffff, 0xffff},
          __v8hu{0x5555, 0x0000, 0x5555, 0x0000, 0xffff, 0xffff, 0xffff, 0xffff},
          __v8hu{0xffff, 0x0000, 0xffff, 0x0000, 0x5555, 0x5555, 0x5555, 0x5555},
          __v8hu{0x5555, 0x0000, 0x5555, 0x0000, 0x5555, 0x5555, 0x5555, 0x5555});
-  Verify(Vaddvxm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvxm<uint16_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint16_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvxm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvxm<UInt16, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt16, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v8hu{0xffff, 0xfffe, 0xffff, 0xfffe, 0xffff, 0xfffe, 0xffff, 0xfffe},
          __v8hu{0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff},
          __v8hu{0x5555, 0xffff, 0x5555, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff},
          __v8hu{0xffff, 0xffff, 0xffff, 0xffff, 0x5555, 0x5555, 0x5555, 0x5555},
          __v8hu{0x5555, 0xffff, 0x5555, 0xffff, 0x5555, 0x5555, 0x5555, 0x5555});
-  Verify(Vaddvxm<uint32_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint32_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvxm<uint32_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint32_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvxm<UInt32, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt32, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvxm<UInt32, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt32, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v4su{0xffff'fffe, 0xffff'ffff, 0xffff'fffe, 0xffff'ffff},
          __v4su{0xffff'ffff, 0x0000'0000, 0xffff'ffff, 0xffff'ffff},
          __v4su{0x5555'5555, 0x0000'0000, 0xffff'ffff, 0xffff'ffff},
          __v4su{0xffff'ffff, 0x0000'0000, 0x5555'5555, 0x5555'5555},
          __v4su{0x5555'5555, 0x0000'0000, 0x5555'5555, 0x5555'5555});
-  Verify(Vaddvxm<uint32_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint32_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvxm<uint32_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint32_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvxm<UInt32, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt32, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvxm<UInt32, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt32, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v4su{0xffff'ffff, 0xffff'fffe, 0xffff'ffff, 0xffff'fffe},
          __v4su{0xffff'ffff, 0xffff'ffff, 0xffff'ffff, 0xffff'ffff},
          __v4su{0x5555'5555, 0xffff'ffff, 0xffff'ffff, 0xffff'ffff},
          __v4su{0xffff'ffff, 0xffff'ffff, 0x5555'5555, 0x5555'5555},
          __v4su{0x5555'5555, 0xffff'ffff, 0x5555'5555, 0x5555'5555});
-  Verify(Vaddvxm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvxm<uint64_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint64_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvxm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvxm<UInt64, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt64, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v2du{0xffff'ffff'ffff'fffe, 0xffff'ffff'ffff'ffff},
          __v2du{0xffff'ffff'ffff'ffff, 0xffff'ffff'ffff'ffff},
          __v2du{0x5555'5555'5555'5555, 0xffff'ffff'ffff'ffff},
          __v2du{0xffff'ffff'ffff'ffff, 0x5555'5555'5555'5555},
          __v2du{0x5555'5555'5555'5555, 0x5555'5555'5555'5555});
-  Verify(Vaddvxm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvxm<uint64_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint64_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvxm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvxm<UInt64, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt64, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v2du{0xffff'ffff'ffff'ffff, 0xffff'ffff'ffff'fffe},
          __v2du{0xffff'ffff'ffff'ffff, 0xffff'ffff'ffff'ffff},
          __v2du{0x5555'5555'5555'5555, 0xffff'ffff'ffff'ffff},
@@ -543,68 +550,68 @@
     ASSERT_EQ(Vaddvvmuu(1, 16, 0xffff, kUndisturbedResult, __m128i{-1, -1}, arg2),
               std::tuple{result_to_check});
   };
-  Verify(Vaddvv<uint8_t, TailProcessing::kAgnostic>,
-         Vaddvv<uint8_t, TailProcessing::kUndisturbed>,
-         Vaddvvm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvvm<uint8_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint8_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvv<UInt8, TailProcessing::kAgnostic>,
+         Vaddvv<UInt8, TailProcessing::kUndisturbed>,
+         Vaddvvm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvvm<UInt8, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt8, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v16qu{0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1},
          __v16qu{0x55, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0});
-  Verify(Vaddvv<uint8_t, TailProcessing::kAgnostic>,
-         Vaddvv<uint8_t, TailProcessing::kUndisturbed>,
-         Vaddvvm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvvm<uint8_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint8_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvv<UInt8, TailProcessing::kAgnostic>,
+         Vaddvv<UInt8, TailProcessing::kUndisturbed>,
+         Vaddvvm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvvm<UInt8, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt8, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v16qu{1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0},
          __v16qu{0x55, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255});
-  Verify(Vaddvv<uint16_t, TailProcessing::kAgnostic>,
-         Vaddvv<uint16_t, TailProcessing::kUndisturbed>,
-         Vaddvvm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvvm<uint16_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint16_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvv<UInt16, TailProcessing::kAgnostic>,
+         Vaddvv<UInt16, TailProcessing::kUndisturbed>,
+         Vaddvvm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvvm<UInt16, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt16, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v8hu{0, 1, 0, 1, 0, 1, 0, 1},
          __v8hu{0x5555, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000});
-  Verify(Vaddvv<uint16_t, TailProcessing::kAgnostic>,
-         Vaddvv<uint16_t, TailProcessing::kUndisturbed>,
-         Vaddvvm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvvm<uint16_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint16_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvv<UInt16, TailProcessing::kAgnostic>,
+         Vaddvv<UInt16, TailProcessing::kUndisturbed>,
+         Vaddvvm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvvm<UInt16, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt16, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v8hu{1, 0, 1, 0, 1, 0, 1, 0},
          __v8hu{0x5555, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff});
-  Verify(Vaddvv<uint32_t, TailProcessing::kAgnostic>,
-         Vaddvv<uint32_t, TailProcessing::kUndisturbed>,
-         Vaddvvm<uint32_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint32_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvvm<uint32_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint32_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvv<UInt32, TailProcessing::kAgnostic>,
+         Vaddvv<UInt32, TailProcessing::kUndisturbed>,
+         Vaddvvm<UInt32, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt32, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvvm<UInt32, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt32, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v4su{0, 1, 0, 1},
          __v4su{0x5555'5555, 0x0000'0000, 0xffff'ffff, 0x0000'0000});
-  Verify(Vaddvv<uint32_t, TailProcessing::kAgnostic>,
-         Vaddvv<uint32_t, TailProcessing::kUndisturbed>,
-         Vaddvvm<uint32_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint32_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvvm<uint32_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint32_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvv<UInt32, TailProcessing::kAgnostic>,
+         Vaddvv<UInt32, TailProcessing::kUndisturbed>,
+         Vaddvvm<UInt32, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt32, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvvm<UInt32, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt32, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v4su{1, 0, 1, 0},
          __v4su{0x5555'5555, 0xffff'ffff, 0x0000'0000, 0xffff'ffff});
-  Verify(Vaddvv<uint64_t, TailProcessing::kAgnostic>,
-         Vaddvv<uint64_t, TailProcessing::kUndisturbed>,
-         Vaddvvm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvvm<uint64_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint64_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvv<UInt64, TailProcessing::kAgnostic>,
+         Vaddvv<UInt64, TailProcessing::kUndisturbed>,
+         Vaddvvm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvvm<UInt64, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt64, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v2du{0, 1},
          __v2du{0x5555'5555'5555'5555, 0x0000'0000'0000'0000});
-  Verify(Vaddvv<uint64_t, TailProcessing::kAgnostic>,
-         Vaddvv<uint64_t, TailProcessing::kUndisturbed>,
-         Vaddvvm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvvm<uint64_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvvm<uint64_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvv<UInt64, TailProcessing::kAgnostic>,
+         Vaddvv<UInt64, TailProcessing::kUndisturbed>,
+         Vaddvvm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvvm<UInt64, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvvm<UInt64, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v2du{1, 0},
          __v2du{0x5555'5555'5555'5555, 0xffff'ffff'ffff'ffff});
 }
@@ -618,75 +625,79 @@
                    auto Vaddvxmuu,
                    SIMD128Register arg1,
                    auto result_to_check) {
-    ASSERT_EQ(Vaddvxa(1, 16, kUndisturbedResult, arg1, 1), std::tuple{result_to_check});
-    ASSERT_EQ(Vaddvxu(1, 16, kUndisturbedResult, arg1, 1), std::tuple{result_to_check});
-    ASSERT_EQ(Vaddvxmaa(1, 16, 0xffff, kUndisturbedResult, arg1, 1), std::tuple{result_to_check});
-    ASSERT_EQ(Vaddvxmau(1, 16, 0xffff, kUndisturbedResult, arg1, 1), std::tuple{result_to_check});
-    ASSERT_EQ(Vaddvxmua(1, 16, 0xffff, kUndisturbedResult, arg1, 1), std::tuple{result_to_check});
-    ASSERT_EQ(Vaddvxmuu(1, 16, 0xffff, kUndisturbedResult, arg1, 1), std::tuple{result_to_check});
+    ASSERT_EQ(Vaddvxa(1, 16, kUndisturbedResult, arg1, UInt8{1}), std::tuple{result_to_check});
+    ASSERT_EQ(Vaddvxu(1, 16, kUndisturbedResult, arg1, UInt8{1}), std::tuple{result_to_check});
+    ASSERT_EQ(Vaddvxmaa(1, 16, 0xffff, kUndisturbedResult, arg1, UInt8{1}),
+              std::tuple{result_to_check});
+    ASSERT_EQ(Vaddvxmau(1, 16, 0xffff, kUndisturbedResult, arg1, UInt8{1}),
+              std::tuple{result_to_check});
+    ASSERT_EQ(Vaddvxmua(1, 16, 0xffff, kUndisturbedResult, arg1, UInt8{1}),
+              std::tuple{result_to_check});
+    ASSERT_EQ(Vaddvxmuu(1, 16, 0xffff, kUndisturbedResult, arg1, UInt8{1}),
+              std::tuple{result_to_check});
   };
-  Verify(Vaddvx<uint8_t, TailProcessing::kAgnostic>,
-         Vaddvx<uint8_t, TailProcessing::kUndisturbed>,
-         Vaddvxm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvxm<uint8_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint8_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvx<UInt8, TailProcessing::kAgnostic>,
+         Vaddvx<UInt8, TailProcessing::kUndisturbed>,
+         Vaddvxm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvxm<UInt8, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt8, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v16qu{254, 255, 254, 255, 254, 255, 254, 255, 254, 255, 254, 255, 254, 255, 254, 255},
          __v16qu{0x55, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0});
-  Verify(Vaddvx<uint8_t, TailProcessing::kAgnostic>,
-         Vaddvx<uint8_t, TailProcessing::kUndisturbed>,
-         Vaddvxm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvxm<uint8_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint8_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvx<UInt8, TailProcessing::kAgnostic>,
+         Vaddvx<UInt8, TailProcessing::kUndisturbed>,
+         Vaddvxm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvxm<UInt8, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt8, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v16qu{255, 254, 255, 254, 255, 254, 255, 254, 255, 254, 255, 254, 255, 254, 255, 254},
          __v16qu{0x55, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255});
-  Verify(Vaddvx<uint16_t, TailProcessing::kAgnostic>,
-         Vaddvx<uint16_t, TailProcessing::kUndisturbed>,
-         Vaddvxm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvxm<uint16_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint16_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvx<UInt16, TailProcessing::kAgnostic>,
+         Vaddvx<UInt16, TailProcessing::kUndisturbed>,
+         Vaddvxm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvxm<UInt16, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt16, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v8hu{0xfffe, 0xffff, 0xfffe, 0xffff, 0xfffe, 0xffff, 0xfffe, 0xffff},
          __v8hu{0x5555, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000});
-  Verify(Vaddvx<uint16_t, TailProcessing::kAgnostic>,
-         Vaddvx<uint16_t, TailProcessing::kUndisturbed>,
-         Vaddvxm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvxm<uint16_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint16_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvx<UInt16, TailProcessing::kAgnostic>,
+         Vaddvx<UInt16, TailProcessing::kUndisturbed>,
+         Vaddvxm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvxm<UInt16, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt16, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v8hu{0xffff, 0xfffe, 0xffff, 0xfffe, 0xffff, 0xfffe, 0xffff, 0xfffe},
          __v8hu{0x5555, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff});
-  Verify(Vaddvx<uint32_t, TailProcessing::kAgnostic>,
-         Vaddvx<uint32_t, TailProcessing::kUndisturbed>,
-         Vaddvxm<uint32_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint32_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvxm<uint32_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint32_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvx<UInt32, TailProcessing::kAgnostic>,
+         Vaddvx<UInt32, TailProcessing::kUndisturbed>,
+         Vaddvxm<UInt32, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt32, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvxm<UInt32, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt32, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v4su{0xffff'fffe, 0xffff'ffff, 0xffff'fffe, 0xffff'ffff},
          __v4su{0x5555'5555, 0x0000'0000, 0xffff'ffff, 0x0000'0000});
-  Verify(Vaddvx<uint32_t, TailProcessing::kAgnostic>,
-         Vaddvx<uint32_t, TailProcessing::kUndisturbed>,
-         Vaddvxm<uint32_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint32_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvxm<uint32_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint32_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvx<UInt32, TailProcessing::kAgnostic>,
+         Vaddvx<UInt32, TailProcessing::kUndisturbed>,
+         Vaddvxm<UInt32, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt32, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvxm<UInt32, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt32, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v4su{0xffff'ffff, 0xffff'fffe, 0xffff'ffff, 0xffff'fffe},
          __v4su{0x5555'5555, 0xffff'ffff, 0x0000'0000, 0xffff'ffff});
-  Verify(Vaddvx<uint64_t, TailProcessing::kAgnostic>,
-         Vaddvx<uint64_t, TailProcessing::kUndisturbed>,
-         Vaddvxm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvxm<uint64_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint64_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvx<UInt64, TailProcessing::kAgnostic>,
+         Vaddvx<UInt64, TailProcessing::kUndisturbed>,
+         Vaddvxm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvxm<UInt64, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt64, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v2du{0xffff'ffff'ffff'fffe, 0xffff'ffff'ffff'ffff},
          __v2du{0x5555'5555'5555'5555, 0x0000'0000'0000'0000});
-  Verify(Vaddvx<uint64_t, TailProcessing::kAgnostic>,
-         Vaddvx<uint64_t, TailProcessing::kUndisturbed>,
-         Vaddvxm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
-         Vaddvxm<uint64_t, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
-         Vaddvxm<uint64_t, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
+  Verify(Vaddvx<UInt64, TailProcessing::kAgnostic>,
+         Vaddvx<UInt64, TailProcessing::kUndisturbed>,
+         Vaddvxm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kUndisturbed>,
+         Vaddvxm<UInt64, TailProcessing::kUndisturbed, InactiveProcessing::kAgnostic>,
+         Vaddvxm<UInt64, TailProcessing::kUndisturbed, InactiveProcessing::kUndisturbed>,
          __v2du{0xffff'ffff'ffff'ffff, 0xffff'ffff'ffff'fffe},
          __v2du{0x5555'5555'5555'5555, 0xffff'ffff'ffff'ffff});
 }
@@ -697,71 +708,72 @@
     ASSERT_EQ(Vsubvvm(0, 16, 0xffff, kUndisturbedResult, __m128i{0, 0}, arg2),
               std::tuple{result_to_check});
   };
-  Verify(Vsubvv<uint8_t, TailProcessing::kAgnostic>,
-         Vsubvvm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+  Verify(Vsubvv<UInt8, TailProcessing::kAgnostic>,
+         Vsubvvm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
          __v16qu{0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1},
          __v16qu{0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255});
-  Verify(Vsubvv<uint8_t, TailProcessing::kAgnostic>,
-         Vsubvvm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+  Verify(Vsubvv<UInt8, TailProcessing::kAgnostic>,
+         Vsubvvm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
          __v16qu{1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0},
          __v16qu{255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0});
-  Verify(Vsubvv<uint16_t, TailProcessing::kAgnostic>,
-         Vsubvvm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+  Verify(Vsubvv<UInt16, TailProcessing::kAgnostic>,
+         Vsubvvm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
          __v8hu{0, 1, 0, 1, 0, 1, 0, 1},
          __v8hu{0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff});
-  Verify(Vsubvv<uint16_t, TailProcessing::kAgnostic>,
-         Vsubvvm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+  Verify(Vsubvv<UInt16, TailProcessing::kAgnostic>,
+         Vsubvvm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
          __v8hu{1, 0, 1, 0, 1, 0, 1, 0},
          __v8hu{0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000});
-  Verify(Vsubvv<uint32_t, TailProcessing::kAgnostic>,
-         Vsubvvm<uint32_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+  Verify(Vsubvv<UInt32, TailProcessing::kAgnostic>,
+         Vsubvvm<UInt32, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
          __v4su{0, 1, 0, 1},
          __v4su{0x0000'0000, 0xffff'ffff, 0x0000'0000, 0xffff'ffff});
-  Verify(Vsubvv<uint64_t, TailProcessing::kAgnostic>,
-         Vsubvvm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+  Verify(Vsubvv<UInt64, TailProcessing::kAgnostic>,
+         Vsubvvm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
          __v2du{0, 1},
          __v2du{0x0000'0000'0000'0000, 0xffff'ffff'ffff'ffff});
-  Verify(Vsubvv<uint64_t, TailProcessing::kAgnostic>,
-         Vsubvvm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+  Verify(Vsubvv<UInt64, TailProcessing::kAgnostic>,
+         Vsubvvm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
          __v2du{1, 0},
          __v2du{0xffff'ffff'ffff'ffff, 0x0000'0000'0000'0000});
 }
 
 TEST(VectorIntrinsics, Vsubvx) {
   auto Verify = [](auto Vsubvx, auto Vsubvxm, SIMD128Register arg1, auto result_to_check) {
-    ASSERT_EQ(Vsubvx(0, 16, kUndisturbedResult, arg1, 1), std::tuple{result_to_check});
-    ASSERT_EQ(Vsubvxm(0, 16, 0xffff, kUndisturbedResult, arg1, 1), std::tuple{result_to_check});
+    ASSERT_EQ(Vsubvx(0, 16, kUndisturbedResult, arg1, UInt8{1}), std::tuple{result_to_check});
+    ASSERT_EQ(Vsubvxm(0, 16, 0xffff, kUndisturbedResult, arg1, UInt8{1}),
+              std::tuple{result_to_check});
   };
-  Verify(Vsubvx<uint8_t, TailProcessing::kAgnostic>,
-         Vsubvxm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+  Verify(Vsubvx<UInt8, TailProcessing::kAgnostic>,
+         Vsubvxm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
          __v16qu{1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0},
          __v16qu{0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255});
-  Verify(Vsubvx<uint8_t, TailProcessing::kAgnostic>,
-         Vsubvxm<uint8_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+  Verify(Vsubvx<UInt8, TailProcessing::kAgnostic>,
+         Vsubvxm<UInt8, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
          __v16qu{0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1},
          __v16qu{255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0});
-  Verify(Vsubvx<uint16_t, TailProcessing::kAgnostic>,
-         Vsubvxm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+  Verify(Vsubvx<UInt16, TailProcessing::kAgnostic>,
+         Vsubvxm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
          __v8hu{1, 0, 1, 0, 1, 0, 1, 0},
          __v8hu{0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff});
-  Verify(Vsubvx<uint16_t, TailProcessing::kAgnostic>,
-         Vsubvxm<uint16_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+  Verify(Vsubvx<UInt16, TailProcessing::kAgnostic>,
+         Vsubvxm<UInt16, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
          __v8hu{0, 1, 0, 1, 0, 1, 0, 1},
          __v8hu{0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000});
-  Verify(Vsubvx<uint32_t, TailProcessing::kAgnostic>,
-         Vsubvxm<uint32_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+  Verify(Vsubvx<UInt32, TailProcessing::kAgnostic>,
+         Vsubvxm<UInt32, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
          __v4su{1, 0, 1, 0},
          __v4su{0x0000'0000, 0xffff'ffff, 0x0000'0000, 0xffff'ffff});
-  Verify(Vsubvx<uint32_t, TailProcessing::kAgnostic>,
-         Vsubvxm<uint32_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+  Verify(Vsubvx<UInt32, TailProcessing::kAgnostic>,
+         Vsubvxm<UInt32, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
          __v4su{0, 1, 0, 1},
          __v4su{0xffff'ffff, 0x0000'0000, 0xffff'ffff, 0x0000'0000});
-  Verify(Vsubvx<uint64_t, TailProcessing::kAgnostic>,
-         Vsubvxm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+  Verify(Vsubvx<UInt64, TailProcessing::kAgnostic>,
+         Vsubvxm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
          __v2du{1, 0},
          __v2du{0x0000'0000'0000'0000, 0xffff'ffff'ffff'ffff});
-  Verify(Vsubvx<uint64_t, TailProcessing::kAgnostic>,
-         Vsubvxm<uint64_t, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
+  Verify(Vsubvx<UInt64, TailProcessing::kAgnostic>,
+         Vsubvxm<UInt64, TailProcessing::kAgnostic, InactiveProcessing::kAgnostic>,
          __v2du{0, 1},
          __v2du{0xffff'ffff'ffff'ffff, 0x0000'0000'0000'0000});
 }