Rename VBinOpMicrokernelTester -> VBinaryMicrokernelTester

Match similar change for vector unary microkernel tester

PiperOrigin-RevId: 373638674
diff --git a/test/f32-vrdivc-relu.cc b/test/f32-vrdivc-relu.cc
index a2efc96..ebda091 100644
--- a/test/f32-vrdivc-relu.cc
+++ b/test/f32-vrdivc-relu.cc
@@ -19,41 +19,41 @@
 
 #if XNN_ARCH_WASMSIMD
   TEST(F32_VRDIVC_RELU__WASMSIMD_X4, batch_eq_4) {
-    VBinOpCMicrokernelTester()
+    VBinaryCMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vrdivc_relu_ukernel__wasmsimd_x4, VBinOpCMicrokernelTester::OpType::RDivC);
+      .Test(xnn_f32_vrdivc_relu_ukernel__wasmsimd_x4, VBinaryCMicrokernelTester::OpType::RDivC);
   }
 
   TEST(F32_VRDIVC_RELU__WASMSIMD_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
-      VBinOpCMicrokernelTester()
+      VBinaryCMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vrdivc_relu_ukernel__wasmsimd_x4, VBinOpCMicrokernelTester::OpType::RDivC);
+        .Test(xnn_f32_vrdivc_relu_ukernel__wasmsimd_x4, VBinaryCMicrokernelTester::OpType::RDivC);
     }
   }
 
   TEST(F32_VRDIVC_RELU__WASMSIMD_X4, batch_lt_4) {
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
-      VBinOpCMicrokernelTester()
+      VBinaryCMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vrdivc_relu_ukernel__wasmsimd_x4, VBinOpCMicrokernelTester::OpType::RDivC);
+        .Test(xnn_f32_vrdivc_relu_ukernel__wasmsimd_x4, VBinaryCMicrokernelTester::OpType::RDivC);
     }
   }
 
   TEST(F32_VRDIVC_RELU__WASMSIMD_X4, batch_gt_4) {
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
-      VBinOpCMicrokernelTester()
+      VBinaryCMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vrdivc_relu_ukernel__wasmsimd_x4, VBinOpCMicrokernelTester::OpType::RDivC);
+        .Test(xnn_f32_vrdivc_relu_ukernel__wasmsimd_x4, VBinaryCMicrokernelTester::OpType::RDivC);
     }
   }
 
   TEST(F32_VRDIVC_RELU__WASMSIMD_X4, inplace) {
     for (size_t batch_size = 1; batch_size <= 20; batch_size += 3) {
-      VBinOpCMicrokernelTester()
+      VBinaryCMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vrdivc_relu_ukernel__wasmsimd_x4, VBinOpCMicrokernelTester::OpType::RDivC);
+        .Test(xnn_f32_vrdivc_relu_ukernel__wasmsimd_x4, VBinaryCMicrokernelTester::OpType::RDivC);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -61,41 +61,41 @@
 
 #if XNN_ARCH_WASMSIMD
   TEST(F32_VRDIVC_RELU__WASMSIMD_X8, batch_eq_8) {
-    VBinOpCMicrokernelTester()
+    VBinaryCMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vrdivc_relu_ukernel__wasmsimd_x8, VBinOpCMicrokernelTester::OpType::RDivC);
+      .Test(xnn_f32_vrdivc_relu_ukernel__wasmsimd_x8, VBinaryCMicrokernelTester::OpType::RDivC);
   }
 
   TEST(F32_VRDIVC_RELU__WASMSIMD_X8, batch_div_8) {
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
-      VBinOpCMicrokernelTester()
+      VBinaryCMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vrdivc_relu_ukernel__wasmsimd_x8, VBinOpCMicrokernelTester::OpType::RDivC);
+        .Test(xnn_f32_vrdivc_relu_ukernel__wasmsimd_x8, VBinaryCMicrokernelTester::OpType::RDivC);
     }
   }
 
   TEST(F32_VRDIVC_RELU__WASMSIMD_X8, batch_lt_8) {
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
-      VBinOpCMicrokernelTester()
+      VBinaryCMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vrdivc_relu_ukernel__wasmsimd_x8, VBinOpCMicrokernelTester::OpType::RDivC);
+        .Test(xnn_f32_vrdivc_relu_ukernel__wasmsimd_x8, VBinaryCMicrokernelTester::OpType::RDivC);
     }
   }
 
   TEST(F32_VRDIVC_RELU__WASMSIMD_X8, batch_gt_8) {
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
-      VBinOpCMicrokernelTester()
+      VBinaryCMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vrdivc_relu_ukernel__wasmsimd_x8, VBinOpCMicrokernelTester::OpType::RDivC);
+        .Test(xnn_f32_vrdivc_relu_ukernel__wasmsimd_x8, VBinaryCMicrokernelTester::OpType::RDivC);
     }
   }
 
   TEST(F32_VRDIVC_RELU__WASMSIMD_X8, inplace) {
     for (size_t batch_size = 1; batch_size <= 40; batch_size += 7) {
-      VBinOpCMicrokernelTester()
+      VBinaryCMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vrdivc_relu_ukernel__wasmsimd_x8, VBinOpCMicrokernelTester::OpType::RDivC);
+        .Test(xnn_f32_vrdivc_relu_ukernel__wasmsimd_x8, VBinaryCMicrokernelTester::OpType::RDivC);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -103,41 +103,41 @@
 
 #if XNN_ARCH_WASMSIMD
   TEST(F32_VRDIVC_RELU__WASMSIMD_X16, batch_eq_16) {
-    VBinOpCMicrokernelTester()
+    VBinaryCMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f32_vrdivc_relu_ukernel__wasmsimd_x16, VBinOpCMicrokernelTester::OpType::RDivC);
+      .Test(xnn_f32_vrdivc_relu_ukernel__wasmsimd_x16, VBinaryCMicrokernelTester::OpType::RDivC);
   }
 
   TEST(F32_VRDIVC_RELU__WASMSIMD_X16, batch_div_16) {
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
-      VBinOpCMicrokernelTester()
+      VBinaryCMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vrdivc_relu_ukernel__wasmsimd_x16, VBinOpCMicrokernelTester::OpType::RDivC);
+        .Test(xnn_f32_vrdivc_relu_ukernel__wasmsimd_x16, VBinaryCMicrokernelTester::OpType::RDivC);
     }
   }
 
   TEST(F32_VRDIVC_RELU__WASMSIMD_X16, batch_lt_16) {
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
-      VBinOpCMicrokernelTester()
+      VBinaryCMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vrdivc_relu_ukernel__wasmsimd_x16, VBinOpCMicrokernelTester::OpType::RDivC);
+        .Test(xnn_f32_vrdivc_relu_ukernel__wasmsimd_x16, VBinaryCMicrokernelTester::OpType::RDivC);
     }
   }
 
   TEST(F32_VRDIVC_RELU__WASMSIMD_X16, batch_gt_16) {
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
-      VBinOpCMicrokernelTester()
+      VBinaryCMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vrdivc_relu_ukernel__wasmsimd_x16, VBinOpCMicrokernelTester::OpType::RDivC);
+        .Test(xnn_f32_vrdivc_relu_ukernel__wasmsimd_x16, VBinaryCMicrokernelTester::OpType::RDivC);
     }
   }
 
   TEST(F32_VRDIVC_RELU__WASMSIMD_X16, inplace) {
     for (size_t batch_size = 1; batch_size <= 80; batch_size += 15) {
-      VBinOpCMicrokernelTester()
+      VBinaryCMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vrdivc_relu_ukernel__wasmsimd_x16, VBinOpCMicrokernelTester::OpType::RDivC);
+        .Test(xnn_f32_vrdivc_relu_ukernel__wasmsimd_x16, VBinaryCMicrokernelTester::OpType::RDivC);
     }
   }
 #endif  // XNN_ARCH_WASMSIMD
@@ -145,25 +145,25 @@
 
 #if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
   TEST(F32_VRDIVC_RELU__WASM_X1, batch_eq_1) {
-    VBinOpCMicrokernelTester()
+    VBinaryCMicrokernelTester()
       .batch_size(1)
-      .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x1, VBinOpCMicrokernelTester::OpType::RDivC);
+      .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x1, VBinaryCMicrokernelTester::OpType::RDivC);
   }
 
   TEST(F32_VRDIVC_RELU__WASM_X1, batch_gt_1) {
     for (size_t batch_size = 2; batch_size < 10; batch_size++) {
-      VBinOpCMicrokernelTester()
+      VBinaryCMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x1, VBinOpCMicrokernelTester::OpType::RDivC);
+        .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x1, VBinaryCMicrokernelTester::OpType::RDivC);
     }
   }
 
   TEST(F32_VRDIVC_RELU__WASM_X1, inplace) {
     for (size_t batch_size = 1; batch_size <= 5; batch_size += 1) {
-      VBinOpCMicrokernelTester()
+      VBinaryCMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x1, VBinOpCMicrokernelTester::OpType::RDivC);
+        .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x1, VBinaryCMicrokernelTester::OpType::RDivC);
     }
   }
 #endif  // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
@@ -171,41 +171,41 @@
 
 #if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
   TEST(F32_VRDIVC_RELU__WASM_X2, batch_eq_2) {
-    VBinOpCMicrokernelTester()
+    VBinaryCMicrokernelTester()
       .batch_size(2)
-      .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x2, VBinOpCMicrokernelTester::OpType::RDivC);
+      .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x2, VBinaryCMicrokernelTester::OpType::RDivC);
   }
 
   TEST(F32_VRDIVC_RELU__WASM_X2, batch_div_2) {
     for (size_t batch_size = 4; batch_size < 20; batch_size += 2) {
-      VBinOpCMicrokernelTester()
+      VBinaryCMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x2, VBinOpCMicrokernelTester::OpType::RDivC);
+        .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x2, VBinaryCMicrokernelTester::OpType::RDivC);
     }
   }
 
   TEST(F32_VRDIVC_RELU__WASM_X2, batch_lt_2) {
     for (size_t batch_size = 1; batch_size < 2; batch_size++) {
-      VBinOpCMicrokernelTester()
+      VBinaryCMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x2, VBinOpCMicrokernelTester::OpType::RDivC);
+        .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x2, VBinaryCMicrokernelTester::OpType::RDivC);
     }
   }
 
   TEST(F32_VRDIVC_RELU__WASM_X2, batch_gt_2) {
     for (size_t batch_size = 3; batch_size < 4; batch_size++) {
-      VBinOpCMicrokernelTester()
+      VBinaryCMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x2, VBinOpCMicrokernelTester::OpType::RDivC);
+        .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x2, VBinaryCMicrokernelTester::OpType::RDivC);
     }
   }
 
   TEST(F32_VRDIVC_RELU__WASM_X2, inplace) {
     for (size_t batch_size = 1; batch_size <= 10; batch_size += 1) {
-      VBinOpCMicrokernelTester()
+      VBinaryCMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x2, VBinOpCMicrokernelTester::OpType::RDivC);
+        .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x2, VBinaryCMicrokernelTester::OpType::RDivC);
     }
   }
 #endif  // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
@@ -213,41 +213,41 @@
 
 #if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
   TEST(F32_VRDIVC_RELU__WASM_X4, batch_eq_4) {
-    VBinOpCMicrokernelTester()
+    VBinaryCMicrokernelTester()
       .batch_size(4)
-      .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x4, VBinOpCMicrokernelTester::OpType::RDivC);
+      .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x4, VBinaryCMicrokernelTester::OpType::RDivC);
   }
 
   TEST(F32_VRDIVC_RELU__WASM_X4, batch_div_4) {
     for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
-      VBinOpCMicrokernelTester()
+      VBinaryCMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x4, VBinOpCMicrokernelTester::OpType::RDivC);
+        .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x4, VBinaryCMicrokernelTester::OpType::RDivC);
     }
   }
 
   TEST(F32_VRDIVC_RELU__WASM_X4, batch_lt_4) {
     for (size_t batch_size = 1; batch_size < 4; batch_size++) {
-      VBinOpCMicrokernelTester()
+      VBinaryCMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x4, VBinOpCMicrokernelTester::OpType::RDivC);
+        .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x4, VBinaryCMicrokernelTester::OpType::RDivC);
     }
   }
 
   TEST(F32_VRDIVC_RELU__WASM_X4, batch_gt_4) {
     for (size_t batch_size = 5; batch_size < 8; batch_size++) {
-      VBinOpCMicrokernelTester()
+      VBinaryCMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x4, VBinOpCMicrokernelTester::OpType::RDivC);
+        .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x4, VBinaryCMicrokernelTester::OpType::RDivC);
     }
   }
 
   TEST(F32_VRDIVC_RELU__WASM_X4, inplace) {
     for (size_t batch_size = 1; batch_size <= 20; batch_size += 3) {
-      VBinOpCMicrokernelTester()
+      VBinaryCMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x4, VBinOpCMicrokernelTester::OpType::RDivC);
+        .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x4, VBinaryCMicrokernelTester::OpType::RDivC);
     }
   }
 #endif  // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
@@ -255,185 +255,185 @@
 
 #if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
   TEST(F32_VRDIVC_RELU__WASM_X8, batch_eq_8) {
-    VBinOpCMicrokernelTester()
+    VBinaryCMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x8, VBinOpCMicrokernelTester::OpType::RDivC);
+      .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x8, VBinaryCMicrokernelTester::OpType::RDivC);
   }
 
   TEST(F32_VRDIVC_RELU__WASM_X8, batch_div_8) {
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
-      VBinOpCMicrokernelTester()
+      VBinaryCMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x8, VBinOpCMicrokernelTester::OpType::RDivC);
+        .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x8, VBinaryCMicrokernelTester::OpType::RDivC);
     }
   }
 
   TEST(F32_VRDIVC_RELU__WASM_X8, batch_lt_8) {
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
-      VBinOpCMicrokernelTester()
+      VBinaryCMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x8, VBinOpCMicrokernelTester::OpType::RDivC);
+        .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x8, VBinaryCMicrokernelTester::OpType::RDivC);
     }
   }
 
   TEST(F32_VRDIVC_RELU__WASM_X8, batch_gt_8) {
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
-      VBinOpCMicrokernelTester()
+      VBinaryCMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x8, VBinOpCMicrokernelTester::OpType::RDivC);
+        .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x8, VBinaryCMicrokernelTester::OpType::RDivC);
     }
   }
 
   TEST(F32_VRDIVC_RELU__WASM_X8, inplace) {
     for (size_t batch_size = 1; batch_size <= 40; batch_size += 7) {
-      VBinOpCMicrokernelTester()
+      VBinaryCMicrokernelTester()
         .batch_size(batch_size)
         .inplace(true)
-        .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x8, VBinOpCMicrokernelTester::OpType::RDivC);
+        .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x8, VBinaryCMicrokernelTester::OpType::RDivC);
     }
   }
 #endif  // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
 
 
 TEST(F32_VRDIVC_RELU__SCALAR_X1, batch_eq_1) {
-  VBinOpCMicrokernelTester()
+  VBinaryCMicrokernelTester()
     .batch_size(1)
-    .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x1, VBinOpCMicrokernelTester::OpType::RDivC, VBinOpCMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x1, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VRDIVC_RELU__SCALAR_X1, batch_gt_1) {
   for (size_t batch_size = 2; batch_size < 10; batch_size++) {
-    VBinOpCMicrokernelTester()
+    VBinaryCMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x1, VBinOpCMicrokernelTester::OpType::RDivC, VBinOpCMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x1, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VRDIVC_RELU__SCALAR_X1, inplace) {
   for (size_t batch_size = 1; batch_size <= 5; batch_size += 1) {
-    VBinOpCMicrokernelTester()
+    VBinaryCMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x1, VBinOpCMicrokernelTester::OpType::RDivC, VBinOpCMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x1, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
   }
 }
 
 
 TEST(F32_VRDIVC_RELU__SCALAR_X2, batch_eq_2) {
-  VBinOpCMicrokernelTester()
+  VBinaryCMicrokernelTester()
     .batch_size(2)
-    .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x2, VBinOpCMicrokernelTester::OpType::RDivC, VBinOpCMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x2, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VRDIVC_RELU__SCALAR_X2, batch_div_2) {
   for (size_t batch_size = 4; batch_size < 20; batch_size += 2) {
-    VBinOpCMicrokernelTester()
+    VBinaryCMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x2, VBinOpCMicrokernelTester::OpType::RDivC, VBinOpCMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x2, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VRDIVC_RELU__SCALAR_X2, batch_lt_2) {
   for (size_t batch_size = 1; batch_size < 2; batch_size++) {
-    VBinOpCMicrokernelTester()
+    VBinaryCMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x2, VBinOpCMicrokernelTester::OpType::RDivC, VBinOpCMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x2, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VRDIVC_RELU__SCALAR_X2, batch_gt_2) {
   for (size_t batch_size = 3; batch_size < 4; batch_size++) {
-    VBinOpCMicrokernelTester()
+    VBinaryCMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x2, VBinOpCMicrokernelTester::OpType::RDivC, VBinOpCMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x2, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VRDIVC_RELU__SCALAR_X2, inplace) {
   for (size_t batch_size = 1; batch_size <= 10; batch_size += 1) {
-    VBinOpCMicrokernelTester()
+    VBinaryCMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x2, VBinOpCMicrokernelTester::OpType::RDivC, VBinOpCMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x2, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
   }
 }
 
 
 TEST(F32_VRDIVC_RELU__SCALAR_X4, batch_eq_4) {
-  VBinOpCMicrokernelTester()
+  VBinaryCMicrokernelTester()
     .batch_size(4)
-    .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x4, VBinOpCMicrokernelTester::OpType::RDivC, VBinOpCMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x4, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VRDIVC_RELU__SCALAR_X4, batch_div_4) {
   for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
-    VBinOpCMicrokernelTester()
+    VBinaryCMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x4, VBinOpCMicrokernelTester::OpType::RDivC, VBinOpCMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x4, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VRDIVC_RELU__SCALAR_X4, batch_lt_4) {
   for (size_t batch_size = 1; batch_size < 4; batch_size++) {
-    VBinOpCMicrokernelTester()
+    VBinaryCMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x4, VBinOpCMicrokernelTester::OpType::RDivC, VBinOpCMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x4, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VRDIVC_RELU__SCALAR_X4, batch_gt_4) {
   for (size_t batch_size = 5; batch_size < 8; batch_size++) {
-    VBinOpCMicrokernelTester()
+    VBinaryCMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x4, VBinOpCMicrokernelTester::OpType::RDivC, VBinOpCMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x4, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VRDIVC_RELU__SCALAR_X4, inplace) {
   for (size_t batch_size = 1; batch_size <= 20; batch_size += 3) {
-    VBinOpCMicrokernelTester()
+    VBinaryCMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x4, VBinOpCMicrokernelTester::OpType::RDivC, VBinOpCMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x4, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
   }
 }
 
 
 TEST(F32_VRDIVC_RELU__SCALAR_X8, batch_eq_8) {
-  VBinOpCMicrokernelTester()
+  VBinaryCMicrokernelTester()
     .batch_size(8)
-    .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x8, VBinOpCMicrokernelTester::OpType::RDivC, VBinOpCMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x8, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
 }
 
 TEST(F32_VRDIVC_RELU__SCALAR_X8, batch_div_8) {
   for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
-    VBinOpCMicrokernelTester()
+    VBinaryCMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x8, VBinOpCMicrokernelTester::OpType::RDivC, VBinOpCMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x8, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VRDIVC_RELU__SCALAR_X8, batch_lt_8) {
   for (size_t batch_size = 1; batch_size < 8; batch_size++) {
-    VBinOpCMicrokernelTester()
+    VBinaryCMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x8, VBinOpCMicrokernelTester::OpType::RDivC, VBinOpCMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x8, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VRDIVC_RELU__SCALAR_X8, batch_gt_8) {
   for (size_t batch_size = 9; batch_size < 16; batch_size++) {
-    VBinOpCMicrokernelTester()
+    VBinaryCMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x8, VBinOpCMicrokernelTester::OpType::RDivC, VBinOpCMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x8, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
   }
 }
 
 TEST(F32_VRDIVC_RELU__SCALAR_X8, inplace) {
   for (size_t batch_size = 1; batch_size <= 40; batch_size += 7) {
-    VBinOpCMicrokernelTester()
+    VBinaryCMicrokernelTester()
       .batch_size(batch_size)
       .inplace(true)
-      .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x8, VBinOpCMicrokernelTester::OpType::RDivC, VBinOpCMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x8, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
   }
 }