commit 10f1fe06874ebf0ee565433144970305b3d58770
author Marat Dukhan <maratek@google.com> Thu May 13 12:51:12 2021 -0700
committer XNNPACK Team <xnnpack-github-robot@google.com> Thu May 13 12:51:57 2021 -0700
tree 24edbf6f93ac63d79ba6cfa2bca706e8f5ee7fbe
parent 87ed45cd81ad706267845ee1c3365535c05fcc02

Rename VBinOpMicrokernelTester -> VBinaryMicrokernelTester

Match similar change for vector unary microkernel tester

PiperOrigin-RevId: 373638674

test/f16-vsub-minmax.cc

diff --git a/test/f16-vsub-minmax.cc b/test/f16-vsub-minmax.cc
index 780329d..31b91cf 100644
--- a/test/f16-vsub-minmax.cc
+++ b/test/f16-vsub-minmax.cc
@@ -20,86 +20,86 @@
 #if XNN_ARCH_ARM64
   TEST(F16_VSUB_MINMAX__NEONFP16ARITH_X8, batch_eq_8) {
     TEST_REQUIRES_ARM_NEON_FP16_ARITH;
-    VBinOpMicrokernelTester()
+    VBinaryMicrokernelTester()
       .batch_size(8)
-      .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x8, VBinOpMicrokernelTester::OpType::Sub);
+      .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x8, VBinaryMicrokernelTester::OpType::Sub);
   }
 
   TEST(F16_VSUB_MINMAX__NEONFP16ARITH_X8, batch_div_8) {
     TEST_REQUIRES_ARM_NEON_FP16_ARITH;
     for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x8, VBinOpMicrokernelTester::OpType::Sub);
+        .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x8, VBinaryMicrokernelTester::OpType::Sub);
     }
   }
 
   TEST(F16_VSUB_MINMAX__NEONFP16ARITH_X8, batch_lt_8) {
     TEST_REQUIRES_ARM_NEON_FP16_ARITH;
     for (size_t batch_size = 1; batch_size < 8; batch_size++) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x8, VBinOpMicrokernelTester::OpType::Sub);
+        .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x8, VBinaryMicrokernelTester::OpType::Sub);
     }
   }
 
   TEST(F16_VSUB_MINMAX__NEONFP16ARITH_X8, batch_gt_8) {
     TEST_REQUIRES_ARM_NEON_FP16_ARITH;
     for (size_t batch_size = 9; batch_size < 16; batch_size++) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x8, VBinOpMicrokernelTester::OpType::Sub);
+        .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x8, VBinaryMicrokernelTester::OpType::Sub);
     }
   }
 
   TEST(F16_VSUB_MINMAX__NEONFP16ARITH_X8, inplace_a) {
     TEST_REQUIRES_ARM_NEON_FP16_ARITH;
     for (size_t batch_size = 1; batch_size <= 40; batch_size += 7) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace_a(true)
-        .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x8, VBinOpMicrokernelTester::OpType::Sub);
+        .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x8, VBinaryMicrokernelTester::OpType::Sub);
     }
   }
 
   TEST(F16_VSUB_MINMAX__NEONFP16ARITH_X8, inplace_b) {
     TEST_REQUIRES_ARM_NEON_FP16_ARITH;
     for (size_t batch_size = 1; batch_size <= 40; batch_size += 7) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace_b(true)
-        .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x8, VBinOpMicrokernelTester::OpType::Sub);
+        .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x8, VBinaryMicrokernelTester::OpType::Sub);
     }
   }
 
   TEST(F16_VSUB_MINMAX__NEONFP16ARITH_X8, inplace_a_and_b) {
     TEST_REQUIRES_ARM_NEON_FP16_ARITH;
     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_f16_vsub_minmax_ukernel__neonfp16arith_x8, VBinOpMicrokernelTester::OpType::Sub);
+        .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x8, VBinaryMicrokernelTester::OpType::Sub);
     }
   }
 
   TEST(F16_VSUB_MINMAX__NEONFP16ARITH_X8, qmin) {
     TEST_REQUIRES_ARM_NEON_FP16_ARITH;
     for (size_t batch_size = 1; batch_size <= 40; batch_size += 7) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
         .qmin(128)
-        .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x8, VBinOpMicrokernelTester::OpType::Sub);
+        .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x8, VBinaryMicrokernelTester::OpType::Sub);
     }
   }
 
   TEST(F16_VSUB_MINMAX__NEONFP16ARITH_X8, qmax) {
     TEST_REQUIRES_ARM_NEON_FP16_ARITH;
     for (size_t batch_size = 1; batch_size <= 40; batch_size += 7) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
         .qmax(128)
-        .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x8, VBinOpMicrokernelTester::OpType::Sub);
+        .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x8, VBinaryMicrokernelTester::OpType::Sub);
     }
   }
 #endif  // XNN_ARCH_ARM64
@@ -108,86 +108,86 @@
 #if XNN_ARCH_ARM64
   TEST(F16_VSUB_MINMAX__NEONFP16ARITH_X16, batch_eq_16) {
     TEST_REQUIRES_ARM_NEON_FP16_ARITH;
-    VBinOpMicrokernelTester()
+    VBinaryMicrokernelTester()
       .batch_size(16)
-      .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x16, VBinOpMicrokernelTester::OpType::Sub);
+      .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x16, VBinaryMicrokernelTester::OpType::Sub);
   }
 
   TEST(F16_VSUB_MINMAX__NEONFP16ARITH_X16, batch_div_16) {
     TEST_REQUIRES_ARM_NEON_FP16_ARITH;
     for (size_t batch_size = 32; batch_size < 160; batch_size += 16) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x16, VBinOpMicrokernelTester::OpType::Sub);
+        .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x16, VBinaryMicrokernelTester::OpType::Sub);
     }
   }
 
   TEST(F16_VSUB_MINMAX__NEONFP16ARITH_X16, batch_lt_16) {
     TEST_REQUIRES_ARM_NEON_FP16_ARITH;
     for (size_t batch_size = 1; batch_size < 16; batch_size++) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x16, VBinOpMicrokernelTester::OpType::Sub);
+        .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x16, VBinaryMicrokernelTester::OpType::Sub);
     }
   }
 
   TEST(F16_VSUB_MINMAX__NEONFP16ARITH_X16, batch_gt_16) {
     TEST_REQUIRES_ARM_NEON_FP16_ARITH;
     for (size_t batch_size = 17; batch_size < 32; batch_size++) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
-        .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x16, VBinOpMicrokernelTester::OpType::Sub);
+        .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x16, VBinaryMicrokernelTester::OpType::Sub);
     }
   }
 
   TEST(F16_VSUB_MINMAX__NEONFP16ARITH_X16, inplace_a) {
     TEST_REQUIRES_ARM_NEON_FP16_ARITH;
     for (size_t batch_size = 1; batch_size <= 80; batch_size += 15) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace_a(true)
-        .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x16, VBinOpMicrokernelTester::OpType::Sub);
+        .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x16, VBinaryMicrokernelTester::OpType::Sub);
     }
   }
 
   TEST(F16_VSUB_MINMAX__NEONFP16ARITH_X16, inplace_b) {
     TEST_REQUIRES_ARM_NEON_FP16_ARITH;
     for (size_t batch_size = 1; batch_size <= 80; batch_size += 15) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
         .inplace_b(true)
-        .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x16, VBinOpMicrokernelTester::OpType::Sub);
+        .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x16, VBinaryMicrokernelTester::OpType::Sub);
     }
   }
 
   TEST(F16_VSUB_MINMAX__NEONFP16ARITH_X16, inplace_a_and_b) {
     TEST_REQUIRES_ARM_NEON_FP16_ARITH;
     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_f16_vsub_minmax_ukernel__neonfp16arith_x16, VBinOpMicrokernelTester::OpType::Sub);
+        .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x16, VBinaryMicrokernelTester::OpType::Sub);
     }
   }
 
   TEST(F16_VSUB_MINMAX__NEONFP16ARITH_X16, qmin) {
     TEST_REQUIRES_ARM_NEON_FP16_ARITH;
     for (size_t batch_size = 1; batch_size <= 80; batch_size += 15) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
         .qmin(128)
-        .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x16, VBinOpMicrokernelTester::OpType::Sub);
+        .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x16, VBinaryMicrokernelTester::OpType::Sub);
     }
   }
 
   TEST(F16_VSUB_MINMAX__NEONFP16ARITH_X16, qmax) {
     TEST_REQUIRES_ARM_NEON_FP16_ARITH;
     for (size_t batch_size = 1; batch_size <= 80; batch_size += 15) {
-      VBinOpMicrokernelTester()
+      VBinaryMicrokernelTester()
         .batch_size(batch_size)
         .qmax(128)
-        .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x16, VBinOpMicrokernelTester::OpType::Sub);
+        .Test(xnn_f16_vsub_minmax_ukernel__neonfp16arith_x16, VBinaryMicrokernelTester::OpType::Sub);
     }
   }
 #endif  // XNN_ARCH_ARM64