Rename VUnOpMicrokernelTester -> VUnaryMicrokernelTester

Make the class name match the filename

PiperOrigin-RevId: 373632112
diff --git a/test/f32-vrelu.cc b/test/f32-vrelu.cc
index b1edabc..792278d 100644
--- a/test/f32-vrelu.cc
+++ b/test/f32-vrelu.cc
@@ -20,45 +20,45 @@
 #if XNN_ARCH_ARM || XNN_ARCH_ARM64
   TEST(F32_VRELU__NEON_X4, batch_eq_4) {
     TEST_REQUIRES_ARM_NEON;
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__neon_x4), VUnOpMicrokernelTester::OpType::ReLU);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::ReLU);
   }
 
   TEST(F32_VRELU__NEON_X4, batch_div_4) {
     TEST_REQUIRES_ARM_NEON;
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__neon_x4), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__NEON_X4, batch_lt_4) {
     TEST_REQUIRES_ARM_NEON;
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__neon_x4), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__NEON_X4, batch_gt_4) {
     TEST_REQUIRES_ARM_NEON;
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__neon_x4), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__NEON_X4, inplace) {
     TEST_REQUIRES_ARM_NEON;
     for (size_t batch_size = 1; batch_size <= 20; batch_size += 3) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__neon_x4), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -67,45 +67,45 @@
 #if XNN_ARCH_ARM || XNN_ARCH_ARM64
   TEST(F32_VRELU__NEON_X8, batch_eq_8) {
     TEST_REQUIRES_ARM_NEON;
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__neon_x8), VUnOpMicrokernelTester::OpType::ReLU);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::ReLU);
   }
 
   TEST(F32_VRELU__NEON_X8, batch_div_8) {
     TEST_REQUIRES_ARM_NEON;
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__neon_x8), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__NEON_X8, batch_lt_8) {
     TEST_REQUIRES_ARM_NEON;
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__neon_x8), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__NEON_X8, batch_gt_8) {
     TEST_REQUIRES_ARM_NEON;
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__neon_x8), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__NEON_X8, inplace) {
     TEST_REQUIRES_ARM_NEON;
     for (size_t batch_size = 1; batch_size <= 40; batch_size += 7) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__neon_x8), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -114,45 +114,45 @@
 #if XNN_ARCH_X86 || XNN_ARCH_X86_64
   TEST(F32_VRELU__SSE_X4, batch_eq_4) {
     TEST_REQUIRES_X86_SSE;
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__sse_x4), VUnOpMicrokernelTester::OpType::ReLU);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::ReLU);
   }
 
   TEST(F32_VRELU__SSE_X4, batch_div_4) {
     TEST_REQUIRES_X86_SSE;
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__sse_x4), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__SSE_X4, batch_lt_4) {
     TEST_REQUIRES_X86_SSE;
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__sse_x4), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__SSE_X4, batch_gt_4) {
     TEST_REQUIRES_X86_SSE;
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__sse_x4), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__SSE_X4, inplace) {
     TEST_REQUIRES_X86_SSE;
     for (size_t batch_size = 1; batch_size <= 20; batch_size += 3) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__sse_x4), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -161,45 +161,45 @@
 #if XNN_ARCH_X86 || XNN_ARCH_X86_64
   TEST(F32_VRELU__SSE_X8, batch_eq_8) {
     TEST_REQUIRES_X86_SSE;
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__sse_x8), VUnOpMicrokernelTester::OpType::ReLU);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::ReLU);
   }
 
   TEST(F32_VRELU__SSE_X8, batch_div_8) {
     TEST_REQUIRES_X86_SSE;
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__sse_x8), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__SSE_X8, batch_lt_8) {
     TEST_REQUIRES_X86_SSE;
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__sse_x8), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__SSE_X8, batch_gt_8) {
     TEST_REQUIRES_X86_SSE;
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__sse_x8), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__SSE_X8, inplace) {
     TEST_REQUIRES_X86_SSE;
     for (size_t batch_size = 1; batch_size <= 40; batch_size += 7) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__sse_x8), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -208,45 +208,45 @@
 #if XNN_ARCH_X86 || XNN_ARCH_X86_64
   TEST(F32_VRELU__AVX_X8, batch_eq_8) {
     TEST_REQUIRES_X86_AVX;
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx_x8), VUnOpMicrokernelTester::OpType::ReLU);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::ReLU);
   }
 
   TEST(F32_VRELU__AVX_X8, batch_div_8) {
     TEST_REQUIRES_X86_AVX;
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx_x8), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__AVX_X8, batch_lt_8) {
     TEST_REQUIRES_X86_AVX;
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx_x8), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__AVX_X8, batch_gt_8) {
     TEST_REQUIRES_X86_AVX;
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx_x8), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__AVX_X8, inplace) {
     TEST_REQUIRES_X86_AVX;
     for (size_t batch_size = 1; batch_size <= 40; batch_size += 7) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx_x8), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -255,45 +255,45 @@
 #if XNN_ARCH_X86 || XNN_ARCH_X86_64
   TEST(F32_VRELU__AVX_X16, batch_eq_16) {
     TEST_REQUIRES_X86_AVX;
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx_x16), VUnOpMicrokernelTester::OpType::ReLU);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::ReLU);
   }
 
   TEST(F32_VRELU__AVX_X16, batch_div_16) {
     TEST_REQUIRES_X86_AVX;
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx_x16), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__AVX_X16, batch_lt_16) {
     TEST_REQUIRES_X86_AVX;
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx_x16), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__AVX_X16, batch_gt_16) {
     TEST_REQUIRES_X86_AVX;
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx_x16), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__AVX_X16, inplace) {
     TEST_REQUIRES_X86_AVX;
     for (size_t batch_size = 1; batch_size <= 80; batch_size += 15) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx_x16), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -302,45 +302,45 @@
 #if XNN_ARCH_X86 || XNN_ARCH_X86_64
   TEST(F32_VRELU__AVX512F_X16, batch_eq_16) {
     TEST_REQUIRES_X86_AVX512F;
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx512f_x16), VUnOpMicrokernelTester::OpType::ReLU);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::ReLU);
   }
 
   TEST(F32_VRELU__AVX512F_X16, batch_div_16) {
     TEST_REQUIRES_X86_AVX512F;
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx512f_x16), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__AVX512F_X16, batch_lt_16) {
     TEST_REQUIRES_X86_AVX512F;
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx512f_x16), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__AVX512F_X16, batch_gt_16) {
     TEST_REQUIRES_X86_AVX512F;
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx512f_x16), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__AVX512F_X16, inplace) {
     TEST_REQUIRES_X86_AVX512F;
     for (size_t batch_size = 1; batch_size <= 80; batch_size += 15) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx512f_x16), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -349,215 +349,215 @@
 #if XNN_ARCH_X86 || XNN_ARCH_X86_64
   TEST(F32_VRELU__AVX512F_X32, batch_eq_32) {
     TEST_REQUIRES_X86_AVX512F;
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx512f_x32), VUnOpMicrokernelTester::OpType::ReLU);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::ReLU);
   }
 
   TEST(F32_VRELU__AVX512F_X32, batch_div_32) {
     TEST_REQUIRES_X86_AVX512F;
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx512f_x32), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__AVX512F_X32, batch_lt_32) {
     TEST_REQUIRES_X86_AVX512F;
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx512f_x32), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__AVX512F_X32, batch_gt_32) {
     TEST_REQUIRES_X86_AVX512F;
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx512f_x32), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__AVX512F_X32, inplace) {
     TEST_REQUIRES_X86_AVX512F;
     for (size_t batch_size = 1; batch_size <= 160; batch_size += 31) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx512f_x32), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
 
 
 TEST(F32_VRELU__SCALAR_X1, batch_eq_1) {
-  VUnOpMicrokernelTester()
+  VUnaryMicrokernelTester()
     .batch_size(1)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x1), VUnOpMicrokernelTester::OpType::ReLU, VUnOpMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x1), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VRELU__SCALAR_X1, batch_gt_1) {
   for (size_t batch_size = 2; batch_size < 10; batch_size++) {
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x1), VUnOpMicrokernelTester::OpType::ReLU, VUnOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x1), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VRELU__SCALAR_X1, inplace) {
   for (size_t batch_size = 1; batch_size <= 5; batch_size += 1) {
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x1), VUnOpMicrokernelTester::OpType::ReLU, VUnOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x1), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 
 TEST(F32_VRELU__SCALAR_X2, batch_eq_2) {
-  VUnOpMicrokernelTester()
+  VUnaryMicrokernelTester()
     .batch_size(2)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x2), VUnOpMicrokernelTester::OpType::ReLU, VUnOpMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VRELU__SCALAR_X2, batch_div_2) {
   for (size_t batch_size = 4; batch_size < 20; batch_size += 2) {
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x2), VUnOpMicrokernelTester::OpType::ReLU, VUnOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VRELU__SCALAR_X2, batch_lt_2) {
   for (size_t batch_size = 1; batch_size < 2; batch_size++) {
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x2), VUnOpMicrokernelTester::OpType::ReLU, VUnOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VRELU__SCALAR_X2, batch_gt_2) {
   for (size_t batch_size = 3; batch_size < 4; batch_size++) {
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x2), VUnOpMicrokernelTester::OpType::ReLU, VUnOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VRELU__SCALAR_X2, inplace) {
   for (size_t batch_size = 1; batch_size <= 10; batch_size += 1) {
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x2), VUnOpMicrokernelTester::OpType::ReLU, VUnOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 
 TEST(F32_VRELU__SCALAR_X4, batch_eq_4) {
-  VUnOpMicrokernelTester()
+  VUnaryMicrokernelTester()
     .batch_size(4)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x4), VUnOpMicrokernelTester::OpType::ReLU, VUnOpMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VRELU__SCALAR_X4, batch_div_4) {
   for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x4), VUnOpMicrokernelTester::OpType::ReLU, VUnOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VRELU__SCALAR_X4, batch_lt_4) {
   for (size_t batch_size = 1; batch_size < 4; batch_size++) {
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x4), VUnOpMicrokernelTester::OpType::ReLU, VUnOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VRELU__SCALAR_X4, batch_gt_4) {
   for (size_t batch_size = 5; batch_size < 8; batch_size++) {
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x4), VUnOpMicrokernelTester::OpType::ReLU, VUnOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VRELU__SCALAR_X4, inplace) {
   for (size_t batch_size = 1; batch_size <= 20; batch_size += 3) {
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x4), VUnOpMicrokernelTester::OpType::ReLU, VUnOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 
 TEST(F32_VRELU__SCALAR_X8, batch_eq_8) {
-  VUnOpMicrokernelTester()
+  VUnaryMicrokernelTester()
     .batch_size(8)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x8), VUnOpMicrokernelTester::OpType::ReLU, VUnOpMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x8), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VRELU__SCALAR_X8, batch_div_8) {
   for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x8), VUnOpMicrokernelTester::OpType::ReLU, VUnOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x8), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VRELU__SCALAR_X8, batch_lt_8) {
   for (size_t batch_size = 1; batch_size < 8; batch_size++) {
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x8), VUnOpMicrokernelTester::OpType::ReLU, VUnOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x8), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VRELU__SCALAR_X8, batch_gt_8) {
   for (size_t batch_size = 9; batch_size < 16; batch_size++) {
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x8), VUnOpMicrokernelTester::OpType::ReLU, VUnOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x8), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VRELU__SCALAR_X8, inplace) {
   for (size_t batch_size = 1; batch_size <= 40; batch_size += 7) {
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x8), VUnOpMicrokernelTester::OpType::ReLU, VUnOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x8), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 
 #if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
   TEST(F32_VRELU__WASM_X1, batch_eq_1) {
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(1)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x1), VUnOpMicrokernelTester::OpType::ReLU);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x1), VUnaryMicrokernelTester::OpType::ReLU);
   }
 
   TEST(F32_VRELU__WASM_X1, batch_gt_1) {
     for (size_t batch_size = 2; batch_size < 10; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x1), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x1), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__WASM_X1, inplace) {
     for (size_t batch_size = 1; batch_size <= 5; batch_size += 1) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x1), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x1), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
@@ -565,41 +565,41 @@
 
 #if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
   TEST(F32_VRELU__WASM_X2, batch_eq_2) {
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(2)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x2), VUnOpMicrokernelTester::OpType::ReLU);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x2), VUnaryMicrokernelTester::OpType::ReLU);
   }
 
   TEST(F32_VRELU__WASM_X2, batch_div_2) {
     for (size_t batch_size = 4; batch_size < 20; batch_size += 2) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x2), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x2), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__WASM_X2, batch_lt_2) {
     for (size_t batch_size = 1; batch_size < 2; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x2), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x2), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__WASM_X2, batch_gt_2) {
     for (size_t batch_size = 3; batch_size < 4; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x2), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x2), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__WASM_X2, inplace) {
     for (size_t batch_size = 1; batch_size <= 10; batch_size += 1) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x2), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x2), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
@@ -607,41 +607,41 @@
 
 #if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
   TEST(F32_VRELU__WASM_X4, batch_eq_4) {
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x4), VUnOpMicrokernelTester::OpType::ReLU);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x4), VUnaryMicrokernelTester::OpType::ReLU);
   }
 
   TEST(F32_VRELU__WASM_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x4), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x4), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__WASM_X4, batch_lt_4) {
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x4), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x4), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__WASM_X4, batch_gt_4) {
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x4), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x4), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__WASM_X4, inplace) {
     for (size_t batch_size = 1; batch_size <= 20; batch_size += 3) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x4), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x4), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
@@ -649,41 +649,41 @@
 
 #if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
   TEST(F32_VRELU__WASM_X8, batch_eq_8) {
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x8), VUnOpMicrokernelTester::OpType::ReLU);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x8), VUnaryMicrokernelTester::OpType::ReLU);
   }
 
   TEST(F32_VRELU__WASM_X8, batch_div_8) {
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x8), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x8), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__WASM_X8, batch_lt_8) {
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x8), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x8), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__WASM_X8, batch_gt_8) {
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x8), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x8), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__WASM_X8, inplace) {
     for (size_t batch_size = 1; batch_size <= 40; batch_size += 7) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x8), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x8), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
@@ -691,41 +691,41 @@
 
 #if XNN_ARCH_WASMSIMD
   TEST(F32_VRELU__WASMSIMD_X4, batch_eq_4) {
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x4), VUnOpMicrokernelTester::OpType::ReLU);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x4), VUnaryMicrokernelTester::OpType::ReLU);
   }
 
   TEST(F32_VRELU__WASMSIMD_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x4), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x4), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__WASMSIMD_X4, batch_lt_4) {
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x4), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x4), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__WASMSIMD_X4, batch_gt_4) {
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x4), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x4), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__WASMSIMD_X4, inplace) {
     for (size_t batch_size = 1; batch_size <= 20; batch_size += 3) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x4), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x4), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -733,41 +733,41 @@
 
 #if XNN_ARCH_WASMSIMD
   TEST(F32_VRELU__WASMSIMD_X8, batch_eq_8) {
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x8), VUnOpMicrokernelTester::OpType::ReLU);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x8), VUnaryMicrokernelTester::OpType::ReLU);
   }
 
   TEST(F32_VRELU__WASMSIMD_X8, batch_div_8) {
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x8), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x8), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__WASMSIMD_X8, batch_lt_8) {
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x8), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x8), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__WASMSIMD_X8, batch_gt_8) {
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x8), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x8), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__WASMSIMD_X8, inplace) {
     for (size_t batch_size = 1; batch_size <= 40; batch_size += 7) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x8), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x8), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -775,41 +775,41 @@
 
 #if XNN_ARCH_WASMSIMD
   TEST(F32_VRELU__WASMSIMD_X16, batch_eq_16) {
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x16), VUnOpMicrokernelTester::OpType::ReLU);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x16), VUnaryMicrokernelTester::OpType::ReLU);
   }
 
   TEST(F32_VRELU__WASMSIMD_X16, batch_div_16) {
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x16), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x16), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__WASMSIMD_X16, batch_lt_16) {
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x16), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x16), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__WASMSIMD_X16, batch_gt_16) {
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x16), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x16), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__WASMSIMD_X16, inplace) {
     for (size_t batch_size = 1; batch_size <= 80; batch_size += 15) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x16), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x16), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -817,25 +817,25 @@
 
 #if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
   TEST(F32_VRELU__WASM32_SHR_X1, batch_eq_1) {
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(1)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x1), VUnOpMicrokernelTester::OpType::ReLU);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x1), VUnaryMicrokernelTester::OpType::ReLU);
   }
 
   TEST(F32_VRELU__WASM32_SHR_X1, batch_gt_1) {
     for (size_t batch_size = 2; batch_size < 10; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x1), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x1), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__WASM32_SHR_X1, inplace) {
     for (size_t batch_size = 1; batch_size <= 5; batch_size += 1) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x1), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x1), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
@@ -843,41 +843,41 @@
 
 #if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
   TEST(F32_VRELU__WASM32_SHR_X2, batch_eq_2) {
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(2)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x2), VUnOpMicrokernelTester::OpType::ReLU);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x2), VUnaryMicrokernelTester::OpType::ReLU);
   }
 
   TEST(F32_VRELU__WASM32_SHR_X2, batch_div_2) {
     for (size_t batch_size = 4; batch_size < 20; batch_size += 2) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x2), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x2), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__WASM32_SHR_X2, batch_lt_2) {
     for (size_t batch_size = 1; batch_size < 2; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x2), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x2), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__WASM32_SHR_X2, batch_gt_2) {
     for (size_t batch_size = 3; batch_size < 4; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x2), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x2), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__WASM32_SHR_X2, inplace) {
     for (size_t batch_size = 1; batch_size <= 10; batch_size += 1) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x2), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x2), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
@@ -885,41 +885,41 @@
 
 #if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
   TEST(F32_VRELU__WASM32_SHR_X4, batch_eq_4) {
-    VUnOpMicrokernelTester()
+    VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x4), VUnOpMicrokernelTester::OpType::ReLU);
+      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x4), VUnaryMicrokernelTester::OpType::ReLU);
   }
 
   TEST(F32_VRELU__WASM32_SHR_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x4), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x4), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__WASM32_SHR_X4, batch_lt_4) {
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x4), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x4), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__WASM32_SHR_X4, batch_gt_4) {
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x4), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x4), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
   TEST(F32_VRELU__WASM32_SHR_X4, inplace) {
     for (size_t batch_size = 1; batch_size <= 20; batch_size += 3) {
-      VUnOpMicrokernelTester()
+      VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x4), VUnOpMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x4), VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD