Remove pointer casting in generated vector unary tests

Open opportunity for generating FP16 and integer tests

PiperOrigin-RevId: 373669369
diff --git a/src/xnnpack/params.h b/src/xnnpack/params.h
index 9a7105aa..65a54f2 100644
--- a/src/xnnpack/params.h
+++ b/src/xnnpack/params.h
@@ -1489,19 +1489,19 @@
     void* y,
     const void* params);
 
-typedef void (*xnn_f16_clamp_ukernel_function)(
+typedef void (*xnn_f16_vclamp_ukernel_function)(
     size_t n,
     const void* x,
     void* y,
     const struct xnn_f16_minmax_params* params);
 
-typedef void (*xnn_f32_clamp_ukernel_function)(
+typedef void (*xnn_f32_vclamp_ukernel_function)(
     size_t n,
     const float* x,
     float* y,
     const union xnn_f32_minmax_params* params);
 
-typedef void (*xnn_u8_clamp_ukernel_function)(
+typedef void (*xnn_u8_vclamp_ukernel_function)(
     size_t n,
     const uint8_t* x,
     uint8_t* y,
@@ -1531,6 +1531,30 @@
     float* y,
     const union xnn_f32_hswish_params* params);
 
+typedef void (*xnn_f32_vabs_ukernel_function)(
+    size_t n,
+    const float* x,
+    float* y,
+    const union xnn_f32_abs_params* params);
+
+typedef void (*xnn_f32_vlrelu_ukernel_function)(
+    size_t n,
+    const float* x,
+    float* y,
+    const union xnn_f32_lrelu_params* params);
+
+typedef void (*xnn_f32_vneg_ukernel_function)(
+    size_t n,
+    const float* x,
+    float* y,
+    const union xnn_f32_neg_params* params);
+
+typedef void (*xnn_f32_vround_ukernel_function)(
+    size_t n,
+    const float* x,
+    float* y,
+    const union xnn_f32_rnd_params* params);
+
 typedef void (*xnn_rmax_ukernel_function)(
     size_t n,
     const void* x,
diff --git a/test/f32-vabs.cc b/test/f32-vabs.cc
index 75a08ab..72533bd 100644
--- a/test/f32-vabs.cc
+++ b/test/f32-vabs.cc
@@ -22,7 +22,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::Abs);
+      .Test(xnn_f32_vabs_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::Abs);
   }
 
   TEST(F32_VABS__NEON_X4, batch_div_4) {
@@ -30,7 +30,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 
@@ -39,7 +39,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 
@@ -48,7 +48,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 
@@ -58,7 +58,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -69,7 +69,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::Abs);
+      .Test(xnn_f32_vabs_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::Abs);
   }
 
   TEST(F32_VABS__NEON_X8, batch_div_8) {
@@ -77,7 +77,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 
@@ -86,7 +86,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 
@@ -95,7 +95,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 
@@ -105,7 +105,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -116,7 +116,7 @@
     TEST_REQUIRES_X86_SSE;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::Abs);
+      .Test(xnn_f32_vabs_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::Abs);
   }
 
   TEST(F32_VABS__SSE_X4, batch_div_4) {
@@ -124,7 +124,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 
@@ -133,7 +133,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 
@@ -142,7 +142,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 
@@ -152,7 +152,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -163,7 +163,7 @@
     TEST_REQUIRES_X86_SSE;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::Abs);
+      .Test(xnn_f32_vabs_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::Abs);
   }
 
   TEST(F32_VABS__SSE_X8, batch_div_8) {
@@ -171,7 +171,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 
@@ -180,7 +180,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 
@@ -189,7 +189,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 
@@ -199,7 +199,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -210,7 +210,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::Abs);
+      .Test(xnn_f32_vabs_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::Abs);
   }
 
   TEST(F32_VABS__AVX_X8, batch_div_8) {
@@ -218,7 +218,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 
@@ -227,7 +227,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 
@@ -236,7 +236,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 
@@ -246,7 +246,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -257,7 +257,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::Abs);
+      .Test(xnn_f32_vabs_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::Abs);
   }
 
   TEST(F32_VABS__AVX_X16, batch_div_16) {
@@ -265,7 +265,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 
@@ -274,7 +274,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 
@@ -283,7 +283,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 
@@ -293,7 +293,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -304,7 +304,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::Abs);
+      .Test(xnn_f32_vabs_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::Abs);
   }
 
   TEST(F32_VABS__AVX512F_X16, batch_div_16) {
@@ -312,7 +312,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 
@@ -321,7 +321,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 
@@ -330,7 +330,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 
@@ -340,7 +340,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -351,7 +351,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::Abs);
+      .Test(xnn_f32_vabs_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::Abs);
   }
 
   TEST(F32_VABS__AVX512F_X32, batch_div_32) {
@@ -359,7 +359,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 
@@ -368,7 +368,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 
@@ -377,7 +377,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 
@@ -387,7 +387,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -397,14 +397,14 @@
   TEST(F32_VABS__WASMSIMD_X4, batch_eq_4) {
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__wasmsimd_x4), VUnaryMicrokernelTester::OpType::Abs);
+      .Test(xnn_f32_vabs_ukernel__wasmsimd_x4, VUnaryMicrokernelTester::OpType::Abs);
   }
 
   TEST(F32_VABS__WASMSIMD_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__wasmsimd_x4), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__wasmsimd_x4, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 
@@ -412,7 +412,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__wasmsimd_x4), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__wasmsimd_x4, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 
@@ -420,7 +420,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__wasmsimd_x4), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__wasmsimd_x4, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 
@@ -429,7 +429,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__wasmsimd_x4), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__wasmsimd_x4, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -439,14 +439,14 @@
   TEST(F32_VABS__WASMSIMD_X8, batch_eq_8) {
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__wasmsimd_x8), VUnaryMicrokernelTester::OpType::Abs);
+      .Test(xnn_f32_vabs_ukernel__wasmsimd_x8, VUnaryMicrokernelTester::OpType::Abs);
   }
 
   TEST(F32_VABS__WASMSIMD_X8, batch_div_8) {
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__wasmsimd_x8), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__wasmsimd_x8, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 
@@ -454,7 +454,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__wasmsimd_x8), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__wasmsimd_x8, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 
@@ -462,7 +462,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__wasmsimd_x8), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__wasmsimd_x8, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 
@@ -471,7 +471,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__wasmsimd_x8), VUnaryMicrokernelTester::OpType::Abs);
+        .Test(xnn_f32_vabs_ukernel__wasmsimd_x8, VUnaryMicrokernelTester::OpType::Abs);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -480,14 +480,14 @@
 TEST(F32_VABS__SCALAR_X1, batch_eq_1) {
   VUnaryMicrokernelTester()
     .batch_size(1)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__scalar_x1), VUnaryMicrokernelTester::OpType::Abs, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vabs_ukernel__scalar_x1, VUnaryMicrokernelTester::OpType::Abs, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VABS__SCALAR_X1, batch_gt_1) {
   for (size_t batch_size = 2; batch_size < 10; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__scalar_x1), VUnaryMicrokernelTester::OpType::Abs, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vabs_ukernel__scalar_x1, VUnaryMicrokernelTester::OpType::Abs, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -496,7 +496,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__scalar_x1), VUnaryMicrokernelTester::OpType::Abs, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vabs_ukernel__scalar_x1, VUnaryMicrokernelTester::OpType::Abs, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -504,14 +504,14 @@
 TEST(F32_VABS__SCALAR_X2, batch_eq_2) {
   VUnaryMicrokernelTester()
     .batch_size(2)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::Abs, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vabs_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::Abs, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VABS__SCALAR_X2, batch_div_2) {
   for (size_t batch_size = 4; batch_size < 20; batch_size += 2) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::Abs, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vabs_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::Abs, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -519,7 +519,7 @@
   for (size_t batch_size = 1; batch_size < 2; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::Abs, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vabs_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::Abs, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -527,7 +527,7 @@
   for (size_t batch_size = 3; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::Abs, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vabs_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::Abs, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -536,7 +536,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::Abs, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vabs_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::Abs, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -544,14 +544,14 @@
 TEST(F32_VABS__SCALAR_X4, batch_eq_4) {
   VUnaryMicrokernelTester()
     .batch_size(4)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::Abs, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vabs_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::Abs, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VABS__SCALAR_X4, batch_div_4) {
   for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::Abs, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vabs_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::Abs, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -559,7 +559,7 @@
   for (size_t batch_size = 1; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::Abs, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vabs_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::Abs, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -567,7 +567,7 @@
   for (size_t batch_size = 5; batch_size < 8; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::Abs, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vabs_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::Abs, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -576,6 +576,6 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vabs_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::Abs, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vabs_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::Abs, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
diff --git a/test/f32-vclamp.cc b/test/f32-vclamp.cc
index 0859ce2..39df598 100644
--- a/test/f32-vclamp.cc
+++ b/test/f32-vclamp.cc
@@ -22,7 +22,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::Clamp);
+      .Test(xnn_f32_vclamp_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::Clamp);
   }
 
   TEST(F32_VCLAMP__NEON_X4, batch_div_4) {
@@ -30,7 +30,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -39,7 +39,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -48,7 +48,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -58,7 +58,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -69,7 +69,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .qmin(qmin)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::Clamp);
+          .Test(xnn_f32_vclamp_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::Clamp);
       }
     }
   }
@@ -81,7 +81,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .qmax(qmax)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::Clamp);
+          .Test(xnn_f32_vclamp_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::Clamp);
       }
     }
   }
@@ -93,7 +93,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::Clamp);
+      .Test(xnn_f32_vclamp_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::Clamp);
   }
 
   TEST(F32_VCLAMP__NEON_X8, batch_div_8) {
@@ -101,7 +101,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -110,7 +110,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -119,7 +119,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -129,7 +129,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -140,7 +140,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .qmin(qmin)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::Clamp);
+          .Test(xnn_f32_vclamp_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::Clamp);
       }
     }
   }
@@ -152,7 +152,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .qmax(qmax)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::Clamp);
+          .Test(xnn_f32_vclamp_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::Clamp);
       }
     }
   }
@@ -164,7 +164,7 @@
     TEST_REQUIRES_X86_SSE;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::Clamp);
+      .Test(xnn_f32_vclamp_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::Clamp);
   }
 
   TEST(F32_VCLAMP__SSE_X4, batch_div_4) {
@@ -172,7 +172,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -181,7 +181,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -190,7 +190,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -200,7 +200,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -211,7 +211,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .qmin(qmin)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::Clamp);
+          .Test(xnn_f32_vclamp_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::Clamp);
       }
     }
   }
@@ -223,7 +223,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .qmax(qmax)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::Clamp);
+          .Test(xnn_f32_vclamp_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::Clamp);
       }
     }
   }
@@ -235,7 +235,7 @@
     TEST_REQUIRES_X86_SSE;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::Clamp);
+      .Test(xnn_f32_vclamp_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::Clamp);
   }
 
   TEST(F32_VCLAMP__SSE_X8, batch_div_8) {
@@ -243,7 +243,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -252,7 +252,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -261,7 +261,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -271,7 +271,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -282,7 +282,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .qmin(qmin)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::Clamp);
+          .Test(xnn_f32_vclamp_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::Clamp);
       }
     }
   }
@@ -294,7 +294,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .qmax(qmax)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::Clamp);
+          .Test(xnn_f32_vclamp_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::Clamp);
       }
     }
   }
@@ -306,7 +306,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::Clamp);
+      .Test(xnn_f32_vclamp_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::Clamp);
   }
 
   TEST(F32_VCLAMP__AVX_X8, batch_div_8) {
@@ -314,7 +314,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -323,7 +323,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -332,7 +332,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -342,7 +342,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -353,7 +353,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .qmin(qmin)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::Clamp);
+          .Test(xnn_f32_vclamp_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::Clamp);
       }
     }
   }
@@ -365,7 +365,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .qmax(qmax)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::Clamp);
+          .Test(xnn_f32_vclamp_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::Clamp);
       }
     }
   }
@@ -377,7 +377,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::Clamp);
+      .Test(xnn_f32_vclamp_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::Clamp);
   }
 
   TEST(F32_VCLAMP__AVX_X16, batch_div_16) {
@@ -385,7 +385,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -394,7 +394,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -403,7 +403,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -413,7 +413,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -424,7 +424,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .qmin(qmin)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::Clamp);
+          .Test(xnn_f32_vclamp_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::Clamp);
       }
     }
   }
@@ -436,7 +436,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .qmax(qmax)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::Clamp);
+          .Test(xnn_f32_vclamp_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::Clamp);
       }
     }
   }
@@ -448,7 +448,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::Clamp);
+      .Test(xnn_f32_vclamp_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::Clamp);
   }
 
   TEST(F32_VCLAMP__AVX512F_X16, batch_div_16) {
@@ -456,7 +456,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -465,7 +465,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -474,7 +474,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -484,7 +484,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -495,7 +495,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .qmin(qmin)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::Clamp);
+          .Test(xnn_f32_vclamp_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::Clamp);
       }
     }
   }
@@ -507,7 +507,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .qmax(qmax)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::Clamp);
+          .Test(xnn_f32_vclamp_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::Clamp);
       }
     }
   }
@@ -519,7 +519,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::Clamp);
+      .Test(xnn_f32_vclamp_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::Clamp);
   }
 
   TEST(F32_VCLAMP__AVX512F_X32, batch_div_32) {
@@ -527,7 +527,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -536,7 +536,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -545,7 +545,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -555,7 +555,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -566,7 +566,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .qmin(qmin)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::Clamp);
+          .Test(xnn_f32_vclamp_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::Clamp);
       }
     }
   }
@@ -578,7 +578,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .qmax(qmax)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::Clamp);
+          .Test(xnn_f32_vclamp_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::Clamp);
       }
     }
   }
@@ -589,14 +589,14 @@
   TEST(F32_VCLAMP__WASMSIMD_ARM_X4, batch_eq_4) {
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasmsimd_arm_x4), VUnaryMicrokernelTester::OpType::Clamp);
+      .Test(xnn_f32_vclamp_ukernel__wasmsimd_arm_x4, VUnaryMicrokernelTester::OpType::Clamp);
   }
 
   TEST(F32_VCLAMP__WASMSIMD_ARM_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasmsimd_arm_x4), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__wasmsimd_arm_x4, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -604,7 +604,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasmsimd_arm_x4), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__wasmsimd_arm_x4, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -612,7 +612,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasmsimd_arm_x4), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__wasmsimd_arm_x4, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -621,7 +621,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasmsimd_arm_x4), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__wasmsimd_arm_x4, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -631,7 +631,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .qmin(qmin)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasmsimd_arm_x4), VUnaryMicrokernelTester::OpType::Clamp);
+          .Test(xnn_f32_vclamp_ukernel__wasmsimd_arm_x4, VUnaryMicrokernelTester::OpType::Clamp);
       }
     }
   }
@@ -642,7 +642,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .qmax(qmax)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasmsimd_arm_x4), VUnaryMicrokernelTester::OpType::Clamp);
+          .Test(xnn_f32_vclamp_ukernel__wasmsimd_arm_x4, VUnaryMicrokernelTester::OpType::Clamp);
       }
     }
   }
@@ -653,14 +653,14 @@
   TEST(F32_VCLAMP__WASMSIMD_ARM_X8, batch_eq_8) {
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasmsimd_arm_x8), VUnaryMicrokernelTester::OpType::Clamp);
+      .Test(xnn_f32_vclamp_ukernel__wasmsimd_arm_x8, VUnaryMicrokernelTester::OpType::Clamp);
   }
 
   TEST(F32_VCLAMP__WASMSIMD_ARM_X8, batch_div_8) {
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasmsimd_arm_x8), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__wasmsimd_arm_x8, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -668,7 +668,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasmsimd_arm_x8), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__wasmsimd_arm_x8, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -676,7 +676,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasmsimd_arm_x8), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__wasmsimd_arm_x8, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -685,7 +685,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasmsimd_arm_x8), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__wasmsimd_arm_x8, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -695,7 +695,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .qmin(qmin)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasmsimd_arm_x8), VUnaryMicrokernelTester::OpType::Clamp);
+          .Test(xnn_f32_vclamp_ukernel__wasmsimd_arm_x8, VUnaryMicrokernelTester::OpType::Clamp);
       }
     }
   }
@@ -706,7 +706,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .qmax(qmax)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasmsimd_arm_x8), VUnaryMicrokernelTester::OpType::Clamp);
+          .Test(xnn_f32_vclamp_ukernel__wasmsimd_arm_x8, VUnaryMicrokernelTester::OpType::Clamp);
       }
     }
   }
@@ -717,14 +717,14 @@
   TEST(F32_VCLAMP__WASMSIMD_X86_X4, batch_eq_4) {
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasmsimd_x86_x4), VUnaryMicrokernelTester::OpType::Clamp);
+      .Test(xnn_f32_vclamp_ukernel__wasmsimd_x86_x4, VUnaryMicrokernelTester::OpType::Clamp);
   }
 
   TEST(F32_VCLAMP__WASMSIMD_X86_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasmsimd_x86_x4), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__wasmsimd_x86_x4, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -732,7 +732,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasmsimd_x86_x4), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__wasmsimd_x86_x4, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -740,7 +740,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasmsimd_x86_x4), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__wasmsimd_x86_x4, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -749,7 +749,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasmsimd_x86_x4), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__wasmsimd_x86_x4, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -759,7 +759,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .qmin(qmin)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasmsimd_x86_x4), VUnaryMicrokernelTester::OpType::Clamp);
+          .Test(xnn_f32_vclamp_ukernel__wasmsimd_x86_x4, VUnaryMicrokernelTester::OpType::Clamp);
       }
     }
   }
@@ -770,7 +770,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .qmax(qmax)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasmsimd_x86_x4), VUnaryMicrokernelTester::OpType::Clamp);
+          .Test(xnn_f32_vclamp_ukernel__wasmsimd_x86_x4, VUnaryMicrokernelTester::OpType::Clamp);
       }
     }
   }
@@ -781,14 +781,14 @@
   TEST(F32_VCLAMP__WASMSIMD_X86_X8, batch_eq_8) {
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasmsimd_x86_x8), VUnaryMicrokernelTester::OpType::Clamp);
+      .Test(xnn_f32_vclamp_ukernel__wasmsimd_x86_x8, VUnaryMicrokernelTester::OpType::Clamp);
   }
 
   TEST(F32_VCLAMP__WASMSIMD_X86_X8, batch_div_8) {
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasmsimd_x86_x8), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__wasmsimd_x86_x8, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -796,7 +796,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasmsimd_x86_x8), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__wasmsimd_x86_x8, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -804,7 +804,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasmsimd_x86_x8), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__wasmsimd_x86_x8, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -813,7 +813,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasmsimd_x86_x8), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__wasmsimd_x86_x8, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -823,7 +823,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .qmin(qmin)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasmsimd_x86_x8), VUnaryMicrokernelTester::OpType::Clamp);
+          .Test(xnn_f32_vclamp_ukernel__wasmsimd_x86_x8, VUnaryMicrokernelTester::OpType::Clamp);
       }
     }
   }
@@ -834,7 +834,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .qmax(qmax)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasmsimd_x86_x8), VUnaryMicrokernelTester::OpType::Clamp);
+          .Test(xnn_f32_vclamp_ukernel__wasmsimd_x86_x8, VUnaryMicrokernelTester::OpType::Clamp);
       }
     }
   }
@@ -845,14 +845,14 @@
   TEST(F32_VCLAMP__WASM_X1, batch_eq_1) {
     VUnaryMicrokernelTester()
       .batch_size(1)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasm_x1), VUnaryMicrokernelTester::OpType::Clamp);
+      .Test(xnn_f32_vclamp_ukernel__wasm_x1, VUnaryMicrokernelTester::OpType::Clamp);
   }
 
   TEST(F32_VCLAMP__WASM_X1, batch_gt_1) {
     for (size_t batch_size = 2; batch_size < 10; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasm_x1), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__wasm_x1, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -861,7 +861,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasm_x1), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__wasm_x1, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -871,7 +871,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .qmin(qmin)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasm_x1), VUnaryMicrokernelTester::OpType::Clamp);
+          .Test(xnn_f32_vclamp_ukernel__wasm_x1, VUnaryMicrokernelTester::OpType::Clamp);
       }
     }
   }
@@ -882,7 +882,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .qmax(qmax)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasm_x1), VUnaryMicrokernelTester::OpType::Clamp);
+          .Test(xnn_f32_vclamp_ukernel__wasm_x1, VUnaryMicrokernelTester::OpType::Clamp);
       }
     }
   }
@@ -893,14 +893,14 @@
   TEST(F32_VCLAMP__WASM_X2, batch_eq_2) {
     VUnaryMicrokernelTester()
       .batch_size(2)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasm_x2), VUnaryMicrokernelTester::OpType::Clamp);
+      .Test(xnn_f32_vclamp_ukernel__wasm_x2, VUnaryMicrokernelTester::OpType::Clamp);
   }
 
   TEST(F32_VCLAMP__WASM_X2, batch_div_2) {
     for (size_t batch_size = 4; batch_size < 20; batch_size += 2) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasm_x2), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__wasm_x2, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -908,7 +908,7 @@
     for (size_t batch_size = 1; batch_size < 2; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasm_x2), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__wasm_x2, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -916,7 +916,7 @@
     for (size_t batch_size = 3; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasm_x2), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__wasm_x2, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -925,7 +925,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasm_x2), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__wasm_x2, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -935,7 +935,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .qmin(qmin)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasm_x2), VUnaryMicrokernelTester::OpType::Clamp);
+          .Test(xnn_f32_vclamp_ukernel__wasm_x2, VUnaryMicrokernelTester::OpType::Clamp);
       }
     }
   }
@@ -946,7 +946,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .qmax(qmax)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasm_x2), VUnaryMicrokernelTester::OpType::Clamp);
+          .Test(xnn_f32_vclamp_ukernel__wasm_x2, VUnaryMicrokernelTester::OpType::Clamp);
       }
     }
   }
@@ -957,14 +957,14 @@
   TEST(F32_VCLAMP__WASM_X4, batch_eq_4) {
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasm_x4), VUnaryMicrokernelTester::OpType::Clamp);
+      .Test(xnn_f32_vclamp_ukernel__wasm_x4, VUnaryMicrokernelTester::OpType::Clamp);
   }
 
   TEST(F32_VCLAMP__WASM_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasm_x4), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__wasm_x4, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -972,7 +972,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasm_x4), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__wasm_x4, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -980,7 +980,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasm_x4), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__wasm_x4, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -989,7 +989,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasm_x4), VUnaryMicrokernelTester::OpType::Clamp);
+        .Test(xnn_f32_vclamp_ukernel__wasm_x4, VUnaryMicrokernelTester::OpType::Clamp);
     }
   }
 
@@ -999,7 +999,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .qmin(qmin)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasm_x4), VUnaryMicrokernelTester::OpType::Clamp);
+          .Test(xnn_f32_vclamp_ukernel__wasm_x4, VUnaryMicrokernelTester::OpType::Clamp);
       }
     }
   }
@@ -1010,7 +1010,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .qmax(qmax)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__wasm_x4), VUnaryMicrokernelTester::OpType::Clamp);
+          .Test(xnn_f32_vclamp_ukernel__wasm_x4, VUnaryMicrokernelTester::OpType::Clamp);
       }
     }
   }
@@ -1020,14 +1020,14 @@
 TEST(F32_VCLAMP__SCALAR_X1, batch_eq_1) {
   VUnaryMicrokernelTester()
     .batch_size(1)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__scalar_x1), VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vclamp_ukernel__scalar_x1, VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VCLAMP__SCALAR_X1, batch_gt_1) {
   for (size_t batch_size = 2; batch_size < 10; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__scalar_x1), VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vclamp_ukernel__scalar_x1, VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -1036,7 +1036,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__scalar_x1), VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vclamp_ukernel__scalar_x1, VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -1046,7 +1046,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .qmin(qmin)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__scalar_x1), VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_vclamp_ukernel__scalar_x1, VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -1057,7 +1057,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .qmax(qmax)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__scalar_x1), VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_vclamp_ukernel__scalar_x1, VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -1066,14 +1066,14 @@
 TEST(F32_VCLAMP__SCALAR_X2, batch_eq_2) {
   VUnaryMicrokernelTester()
     .batch_size(2)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vclamp_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VCLAMP__SCALAR_X2, batch_div_2) {
   for (size_t batch_size = 4; batch_size < 20; batch_size += 2) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vclamp_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -1081,7 +1081,7 @@
   for (size_t batch_size = 1; batch_size < 2; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vclamp_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -1089,7 +1089,7 @@
   for (size_t batch_size = 3; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vclamp_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -1098,7 +1098,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vclamp_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -1108,7 +1108,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .qmin(qmin)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_vclamp_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -1119,7 +1119,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .qmax(qmax)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_vclamp_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -1128,14 +1128,14 @@
 TEST(F32_VCLAMP__SCALAR_X4, batch_eq_4) {
   VUnaryMicrokernelTester()
     .batch_size(4)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vclamp_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VCLAMP__SCALAR_X4, batch_div_4) {
   for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vclamp_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -1143,7 +1143,7 @@
   for (size_t batch_size = 1; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vclamp_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -1151,7 +1151,7 @@
   for (size_t batch_size = 5; batch_size < 8; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vclamp_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -1160,7 +1160,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vclamp_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -1170,7 +1170,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .qmin(qmin)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_vclamp_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -1181,7 +1181,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .qmax(qmax)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vclamp_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_vclamp_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::Clamp, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
diff --git a/test/f32-velu.cc b/test/f32-velu.cc
index f52868c..d07f284 100644
--- a/test/f32-velu.cc
+++ b/test/f32-velu.cc
@@ -22,7 +22,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__NEON_RR2_LUT16_P3_X4, batch_div_4) {
@@ -30,7 +30,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -39,7 +39,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -48,7 +48,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -58,7 +58,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -69,7 +69,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -81,7 +81,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -93,7 +93,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -105,7 +105,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__NEON_RR2_LUT16_P3_X8, batch_div_8) {
@@ -113,7 +113,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -122,7 +122,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -131,7 +131,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -141,7 +141,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -152,7 +152,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -164,7 +164,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -176,7 +176,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -188,7 +188,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__NEON_RR2_LUT16_P3_X12, batch_div_12) {
@@ -196,7 +196,7 @@
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -205,7 +205,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -214,7 +214,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -224,7 +224,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -235,7 +235,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -247,7 +247,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -259,7 +259,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -271,7 +271,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__NEON_RR2_LUT16_P3_X16, batch_div_16) {
@@ -279,7 +279,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -288,7 +288,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -297,7 +297,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -307,7 +307,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -318,7 +318,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -330,7 +330,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -342,7 +342,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -354,7 +354,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__NEON_RR2_LUT16_P3_X20, batch_div_20) {
@@ -362,7 +362,7 @@
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -371,7 +371,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -380,7 +380,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -390,7 +390,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -401,7 +401,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -413,7 +413,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -425,7 +425,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -437,7 +437,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__NEON_RR2_LUT16_P3_X24, batch_div_24) {
@@ -445,7 +445,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -454,7 +454,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -463,7 +463,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -473,7 +473,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -484,7 +484,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -496,7 +496,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -508,7 +508,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -520,7 +520,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__NEON_RR2_P6_X4, batch_div_4) {
@@ -528,7 +528,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -537,7 +537,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -546,7 +546,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -556,7 +556,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -567,7 +567,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -579,7 +579,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -591,7 +591,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -603,7 +603,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__NEON_RR2_P6_X8, batch_div_8) {
@@ -611,7 +611,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -620,7 +620,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -629,7 +629,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -639,7 +639,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -650,7 +650,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -662,7 +662,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -674,7 +674,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -686,7 +686,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__NEON_RR2_P6_X12, batch_div_12) {
@@ -694,7 +694,7 @@
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -703,7 +703,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -712,7 +712,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -722,7 +722,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -733,7 +733,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -745,7 +745,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -757,7 +757,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -769,7 +769,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__NEON_RR2_P6_X16, batch_div_16) {
@@ -777,7 +777,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -786,7 +786,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -795,7 +795,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -805,7 +805,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -816,7 +816,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -828,7 +828,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -840,7 +840,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -852,7 +852,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__NEON_RR2_P6_X20, batch_div_20) {
@@ -860,7 +860,7 @@
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -869,7 +869,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -878,7 +878,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -888,7 +888,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -899,7 +899,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -911,7 +911,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -923,7 +923,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -935,7 +935,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__NEON_RR2_P6_X24, batch_div_24) {
@@ -943,7 +943,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -952,7 +952,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -961,7 +961,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -971,7 +971,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -982,7 +982,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -994,7 +994,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1006,7 +1006,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neon_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neon_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1018,7 +1018,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__NEONFMA_RR1_LUT16_P3_X4, batch_div_4) {
@@ -1026,7 +1026,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1035,7 +1035,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1044,7 +1044,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1054,7 +1054,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1065,7 +1065,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1077,7 +1077,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1089,7 +1089,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1101,7 +1101,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__NEONFMA_RR1_LUT16_P3_X8, batch_div_8) {
@@ -1109,7 +1109,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1118,7 +1118,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1127,7 +1127,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1137,7 +1137,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1148,7 +1148,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1160,7 +1160,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1172,7 +1172,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1184,7 +1184,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__NEONFMA_RR1_LUT16_P3_X12, batch_div_12) {
@@ -1192,7 +1192,7 @@
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1201,7 +1201,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1210,7 +1210,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1220,7 +1220,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1231,7 +1231,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1243,7 +1243,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1255,7 +1255,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1267,7 +1267,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__NEONFMA_RR1_LUT16_P3_X16, batch_div_16) {
@@ -1275,7 +1275,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1284,7 +1284,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1293,7 +1293,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1303,7 +1303,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1314,7 +1314,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1326,7 +1326,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1338,7 +1338,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1350,7 +1350,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__NEONFMA_RR1_LUT16_P3_X20, batch_div_20) {
@@ -1358,7 +1358,7 @@
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1367,7 +1367,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1376,7 +1376,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1386,7 +1386,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1397,7 +1397,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1409,7 +1409,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1421,7 +1421,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1433,7 +1433,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__NEONFMA_RR1_LUT16_P3_X24, batch_div_24) {
@@ -1441,7 +1441,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1450,7 +1450,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1459,7 +1459,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1469,7 +1469,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1480,7 +1480,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1492,7 +1492,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1504,7 +1504,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1516,7 +1516,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__NEONFMA_RR1_P6_X4, batch_div_4) {
@@ -1524,7 +1524,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1533,7 +1533,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1542,7 +1542,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1552,7 +1552,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1563,7 +1563,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1575,7 +1575,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1587,7 +1587,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1599,7 +1599,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__NEONFMA_RR1_P6_X8, batch_div_8) {
@@ -1607,7 +1607,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1616,7 +1616,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1625,7 +1625,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1635,7 +1635,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1646,7 +1646,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1658,7 +1658,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1670,7 +1670,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1682,7 +1682,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__NEONFMA_RR1_P6_X12, batch_div_12) {
@@ -1690,7 +1690,7 @@
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1699,7 +1699,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1708,7 +1708,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1718,7 +1718,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1729,7 +1729,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1741,7 +1741,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1753,7 +1753,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1765,7 +1765,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__NEONFMA_RR1_P6_X16, batch_div_16) {
@@ -1773,7 +1773,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1782,7 +1782,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1791,7 +1791,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1801,7 +1801,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1812,7 +1812,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1824,7 +1824,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1836,7 +1836,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1848,7 +1848,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__NEONFMA_RR1_P6_X20, batch_div_20) {
@@ -1856,7 +1856,7 @@
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1865,7 +1865,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1874,7 +1874,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1884,7 +1884,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1895,7 +1895,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1907,7 +1907,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1919,7 +1919,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1931,7 +1931,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__NEONFMA_RR1_P6_X24, batch_div_24) {
@@ -1939,7 +1939,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1948,7 +1948,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1957,7 +1957,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1967,7 +1967,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -1978,7 +1978,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -1990,7 +1990,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2002,7 +2002,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__neonfma_rr1_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__neonfma_rr1_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2014,7 +2014,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__SSE2_RR2_LUT16_P3_X4, batch_div_4) {
@@ -2022,7 +2022,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2031,7 +2031,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2040,7 +2040,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2050,7 +2050,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2061,7 +2061,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2073,7 +2073,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2085,7 +2085,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2097,7 +2097,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__SSE2_RR2_LUT16_P3_X8, batch_div_8) {
@@ -2105,7 +2105,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2114,7 +2114,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2123,7 +2123,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2133,7 +2133,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2144,7 +2144,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2156,7 +2156,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2168,7 +2168,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2180,7 +2180,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__SSE2_RR2_LUT16_P3_X12, batch_div_12) {
@@ -2188,7 +2188,7 @@
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2197,7 +2197,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2206,7 +2206,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2216,7 +2216,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2227,7 +2227,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2239,7 +2239,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2251,7 +2251,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2263,7 +2263,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__SSE2_RR2_LUT16_P3_X16, batch_div_16) {
@@ -2271,7 +2271,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2280,7 +2280,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2289,7 +2289,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2299,7 +2299,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2310,7 +2310,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2322,7 +2322,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2334,7 +2334,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2346,7 +2346,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__SSE2_RR2_LUT16_P3_X20, batch_div_20) {
@@ -2354,7 +2354,7 @@
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2363,7 +2363,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2372,7 +2372,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2382,7 +2382,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2393,7 +2393,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2405,7 +2405,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2417,7 +2417,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2429,7 +2429,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__SSE2_RR2_LUT16_P3_X24, batch_div_24) {
@@ -2437,7 +2437,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2446,7 +2446,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2455,7 +2455,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2465,7 +2465,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2476,7 +2476,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2488,7 +2488,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2500,7 +2500,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2512,7 +2512,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__SSE2_RR2_P6_X4, batch_div_4) {
@@ -2520,7 +2520,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2529,7 +2529,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2538,7 +2538,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2548,7 +2548,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2559,7 +2559,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2571,7 +2571,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2583,7 +2583,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2595,7 +2595,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__SSE2_RR2_P6_X8, batch_div_8) {
@@ -2603,7 +2603,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2612,7 +2612,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2621,7 +2621,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2631,7 +2631,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2642,7 +2642,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2654,7 +2654,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2666,7 +2666,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2678,7 +2678,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__SSE2_RR2_P6_X12, batch_div_12) {
@@ -2686,7 +2686,7 @@
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2695,7 +2695,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2704,7 +2704,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2714,7 +2714,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2725,7 +2725,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2737,7 +2737,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2749,7 +2749,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2761,7 +2761,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__SSE2_RR2_P6_X16, batch_div_16) {
@@ -2769,7 +2769,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2778,7 +2778,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2787,7 +2787,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2797,7 +2797,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2808,7 +2808,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2820,7 +2820,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2832,7 +2832,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2844,7 +2844,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__SSE2_RR2_P6_X20, batch_div_20) {
@@ -2852,7 +2852,7 @@
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2861,7 +2861,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2870,7 +2870,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2880,7 +2880,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2891,7 +2891,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2903,7 +2903,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2915,7 +2915,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2927,7 +2927,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__SSE2_RR2_P6_X24, batch_div_24) {
@@ -2935,7 +2935,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2944,7 +2944,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2953,7 +2953,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2963,7 +2963,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -2974,7 +2974,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2986,7 +2986,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -2998,7 +2998,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse2_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse2_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3010,7 +3010,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__SSE41_RR2_LUT16_P3_X4, batch_div_4) {
@@ -3018,7 +3018,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3027,7 +3027,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3036,7 +3036,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3046,7 +3046,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3057,7 +3057,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3069,7 +3069,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3081,7 +3081,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3093,7 +3093,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__SSE41_RR2_LUT16_P3_X8, batch_div_8) {
@@ -3101,7 +3101,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3110,7 +3110,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3119,7 +3119,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3129,7 +3129,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3140,7 +3140,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3152,7 +3152,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3164,7 +3164,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3176,7 +3176,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__SSE41_RR2_LUT16_P3_X12, batch_div_12) {
@@ -3184,7 +3184,7 @@
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3193,7 +3193,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3202,7 +3202,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3212,7 +3212,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3223,7 +3223,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3235,7 +3235,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3247,7 +3247,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3259,7 +3259,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__SSE41_RR2_LUT16_P3_X16, batch_div_16) {
@@ -3267,7 +3267,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3276,7 +3276,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3285,7 +3285,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3295,7 +3295,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3306,7 +3306,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3318,7 +3318,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3330,7 +3330,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3342,7 +3342,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__SSE41_RR2_LUT16_P3_X20, batch_div_20) {
@@ -3350,7 +3350,7 @@
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3359,7 +3359,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3368,7 +3368,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3378,7 +3378,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3389,7 +3389,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3401,7 +3401,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3413,7 +3413,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3425,7 +3425,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__SSE41_RR2_LUT16_P3_X24, batch_div_24) {
@@ -3433,7 +3433,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3442,7 +3442,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3451,7 +3451,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3461,7 +3461,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3472,7 +3472,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3484,7 +3484,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3496,7 +3496,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3508,7 +3508,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__SSE41_RR2_P6_X4, batch_div_4) {
@@ -3516,7 +3516,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3525,7 +3525,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3534,7 +3534,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3544,7 +3544,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3555,7 +3555,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3567,7 +3567,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3579,7 +3579,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3591,7 +3591,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__SSE41_RR2_P6_X8, batch_div_8) {
@@ -3599,7 +3599,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3608,7 +3608,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3617,7 +3617,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3627,7 +3627,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3638,7 +3638,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3650,7 +3650,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3662,7 +3662,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3674,7 +3674,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__SSE41_RR2_P6_X12, batch_div_12) {
@@ -3682,7 +3682,7 @@
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3691,7 +3691,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3700,7 +3700,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3710,7 +3710,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3721,7 +3721,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3733,7 +3733,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3745,7 +3745,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3757,7 +3757,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__SSE41_RR2_P6_X16, batch_div_16) {
@@ -3765,7 +3765,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3774,7 +3774,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3783,7 +3783,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3793,7 +3793,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3804,7 +3804,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3816,7 +3816,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3828,7 +3828,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3840,7 +3840,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__SSE41_RR2_P6_X20, batch_div_20) {
@@ -3848,7 +3848,7 @@
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3857,7 +3857,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3866,7 +3866,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3876,7 +3876,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3887,7 +3887,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3899,7 +3899,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3911,7 +3911,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3923,7 +3923,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__SSE41_RR2_P6_X24, batch_div_24) {
@@ -3931,7 +3931,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3940,7 +3940,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3949,7 +3949,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3959,7 +3959,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -3970,7 +3970,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3982,7 +3982,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -3994,7 +3994,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__sse41_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__sse41_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4006,7 +4006,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x8), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x8, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX_RR2_LUT4_P4_PERM_X8, batch_div_8) {
@@ -4014,7 +4014,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4023,7 +4023,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4032,7 +4032,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4042,7 +4042,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4053,7 +4053,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4065,7 +4065,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4077,7 +4077,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4089,7 +4089,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX_RR2_LUT4_P4_PERM_X16, batch_div_16) {
@@ -4097,7 +4097,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4106,7 +4106,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4115,7 +4115,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4125,7 +4125,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4136,7 +4136,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4148,7 +4148,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4160,7 +4160,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4172,7 +4172,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x24), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x24, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX_RR2_LUT4_P4_PERM_X24, batch_div_24) {
@@ -4180,7 +4180,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4189,7 +4189,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4198,7 +4198,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4208,7 +4208,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4219,7 +4219,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4231,7 +4231,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4243,7 +4243,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4255,7 +4255,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX_RR2_LUT4_P4_PERM_X32, batch_div_32) {
@@ -4263,7 +4263,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4272,7 +4272,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4281,7 +4281,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4291,7 +4291,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4302,7 +4302,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4314,7 +4314,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4326,7 +4326,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4338,7 +4338,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(40)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x40), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x40, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX_RR2_LUT4_P4_PERM_X40, batch_div_40) {
@@ -4346,7 +4346,7 @@
     for (size_t batch_size = 80; batch_size < 400; batch_size += 40) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x40), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x40, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4355,7 +4355,7 @@
     for (size_t batch_size = 1; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x40), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x40, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4364,7 +4364,7 @@
     for (size_t batch_size = 41; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x40), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x40, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4374,7 +4374,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x40), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x40, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4385,7 +4385,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x40), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x40, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4397,7 +4397,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x40), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x40, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4409,7 +4409,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x40), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x40, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4421,7 +4421,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(48)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX_RR2_LUT4_P4_PERM_X48, batch_div_48) {
@@ -4429,7 +4429,7 @@
     for (size_t batch_size = 96; batch_size < 480; batch_size += 48) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4438,7 +4438,7 @@
     for (size_t batch_size = 1; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4447,7 +4447,7 @@
     for (size_t batch_size = 49; batch_size < 96; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4457,7 +4457,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4468,7 +4468,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4480,7 +4480,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4492,7 +4492,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut4_p4_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4504,7 +4504,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX_RR2_LUT16_P3_X8, batch_div_8) {
@@ -4512,7 +4512,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4521,7 +4521,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4530,7 +4530,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4540,7 +4540,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4551,7 +4551,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4563,7 +4563,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4575,7 +4575,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4587,7 +4587,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX_RR2_LUT16_P3_X16, batch_div_16) {
@@ -4595,7 +4595,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4604,7 +4604,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4613,7 +4613,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4623,7 +4623,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4634,7 +4634,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4646,7 +4646,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4658,7 +4658,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4670,7 +4670,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX_RR2_LUT16_P3_X24, batch_div_24) {
@@ -4678,7 +4678,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4687,7 +4687,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4696,7 +4696,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4706,7 +4706,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4717,7 +4717,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4729,7 +4729,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4741,7 +4741,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4753,7 +4753,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x32), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x32, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX_RR2_LUT16_P3_X32, batch_div_32) {
@@ -4761,7 +4761,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4770,7 +4770,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4779,7 +4779,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4789,7 +4789,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4800,7 +4800,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x32), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x32, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4812,7 +4812,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x32), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x32, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4824,7 +4824,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x32), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x32, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4836,7 +4836,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(40)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x40), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x40, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX_RR2_LUT16_P3_X40, batch_div_40) {
@@ -4844,7 +4844,7 @@
     for (size_t batch_size = 80; batch_size < 400; batch_size += 40) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x40), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x40, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4853,7 +4853,7 @@
     for (size_t batch_size = 1; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x40), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x40, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4862,7 +4862,7 @@
     for (size_t batch_size = 41; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x40), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x40, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4872,7 +4872,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x40), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x40, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4883,7 +4883,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x40), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x40, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4895,7 +4895,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x40), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x40, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4907,7 +4907,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x40), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x40, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4919,7 +4919,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(48)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x48), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x48, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX_RR2_LUT16_P3_X48, batch_div_48) {
@@ -4927,7 +4927,7 @@
     for (size_t batch_size = 96; batch_size < 480; batch_size += 48) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4936,7 +4936,7 @@
     for (size_t batch_size = 1; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4945,7 +4945,7 @@
     for (size_t batch_size = 49; batch_size < 96; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4955,7 +4955,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -4966,7 +4966,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x48), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x48, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4978,7 +4978,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x48), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x48, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -4990,7 +4990,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x48), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_lut16_p3_x48, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5002,7 +5002,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX_RR2_P6_X8, batch_div_8) {
@@ -5010,7 +5010,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5019,7 +5019,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5028,7 +5028,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5038,7 +5038,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5049,7 +5049,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5061,7 +5061,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5073,7 +5073,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5085,7 +5085,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX_RR2_P6_X16, batch_div_16) {
@@ -5093,7 +5093,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5102,7 +5102,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5111,7 +5111,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5121,7 +5121,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5132,7 +5132,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5144,7 +5144,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5156,7 +5156,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5168,7 +5168,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX_RR2_P6_X24, batch_div_24) {
@@ -5176,7 +5176,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5185,7 +5185,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5194,7 +5194,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5204,7 +5204,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5215,7 +5215,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5227,7 +5227,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5239,7 +5239,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5251,7 +5251,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x32), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x32, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX_RR2_P6_X32, batch_div_32) {
@@ -5259,7 +5259,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5268,7 +5268,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5277,7 +5277,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5287,7 +5287,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5298,7 +5298,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x32), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x32, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5310,7 +5310,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x32), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x32, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5322,7 +5322,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x32), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x32, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5334,7 +5334,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(40)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x40), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x40, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX_RR2_P6_X40, batch_div_40) {
@@ -5342,7 +5342,7 @@
     for (size_t batch_size = 80; batch_size < 400; batch_size += 40) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x40), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x40, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5351,7 +5351,7 @@
     for (size_t batch_size = 1; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x40), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x40, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5360,7 +5360,7 @@
     for (size_t batch_size = 41; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x40), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x40, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5370,7 +5370,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x40), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x40, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5381,7 +5381,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x40), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x40, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5393,7 +5393,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x40), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x40, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5405,7 +5405,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x40), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x40, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5417,7 +5417,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(48)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x48), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x48, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX_RR2_P6_X48, batch_div_48) {
@@ -5425,7 +5425,7 @@
     for (size_t batch_size = 96; batch_size < 480; batch_size += 48) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5434,7 +5434,7 @@
     for (size_t batch_size = 1; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5443,7 +5443,7 @@
     for (size_t batch_size = 49; batch_size < 96; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5453,7 +5453,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5464,7 +5464,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x48), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x48, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5476,7 +5476,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x48), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x48, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5488,7 +5488,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx_rr2_p6_x48), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx_rr2_p6_x48, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5500,7 +5500,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x8), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x8, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_LUT4_P4_PERM_X8, batch_div_8) {
@@ -5508,7 +5508,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5517,7 +5517,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5526,7 +5526,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5536,7 +5536,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5547,7 +5547,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5559,7 +5559,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5571,7 +5571,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5583,7 +5583,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_LUT4_P4_PERM_X16, batch_div_16) {
@@ -5591,7 +5591,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5600,7 +5600,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5609,7 +5609,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5619,7 +5619,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5630,7 +5630,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5642,7 +5642,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5654,7 +5654,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5666,7 +5666,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x24), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x24, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_LUT4_P4_PERM_X24, batch_div_24) {
@@ -5674,7 +5674,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5683,7 +5683,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5692,7 +5692,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5702,7 +5702,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5713,7 +5713,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5725,7 +5725,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5737,7 +5737,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5749,7 +5749,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_LUT4_P4_PERM_X32, batch_div_32) {
@@ -5757,7 +5757,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5766,7 +5766,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5775,7 +5775,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5785,7 +5785,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5796,7 +5796,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5808,7 +5808,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5820,7 +5820,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5832,7 +5832,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(40)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x40), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x40, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_LUT4_P4_PERM_X40, batch_div_40) {
@@ -5840,7 +5840,7 @@
     for (size_t batch_size = 80; batch_size < 400; batch_size += 40) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x40), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x40, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5849,7 +5849,7 @@
     for (size_t batch_size = 1; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x40), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x40, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5858,7 +5858,7 @@
     for (size_t batch_size = 41; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x40), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x40, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5868,7 +5868,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x40), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x40, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5879,7 +5879,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x40), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x40, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5891,7 +5891,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x40), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x40, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5903,7 +5903,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x40), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x40, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5915,7 +5915,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(48)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_LUT4_P4_PERM_X48, batch_div_48) {
@@ -5923,7 +5923,7 @@
     for (size_t batch_size = 96; batch_size < 480; batch_size += 48) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5932,7 +5932,7 @@
     for (size_t batch_size = 1; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5941,7 +5941,7 @@
     for (size_t batch_size = 49; batch_size < 96; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5951,7 +5951,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -5962,7 +5962,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5974,7 +5974,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5986,7 +5986,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -5998,7 +5998,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(56)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x56), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x56, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_LUT4_P4_PERM_X56, batch_div_56) {
@@ -6006,7 +6006,7 @@
     for (size_t batch_size = 112; batch_size < 560; batch_size += 56) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x56), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x56, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6015,7 +6015,7 @@
     for (size_t batch_size = 1; batch_size < 56; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x56), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x56, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6024,7 +6024,7 @@
     for (size_t batch_size = 57; batch_size < 112; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x56), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x56, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6034,7 +6034,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x56), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x56, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6045,7 +6045,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x56), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x56, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6057,7 +6057,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x56), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x56, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6069,7 +6069,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x56), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x56, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6081,7 +6081,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(64)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x64), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x64, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_LUT4_P4_PERM_X64, batch_div_64) {
@@ -6089,7 +6089,7 @@
     for (size_t batch_size = 128; batch_size < 640; batch_size += 64) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x64), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x64, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6098,7 +6098,7 @@
     for (size_t batch_size = 1; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x64), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x64, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6107,7 +6107,7 @@
     for (size_t batch_size = 65; batch_size < 128; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x64), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x64, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6117,7 +6117,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x64), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x64, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6128,7 +6128,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x64), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x64, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6140,7 +6140,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x64), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x64, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6152,7 +6152,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x64), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x64, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6164,7 +6164,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(72)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x72), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x72, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_LUT4_P4_PERM_X72, batch_div_72) {
@@ -6172,7 +6172,7 @@
     for (size_t batch_size = 144; batch_size < 720; batch_size += 72) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x72), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x72, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6181,7 +6181,7 @@
     for (size_t batch_size = 1; batch_size < 72; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x72), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x72, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6190,7 +6190,7 @@
     for (size_t batch_size = 73; batch_size < 144; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x72), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x72, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6200,7 +6200,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x72), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x72, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6211,7 +6211,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x72), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x72, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6223,7 +6223,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x72), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x72, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6235,7 +6235,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x72), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x72, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6247,7 +6247,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(80)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x80), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x80, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_LUT4_P4_PERM_X80, batch_div_80) {
@@ -6255,7 +6255,7 @@
     for (size_t batch_size = 160; batch_size < 800; batch_size += 80) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x80), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x80, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6264,7 +6264,7 @@
     for (size_t batch_size = 1; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x80), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x80, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6273,7 +6273,7 @@
     for (size_t batch_size = 81; batch_size < 160; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x80), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x80, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6283,7 +6283,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x80), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x80, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6294,7 +6294,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x80), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x80, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6306,7 +6306,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x80), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x80, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6318,7 +6318,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x80), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut4_p4_perm_x80, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6330,7 +6330,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x8), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x8, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_LUT8_P4_PERM_X8, batch_div_8) {
@@ -6338,7 +6338,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6347,7 +6347,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6356,7 +6356,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6366,7 +6366,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6377,7 +6377,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6389,7 +6389,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6401,7 +6401,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6413,7 +6413,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_LUT8_P4_PERM_X16, batch_div_16) {
@@ -6421,7 +6421,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6430,7 +6430,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6439,7 +6439,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6449,7 +6449,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6460,7 +6460,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6472,7 +6472,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6484,7 +6484,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6496,7 +6496,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x24), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x24, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_LUT8_P4_PERM_X24, batch_div_24) {
@@ -6504,7 +6504,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6513,7 +6513,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6522,7 +6522,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6532,7 +6532,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6543,7 +6543,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6555,7 +6555,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6567,7 +6567,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6579,7 +6579,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_LUT8_P4_PERM_X32, batch_div_32) {
@@ -6587,7 +6587,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6596,7 +6596,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6605,7 +6605,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6615,7 +6615,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6626,7 +6626,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6638,7 +6638,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6650,7 +6650,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6662,7 +6662,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(40)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x40), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x40, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_LUT8_P4_PERM_X40, batch_div_40) {
@@ -6670,7 +6670,7 @@
     for (size_t batch_size = 80; batch_size < 400; batch_size += 40) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x40), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x40, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6679,7 +6679,7 @@
     for (size_t batch_size = 1; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x40), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x40, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6688,7 +6688,7 @@
     for (size_t batch_size = 41; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x40), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x40, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6698,7 +6698,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x40), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x40, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6709,7 +6709,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x40), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x40, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6721,7 +6721,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x40), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x40, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6733,7 +6733,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x40), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x40, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6745,7 +6745,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(48)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_LUT8_P4_PERM_X48, batch_div_48) {
@@ -6753,7 +6753,7 @@
     for (size_t batch_size = 96; batch_size < 480; batch_size += 48) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6762,7 +6762,7 @@
     for (size_t batch_size = 1; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6771,7 +6771,7 @@
     for (size_t batch_size = 49; batch_size < 96; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6781,7 +6781,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6792,7 +6792,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6804,7 +6804,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6816,7 +6816,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6828,7 +6828,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(56)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x56), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x56, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_LUT8_P4_PERM_X56, batch_div_56) {
@@ -6836,7 +6836,7 @@
     for (size_t batch_size = 112; batch_size < 560; batch_size += 56) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x56), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x56, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6845,7 +6845,7 @@
     for (size_t batch_size = 1; batch_size < 56; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x56), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x56, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6854,7 +6854,7 @@
     for (size_t batch_size = 57; batch_size < 112; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x56), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x56, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6864,7 +6864,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x56), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x56, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6875,7 +6875,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x56), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x56, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6887,7 +6887,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x56), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x56, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6899,7 +6899,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x56), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x56, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6911,7 +6911,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(64)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x64), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x64, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_LUT8_P4_PERM_X64, batch_div_64) {
@@ -6919,7 +6919,7 @@
     for (size_t batch_size = 128; batch_size < 640; batch_size += 64) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x64), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x64, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6928,7 +6928,7 @@
     for (size_t batch_size = 1; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x64), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x64, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6937,7 +6937,7 @@
     for (size_t batch_size = 65; batch_size < 128; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x64), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x64, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6947,7 +6947,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x64), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x64, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -6958,7 +6958,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x64), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x64, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6970,7 +6970,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x64), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x64, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6982,7 +6982,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x64), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x64, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -6994,7 +6994,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(72)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x72), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x72, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_LUT8_P4_PERM_X72, batch_div_72) {
@@ -7002,7 +7002,7 @@
     for (size_t batch_size = 144; batch_size < 720; batch_size += 72) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x72), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x72, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7011,7 +7011,7 @@
     for (size_t batch_size = 1; batch_size < 72; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x72), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x72, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7020,7 +7020,7 @@
     for (size_t batch_size = 73; batch_size < 144; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x72), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x72, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7030,7 +7030,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x72), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x72, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7041,7 +7041,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x72), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x72, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7053,7 +7053,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x72), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x72, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7065,7 +7065,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x72), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x72, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7077,7 +7077,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(80)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x80), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x80, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_LUT8_P4_PERM_X80, batch_div_80) {
@@ -7085,7 +7085,7 @@
     for (size_t batch_size = 160; batch_size < 800; batch_size += 80) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x80), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x80, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7094,7 +7094,7 @@
     for (size_t batch_size = 1; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x80), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x80, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7103,7 +7103,7 @@
     for (size_t batch_size = 81; batch_size < 160; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x80), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x80, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7113,7 +7113,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x80), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x80, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7124,7 +7124,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x80), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x80, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7136,7 +7136,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x80), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x80, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7148,7 +7148,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x80), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut8_p4_perm_x80, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7160,7 +7160,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x8), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x8, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_LUT16_P3_GATHER_X8, batch_div_8) {
@@ -7168,7 +7168,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7177,7 +7177,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7186,7 +7186,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7196,7 +7196,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7207,7 +7207,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7219,7 +7219,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7231,7 +7231,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7243,7 +7243,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x16), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x16, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_LUT16_P3_GATHER_X16, batch_div_16) {
@@ -7251,7 +7251,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7260,7 +7260,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7269,7 +7269,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7279,7 +7279,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7290,7 +7290,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7302,7 +7302,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7314,7 +7314,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7326,7 +7326,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x24), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x24, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_LUT16_P3_GATHER_X24, batch_div_24) {
@@ -7334,7 +7334,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7343,7 +7343,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7352,7 +7352,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7362,7 +7362,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7373,7 +7373,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7385,7 +7385,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7397,7 +7397,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7409,7 +7409,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x32), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x32, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_LUT16_P3_GATHER_X32, batch_div_32) {
@@ -7417,7 +7417,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7426,7 +7426,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7435,7 +7435,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7445,7 +7445,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7456,7 +7456,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x32), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x32, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7468,7 +7468,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x32), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x32, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7480,7 +7480,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x32), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x32, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7492,7 +7492,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(40)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x40), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x40, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_LUT16_P3_GATHER_X40, batch_div_40) {
@@ -7500,7 +7500,7 @@
     for (size_t batch_size = 80; batch_size < 400; batch_size += 40) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x40), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x40, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7509,7 +7509,7 @@
     for (size_t batch_size = 1; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x40), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x40, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7518,7 +7518,7 @@
     for (size_t batch_size = 41; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x40), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x40, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7528,7 +7528,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x40), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x40, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7539,7 +7539,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x40), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x40, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7551,7 +7551,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x40), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x40, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7563,7 +7563,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x40), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x40, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7575,7 +7575,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(48)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x48), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x48, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_LUT16_P3_GATHER_X48, batch_div_48) {
@@ -7583,7 +7583,7 @@
     for (size_t batch_size = 96; batch_size < 480; batch_size += 48) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7592,7 +7592,7 @@
     for (size_t batch_size = 1; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7601,7 +7601,7 @@
     for (size_t batch_size = 49; batch_size < 96; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7611,7 +7611,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7622,7 +7622,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x48), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x48, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7634,7 +7634,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x48), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x48, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7646,7 +7646,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x48), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x48, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7658,7 +7658,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(56)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x56), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x56, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_LUT16_P3_GATHER_X56, batch_div_56) {
@@ -7666,7 +7666,7 @@
     for (size_t batch_size = 112; batch_size < 560; batch_size += 56) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x56), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x56, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7675,7 +7675,7 @@
     for (size_t batch_size = 1; batch_size < 56; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x56), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x56, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7684,7 +7684,7 @@
     for (size_t batch_size = 57; batch_size < 112; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x56), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x56, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7694,7 +7694,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x56), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x56, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7705,7 +7705,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x56), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x56, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7717,7 +7717,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x56), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x56, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7729,7 +7729,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x56), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x56, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7741,7 +7741,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(64)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x64), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x64, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_LUT16_P3_GATHER_X64, batch_div_64) {
@@ -7749,7 +7749,7 @@
     for (size_t batch_size = 128; batch_size < 640; batch_size += 64) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x64), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x64, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7758,7 +7758,7 @@
     for (size_t batch_size = 1; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x64), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x64, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7767,7 +7767,7 @@
     for (size_t batch_size = 65; batch_size < 128; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x64), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x64, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7777,7 +7777,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x64), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x64, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7788,7 +7788,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x64), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x64, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7800,7 +7800,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x64), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x64, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7812,7 +7812,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x64), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x64, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7824,7 +7824,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(72)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x72), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x72, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_LUT16_P3_GATHER_X72, batch_div_72) {
@@ -7832,7 +7832,7 @@
     for (size_t batch_size = 144; batch_size < 720; batch_size += 72) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x72), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x72, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7841,7 +7841,7 @@
     for (size_t batch_size = 1; batch_size < 72; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x72), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x72, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7850,7 +7850,7 @@
     for (size_t batch_size = 73; batch_size < 144; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x72), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x72, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7860,7 +7860,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x72), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x72, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7871,7 +7871,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x72), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x72, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7883,7 +7883,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x72), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x72, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7895,7 +7895,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x72), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x72, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7907,7 +7907,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(80)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x80), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x80, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_LUT16_P3_GATHER_X80, batch_div_80) {
@@ -7915,7 +7915,7 @@
     for (size_t batch_size = 160; batch_size < 800; batch_size += 80) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x80), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x80, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7924,7 +7924,7 @@
     for (size_t batch_size = 1; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x80), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x80, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7933,7 +7933,7 @@
     for (size_t batch_size = 81; batch_size < 160; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x80), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x80, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7943,7 +7943,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x80), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x80, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -7954,7 +7954,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x80), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x80, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7966,7 +7966,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x80), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x80, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7978,7 +7978,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x80), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_lut16_p3_gather_x80, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -7990,7 +7990,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_P6_X8, batch_div_8) {
@@ -7998,7 +7998,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8007,7 +8007,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8016,7 +8016,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8026,7 +8026,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8037,7 +8037,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8049,7 +8049,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8061,7 +8061,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8073,7 +8073,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_P6_X16, batch_div_16) {
@@ -8081,7 +8081,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8090,7 +8090,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8099,7 +8099,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8109,7 +8109,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8120,7 +8120,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8132,7 +8132,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8144,7 +8144,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8156,7 +8156,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_P6_X24, batch_div_24) {
@@ -8164,7 +8164,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8173,7 +8173,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8182,7 +8182,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8192,7 +8192,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8203,7 +8203,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8215,7 +8215,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8227,7 +8227,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8239,7 +8239,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x32), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x32, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_P6_X32, batch_div_32) {
@@ -8247,7 +8247,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8256,7 +8256,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8265,7 +8265,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8275,7 +8275,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8286,7 +8286,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x32), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x32, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8298,7 +8298,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x32), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x32, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8310,7 +8310,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x32), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x32, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8322,7 +8322,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(40)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x40), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x40, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_P6_X40, batch_div_40) {
@@ -8330,7 +8330,7 @@
     for (size_t batch_size = 80; batch_size < 400; batch_size += 40) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x40), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x40, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8339,7 +8339,7 @@
     for (size_t batch_size = 1; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x40), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x40, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8348,7 +8348,7 @@
     for (size_t batch_size = 41; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x40), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x40, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8358,7 +8358,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x40), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x40, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8369,7 +8369,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x40), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x40, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8381,7 +8381,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x40), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x40, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8393,7 +8393,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x40), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x40, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8405,7 +8405,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(48)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x48), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x48, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_P6_X48, batch_div_48) {
@@ -8413,7 +8413,7 @@
     for (size_t batch_size = 96; batch_size < 480; batch_size += 48) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8422,7 +8422,7 @@
     for (size_t batch_size = 1; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8431,7 +8431,7 @@
     for (size_t batch_size = 49; batch_size < 96; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8441,7 +8441,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8452,7 +8452,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x48), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x48, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8464,7 +8464,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x48), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x48, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8476,7 +8476,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x48), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x48, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8488,7 +8488,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(56)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x56), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x56, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_P6_X56, batch_div_56) {
@@ -8496,7 +8496,7 @@
     for (size_t batch_size = 112; batch_size < 560; batch_size += 56) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x56), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x56, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8505,7 +8505,7 @@
     for (size_t batch_size = 1; batch_size < 56; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x56), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x56, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8514,7 +8514,7 @@
     for (size_t batch_size = 57; batch_size < 112; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x56), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x56, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8524,7 +8524,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x56), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x56, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8535,7 +8535,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x56), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x56, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8547,7 +8547,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x56), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x56, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8559,7 +8559,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x56), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x56, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8571,7 +8571,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(64)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x64), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x64, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_P6_X64, batch_div_64) {
@@ -8579,7 +8579,7 @@
     for (size_t batch_size = 128; batch_size < 640; batch_size += 64) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x64), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x64, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8588,7 +8588,7 @@
     for (size_t batch_size = 1; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x64), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x64, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8597,7 +8597,7 @@
     for (size_t batch_size = 65; batch_size < 128; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x64), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x64, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8607,7 +8607,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x64), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x64, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8618,7 +8618,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x64), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x64, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8630,7 +8630,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x64), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x64, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8642,7 +8642,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x64), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x64, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8654,7 +8654,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(72)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x72), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x72, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_P6_X72, batch_div_72) {
@@ -8662,7 +8662,7 @@
     for (size_t batch_size = 144; batch_size < 720; batch_size += 72) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x72), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x72, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8671,7 +8671,7 @@
     for (size_t batch_size = 1; batch_size < 72; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x72), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x72, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8680,7 +8680,7 @@
     for (size_t batch_size = 73; batch_size < 144; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x72), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x72, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8690,7 +8690,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x72), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x72, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8701,7 +8701,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x72), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x72, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8713,7 +8713,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x72), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x72, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8725,7 +8725,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x72), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x72, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8737,7 +8737,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(80)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x80), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x80, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX2_RR1_P6_X80, batch_div_80) {
@@ -8745,7 +8745,7 @@
     for (size_t batch_size = 160; batch_size < 800; batch_size += 80) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x80), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x80, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8754,7 +8754,7 @@
     for (size_t batch_size = 1; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x80), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x80, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8763,7 +8763,7 @@
     for (size_t batch_size = 81; batch_size < 160; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x80), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x80, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8773,7 +8773,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x80), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x80, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8784,7 +8784,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x80), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x80, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8796,7 +8796,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x80), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x80, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8808,7 +8808,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx2_rr1_p6_x80), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx2_rr1_p6_x80, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8820,7 +8820,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX512F_RR1_LUT16_P3_PERM_X16, batch_div_16) {
@@ -8828,7 +8828,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8837,7 +8837,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8846,7 +8846,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8856,7 +8856,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8867,7 +8867,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8879,7 +8879,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8891,7 +8891,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8903,7 +8903,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX512F_RR1_LUT16_P3_PERM_X32, batch_div_32) {
@@ -8911,7 +8911,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8920,7 +8920,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8929,7 +8929,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8939,7 +8939,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -8950,7 +8950,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8962,7 +8962,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8974,7 +8974,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x32), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x32, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -8986,7 +8986,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(48)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX512F_RR1_LUT16_P3_PERM_X48, batch_div_48) {
@@ -8994,7 +8994,7 @@
     for (size_t batch_size = 96; batch_size < 480; batch_size += 48) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9003,7 +9003,7 @@
     for (size_t batch_size = 1; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9012,7 +9012,7 @@
     for (size_t batch_size = 49; batch_size < 96; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9022,7 +9022,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9033,7 +9033,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9045,7 +9045,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9057,7 +9057,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x48), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x48, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9069,7 +9069,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(64)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x64), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x64, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX512F_RR1_LUT16_P3_PERM_X64, batch_div_64) {
@@ -9077,7 +9077,7 @@
     for (size_t batch_size = 128; batch_size < 640; batch_size += 64) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x64), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x64, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9086,7 +9086,7 @@
     for (size_t batch_size = 1; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x64), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x64, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9095,7 +9095,7 @@
     for (size_t batch_size = 65; batch_size < 128; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x64), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x64, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9105,7 +9105,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x64), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x64, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9116,7 +9116,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x64), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x64, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9128,7 +9128,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x64), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x64, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9140,7 +9140,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x64), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x64, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9152,7 +9152,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(80)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x80), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x80, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX512F_RR1_LUT16_P3_PERM_X80, batch_div_80) {
@@ -9160,7 +9160,7 @@
     for (size_t batch_size = 160; batch_size < 800; batch_size += 80) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x80), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x80, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9169,7 +9169,7 @@
     for (size_t batch_size = 1; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x80), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x80, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9178,7 +9178,7 @@
     for (size_t batch_size = 81; batch_size < 160; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x80), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x80, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9188,7 +9188,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x80), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x80, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9199,7 +9199,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x80), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x80, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9211,7 +9211,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x80), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x80, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9223,7 +9223,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x80), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x80, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9235,7 +9235,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(96)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x96), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x96, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX512F_RR1_LUT16_P3_PERM_X96, batch_div_96) {
@@ -9243,7 +9243,7 @@
     for (size_t batch_size = 192; batch_size < 960; batch_size += 96) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x96), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x96, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9252,7 +9252,7 @@
     for (size_t batch_size = 1; batch_size < 96; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x96), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x96, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9261,7 +9261,7 @@
     for (size_t batch_size = 97; batch_size < 192; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x96), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x96, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9271,7 +9271,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x96), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x96, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9282,7 +9282,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x96), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x96, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9294,7 +9294,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x96), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x96, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9306,7 +9306,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x96), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x96, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9318,7 +9318,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(112)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x112), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x112, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX512F_RR1_LUT16_P3_PERM_X112, batch_div_112) {
@@ -9326,7 +9326,7 @@
     for (size_t batch_size = 224; batch_size < 1120; batch_size += 112) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x112), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x112, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9335,7 +9335,7 @@
     for (size_t batch_size = 1; batch_size < 112; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x112), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x112, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9344,7 +9344,7 @@
     for (size_t batch_size = 113; batch_size < 224; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x112), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x112, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9354,7 +9354,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x112), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x112, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9365,7 +9365,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x112), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x112, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9377,7 +9377,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x112), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x112, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9389,7 +9389,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x112), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x112, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9401,7 +9401,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(128)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x128), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x128, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX512F_RR1_LUT16_P3_PERM_X128, batch_div_128) {
@@ -9409,7 +9409,7 @@
     for (size_t batch_size = 256; batch_size < 1280; batch_size += 128) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x128), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x128, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9418,7 +9418,7 @@
     for (size_t batch_size = 1; batch_size < 128; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x128), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x128, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9427,7 +9427,7 @@
     for (size_t batch_size = 129; batch_size < 256; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x128), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x128, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9437,7 +9437,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x128), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x128, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9448,7 +9448,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x128), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x128, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9460,7 +9460,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x128), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x128, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9472,7 +9472,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x128), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_lut16_p3_perm_x128, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9484,7 +9484,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX512F_RR1_P6_X16, batch_div_16) {
@@ -9492,7 +9492,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9501,7 +9501,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9510,7 +9510,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9520,7 +9520,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9531,7 +9531,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9543,7 +9543,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9555,7 +9555,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9567,7 +9567,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x32), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x32, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX512F_RR1_P6_X32, batch_div_32) {
@@ -9575,7 +9575,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9584,7 +9584,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9593,7 +9593,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9603,7 +9603,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x32), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x32, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9614,7 +9614,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x32), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x32, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9626,7 +9626,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x32), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x32, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9638,7 +9638,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x32), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x32, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9650,7 +9650,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(48)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x48), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x48, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX512F_RR1_P6_X48, batch_div_48) {
@@ -9658,7 +9658,7 @@
     for (size_t batch_size = 96; batch_size < 480; batch_size += 48) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9667,7 +9667,7 @@
     for (size_t batch_size = 1; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9676,7 +9676,7 @@
     for (size_t batch_size = 49; batch_size < 96; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9686,7 +9686,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x48), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x48, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9697,7 +9697,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x48), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x48, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9709,7 +9709,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x48), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x48, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9721,7 +9721,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x48), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x48, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9733,7 +9733,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(64)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x64), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x64, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX512F_RR1_P6_X64, batch_div_64) {
@@ -9741,7 +9741,7 @@
     for (size_t batch_size = 128; batch_size < 640; batch_size += 64) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x64), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x64, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9750,7 +9750,7 @@
     for (size_t batch_size = 1; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x64), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x64, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9759,7 +9759,7 @@
     for (size_t batch_size = 65; batch_size < 128; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x64), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x64, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9769,7 +9769,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x64), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x64, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9780,7 +9780,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x64), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x64, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9792,7 +9792,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x64), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x64, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9804,7 +9804,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x64), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x64, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9816,7 +9816,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(80)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x80), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x80, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX512F_RR1_P6_X80, batch_div_80) {
@@ -9824,7 +9824,7 @@
     for (size_t batch_size = 160; batch_size < 800; batch_size += 80) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x80), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x80, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9833,7 +9833,7 @@
     for (size_t batch_size = 1; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x80), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x80, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9842,7 +9842,7 @@
     for (size_t batch_size = 81; batch_size < 160; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x80), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x80, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9852,7 +9852,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x80), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x80, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9863,7 +9863,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x80), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x80, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9875,7 +9875,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x80), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x80, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9887,7 +9887,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x80), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x80, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9899,7 +9899,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(96)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x96), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x96, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX512F_RR1_P6_X96, batch_div_96) {
@@ -9907,7 +9907,7 @@
     for (size_t batch_size = 192; batch_size < 960; batch_size += 96) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x96), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x96, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9916,7 +9916,7 @@
     for (size_t batch_size = 1; batch_size < 96; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x96), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x96, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9925,7 +9925,7 @@
     for (size_t batch_size = 97; batch_size < 192; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x96), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x96, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9935,7 +9935,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x96), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x96, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9946,7 +9946,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x96), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x96, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9958,7 +9958,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x96), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x96, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9970,7 +9970,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x96), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x96, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -9982,7 +9982,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(112)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x112), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x112, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX512F_RR1_P6_X112, batch_div_112) {
@@ -9990,7 +9990,7 @@
     for (size_t batch_size = 224; batch_size < 1120; batch_size += 112) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x112), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x112, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -9999,7 +9999,7 @@
     for (size_t batch_size = 1; batch_size < 112; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x112), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x112, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10008,7 +10008,7 @@
     for (size_t batch_size = 113; batch_size < 224; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x112), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x112, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10018,7 +10018,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x112), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x112, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10029,7 +10029,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x112), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x112, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10041,7 +10041,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x112), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x112, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10053,7 +10053,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x112), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x112, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10065,7 +10065,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(128)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x128), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x128, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__AVX512F_RR1_P6_X128, batch_div_128) {
@@ -10073,7 +10073,7 @@
     for (size_t batch_size = 256; batch_size < 1280; batch_size += 128) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x128), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x128, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10082,7 +10082,7 @@
     for (size_t batch_size = 1; batch_size < 128; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x128), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x128, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10091,7 +10091,7 @@
     for (size_t batch_size = 129; batch_size < 256; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x128), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x128, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10101,7 +10101,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x128), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x128, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10112,7 +10112,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x128), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x128, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10124,7 +10124,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x128), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x128, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10136,7 +10136,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__avx512f_rr1_p6_x128), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__avx512f_rr1_p6_x128, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10147,14 +10147,14 @@
   TEST(F32_VELU__WASMSIMD_ARM_RR2_LUT16_P3_X4, batch_eq_4) {
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASMSIMD_ARM_RR2_LUT16_P3_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10162,7 +10162,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10170,7 +10170,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10179,7 +10179,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10189,7 +10189,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10200,7 +10200,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10211,7 +10211,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10222,14 +10222,14 @@
   TEST(F32_VELU__WASMSIMD_ARM_RR2_LUT16_P3_X8, batch_eq_8) {
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASMSIMD_ARM_RR2_LUT16_P3_X8, batch_div_8) {
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10237,7 +10237,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10245,7 +10245,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10254,7 +10254,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10264,7 +10264,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10275,7 +10275,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10286,7 +10286,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10297,14 +10297,14 @@
   TEST(F32_VELU__WASMSIMD_ARM_RR2_LUT16_P3_X12, batch_eq_12) {
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASMSIMD_ARM_RR2_LUT16_P3_X12, batch_div_12) {
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10312,7 +10312,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10320,7 +10320,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10329,7 +10329,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10339,7 +10339,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10350,7 +10350,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10361,7 +10361,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10372,14 +10372,14 @@
   TEST(F32_VELU__WASMSIMD_ARM_RR2_LUT16_P3_X16, batch_eq_16) {
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASMSIMD_ARM_RR2_LUT16_P3_X16, batch_div_16) {
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10387,7 +10387,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10395,7 +10395,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10404,7 +10404,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10414,7 +10414,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10425,7 +10425,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10436,7 +10436,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10447,14 +10447,14 @@
   TEST(F32_VELU__WASMSIMD_ARM_RR2_LUT16_P3_X20, batch_eq_20) {
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASMSIMD_ARM_RR2_LUT16_P3_X20, batch_div_20) {
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10462,7 +10462,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10470,7 +10470,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10479,7 +10479,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10489,7 +10489,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10500,7 +10500,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10511,7 +10511,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10522,14 +10522,14 @@
   TEST(F32_VELU__WASMSIMD_ARM_RR2_LUT16_P3_X24, batch_eq_24) {
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASMSIMD_ARM_RR2_LUT16_P3_X24, batch_div_24) {
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10537,7 +10537,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10545,7 +10545,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10554,7 +10554,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10564,7 +10564,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10575,7 +10575,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10586,7 +10586,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10597,14 +10597,14 @@
   TEST(F32_VELU__WASMSIMD_X86_RR2_LUT16_P3_X4, batch_eq_4) {
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASMSIMD_X86_RR2_LUT16_P3_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10612,7 +10612,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10620,7 +10620,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10629,7 +10629,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10639,7 +10639,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10650,7 +10650,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10661,7 +10661,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10672,14 +10672,14 @@
   TEST(F32_VELU__WASMSIMD_X86_RR2_LUT16_P3_X8, batch_eq_8) {
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASMSIMD_X86_RR2_LUT16_P3_X8, batch_div_8) {
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10687,7 +10687,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10695,7 +10695,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10704,7 +10704,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10714,7 +10714,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10725,7 +10725,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10736,7 +10736,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10747,14 +10747,14 @@
   TEST(F32_VELU__WASMSIMD_X86_RR2_LUT16_P3_X12, batch_eq_12) {
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASMSIMD_X86_RR2_LUT16_P3_X12, batch_div_12) {
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10762,7 +10762,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10770,7 +10770,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10779,7 +10779,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10789,7 +10789,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10800,7 +10800,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10811,7 +10811,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10822,14 +10822,14 @@
   TEST(F32_VELU__WASMSIMD_X86_RR2_LUT16_P3_X16, batch_eq_16) {
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASMSIMD_X86_RR2_LUT16_P3_X16, batch_div_16) {
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10837,7 +10837,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10845,7 +10845,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10854,7 +10854,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10864,7 +10864,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10875,7 +10875,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10886,7 +10886,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10897,14 +10897,14 @@
   TEST(F32_VELU__WASMSIMD_X86_RR2_LUT16_P3_X20, batch_eq_20) {
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASMSIMD_X86_RR2_LUT16_P3_X20, batch_div_20) {
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10912,7 +10912,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10920,7 +10920,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10929,7 +10929,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10939,7 +10939,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10950,7 +10950,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10961,7 +10961,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -10972,14 +10972,14 @@
   TEST(F32_VELU__WASMSIMD_X86_RR2_LUT16_P3_X24, batch_eq_24) {
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASMSIMD_X86_RR2_LUT16_P3_X24, batch_div_24) {
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10987,7 +10987,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -10995,7 +10995,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11004,7 +11004,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11014,7 +11014,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11025,7 +11025,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11036,7 +11036,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_lut16_p3_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11047,14 +11047,14 @@
   TEST(F32_VELU__WASMSIMD_ARM_RR2_P6_X4, batch_eq_4) {
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASMSIMD_ARM_RR2_P6_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11062,7 +11062,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11070,7 +11070,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11079,7 +11079,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11089,7 +11089,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11100,7 +11100,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11111,7 +11111,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11122,14 +11122,14 @@
   TEST(F32_VELU__WASMSIMD_ARM_RR2_P6_X8, batch_eq_8) {
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASMSIMD_ARM_RR2_P6_X8, batch_div_8) {
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11137,7 +11137,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11145,7 +11145,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11154,7 +11154,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11164,7 +11164,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11175,7 +11175,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11186,7 +11186,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11197,14 +11197,14 @@
   TEST(F32_VELU__WASMSIMD_ARM_RR2_P6_X12, batch_eq_12) {
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASMSIMD_ARM_RR2_P6_X12, batch_div_12) {
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11212,7 +11212,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11220,7 +11220,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11229,7 +11229,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11239,7 +11239,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11250,7 +11250,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11261,7 +11261,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11272,14 +11272,14 @@
   TEST(F32_VELU__WASMSIMD_ARM_RR2_P6_X16, batch_eq_16) {
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASMSIMD_ARM_RR2_P6_X16, batch_div_16) {
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11287,7 +11287,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11295,7 +11295,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11304,7 +11304,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11314,7 +11314,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11325,7 +11325,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11336,7 +11336,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11347,14 +11347,14 @@
   TEST(F32_VELU__WASMSIMD_ARM_RR2_P6_X20, batch_eq_20) {
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASMSIMD_ARM_RR2_P6_X20, batch_div_20) {
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11362,7 +11362,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11370,7 +11370,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11379,7 +11379,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11389,7 +11389,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11400,7 +11400,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11411,7 +11411,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11422,14 +11422,14 @@
   TEST(F32_VELU__WASMSIMD_ARM_RR2_P6_X24, batch_eq_24) {
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASMSIMD_ARM_RR2_P6_X24, batch_div_24) {
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11437,7 +11437,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11445,7 +11445,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11454,7 +11454,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11464,7 +11464,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11475,7 +11475,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11486,7 +11486,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_arm_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11497,14 +11497,14 @@
   TEST(F32_VELU__WASMSIMD_X86_RR2_P6_X4, batch_eq_4) {
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASMSIMD_X86_RR2_P6_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11512,7 +11512,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11520,7 +11520,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11529,7 +11529,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11539,7 +11539,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11550,7 +11550,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11561,7 +11561,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11572,14 +11572,14 @@
   TEST(F32_VELU__WASMSIMD_X86_RR2_P6_X8, batch_eq_8) {
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASMSIMD_X86_RR2_P6_X8, batch_div_8) {
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11587,7 +11587,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11595,7 +11595,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11604,7 +11604,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11614,7 +11614,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11625,7 +11625,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11636,7 +11636,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x8), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x8, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11647,14 +11647,14 @@
   TEST(F32_VELU__WASMSIMD_X86_RR2_P6_X12, batch_eq_12) {
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASMSIMD_X86_RR2_P6_X12, batch_div_12) {
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11662,7 +11662,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11670,7 +11670,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11679,7 +11679,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11689,7 +11689,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11700,7 +11700,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11711,7 +11711,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x12), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x12, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11722,14 +11722,14 @@
   TEST(F32_VELU__WASMSIMD_X86_RR2_P6_X16, batch_eq_16) {
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASMSIMD_X86_RR2_P6_X16, batch_div_16) {
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11737,7 +11737,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11745,7 +11745,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11754,7 +11754,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11764,7 +11764,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11775,7 +11775,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11786,7 +11786,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x16), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x16, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11797,14 +11797,14 @@
   TEST(F32_VELU__WASMSIMD_X86_RR2_P6_X20, batch_eq_20) {
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASMSIMD_X86_RR2_P6_X20, batch_div_20) {
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11812,7 +11812,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11820,7 +11820,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11829,7 +11829,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11839,7 +11839,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11850,7 +11850,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11861,7 +11861,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x20), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x20, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11872,14 +11872,14 @@
   TEST(F32_VELU__WASMSIMD_X86_RR2_P6_X24, batch_eq_24) {
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASMSIMD_X86_RR2_P6_X24, batch_div_24) {
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11887,7 +11887,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11895,7 +11895,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11904,7 +11904,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11914,7 +11914,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11925,7 +11925,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11936,7 +11936,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x24), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasmsimd_x86_rr2_p6_x24, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11947,14 +11947,14 @@
   TEST(F32_VELU__WASM_RR2_LUT16_P3_X1, batch_eq_1) {
     VUnaryMicrokernelTester()
       .batch_size(1)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x1), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x1, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASM_RR2_LUT16_P3_X1, batch_gt_1) {
     for (size_t batch_size = 2; batch_size < 10; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x1), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x1, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11963,7 +11963,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x1), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x1, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -11973,7 +11973,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x1), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x1, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11984,7 +11984,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x1), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x1, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -11995,7 +11995,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x1), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x1, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12006,14 +12006,14 @@
   TEST(F32_VELU__WASM_RR2_LUT16_P3_X2, batch_eq_2) {
     VUnaryMicrokernelTester()
       .batch_size(2)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x2), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x2, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASM_RR2_LUT16_P3_X2, batch_div_2) {
     for (size_t batch_size = 4; batch_size < 20; batch_size += 2) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x2), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x2, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12021,7 +12021,7 @@
     for (size_t batch_size = 1; batch_size < 2; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x2), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x2, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12029,7 +12029,7 @@
     for (size_t batch_size = 3; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x2), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x2, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12038,7 +12038,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x2), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x2, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12048,7 +12048,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x2), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x2, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12059,7 +12059,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x2), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x2, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12070,7 +12070,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x2), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x2, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12081,14 +12081,14 @@
   TEST(F32_VELU__WASM_RR2_LUT16_P3_X3, batch_eq_3) {
     VUnaryMicrokernelTester()
       .batch_size(3)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x3), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x3, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASM_RR2_LUT16_P3_X3, batch_div_3) {
     for (size_t batch_size = 6; batch_size < 30; batch_size += 3) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x3), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x3, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12096,7 +12096,7 @@
     for (size_t batch_size = 1; batch_size < 3; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x3), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x3, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12104,7 +12104,7 @@
     for (size_t batch_size = 4; batch_size < 6; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x3), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x3, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12113,7 +12113,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x3), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x3, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12123,7 +12123,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x3), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x3, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12134,7 +12134,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x3), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x3, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12145,7 +12145,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x3), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x3, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12156,14 +12156,14 @@
   TEST(F32_VELU__WASM_RR2_LUT16_P3_X4, batch_eq_4) {
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASM_RR2_LUT16_P3_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12171,7 +12171,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12179,7 +12179,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12188,7 +12188,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12198,7 +12198,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12209,7 +12209,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12220,7 +12220,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12231,14 +12231,14 @@
   TEST(F32_VELU__WASM_RR2_LUT16_P3_X5, batch_eq_5) {
     VUnaryMicrokernelTester()
       .batch_size(5)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x5), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x5, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASM_RR2_LUT16_P3_X5, batch_div_5) {
     for (size_t batch_size = 10; batch_size < 50; batch_size += 5) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x5), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x5, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12246,7 +12246,7 @@
     for (size_t batch_size = 1; batch_size < 5; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x5), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x5, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12254,7 +12254,7 @@
     for (size_t batch_size = 6; batch_size < 10; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x5), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x5, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12263,7 +12263,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x5), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x5, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12273,7 +12273,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x5), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x5, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12284,7 +12284,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x5), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x5, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12295,7 +12295,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x5), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x5, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12306,14 +12306,14 @@
   TEST(F32_VELU__WASM_RR2_LUT16_P3_X6, batch_eq_6) {
     VUnaryMicrokernelTester()
       .batch_size(6)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x6), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x6, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASM_RR2_LUT16_P3_X6, batch_div_6) {
     for (size_t batch_size = 12; batch_size < 60; batch_size += 6) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x6), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x6, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12321,7 +12321,7 @@
     for (size_t batch_size = 1; batch_size < 6; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x6), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x6, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12329,7 +12329,7 @@
     for (size_t batch_size = 7; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x6), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x6, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12338,7 +12338,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x6), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x6, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12348,7 +12348,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x6), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x6, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12359,7 +12359,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x6), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x6, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12370,7 +12370,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x6), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_lut16_p3_x6, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12381,14 +12381,14 @@
   TEST(F32_VELU__WASM_RR2_P6_X1, batch_eq_1) {
     VUnaryMicrokernelTester()
       .batch_size(1)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x1), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x1, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASM_RR2_P6_X1, batch_gt_1) {
     for (size_t batch_size = 2; batch_size < 10; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x1), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x1, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12397,7 +12397,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x1), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x1, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12407,7 +12407,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x1), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x1, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12418,7 +12418,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x1), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x1, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12429,7 +12429,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x1), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x1, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12440,14 +12440,14 @@
   TEST(F32_VELU__WASM_RR2_P6_X2, batch_eq_2) {
     VUnaryMicrokernelTester()
       .batch_size(2)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x2), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x2, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASM_RR2_P6_X2, batch_div_2) {
     for (size_t batch_size = 4; batch_size < 20; batch_size += 2) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x2), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x2, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12455,7 +12455,7 @@
     for (size_t batch_size = 1; batch_size < 2; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x2), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x2, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12463,7 +12463,7 @@
     for (size_t batch_size = 3; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x2), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x2, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12472,7 +12472,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x2), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x2, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12482,7 +12482,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x2), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x2, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12493,7 +12493,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x2), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x2, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12504,7 +12504,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x2), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x2, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12515,14 +12515,14 @@
   TEST(F32_VELU__WASM_RR2_P6_X3, batch_eq_3) {
     VUnaryMicrokernelTester()
       .batch_size(3)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x3), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x3, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASM_RR2_P6_X3, batch_div_3) {
     for (size_t batch_size = 6; batch_size < 30; batch_size += 3) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x3), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x3, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12530,7 +12530,7 @@
     for (size_t batch_size = 1; batch_size < 3; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x3), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x3, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12538,7 +12538,7 @@
     for (size_t batch_size = 4; batch_size < 6; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x3), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x3, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12547,7 +12547,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x3), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x3, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12557,7 +12557,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x3), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x3, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12568,7 +12568,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x3), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x3, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12579,7 +12579,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x3), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x3, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12590,14 +12590,14 @@
   TEST(F32_VELU__WASM_RR2_P6_X4, batch_eq_4) {
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASM_RR2_P6_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12605,7 +12605,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12613,7 +12613,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12622,7 +12622,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12632,7 +12632,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12643,7 +12643,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12654,7 +12654,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12665,14 +12665,14 @@
   TEST(F32_VELU__WASM_RR2_P6_X5, batch_eq_5) {
     VUnaryMicrokernelTester()
       .batch_size(5)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x5), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x5, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASM_RR2_P6_X5, batch_div_5) {
     for (size_t batch_size = 10; batch_size < 50; batch_size += 5) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x5), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x5, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12680,7 +12680,7 @@
     for (size_t batch_size = 1; batch_size < 5; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x5), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x5, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12688,7 +12688,7 @@
     for (size_t batch_size = 6; batch_size < 10; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x5), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x5, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12697,7 +12697,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x5), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x5, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12707,7 +12707,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x5), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x5, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12718,7 +12718,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x5), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x5, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12729,7 +12729,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x5), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x5, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12740,14 +12740,14 @@
   TEST(F32_VELU__WASM_RR2_P6_X6, batch_eq_6) {
     VUnaryMicrokernelTester()
       .batch_size(6)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x6), VUnaryMicrokernelTester::OpType::ELU);
+      .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x6, VUnaryMicrokernelTester::OpType::ELU);
   }
 
   TEST(F32_VELU__WASM_RR2_P6_X6, batch_div_6) {
     for (size_t batch_size = 12; batch_size < 60; batch_size += 6) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x6), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x6, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12755,7 +12755,7 @@
     for (size_t batch_size = 1; batch_size < 6; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x6), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x6, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12763,7 +12763,7 @@
     for (size_t batch_size = 7; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x6), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x6, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12772,7 +12772,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x6), VUnaryMicrokernelTester::OpType::ELU);
+        .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x6, VUnaryMicrokernelTester::OpType::ELU);
     }
   }
 
@@ -12782,7 +12782,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .prescale(prescale)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x6), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x6, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12793,7 +12793,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .alpha(alpha)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x6), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x6, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12804,7 +12804,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .beta(beta)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__wasm_rr2_p6_x6), VUnaryMicrokernelTester::OpType::ELU);
+          .Test(xnn_f32_velu_ukernel__wasm_rr2_p6_x6, VUnaryMicrokernelTester::OpType::ELU);
       }
     }
   }
@@ -12814,14 +12814,14 @@
 TEST(F32_VELU__SCALAR_RR2_LUT16_P3_X1, batch_eq_1) {
   VUnaryMicrokernelTester()
     .batch_size(1)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x1), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x1, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VELU__SCALAR_RR2_LUT16_P3_X1, batch_gt_1) {
   for (size_t batch_size = 2; batch_size < 10; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x1), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x1, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -12830,7 +12830,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x1), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x1, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -12840,7 +12840,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .prescale(prescale)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x1), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x1, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -12851,7 +12851,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .alpha(alpha)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x1), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x1, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -12862,7 +12862,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .beta(beta)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x1), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x1, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -12871,14 +12871,14 @@
 TEST(F32_VELU__SCALAR_RR2_LUT16_P3_X2, batch_eq_2) {
   VUnaryMicrokernelTester()
     .batch_size(2)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x2), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x2, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VELU__SCALAR_RR2_LUT16_P3_X2, batch_div_2) {
   for (size_t batch_size = 4; batch_size < 20; batch_size += 2) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x2), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x2, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -12886,7 +12886,7 @@
   for (size_t batch_size = 1; batch_size < 2; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x2), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x2, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -12894,7 +12894,7 @@
   for (size_t batch_size = 3; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x2), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x2, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -12903,7 +12903,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x2), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x2, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -12913,7 +12913,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .prescale(prescale)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x2), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x2, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -12924,7 +12924,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .alpha(alpha)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x2), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x2, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -12935,7 +12935,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .beta(beta)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x2), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x2, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -12944,14 +12944,14 @@
 TEST(F32_VELU__SCALAR_RR2_LUT16_P3_X3, batch_eq_3) {
   VUnaryMicrokernelTester()
     .batch_size(3)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x3), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x3, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VELU__SCALAR_RR2_LUT16_P3_X3, batch_div_3) {
   for (size_t batch_size = 6; batch_size < 30; batch_size += 3) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x3), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x3, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -12959,7 +12959,7 @@
   for (size_t batch_size = 1; batch_size < 3; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x3), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x3, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -12967,7 +12967,7 @@
   for (size_t batch_size = 4; batch_size < 6; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x3), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x3, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -12976,7 +12976,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x3), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x3, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -12986,7 +12986,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .prescale(prescale)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x3), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x3, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -12997,7 +12997,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .alpha(alpha)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x3), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x3, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -13008,7 +13008,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .beta(beta)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x3), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x3, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -13017,14 +13017,14 @@
 TEST(F32_VELU__SCALAR_RR2_LUT16_P3_X4, batch_eq_4) {
   VUnaryMicrokernelTester()
     .batch_size(4)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VELU__SCALAR_RR2_LUT16_P3_X4, batch_div_4) {
   for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13032,7 +13032,7 @@
   for (size_t batch_size = 1; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13040,7 +13040,7 @@
   for (size_t batch_size = 5; batch_size < 8; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13049,7 +13049,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13059,7 +13059,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .prescale(prescale)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -13070,7 +13070,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .alpha(alpha)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -13081,7 +13081,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .beta(beta)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x4), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x4, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -13090,14 +13090,14 @@
 TEST(F32_VELU__SCALAR_RR2_LUT16_P3_X5, batch_eq_5) {
   VUnaryMicrokernelTester()
     .batch_size(5)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x5), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x5, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VELU__SCALAR_RR2_LUT16_P3_X5, batch_div_5) {
   for (size_t batch_size = 10; batch_size < 50; batch_size += 5) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x5), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x5, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13105,7 +13105,7 @@
   for (size_t batch_size = 1; batch_size < 5; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x5), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x5, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13113,7 +13113,7 @@
   for (size_t batch_size = 6; batch_size < 10; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x5), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x5, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13122,7 +13122,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x5), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x5, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13132,7 +13132,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .prescale(prescale)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x5), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x5, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -13143,7 +13143,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .alpha(alpha)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x5), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x5, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -13154,7 +13154,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .beta(beta)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x5), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x5, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -13163,14 +13163,14 @@
 TEST(F32_VELU__SCALAR_RR2_LUT16_P3_X6, batch_eq_6) {
   VUnaryMicrokernelTester()
     .batch_size(6)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x6), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x6, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VELU__SCALAR_RR2_LUT16_P3_X6, batch_div_6) {
   for (size_t batch_size = 12; batch_size < 60; batch_size += 6) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x6), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x6, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13178,7 +13178,7 @@
   for (size_t batch_size = 1; batch_size < 6; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x6), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x6, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13186,7 +13186,7 @@
   for (size_t batch_size = 7; batch_size < 12; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x6), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x6, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13195,7 +13195,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x6), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x6, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13205,7 +13205,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .prescale(prescale)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x6), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x6, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -13216,7 +13216,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .alpha(alpha)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x6), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x6, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -13227,7 +13227,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .beta(beta)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x6), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_lut16_p3_x6, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -13236,14 +13236,14 @@
 TEST(F32_VELU__SCALAR_RR2_P6_X1, batch_eq_1) {
   VUnaryMicrokernelTester()
     .batch_size(1)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x1), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x1, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VELU__SCALAR_RR2_P6_X1, batch_gt_1) {
   for (size_t batch_size = 2; batch_size < 10; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x1), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x1, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13252,7 +13252,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x1), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x1, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13262,7 +13262,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .prescale(prescale)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x1), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x1, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -13273,7 +13273,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .alpha(alpha)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x1), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x1, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -13284,7 +13284,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .beta(beta)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x1), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x1, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -13293,14 +13293,14 @@
 TEST(F32_VELU__SCALAR_RR2_P6_X2, batch_eq_2) {
   VUnaryMicrokernelTester()
     .batch_size(2)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x2), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x2, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VELU__SCALAR_RR2_P6_X2, batch_div_2) {
   for (size_t batch_size = 4; batch_size < 20; batch_size += 2) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x2), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x2, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13308,7 +13308,7 @@
   for (size_t batch_size = 1; batch_size < 2; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x2), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x2, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13316,7 +13316,7 @@
   for (size_t batch_size = 3; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x2), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x2, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13325,7 +13325,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x2), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x2, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13335,7 +13335,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .prescale(prescale)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x2), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x2, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -13346,7 +13346,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .alpha(alpha)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x2), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x2, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -13357,7 +13357,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .beta(beta)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x2), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x2, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -13366,14 +13366,14 @@
 TEST(F32_VELU__SCALAR_RR2_P6_X3, batch_eq_3) {
   VUnaryMicrokernelTester()
     .batch_size(3)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x3), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x3, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VELU__SCALAR_RR2_P6_X3, batch_div_3) {
   for (size_t batch_size = 6; batch_size < 30; batch_size += 3) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x3), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x3, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13381,7 +13381,7 @@
   for (size_t batch_size = 1; batch_size < 3; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x3), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x3, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13389,7 +13389,7 @@
   for (size_t batch_size = 4; batch_size < 6; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x3), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x3, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13398,7 +13398,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x3), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x3, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13408,7 +13408,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .prescale(prescale)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x3), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x3, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -13419,7 +13419,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .alpha(alpha)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x3), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x3, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -13430,7 +13430,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .beta(beta)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x3), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x3, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -13439,14 +13439,14 @@
 TEST(F32_VELU__SCALAR_RR2_P6_X4, batch_eq_4) {
   VUnaryMicrokernelTester()
     .batch_size(4)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VELU__SCALAR_RR2_P6_X4, batch_div_4) {
   for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13454,7 +13454,7 @@
   for (size_t batch_size = 1; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13462,7 +13462,7 @@
   for (size_t batch_size = 5; batch_size < 8; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13471,7 +13471,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13481,7 +13481,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .prescale(prescale)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -13492,7 +13492,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .alpha(alpha)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -13503,7 +13503,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .beta(beta)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x4), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x4, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -13512,14 +13512,14 @@
 TEST(F32_VELU__SCALAR_RR2_P6_X5, batch_eq_5) {
   VUnaryMicrokernelTester()
     .batch_size(5)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x5), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x5, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VELU__SCALAR_RR2_P6_X5, batch_div_5) {
   for (size_t batch_size = 10; batch_size < 50; batch_size += 5) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x5), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x5, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13527,7 +13527,7 @@
   for (size_t batch_size = 1; batch_size < 5; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x5), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x5, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13535,7 +13535,7 @@
   for (size_t batch_size = 6; batch_size < 10; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x5), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x5, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13544,7 +13544,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x5), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x5, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13554,7 +13554,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .prescale(prescale)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x5), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x5, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -13565,7 +13565,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .alpha(alpha)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x5), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x5, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -13576,7 +13576,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .beta(beta)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x5), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x5, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -13585,14 +13585,14 @@
 TEST(F32_VELU__SCALAR_RR2_P6_X6, batch_eq_6) {
   VUnaryMicrokernelTester()
     .batch_size(6)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x6), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x6, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VELU__SCALAR_RR2_P6_X6, batch_div_6) {
   for (size_t batch_size = 12; batch_size < 60; batch_size += 6) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x6), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x6, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13600,7 +13600,7 @@
   for (size_t batch_size = 1; batch_size < 6; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x6), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x6, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13608,7 +13608,7 @@
   for (size_t batch_size = 7; batch_size < 12; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x6), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x6, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13617,7 +13617,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x6), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x6, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -13627,7 +13627,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .prescale(prescale)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x6), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x6, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -13638,7 +13638,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .alpha(alpha)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x6), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x6, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -13649,7 +13649,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .beta(beta)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_velu_ukernel__scalar_rr2_p6_x6), VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_velu_ukernel__scalar_rr2_p6_x6, VUnaryMicrokernelTester::OpType::ELU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
diff --git a/test/f32-vhswish.cc b/test/f32-vhswish.cc
index dd53446..b7c78e6 100644
--- a/test/f32-vhswish.cc
+++ b/test/f32-vhswish.cc
@@ -22,7 +22,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::HardSwish);
+      .Test(xnn_f32_vhswish_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::HardSwish);
   }
 
   TEST(F32_VHSWISH__NEON_X4, batch_div_4) {
@@ -30,7 +30,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -39,7 +39,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -48,7 +48,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -58,7 +58,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -69,7 +69,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::HardSwish);
+      .Test(xnn_f32_vhswish_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::HardSwish);
   }
 
   TEST(F32_VHSWISH__NEON_X8, batch_div_8) {
@@ -77,7 +77,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -86,7 +86,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -95,7 +95,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -105,7 +105,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -116,7 +116,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__neon_x16), VUnaryMicrokernelTester::OpType::HardSwish);
+      .Test(xnn_f32_vhswish_ukernel__neon_x16, VUnaryMicrokernelTester::OpType::HardSwish);
   }
 
   TEST(F32_VHSWISH__NEON_X16, batch_div_16) {
@@ -124,7 +124,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__neon_x16), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__neon_x16, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -133,7 +133,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__neon_x16), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__neon_x16, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -142,7 +142,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__neon_x16), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__neon_x16, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -152,7 +152,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__neon_x16), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__neon_x16, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -163,7 +163,7 @@
     TEST_REQUIRES_X86_SSE;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::HardSwish);
+      .Test(xnn_f32_vhswish_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::HardSwish);
   }
 
   TEST(F32_VHSWISH__SSE_X4, batch_div_4) {
@@ -171,7 +171,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -180,7 +180,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -189,7 +189,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -199,7 +199,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -210,7 +210,7 @@
     TEST_REQUIRES_X86_SSE;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::HardSwish);
+      .Test(xnn_f32_vhswish_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::HardSwish);
   }
 
   TEST(F32_VHSWISH__SSE_X8, batch_div_8) {
@@ -218,7 +218,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -227,7 +227,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -236,7 +236,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -246,7 +246,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -257,7 +257,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::HardSwish);
+      .Test(xnn_f32_vhswish_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::HardSwish);
   }
 
   TEST(F32_VHSWISH__AVX_X8, batch_div_8) {
@@ -265,7 +265,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -274,7 +274,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -283,7 +283,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -293,7 +293,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -304,7 +304,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::HardSwish);
+      .Test(xnn_f32_vhswish_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::HardSwish);
   }
 
   TEST(F32_VHSWISH__AVX_X16, batch_div_16) {
@@ -312,7 +312,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -321,7 +321,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -330,7 +330,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -340,7 +340,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -351,7 +351,7 @@
     TEST_REQUIRES_X86_FMA3;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__fma3_x8), VUnaryMicrokernelTester::OpType::HardSwish);
+      .Test(xnn_f32_vhswish_ukernel__fma3_x8, VUnaryMicrokernelTester::OpType::HardSwish);
   }
 
   TEST(F32_VHSWISH__FMA3_X8, batch_div_8) {
@@ -359,7 +359,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__fma3_x8), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__fma3_x8, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -368,7 +368,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__fma3_x8), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__fma3_x8, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -377,7 +377,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__fma3_x8), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__fma3_x8, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -387,7 +387,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__fma3_x8), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__fma3_x8, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -398,7 +398,7 @@
     TEST_REQUIRES_X86_FMA3;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__fma3_x16), VUnaryMicrokernelTester::OpType::HardSwish);
+      .Test(xnn_f32_vhswish_ukernel__fma3_x16, VUnaryMicrokernelTester::OpType::HardSwish);
   }
 
   TEST(F32_VHSWISH__FMA3_X16, batch_div_16) {
@@ -406,7 +406,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__fma3_x16), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__fma3_x16, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -415,7 +415,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__fma3_x16), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__fma3_x16, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -424,7 +424,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__fma3_x16), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__fma3_x16, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -434,7 +434,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__fma3_x16), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__fma3_x16, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -445,7 +445,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::HardSwish);
+      .Test(xnn_f32_vhswish_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::HardSwish);
   }
 
   TEST(F32_VHSWISH__AVX512F_X16, batch_div_16) {
@@ -453,7 +453,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -462,7 +462,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -471,7 +471,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -481,7 +481,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -492,7 +492,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::HardSwish);
+      .Test(xnn_f32_vhswish_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::HardSwish);
   }
 
   TEST(F32_VHSWISH__AVX512F_X32, batch_div_32) {
@@ -500,7 +500,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -509,7 +509,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -518,7 +518,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -528,7 +528,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -538,14 +538,14 @@
   TEST(F32_VHSWISH__WASMSIMD_X4, batch_eq_4) {
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__wasmsimd_x4), VUnaryMicrokernelTester::OpType::HardSwish);
+      .Test(xnn_f32_vhswish_ukernel__wasmsimd_x4, VUnaryMicrokernelTester::OpType::HardSwish);
   }
 
   TEST(F32_VHSWISH__WASMSIMD_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__wasmsimd_x4), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__wasmsimd_x4, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -553,7 +553,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__wasmsimd_x4), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__wasmsimd_x4, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -561,7 +561,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__wasmsimd_x4), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__wasmsimd_x4, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -570,7 +570,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__wasmsimd_x4), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__wasmsimd_x4, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -580,14 +580,14 @@
   TEST(F32_VHSWISH__WASMSIMD_X8, batch_eq_8) {
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__wasmsimd_x8), VUnaryMicrokernelTester::OpType::HardSwish);
+      .Test(xnn_f32_vhswish_ukernel__wasmsimd_x8, VUnaryMicrokernelTester::OpType::HardSwish);
   }
 
   TEST(F32_VHSWISH__WASMSIMD_X8, batch_div_8) {
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__wasmsimd_x8), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__wasmsimd_x8, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -595,7 +595,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__wasmsimd_x8), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__wasmsimd_x8, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -603,7 +603,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__wasmsimd_x8), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__wasmsimd_x8, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -612,7 +612,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__wasmsimd_x8), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__wasmsimd_x8, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -622,14 +622,14 @@
   TEST(F32_VHSWISH__WASMSIMD_X16, batch_eq_16) {
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__wasmsimd_x16), VUnaryMicrokernelTester::OpType::HardSwish);
+      .Test(xnn_f32_vhswish_ukernel__wasmsimd_x16, VUnaryMicrokernelTester::OpType::HardSwish);
   }
 
   TEST(F32_VHSWISH__WASMSIMD_X16, batch_div_16) {
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__wasmsimd_x16), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__wasmsimd_x16, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -637,7 +637,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__wasmsimd_x16), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__wasmsimd_x16, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -645,7 +645,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__wasmsimd_x16), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__wasmsimd_x16, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -654,7 +654,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__wasmsimd_x16), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__wasmsimd_x16, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -664,14 +664,14 @@
   TEST(F32_VHSWISH__WASM_X1, batch_eq_1) {
     VUnaryMicrokernelTester()
       .batch_size(1)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__wasm_x1), VUnaryMicrokernelTester::OpType::HardSwish);
+      .Test(xnn_f32_vhswish_ukernel__wasm_x1, VUnaryMicrokernelTester::OpType::HardSwish);
   }
 
   TEST(F32_VHSWISH__WASM_X1, batch_gt_1) {
     for (size_t batch_size = 2; batch_size < 10; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__wasm_x1), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__wasm_x1, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -680,7 +680,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__wasm_x1), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__wasm_x1, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 #endif  // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
@@ -690,14 +690,14 @@
   TEST(F32_VHSWISH__WASM_X2, batch_eq_2) {
     VUnaryMicrokernelTester()
       .batch_size(2)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__wasm_x2), VUnaryMicrokernelTester::OpType::HardSwish);
+      .Test(xnn_f32_vhswish_ukernel__wasm_x2, VUnaryMicrokernelTester::OpType::HardSwish);
   }
 
   TEST(F32_VHSWISH__WASM_X2, batch_div_2) {
     for (size_t batch_size = 4; batch_size < 20; batch_size += 2) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__wasm_x2), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__wasm_x2, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -705,7 +705,7 @@
     for (size_t batch_size = 1; batch_size < 2; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__wasm_x2), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__wasm_x2, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -713,7 +713,7 @@
     for (size_t batch_size = 3; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__wasm_x2), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__wasm_x2, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -722,7 +722,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__wasm_x2), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__wasm_x2, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 #endif  // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
@@ -732,14 +732,14 @@
   TEST(F32_VHSWISH__WASM_X4, batch_eq_4) {
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__wasm_x4), VUnaryMicrokernelTester::OpType::HardSwish);
+      .Test(xnn_f32_vhswish_ukernel__wasm_x4, VUnaryMicrokernelTester::OpType::HardSwish);
   }
 
   TEST(F32_VHSWISH__WASM_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__wasm_x4), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__wasm_x4, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -747,7 +747,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__wasm_x4), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__wasm_x4, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -755,7 +755,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__wasm_x4), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__wasm_x4, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 
@@ -764,7 +764,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__wasm_x4), VUnaryMicrokernelTester::OpType::HardSwish);
+        .Test(xnn_f32_vhswish_ukernel__wasm_x4, VUnaryMicrokernelTester::OpType::HardSwish);
     }
   }
 #endif  // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
@@ -773,14 +773,14 @@
 TEST(F32_VHSWISH__SCALAR_X1, batch_eq_1) {
   VUnaryMicrokernelTester()
     .batch_size(1)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__scalar_x1), VUnaryMicrokernelTester::OpType::HardSwish, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vhswish_ukernel__scalar_x1, VUnaryMicrokernelTester::OpType::HardSwish, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VHSWISH__SCALAR_X1, batch_gt_1) {
   for (size_t batch_size = 2; batch_size < 10; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__scalar_x1), VUnaryMicrokernelTester::OpType::HardSwish, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vhswish_ukernel__scalar_x1, VUnaryMicrokernelTester::OpType::HardSwish, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -789,7 +789,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__scalar_x1), VUnaryMicrokernelTester::OpType::HardSwish, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vhswish_ukernel__scalar_x1, VUnaryMicrokernelTester::OpType::HardSwish, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -797,14 +797,14 @@
 TEST(F32_VHSWISH__SCALAR_X2, batch_eq_2) {
   VUnaryMicrokernelTester()
     .batch_size(2)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::HardSwish, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vhswish_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::HardSwish, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VHSWISH__SCALAR_X2, batch_div_2) {
   for (size_t batch_size = 4; batch_size < 20; batch_size += 2) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::HardSwish, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vhswish_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::HardSwish, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -812,7 +812,7 @@
   for (size_t batch_size = 1; batch_size < 2; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::HardSwish, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vhswish_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::HardSwish, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -820,7 +820,7 @@
   for (size_t batch_size = 3; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::HardSwish, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vhswish_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::HardSwish, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -829,7 +829,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::HardSwish, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vhswish_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::HardSwish, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -837,14 +837,14 @@
 TEST(F32_VHSWISH__SCALAR_X4, batch_eq_4) {
   VUnaryMicrokernelTester()
     .batch_size(4)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::HardSwish, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vhswish_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::HardSwish, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VHSWISH__SCALAR_X4, batch_div_4) {
   for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::HardSwish, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vhswish_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::HardSwish, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -852,7 +852,7 @@
   for (size_t batch_size = 1; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::HardSwish, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vhswish_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::HardSwish, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -860,7 +860,7 @@
   for (size_t batch_size = 5; batch_size < 8; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::HardSwish, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vhswish_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::HardSwish, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -869,6 +869,6 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vhswish_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::HardSwish, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vhswish_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::HardSwish, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
diff --git a/test/f32-vlrelu.cc b/test/f32-vlrelu.cc
index ebbe5b2..d09b98f 100644
--- a/test/f32-vlrelu.cc
+++ b/test/f32-vlrelu.cc
@@ -22,7 +22,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+      .Test(xnn_f32_vlrelu_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
   }
 
   TEST(F32_VLRELU__NEON_X4, batch_div_4) {
@@ -30,7 +30,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -39,7 +39,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -48,7 +48,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -58,7 +58,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -69,7 +69,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .slope(slope)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+          .Test(xnn_f32_vlrelu_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
       }
     }
   }
@@ -81,7 +81,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+      .Test(xnn_f32_vlrelu_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
   }
 
   TEST(F32_VLRELU__NEON_X8, batch_div_8) {
@@ -89,7 +89,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -98,7 +98,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -107,7 +107,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -117,7 +117,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -128,7 +128,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .slope(slope)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+          .Test(xnn_f32_vlrelu_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
       }
     }
   }
@@ -140,7 +140,7 @@
     TEST_REQUIRES_X86_SSE;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+      .Test(xnn_f32_vlrelu_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
   }
 
   TEST(F32_VLRELU__SSE_X4, batch_div_4) {
@@ -148,7 +148,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -157,7 +157,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -166,7 +166,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -176,7 +176,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -187,7 +187,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .slope(slope)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+          .Test(xnn_f32_vlrelu_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
       }
     }
   }
@@ -199,7 +199,7 @@
     TEST_REQUIRES_X86_SSE;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+      .Test(xnn_f32_vlrelu_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
   }
 
   TEST(F32_VLRELU__SSE_X8, batch_div_8) {
@@ -207,7 +207,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -216,7 +216,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -225,7 +225,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -235,7 +235,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -246,7 +246,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .slope(slope)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+          .Test(xnn_f32_vlrelu_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
       }
     }
   }
@@ -258,7 +258,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse2_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+      .Test(xnn_f32_vlrelu_ukernel__sse2_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
   }
 
   TEST(F32_VLRELU__SSE2_X4, batch_div_4) {
@@ -266,7 +266,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse2_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__sse2_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -275,7 +275,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse2_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__sse2_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -284,7 +284,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse2_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__sse2_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -294,7 +294,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse2_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__sse2_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -305,7 +305,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .slope(slope)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse2_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+          .Test(xnn_f32_vlrelu_ukernel__sse2_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
       }
     }
   }
@@ -317,7 +317,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse2_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+      .Test(xnn_f32_vlrelu_ukernel__sse2_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
   }
 
   TEST(F32_VLRELU__SSE2_X8, batch_div_8) {
@@ -325,7 +325,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse2_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__sse2_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -334,7 +334,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse2_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__sse2_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -343,7 +343,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse2_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__sse2_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -353,7 +353,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse2_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__sse2_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -364,7 +364,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .slope(slope)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse2_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+          .Test(xnn_f32_vlrelu_ukernel__sse2_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
       }
     }
   }
@@ -376,7 +376,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse41_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+      .Test(xnn_f32_vlrelu_ukernel__sse41_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
   }
 
   TEST(F32_VLRELU__SSE41_X4, batch_div_4) {
@@ -384,7 +384,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse41_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__sse41_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -393,7 +393,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse41_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__sse41_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -402,7 +402,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse41_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__sse41_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -412,7 +412,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse41_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__sse41_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -423,7 +423,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .slope(slope)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse41_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+          .Test(xnn_f32_vlrelu_ukernel__sse41_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
       }
     }
   }
@@ -435,7 +435,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse41_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+      .Test(xnn_f32_vlrelu_ukernel__sse41_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
   }
 
   TEST(F32_VLRELU__SSE41_X8, batch_div_8) {
@@ -443,7 +443,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse41_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__sse41_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -452,7 +452,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse41_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__sse41_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -461,7 +461,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse41_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__sse41_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -471,7 +471,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse41_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__sse41_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -482,7 +482,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .slope(slope)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__sse41_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+          .Test(xnn_f32_vlrelu_ukernel__sse41_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
       }
     }
   }
@@ -494,7 +494,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+      .Test(xnn_f32_vlrelu_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
   }
 
   TEST(F32_VLRELU__AVX_X8, batch_div_8) {
@@ -502,7 +502,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -511,7 +511,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -520,7 +520,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -530,7 +530,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -541,7 +541,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .slope(slope)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+          .Test(xnn_f32_vlrelu_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
       }
     }
   }
@@ -553,7 +553,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::LeakyReLU);
+      .Test(xnn_f32_vlrelu_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::LeakyReLU);
   }
 
   TEST(F32_VLRELU__AVX_X16, batch_div_16) {
@@ -561,7 +561,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -570,7 +570,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -579,7 +579,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -589,7 +589,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -600,7 +600,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .slope(slope)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::LeakyReLU);
+          .Test(xnn_f32_vlrelu_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::LeakyReLU);
       }
     }
   }
@@ -612,7 +612,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::LeakyReLU);
+      .Test(xnn_f32_vlrelu_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::LeakyReLU);
   }
 
   TEST(F32_VLRELU__AVX512F_X16, batch_div_16) {
@@ -620,7 +620,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -629,7 +629,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -638,7 +638,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -648,7 +648,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -659,7 +659,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .slope(slope)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::LeakyReLU);
+          .Test(xnn_f32_vlrelu_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::LeakyReLU);
       }
     }
   }
@@ -671,7 +671,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::LeakyReLU);
+      .Test(xnn_f32_vlrelu_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::LeakyReLU);
   }
 
   TEST(F32_VLRELU__AVX512F_X32, batch_div_32) {
@@ -679,7 +679,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -688,7 +688,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -697,7 +697,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -707,7 +707,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -718,7 +718,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .slope(slope)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::LeakyReLU);
+          .Test(xnn_f32_vlrelu_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::LeakyReLU);
       }
     }
   }
@@ -729,14 +729,14 @@
   TEST(F32_VLRELU__WASMSIMD_BITSELECT_X4, batch_eq_4) {
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasmsimd_bitselect_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+      .Test(xnn_f32_vlrelu_ukernel__wasmsimd_bitselect_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
   }
 
   TEST(F32_VLRELU__WASMSIMD_BITSELECT_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasmsimd_bitselect_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__wasmsimd_bitselect_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -744,7 +744,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasmsimd_bitselect_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__wasmsimd_bitselect_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -752,7 +752,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasmsimd_bitselect_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__wasmsimd_bitselect_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -761,7 +761,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasmsimd_bitselect_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__wasmsimd_bitselect_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -771,7 +771,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .slope(slope)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasmsimd_bitselect_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+          .Test(xnn_f32_vlrelu_ukernel__wasmsimd_bitselect_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
       }
     }
   }
@@ -782,14 +782,14 @@
   TEST(F32_VLRELU__WASMSIMD_BITSELECT_X8, batch_eq_8) {
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasmsimd_bitselect_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+      .Test(xnn_f32_vlrelu_ukernel__wasmsimd_bitselect_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
   }
 
   TEST(F32_VLRELU__WASMSIMD_BITSELECT_X8, batch_div_8) {
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasmsimd_bitselect_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__wasmsimd_bitselect_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -797,7 +797,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasmsimd_bitselect_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__wasmsimd_bitselect_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -805,7 +805,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasmsimd_bitselect_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__wasmsimd_bitselect_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -814,7 +814,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasmsimd_bitselect_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__wasmsimd_bitselect_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -824,7 +824,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .slope(slope)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasmsimd_bitselect_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+          .Test(xnn_f32_vlrelu_ukernel__wasmsimd_bitselect_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
       }
     }
   }
@@ -835,14 +835,14 @@
   TEST(F32_VLRELU__WASMSIMD_MINMAX_X4, batch_eq_4) {
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasmsimd_minmax_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+      .Test(xnn_f32_vlrelu_ukernel__wasmsimd_minmax_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
   }
 
   TEST(F32_VLRELU__WASMSIMD_MINMAX_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasmsimd_minmax_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__wasmsimd_minmax_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -850,7 +850,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasmsimd_minmax_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__wasmsimd_minmax_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -858,7 +858,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasmsimd_minmax_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__wasmsimd_minmax_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -867,7 +867,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasmsimd_minmax_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__wasmsimd_minmax_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -877,7 +877,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .slope(slope)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasmsimd_minmax_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+          .Test(xnn_f32_vlrelu_ukernel__wasmsimd_minmax_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
       }
     }
   }
@@ -888,14 +888,14 @@
   TEST(F32_VLRELU__WASMSIMD_MINMAX_X8, batch_eq_8) {
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasmsimd_minmax_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+      .Test(xnn_f32_vlrelu_ukernel__wasmsimd_minmax_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
   }
 
   TEST(F32_VLRELU__WASMSIMD_MINMAX_X8, batch_div_8) {
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasmsimd_minmax_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__wasmsimd_minmax_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -903,7 +903,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasmsimd_minmax_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__wasmsimd_minmax_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -911,7 +911,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasmsimd_minmax_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__wasmsimd_minmax_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -920,7 +920,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasmsimd_minmax_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__wasmsimd_minmax_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -930,7 +930,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .slope(slope)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasmsimd_minmax_x8), VUnaryMicrokernelTester::OpType::LeakyReLU);
+          .Test(xnn_f32_vlrelu_ukernel__wasmsimd_minmax_x8, VUnaryMicrokernelTester::OpType::LeakyReLU);
       }
     }
   }
@@ -941,14 +941,14 @@
   TEST(F32_VLRELU__WASM_X1, batch_eq_1) {
     VUnaryMicrokernelTester()
       .batch_size(1)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasm_x1), VUnaryMicrokernelTester::OpType::LeakyReLU);
+      .Test(xnn_f32_vlrelu_ukernel__wasm_x1, VUnaryMicrokernelTester::OpType::LeakyReLU);
   }
 
   TEST(F32_VLRELU__WASM_X1, batch_gt_1) {
     for (size_t batch_size = 2; batch_size < 10; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasm_x1), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__wasm_x1, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -957,7 +957,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasm_x1), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__wasm_x1, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -967,7 +967,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .slope(slope)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasm_x1), VUnaryMicrokernelTester::OpType::LeakyReLU);
+          .Test(xnn_f32_vlrelu_ukernel__wasm_x1, VUnaryMicrokernelTester::OpType::LeakyReLU);
       }
     }
   }
@@ -978,14 +978,14 @@
   TEST(F32_VLRELU__WASM_X2, batch_eq_2) {
     VUnaryMicrokernelTester()
       .batch_size(2)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasm_x2), VUnaryMicrokernelTester::OpType::LeakyReLU);
+      .Test(xnn_f32_vlrelu_ukernel__wasm_x2, VUnaryMicrokernelTester::OpType::LeakyReLU);
   }
 
   TEST(F32_VLRELU__WASM_X2, batch_div_2) {
     for (size_t batch_size = 4; batch_size < 20; batch_size += 2) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasm_x2), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__wasm_x2, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -993,7 +993,7 @@
     for (size_t batch_size = 1; batch_size < 2; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasm_x2), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__wasm_x2, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -1001,7 +1001,7 @@
     for (size_t batch_size = 3; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasm_x2), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__wasm_x2, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -1010,7 +1010,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasm_x2), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__wasm_x2, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -1020,7 +1020,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .slope(slope)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasm_x2), VUnaryMicrokernelTester::OpType::LeakyReLU);
+          .Test(xnn_f32_vlrelu_ukernel__wasm_x2, VUnaryMicrokernelTester::OpType::LeakyReLU);
       }
     }
   }
@@ -1031,14 +1031,14 @@
   TEST(F32_VLRELU__WASM_X4, batch_eq_4) {
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasm_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+      .Test(xnn_f32_vlrelu_ukernel__wasm_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
   }
 
   TEST(F32_VLRELU__WASM_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasm_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__wasm_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -1046,7 +1046,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasm_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__wasm_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -1054,7 +1054,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasm_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__wasm_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -1063,7 +1063,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasm_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+        .Test(xnn_f32_vlrelu_ukernel__wasm_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
     }
   }
 
@@ -1073,7 +1073,7 @@
         VUnaryMicrokernelTester()
           .batch_size(batch_size)
           .slope(slope)
-          .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__wasm_x4), VUnaryMicrokernelTester::OpType::LeakyReLU);
+          .Test(xnn_f32_vlrelu_ukernel__wasm_x4, VUnaryMicrokernelTester::OpType::LeakyReLU);
       }
     }
   }
@@ -1083,14 +1083,14 @@
 TEST(F32_VLRELU__SCALAR_X1, batch_eq_1) {
   VUnaryMicrokernelTester()
     .batch_size(1)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__scalar_x1), VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vlrelu_ukernel__scalar_x1, VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VLRELU__SCALAR_X1, batch_gt_1) {
   for (size_t batch_size = 2; batch_size < 10; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__scalar_x1), VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vlrelu_ukernel__scalar_x1, VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -1099,7 +1099,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__scalar_x1), VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vlrelu_ukernel__scalar_x1, VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -1109,7 +1109,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .slope(slope)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__scalar_x1), VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_vlrelu_ukernel__scalar_x1, VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -1117,14 +1117,14 @@
 TEST(F32_VLRELU__SCALAR_X2, batch_eq_2) {
   VUnaryMicrokernelTester()
     .batch_size(2)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vlrelu_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VLRELU__SCALAR_X2, batch_div_2) {
   for (size_t batch_size = 4; batch_size < 20; batch_size += 2) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vlrelu_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -1132,7 +1132,7 @@
   for (size_t batch_size = 1; batch_size < 2; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vlrelu_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -1140,7 +1140,7 @@
   for (size_t batch_size = 3; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vlrelu_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -1149,7 +1149,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vlrelu_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -1159,7 +1159,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .slope(slope)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_vlrelu_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
@@ -1167,14 +1167,14 @@
 TEST(F32_VLRELU__SCALAR_X4, batch_eq_4) {
   VUnaryMicrokernelTester()
     .batch_size(4)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vlrelu_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VLRELU__SCALAR_X4, batch_div_4) {
   for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vlrelu_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -1182,7 +1182,7 @@
   for (size_t batch_size = 1; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vlrelu_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -1190,7 +1190,7 @@
   for (size_t batch_size = 5; batch_size < 8; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vlrelu_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -1199,7 +1199,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vlrelu_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -1209,7 +1209,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .slope(slope)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vlrelu_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
+        .Test(xnn_f32_vlrelu_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::LeakyReLU, VUnaryMicrokernelTester::Variant::Scalar);
     }
   }
 }
\ No newline at end of file
diff --git a/test/f32-vneg.cc b/test/f32-vneg.cc
index 400fb55..eb5b680 100644
--- a/test/f32-vneg.cc
+++ b/test/f32-vneg.cc
@@ -22,7 +22,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::Negate);
+      .Test(xnn_f32_vneg_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::Negate);
   }
 
   TEST(F32_VNEG__NEON_X4, batch_div_4) {
@@ -30,7 +30,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 
@@ -39,7 +39,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 
@@ -48,7 +48,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 
@@ -58,7 +58,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -69,7 +69,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::Negate);
+      .Test(xnn_f32_vneg_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::Negate);
   }
 
   TEST(F32_VNEG__NEON_X8, batch_div_8) {
@@ -77,7 +77,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 
@@ -86,7 +86,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 
@@ -95,7 +95,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 
@@ -105,7 +105,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -116,7 +116,7 @@
     TEST_REQUIRES_X86_SSE;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::Negate);
+      .Test(xnn_f32_vneg_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::Negate);
   }
 
   TEST(F32_VNEG__SSE_X4, batch_div_4) {
@@ -124,7 +124,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 
@@ -133,7 +133,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 
@@ -142,7 +142,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 
@@ -152,7 +152,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -163,7 +163,7 @@
     TEST_REQUIRES_X86_SSE;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::Negate);
+      .Test(xnn_f32_vneg_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::Negate);
   }
 
   TEST(F32_VNEG__SSE_X8, batch_div_8) {
@@ -171,7 +171,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 
@@ -180,7 +180,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 
@@ -189,7 +189,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 
@@ -199,7 +199,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -210,7 +210,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::Negate);
+      .Test(xnn_f32_vneg_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::Negate);
   }
 
   TEST(F32_VNEG__AVX_X8, batch_div_8) {
@@ -218,7 +218,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 
@@ -227,7 +227,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 
@@ -236,7 +236,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 
@@ -246,7 +246,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -257,7 +257,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::Negate);
+      .Test(xnn_f32_vneg_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::Negate);
   }
 
   TEST(F32_VNEG__AVX_X16, batch_div_16) {
@@ -265,7 +265,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 
@@ -274,7 +274,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 
@@ -283,7 +283,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 
@@ -293,7 +293,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -304,7 +304,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::Negate);
+      .Test(xnn_f32_vneg_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::Negate);
   }
 
   TEST(F32_VNEG__AVX512F_X16, batch_div_16) {
@@ -312,7 +312,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 
@@ -321,7 +321,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 
@@ -330,7 +330,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 
@@ -340,7 +340,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -351,7 +351,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::Negate);
+      .Test(xnn_f32_vneg_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::Negate);
   }
 
   TEST(F32_VNEG__AVX512F_X32, batch_div_32) {
@@ -359,7 +359,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 
@@ -368,7 +368,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 
@@ -377,7 +377,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 
@@ -387,7 +387,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -397,14 +397,14 @@
   TEST(F32_VNEG__WASMSIMD_X4, batch_eq_4) {
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__wasmsimd_x4), VUnaryMicrokernelTester::OpType::Negate);
+      .Test(xnn_f32_vneg_ukernel__wasmsimd_x4, VUnaryMicrokernelTester::OpType::Negate);
   }
 
   TEST(F32_VNEG__WASMSIMD_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__wasmsimd_x4), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__wasmsimd_x4, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 
@@ -412,7 +412,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__wasmsimd_x4), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__wasmsimd_x4, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 
@@ -420,7 +420,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__wasmsimd_x4), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__wasmsimd_x4, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 
@@ -429,7 +429,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__wasmsimd_x4), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__wasmsimd_x4, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -439,14 +439,14 @@
   TEST(F32_VNEG__WASMSIMD_X8, batch_eq_8) {
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__wasmsimd_x8), VUnaryMicrokernelTester::OpType::Negate);
+      .Test(xnn_f32_vneg_ukernel__wasmsimd_x8, VUnaryMicrokernelTester::OpType::Negate);
   }
 
   TEST(F32_VNEG__WASMSIMD_X8, batch_div_8) {
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__wasmsimd_x8), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__wasmsimd_x8, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 
@@ -454,7 +454,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__wasmsimd_x8), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__wasmsimd_x8, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 
@@ -462,7 +462,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__wasmsimd_x8), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__wasmsimd_x8, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 
@@ -471,7 +471,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__wasmsimd_x8), VUnaryMicrokernelTester::OpType::Negate);
+        .Test(xnn_f32_vneg_ukernel__wasmsimd_x8, VUnaryMicrokernelTester::OpType::Negate);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -480,14 +480,14 @@
 TEST(F32_VNEG__SCALAR_X1, batch_eq_1) {
   VUnaryMicrokernelTester()
     .batch_size(1)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__scalar_x1), VUnaryMicrokernelTester::OpType::Negate, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vneg_ukernel__scalar_x1, VUnaryMicrokernelTester::OpType::Negate, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VNEG__SCALAR_X1, batch_gt_1) {
   for (size_t batch_size = 2; batch_size < 10; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__scalar_x1), VUnaryMicrokernelTester::OpType::Negate, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vneg_ukernel__scalar_x1, VUnaryMicrokernelTester::OpType::Negate, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -496,7 +496,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__scalar_x1), VUnaryMicrokernelTester::OpType::Negate, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vneg_ukernel__scalar_x1, VUnaryMicrokernelTester::OpType::Negate, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -504,14 +504,14 @@
 TEST(F32_VNEG__SCALAR_X2, batch_eq_2) {
   VUnaryMicrokernelTester()
     .batch_size(2)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::Negate, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vneg_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::Negate, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VNEG__SCALAR_X2, batch_div_2) {
   for (size_t batch_size = 4; batch_size < 20; batch_size += 2) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::Negate, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vneg_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::Negate, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -519,7 +519,7 @@
   for (size_t batch_size = 1; batch_size < 2; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::Negate, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vneg_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::Negate, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -527,7 +527,7 @@
   for (size_t batch_size = 3; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::Negate, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vneg_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::Negate, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -536,7 +536,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::Negate, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vneg_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::Negate, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -544,14 +544,14 @@
 TEST(F32_VNEG__SCALAR_X4, batch_eq_4) {
   VUnaryMicrokernelTester()
     .batch_size(4)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::Negate, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vneg_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::Negate, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VNEG__SCALAR_X4, batch_div_4) {
   for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::Negate, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vneg_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::Negate, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -559,7 +559,7 @@
   for (size_t batch_size = 1; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::Negate, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vneg_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::Negate, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -567,7 +567,7 @@
   for (size_t batch_size = 5; batch_size < 8; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::Negate, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vneg_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::Negate, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -576,6 +576,6 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vneg_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::Negate, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vneg_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::Negate, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
diff --git a/test/f32-vrelu.cc b/test/f32-vrelu.cc
index 792278d..21296eb 100644
--- a/test/f32-vrelu.cc
+++ b/test/f32-vrelu.cc
@@ -22,7 +22,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::ReLU);
+      .Test(xnn_f32_vrelu_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::ReLU);
   }
 
   TEST(F32_VRELU__NEON_X4, batch_div_4) {
@@ -30,7 +30,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -39,7 +39,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -48,7 +48,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -58,7 +58,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -69,7 +69,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::ReLU);
+      .Test(xnn_f32_vrelu_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::ReLU);
   }
 
   TEST(F32_VRELU__NEON_X8, batch_div_8) {
@@ -77,7 +77,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -86,7 +86,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -95,7 +95,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -105,7 +105,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -116,7 +116,7 @@
     TEST_REQUIRES_X86_SSE;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::ReLU);
+      .Test(xnn_f32_vrelu_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::ReLU);
   }
 
   TEST(F32_VRELU__SSE_X4, batch_div_4) {
@@ -124,7 +124,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -133,7 +133,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -142,7 +142,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -152,7 +152,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -163,7 +163,7 @@
     TEST_REQUIRES_X86_SSE;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::ReLU);
+      .Test(xnn_f32_vrelu_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::ReLU);
   }
 
   TEST(F32_VRELU__SSE_X8, batch_div_8) {
@@ -171,7 +171,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -180,7 +180,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -189,7 +189,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -199,7 +199,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -210,7 +210,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::ReLU);
+      .Test(xnn_f32_vrelu_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::ReLU);
   }
 
   TEST(F32_VRELU__AVX_X8, batch_div_8) {
@@ -218,7 +218,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -227,7 +227,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -236,7 +236,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -246,7 +246,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -257,7 +257,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::ReLU);
+      .Test(xnn_f32_vrelu_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::ReLU);
   }
 
   TEST(F32_VRELU__AVX_X16, batch_div_16) {
@@ -265,7 +265,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -274,7 +274,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -283,7 +283,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -293,7 +293,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -304,7 +304,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::ReLU);
+      .Test(xnn_f32_vrelu_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::ReLU);
   }
 
   TEST(F32_VRELU__AVX512F_X16, batch_div_16) {
@@ -312,7 +312,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -321,7 +321,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -330,7 +330,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -340,7 +340,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -351,7 +351,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::ReLU);
+      .Test(xnn_f32_vrelu_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::ReLU);
   }
 
   TEST(F32_VRELU__AVX512F_X32, batch_div_32) {
@@ -359,7 +359,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -368,7 +368,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -377,7 +377,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -387,7 +387,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -396,14 +396,14 @@
 TEST(F32_VRELU__SCALAR_X1, batch_eq_1) {
   VUnaryMicrokernelTester()
     .batch_size(1)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x1), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(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++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x1), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrelu_ukernel__scalar_x1, VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -412,7 +412,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x1), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrelu_ukernel__scalar_x1, VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -420,14 +420,14 @@
 TEST(F32_VRELU__SCALAR_X2, batch_eq_2) {
   VUnaryMicrokernelTester()
     .batch_size(2)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(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) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrelu_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -435,7 +435,7 @@
   for (size_t batch_size = 1; batch_size < 2; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrelu_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -443,7 +443,7 @@
   for (size_t batch_size = 3; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrelu_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -452,7 +452,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrelu_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -460,14 +460,14 @@
 TEST(F32_VRELU__SCALAR_X4, batch_eq_4) {
   VUnaryMicrokernelTester()
     .batch_size(4)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(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) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrelu_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -475,7 +475,7 @@
   for (size_t batch_size = 1; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrelu_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -483,7 +483,7 @@
   for (size_t batch_size = 5; batch_size < 8; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrelu_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -492,7 +492,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrelu_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -500,14 +500,14 @@
 TEST(F32_VRELU__SCALAR_X8, batch_eq_8) {
   VUnaryMicrokernelTester()
     .batch_size(8)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x8), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(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) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x8), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrelu_ukernel__scalar_x8, VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -515,7 +515,7 @@
   for (size_t batch_size = 1; batch_size < 8; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x8), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrelu_ukernel__scalar_x8, VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -523,7 +523,7 @@
   for (size_t batch_size = 9; batch_size < 16; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x8), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrelu_ukernel__scalar_x8, VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -532,7 +532,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__scalar_x8), VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrelu_ukernel__scalar_x8, VUnaryMicrokernelTester::OpType::ReLU, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -541,14 +541,14 @@
   TEST(F32_VRELU__WASM_X1, batch_eq_1) {
     VUnaryMicrokernelTester()
       .batch_size(1)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x1), VUnaryMicrokernelTester::OpType::ReLU);
+      .Test(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++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x1), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasm_x1, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -557,7 +557,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x1), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasm_x1, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
@@ -567,14 +567,14 @@
   TEST(F32_VRELU__WASM_X2, batch_eq_2) {
     VUnaryMicrokernelTester()
       .batch_size(2)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x2), VUnaryMicrokernelTester::OpType::ReLU);
+      .Test(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) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x2), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasm_x2, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -582,7 +582,7 @@
     for (size_t batch_size = 1; batch_size < 2; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x2), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasm_x2, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -590,7 +590,7 @@
     for (size_t batch_size = 3; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x2), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasm_x2, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -599,7 +599,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x2), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasm_x2, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
@@ -609,14 +609,14 @@
   TEST(F32_VRELU__WASM_X4, batch_eq_4) {
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x4), VUnaryMicrokernelTester::OpType::ReLU);
+      .Test(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) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x4), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasm_x4, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -624,7 +624,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x4), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasm_x4, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -632,7 +632,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x4), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasm_x4, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -641,7 +641,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x4), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasm_x4, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
@@ -651,14 +651,14 @@
   TEST(F32_VRELU__WASM_X8, batch_eq_8) {
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x8), VUnaryMicrokernelTester::OpType::ReLU);
+      .Test(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) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x8), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasm_x8, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -666,7 +666,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x8), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasm_x8, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -674,7 +674,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x8), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasm_x8, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -683,7 +683,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm_x8), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasm_x8, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
@@ -693,14 +693,14 @@
   TEST(F32_VRELU__WASMSIMD_X4, batch_eq_4) {
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x4), VUnaryMicrokernelTester::OpType::ReLU);
+      .Test(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) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x4), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasmsimd_x4, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -708,7 +708,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x4), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasmsimd_x4, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -716,7 +716,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x4), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasmsimd_x4, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -725,7 +725,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x4), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasmsimd_x4, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -735,14 +735,14 @@
   TEST(F32_VRELU__WASMSIMD_X8, batch_eq_8) {
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x8), VUnaryMicrokernelTester::OpType::ReLU);
+      .Test(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) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x8), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasmsimd_x8, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -750,7 +750,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x8), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasmsimd_x8, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -758,7 +758,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x8), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasmsimd_x8, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -767,7 +767,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x8), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasmsimd_x8, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -777,14 +777,14 @@
   TEST(F32_VRELU__WASMSIMD_X16, batch_eq_16) {
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x16), VUnaryMicrokernelTester::OpType::ReLU);
+      .Test(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) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x16), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasmsimd_x16, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -792,7 +792,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x16), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasmsimd_x16, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -800,7 +800,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x16), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasmsimd_x16, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -809,7 +809,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasmsimd_x16), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasmsimd_x16, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -819,14 +819,14 @@
   TEST(F32_VRELU__WASM32_SHR_X1, batch_eq_1) {
     VUnaryMicrokernelTester()
       .batch_size(1)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x1), VUnaryMicrokernelTester::OpType::ReLU);
+      .Test(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++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x1), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasm32_shr_x1, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -835,7 +835,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x1), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasm32_shr_x1, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
@@ -845,14 +845,14 @@
   TEST(F32_VRELU__WASM32_SHR_X2, batch_eq_2) {
     VUnaryMicrokernelTester()
       .batch_size(2)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x2), VUnaryMicrokernelTester::OpType::ReLU);
+      .Test(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) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x2), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasm32_shr_x2, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -860,7 +860,7 @@
     for (size_t batch_size = 1; batch_size < 2; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x2), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasm32_shr_x2, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -868,7 +868,7 @@
     for (size_t batch_size = 3; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x2), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasm32_shr_x2, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -877,7 +877,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x2), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasm32_shr_x2, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
@@ -887,14 +887,14 @@
   TEST(F32_VRELU__WASM32_SHR_X4, batch_eq_4) {
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x4), VUnaryMicrokernelTester::OpType::ReLU);
+      .Test(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) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x4), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasm32_shr_x4, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -902,7 +902,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x4), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasm32_shr_x4, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -910,7 +910,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x4), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasm32_shr_x4, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 
@@ -919,7 +919,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrelu_ukernel__wasm32_shr_x4), VUnaryMicrokernelTester::OpType::ReLU);
+        .Test(xnn_f32_vrelu_ukernel__wasm32_shr_x4, VUnaryMicrokernelTester::OpType::ReLU);
     }
   }
 #endif  // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
diff --git a/test/f32-vrndd.cc b/test/f32-vrndd.cc
index 55d42e3..df058ce 100644
--- a/test/f32-vrndd.cc
+++ b/test/f32-vrndd.cc
@@ -22,7 +22,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::RoundDown);
+      .Test(xnn_f32_vrndd_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::RoundDown);
   }
 
   TEST(F32_VRNDD__NEON_X4, batch_div_4) {
@@ -30,7 +30,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -39,7 +39,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -48,7 +48,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -58,7 +58,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -69,7 +69,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+      .Test(xnn_f32_vrndd_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::RoundDown);
   }
 
   TEST(F32_VRNDD__NEON_X8, batch_div_8) {
@@ -77,7 +77,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -86,7 +86,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -95,7 +95,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -105,7 +105,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -116,7 +116,7 @@
     TEST_REQUIRES_ARM_NEON_V8;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__neonv8_x4), VUnaryMicrokernelTester::OpType::RoundDown);
+      .Test(xnn_f32_vrndd_ukernel__neonv8_x4, VUnaryMicrokernelTester::OpType::RoundDown);
   }
 
   TEST(F32_VRNDD__NEONV8_X4, batch_div_4) {
@@ -124,7 +124,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__neonv8_x4), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__neonv8_x4, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -133,7 +133,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__neonv8_x4), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__neonv8_x4, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -142,7 +142,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__neonv8_x4), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__neonv8_x4, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -152,7 +152,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__neonv8_x4), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__neonv8_x4, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -163,7 +163,7 @@
     TEST_REQUIRES_ARM_NEON_V8;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__neonv8_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+      .Test(xnn_f32_vrndd_ukernel__neonv8_x8, VUnaryMicrokernelTester::OpType::RoundDown);
   }
 
   TEST(F32_VRNDD__NEONV8_X8, batch_div_8) {
@@ -171,7 +171,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__neonv8_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__neonv8_x8, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -180,7 +180,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__neonv8_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__neonv8_x8, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -189,7 +189,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__neonv8_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__neonv8_x8, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -199,7 +199,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__neonv8_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__neonv8_x8, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -210,7 +210,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__sse2_x4), VUnaryMicrokernelTester::OpType::RoundDown);
+      .Test(xnn_f32_vrndd_ukernel__sse2_x4, VUnaryMicrokernelTester::OpType::RoundDown);
   }
 
   TEST(F32_VRNDD__SSE2_X4, batch_div_4) {
@@ -218,7 +218,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__sse2_x4), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__sse2_x4, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -227,7 +227,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__sse2_x4), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__sse2_x4, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -236,7 +236,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__sse2_x4), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__sse2_x4, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -246,7 +246,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__sse2_x4), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__sse2_x4, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -257,7 +257,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__sse2_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+      .Test(xnn_f32_vrndd_ukernel__sse2_x8, VUnaryMicrokernelTester::OpType::RoundDown);
   }
 
   TEST(F32_VRNDD__SSE2_X8, batch_div_8) {
@@ -265,7 +265,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__sse2_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__sse2_x8, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -274,7 +274,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__sse2_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__sse2_x8, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -283,7 +283,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__sse2_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__sse2_x8, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -293,7 +293,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__sse2_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__sse2_x8, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -304,7 +304,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__sse41_x4), VUnaryMicrokernelTester::OpType::RoundDown);
+      .Test(xnn_f32_vrndd_ukernel__sse41_x4, VUnaryMicrokernelTester::OpType::RoundDown);
   }
 
   TEST(F32_VRNDD__SSE41_X4, batch_div_4) {
@@ -312,7 +312,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__sse41_x4), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__sse41_x4, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -321,7 +321,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__sse41_x4), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__sse41_x4, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -330,7 +330,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__sse41_x4), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__sse41_x4, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -340,7 +340,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__sse41_x4), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__sse41_x4, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -351,7 +351,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__sse41_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+      .Test(xnn_f32_vrndd_ukernel__sse41_x8, VUnaryMicrokernelTester::OpType::RoundDown);
   }
 
   TEST(F32_VRNDD__SSE41_X8, batch_div_8) {
@@ -359,7 +359,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__sse41_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__sse41_x8, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -368,7 +368,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__sse41_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__sse41_x8, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -377,7 +377,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__sse41_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__sse41_x8, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -387,7 +387,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__sse41_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__sse41_x8, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -398,7 +398,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+      .Test(xnn_f32_vrndd_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::RoundDown);
   }
 
   TEST(F32_VRNDD__AVX_X8, batch_div_8) {
@@ -406,7 +406,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -415,7 +415,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -424,7 +424,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -434,7 +434,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -445,7 +445,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::RoundDown);
+      .Test(xnn_f32_vrndd_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::RoundDown);
   }
 
   TEST(F32_VRNDD__AVX_X16, batch_div_16) {
@@ -453,7 +453,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -462,7 +462,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -471,7 +471,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -481,7 +481,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -492,7 +492,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::RoundDown);
+      .Test(xnn_f32_vrndd_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::RoundDown);
   }
 
   TEST(F32_VRNDD__AVX512F_X16, batch_div_16) {
@@ -500,7 +500,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -509,7 +509,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -518,7 +518,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -528,7 +528,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -539,7 +539,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::RoundDown);
+      .Test(xnn_f32_vrndd_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::RoundDown);
   }
 
   TEST(F32_VRNDD__AVX512F_X32, batch_div_32) {
@@ -547,7 +547,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -556,7 +556,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -565,7 +565,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -575,7 +575,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -585,14 +585,14 @@
   TEST(F32_VRNDD__WASMSIMD_ADDSUB_X4, batch_eq_4) {
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__wasmsimd_addsub_x4), VUnaryMicrokernelTester::OpType::RoundDown);
+      .Test(xnn_f32_vrndd_ukernel__wasmsimd_addsub_x4, VUnaryMicrokernelTester::OpType::RoundDown);
   }
 
   TEST(F32_VRNDD__WASMSIMD_ADDSUB_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__wasmsimd_addsub_x4), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__wasmsimd_addsub_x4, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -600,7 +600,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__wasmsimd_addsub_x4), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__wasmsimd_addsub_x4, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -608,7 +608,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__wasmsimd_addsub_x4), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__wasmsimd_addsub_x4, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -617,7 +617,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__wasmsimd_addsub_x4), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__wasmsimd_addsub_x4, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -627,14 +627,14 @@
   TEST(F32_VRNDD__WASMSIMD_ADDSUB_X8, batch_eq_8) {
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__wasmsimd_addsub_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+      .Test(xnn_f32_vrndd_ukernel__wasmsimd_addsub_x8, VUnaryMicrokernelTester::OpType::RoundDown);
   }
 
   TEST(F32_VRNDD__WASMSIMD_ADDSUB_X8, batch_div_8) {
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__wasmsimd_addsub_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__wasmsimd_addsub_x8, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -642,7 +642,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__wasmsimd_addsub_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__wasmsimd_addsub_x8, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -650,7 +650,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__wasmsimd_addsub_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__wasmsimd_addsub_x8, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -659,7 +659,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__wasmsimd_addsub_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__wasmsimd_addsub_x8, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -669,14 +669,14 @@
   TEST(F32_VRNDD__WASMSIMD_CVT_X4, batch_eq_4) {
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__wasmsimd_cvt_x4), VUnaryMicrokernelTester::OpType::RoundDown);
+      .Test(xnn_f32_vrndd_ukernel__wasmsimd_cvt_x4, VUnaryMicrokernelTester::OpType::RoundDown);
   }
 
   TEST(F32_VRNDD__WASMSIMD_CVT_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__wasmsimd_cvt_x4), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__wasmsimd_cvt_x4, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -684,7 +684,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__wasmsimd_cvt_x4), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__wasmsimd_cvt_x4, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -692,7 +692,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__wasmsimd_cvt_x4), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__wasmsimd_cvt_x4, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -701,7 +701,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__wasmsimd_cvt_x4), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__wasmsimd_cvt_x4, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -711,14 +711,14 @@
   TEST(F32_VRNDD__WASMSIMD_CVT_X8, batch_eq_8) {
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__wasmsimd_cvt_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+      .Test(xnn_f32_vrndd_ukernel__wasmsimd_cvt_x8, VUnaryMicrokernelTester::OpType::RoundDown);
   }
 
   TEST(F32_VRNDD__WASMSIMD_CVT_X8, batch_div_8) {
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__wasmsimd_cvt_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__wasmsimd_cvt_x8, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -726,7 +726,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__wasmsimd_cvt_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__wasmsimd_cvt_x8, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -734,7 +734,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__wasmsimd_cvt_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__wasmsimd_cvt_x8, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 
@@ -743,7 +743,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__wasmsimd_cvt_x8), VUnaryMicrokernelTester::OpType::RoundDown);
+        .Test(xnn_f32_vrndd_ukernel__wasmsimd_cvt_x8, VUnaryMicrokernelTester::OpType::RoundDown);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -752,14 +752,14 @@
 TEST(F32_VRNDD__SCALAR_LIBM_X1, batch_eq_1) {
   VUnaryMicrokernelTester()
     .batch_size(1)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__scalar_libm_x1), VUnaryMicrokernelTester::OpType::RoundDown, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vrndd_ukernel__scalar_libm_x1, VUnaryMicrokernelTester::OpType::RoundDown, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VRNDD__SCALAR_LIBM_X1, batch_gt_1) {
   for (size_t batch_size = 2; batch_size < 10; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__scalar_libm_x1), VUnaryMicrokernelTester::OpType::RoundDown, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndd_ukernel__scalar_libm_x1, VUnaryMicrokernelTester::OpType::RoundDown, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -768,7 +768,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__scalar_libm_x1), VUnaryMicrokernelTester::OpType::RoundDown, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndd_ukernel__scalar_libm_x1, VUnaryMicrokernelTester::OpType::RoundDown, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -776,14 +776,14 @@
 TEST(F32_VRNDD__SCALAR_LIBM_X2, batch_eq_2) {
   VUnaryMicrokernelTester()
     .batch_size(2)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__scalar_libm_x2), VUnaryMicrokernelTester::OpType::RoundDown, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vrndd_ukernel__scalar_libm_x2, VUnaryMicrokernelTester::OpType::RoundDown, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VRNDD__SCALAR_LIBM_X2, batch_div_2) {
   for (size_t batch_size = 4; batch_size < 20; batch_size += 2) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__scalar_libm_x2), VUnaryMicrokernelTester::OpType::RoundDown, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndd_ukernel__scalar_libm_x2, VUnaryMicrokernelTester::OpType::RoundDown, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -791,7 +791,7 @@
   for (size_t batch_size = 1; batch_size < 2; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__scalar_libm_x2), VUnaryMicrokernelTester::OpType::RoundDown, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndd_ukernel__scalar_libm_x2, VUnaryMicrokernelTester::OpType::RoundDown, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -799,7 +799,7 @@
   for (size_t batch_size = 3; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__scalar_libm_x2), VUnaryMicrokernelTester::OpType::RoundDown, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndd_ukernel__scalar_libm_x2, VUnaryMicrokernelTester::OpType::RoundDown, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -808,7 +808,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__scalar_libm_x2), VUnaryMicrokernelTester::OpType::RoundDown, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndd_ukernel__scalar_libm_x2, VUnaryMicrokernelTester::OpType::RoundDown, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -816,14 +816,14 @@
 TEST(F32_VRNDD__SCALAR_LIBM_X4, batch_eq_4) {
   VUnaryMicrokernelTester()
     .batch_size(4)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__scalar_libm_x4), VUnaryMicrokernelTester::OpType::RoundDown, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vrndd_ukernel__scalar_libm_x4, VUnaryMicrokernelTester::OpType::RoundDown, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VRNDD__SCALAR_LIBM_X4, batch_div_4) {
   for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__scalar_libm_x4), VUnaryMicrokernelTester::OpType::RoundDown, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndd_ukernel__scalar_libm_x4, VUnaryMicrokernelTester::OpType::RoundDown, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -831,7 +831,7 @@
   for (size_t batch_size = 1; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__scalar_libm_x4), VUnaryMicrokernelTester::OpType::RoundDown, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndd_ukernel__scalar_libm_x4, VUnaryMicrokernelTester::OpType::RoundDown, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -839,7 +839,7 @@
   for (size_t batch_size = 5; batch_size < 8; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__scalar_libm_x4), VUnaryMicrokernelTester::OpType::RoundDown, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndd_ukernel__scalar_libm_x4, VUnaryMicrokernelTester::OpType::RoundDown, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -848,6 +848,6 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndd_ukernel__scalar_libm_x4), VUnaryMicrokernelTester::OpType::RoundDown, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndd_ukernel__scalar_libm_x4, VUnaryMicrokernelTester::OpType::RoundDown, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
diff --git a/test/f32-vrndne.cc b/test/f32-vrndne.cc
index d845f78..f5a3cec 100644
--- a/test/f32-vrndne.cc
+++ b/test/f32-vrndne.cc
@@ -22,7 +22,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+      .Test(xnn_f32_vrndne_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
   }
 
   TEST(F32_VRNDNE__NEON_X4, batch_div_4) {
@@ -30,7 +30,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -39,7 +39,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -48,7 +48,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -58,7 +58,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -69,7 +69,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+      .Test(xnn_f32_vrndne_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
   }
 
   TEST(F32_VRNDNE__NEON_X8, batch_div_8) {
@@ -77,7 +77,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -86,7 +86,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -95,7 +95,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -105,7 +105,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -116,7 +116,7 @@
     TEST_REQUIRES_ARM_NEON_V8;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__neonv8_x4), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+      .Test(xnn_f32_vrndne_ukernel__neonv8_x4, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
   }
 
   TEST(F32_VRNDNE__NEONV8_X4, batch_div_4) {
@@ -124,7 +124,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__neonv8_x4), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__neonv8_x4, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -133,7 +133,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__neonv8_x4), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__neonv8_x4, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -142,7 +142,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__neonv8_x4), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__neonv8_x4, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -152,7 +152,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__neonv8_x4), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__neonv8_x4, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -163,7 +163,7 @@
     TEST_REQUIRES_ARM_NEON_V8;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__neonv8_x8), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+      .Test(xnn_f32_vrndne_ukernel__neonv8_x8, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
   }
 
   TEST(F32_VRNDNE__NEONV8_X8, batch_div_8) {
@@ -171,7 +171,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__neonv8_x8), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__neonv8_x8, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -180,7 +180,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__neonv8_x8), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__neonv8_x8, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -189,7 +189,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__neonv8_x8), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__neonv8_x8, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -199,7 +199,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__neonv8_x8), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__neonv8_x8, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -210,7 +210,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__sse2_x4), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+      .Test(xnn_f32_vrndne_ukernel__sse2_x4, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
   }
 
   TEST(F32_VRNDNE__SSE2_X4, batch_div_4) {
@@ -218,7 +218,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__sse2_x4), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__sse2_x4, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -227,7 +227,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__sse2_x4), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__sse2_x4, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -236,7 +236,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__sse2_x4), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__sse2_x4, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -246,7 +246,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__sse2_x4), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__sse2_x4, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -257,7 +257,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__sse2_x8), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+      .Test(xnn_f32_vrndne_ukernel__sse2_x8, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
   }
 
   TEST(F32_VRNDNE__SSE2_X8, batch_div_8) {
@@ -265,7 +265,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__sse2_x8), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__sse2_x8, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -274,7 +274,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__sse2_x8), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__sse2_x8, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -283,7 +283,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__sse2_x8), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__sse2_x8, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -293,7 +293,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__sse2_x8), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__sse2_x8, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -304,7 +304,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__sse41_x4), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+      .Test(xnn_f32_vrndne_ukernel__sse41_x4, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
   }
 
   TEST(F32_VRNDNE__SSE41_X4, batch_div_4) {
@@ -312,7 +312,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__sse41_x4), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__sse41_x4, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -321,7 +321,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__sse41_x4), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__sse41_x4, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -330,7 +330,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__sse41_x4), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__sse41_x4, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -340,7 +340,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__sse41_x4), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__sse41_x4, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -351,7 +351,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__sse41_x8), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+      .Test(xnn_f32_vrndne_ukernel__sse41_x8, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
   }
 
   TEST(F32_VRNDNE__SSE41_X8, batch_div_8) {
@@ -359,7 +359,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__sse41_x8), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__sse41_x8, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -368,7 +368,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__sse41_x8), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__sse41_x8, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -377,7 +377,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__sse41_x8), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__sse41_x8, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -387,7 +387,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__sse41_x8), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__sse41_x8, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -398,7 +398,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+      .Test(xnn_f32_vrndne_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
   }
 
   TEST(F32_VRNDNE__AVX_X8, batch_div_8) {
@@ -406,7 +406,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -415,7 +415,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -424,7 +424,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -434,7 +434,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -445,7 +445,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+      .Test(xnn_f32_vrndne_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
   }
 
   TEST(F32_VRNDNE__AVX_X16, batch_div_16) {
@@ -453,7 +453,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -462,7 +462,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -471,7 +471,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -481,7 +481,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -492,7 +492,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+      .Test(xnn_f32_vrndne_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
   }
 
   TEST(F32_VRNDNE__AVX512F_X16, batch_div_16) {
@@ -500,7 +500,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -509,7 +509,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -518,7 +518,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -528,7 +528,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -539,7 +539,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+      .Test(xnn_f32_vrndne_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
   }
 
   TEST(F32_VRNDNE__AVX512F_X32, batch_div_32) {
@@ -547,7 +547,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -556,7 +556,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -565,7 +565,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -575,7 +575,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -585,14 +585,14 @@
   TEST(F32_VRNDNE__WASMSIMD_ADDSUB_X4, batch_eq_4) {
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__wasmsimd_addsub_x4), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+      .Test(xnn_f32_vrndne_ukernel__wasmsimd_addsub_x4, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
   }
 
   TEST(F32_VRNDNE__WASMSIMD_ADDSUB_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__wasmsimd_addsub_x4), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__wasmsimd_addsub_x4, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -600,7 +600,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__wasmsimd_addsub_x4), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__wasmsimd_addsub_x4, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -608,7 +608,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__wasmsimd_addsub_x4), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__wasmsimd_addsub_x4, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -617,7 +617,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__wasmsimd_addsub_x4), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__wasmsimd_addsub_x4, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -627,14 +627,14 @@
   TEST(F32_VRNDNE__WASMSIMD_ADDSUB_X8, batch_eq_8) {
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__wasmsimd_addsub_x8), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+      .Test(xnn_f32_vrndne_ukernel__wasmsimd_addsub_x8, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
   }
 
   TEST(F32_VRNDNE__WASMSIMD_ADDSUB_X8, batch_div_8) {
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__wasmsimd_addsub_x8), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__wasmsimd_addsub_x8, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -642,7 +642,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__wasmsimd_addsub_x8), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__wasmsimd_addsub_x8, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -650,7 +650,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__wasmsimd_addsub_x8), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__wasmsimd_addsub_x8, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 
@@ -659,7 +659,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__wasmsimd_addsub_x8), VUnaryMicrokernelTester::OpType::RoundToNearestEven);
+        .Test(xnn_f32_vrndne_ukernel__wasmsimd_addsub_x8, VUnaryMicrokernelTester::OpType::RoundToNearestEven);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -668,14 +668,14 @@
 TEST(F32_VRNDNE__SCALAR_LIBM_X1, batch_eq_1) {
   VUnaryMicrokernelTester()
     .batch_size(1)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__scalar_libm_x1), VUnaryMicrokernelTester::OpType::RoundToNearestEven, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vrndne_ukernel__scalar_libm_x1, VUnaryMicrokernelTester::OpType::RoundToNearestEven, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VRNDNE__SCALAR_LIBM_X1, batch_gt_1) {
   for (size_t batch_size = 2; batch_size < 10; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__scalar_libm_x1), VUnaryMicrokernelTester::OpType::RoundToNearestEven, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndne_ukernel__scalar_libm_x1, VUnaryMicrokernelTester::OpType::RoundToNearestEven, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -684,7 +684,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__scalar_libm_x1), VUnaryMicrokernelTester::OpType::RoundToNearestEven, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndne_ukernel__scalar_libm_x1, VUnaryMicrokernelTester::OpType::RoundToNearestEven, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -692,14 +692,14 @@
 TEST(F32_VRNDNE__SCALAR_LIBM_X2, batch_eq_2) {
   VUnaryMicrokernelTester()
     .batch_size(2)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__scalar_libm_x2), VUnaryMicrokernelTester::OpType::RoundToNearestEven, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vrndne_ukernel__scalar_libm_x2, VUnaryMicrokernelTester::OpType::RoundToNearestEven, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VRNDNE__SCALAR_LIBM_X2, batch_div_2) {
   for (size_t batch_size = 4; batch_size < 20; batch_size += 2) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__scalar_libm_x2), VUnaryMicrokernelTester::OpType::RoundToNearestEven, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndne_ukernel__scalar_libm_x2, VUnaryMicrokernelTester::OpType::RoundToNearestEven, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -707,7 +707,7 @@
   for (size_t batch_size = 1; batch_size < 2; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__scalar_libm_x2), VUnaryMicrokernelTester::OpType::RoundToNearestEven, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndne_ukernel__scalar_libm_x2, VUnaryMicrokernelTester::OpType::RoundToNearestEven, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -715,7 +715,7 @@
   for (size_t batch_size = 3; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__scalar_libm_x2), VUnaryMicrokernelTester::OpType::RoundToNearestEven, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndne_ukernel__scalar_libm_x2, VUnaryMicrokernelTester::OpType::RoundToNearestEven, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -724,7 +724,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__scalar_libm_x2), VUnaryMicrokernelTester::OpType::RoundToNearestEven, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndne_ukernel__scalar_libm_x2, VUnaryMicrokernelTester::OpType::RoundToNearestEven, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -732,14 +732,14 @@
 TEST(F32_VRNDNE__SCALAR_LIBM_X4, batch_eq_4) {
   VUnaryMicrokernelTester()
     .batch_size(4)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__scalar_libm_x4), VUnaryMicrokernelTester::OpType::RoundToNearestEven, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vrndne_ukernel__scalar_libm_x4, VUnaryMicrokernelTester::OpType::RoundToNearestEven, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VRNDNE__SCALAR_LIBM_X4, batch_div_4) {
   for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__scalar_libm_x4), VUnaryMicrokernelTester::OpType::RoundToNearestEven, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndne_ukernel__scalar_libm_x4, VUnaryMicrokernelTester::OpType::RoundToNearestEven, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -747,7 +747,7 @@
   for (size_t batch_size = 1; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__scalar_libm_x4), VUnaryMicrokernelTester::OpType::RoundToNearestEven, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndne_ukernel__scalar_libm_x4, VUnaryMicrokernelTester::OpType::RoundToNearestEven, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -755,7 +755,7 @@
   for (size_t batch_size = 5; batch_size < 8; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__scalar_libm_x4), VUnaryMicrokernelTester::OpType::RoundToNearestEven, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndne_ukernel__scalar_libm_x4, VUnaryMicrokernelTester::OpType::RoundToNearestEven, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -764,6 +764,6 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndne_ukernel__scalar_libm_x4), VUnaryMicrokernelTester::OpType::RoundToNearestEven, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndne_ukernel__scalar_libm_x4, VUnaryMicrokernelTester::OpType::RoundToNearestEven, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
diff --git a/test/f32-vrndu.cc b/test/f32-vrndu.cc
index 0f97659..72d860c 100644
--- a/test/f32-vrndu.cc
+++ b/test/f32-vrndu.cc
@@ -22,7 +22,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::RoundUp);
+      .Test(xnn_f32_vrndu_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::RoundUp);
   }
 
   TEST(F32_VRNDU__NEON_X4, batch_div_4) {
@@ -30,7 +30,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -39,7 +39,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -48,7 +48,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -58,7 +58,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -69,7 +69,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+      .Test(xnn_f32_vrndu_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::RoundUp);
   }
 
   TEST(F32_VRNDU__NEON_X8, batch_div_8) {
@@ -77,7 +77,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -86,7 +86,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -95,7 +95,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -105,7 +105,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -116,7 +116,7 @@
     TEST_REQUIRES_ARM_NEON_V8;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__neonv8_x4), VUnaryMicrokernelTester::OpType::RoundUp);
+      .Test(xnn_f32_vrndu_ukernel__neonv8_x4, VUnaryMicrokernelTester::OpType::RoundUp);
   }
 
   TEST(F32_VRNDU__NEONV8_X4, batch_div_4) {
@@ -124,7 +124,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__neonv8_x4), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__neonv8_x4, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -133,7 +133,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__neonv8_x4), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__neonv8_x4, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -142,7 +142,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__neonv8_x4), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__neonv8_x4, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -152,7 +152,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__neonv8_x4), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__neonv8_x4, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -163,7 +163,7 @@
     TEST_REQUIRES_ARM_NEON_V8;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__neonv8_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+      .Test(xnn_f32_vrndu_ukernel__neonv8_x8, VUnaryMicrokernelTester::OpType::RoundUp);
   }
 
   TEST(F32_VRNDU__NEONV8_X8, batch_div_8) {
@@ -171,7 +171,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__neonv8_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__neonv8_x8, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -180,7 +180,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__neonv8_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__neonv8_x8, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -189,7 +189,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__neonv8_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__neonv8_x8, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -199,7 +199,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__neonv8_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__neonv8_x8, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -210,7 +210,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__sse2_x4), VUnaryMicrokernelTester::OpType::RoundUp);
+      .Test(xnn_f32_vrndu_ukernel__sse2_x4, VUnaryMicrokernelTester::OpType::RoundUp);
   }
 
   TEST(F32_VRNDU__SSE2_X4, batch_div_4) {
@@ -218,7 +218,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__sse2_x4), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__sse2_x4, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -227,7 +227,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__sse2_x4), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__sse2_x4, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -236,7 +236,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__sse2_x4), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__sse2_x4, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -246,7 +246,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__sse2_x4), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__sse2_x4, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -257,7 +257,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__sse2_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+      .Test(xnn_f32_vrndu_ukernel__sse2_x8, VUnaryMicrokernelTester::OpType::RoundUp);
   }
 
   TEST(F32_VRNDU__SSE2_X8, batch_div_8) {
@@ -265,7 +265,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__sse2_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__sse2_x8, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -274,7 +274,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__sse2_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__sse2_x8, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -283,7 +283,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__sse2_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__sse2_x8, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -293,7 +293,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__sse2_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__sse2_x8, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -304,7 +304,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__sse41_x4), VUnaryMicrokernelTester::OpType::RoundUp);
+      .Test(xnn_f32_vrndu_ukernel__sse41_x4, VUnaryMicrokernelTester::OpType::RoundUp);
   }
 
   TEST(F32_VRNDU__SSE41_X4, batch_div_4) {
@@ -312,7 +312,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__sse41_x4), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__sse41_x4, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -321,7 +321,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__sse41_x4), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__sse41_x4, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -330,7 +330,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__sse41_x4), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__sse41_x4, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -340,7 +340,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__sse41_x4), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__sse41_x4, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -351,7 +351,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__sse41_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+      .Test(xnn_f32_vrndu_ukernel__sse41_x8, VUnaryMicrokernelTester::OpType::RoundUp);
   }
 
   TEST(F32_VRNDU__SSE41_X8, batch_div_8) {
@@ -359,7 +359,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__sse41_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__sse41_x8, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -368,7 +368,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__sse41_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__sse41_x8, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -377,7 +377,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__sse41_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__sse41_x8, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -387,7 +387,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__sse41_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__sse41_x8, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -398,7 +398,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+      .Test(xnn_f32_vrndu_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::RoundUp);
   }
 
   TEST(F32_VRNDU__AVX_X8, batch_div_8) {
@@ -406,7 +406,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -415,7 +415,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -424,7 +424,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -434,7 +434,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -445,7 +445,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::RoundUp);
+      .Test(xnn_f32_vrndu_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::RoundUp);
   }
 
   TEST(F32_VRNDU__AVX_X16, batch_div_16) {
@@ -453,7 +453,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -462,7 +462,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -471,7 +471,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -481,7 +481,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -492,7 +492,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::RoundUp);
+      .Test(xnn_f32_vrndu_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::RoundUp);
   }
 
   TEST(F32_VRNDU__AVX512F_X16, batch_div_16) {
@@ -500,7 +500,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -509,7 +509,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -518,7 +518,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -528,7 +528,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -539,7 +539,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::RoundUp);
+      .Test(xnn_f32_vrndu_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::RoundUp);
   }
 
   TEST(F32_VRNDU__AVX512F_X32, batch_div_32) {
@@ -547,7 +547,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -556,7 +556,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -565,7 +565,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -575,7 +575,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -585,14 +585,14 @@
   TEST(F32_VRNDU__WASMSIMD_ADDSUB_X4, batch_eq_4) {
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__wasmsimd_addsub_x4), VUnaryMicrokernelTester::OpType::RoundUp);
+      .Test(xnn_f32_vrndu_ukernel__wasmsimd_addsub_x4, VUnaryMicrokernelTester::OpType::RoundUp);
   }
 
   TEST(F32_VRNDU__WASMSIMD_ADDSUB_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__wasmsimd_addsub_x4), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__wasmsimd_addsub_x4, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -600,7 +600,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__wasmsimd_addsub_x4), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__wasmsimd_addsub_x4, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -608,7 +608,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__wasmsimd_addsub_x4), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__wasmsimd_addsub_x4, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -617,7 +617,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__wasmsimd_addsub_x4), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__wasmsimd_addsub_x4, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -627,14 +627,14 @@
   TEST(F32_VRNDU__WASMSIMD_ADDSUB_X8, batch_eq_8) {
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__wasmsimd_addsub_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+      .Test(xnn_f32_vrndu_ukernel__wasmsimd_addsub_x8, VUnaryMicrokernelTester::OpType::RoundUp);
   }
 
   TEST(F32_VRNDU__WASMSIMD_ADDSUB_X8, batch_div_8) {
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__wasmsimd_addsub_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__wasmsimd_addsub_x8, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -642,7 +642,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__wasmsimd_addsub_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__wasmsimd_addsub_x8, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -650,7 +650,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__wasmsimd_addsub_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__wasmsimd_addsub_x8, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -659,7 +659,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__wasmsimd_addsub_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__wasmsimd_addsub_x8, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -669,14 +669,14 @@
   TEST(F32_VRNDU__WASMSIMD_CVT_X4, batch_eq_4) {
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__wasmsimd_cvt_x4), VUnaryMicrokernelTester::OpType::RoundUp);
+      .Test(xnn_f32_vrndu_ukernel__wasmsimd_cvt_x4, VUnaryMicrokernelTester::OpType::RoundUp);
   }
 
   TEST(F32_VRNDU__WASMSIMD_CVT_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__wasmsimd_cvt_x4), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__wasmsimd_cvt_x4, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -684,7 +684,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__wasmsimd_cvt_x4), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__wasmsimd_cvt_x4, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -692,7 +692,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__wasmsimd_cvt_x4), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__wasmsimd_cvt_x4, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -701,7 +701,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__wasmsimd_cvt_x4), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__wasmsimd_cvt_x4, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -711,14 +711,14 @@
   TEST(F32_VRNDU__WASMSIMD_CVT_X8, batch_eq_8) {
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__wasmsimd_cvt_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+      .Test(xnn_f32_vrndu_ukernel__wasmsimd_cvt_x8, VUnaryMicrokernelTester::OpType::RoundUp);
   }
 
   TEST(F32_VRNDU__WASMSIMD_CVT_X8, batch_div_8) {
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__wasmsimd_cvt_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__wasmsimd_cvt_x8, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -726,7 +726,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__wasmsimd_cvt_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__wasmsimd_cvt_x8, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -734,7 +734,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__wasmsimd_cvt_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__wasmsimd_cvt_x8, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 
@@ -743,7 +743,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__wasmsimd_cvt_x8), VUnaryMicrokernelTester::OpType::RoundUp);
+        .Test(xnn_f32_vrndu_ukernel__wasmsimd_cvt_x8, VUnaryMicrokernelTester::OpType::RoundUp);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -752,14 +752,14 @@
 TEST(F32_VRNDU__SCALAR_LIBM_X1, batch_eq_1) {
   VUnaryMicrokernelTester()
     .batch_size(1)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__scalar_libm_x1), VUnaryMicrokernelTester::OpType::RoundUp, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vrndu_ukernel__scalar_libm_x1, VUnaryMicrokernelTester::OpType::RoundUp, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VRNDU__SCALAR_LIBM_X1, batch_gt_1) {
   for (size_t batch_size = 2; batch_size < 10; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__scalar_libm_x1), VUnaryMicrokernelTester::OpType::RoundUp, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndu_ukernel__scalar_libm_x1, VUnaryMicrokernelTester::OpType::RoundUp, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -768,7 +768,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__scalar_libm_x1), VUnaryMicrokernelTester::OpType::RoundUp, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndu_ukernel__scalar_libm_x1, VUnaryMicrokernelTester::OpType::RoundUp, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -776,14 +776,14 @@
 TEST(F32_VRNDU__SCALAR_LIBM_X2, batch_eq_2) {
   VUnaryMicrokernelTester()
     .batch_size(2)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__scalar_libm_x2), VUnaryMicrokernelTester::OpType::RoundUp, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vrndu_ukernel__scalar_libm_x2, VUnaryMicrokernelTester::OpType::RoundUp, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VRNDU__SCALAR_LIBM_X2, batch_div_2) {
   for (size_t batch_size = 4; batch_size < 20; batch_size += 2) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__scalar_libm_x2), VUnaryMicrokernelTester::OpType::RoundUp, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndu_ukernel__scalar_libm_x2, VUnaryMicrokernelTester::OpType::RoundUp, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -791,7 +791,7 @@
   for (size_t batch_size = 1; batch_size < 2; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__scalar_libm_x2), VUnaryMicrokernelTester::OpType::RoundUp, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndu_ukernel__scalar_libm_x2, VUnaryMicrokernelTester::OpType::RoundUp, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -799,7 +799,7 @@
   for (size_t batch_size = 3; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__scalar_libm_x2), VUnaryMicrokernelTester::OpType::RoundUp, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndu_ukernel__scalar_libm_x2, VUnaryMicrokernelTester::OpType::RoundUp, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -808,7 +808,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__scalar_libm_x2), VUnaryMicrokernelTester::OpType::RoundUp, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndu_ukernel__scalar_libm_x2, VUnaryMicrokernelTester::OpType::RoundUp, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -816,14 +816,14 @@
 TEST(F32_VRNDU__SCALAR_LIBM_X4, batch_eq_4) {
   VUnaryMicrokernelTester()
     .batch_size(4)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__scalar_libm_x4), VUnaryMicrokernelTester::OpType::RoundUp, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vrndu_ukernel__scalar_libm_x4, VUnaryMicrokernelTester::OpType::RoundUp, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VRNDU__SCALAR_LIBM_X4, batch_div_4) {
   for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__scalar_libm_x4), VUnaryMicrokernelTester::OpType::RoundUp, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndu_ukernel__scalar_libm_x4, VUnaryMicrokernelTester::OpType::RoundUp, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -831,7 +831,7 @@
   for (size_t batch_size = 1; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__scalar_libm_x4), VUnaryMicrokernelTester::OpType::RoundUp, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndu_ukernel__scalar_libm_x4, VUnaryMicrokernelTester::OpType::RoundUp, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -839,7 +839,7 @@
   for (size_t batch_size = 5; batch_size < 8; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__scalar_libm_x4), VUnaryMicrokernelTester::OpType::RoundUp, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndu_ukernel__scalar_libm_x4, VUnaryMicrokernelTester::OpType::RoundUp, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -848,6 +848,6 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndu_ukernel__scalar_libm_x4), VUnaryMicrokernelTester::OpType::RoundUp, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndu_ukernel__scalar_libm_x4, VUnaryMicrokernelTester::OpType::RoundUp, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
diff --git a/test/f32-vrndz.cc b/test/f32-vrndz.cc
index 3113a78..b38e626 100644
--- a/test/f32-vrndz.cc
+++ b/test/f32-vrndz.cc
@@ -22,7 +22,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+      .Test(xnn_f32_vrndz_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
   }
 
   TEST(F32_VRNDZ__NEON_X4, batch_div_4) {
@@ -30,7 +30,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -39,7 +39,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -48,7 +48,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -58,7 +58,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -69,7 +69,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+      .Test(xnn_f32_vrndz_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
   }
 
   TEST(F32_VRNDZ__NEON_X8, batch_div_8) {
@@ -77,7 +77,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -86,7 +86,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -95,7 +95,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -105,7 +105,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -116,7 +116,7 @@
     TEST_REQUIRES_ARM_NEON_V8;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__neonv8_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+      .Test(xnn_f32_vrndz_ukernel__neonv8_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
   }
 
   TEST(F32_VRNDZ__NEONV8_X4, batch_div_4) {
@@ -124,7 +124,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__neonv8_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__neonv8_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -133,7 +133,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__neonv8_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__neonv8_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -142,7 +142,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__neonv8_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__neonv8_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -152,7 +152,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__neonv8_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__neonv8_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -163,7 +163,7 @@
     TEST_REQUIRES_ARM_NEON_V8;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__neonv8_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+      .Test(xnn_f32_vrndz_ukernel__neonv8_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
   }
 
   TEST(F32_VRNDZ__NEONV8_X8, batch_div_8) {
@@ -171,7 +171,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__neonv8_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__neonv8_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -180,7 +180,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__neonv8_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__neonv8_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -189,7 +189,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__neonv8_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__neonv8_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -199,7 +199,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__neonv8_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__neonv8_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -210,7 +210,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__sse2_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+      .Test(xnn_f32_vrndz_ukernel__sse2_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
   }
 
   TEST(F32_VRNDZ__SSE2_X4, batch_div_4) {
@@ -218,7 +218,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__sse2_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__sse2_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -227,7 +227,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__sse2_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__sse2_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -236,7 +236,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__sse2_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__sse2_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -246,7 +246,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__sse2_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__sse2_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -257,7 +257,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__sse2_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+      .Test(xnn_f32_vrndz_ukernel__sse2_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
   }
 
   TEST(F32_VRNDZ__SSE2_X8, batch_div_8) {
@@ -265,7 +265,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__sse2_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__sse2_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -274,7 +274,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__sse2_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__sse2_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -283,7 +283,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__sse2_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__sse2_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -293,7 +293,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__sse2_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__sse2_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -304,7 +304,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__sse41_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+      .Test(xnn_f32_vrndz_ukernel__sse41_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
   }
 
   TEST(F32_VRNDZ__SSE41_X4, batch_div_4) {
@@ -312,7 +312,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__sse41_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__sse41_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -321,7 +321,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__sse41_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__sse41_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -330,7 +330,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__sse41_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__sse41_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -340,7 +340,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__sse41_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__sse41_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -351,7 +351,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__sse41_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+      .Test(xnn_f32_vrndz_ukernel__sse41_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
   }
 
   TEST(F32_VRNDZ__SSE41_X8, batch_div_8) {
@@ -359,7 +359,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__sse41_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__sse41_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -368,7 +368,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__sse41_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__sse41_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -377,7 +377,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__sse41_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__sse41_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -387,7 +387,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__sse41_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__sse41_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -398,7 +398,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+      .Test(xnn_f32_vrndz_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
   }
 
   TEST(F32_VRNDZ__AVX_X8, batch_div_8) {
@@ -406,7 +406,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -415,7 +415,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -424,7 +424,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -434,7 +434,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -445,7 +445,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+      .Test(xnn_f32_vrndz_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
   }
 
   TEST(F32_VRNDZ__AVX_X16, batch_div_16) {
@@ -453,7 +453,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -462,7 +462,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -471,7 +471,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -481,7 +481,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -492,7 +492,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+      .Test(xnn_f32_vrndz_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
   }
 
   TEST(F32_VRNDZ__AVX512F_X16, batch_div_16) {
@@ -500,7 +500,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -509,7 +509,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -518,7 +518,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -528,7 +528,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -539,7 +539,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+      .Test(xnn_f32_vrndz_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
   }
 
   TEST(F32_VRNDZ__AVX512F_X32, batch_div_32) {
@@ -547,7 +547,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -556,7 +556,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -565,7 +565,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -575,7 +575,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -585,14 +585,14 @@
   TEST(F32_VRNDZ__WASMSIMD_ADDSUB_X4, batch_eq_4) {
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__wasmsimd_addsub_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+      .Test(xnn_f32_vrndz_ukernel__wasmsimd_addsub_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
   }
 
   TEST(F32_VRNDZ__WASMSIMD_ADDSUB_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__wasmsimd_addsub_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__wasmsimd_addsub_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -600,7 +600,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__wasmsimd_addsub_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__wasmsimd_addsub_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -608,7 +608,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__wasmsimd_addsub_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__wasmsimd_addsub_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -617,7 +617,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__wasmsimd_addsub_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__wasmsimd_addsub_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -627,14 +627,14 @@
   TEST(F32_VRNDZ__WASMSIMD_ADDSUB_X8, batch_eq_8) {
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__wasmsimd_addsub_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+      .Test(xnn_f32_vrndz_ukernel__wasmsimd_addsub_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
   }
 
   TEST(F32_VRNDZ__WASMSIMD_ADDSUB_X8, batch_div_8) {
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__wasmsimd_addsub_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__wasmsimd_addsub_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -642,7 +642,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__wasmsimd_addsub_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__wasmsimd_addsub_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -650,7 +650,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__wasmsimd_addsub_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__wasmsimd_addsub_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -659,7 +659,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__wasmsimd_addsub_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__wasmsimd_addsub_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -669,14 +669,14 @@
   TEST(F32_VRNDZ__WASMSIMD_CVT_X4, batch_eq_4) {
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__wasmsimd_cvt_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+      .Test(xnn_f32_vrndz_ukernel__wasmsimd_cvt_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
   }
 
   TEST(F32_VRNDZ__WASMSIMD_CVT_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__wasmsimd_cvt_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__wasmsimd_cvt_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -684,7 +684,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__wasmsimd_cvt_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__wasmsimd_cvt_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -692,7 +692,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__wasmsimd_cvt_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__wasmsimd_cvt_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -701,7 +701,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__wasmsimd_cvt_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__wasmsimd_cvt_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -711,14 +711,14 @@
   TEST(F32_VRNDZ__WASMSIMD_CVT_X8, batch_eq_8) {
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__wasmsimd_cvt_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+      .Test(xnn_f32_vrndz_ukernel__wasmsimd_cvt_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
   }
 
   TEST(F32_VRNDZ__WASMSIMD_CVT_X8, batch_div_8) {
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__wasmsimd_cvt_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__wasmsimd_cvt_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -726,7 +726,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__wasmsimd_cvt_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__wasmsimd_cvt_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -734,7 +734,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__wasmsimd_cvt_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__wasmsimd_cvt_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 
@@ -743,7 +743,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__wasmsimd_cvt_x8), VUnaryMicrokernelTester::OpType::RoundTowardsZero);
+        .Test(xnn_f32_vrndz_ukernel__wasmsimd_cvt_x8, VUnaryMicrokernelTester::OpType::RoundTowardsZero);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -752,14 +752,14 @@
 TEST(F32_VRNDZ__SCALAR_LIBM_X1, batch_eq_1) {
   VUnaryMicrokernelTester()
     .batch_size(1)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__scalar_libm_x1), VUnaryMicrokernelTester::OpType::RoundTowardsZero, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vrndz_ukernel__scalar_libm_x1, VUnaryMicrokernelTester::OpType::RoundTowardsZero, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VRNDZ__SCALAR_LIBM_X1, batch_gt_1) {
   for (size_t batch_size = 2; batch_size < 10; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__scalar_libm_x1), VUnaryMicrokernelTester::OpType::RoundTowardsZero, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndz_ukernel__scalar_libm_x1, VUnaryMicrokernelTester::OpType::RoundTowardsZero, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -768,7 +768,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__scalar_libm_x1), VUnaryMicrokernelTester::OpType::RoundTowardsZero, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndz_ukernel__scalar_libm_x1, VUnaryMicrokernelTester::OpType::RoundTowardsZero, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -776,14 +776,14 @@
 TEST(F32_VRNDZ__SCALAR_LIBM_X2, batch_eq_2) {
   VUnaryMicrokernelTester()
     .batch_size(2)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__scalar_libm_x2), VUnaryMicrokernelTester::OpType::RoundTowardsZero, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vrndz_ukernel__scalar_libm_x2, VUnaryMicrokernelTester::OpType::RoundTowardsZero, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VRNDZ__SCALAR_LIBM_X2, batch_div_2) {
   for (size_t batch_size = 4; batch_size < 20; batch_size += 2) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__scalar_libm_x2), VUnaryMicrokernelTester::OpType::RoundTowardsZero, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndz_ukernel__scalar_libm_x2, VUnaryMicrokernelTester::OpType::RoundTowardsZero, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -791,7 +791,7 @@
   for (size_t batch_size = 1; batch_size < 2; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__scalar_libm_x2), VUnaryMicrokernelTester::OpType::RoundTowardsZero, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndz_ukernel__scalar_libm_x2, VUnaryMicrokernelTester::OpType::RoundTowardsZero, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -799,7 +799,7 @@
   for (size_t batch_size = 3; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__scalar_libm_x2), VUnaryMicrokernelTester::OpType::RoundTowardsZero, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndz_ukernel__scalar_libm_x2, VUnaryMicrokernelTester::OpType::RoundTowardsZero, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -808,7 +808,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__scalar_libm_x2), VUnaryMicrokernelTester::OpType::RoundTowardsZero, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndz_ukernel__scalar_libm_x2, VUnaryMicrokernelTester::OpType::RoundTowardsZero, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -816,14 +816,14 @@
 TEST(F32_VRNDZ__SCALAR_LIBM_X4, batch_eq_4) {
   VUnaryMicrokernelTester()
     .batch_size(4)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__scalar_libm_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vrndz_ukernel__scalar_libm_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VRNDZ__SCALAR_LIBM_X4, batch_div_4) {
   for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__scalar_libm_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndz_ukernel__scalar_libm_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -831,7 +831,7 @@
   for (size_t batch_size = 1; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__scalar_libm_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndz_ukernel__scalar_libm_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -839,7 +839,7 @@
   for (size_t batch_size = 5; batch_size < 8; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__scalar_libm_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndz_ukernel__scalar_libm_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -848,6 +848,6 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vrndz_ukernel__scalar_libm_x4), VUnaryMicrokernelTester::OpType::RoundTowardsZero, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrndz_ukernel__scalar_libm_x4, VUnaryMicrokernelTester::OpType::RoundTowardsZero, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
diff --git a/test/f32-vsigmoid.cc b/test/f32-vsigmoid.cc
index a0bdf88..790976d 100644
--- a/test/f32-vsigmoid.cc
+++ b/test/f32-vsigmoid.cc
@@ -22,7 +22,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_P5_DIV_X4, batch_div_4) {
@@ -30,7 +30,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -39,7 +39,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -48,7 +48,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -58,7 +58,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM64
@@ -69,7 +69,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_P5_DIV_X8, batch_div_8) {
@@ -77,7 +77,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -86,7 +86,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -95,7 +95,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -105,7 +105,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM64
@@ -116,7 +116,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_P5_DIV_X12, batch_div_12) {
@@ -124,7 +124,7 @@
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -133,7 +133,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -142,7 +142,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -152,7 +152,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM64
@@ -163,7 +163,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_P5_DIV_X16, batch_div_16) {
@@ -171,7 +171,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -180,7 +180,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -189,7 +189,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -199,7 +199,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM64
@@ -210,7 +210,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_P5_DIV_X20, batch_div_20) {
@@ -218,7 +218,7 @@
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -227,7 +227,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -236,7 +236,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -246,7 +246,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM64
@@ -257,7 +257,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_P5_DIV_X24, batch_div_24) {
@@ -265,7 +265,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -274,7 +274,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -283,7 +283,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -293,7 +293,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM64
@@ -304,7 +304,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_P5_NR2FMA_X4, batch_div_4) {
@@ -312,7 +312,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -321,7 +321,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -330,7 +330,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -340,7 +340,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -351,7 +351,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_P5_NR2FMA_X8, batch_div_8) {
@@ -359,7 +359,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -368,7 +368,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -377,7 +377,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -387,7 +387,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -398,7 +398,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_P5_NR2FMA_X12, batch_div_12) {
@@ -406,7 +406,7 @@
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -415,7 +415,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -424,7 +424,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -434,7 +434,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -445,7 +445,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_P5_NR2FMA_X16, batch_div_16) {
@@ -453,7 +453,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -462,7 +462,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -471,7 +471,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -481,7 +481,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -492,7 +492,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_P5_NR2FMA_X20, batch_div_20) {
@@ -500,7 +500,7 @@
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -509,7 +509,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -518,7 +518,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -528,7 +528,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -539,7 +539,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_P5_NR2FMA_X24, batch_div_24) {
@@ -547,7 +547,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -556,7 +556,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -565,7 +565,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -575,7 +575,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -586,7 +586,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_P5_NR1RECPS1FMA_X4, batch_div_4) {
@@ -594,7 +594,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -603,7 +603,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -612,7 +612,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -622,7 +622,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -633,7 +633,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_P5_NR1RECPS1FMA_X8, batch_div_8) {
@@ -641,7 +641,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -650,7 +650,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -659,7 +659,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -669,7 +669,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -680,7 +680,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_P5_NR1RECPS1FMA_X12, batch_div_12) {
@@ -688,7 +688,7 @@
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -697,7 +697,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -706,7 +706,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -716,7 +716,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -727,7 +727,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_P5_NR1RECPS1FMA_X16, batch_div_16) {
@@ -735,7 +735,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -744,7 +744,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -753,7 +753,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -763,7 +763,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -774,7 +774,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_P5_NR1RECPS1FMA_X20, batch_div_20) {
@@ -782,7 +782,7 @@
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -791,7 +791,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -800,7 +800,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -810,7 +810,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -821,7 +821,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_P5_NR1RECPS1FMA_X24, batch_div_24) {
@@ -829,7 +829,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -838,7 +838,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -847,7 +847,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -857,7 +857,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr1recps1fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -868,7 +868,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_P5_NR2RECPS_X4, batch_div_4) {
@@ -876,7 +876,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -885,7 +885,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -894,7 +894,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -904,7 +904,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -915,7 +915,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_P5_NR2RECPS_X8, batch_div_8) {
@@ -923,7 +923,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -932,7 +932,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -941,7 +941,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -951,7 +951,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -962,7 +962,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_P5_NR2RECPS_X12, batch_div_12) {
@@ -970,7 +970,7 @@
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -979,7 +979,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -988,7 +988,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -998,7 +998,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -1009,7 +1009,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_P5_NR2RECPS_X16, batch_div_16) {
@@ -1017,7 +1017,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1026,7 +1026,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1035,7 +1035,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1045,7 +1045,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -1056,7 +1056,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_P5_NR2RECPS_X20, batch_div_20) {
@@ -1064,7 +1064,7 @@
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1073,7 +1073,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1082,7 +1082,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1092,7 +1092,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -1103,7 +1103,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_P5_NR2RECPS_X24, batch_div_24) {
@@ -1111,7 +1111,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1120,7 +1120,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1129,7 +1129,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1139,7 +1139,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_p5_nr2recps_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -1150,7 +1150,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEON_RR2_P5_NR2RECPS_X4, batch_div_4) {
@@ -1158,7 +1158,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1167,7 +1167,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1176,7 +1176,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1186,7 +1186,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -1197,7 +1197,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEON_RR2_P5_NR2RECPS_X8, batch_div_8) {
@@ -1205,7 +1205,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1214,7 +1214,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1223,7 +1223,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1233,7 +1233,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -1244,7 +1244,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEON_RR2_P5_NR2RECPS_X12, batch_div_12) {
@@ -1252,7 +1252,7 @@
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1261,7 +1261,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1270,7 +1270,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1280,7 +1280,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -1291,7 +1291,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEON_RR2_P5_NR2RECPS_X16, batch_div_16) {
@@ -1299,7 +1299,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1308,7 +1308,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1317,7 +1317,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1327,7 +1327,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -1338,7 +1338,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEON_RR2_P5_NR2RECPS_X20, batch_div_20) {
@@ -1346,7 +1346,7 @@
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1355,7 +1355,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1364,7 +1364,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1374,7 +1374,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -1385,7 +1385,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEON_RR2_P5_NR2RECPS_X24, batch_div_24) {
@@ -1393,7 +1393,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1402,7 +1402,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1411,7 +1411,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1421,7 +1421,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_p5_nr2recps_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -1432,7 +1432,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT64_P2_DIV_X4, batch_div_4) {
@@ -1440,7 +1440,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1449,7 +1449,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1458,7 +1458,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1468,7 +1468,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM64
@@ -1479,7 +1479,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT64_P2_DIV_X8, batch_div_8) {
@@ -1487,7 +1487,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1496,7 +1496,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1505,7 +1505,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1515,7 +1515,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM64
@@ -1526,7 +1526,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT64_P2_DIV_X12, batch_div_12) {
@@ -1534,7 +1534,7 @@
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1543,7 +1543,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1552,7 +1552,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1562,7 +1562,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM64
@@ -1573,7 +1573,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT64_P2_DIV_X16, batch_div_16) {
@@ -1581,7 +1581,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1590,7 +1590,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1599,7 +1599,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1609,7 +1609,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM64
@@ -1620,7 +1620,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT64_P2_DIV_X20, batch_div_20) {
@@ -1628,7 +1628,7 @@
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1637,7 +1637,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1646,7 +1646,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1656,7 +1656,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM64
@@ -1667,7 +1667,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT64_P2_DIV_X24, batch_div_24) {
@@ -1675,7 +1675,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1684,7 +1684,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1693,7 +1693,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1703,7 +1703,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM64
@@ -1714,7 +1714,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT64_P2_NR2FMA_X4, batch_div_4) {
@@ -1722,7 +1722,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1731,7 +1731,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1740,7 +1740,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1750,7 +1750,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -1761,7 +1761,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT64_P2_NR2FMA_X8, batch_div_8) {
@@ -1769,7 +1769,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1778,7 +1778,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1787,7 +1787,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1797,7 +1797,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -1808,7 +1808,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT64_P2_NR2FMA_X12, batch_div_12) {
@@ -1816,7 +1816,7 @@
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1825,7 +1825,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1834,7 +1834,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1844,7 +1844,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -1855,7 +1855,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT64_P2_NR2FMA_X16, batch_div_16) {
@@ -1863,7 +1863,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1872,7 +1872,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1881,7 +1881,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1891,7 +1891,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -1902,7 +1902,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT64_P2_NR2FMA_X20, batch_div_20) {
@@ -1910,7 +1910,7 @@
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1919,7 +1919,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1928,7 +1928,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1938,7 +1938,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -1949,7 +1949,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT64_P2_NR2FMA_X24, batch_div_24) {
@@ -1957,7 +1957,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1966,7 +1966,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1975,7 +1975,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -1985,7 +1985,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -1996,7 +1996,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT64_P2_NR1RECPS1FMA_X4, batch_div_4) {
@@ -2004,7 +2004,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2013,7 +2013,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2022,7 +2022,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2032,7 +2032,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -2043,7 +2043,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT64_P2_NR1RECPS1FMA_X8, batch_div_8) {
@@ -2051,7 +2051,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2060,7 +2060,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2069,7 +2069,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2079,7 +2079,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -2090,7 +2090,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT64_P2_NR1RECPS1FMA_X12, batch_div_12) {
@@ -2098,7 +2098,7 @@
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2107,7 +2107,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2116,7 +2116,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2126,7 +2126,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -2137,7 +2137,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT64_P2_NR1RECPS1FMA_X16, batch_div_16) {
@@ -2145,7 +2145,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2154,7 +2154,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2163,7 +2163,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2173,7 +2173,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -2184,7 +2184,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT64_P2_NR1RECPS1FMA_X20, batch_div_20) {
@@ -2192,7 +2192,7 @@
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2201,7 +2201,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2210,7 +2210,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2220,7 +2220,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -2231,7 +2231,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT64_P2_NR1RECPS1FMA_X24, batch_div_24) {
@@ -2239,7 +2239,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2248,7 +2248,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2257,7 +2257,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2267,7 +2267,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr1recps1fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -2278,7 +2278,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT64_P2_NR2RECPS_X4, batch_div_4) {
@@ -2286,7 +2286,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2295,7 +2295,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2304,7 +2304,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2314,7 +2314,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -2325,7 +2325,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT64_P2_NR2RECPS_X8, batch_div_8) {
@@ -2333,7 +2333,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2342,7 +2342,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2351,7 +2351,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2361,7 +2361,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -2372,7 +2372,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT64_P2_NR2RECPS_X12, batch_div_12) {
@@ -2380,7 +2380,7 @@
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2389,7 +2389,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2398,7 +2398,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2408,7 +2408,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -2419,7 +2419,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT64_P2_NR2RECPS_X16, batch_div_16) {
@@ -2427,7 +2427,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2436,7 +2436,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2445,7 +2445,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2455,7 +2455,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -2466,7 +2466,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT64_P2_NR2RECPS_X20, batch_div_20) {
@@ -2474,7 +2474,7 @@
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2483,7 +2483,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2492,7 +2492,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2502,7 +2502,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -2513,7 +2513,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT64_P2_NR2RECPS_X24, batch_div_24) {
@@ -2521,7 +2521,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2530,7 +2530,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2539,7 +2539,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2549,7 +2549,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut64_p2_nr2recps_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -2560,7 +2560,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEON_RR2_LUT64_P2_NR2RECPS_X4, batch_div_4) {
@@ -2568,7 +2568,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2577,7 +2577,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2586,7 +2586,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2596,7 +2596,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -2607,7 +2607,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEON_RR2_LUT64_P2_NR2RECPS_X8, batch_div_8) {
@@ -2615,7 +2615,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2624,7 +2624,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2633,7 +2633,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2643,7 +2643,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -2654,7 +2654,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEON_RR2_LUT64_P2_NR2RECPS_X12, batch_div_12) {
@@ -2662,7 +2662,7 @@
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2671,7 +2671,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2680,7 +2680,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2690,7 +2690,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -2701,7 +2701,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEON_RR2_LUT64_P2_NR2RECPS_X16, batch_div_16) {
@@ -2709,7 +2709,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2718,7 +2718,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2727,7 +2727,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2737,7 +2737,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -2748,7 +2748,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEON_RR2_LUT64_P2_NR2RECPS_X20, batch_div_20) {
@@ -2756,7 +2756,7 @@
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2765,7 +2765,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2774,7 +2774,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2784,7 +2784,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -2795,7 +2795,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEON_RR2_LUT64_P2_NR2RECPS_X24, batch_div_24) {
@@ -2803,7 +2803,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2812,7 +2812,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2821,7 +2821,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2831,7 +2831,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut64_p2_nr2recps_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -2842,7 +2842,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT2048_P1_DIV_X4, batch_div_4) {
@@ -2850,7 +2850,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2859,7 +2859,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2868,7 +2868,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2878,7 +2878,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM64
@@ -2889,7 +2889,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT2048_P1_DIV_X8, batch_div_8) {
@@ -2897,7 +2897,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2906,7 +2906,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2915,7 +2915,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2925,7 +2925,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM64
@@ -2936,7 +2936,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT2048_P1_DIV_X12, batch_div_12) {
@@ -2944,7 +2944,7 @@
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2953,7 +2953,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2962,7 +2962,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -2972,7 +2972,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM64
@@ -2983,7 +2983,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT2048_P1_DIV_X16, batch_div_16) {
@@ -2991,7 +2991,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3000,7 +3000,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3009,7 +3009,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3019,7 +3019,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM64
@@ -3030,7 +3030,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT2048_P1_DIV_X20, batch_div_20) {
@@ -3038,7 +3038,7 @@
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3047,7 +3047,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3056,7 +3056,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3066,7 +3066,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM64
@@ -3077,7 +3077,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT2048_P1_DIV_X24, batch_div_24) {
@@ -3085,7 +3085,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3094,7 +3094,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3103,7 +3103,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3113,7 +3113,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM64
@@ -3124,7 +3124,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT2048_P1_NR2FMA_X4, batch_div_4) {
@@ -3132,7 +3132,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3141,7 +3141,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3150,7 +3150,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3160,7 +3160,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -3171,7 +3171,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT2048_P1_NR2FMA_X8, batch_div_8) {
@@ -3179,7 +3179,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3188,7 +3188,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3197,7 +3197,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3207,7 +3207,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -3218,7 +3218,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT2048_P1_NR2FMA_X12, batch_div_12) {
@@ -3226,7 +3226,7 @@
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3235,7 +3235,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3244,7 +3244,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3254,7 +3254,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -3265,7 +3265,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT2048_P1_NR2FMA_X16, batch_div_16) {
@@ -3273,7 +3273,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3282,7 +3282,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3291,7 +3291,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3301,7 +3301,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -3312,7 +3312,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT2048_P1_NR2FMA_X20, batch_div_20) {
@@ -3320,7 +3320,7 @@
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3329,7 +3329,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3338,7 +3338,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3348,7 +3348,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -3359,7 +3359,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT2048_P1_NR2FMA_X24, batch_div_24) {
@@ -3367,7 +3367,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3376,7 +3376,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3385,7 +3385,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3395,7 +3395,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -3406,7 +3406,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT2048_P1_NR1RECPS1FMA_X4, batch_div_4) {
@@ -3414,7 +3414,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3423,7 +3423,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3432,7 +3432,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3442,7 +3442,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -3453,7 +3453,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT2048_P1_NR1RECPS1FMA_X8, batch_div_8) {
@@ -3461,7 +3461,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3470,7 +3470,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3479,7 +3479,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3489,7 +3489,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -3500,7 +3500,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT2048_P1_NR1RECPS1FMA_X12, batch_div_12) {
@@ -3508,7 +3508,7 @@
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3517,7 +3517,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3526,7 +3526,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3536,7 +3536,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -3547,7 +3547,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT2048_P1_NR1RECPS1FMA_X16, batch_div_16) {
@@ -3555,7 +3555,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3564,7 +3564,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3573,7 +3573,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3583,7 +3583,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -3594,7 +3594,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT2048_P1_NR1RECPS1FMA_X20, batch_div_20) {
@@ -3602,7 +3602,7 @@
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3611,7 +3611,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3620,7 +3620,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3630,7 +3630,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -3641,7 +3641,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT2048_P1_NR1RECPS1FMA_X24, batch_div_24) {
@@ -3649,7 +3649,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3658,7 +3658,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3667,7 +3667,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3677,7 +3677,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr1recps1fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -3688,7 +3688,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT2048_P1_NR2RECPS_X4, batch_div_4) {
@@ -3696,7 +3696,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3705,7 +3705,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3714,7 +3714,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3724,7 +3724,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -3735,7 +3735,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT2048_P1_NR2RECPS_X8, batch_div_8) {
@@ -3743,7 +3743,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3752,7 +3752,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3761,7 +3761,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3771,7 +3771,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -3782,7 +3782,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT2048_P1_NR2RECPS_X12, batch_div_12) {
@@ -3790,7 +3790,7 @@
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3799,7 +3799,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3808,7 +3808,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3818,7 +3818,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -3829,7 +3829,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT2048_P1_NR2RECPS_X16, batch_div_16) {
@@ -3837,7 +3837,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3846,7 +3846,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3855,7 +3855,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3865,7 +3865,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -3876,7 +3876,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT2048_P1_NR2RECPS_X20, batch_div_20) {
@@ -3884,7 +3884,7 @@
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3893,7 +3893,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3902,7 +3902,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3912,7 +3912,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -3923,7 +3923,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEONFMA_RR1_LUT2048_P1_NR2RECPS_X24, batch_div_24) {
@@ -3931,7 +3931,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3940,7 +3940,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3949,7 +3949,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3959,7 +3959,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neonfma_rr1_lut2048_p1_nr2recps_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -3970,7 +3970,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEON_RR2_LUT2048_P1_NR2RECPS_X4, batch_div_4) {
@@ -3978,7 +3978,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3987,7 +3987,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -3996,7 +3996,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4006,7 +4006,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -4017,7 +4017,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEON_RR2_LUT2048_P1_NR2RECPS_X8, batch_div_8) {
@@ -4025,7 +4025,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4034,7 +4034,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4043,7 +4043,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4053,7 +4053,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -4064,7 +4064,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEON_RR2_LUT2048_P1_NR2RECPS_X12, batch_div_12) {
@@ -4072,7 +4072,7 @@
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4081,7 +4081,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4090,7 +4090,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4100,7 +4100,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -4111,7 +4111,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEON_RR2_LUT2048_P1_NR2RECPS_X16, batch_div_16) {
@@ -4119,7 +4119,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4128,7 +4128,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4137,7 +4137,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4147,7 +4147,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -4158,7 +4158,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEON_RR2_LUT2048_P1_NR2RECPS_X20, batch_div_20) {
@@ -4166,7 +4166,7 @@
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4175,7 +4175,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4184,7 +4184,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4194,7 +4194,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -4205,7 +4205,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__NEON_RR2_LUT2048_P1_NR2RECPS_X24, batch_div_24) {
@@ -4213,7 +4213,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4222,7 +4222,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4231,7 +4231,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4241,7 +4241,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__neon_rr2_lut2048_p1_nr2recps_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -4252,7 +4252,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__SSE2_P5_DIV_X4, batch_div_4) {
@@ -4260,7 +4260,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4269,7 +4269,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4278,7 +4278,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4288,7 +4288,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -4299,7 +4299,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__SSE2_P5_DIV_X8, batch_div_8) {
@@ -4307,7 +4307,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4316,7 +4316,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4325,7 +4325,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4335,7 +4335,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -4346,7 +4346,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__SSE2_P5_DIV_X12, batch_div_12) {
@@ -4354,7 +4354,7 @@
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4363,7 +4363,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4372,7 +4372,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4382,7 +4382,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -4393,7 +4393,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__SSE2_P5_DIV_X16, batch_div_16) {
@@ -4401,7 +4401,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4410,7 +4410,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4419,7 +4419,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4429,7 +4429,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -4440,7 +4440,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__SSE2_P5_DIV_X20, batch_div_20) {
@@ -4448,7 +4448,7 @@
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4457,7 +4457,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4466,7 +4466,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4476,7 +4476,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -4487,7 +4487,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__SSE2_P5_DIV_X24, batch_div_24) {
@@ -4495,7 +4495,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4504,7 +4504,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4513,7 +4513,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4523,7 +4523,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_p5_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -4534,7 +4534,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__SSE41_P5_DIV_X4, batch_div_4) {
@@ -4542,7 +4542,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4551,7 +4551,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4560,7 +4560,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4570,7 +4570,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -4581,7 +4581,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__SSE41_P5_DIV_X8, batch_div_8) {
@@ -4589,7 +4589,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4598,7 +4598,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4607,7 +4607,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4617,7 +4617,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -4628,7 +4628,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__SSE41_P5_DIV_X12, batch_div_12) {
@@ -4636,7 +4636,7 @@
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4645,7 +4645,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4654,7 +4654,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4664,7 +4664,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -4675,7 +4675,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__SSE41_P5_DIV_X16, batch_div_16) {
@@ -4683,7 +4683,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4692,7 +4692,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4701,7 +4701,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4711,7 +4711,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -4722,7 +4722,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__SSE41_P5_DIV_X20, batch_div_20) {
@@ -4730,7 +4730,7 @@
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4739,7 +4739,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4748,7 +4748,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4758,7 +4758,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -4769,7 +4769,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__SSE41_P5_DIV_X24, batch_div_24) {
@@ -4777,7 +4777,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4786,7 +4786,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4795,7 +4795,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4805,7 +4805,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_p5_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -4816,7 +4816,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__SSE2_LUT64_P2_DIV_X4, batch_div_4) {
@@ -4824,7 +4824,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4833,7 +4833,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4842,7 +4842,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4852,7 +4852,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -4863,7 +4863,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__SSE2_LUT64_P2_DIV_X8, batch_div_8) {
@@ -4871,7 +4871,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4880,7 +4880,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4889,7 +4889,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4899,7 +4899,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -4910,7 +4910,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__SSE2_LUT64_P2_DIV_X12, batch_div_12) {
@@ -4918,7 +4918,7 @@
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4927,7 +4927,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4936,7 +4936,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4946,7 +4946,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -4957,7 +4957,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__SSE2_LUT64_P2_DIV_X16, batch_div_16) {
@@ -4965,7 +4965,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4974,7 +4974,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4983,7 +4983,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -4993,7 +4993,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -5004,7 +5004,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__SSE2_LUT64_P2_DIV_X20, batch_div_20) {
@@ -5012,7 +5012,7 @@
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5021,7 +5021,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5030,7 +5030,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5040,7 +5040,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -5051,7 +5051,7 @@
     TEST_REQUIRES_X86_SSE2;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__SSE2_LUT64_P2_DIV_X24, batch_div_24) {
@@ -5059,7 +5059,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5068,7 +5068,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5077,7 +5077,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5087,7 +5087,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse2_lut64_p2_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -5098,7 +5098,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__SSE41_LUT64_P2_DIV_X4, batch_div_4) {
@@ -5106,7 +5106,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5115,7 +5115,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5124,7 +5124,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5134,7 +5134,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -5145,7 +5145,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__SSE41_LUT64_P2_DIV_X8, batch_div_8) {
@@ -5153,7 +5153,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5162,7 +5162,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5171,7 +5171,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5181,7 +5181,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -5192,7 +5192,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__SSE41_LUT64_P2_DIV_X12, batch_div_12) {
@@ -5200,7 +5200,7 @@
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5209,7 +5209,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5218,7 +5218,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5228,7 +5228,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -5239,7 +5239,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__SSE41_LUT64_P2_DIV_X16, batch_div_16) {
@@ -5247,7 +5247,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5256,7 +5256,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5265,7 +5265,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5275,7 +5275,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -5286,7 +5286,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__SSE41_LUT64_P2_DIV_X20, batch_div_20) {
@@ -5294,7 +5294,7 @@
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5303,7 +5303,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5312,7 +5312,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5322,7 +5322,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -5333,7 +5333,7 @@
     TEST_REQUIRES_X86_SSE41;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__SSE41_LUT64_P2_DIV_X24, batch_div_24) {
@@ -5341,7 +5341,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5350,7 +5350,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5359,7 +5359,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5369,7 +5369,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__sse41_lut64_p2_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -5380,7 +5380,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX_RR2_P5_DIV_X8, batch_div_8) {
@@ -5388,7 +5388,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5397,7 +5397,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5406,7 +5406,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5416,7 +5416,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -5427,7 +5427,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX_RR2_P5_DIV_X16, batch_div_16) {
@@ -5435,7 +5435,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5444,7 +5444,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5453,7 +5453,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5463,7 +5463,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -5474,7 +5474,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX_RR2_P5_DIV_X24, batch_div_24) {
@@ -5482,7 +5482,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5491,7 +5491,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5500,7 +5500,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5510,7 +5510,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -5521,7 +5521,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX_RR2_P5_DIV_X32, batch_div_32) {
@@ -5529,7 +5529,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5538,7 +5538,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5547,7 +5547,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5557,7 +5557,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -5568,7 +5568,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(40)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x40), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x40, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX_RR2_P5_DIV_X40, batch_div_40) {
@@ -5576,7 +5576,7 @@
     for (size_t batch_size = 80; batch_size < 400; batch_size += 40) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x40), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x40, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5585,7 +5585,7 @@
     for (size_t batch_size = 1; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x40), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x40, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5594,7 +5594,7 @@
     for (size_t batch_size = 41; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x40), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x40, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5604,7 +5604,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x40), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x40, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -5615,7 +5615,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(48)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX_RR2_P5_DIV_X48, batch_div_48) {
@@ -5623,7 +5623,7 @@
     for (size_t batch_size = 96; batch_size < 480; batch_size += 48) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5632,7 +5632,7 @@
     for (size_t batch_size = 1; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5641,7 +5641,7 @@
     for (size_t batch_size = 49; batch_size < 96; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5651,7 +5651,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -5662,7 +5662,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(56)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x56), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x56, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX_RR2_P5_DIV_X56, batch_div_56) {
@@ -5670,7 +5670,7 @@
     for (size_t batch_size = 112; batch_size < 560; batch_size += 56) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x56), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x56, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5679,7 +5679,7 @@
     for (size_t batch_size = 1; batch_size < 56; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x56), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x56, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5688,7 +5688,7 @@
     for (size_t batch_size = 57; batch_size < 112; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x56), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x56, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5698,7 +5698,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x56), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x56, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -5709,7 +5709,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(64)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX_RR2_P5_DIV_X64, batch_div_64) {
@@ -5717,7 +5717,7 @@
     for (size_t batch_size = 128; batch_size < 640; batch_size += 64) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5726,7 +5726,7 @@
     for (size_t batch_size = 1; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5735,7 +5735,7 @@
     for (size_t batch_size = 65; batch_size < 128; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5745,7 +5745,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -5756,7 +5756,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(72)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x72), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x72, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX_RR2_P5_DIV_X72, batch_div_72) {
@@ -5764,7 +5764,7 @@
     for (size_t batch_size = 144; batch_size < 720; batch_size += 72) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x72), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x72, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5773,7 +5773,7 @@
     for (size_t batch_size = 1; batch_size < 72; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x72), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x72, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5782,7 +5782,7 @@
     for (size_t batch_size = 73; batch_size < 144; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x72), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x72, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5792,7 +5792,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x72), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x72, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -5803,7 +5803,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(80)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX_RR2_P5_DIV_X80, batch_div_80) {
@@ -5811,7 +5811,7 @@
     for (size_t batch_size = 160; batch_size < 800; batch_size += 80) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5820,7 +5820,7 @@
     for (size_t batch_size = 1; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5829,7 +5829,7 @@
     for (size_t batch_size = 81; batch_size < 160; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5839,7 +5839,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_div_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -5850,7 +5850,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX_RR2_P5_NR2_X8, batch_div_8) {
@@ -5858,7 +5858,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5867,7 +5867,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5876,7 +5876,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5886,7 +5886,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -5897,7 +5897,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX_RR2_P5_NR2_X16, batch_div_16) {
@@ -5905,7 +5905,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5914,7 +5914,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5923,7 +5923,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5933,7 +5933,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -5944,7 +5944,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX_RR2_P5_NR2_X24, batch_div_24) {
@@ -5952,7 +5952,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5961,7 +5961,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5970,7 +5970,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -5980,7 +5980,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -5991,7 +5991,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX_RR2_P5_NR2_X32, batch_div_32) {
@@ -5999,7 +5999,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6008,7 +6008,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6017,7 +6017,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6027,7 +6027,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -6038,7 +6038,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(40)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x40), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x40, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX_RR2_P5_NR2_X40, batch_div_40) {
@@ -6046,7 +6046,7 @@
     for (size_t batch_size = 80; batch_size < 400; batch_size += 40) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x40), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x40, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6055,7 +6055,7 @@
     for (size_t batch_size = 1; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x40), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x40, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6064,7 +6064,7 @@
     for (size_t batch_size = 41; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x40), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x40, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6074,7 +6074,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x40), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x40, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -6085,7 +6085,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(48)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX_RR2_P5_NR2_X48, batch_div_48) {
@@ -6093,7 +6093,7 @@
     for (size_t batch_size = 96; batch_size < 480; batch_size += 48) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6102,7 +6102,7 @@
     for (size_t batch_size = 1; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6111,7 +6111,7 @@
     for (size_t batch_size = 49; batch_size < 96; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6121,7 +6121,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -6132,7 +6132,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(56)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x56), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x56, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX_RR2_P5_NR2_X56, batch_div_56) {
@@ -6140,7 +6140,7 @@
     for (size_t batch_size = 112; batch_size < 560; batch_size += 56) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x56), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x56, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6149,7 +6149,7 @@
     for (size_t batch_size = 1; batch_size < 56; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x56), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x56, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6158,7 +6158,7 @@
     for (size_t batch_size = 57; batch_size < 112; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x56), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x56, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6168,7 +6168,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x56), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x56, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -6179,7 +6179,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(64)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX_RR2_P5_NR2_X64, batch_div_64) {
@@ -6187,7 +6187,7 @@
     for (size_t batch_size = 128; batch_size < 640; batch_size += 64) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6196,7 +6196,7 @@
     for (size_t batch_size = 1; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6205,7 +6205,7 @@
     for (size_t batch_size = 65; batch_size < 128; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6215,7 +6215,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -6226,7 +6226,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(72)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x72), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x72, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX_RR2_P5_NR2_X72, batch_div_72) {
@@ -6234,7 +6234,7 @@
     for (size_t batch_size = 144; batch_size < 720; batch_size += 72) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x72), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x72, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6243,7 +6243,7 @@
     for (size_t batch_size = 1; batch_size < 72; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x72), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x72, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6252,7 +6252,7 @@
     for (size_t batch_size = 73; batch_size < 144; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x72), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x72, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6262,7 +6262,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x72), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x72, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -6273,7 +6273,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(80)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX_RR2_P5_NR2_X80, batch_div_80) {
@@ -6281,7 +6281,7 @@
     for (size_t batch_size = 160; batch_size < 800; batch_size += 80) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6290,7 +6290,7 @@
     for (size_t batch_size = 1; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6299,7 +6299,7 @@
     for (size_t batch_size = 81; batch_size < 160; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6309,7 +6309,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx_rr2_p5_nr2_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -6320,7 +6320,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX2_RR1_P5_DIV_X8, batch_div_8) {
@@ -6328,7 +6328,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6337,7 +6337,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6346,7 +6346,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6356,7 +6356,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -6367,7 +6367,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX2_RR1_P5_DIV_X16, batch_div_16) {
@@ -6375,7 +6375,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6384,7 +6384,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6393,7 +6393,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6403,7 +6403,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -6414,7 +6414,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX2_RR1_P5_DIV_X24, batch_div_24) {
@@ -6422,7 +6422,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6431,7 +6431,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6440,7 +6440,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6450,7 +6450,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -6461,7 +6461,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX2_RR1_P5_DIV_X32, batch_div_32) {
@@ -6469,7 +6469,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6478,7 +6478,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6487,7 +6487,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6497,7 +6497,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -6508,7 +6508,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(40)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x40), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x40, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX2_RR1_P5_DIV_X40, batch_div_40) {
@@ -6516,7 +6516,7 @@
     for (size_t batch_size = 80; batch_size < 400; batch_size += 40) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x40), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x40, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6525,7 +6525,7 @@
     for (size_t batch_size = 1; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x40), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x40, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6534,7 +6534,7 @@
     for (size_t batch_size = 41; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x40), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x40, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6544,7 +6544,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x40), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x40, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -6555,7 +6555,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(48)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX2_RR1_P5_DIV_X48, batch_div_48) {
@@ -6563,7 +6563,7 @@
     for (size_t batch_size = 96; batch_size < 480; batch_size += 48) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6572,7 +6572,7 @@
     for (size_t batch_size = 1; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6581,7 +6581,7 @@
     for (size_t batch_size = 49; batch_size < 96; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6591,7 +6591,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -6602,7 +6602,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(56)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x56), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x56, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX2_RR1_P5_DIV_X56, batch_div_56) {
@@ -6610,7 +6610,7 @@
     for (size_t batch_size = 112; batch_size < 560; batch_size += 56) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x56), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x56, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6619,7 +6619,7 @@
     for (size_t batch_size = 1; batch_size < 56; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x56), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x56, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6628,7 +6628,7 @@
     for (size_t batch_size = 57; batch_size < 112; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x56), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x56, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6638,7 +6638,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x56), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x56, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -6649,7 +6649,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(64)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX2_RR1_P5_DIV_X64, batch_div_64) {
@@ -6657,7 +6657,7 @@
     for (size_t batch_size = 128; batch_size < 640; batch_size += 64) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6666,7 +6666,7 @@
     for (size_t batch_size = 1; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6675,7 +6675,7 @@
     for (size_t batch_size = 65; batch_size < 128; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6685,7 +6685,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -6696,7 +6696,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(72)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x72), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x72, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX2_RR1_P5_DIV_X72, batch_div_72) {
@@ -6704,7 +6704,7 @@
     for (size_t batch_size = 144; batch_size < 720; batch_size += 72) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x72), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x72, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6713,7 +6713,7 @@
     for (size_t batch_size = 1; batch_size < 72; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x72), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x72, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6722,7 +6722,7 @@
     for (size_t batch_size = 73; batch_size < 144; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x72), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x72, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6732,7 +6732,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x72), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x72, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -6743,7 +6743,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(80)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX2_RR1_P5_DIV_X80, batch_div_80) {
@@ -6751,7 +6751,7 @@
     for (size_t batch_size = 160; batch_size < 800; batch_size += 80) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6760,7 +6760,7 @@
     for (size_t batch_size = 1; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6769,7 +6769,7 @@
     for (size_t batch_size = 81; batch_size < 160; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6779,7 +6779,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_div_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -6790,7 +6790,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX2_RR1_P5_NR1FMA_X8, batch_div_8) {
@@ -6798,7 +6798,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6807,7 +6807,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6816,7 +6816,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6826,7 +6826,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -6837,7 +6837,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX2_RR1_P5_NR1FMA_X16, batch_div_16) {
@@ -6845,7 +6845,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6854,7 +6854,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6863,7 +6863,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6873,7 +6873,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -6884,7 +6884,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX2_RR1_P5_NR1FMA_X24, batch_div_24) {
@@ -6892,7 +6892,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6901,7 +6901,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6910,7 +6910,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6920,7 +6920,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -6931,7 +6931,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX2_RR1_P5_NR1FMA_X32, batch_div_32) {
@@ -6939,7 +6939,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6948,7 +6948,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6957,7 +6957,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6967,7 +6967,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -6978,7 +6978,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(40)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x40), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x40, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX2_RR1_P5_NR1FMA_X40, batch_div_40) {
@@ -6986,7 +6986,7 @@
     for (size_t batch_size = 80; batch_size < 400; batch_size += 40) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x40), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x40, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -6995,7 +6995,7 @@
     for (size_t batch_size = 1; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x40), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x40, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7004,7 +7004,7 @@
     for (size_t batch_size = 41; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x40), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x40, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7014,7 +7014,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x40), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x40, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -7025,7 +7025,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(48)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX2_RR1_P5_NR1FMA_X48, batch_div_48) {
@@ -7033,7 +7033,7 @@
     for (size_t batch_size = 96; batch_size < 480; batch_size += 48) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7042,7 +7042,7 @@
     for (size_t batch_size = 1; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7051,7 +7051,7 @@
     for (size_t batch_size = 49; batch_size < 96; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7061,7 +7061,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -7072,7 +7072,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(56)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x56), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x56, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX2_RR1_P5_NR1FMA_X56, batch_div_56) {
@@ -7080,7 +7080,7 @@
     for (size_t batch_size = 112; batch_size < 560; batch_size += 56) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x56), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x56, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7089,7 +7089,7 @@
     for (size_t batch_size = 1; batch_size < 56; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x56), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x56, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7098,7 +7098,7 @@
     for (size_t batch_size = 57; batch_size < 112; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x56), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x56, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7108,7 +7108,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x56), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x56, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -7119,7 +7119,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(64)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX2_RR1_P5_NR1FMA_X64, batch_div_64) {
@@ -7127,7 +7127,7 @@
     for (size_t batch_size = 128; batch_size < 640; batch_size += 64) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7136,7 +7136,7 @@
     for (size_t batch_size = 1; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7145,7 +7145,7 @@
     for (size_t batch_size = 65; batch_size < 128; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7155,7 +7155,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -7166,7 +7166,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(72)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x72), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x72, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX2_RR1_P5_NR1FMA_X72, batch_div_72) {
@@ -7174,7 +7174,7 @@
     for (size_t batch_size = 144; batch_size < 720; batch_size += 72) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x72), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x72, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7183,7 +7183,7 @@
     for (size_t batch_size = 1; batch_size < 72; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x72), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x72, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7192,7 +7192,7 @@
     for (size_t batch_size = 73; batch_size < 144; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x72), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x72, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7202,7 +7202,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x72), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x72, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -7213,7 +7213,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(80)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX2_RR1_P5_NR1FMA_X80, batch_div_80) {
@@ -7221,7 +7221,7 @@
     for (size_t batch_size = 160; batch_size < 800; batch_size += 80) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7230,7 +7230,7 @@
     for (size_t batch_size = 1; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7239,7 +7239,7 @@
     for (size_t batch_size = 81; batch_size < 160; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7249,7 +7249,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr1fma_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -7260,7 +7260,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX2_RR1_P5_NR2FMA_X8, batch_div_8) {
@@ -7268,7 +7268,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7277,7 +7277,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7286,7 +7286,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7296,7 +7296,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -7307,7 +7307,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX2_RR1_P5_NR2FMA_X16, batch_div_16) {
@@ -7315,7 +7315,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7324,7 +7324,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7333,7 +7333,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7343,7 +7343,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -7354,7 +7354,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX2_RR1_P5_NR2FMA_X24, batch_div_24) {
@@ -7362,7 +7362,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7371,7 +7371,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7380,7 +7380,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7390,7 +7390,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -7401,7 +7401,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX2_RR1_P5_NR2FMA_X32, batch_div_32) {
@@ -7409,7 +7409,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7418,7 +7418,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7427,7 +7427,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7437,7 +7437,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -7448,7 +7448,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(40)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x40), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x40, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX2_RR1_P5_NR2FMA_X40, batch_div_40) {
@@ -7456,7 +7456,7 @@
     for (size_t batch_size = 80; batch_size < 400; batch_size += 40) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x40), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x40, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7465,7 +7465,7 @@
     for (size_t batch_size = 1; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x40), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x40, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7474,7 +7474,7 @@
     for (size_t batch_size = 41; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x40), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x40, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7484,7 +7484,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x40), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x40, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -7495,7 +7495,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(48)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX2_RR1_P5_NR2FMA_X48, batch_div_48) {
@@ -7503,7 +7503,7 @@
     for (size_t batch_size = 96; batch_size < 480; batch_size += 48) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7512,7 +7512,7 @@
     for (size_t batch_size = 1; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7521,7 +7521,7 @@
     for (size_t batch_size = 49; batch_size < 96; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7531,7 +7531,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -7542,7 +7542,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(56)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x56), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x56, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX2_RR1_P5_NR2FMA_X56, batch_div_56) {
@@ -7550,7 +7550,7 @@
     for (size_t batch_size = 112; batch_size < 560; batch_size += 56) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x56), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x56, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7559,7 +7559,7 @@
     for (size_t batch_size = 1; batch_size < 56; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x56), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x56, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7568,7 +7568,7 @@
     for (size_t batch_size = 57; batch_size < 112; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x56), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x56, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7578,7 +7578,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x56), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x56, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -7589,7 +7589,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(64)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX2_RR1_P5_NR2FMA_X64, batch_div_64) {
@@ -7597,7 +7597,7 @@
     for (size_t batch_size = 128; batch_size < 640; batch_size += 64) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7606,7 +7606,7 @@
     for (size_t batch_size = 1; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7615,7 +7615,7 @@
     for (size_t batch_size = 65; batch_size < 128; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7625,7 +7625,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -7636,7 +7636,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(72)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x72), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x72, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX2_RR1_P5_NR2FMA_X72, batch_div_72) {
@@ -7644,7 +7644,7 @@
     for (size_t batch_size = 144; batch_size < 720; batch_size += 72) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x72), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x72, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7653,7 +7653,7 @@
     for (size_t batch_size = 1; batch_size < 72; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x72), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x72, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7662,7 +7662,7 @@
     for (size_t batch_size = 73; batch_size < 144; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x72), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x72, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7672,7 +7672,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x72), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x72, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -7683,7 +7683,7 @@
     TEST_REQUIRES_X86_AVX2;
     VUnaryMicrokernelTester()
       .batch_size(80)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX2_RR1_P5_NR2FMA_X80, batch_div_80) {
@@ -7691,7 +7691,7 @@
     for (size_t batch_size = 160; batch_size < 800; batch_size += 80) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7700,7 +7700,7 @@
     for (size_t batch_size = 1; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7709,7 +7709,7 @@
     for (size_t batch_size = 81; batch_size < 160; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7719,7 +7719,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx2_rr1_p5_nr2fma_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -7730,7 +7730,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_P5_SCALEF_DIV_X16, batch_div_16) {
@@ -7738,7 +7738,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7747,7 +7747,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7756,7 +7756,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7766,7 +7766,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -7777,7 +7777,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_P5_SCALEF_DIV_X32, batch_div_32) {
@@ -7785,7 +7785,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7794,7 +7794,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7803,7 +7803,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7813,7 +7813,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -7824,7 +7824,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(48)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_P5_SCALEF_DIV_X48, batch_div_48) {
@@ -7832,7 +7832,7 @@
     for (size_t batch_size = 96; batch_size < 480; batch_size += 48) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7841,7 +7841,7 @@
     for (size_t batch_size = 1; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7850,7 +7850,7 @@
     for (size_t batch_size = 49; batch_size < 96; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7860,7 +7860,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -7871,7 +7871,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(64)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_P5_SCALEF_DIV_X64, batch_div_64) {
@@ -7879,7 +7879,7 @@
     for (size_t batch_size = 128; batch_size < 640; batch_size += 64) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7888,7 +7888,7 @@
     for (size_t batch_size = 1; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7897,7 +7897,7 @@
     for (size_t batch_size = 65; batch_size < 128; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7907,7 +7907,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -7918,7 +7918,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(80)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_P5_SCALEF_DIV_X80, batch_div_80) {
@@ -7926,7 +7926,7 @@
     for (size_t batch_size = 160; batch_size < 800; batch_size += 80) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7935,7 +7935,7 @@
     for (size_t batch_size = 1; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7944,7 +7944,7 @@
     for (size_t batch_size = 81; batch_size < 160; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7954,7 +7954,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -7965,7 +7965,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(96)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x96), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x96, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_P5_SCALEF_DIV_X96, batch_div_96) {
@@ -7973,7 +7973,7 @@
     for (size_t batch_size = 192; batch_size < 960; batch_size += 96) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x96), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x96, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7982,7 +7982,7 @@
     for (size_t batch_size = 1; batch_size < 96; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x96), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x96, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -7991,7 +7991,7 @@
     for (size_t batch_size = 97; batch_size < 192; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x96), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x96, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8001,7 +8001,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x96), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x96, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -8012,7 +8012,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(112)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x112), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x112, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_P5_SCALEF_DIV_X112, batch_div_112) {
@@ -8020,7 +8020,7 @@
     for (size_t batch_size = 224; batch_size < 1120; batch_size += 112) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x112), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x112, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8029,7 +8029,7 @@
     for (size_t batch_size = 1; batch_size < 112; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x112), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x112, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8038,7 +8038,7 @@
     for (size_t batch_size = 113; batch_size < 224; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x112), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x112, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8048,7 +8048,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x112), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x112, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -8059,7 +8059,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(128)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x128), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x128, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_P5_SCALEF_DIV_X128, batch_div_128) {
@@ -8067,7 +8067,7 @@
     for (size_t batch_size = 256; batch_size < 1280; batch_size += 128) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x128), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x128, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8076,7 +8076,7 @@
     for (size_t batch_size = 1; batch_size < 128; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x128), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x128, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8085,7 +8085,7 @@
     for (size_t batch_size = 129; batch_size < 256; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x128), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x128, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8095,7 +8095,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x128), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_div_x128, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -8106,7 +8106,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_P5_SCALEF_NR1FMA_X16, batch_div_16) {
@@ -8114,7 +8114,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8123,7 +8123,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8132,7 +8132,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8142,7 +8142,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -8153,7 +8153,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_P5_SCALEF_NR1FMA_X32, batch_div_32) {
@@ -8161,7 +8161,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8170,7 +8170,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8179,7 +8179,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8189,7 +8189,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -8200,7 +8200,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(48)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_P5_SCALEF_NR1FMA_X48, batch_div_48) {
@@ -8208,7 +8208,7 @@
     for (size_t batch_size = 96; batch_size < 480; batch_size += 48) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8217,7 +8217,7 @@
     for (size_t batch_size = 1; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8226,7 +8226,7 @@
     for (size_t batch_size = 49; batch_size < 96; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8236,7 +8236,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -8247,7 +8247,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(64)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_P5_SCALEF_NR1FMA_X64, batch_div_64) {
@@ -8255,7 +8255,7 @@
     for (size_t batch_size = 128; batch_size < 640; batch_size += 64) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8264,7 +8264,7 @@
     for (size_t batch_size = 1; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8273,7 +8273,7 @@
     for (size_t batch_size = 65; batch_size < 128; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8283,7 +8283,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -8294,7 +8294,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(80)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_P5_SCALEF_NR1FMA_X80, batch_div_80) {
@@ -8302,7 +8302,7 @@
     for (size_t batch_size = 160; batch_size < 800; batch_size += 80) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8311,7 +8311,7 @@
     for (size_t batch_size = 1; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8320,7 +8320,7 @@
     for (size_t batch_size = 81; batch_size < 160; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8330,7 +8330,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -8341,7 +8341,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(96)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x96), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x96, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_P5_SCALEF_NR1FMA_X96, batch_div_96) {
@@ -8349,7 +8349,7 @@
     for (size_t batch_size = 192; batch_size < 960; batch_size += 96) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x96), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x96, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8358,7 +8358,7 @@
     for (size_t batch_size = 1; batch_size < 96; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x96), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x96, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8367,7 +8367,7 @@
     for (size_t batch_size = 97; batch_size < 192; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x96), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x96, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8377,7 +8377,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x96), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x96, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -8388,7 +8388,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(112)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x112), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x112, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_P5_SCALEF_NR1FMA_X112, batch_div_112) {
@@ -8396,7 +8396,7 @@
     for (size_t batch_size = 224; batch_size < 1120; batch_size += 112) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x112), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x112, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8405,7 +8405,7 @@
     for (size_t batch_size = 1; batch_size < 112; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x112), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x112, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8414,7 +8414,7 @@
     for (size_t batch_size = 113; batch_size < 224; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x112), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x112, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8424,7 +8424,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x112), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x112, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -8435,7 +8435,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(128)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x128), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x128, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_P5_SCALEF_NR1FMA_X128, batch_div_128) {
@@ -8443,7 +8443,7 @@
     for (size_t batch_size = 256; batch_size < 1280; batch_size += 128) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x128), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x128, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8452,7 +8452,7 @@
     for (size_t batch_size = 1; batch_size < 128; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x128), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x128, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8461,7 +8461,7 @@
     for (size_t batch_size = 129; batch_size < 256; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x128), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x128, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8471,7 +8471,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x128), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_p5_scalef_nr1fma_x128, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -8482,7 +8482,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_LUT16_P3_PERM_SCALEF_DIV_X16, batch_div_16) {
@@ -8490,7 +8490,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8499,7 +8499,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8508,7 +8508,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8518,7 +8518,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -8529,7 +8529,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_LUT16_P3_PERM_SCALEF_DIV_X32, batch_div_32) {
@@ -8537,7 +8537,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8546,7 +8546,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8555,7 +8555,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8565,7 +8565,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -8576,7 +8576,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(48)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_LUT16_P3_PERM_SCALEF_DIV_X48, batch_div_48) {
@@ -8584,7 +8584,7 @@
     for (size_t batch_size = 96; batch_size < 480; batch_size += 48) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8593,7 +8593,7 @@
     for (size_t batch_size = 1; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8602,7 +8602,7 @@
     for (size_t batch_size = 49; batch_size < 96; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8612,7 +8612,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -8623,7 +8623,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(64)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_LUT16_P3_PERM_SCALEF_DIV_X64, batch_div_64) {
@@ -8631,7 +8631,7 @@
     for (size_t batch_size = 128; batch_size < 640; batch_size += 64) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8640,7 +8640,7 @@
     for (size_t batch_size = 1; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8649,7 +8649,7 @@
     for (size_t batch_size = 65; batch_size < 128; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8659,7 +8659,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -8670,7 +8670,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(80)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_LUT16_P3_PERM_SCALEF_DIV_X80, batch_div_80) {
@@ -8678,7 +8678,7 @@
     for (size_t batch_size = 160; batch_size < 800; batch_size += 80) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8687,7 +8687,7 @@
     for (size_t batch_size = 1; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8696,7 +8696,7 @@
     for (size_t batch_size = 81; batch_size < 160; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8706,7 +8706,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -8717,7 +8717,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(96)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x96), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x96, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_LUT16_P3_PERM_SCALEF_DIV_X96, batch_div_96) {
@@ -8725,7 +8725,7 @@
     for (size_t batch_size = 192; batch_size < 960; batch_size += 96) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x96), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x96, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8734,7 +8734,7 @@
     for (size_t batch_size = 1; batch_size < 96; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x96), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x96, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8743,7 +8743,7 @@
     for (size_t batch_size = 97; batch_size < 192; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x96), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x96, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8753,7 +8753,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x96), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x96, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -8764,7 +8764,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(112)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x112), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x112, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_LUT16_P3_PERM_SCALEF_DIV_X112, batch_div_112) {
@@ -8772,7 +8772,7 @@
     for (size_t batch_size = 224; batch_size < 1120; batch_size += 112) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x112), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x112, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8781,7 +8781,7 @@
     for (size_t batch_size = 1; batch_size < 112; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x112), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x112, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8790,7 +8790,7 @@
     for (size_t batch_size = 113; batch_size < 224; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x112), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x112, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8800,7 +8800,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x112), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x112, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -8811,7 +8811,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(128)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x128), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x128, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_LUT16_P3_PERM_SCALEF_DIV_X128, batch_div_128) {
@@ -8819,7 +8819,7 @@
     for (size_t batch_size = 256; batch_size < 1280; batch_size += 128) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x128), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x128, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8828,7 +8828,7 @@
     for (size_t batch_size = 1; batch_size < 128; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x128), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x128, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8837,7 +8837,7 @@
     for (size_t batch_size = 129; batch_size < 256; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x128), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x128, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8847,7 +8847,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x128), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_div_x128, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -8858,7 +8858,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_LUT16_P3_PERM_SCALEF_NR1FMA_X16, batch_div_16) {
@@ -8866,7 +8866,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8875,7 +8875,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8884,7 +8884,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8894,7 +8894,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -8905,7 +8905,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_LUT16_P3_PERM_SCALEF_NR1FMA_X32, batch_div_32) {
@@ -8913,7 +8913,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8922,7 +8922,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8931,7 +8931,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8941,7 +8941,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -8952,7 +8952,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(48)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_LUT16_P3_PERM_SCALEF_NR1FMA_X48, batch_div_48) {
@@ -8960,7 +8960,7 @@
     for (size_t batch_size = 96; batch_size < 480; batch_size += 48) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8969,7 +8969,7 @@
     for (size_t batch_size = 1; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8978,7 +8978,7 @@
     for (size_t batch_size = 49; batch_size < 96; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -8988,7 +8988,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -8999,7 +8999,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(64)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_LUT16_P3_PERM_SCALEF_NR1FMA_X64, batch_div_64) {
@@ -9007,7 +9007,7 @@
     for (size_t batch_size = 128; batch_size < 640; batch_size += 64) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9016,7 +9016,7 @@
     for (size_t batch_size = 1; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9025,7 +9025,7 @@
     for (size_t batch_size = 65; batch_size < 128; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9035,7 +9035,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -9046,7 +9046,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(80)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_LUT16_P3_PERM_SCALEF_NR1FMA_X80, batch_div_80) {
@@ -9054,7 +9054,7 @@
     for (size_t batch_size = 160; batch_size < 800; batch_size += 80) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9063,7 +9063,7 @@
     for (size_t batch_size = 1; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9072,7 +9072,7 @@
     for (size_t batch_size = 81; batch_size < 160; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9082,7 +9082,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -9093,7 +9093,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(96)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x96), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x96, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_LUT16_P3_PERM_SCALEF_NR1FMA_X96, batch_div_96) {
@@ -9101,7 +9101,7 @@
     for (size_t batch_size = 192; batch_size < 960; batch_size += 96) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x96), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x96, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9110,7 +9110,7 @@
     for (size_t batch_size = 1; batch_size < 96; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x96), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x96, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9119,7 +9119,7 @@
     for (size_t batch_size = 97; batch_size < 192; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x96), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x96, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9129,7 +9129,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x96), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x96, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -9140,7 +9140,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(112)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x112), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x112, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_LUT16_P3_PERM_SCALEF_NR1FMA_X112, batch_div_112) {
@@ -9148,7 +9148,7 @@
     for (size_t batch_size = 224; batch_size < 1120; batch_size += 112) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x112), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x112, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9157,7 +9157,7 @@
     for (size_t batch_size = 1; batch_size < 112; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x112), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x112, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9166,7 +9166,7 @@
     for (size_t batch_size = 113; batch_size < 224; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x112), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x112, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9176,7 +9176,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x112), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x112, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -9187,7 +9187,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(128)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x128), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x128, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR1_LUT16_P3_PERM_SCALEF_NR1FMA_X128, batch_div_128) {
@@ -9195,7 +9195,7 @@
     for (size_t batch_size = 256; batch_size < 1280; batch_size += 128) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x128), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x128, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9204,7 +9204,7 @@
     for (size_t batch_size = 1; batch_size < 128; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x128), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x128, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9213,7 +9213,7 @@
     for (size_t batch_size = 129; batch_size < 256; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x128), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x128, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9223,7 +9223,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x128), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr1_lut16_p3_perm_scalef_nr1fma_x128, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -9234,7 +9234,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR2_LUT32_P2_PERM2_SCALEF_DIV_X16, batch_div_16) {
@@ -9242,7 +9242,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9251,7 +9251,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9260,7 +9260,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9270,7 +9270,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -9281,7 +9281,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR2_LUT32_P2_PERM2_SCALEF_DIV_X32, batch_div_32) {
@@ -9289,7 +9289,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9298,7 +9298,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9307,7 +9307,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9317,7 +9317,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -9328,7 +9328,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(48)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR2_LUT32_P2_PERM2_SCALEF_DIV_X48, batch_div_48) {
@@ -9336,7 +9336,7 @@
     for (size_t batch_size = 96; batch_size < 480; batch_size += 48) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9345,7 +9345,7 @@
     for (size_t batch_size = 1; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9354,7 +9354,7 @@
     for (size_t batch_size = 49; batch_size < 96; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9364,7 +9364,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -9375,7 +9375,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(64)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR2_LUT32_P2_PERM2_SCALEF_DIV_X64, batch_div_64) {
@@ -9383,7 +9383,7 @@
     for (size_t batch_size = 128; batch_size < 640; batch_size += 64) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9392,7 +9392,7 @@
     for (size_t batch_size = 1; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9401,7 +9401,7 @@
     for (size_t batch_size = 65; batch_size < 128; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9411,7 +9411,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -9422,7 +9422,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(80)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR2_LUT32_P2_PERM2_SCALEF_DIV_X80, batch_div_80) {
@@ -9430,7 +9430,7 @@
     for (size_t batch_size = 160; batch_size < 800; batch_size += 80) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9439,7 +9439,7 @@
     for (size_t batch_size = 1; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9448,7 +9448,7 @@
     for (size_t batch_size = 81; batch_size < 160; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9458,7 +9458,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -9469,7 +9469,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(96)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x96), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x96, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR2_LUT32_P2_PERM2_SCALEF_DIV_X96, batch_div_96) {
@@ -9477,7 +9477,7 @@
     for (size_t batch_size = 192; batch_size < 960; batch_size += 96) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x96), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x96, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9486,7 +9486,7 @@
     for (size_t batch_size = 1; batch_size < 96; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x96), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x96, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9495,7 +9495,7 @@
     for (size_t batch_size = 97; batch_size < 192; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x96), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x96, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9505,7 +9505,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x96), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x96, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -9516,7 +9516,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(112)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x112), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x112, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR2_LUT32_P2_PERM2_SCALEF_DIV_X112, batch_div_112) {
@@ -9524,7 +9524,7 @@
     for (size_t batch_size = 224; batch_size < 1120; batch_size += 112) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x112), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x112, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9533,7 +9533,7 @@
     for (size_t batch_size = 1; batch_size < 112; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x112), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x112, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9542,7 +9542,7 @@
     for (size_t batch_size = 113; batch_size < 224; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x112), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x112, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9552,7 +9552,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x112), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x112, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -9563,7 +9563,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(128)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x128), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x128, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR2_LUT32_P2_PERM2_SCALEF_DIV_X128, batch_div_128) {
@@ -9571,7 +9571,7 @@
     for (size_t batch_size = 256; batch_size < 1280; batch_size += 128) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x128), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x128, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9580,7 +9580,7 @@
     for (size_t batch_size = 1; batch_size < 128; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x128), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x128, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9589,7 +9589,7 @@
     for (size_t batch_size = 129; batch_size < 256; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x128), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x128, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9599,7 +9599,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x128), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_div_x128, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -9610,7 +9610,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR2_LUT32_P2_PERM2_SCALEF_NR1FMA_X16, batch_div_16) {
@@ -9618,7 +9618,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9627,7 +9627,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9636,7 +9636,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9646,7 +9646,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -9657,7 +9657,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR2_LUT32_P2_PERM2_SCALEF_NR1FMA_X32, batch_div_32) {
@@ -9665,7 +9665,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9674,7 +9674,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9683,7 +9683,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9693,7 +9693,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x32), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x32, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -9704,7 +9704,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(48)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR2_LUT32_P2_PERM2_SCALEF_NR1FMA_X48, batch_div_48) {
@@ -9712,7 +9712,7 @@
     for (size_t batch_size = 96; batch_size < 480; batch_size += 48) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9721,7 +9721,7 @@
     for (size_t batch_size = 1; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9730,7 +9730,7 @@
     for (size_t batch_size = 49; batch_size < 96; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9740,7 +9740,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x48), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x48, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -9751,7 +9751,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(64)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR2_LUT32_P2_PERM2_SCALEF_NR1FMA_X64, batch_div_64) {
@@ -9759,7 +9759,7 @@
     for (size_t batch_size = 128; batch_size < 640; batch_size += 64) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9768,7 +9768,7 @@
     for (size_t batch_size = 1; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9777,7 +9777,7 @@
     for (size_t batch_size = 65; batch_size < 128; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9787,7 +9787,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x64), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x64, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -9798,7 +9798,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(80)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR2_LUT32_P2_PERM2_SCALEF_NR1FMA_X80, batch_div_80) {
@@ -9806,7 +9806,7 @@
     for (size_t batch_size = 160; batch_size < 800; batch_size += 80) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9815,7 +9815,7 @@
     for (size_t batch_size = 1; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9824,7 +9824,7 @@
     for (size_t batch_size = 81; batch_size < 160; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9834,7 +9834,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x80), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x80, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -9845,7 +9845,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(96)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x96), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x96, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR2_LUT32_P2_PERM2_SCALEF_NR1FMA_X96, batch_div_96) {
@@ -9853,7 +9853,7 @@
     for (size_t batch_size = 192; batch_size < 960; batch_size += 96) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x96), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x96, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9862,7 +9862,7 @@
     for (size_t batch_size = 1; batch_size < 96; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x96), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x96, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9871,7 +9871,7 @@
     for (size_t batch_size = 97; batch_size < 192; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x96), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x96, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9881,7 +9881,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x96), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x96, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -9892,7 +9892,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(112)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x112), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x112, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR2_LUT32_P2_PERM2_SCALEF_NR1FMA_X112, batch_div_112) {
@@ -9900,7 +9900,7 @@
     for (size_t batch_size = 224; batch_size < 1120; batch_size += 112) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x112), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x112, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9909,7 +9909,7 @@
     for (size_t batch_size = 1; batch_size < 112; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x112), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x112, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9918,7 +9918,7 @@
     for (size_t batch_size = 113; batch_size < 224; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x112), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x112, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9928,7 +9928,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x112), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x112, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -9939,7 +9939,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(128)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x128), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x128, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__AVX512F_RR2_LUT32_P2_PERM2_SCALEF_NR1FMA_X128, batch_div_128) {
@@ -9947,7 +9947,7 @@
     for (size_t batch_size = 256; batch_size < 1280; batch_size += 128) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x128), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x128, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9956,7 +9956,7 @@
     for (size_t batch_size = 1; batch_size < 128; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x128), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x128, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9965,7 +9965,7 @@
     for (size_t batch_size = 129; batch_size < 256; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x128), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x128, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -9975,7 +9975,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x128), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__avx512f_rr2_lut32_p2_perm2_scalef_nr1fma_x128, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -9985,14 +9985,14 @@
   TEST(F32_VSIGMOID__WASMSIMD_P5_DIV_X4, batch_eq_4) {
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__WASMSIMD_P5_DIV_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10000,7 +10000,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10008,7 +10008,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10017,7 +10017,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -10027,14 +10027,14 @@
   TEST(F32_VSIGMOID__WASMSIMD_P5_DIV_X8, batch_eq_8) {
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__WASMSIMD_P5_DIV_X8, batch_div_8) {
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10042,7 +10042,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10050,7 +10050,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10059,7 +10059,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -10069,14 +10069,14 @@
   TEST(F32_VSIGMOID__WASMSIMD_P5_DIV_X12, batch_eq_12) {
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__WASMSIMD_P5_DIV_X12, batch_div_12) {
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10084,7 +10084,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10092,7 +10092,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10101,7 +10101,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -10111,14 +10111,14 @@
   TEST(F32_VSIGMOID__WASMSIMD_P5_DIV_X16, batch_eq_16) {
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__WASMSIMD_P5_DIV_X16, batch_div_16) {
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10126,7 +10126,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10134,7 +10134,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10143,7 +10143,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -10153,14 +10153,14 @@
   TEST(F32_VSIGMOID__WASMSIMD_P5_DIV_X20, batch_eq_20) {
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__WASMSIMD_P5_DIV_X20, batch_div_20) {
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10168,7 +10168,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10176,7 +10176,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10185,7 +10185,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -10195,14 +10195,14 @@
   TEST(F32_VSIGMOID__WASMSIMD_P5_DIV_X24, batch_eq_24) {
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__WASMSIMD_P5_DIV_X24, batch_div_24) {
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10210,7 +10210,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10218,7 +10218,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10227,7 +10227,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_p5_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -10237,14 +10237,14 @@
   TEST(F32_VSIGMOID__WASMSIMD_LUT64_P2_DIV_X4, batch_eq_4) {
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__WASMSIMD_LUT64_P2_DIV_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10252,7 +10252,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10260,7 +10260,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10269,7 +10269,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -10279,14 +10279,14 @@
   TEST(F32_VSIGMOID__WASMSIMD_LUT64_P2_DIV_X8, batch_eq_8) {
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__WASMSIMD_LUT64_P2_DIV_X8, batch_div_8) {
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10294,7 +10294,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10302,7 +10302,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10311,7 +10311,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x8), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x8, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -10321,14 +10321,14 @@
   TEST(F32_VSIGMOID__WASMSIMD_LUT64_P2_DIV_X12, batch_eq_12) {
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__WASMSIMD_LUT64_P2_DIV_X12, batch_div_12) {
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10336,7 +10336,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10344,7 +10344,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10353,7 +10353,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x12), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x12, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -10363,14 +10363,14 @@
   TEST(F32_VSIGMOID__WASMSIMD_LUT64_P2_DIV_X16, batch_eq_16) {
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__WASMSIMD_LUT64_P2_DIV_X16, batch_div_16) {
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10378,7 +10378,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10386,7 +10386,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10395,7 +10395,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x16), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x16, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -10405,14 +10405,14 @@
   TEST(F32_VSIGMOID__WASMSIMD_LUT64_P2_DIV_X20, batch_eq_20) {
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__WASMSIMD_LUT64_P2_DIV_X20, batch_div_20) {
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10420,7 +10420,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10428,7 +10428,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10437,7 +10437,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x20), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x20, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -10447,14 +10447,14 @@
   TEST(F32_VSIGMOID__WASMSIMD_LUT64_P2_DIV_X24, batch_eq_24) {
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+      .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
   }
 
   TEST(F32_VSIGMOID__WASMSIMD_LUT64_P2_DIV_X24, batch_div_24) {
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10462,7 +10462,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10470,7 +10470,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 
@@ -10479,7 +10479,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x24), VUnaryMicrokernelTester::OpType::Sigmoid);
+        .Test(xnn_f32_vsigmoid_ukernel__wasmsimd_lut64_p2_div_x24, VUnaryMicrokernelTester::OpType::Sigmoid);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -10488,14 +10488,14 @@
 TEST(F32_VSIGMOID__SCALAR_LUT2048_P1_DIV_X1, batch_eq_1) {
   VUnaryMicrokernelTester()
     .batch_size(1)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_lut2048_p1_div_x1), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vsigmoid_ukernel__scalar_lut2048_p1_div_x1, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VSIGMOID__SCALAR_LUT2048_P1_DIV_X1, batch_gt_1) {
   for (size_t batch_size = 2; batch_size < 10; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_lut2048_p1_div_x1), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsigmoid_ukernel__scalar_lut2048_p1_div_x1, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -10504,7 +10504,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_lut2048_p1_div_x1), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsigmoid_ukernel__scalar_lut2048_p1_div_x1, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -10512,14 +10512,14 @@
 TEST(F32_VSIGMOID__SCALAR_LUT2048_P1_DIV_X2, batch_eq_2) {
   VUnaryMicrokernelTester()
     .batch_size(2)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_lut2048_p1_div_x2), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vsigmoid_ukernel__scalar_lut2048_p1_div_x2, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VSIGMOID__SCALAR_LUT2048_P1_DIV_X2, batch_div_2) {
   for (size_t batch_size = 4; batch_size < 20; batch_size += 2) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_lut2048_p1_div_x2), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsigmoid_ukernel__scalar_lut2048_p1_div_x2, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -10527,7 +10527,7 @@
   for (size_t batch_size = 1; batch_size < 2; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_lut2048_p1_div_x2), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsigmoid_ukernel__scalar_lut2048_p1_div_x2, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -10535,7 +10535,7 @@
   for (size_t batch_size = 3; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_lut2048_p1_div_x2), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsigmoid_ukernel__scalar_lut2048_p1_div_x2, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -10544,7 +10544,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_lut2048_p1_div_x2), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsigmoid_ukernel__scalar_lut2048_p1_div_x2, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -10552,14 +10552,14 @@
 TEST(F32_VSIGMOID__SCALAR_LUT2048_P1_DIV_X4, batch_eq_4) {
   VUnaryMicrokernelTester()
     .batch_size(4)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_lut2048_p1_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vsigmoid_ukernel__scalar_lut2048_p1_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VSIGMOID__SCALAR_LUT2048_P1_DIV_X4, batch_div_4) {
   for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_lut2048_p1_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsigmoid_ukernel__scalar_lut2048_p1_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -10567,7 +10567,7 @@
   for (size_t batch_size = 1; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_lut2048_p1_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsigmoid_ukernel__scalar_lut2048_p1_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -10575,7 +10575,7 @@
   for (size_t batch_size = 5; batch_size < 8; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_lut2048_p1_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsigmoid_ukernel__scalar_lut2048_p1_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -10584,7 +10584,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_lut2048_p1_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsigmoid_ukernel__scalar_lut2048_p1_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -10592,14 +10592,14 @@
 TEST(F32_VSIGMOID__SCALAR_LUT64_P2_DIV_X1, batch_eq_1) {
   VUnaryMicrokernelTester()
     .batch_size(1)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_lut64_p2_div_x1), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vsigmoid_ukernel__scalar_lut64_p2_div_x1, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VSIGMOID__SCALAR_LUT64_P2_DIV_X1, batch_gt_1) {
   for (size_t batch_size = 2; batch_size < 10; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_lut64_p2_div_x1), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsigmoid_ukernel__scalar_lut64_p2_div_x1, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -10608,7 +10608,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_lut64_p2_div_x1), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsigmoid_ukernel__scalar_lut64_p2_div_x1, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -10616,14 +10616,14 @@
 TEST(F32_VSIGMOID__SCALAR_LUT64_P2_DIV_X2, batch_eq_2) {
   VUnaryMicrokernelTester()
     .batch_size(2)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_lut64_p2_div_x2), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vsigmoid_ukernel__scalar_lut64_p2_div_x2, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VSIGMOID__SCALAR_LUT64_P2_DIV_X2, batch_div_2) {
   for (size_t batch_size = 4; batch_size < 20; batch_size += 2) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_lut64_p2_div_x2), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsigmoid_ukernel__scalar_lut64_p2_div_x2, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -10631,7 +10631,7 @@
   for (size_t batch_size = 1; batch_size < 2; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_lut64_p2_div_x2), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsigmoid_ukernel__scalar_lut64_p2_div_x2, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -10639,7 +10639,7 @@
   for (size_t batch_size = 3; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_lut64_p2_div_x2), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsigmoid_ukernel__scalar_lut64_p2_div_x2, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -10648,7 +10648,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_lut64_p2_div_x2), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsigmoid_ukernel__scalar_lut64_p2_div_x2, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -10656,14 +10656,14 @@
 TEST(F32_VSIGMOID__SCALAR_LUT64_P2_DIV_X4, batch_eq_4) {
   VUnaryMicrokernelTester()
     .batch_size(4)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_lut64_p2_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vsigmoid_ukernel__scalar_lut64_p2_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VSIGMOID__SCALAR_LUT64_P2_DIV_X4, batch_div_4) {
   for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_lut64_p2_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsigmoid_ukernel__scalar_lut64_p2_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -10671,7 +10671,7 @@
   for (size_t batch_size = 1; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_lut64_p2_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsigmoid_ukernel__scalar_lut64_p2_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -10679,7 +10679,7 @@
   for (size_t batch_size = 5; batch_size < 8; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_lut64_p2_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsigmoid_ukernel__scalar_lut64_p2_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -10688,7 +10688,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_lut64_p2_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsigmoid_ukernel__scalar_lut64_p2_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -10696,14 +10696,14 @@
 TEST(F32_VSIGMOID__SCALAR_P5_DIV_X1, batch_eq_1) {
   VUnaryMicrokernelTester()
     .batch_size(1)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_p5_div_x1), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vsigmoid_ukernel__scalar_p5_div_x1, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VSIGMOID__SCALAR_P5_DIV_X1, batch_gt_1) {
   for (size_t batch_size = 2; batch_size < 10; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_p5_div_x1), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsigmoid_ukernel__scalar_p5_div_x1, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -10712,7 +10712,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_p5_div_x1), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsigmoid_ukernel__scalar_p5_div_x1, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -10720,14 +10720,14 @@
 TEST(F32_VSIGMOID__SCALAR_P5_DIV_X2, batch_eq_2) {
   VUnaryMicrokernelTester()
     .batch_size(2)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_p5_div_x2), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vsigmoid_ukernel__scalar_p5_div_x2, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VSIGMOID__SCALAR_P5_DIV_X2, batch_div_2) {
   for (size_t batch_size = 4; batch_size < 20; batch_size += 2) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_p5_div_x2), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsigmoid_ukernel__scalar_p5_div_x2, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -10735,7 +10735,7 @@
   for (size_t batch_size = 1; batch_size < 2; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_p5_div_x2), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsigmoid_ukernel__scalar_p5_div_x2, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -10743,7 +10743,7 @@
   for (size_t batch_size = 3; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_p5_div_x2), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsigmoid_ukernel__scalar_p5_div_x2, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -10752,7 +10752,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_p5_div_x2), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsigmoid_ukernel__scalar_p5_div_x2, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -10760,14 +10760,14 @@
 TEST(F32_VSIGMOID__SCALAR_P5_DIV_X4, batch_eq_4) {
   VUnaryMicrokernelTester()
     .batch_size(4)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_p5_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vsigmoid_ukernel__scalar_p5_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VSIGMOID__SCALAR_P5_DIV_X4, batch_div_4) {
   for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_p5_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsigmoid_ukernel__scalar_p5_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -10775,7 +10775,7 @@
   for (size_t batch_size = 1; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_p5_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsigmoid_ukernel__scalar_p5_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -10783,7 +10783,7 @@
   for (size_t batch_size = 5; batch_size < 8; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_p5_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsigmoid_ukernel__scalar_p5_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -10792,6 +10792,6 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsigmoid_ukernel__scalar_p5_div_x4), VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsigmoid_ukernel__scalar_p5_div_x4, VUnaryMicrokernelTester::OpType::Sigmoid, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
diff --git a/test/f32-vsqr.cc b/test/f32-vsqr.cc
index d5dc704..5ed0864 100644
--- a/test/f32-vsqr.cc
+++ b/test/f32-vsqr.cc
@@ -22,7 +22,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::Square);
+      .Test(xnn_f32_vsqr_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::Square);
   }
 
   TEST(F32_VSQR__NEON_X4, batch_div_4) {
@@ -30,7 +30,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 
@@ -39,7 +39,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 
@@ -48,7 +48,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 
@@ -58,7 +58,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__neon_x4), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__neon_x4, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -69,7 +69,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::Square);
+      .Test(xnn_f32_vsqr_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::Square);
   }
 
   TEST(F32_VSQR__NEON_X8, batch_div_8) {
@@ -77,7 +77,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 
@@ -86,7 +86,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 
@@ -95,7 +95,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 
@@ -105,7 +105,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__neon_x8), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__neon_x8, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -116,7 +116,7 @@
     TEST_REQUIRES_X86_SSE;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::Square);
+      .Test(xnn_f32_vsqr_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::Square);
   }
 
   TEST(F32_VSQR__SSE_X4, batch_div_4) {
@@ -124,7 +124,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 
@@ -133,7 +133,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 
@@ -142,7 +142,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 
@@ -152,7 +152,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__sse_x4), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__sse_x4, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -163,7 +163,7 @@
     TEST_REQUIRES_X86_SSE;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::Square);
+      .Test(xnn_f32_vsqr_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::Square);
   }
 
   TEST(F32_VSQR__SSE_X8, batch_div_8) {
@@ -171,7 +171,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 
@@ -180,7 +180,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 
@@ -189,7 +189,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 
@@ -199,7 +199,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__sse_x8), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__sse_x8, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -210,7 +210,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::Square);
+      .Test(xnn_f32_vsqr_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::Square);
   }
 
   TEST(F32_VSQR__AVX_X8, batch_div_8) {
@@ -218,7 +218,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 
@@ -227,7 +227,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 
@@ -236,7 +236,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 
@@ -246,7 +246,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__avx_x8), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__avx_x8, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -257,7 +257,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::Square);
+      .Test(xnn_f32_vsqr_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::Square);
   }
 
   TEST(F32_VSQR__AVX_X16, batch_div_16) {
@@ -265,7 +265,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 
@@ -274,7 +274,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 
@@ -283,7 +283,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 
@@ -293,7 +293,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__avx_x16), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__avx_x16, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -304,7 +304,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::Square);
+      .Test(xnn_f32_vsqr_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::Square);
   }
 
   TEST(F32_VSQR__AVX512F_X16, batch_div_16) {
@@ -312,7 +312,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 
@@ -321,7 +321,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 
@@ -330,7 +330,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 
@@ -340,7 +340,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__avx512f_x16), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__avx512f_x16, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -351,7 +351,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::Square);
+      .Test(xnn_f32_vsqr_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::Square);
   }
 
   TEST(F32_VSQR__AVX512F_X32, batch_div_32) {
@@ -359,7 +359,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 
@@ -368,7 +368,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 
@@ -377,7 +377,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 
@@ -387,7 +387,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__avx512f_x32), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__avx512f_x32, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -397,14 +397,14 @@
   TEST(F32_VSQR__WASMSIMD_X4, batch_eq_4) {
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__wasmsimd_x4), VUnaryMicrokernelTester::OpType::Square);
+      .Test(xnn_f32_vsqr_ukernel__wasmsimd_x4, VUnaryMicrokernelTester::OpType::Square);
   }
 
   TEST(F32_VSQR__WASMSIMD_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__wasmsimd_x4), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__wasmsimd_x4, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 
@@ -412,7 +412,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__wasmsimd_x4), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__wasmsimd_x4, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 
@@ -420,7 +420,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__wasmsimd_x4), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__wasmsimd_x4, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 
@@ -429,7 +429,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__wasmsimd_x4), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__wasmsimd_x4, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -439,14 +439,14 @@
   TEST(F32_VSQR__WASMSIMD_X8, batch_eq_8) {
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__wasmsimd_x8), VUnaryMicrokernelTester::OpType::Square);
+      .Test(xnn_f32_vsqr_ukernel__wasmsimd_x8, VUnaryMicrokernelTester::OpType::Square);
   }
 
   TEST(F32_VSQR__WASMSIMD_X8, batch_div_8) {
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__wasmsimd_x8), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__wasmsimd_x8, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 
@@ -454,7 +454,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__wasmsimd_x8), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__wasmsimd_x8, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 
@@ -462,7 +462,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__wasmsimd_x8), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__wasmsimd_x8, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 
@@ -471,7 +471,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__wasmsimd_x8), VUnaryMicrokernelTester::OpType::Square);
+        .Test(xnn_f32_vsqr_ukernel__wasmsimd_x8, VUnaryMicrokernelTester::OpType::Square);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -480,14 +480,14 @@
 TEST(F32_VSQR__SCALAR_X1, batch_eq_1) {
   VUnaryMicrokernelTester()
     .batch_size(1)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__scalar_x1), VUnaryMicrokernelTester::OpType::Square, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vsqr_ukernel__scalar_x1, VUnaryMicrokernelTester::OpType::Square, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VSQR__SCALAR_X1, batch_gt_1) {
   for (size_t batch_size = 2; batch_size < 10; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__scalar_x1), VUnaryMicrokernelTester::OpType::Square, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsqr_ukernel__scalar_x1, VUnaryMicrokernelTester::OpType::Square, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -496,7 +496,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__scalar_x1), VUnaryMicrokernelTester::OpType::Square, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsqr_ukernel__scalar_x1, VUnaryMicrokernelTester::OpType::Square, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -504,14 +504,14 @@
 TEST(F32_VSQR__SCALAR_X2, batch_eq_2) {
   VUnaryMicrokernelTester()
     .batch_size(2)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::Square, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vsqr_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::Square, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VSQR__SCALAR_X2, batch_div_2) {
   for (size_t batch_size = 4; batch_size < 20; batch_size += 2) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::Square, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsqr_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::Square, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -519,7 +519,7 @@
   for (size_t batch_size = 1; batch_size < 2; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::Square, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsqr_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::Square, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -527,7 +527,7 @@
   for (size_t batch_size = 3; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::Square, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsqr_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::Square, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -536,7 +536,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__scalar_x2), VUnaryMicrokernelTester::OpType::Square, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsqr_ukernel__scalar_x2, VUnaryMicrokernelTester::OpType::Square, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -544,14 +544,14 @@
 TEST(F32_VSQR__SCALAR_X4, batch_eq_4) {
   VUnaryMicrokernelTester()
     .batch_size(4)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::Square, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vsqr_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::Square, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VSQR__SCALAR_X4, batch_div_4) {
   for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::Square, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsqr_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::Square, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -559,7 +559,7 @@
   for (size_t batch_size = 1; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::Square, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsqr_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::Square, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -567,7 +567,7 @@
   for (size_t batch_size = 5; batch_size < 8; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::Square, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsqr_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::Square, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -576,6 +576,6 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqr_ukernel__scalar_x4), VUnaryMicrokernelTester::OpType::Square, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsqr_ukernel__scalar_x4, VUnaryMicrokernelTester::OpType::Square, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
diff --git a/test/f32-vsqrt.cc b/test/f32-vsqrt.cc
index 23f1366..ae9ef8e 100644
--- a/test/f32-vsqrt.cc
+++ b/test/f32-vsqrt.cc
@@ -22,7 +22,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neon_sqrt_x4), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__neon_sqrt_x4, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__NEON_SQRT_X4, batch_div_4) {
@@ -30,7 +30,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neon_sqrt_x4), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neon_sqrt_x4, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -39,7 +39,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neon_sqrt_x4), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neon_sqrt_x4, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -48,7 +48,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neon_sqrt_x4), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neon_sqrt_x4, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -58,7 +58,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neon_sqrt_x4), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neon_sqrt_x4, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_ARM64
@@ -69,7 +69,7 @@
     TEST_REQUIRES_ARM_NEON;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neon_sqrt_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__neon_sqrt_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__NEON_SQRT_X8, batch_div_8) {
@@ -77,7 +77,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neon_sqrt_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neon_sqrt_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -86,7 +86,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neon_sqrt_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neon_sqrt_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -95,7 +95,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neon_sqrt_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neon_sqrt_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -105,7 +105,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neon_sqrt_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neon_sqrt_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_ARM64
@@ -116,7 +116,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x4), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x4, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__NEONFMA_NR1RSQRTS1FMA1ADJ_X4, batch_div_4) {
@@ -124,7 +124,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x4), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x4, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -133,7 +133,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x4), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x4, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -142,7 +142,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x4), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x4, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -152,7 +152,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x4), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x4, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -163,7 +163,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__NEONFMA_NR1RSQRTS1FMA1ADJ_X8, batch_div_8) {
@@ -171,7 +171,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -180,7 +180,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -189,7 +189,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -199,7 +199,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -210,7 +210,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x12), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x12, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__NEONFMA_NR1RSQRTS1FMA1ADJ_X12, batch_div_12) {
@@ -218,7 +218,7 @@
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x12), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x12, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -227,7 +227,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x12), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x12, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -236,7 +236,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x12), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x12, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -246,7 +246,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x12), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x12, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -257,7 +257,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x16), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x16, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__NEONFMA_NR1RSQRTS1FMA1ADJ_X16, batch_div_16) {
@@ -265,7 +265,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x16), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x16, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -274,7 +274,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x16), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x16, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -283,7 +283,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x16), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x16, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -293,7 +293,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x16), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x16, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -304,7 +304,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x20), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x20, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__NEONFMA_NR1RSQRTS1FMA1ADJ_X20, batch_div_20) {
@@ -312,7 +312,7 @@
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x20), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x20, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -321,7 +321,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x20), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x20, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -330,7 +330,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x20), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x20, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -340,7 +340,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x20), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x20, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -351,7 +351,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x24), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x24, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__NEONFMA_NR1RSQRTS1FMA1ADJ_X24, batch_div_24) {
@@ -359,7 +359,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x24), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x24, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -368,7 +368,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x24), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x24, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -377,7 +377,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x24), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x24, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -387,7 +387,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x24), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x24, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -398,7 +398,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(28)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x28), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x28, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__NEONFMA_NR1RSQRTS1FMA1ADJ_X28, batch_div_28) {
@@ -406,7 +406,7 @@
     for (size_t batch_size = 56; batch_size < 280; batch_size += 28) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x28), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x28, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -415,7 +415,7 @@
     for (size_t batch_size = 1; batch_size < 28; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x28), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x28, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -424,7 +424,7 @@
     for (size_t batch_size = 29; batch_size < 56; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x28), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x28, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -434,7 +434,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x28), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x28, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -445,7 +445,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x32), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x32, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__NEONFMA_NR1RSQRTS1FMA1ADJ_X32, batch_div_32) {
@@ -453,7 +453,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x32), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x32, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -462,7 +462,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x32), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x32, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -471,7 +471,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x32), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x32, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -481,7 +481,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x32), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x32, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -492,7 +492,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(36)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x36), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x36, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__NEONFMA_NR1RSQRTS1FMA1ADJ_X36, batch_div_36) {
@@ -500,7 +500,7 @@
     for (size_t batch_size = 72; batch_size < 360; batch_size += 36) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x36), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x36, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -509,7 +509,7 @@
     for (size_t batch_size = 1; batch_size < 36; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x36), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x36, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -518,7 +518,7 @@
     for (size_t batch_size = 37; batch_size < 72; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x36), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x36, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -528,7 +528,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x36), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x36, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -539,7 +539,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(40)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x40), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x40, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__NEONFMA_NR1RSQRTS1FMA1ADJ_X40, batch_div_40) {
@@ -547,7 +547,7 @@
     for (size_t batch_size = 80; batch_size < 400; batch_size += 40) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x40), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x40, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -556,7 +556,7 @@
     for (size_t batch_size = 1; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x40), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x40, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -565,7 +565,7 @@
     for (size_t batch_size = 41; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x40), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x40, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -575,7 +575,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x40), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr1rsqrts1fma1adj_x40, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -586,7 +586,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x4), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x4, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__NEONFMA_NR2FMA1ADJ_X4, batch_div_4) {
@@ -594,7 +594,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x4), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x4, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -603,7 +603,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x4), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x4, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -612,7 +612,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x4), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x4, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -622,7 +622,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x4), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x4, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -633,7 +633,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__NEONFMA_NR2FMA1ADJ_X8, batch_div_8) {
@@ -641,7 +641,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -650,7 +650,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -659,7 +659,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -669,7 +669,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -680,7 +680,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(12)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x12), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x12, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__NEONFMA_NR2FMA1ADJ_X12, batch_div_12) {
@@ -688,7 +688,7 @@
     for (size_t batch_size = 24; batch_size < 120; batch_size += 12) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x12), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x12, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -697,7 +697,7 @@
     for (size_t batch_size = 1; batch_size < 12; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x12), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x12, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -706,7 +706,7 @@
     for (size_t batch_size = 13; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x12), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x12, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -716,7 +716,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x12), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x12, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -727,7 +727,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x16), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x16, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__NEONFMA_NR2FMA1ADJ_X16, batch_div_16) {
@@ -735,7 +735,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x16), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x16, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -744,7 +744,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x16), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x16, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -753,7 +753,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x16), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x16, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -763,7 +763,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x16), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x16, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -774,7 +774,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(20)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x20), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x20, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__NEONFMA_NR2FMA1ADJ_X20, batch_div_20) {
@@ -782,7 +782,7 @@
     for (size_t batch_size = 40; batch_size < 200; batch_size += 20) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x20), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x20, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -791,7 +791,7 @@
     for (size_t batch_size = 1; batch_size < 20; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x20), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x20, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -800,7 +800,7 @@
     for (size_t batch_size = 21; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x20), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x20, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -810,7 +810,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x20), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x20, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -821,7 +821,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x24), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x24, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__NEONFMA_NR2FMA1ADJ_X24, batch_div_24) {
@@ -829,7 +829,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x24), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x24, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -838,7 +838,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x24), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x24, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -847,7 +847,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x24), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x24, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -857,7 +857,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x24), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x24, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -868,7 +868,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(28)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x28), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x28, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__NEONFMA_NR2FMA1ADJ_X28, batch_div_28) {
@@ -876,7 +876,7 @@
     for (size_t batch_size = 56; batch_size < 280; batch_size += 28) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x28), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x28, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -885,7 +885,7 @@
     for (size_t batch_size = 1; batch_size < 28; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x28), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x28, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -894,7 +894,7 @@
     for (size_t batch_size = 29; batch_size < 56; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x28), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x28, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -904,7 +904,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x28), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x28, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -915,7 +915,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x32), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x32, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__NEONFMA_NR2FMA1ADJ_X32, batch_div_32) {
@@ -923,7 +923,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x32), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x32, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -932,7 +932,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x32), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x32, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -941,7 +941,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x32), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x32, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -951,7 +951,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x32), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x32, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -962,7 +962,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(36)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x36), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x36, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__NEONFMA_NR2FMA1ADJ_X36, batch_div_36) {
@@ -970,7 +970,7 @@
     for (size_t batch_size = 72; batch_size < 360; batch_size += 36) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x36), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x36, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -979,7 +979,7 @@
     for (size_t batch_size = 1; batch_size < 36; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x36), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x36, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -988,7 +988,7 @@
     for (size_t batch_size = 37; batch_size < 72; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x36), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x36, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -998,7 +998,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x36), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x36, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -1009,7 +1009,7 @@
     TEST_REQUIRES_ARM_NEON_FMA;
     VUnaryMicrokernelTester()
       .batch_size(40)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x40), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x40, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__NEONFMA_NR2FMA1ADJ_X40, batch_div_40) {
@@ -1017,7 +1017,7 @@
     for (size_t batch_size = 80; batch_size < 400; batch_size += 40) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x40), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x40, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1026,7 +1026,7 @@
     for (size_t batch_size = 1; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x40), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x40, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1035,7 +1035,7 @@
     for (size_t batch_size = 41; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x40), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x40, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1045,7 +1045,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x40), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__neonfma_nr2fma1adj_x40, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
@@ -1056,7 +1056,7 @@
     TEST_REQUIRES_X86_SSE;
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__sse_sqrt_x4), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__sse_sqrt_x4, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__SSE_SQRT_X4, batch_div_4) {
@@ -1064,7 +1064,7 @@
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__sse_sqrt_x4), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__sse_sqrt_x4, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1073,7 +1073,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__sse_sqrt_x4), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__sse_sqrt_x4, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1082,7 +1082,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__sse_sqrt_x4), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__sse_sqrt_x4, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1092,7 +1092,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__sse_sqrt_x4), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__sse_sqrt_x4, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -1103,7 +1103,7 @@
     TEST_REQUIRES_X86_SSE;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__sse_sqrt_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__sse_sqrt_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__SSE_SQRT_X8, batch_div_8) {
@@ -1111,7 +1111,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__sse_sqrt_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__sse_sqrt_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1120,7 +1120,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__sse_sqrt_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__sse_sqrt_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1129,7 +1129,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__sse_sqrt_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__sse_sqrt_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1139,7 +1139,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__sse_sqrt_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__sse_sqrt_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -1150,7 +1150,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx_sqrt_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__avx_sqrt_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__AVX_SQRT_X8, batch_div_8) {
@@ -1158,7 +1158,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx_sqrt_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx_sqrt_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1167,7 +1167,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx_sqrt_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx_sqrt_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1176,7 +1176,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx_sqrt_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx_sqrt_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1186,7 +1186,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx_sqrt_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx_sqrt_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -1197,7 +1197,7 @@
     TEST_REQUIRES_X86_AVX;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx_sqrt_x16), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__avx_sqrt_x16, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__AVX_SQRT_X16, batch_div_16) {
@@ -1205,7 +1205,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx_sqrt_x16), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx_sqrt_x16, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1214,7 +1214,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx_sqrt_x16), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx_sqrt_x16, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1223,7 +1223,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx_sqrt_x16), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx_sqrt_x16, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1233,7 +1233,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx_sqrt_x16), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx_sqrt_x16, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -1244,7 +1244,7 @@
     TEST_REQUIRES_X86_FMA3;
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__FMA3_NR1FMA1ADJ_X8, batch_div_8) {
@@ -1252,7 +1252,7 @@
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1261,7 +1261,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1270,7 +1270,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1280,7 +1280,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -1291,7 +1291,7 @@
     TEST_REQUIRES_X86_FMA3;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x16), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x16, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__FMA3_NR1FMA1ADJ_X16, batch_div_16) {
@@ -1299,7 +1299,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x16), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x16, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1308,7 +1308,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x16), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x16, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1317,7 +1317,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x16), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x16, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1327,7 +1327,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x16), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x16, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -1338,7 +1338,7 @@
     TEST_REQUIRES_X86_FMA3;
     VUnaryMicrokernelTester()
       .batch_size(24)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x24), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x24, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__FMA3_NR1FMA1ADJ_X24, batch_div_24) {
@@ -1346,7 +1346,7 @@
     for (size_t batch_size = 48; batch_size < 240; batch_size += 24) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x24), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x24, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1355,7 +1355,7 @@
     for (size_t batch_size = 1; batch_size < 24; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x24), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x24, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1364,7 +1364,7 @@
     for (size_t batch_size = 25; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x24), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x24, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1374,7 +1374,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x24), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x24, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -1385,7 +1385,7 @@
     TEST_REQUIRES_X86_FMA3;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x32), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x32, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__FMA3_NR1FMA1ADJ_X32, batch_div_32) {
@@ -1393,7 +1393,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x32), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x32, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1402,7 +1402,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x32), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x32, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1411,7 +1411,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x32), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x32, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1421,7 +1421,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x32), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x32, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -1432,7 +1432,7 @@
     TEST_REQUIRES_X86_FMA3;
     VUnaryMicrokernelTester()
       .batch_size(40)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x40), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x40, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__FMA3_NR1FMA1ADJ_X40, batch_div_40) {
@@ -1440,7 +1440,7 @@
     for (size_t batch_size = 80; batch_size < 400; batch_size += 40) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x40), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x40, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1449,7 +1449,7 @@
     for (size_t batch_size = 1; batch_size < 40; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x40), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x40, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1458,7 +1458,7 @@
     for (size_t batch_size = 41; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x40), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x40, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1468,7 +1468,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x40), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x40, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -1479,7 +1479,7 @@
     TEST_REQUIRES_X86_FMA3;
     VUnaryMicrokernelTester()
       .batch_size(48)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x48), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x48, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__FMA3_NR1FMA1ADJ_X48, batch_div_48) {
@@ -1487,7 +1487,7 @@
     for (size_t batch_size = 96; batch_size < 480; batch_size += 48) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x48), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x48, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1496,7 +1496,7 @@
     for (size_t batch_size = 1; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x48), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x48, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1505,7 +1505,7 @@
     for (size_t batch_size = 49; batch_size < 96; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x48), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x48, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1515,7 +1515,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x48), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x48, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -1526,7 +1526,7 @@
     TEST_REQUIRES_X86_FMA3;
     VUnaryMicrokernelTester()
       .batch_size(56)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x56), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x56, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__FMA3_NR1FMA1ADJ_X56, batch_div_56) {
@@ -1534,7 +1534,7 @@
     for (size_t batch_size = 112; batch_size < 560; batch_size += 56) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x56), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x56, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1543,7 +1543,7 @@
     for (size_t batch_size = 1; batch_size < 56; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x56), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x56, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1552,7 +1552,7 @@
     for (size_t batch_size = 57; batch_size < 112; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x56), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x56, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1562,7 +1562,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x56), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x56, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -1573,7 +1573,7 @@
     TEST_REQUIRES_X86_FMA3;
     VUnaryMicrokernelTester()
       .batch_size(64)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x64), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x64, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__FMA3_NR1FMA1ADJ_X64, batch_div_64) {
@@ -1581,7 +1581,7 @@
     for (size_t batch_size = 128; batch_size < 640; batch_size += 64) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x64), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x64, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1590,7 +1590,7 @@
     for (size_t batch_size = 1; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x64), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x64, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1599,7 +1599,7 @@
     for (size_t batch_size = 65; batch_size < 128; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x64), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x64, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1609,7 +1609,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x64), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__fma3_nr1fma1adj_x64, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -1620,7 +1620,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x16), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x16, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__AVX512F_NR1FMA1ADJ_X16, batch_div_16) {
@@ -1628,7 +1628,7 @@
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x16), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x16, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1637,7 +1637,7 @@
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x16), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x16, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1646,7 +1646,7 @@
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x16), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x16, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1656,7 +1656,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x16), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x16, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -1667,7 +1667,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(32)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x32), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x32, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__AVX512F_NR1FMA1ADJ_X32, batch_div_32) {
@@ -1675,7 +1675,7 @@
     for (size_t batch_size = 64; batch_size < 320; batch_size += 32) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x32), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x32, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1684,7 +1684,7 @@
     for (size_t batch_size = 1; batch_size < 32; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x32), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x32, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1693,7 +1693,7 @@
     for (size_t batch_size = 33; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x32), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x32, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1703,7 +1703,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x32), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x32, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -1714,7 +1714,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(48)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x48), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x48, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__AVX512F_NR1FMA1ADJ_X48, batch_div_48) {
@@ -1722,7 +1722,7 @@
     for (size_t batch_size = 96; batch_size < 480; batch_size += 48) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x48), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x48, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1731,7 +1731,7 @@
     for (size_t batch_size = 1; batch_size < 48; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x48), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x48, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1740,7 +1740,7 @@
     for (size_t batch_size = 49; batch_size < 96; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x48), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x48, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1750,7 +1750,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x48), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x48, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -1761,7 +1761,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(64)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x64), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x64, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__AVX512F_NR1FMA1ADJ_X64, batch_div_64) {
@@ -1769,7 +1769,7 @@
     for (size_t batch_size = 128; batch_size < 640; batch_size += 64) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x64), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x64, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1778,7 +1778,7 @@
     for (size_t batch_size = 1; batch_size < 64; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x64), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x64, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1787,7 +1787,7 @@
     for (size_t batch_size = 65; batch_size < 128; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x64), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x64, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1797,7 +1797,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x64), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x64, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -1808,7 +1808,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(80)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x80), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x80, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__AVX512F_NR1FMA1ADJ_X80, batch_div_80) {
@@ -1816,7 +1816,7 @@
     for (size_t batch_size = 160; batch_size < 800; batch_size += 80) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x80), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x80, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1825,7 +1825,7 @@
     for (size_t batch_size = 1; batch_size < 80; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x80), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x80, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1834,7 +1834,7 @@
     for (size_t batch_size = 81; batch_size < 160; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x80), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x80, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1844,7 +1844,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x80), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x80, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -1855,7 +1855,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(96)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x96), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x96, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__AVX512F_NR1FMA1ADJ_X96, batch_div_96) {
@@ -1863,7 +1863,7 @@
     for (size_t batch_size = 192; batch_size < 960; batch_size += 96) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x96), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x96, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1872,7 +1872,7 @@
     for (size_t batch_size = 1; batch_size < 96; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x96), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x96, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1881,7 +1881,7 @@
     for (size_t batch_size = 97; batch_size < 192; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x96), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x96, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1891,7 +1891,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x96), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x96, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -1902,7 +1902,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(112)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x112), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x112, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__AVX512F_NR1FMA1ADJ_X112, batch_div_112) {
@@ -1910,7 +1910,7 @@
     for (size_t batch_size = 224; batch_size < 1120; batch_size += 112) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x112), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x112, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1919,7 +1919,7 @@
     for (size_t batch_size = 1; batch_size < 112; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x112), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x112, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1928,7 +1928,7 @@
     for (size_t batch_size = 113; batch_size < 224; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x112), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x112, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1938,7 +1938,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x112), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x112, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -1949,7 +1949,7 @@
     TEST_REQUIRES_X86_AVX512F;
     VUnaryMicrokernelTester()
       .batch_size(128)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x128), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x128, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__AVX512F_NR1FMA1ADJ_X128, batch_div_128) {
@@ -1957,7 +1957,7 @@
     for (size_t batch_size = 256; batch_size < 1280; batch_size += 128) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x128), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x128, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1966,7 +1966,7 @@
     for (size_t batch_size = 1; batch_size < 128; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x128), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x128, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1975,7 +1975,7 @@
     for (size_t batch_size = 129; batch_size < 256; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x128), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x128, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -1985,7 +1985,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x128), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__avx512f_nr1fma1adj_x128, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -1995,14 +1995,14 @@
   TEST(F32_VSQRT__WASMSIMD_SQRT_X4, batch_eq_4) {
     VUnaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__wasmsimd_sqrt_x4), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__wasmsimd_sqrt_x4, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__WASMSIMD_SQRT_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__wasmsimd_sqrt_x4), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__wasmsimd_sqrt_x4, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -2010,7 +2010,7 @@
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__wasmsimd_sqrt_x4), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__wasmsimd_sqrt_x4, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -2018,7 +2018,7 @@
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__wasmsimd_sqrt_x4), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__wasmsimd_sqrt_x4, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -2027,7 +2027,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__wasmsimd_sqrt_x4), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__wasmsimd_sqrt_x4, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -2037,14 +2037,14 @@
   TEST(F32_VSQRT__WASMSIMD_SQRT_X8, batch_eq_8) {
     VUnaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__wasmsimd_sqrt_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+      .Test(xnn_f32_vsqrt_ukernel__wasmsimd_sqrt_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
   }
 
   TEST(F32_VSQRT__WASMSIMD_SQRT_X8, batch_div_8) {
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__wasmsimd_sqrt_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__wasmsimd_sqrt_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -2052,7 +2052,7 @@
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__wasmsimd_sqrt_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__wasmsimd_sqrt_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -2060,7 +2060,7 @@
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__wasmsimd_sqrt_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__wasmsimd_sqrt_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 
@@ -2069,7 +2069,7 @@
       VUnaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__wasmsimd_sqrt_x8), VUnaryMicrokernelTester::OpType::SquareRoot);
+        .Test(xnn_f32_vsqrt_ukernel__wasmsimd_sqrt_x8, VUnaryMicrokernelTester::OpType::SquareRoot);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -2078,14 +2078,14 @@
 TEST(F32_VSQRT__SCALAR_SQRT_X1, batch_eq_1) {
   VUnaryMicrokernelTester()
     .batch_size(1)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__scalar_sqrt_x1), VUnaryMicrokernelTester::OpType::SquareRoot, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vsqrt_ukernel__scalar_sqrt_x1, VUnaryMicrokernelTester::OpType::SquareRoot, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VSQRT__SCALAR_SQRT_X1, batch_gt_1) {
   for (size_t batch_size = 2; batch_size < 10; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__scalar_sqrt_x1), VUnaryMicrokernelTester::OpType::SquareRoot, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsqrt_ukernel__scalar_sqrt_x1, VUnaryMicrokernelTester::OpType::SquareRoot, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -2094,7 +2094,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__scalar_sqrt_x1), VUnaryMicrokernelTester::OpType::SquareRoot, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsqrt_ukernel__scalar_sqrt_x1, VUnaryMicrokernelTester::OpType::SquareRoot, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -2102,14 +2102,14 @@
 TEST(F32_VSQRT__SCALAR_SQRT_X2, batch_eq_2) {
   VUnaryMicrokernelTester()
     .batch_size(2)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__scalar_sqrt_x2), VUnaryMicrokernelTester::OpType::SquareRoot, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vsqrt_ukernel__scalar_sqrt_x2, VUnaryMicrokernelTester::OpType::SquareRoot, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VSQRT__SCALAR_SQRT_X2, batch_div_2) {
   for (size_t batch_size = 4; batch_size < 20; batch_size += 2) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__scalar_sqrt_x2), VUnaryMicrokernelTester::OpType::SquareRoot, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsqrt_ukernel__scalar_sqrt_x2, VUnaryMicrokernelTester::OpType::SquareRoot, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -2117,7 +2117,7 @@
   for (size_t batch_size = 1; batch_size < 2; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__scalar_sqrt_x2), VUnaryMicrokernelTester::OpType::SquareRoot, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsqrt_ukernel__scalar_sqrt_x2, VUnaryMicrokernelTester::OpType::SquareRoot, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -2125,7 +2125,7 @@
   for (size_t batch_size = 3; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__scalar_sqrt_x2), VUnaryMicrokernelTester::OpType::SquareRoot, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsqrt_ukernel__scalar_sqrt_x2, VUnaryMicrokernelTester::OpType::SquareRoot, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -2134,7 +2134,7 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__scalar_sqrt_x2), VUnaryMicrokernelTester::OpType::SquareRoot, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsqrt_ukernel__scalar_sqrt_x2, VUnaryMicrokernelTester::OpType::SquareRoot, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -2142,14 +2142,14 @@
 TEST(F32_VSQRT__SCALAR_SQRT_X4, batch_eq_4) {
   VUnaryMicrokernelTester()
     .batch_size(4)
-    .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__scalar_sqrt_x4), VUnaryMicrokernelTester::OpType::SquareRoot, VUnaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vsqrt_ukernel__scalar_sqrt_x4, VUnaryMicrokernelTester::OpType::SquareRoot, VUnaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VSQRT__SCALAR_SQRT_X4, batch_div_4) {
   for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__scalar_sqrt_x4), VUnaryMicrokernelTester::OpType::SquareRoot, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsqrt_ukernel__scalar_sqrt_x4, VUnaryMicrokernelTester::OpType::SquareRoot, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -2157,7 +2157,7 @@
   for (size_t batch_size = 1; batch_size < 4; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__scalar_sqrt_x4), VUnaryMicrokernelTester::OpType::SquareRoot, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsqrt_ukernel__scalar_sqrt_x4, VUnaryMicrokernelTester::OpType::SquareRoot, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -2165,7 +2165,7 @@
   for (size_t batch_size = 5; batch_size < 8; batch_size++) {
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__scalar_sqrt_x4), VUnaryMicrokernelTester::OpType::SquareRoot, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsqrt_ukernel__scalar_sqrt_x4, VUnaryMicrokernelTester::OpType::SquareRoot, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
 
@@ -2174,6 +2174,6 @@
     VUnaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vunary_ukernel_function(xnn_f32_vsqrt_ukernel__scalar_sqrt_x4), VUnaryMicrokernelTester::OpType::SquareRoot, VUnaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vsqrt_ukernel__scalar_sqrt_x4, VUnaryMicrokernelTester::OpType::SquareRoot, VUnaryMicrokernelTester::Variant::Scalar);
   }
 }
diff --git a/test/vclamp-microkernel-tester.h b/test/vclamp-microkernel-tester.h
index 1d185f1..de6f8b0 100644
--- a/test/vclamp-microkernel-tester.h
+++ b/test/vclamp-microkernel-tester.h
@@ -79,7 +79,7 @@
     return this->iterations_;
   }
 
-  void Test(xnn_u8_clamp_ukernel_function clamp, Variant variant = Variant::Native) const {
+  void Test(xnn_u8_vclamp_ukernel_function clamp, Variant variant = Variant::Native) const {
     std::random_device random_device;
     auto rng = std::mt19937(random_device());
     auto u8rng = std::bind(std::uniform_int_distribution<uint32_t>(0, std::numeric_limits<uint8_t>::max()), rng);
@@ -128,7 +128,7 @@
     }
   }
 
-  void Test(xnn_f16_clamp_ukernel_function clamp) const {
+  void Test(xnn_f16_vclamp_ukernel_function clamp) const {
     std::random_device random_device;
     auto rng = std::mt19937(random_device());
     auto f32rng = std::bind(std::uniform_real_distribution<float>(0.0f, 255.0f), rng);
diff --git a/test/vunary-microkernel-tester.h b/test/vunary-microkernel-tester.h
index 7a39feb..d5375e7 100644
--- a/test/vunary-microkernel-tester.h
+++ b/test/vunary-microkernel-tester.h
@@ -324,6 +324,42 @@
     }
   }
 
+  inline void Test(xnn_f32_vabs_ukernel_function vunary, OpType op_type, Variant variant = Variant::Native) const {
+    Test(xnn_f32_vunary_ukernel_function(vunary), op_type, variant);
+  }
+
+  inline void Test(xnn_f32_vclamp_ukernel_function vunary, OpType op_type, Variant variant = Variant::Native) const {
+    Test(xnn_f32_vunary_ukernel_function(vunary), op_type, variant);
+  }
+
+  inline void Test(xnn_f32_velu_ukernel_function vunary, OpType op_type, Variant variant = Variant::Native) const {
+    Test(xnn_f32_vunary_ukernel_function(vunary), op_type, variant);
+  }
+
+  inline void Test(xnn_f32_vhswish_ukernel_function vunary, OpType op_type, Variant variant = Variant::Native) const {
+    Test(xnn_f32_vunary_ukernel_function(vunary), op_type, variant);
+  }
+
+  inline void Test(xnn_f32_vlrelu_ukernel_function vunary, OpType op_type, Variant variant = Variant::Native) const {
+    Test(xnn_f32_vunary_ukernel_function(vunary), op_type, variant);
+  }
+
+  inline void Test(xnn_f32_vneg_ukernel_function vunary, OpType op_type, Variant variant = Variant::Native) const {
+    Test(xnn_f32_vunary_ukernel_function(vunary), op_type, variant);
+  }
+
+  inline void Test(xnn_f32_vrelu_ukernel_function vunary, OpType op_type, Variant variant = Variant::Native) const {
+    Test(xnn_f32_vunary_ukernel_function(vunary), op_type, variant);
+  }
+
+  inline void Test(xnn_f32_vround_ukernel_function vunary, OpType op_type, Variant variant = Variant::Native) const {
+    Test(xnn_f32_vunary_ukernel_function(vunary), op_type, variant);
+  }
+
+  inline void Test(xnn_f32_vsqrt_ukernel_function vunary, OpType op_type, Variant variant = Variant::Native) const {
+    Test(xnn_f32_vunary_ukernel_function(vunary), op_type, variant);
+  }
+
  private:
   size_t batch_size_ = 1;
   bool inplace_ = false;
diff --git a/tools/generate-vunary-test.py b/tools/generate-vunary-test.py
index 7e3eef6..2934840 100755
--- a/tools/generate-vunary-test.py
+++ b/tools/generate-vunary-test.py
@@ -202,10 +202,7 @@
   """
   _, test_name = ukernel.split("_", 1)
   _, datatype, _ = ukernel.split("_", 2)
-  test_args = [
-    "xnn_f32_vunary_ukernel_function(%s)" % ukernel,
-    "VUnaryMicrokernelTester::OpType::%s" % op_type,
-  ]
+  test_args = [ukernel, "VUnaryMicrokernelTester::OpType::" + op_type]
   if not isa:
     test_args.append("VUnaryMicrokernelTester::Variant::Scalar")
   return xngen.preprocess(BINOP_TEST_TEMPLATE, {