Rename VBinOpMicrokernelTester -> VBinaryMicrokernelTester

Match similar change for vector unary microkernel tester

PiperOrigin-RevId: 373638674
diff --git a/test/f32-vmul.cc b/test/f32-vmul.cc
index d7e07e6..243e403 100644
--- a/test/f32-vmul.cc
+++ b/test/f32-vmul.cc
@@ -19,60 +19,60 @@
 
 #if XNN_ARCH_WASMSIMD
   TEST(F32_VMUL__WASMSIMD_X4, batch_eq_4) {
-    VBinOpMicrokernelTester()
+    VBinaryMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vmul_ukernel__wasmsimd_x4, VBinOpMicrokernelTester::OpType::Mul);
+      .Test(xnn_f32_vmul_ukernel__wasmsimd_x4, VBinaryMicrokernelTester::OpType::Mul);
   }
 
   TEST(F32_VMUL__WASMSIMD_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vmul_ukernel__wasmsimd_x4, VBinOpMicrokernelTester::OpType::Mul);
+        .Test(xnn_f32_vmul_ukernel__wasmsimd_x4, VBinaryMicrokernelTester::OpType::Mul);
     }
   }
 
   TEST(F32_VMUL__WASMSIMD_X4, batch_lt_4) {
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vmul_ukernel__wasmsimd_x4, VBinOpMicrokernelTester::OpType::Mul);
+        .Test(xnn_f32_vmul_ukernel__wasmsimd_x4, VBinaryMicrokernelTester::OpType::Mul);
     }
   }
 
   TEST(F32_VMUL__WASMSIMD_X4, batch_gt_4) {
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vmul_ukernel__wasmsimd_x4, VBinOpMicrokernelTester::OpType::Mul);
+        .Test(xnn_f32_vmul_ukernel__wasmsimd_x4, VBinaryMicrokernelTester::OpType::Mul);
     }
   }
 
   TEST(F32_VMUL__WASMSIMD_X4, inplace_a) {
     for (size_t batch_size = 1; batch_size <= 20; batch_size += 3) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace_a(true)
-        .Test(xnn_f32_vmul_ukernel__wasmsimd_x4, VBinOpMicrokernelTester::OpType::Mul);
+        .Test(xnn_f32_vmul_ukernel__wasmsimd_x4, VBinaryMicrokernelTester::OpType::Mul);
     }
   }
 
   TEST(F32_VMUL__WASMSIMD_X4, inplace_b) {
     for (size_t batch_size = 1; batch_size <= 20; batch_size += 3) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace_b(true)
-        .Test(xnn_f32_vmul_ukernel__wasmsimd_x4, VBinOpMicrokernelTester::OpType::Mul);
+        .Test(xnn_f32_vmul_ukernel__wasmsimd_x4, VBinaryMicrokernelTester::OpType::Mul);
     }
   }
 
   TEST(F32_VMUL__WASMSIMD_X4, inplace_a_and_b) {
     for (size_t batch_size = 1; batch_size <= 20; batch_size += 3) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace_a(true)
         .inplace_b(true)
-        .Test(xnn_f32_vmul_ukernel__wasmsimd_x4, VBinOpMicrokernelTester::OpType::Mul);
+        .Test(xnn_f32_vmul_ukernel__wasmsimd_x4, VBinaryMicrokernelTester::OpType::Mul);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -80,60 +80,60 @@
 
 #if XNN_ARCH_WASMSIMD
   TEST(F32_VMUL__WASMSIMD_X8, batch_eq_8) {
-    VBinOpMicrokernelTester()
+    VBinaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vmul_ukernel__wasmsimd_x8, VBinOpMicrokernelTester::OpType::Mul);
+      .Test(xnn_f32_vmul_ukernel__wasmsimd_x8, VBinaryMicrokernelTester::OpType::Mul);
   }
 
   TEST(F32_VMUL__WASMSIMD_X8, batch_div_8) {
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vmul_ukernel__wasmsimd_x8, VBinOpMicrokernelTester::OpType::Mul);
+        .Test(xnn_f32_vmul_ukernel__wasmsimd_x8, VBinaryMicrokernelTester::OpType::Mul);
     }
   }
 
   TEST(F32_VMUL__WASMSIMD_X8, batch_lt_8) {
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vmul_ukernel__wasmsimd_x8, VBinOpMicrokernelTester::OpType::Mul);
+        .Test(xnn_f32_vmul_ukernel__wasmsimd_x8, VBinaryMicrokernelTester::OpType::Mul);
     }
   }
 
   TEST(F32_VMUL__WASMSIMD_X8, batch_gt_8) {
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vmul_ukernel__wasmsimd_x8, VBinOpMicrokernelTester::OpType::Mul);
+        .Test(xnn_f32_vmul_ukernel__wasmsimd_x8, VBinaryMicrokernelTester::OpType::Mul);
     }
   }
 
   TEST(F32_VMUL__WASMSIMD_X8, inplace_a) {
     for (size_t batch_size = 1; batch_size <= 40; batch_size += 7) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace_a(true)
-        .Test(xnn_f32_vmul_ukernel__wasmsimd_x8, VBinOpMicrokernelTester::OpType::Mul);
+        .Test(xnn_f32_vmul_ukernel__wasmsimd_x8, VBinaryMicrokernelTester::OpType::Mul);
     }
   }
 
   TEST(F32_VMUL__WASMSIMD_X8, inplace_b) {
     for (size_t batch_size = 1; batch_size <= 40; batch_size += 7) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace_b(true)
-        .Test(xnn_f32_vmul_ukernel__wasmsimd_x8, VBinOpMicrokernelTester::OpType::Mul);
+        .Test(xnn_f32_vmul_ukernel__wasmsimd_x8, VBinaryMicrokernelTester::OpType::Mul);
     }
   }
 
   TEST(F32_VMUL__WASMSIMD_X8, inplace_a_and_b) {
     for (size_t batch_size = 1; batch_size <= 40; batch_size += 7) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace_a(true)
         .inplace_b(true)
-        .Test(xnn_f32_vmul_ukernel__wasmsimd_x8, VBinOpMicrokernelTester::OpType::Mul);
+        .Test(xnn_f32_vmul_ukernel__wasmsimd_x8, VBinaryMicrokernelTester::OpType::Mul);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -141,280 +141,280 @@
 
 #if XNN_ARCH_WASMSIMD
   TEST(F32_VMUL__WASMSIMD_X16, batch_eq_16) {
-    VBinOpMicrokernelTester()
+    VBinaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vmul_ukernel__wasmsimd_x16, VBinOpMicrokernelTester::OpType::Mul);
+      .Test(xnn_f32_vmul_ukernel__wasmsimd_x16, VBinaryMicrokernelTester::OpType::Mul);
   }
 
   TEST(F32_VMUL__WASMSIMD_X16, batch_div_16) {
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vmul_ukernel__wasmsimd_x16, VBinOpMicrokernelTester::OpType::Mul);
+        .Test(xnn_f32_vmul_ukernel__wasmsimd_x16, VBinaryMicrokernelTester::OpType::Mul);
     }
   }
 
   TEST(F32_VMUL__WASMSIMD_X16, batch_lt_16) {
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vmul_ukernel__wasmsimd_x16, VBinOpMicrokernelTester::OpType::Mul);
+        .Test(xnn_f32_vmul_ukernel__wasmsimd_x16, VBinaryMicrokernelTester::OpType::Mul);
     }
   }
 
   TEST(F32_VMUL__WASMSIMD_X16, batch_gt_16) {
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vmul_ukernel__wasmsimd_x16, VBinOpMicrokernelTester::OpType::Mul);
+        .Test(xnn_f32_vmul_ukernel__wasmsimd_x16, VBinaryMicrokernelTester::OpType::Mul);
     }
   }
 
   TEST(F32_VMUL__WASMSIMD_X16, inplace_a) {
     for (size_t batch_size = 1; batch_size <= 80; batch_size += 15) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace_a(true)
-        .Test(xnn_f32_vmul_ukernel__wasmsimd_x16, VBinOpMicrokernelTester::OpType::Mul);
+        .Test(xnn_f32_vmul_ukernel__wasmsimd_x16, VBinaryMicrokernelTester::OpType::Mul);
     }
   }
 
   TEST(F32_VMUL__WASMSIMD_X16, inplace_b) {
     for (size_t batch_size = 1; batch_size <= 80; batch_size += 15) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace_b(true)
-        .Test(xnn_f32_vmul_ukernel__wasmsimd_x16, VBinOpMicrokernelTester::OpType::Mul);
+        .Test(xnn_f32_vmul_ukernel__wasmsimd_x16, VBinaryMicrokernelTester::OpType::Mul);
     }
   }
 
   TEST(F32_VMUL__WASMSIMD_X16, inplace_a_and_b) {
     for (size_t batch_size = 1; batch_size <= 80; batch_size += 15) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace_a(true)
         .inplace_b(true)
-        .Test(xnn_f32_vmul_ukernel__wasmsimd_x16, VBinOpMicrokernelTester::OpType::Mul);
+        .Test(xnn_f32_vmul_ukernel__wasmsimd_x16, VBinaryMicrokernelTester::OpType::Mul);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
 
 
 TEST(F32_VMUL__SCALAR_X1, batch_eq_1) {
-  VBinOpMicrokernelTester()
+  VBinaryMicrokernelTester()
     .batch_size(1)
-    .Test(xnn_f32_vmul_ukernel__scalar_x1, VBinOpMicrokernelTester::OpType::Mul, VBinOpMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vmul_ukernel__scalar_x1, VBinaryMicrokernelTester::OpType::Mul, VBinaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VMUL__SCALAR_X1, batch_gt_1) {
   for (size_t batch_size = 2; batch_size < 10; batch_size++) {
-    VBinOpMicrokernelTester()
+    VBinaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vmul_ukernel__scalar_x1, VBinOpMicrokernelTester::OpType::Mul, VBinOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vmul_ukernel__scalar_x1, VBinaryMicrokernelTester::OpType::Mul, VBinaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VMUL__SCALAR_X1, inplace_a) {
   for (size_t batch_size = 1; batch_size <= 5; batch_size += 1) {
-    VBinOpMicrokernelTester()
+    VBinaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace_a(true)
-      .Test(xnn_f32_vmul_ukernel__scalar_x1, VBinOpMicrokernelTester::OpType::Mul, VBinOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vmul_ukernel__scalar_x1, VBinaryMicrokernelTester::OpType::Mul, VBinaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VMUL__SCALAR_X1, inplace_b) {
   for (size_t batch_size = 1; batch_size <= 5; batch_size += 1) {
-    VBinOpMicrokernelTester()
+    VBinaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace_b(true)
-      .Test(xnn_f32_vmul_ukernel__scalar_x1, VBinOpMicrokernelTester::OpType::Mul, VBinOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vmul_ukernel__scalar_x1, VBinaryMicrokernelTester::OpType::Mul, VBinaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VMUL__SCALAR_X1, inplace_a_and_b) {
   for (size_t batch_size = 1; batch_size <= 5; batch_size += 1) {
-    VBinOpMicrokernelTester()
+    VBinaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace_a(true)
       .inplace_b(true)
-      .Test(xnn_f32_vmul_ukernel__scalar_x1, VBinOpMicrokernelTester::OpType::Mul, VBinOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vmul_ukernel__scalar_x1, VBinaryMicrokernelTester::OpType::Mul, VBinaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 
 TEST(F32_VMUL__SCALAR_X2, batch_eq_2) {
-  VBinOpMicrokernelTester()
+  VBinaryMicrokernelTester()
     .batch_size(2)
-    .Test(xnn_f32_vmul_ukernel__scalar_x2, VBinOpMicrokernelTester::OpType::Mul, VBinOpMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vmul_ukernel__scalar_x2, VBinaryMicrokernelTester::OpType::Mul, VBinaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VMUL__SCALAR_X2, batch_div_2) {
   for (size_t batch_size = 4; batch_size < 20; batch_size += 2) {
-    VBinOpMicrokernelTester()
+    VBinaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vmul_ukernel__scalar_x2, VBinOpMicrokernelTester::OpType::Mul, VBinOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vmul_ukernel__scalar_x2, VBinaryMicrokernelTester::OpType::Mul, VBinaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VMUL__SCALAR_X2, batch_lt_2) {
   for (size_t batch_size = 1; batch_size < 2; batch_size++) {
-    VBinOpMicrokernelTester()
+    VBinaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vmul_ukernel__scalar_x2, VBinOpMicrokernelTester::OpType::Mul, VBinOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vmul_ukernel__scalar_x2, VBinaryMicrokernelTester::OpType::Mul, VBinaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VMUL__SCALAR_X2, batch_gt_2) {
   for (size_t batch_size = 3; batch_size < 4; batch_size++) {
-    VBinOpMicrokernelTester()
+    VBinaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vmul_ukernel__scalar_x2, VBinOpMicrokernelTester::OpType::Mul, VBinOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vmul_ukernel__scalar_x2, VBinaryMicrokernelTester::OpType::Mul, VBinaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VMUL__SCALAR_X2, inplace_a) {
   for (size_t batch_size = 1; batch_size <= 10; batch_size += 1) {
-    VBinOpMicrokernelTester()
+    VBinaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace_a(true)
-      .Test(xnn_f32_vmul_ukernel__scalar_x2, VBinOpMicrokernelTester::OpType::Mul, VBinOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vmul_ukernel__scalar_x2, VBinaryMicrokernelTester::OpType::Mul, VBinaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VMUL__SCALAR_X2, inplace_b) {
   for (size_t batch_size = 1; batch_size <= 10; batch_size += 1) {
-    VBinOpMicrokernelTester()
+    VBinaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace_b(true)
-      .Test(xnn_f32_vmul_ukernel__scalar_x2, VBinOpMicrokernelTester::OpType::Mul, VBinOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vmul_ukernel__scalar_x2, VBinaryMicrokernelTester::OpType::Mul, VBinaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VMUL__SCALAR_X2, inplace_a_and_b) {
   for (size_t batch_size = 1; batch_size <= 10; batch_size += 1) {
-    VBinOpMicrokernelTester()
+    VBinaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace_a(true)
       .inplace_b(true)
-      .Test(xnn_f32_vmul_ukernel__scalar_x2, VBinOpMicrokernelTester::OpType::Mul, VBinOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vmul_ukernel__scalar_x2, VBinaryMicrokernelTester::OpType::Mul, VBinaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 
 TEST(F32_VMUL__SCALAR_X4, batch_eq_4) {
-  VBinOpMicrokernelTester()
+  VBinaryMicrokernelTester()
     .batch_size(4)
-    .Test(xnn_f32_vmul_ukernel__scalar_x4, VBinOpMicrokernelTester::OpType::Mul, VBinOpMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vmul_ukernel__scalar_x4, VBinaryMicrokernelTester::OpType::Mul, VBinaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VMUL__SCALAR_X4, batch_div_4) {
   for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
-    VBinOpMicrokernelTester()
+    VBinaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vmul_ukernel__scalar_x4, VBinOpMicrokernelTester::OpType::Mul, VBinOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vmul_ukernel__scalar_x4, VBinaryMicrokernelTester::OpType::Mul, VBinaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VMUL__SCALAR_X4, batch_lt_4) {
   for (size_t batch_size = 1; batch_size < 4; batch_size++) {
-    VBinOpMicrokernelTester()
+    VBinaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vmul_ukernel__scalar_x4, VBinOpMicrokernelTester::OpType::Mul, VBinOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vmul_ukernel__scalar_x4, VBinaryMicrokernelTester::OpType::Mul, VBinaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VMUL__SCALAR_X4, batch_gt_4) {
   for (size_t batch_size = 5; batch_size < 8; batch_size++) {
-    VBinOpMicrokernelTester()
+    VBinaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vmul_ukernel__scalar_x4, VBinOpMicrokernelTester::OpType::Mul, VBinOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vmul_ukernel__scalar_x4, VBinaryMicrokernelTester::OpType::Mul, VBinaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VMUL__SCALAR_X4, inplace_a) {
   for (size_t batch_size = 1; batch_size <= 20; batch_size += 3) {
-    VBinOpMicrokernelTester()
+    VBinaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace_a(true)
-      .Test(xnn_f32_vmul_ukernel__scalar_x4, VBinOpMicrokernelTester::OpType::Mul, VBinOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vmul_ukernel__scalar_x4, VBinaryMicrokernelTester::OpType::Mul, VBinaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VMUL__SCALAR_X4, inplace_b) {
   for (size_t batch_size = 1; batch_size <= 20; batch_size += 3) {
-    VBinOpMicrokernelTester()
+    VBinaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace_b(true)
-      .Test(xnn_f32_vmul_ukernel__scalar_x4, VBinOpMicrokernelTester::OpType::Mul, VBinOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vmul_ukernel__scalar_x4, VBinaryMicrokernelTester::OpType::Mul, VBinaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VMUL__SCALAR_X4, inplace_a_and_b) {
   for (size_t batch_size = 1; batch_size <= 20; batch_size += 3) {
-    VBinOpMicrokernelTester()
+    VBinaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace_a(true)
       .inplace_b(true)
-      .Test(xnn_f32_vmul_ukernel__scalar_x4, VBinOpMicrokernelTester::OpType::Mul, VBinOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vmul_ukernel__scalar_x4, VBinaryMicrokernelTester::OpType::Mul, VBinaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 
 TEST(F32_VMUL__SCALAR_X8, batch_eq_8) {
-  VBinOpMicrokernelTester()
+  VBinaryMicrokernelTester()
     .batch_size(8)
-    .Test(xnn_f32_vmul_ukernel__scalar_x8, VBinOpMicrokernelTester::OpType::Mul, VBinOpMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vmul_ukernel__scalar_x8, VBinaryMicrokernelTester::OpType::Mul, VBinaryMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VMUL__SCALAR_X8, batch_div_8) {
   for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
-    VBinOpMicrokernelTester()
+    VBinaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vmul_ukernel__scalar_x8, VBinOpMicrokernelTester::OpType::Mul, VBinOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vmul_ukernel__scalar_x8, VBinaryMicrokernelTester::OpType::Mul, VBinaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VMUL__SCALAR_X8, batch_lt_8) {
   for (size_t batch_size = 1; batch_size < 8; batch_size++) {
-    VBinOpMicrokernelTester()
+    VBinaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vmul_ukernel__scalar_x8, VBinOpMicrokernelTester::OpType::Mul, VBinOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vmul_ukernel__scalar_x8, VBinaryMicrokernelTester::OpType::Mul, VBinaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VMUL__SCALAR_X8, batch_gt_8) {
   for (size_t batch_size = 9; batch_size < 16; batch_size++) {
-    VBinOpMicrokernelTester()
+    VBinaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vmul_ukernel__scalar_x8, VBinOpMicrokernelTester::OpType::Mul, VBinOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vmul_ukernel__scalar_x8, VBinaryMicrokernelTester::OpType::Mul, VBinaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VMUL__SCALAR_X8, inplace_a) {
   for (size_t batch_size = 1; batch_size <= 40; batch_size += 7) {
-    VBinOpMicrokernelTester()
+    VBinaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace_a(true)
-      .Test(xnn_f32_vmul_ukernel__scalar_x8, VBinOpMicrokernelTester::OpType::Mul, VBinOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vmul_ukernel__scalar_x8, VBinaryMicrokernelTester::OpType::Mul, VBinaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VMUL__SCALAR_X8, inplace_b) {
   for (size_t batch_size = 1; batch_size <= 40; batch_size += 7) {
-    VBinOpMicrokernelTester()
+    VBinaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace_b(true)
-      .Test(xnn_f32_vmul_ukernel__scalar_x8, VBinOpMicrokernelTester::OpType::Mul, VBinOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vmul_ukernel__scalar_x8, VBinaryMicrokernelTester::OpType::Mul, VBinaryMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VMUL__SCALAR_X8, inplace_a_and_b) {
   for (size_t batch_size = 1; batch_size <= 40; batch_size += 7) {
-    VBinOpMicrokernelTester()
+    VBinaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace_a(true)
       .inplace_b(true)
-      .Test(xnn_f32_vmul_ukernel__scalar_x8, VBinOpMicrokernelTester::OpType::Mul, VBinOpMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vmul_ukernel__scalar_x8, VBinaryMicrokernelTester::OpType::Mul, VBinaryMicrokernelTester::Variant::Scalar);
   }
 }