commit 98c52155e1a61f3703e72f8f7f63c57158635f59
author Marat Dukhan <maratek@google.com> Thu Dec 30 13:31:00 2021 -0800
committer XNNPACK Team <xnnpack-github-robot@google.com> Thu Dec 30 13:32:22 2021 -0800
tree ceade81457312ab721040353a3423dc7d1d1b3e2
parent 0f2819342b83ce9c47d19d4e0ba8a0bc38799844

Move mask_table into VBINARY[C] AVX microkernel parameters

Unblock amalgamation for F32 VBINARY[C] AVX microkernels

PiperOrigin-RevId: 418999851

test/f32-vdiv.cc

diff --git a/test/f32-vdiv.cc b/test/f32-vdiv.cc
index 97b7358..851c6c1 100644
--- a/test/f32-vdiv.cc
+++ b/test/f32-vdiv.cc
@@ -204,14 +204,14 @@
 TEST(F32_VDIV__SCALAR_X1, batch_eq_1) {
   VBinaryMicrokernelTester()
     .batch_size(1)
-    .Test(xnn_f32_vdiv_ukernel__scalar_x1, VBinaryMicrokernelTester::OpType::Div, VBinaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vdiv_ukernel__scalar_x1, VBinaryMicrokernelTester::OpType::Div);
 }
 
 TEST(F32_VDIV__SCALAR_X1, batch_gt_1) {
   for (size_t batch_size = 2; batch_size < 10; batch_size++) {
     VBinaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vdiv_ukernel__scalar_x1, VBinaryMicrokernelTester::OpType::Div, VBinaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vdiv_ukernel__scalar_x1, VBinaryMicrokernelTester::OpType::Div);
   }
 }
 
@@ -220,7 +220,7 @@
     VBinaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace_a(true)
-      .Test(xnn_f32_vdiv_ukernel__scalar_x1, VBinaryMicrokernelTester::OpType::Div, VBinaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vdiv_ukernel__scalar_x1, VBinaryMicrokernelTester::OpType::Div);
   }
 }
 
@@ -229,7 +229,7 @@
     VBinaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace_b(true)
-      .Test(xnn_f32_vdiv_ukernel__scalar_x1, VBinaryMicrokernelTester::OpType::Div, VBinaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vdiv_ukernel__scalar_x1, VBinaryMicrokernelTester::OpType::Div);
   }
 }
 
@@ -239,7 +239,7 @@
       .batch_size(batch_size)
       .inplace_a(true)
       .inplace_b(true)
-      .Test(xnn_f32_vdiv_ukernel__scalar_x1, VBinaryMicrokernelTester::OpType::Div, VBinaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vdiv_ukernel__scalar_x1, VBinaryMicrokernelTester::OpType::Div);
   }
 }
 
@@ -247,14 +247,14 @@
 TEST(F32_VDIV__SCALAR_X2, batch_eq_2) {
   VBinaryMicrokernelTester()
     .batch_size(2)
-    .Test(xnn_f32_vdiv_ukernel__scalar_x2, VBinaryMicrokernelTester::OpType::Div, VBinaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vdiv_ukernel__scalar_x2, VBinaryMicrokernelTester::OpType::Div);
 }
 
 TEST(F32_VDIV__SCALAR_X2, batch_div_2) {
   for (size_t batch_size = 4; batch_size < 20; batch_size += 2) {
     VBinaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vdiv_ukernel__scalar_x2, VBinaryMicrokernelTester::OpType::Div, VBinaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vdiv_ukernel__scalar_x2, VBinaryMicrokernelTester::OpType::Div);
   }
 }
 
@@ -262,7 +262,7 @@
   for (size_t batch_size = 1; batch_size < 2; batch_size++) {
     VBinaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vdiv_ukernel__scalar_x2, VBinaryMicrokernelTester::OpType::Div, VBinaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vdiv_ukernel__scalar_x2, VBinaryMicrokernelTester::OpType::Div);
   }
 }
 
@@ -270,7 +270,7 @@
   for (size_t batch_size = 3; batch_size < 4; batch_size++) {
     VBinaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vdiv_ukernel__scalar_x2, VBinaryMicrokernelTester::OpType::Div, VBinaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vdiv_ukernel__scalar_x2, VBinaryMicrokernelTester::OpType::Div);
   }
 }
 
@@ -279,7 +279,7 @@
     VBinaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace_a(true)
-      .Test(xnn_f32_vdiv_ukernel__scalar_x2, VBinaryMicrokernelTester::OpType::Div, VBinaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vdiv_ukernel__scalar_x2, VBinaryMicrokernelTester::OpType::Div);
   }
 }
 
@@ -288,7 +288,7 @@
     VBinaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace_b(true)
-      .Test(xnn_f32_vdiv_ukernel__scalar_x2, VBinaryMicrokernelTester::OpType::Div, VBinaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vdiv_ukernel__scalar_x2, VBinaryMicrokernelTester::OpType::Div);
   }
 }
 
@@ -298,7 +298,7 @@
       .batch_size(batch_size)
       .inplace_a(true)
       .inplace_b(true)
-      .Test(xnn_f32_vdiv_ukernel__scalar_x2, VBinaryMicrokernelTester::OpType::Div, VBinaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vdiv_ukernel__scalar_x2, VBinaryMicrokernelTester::OpType::Div);
   }
 }
 
@@ -306,14 +306,14 @@
 TEST(F32_VDIV__SCALAR_X4, batch_eq_4) {
   VBinaryMicrokernelTester()
     .batch_size(4)
-    .Test(xnn_f32_vdiv_ukernel__scalar_x4, VBinaryMicrokernelTester::OpType::Div, VBinaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vdiv_ukernel__scalar_x4, VBinaryMicrokernelTester::OpType::Div);
 }
 
 TEST(F32_VDIV__SCALAR_X4, batch_div_4) {
   for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
     VBinaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vdiv_ukernel__scalar_x4, VBinaryMicrokernelTester::OpType::Div, VBinaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vdiv_ukernel__scalar_x4, VBinaryMicrokernelTester::OpType::Div);
   }
 }
 
@@ -321,7 +321,7 @@
   for (size_t batch_size = 1; batch_size < 4; batch_size++) {
     VBinaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vdiv_ukernel__scalar_x4, VBinaryMicrokernelTester::OpType::Div, VBinaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vdiv_ukernel__scalar_x4, VBinaryMicrokernelTester::OpType::Div);
   }
 }
 
@@ -329,7 +329,7 @@
   for (size_t batch_size = 5; batch_size < 8; batch_size++) {
     VBinaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vdiv_ukernel__scalar_x4, VBinaryMicrokernelTester::OpType::Div, VBinaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vdiv_ukernel__scalar_x4, VBinaryMicrokernelTester::OpType::Div);
   }
 }
 
@@ -338,7 +338,7 @@
     VBinaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace_a(true)
-      .Test(xnn_f32_vdiv_ukernel__scalar_x4, VBinaryMicrokernelTester::OpType::Div, VBinaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vdiv_ukernel__scalar_x4, VBinaryMicrokernelTester::OpType::Div);
   }
 }
 
@@ -347,7 +347,7 @@
     VBinaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace_b(true)
-      .Test(xnn_f32_vdiv_ukernel__scalar_x4, VBinaryMicrokernelTester::OpType::Div, VBinaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vdiv_ukernel__scalar_x4, VBinaryMicrokernelTester::OpType::Div);
   }
 }
 
@@ -357,7 +357,7 @@
       .batch_size(batch_size)
       .inplace_a(true)
       .inplace_b(true)
-      .Test(xnn_f32_vdiv_ukernel__scalar_x4, VBinaryMicrokernelTester::OpType::Div, VBinaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vdiv_ukernel__scalar_x4, VBinaryMicrokernelTester::OpType::Div);
   }
 }
 
@@ -365,14 +365,14 @@
 TEST(F32_VDIV__SCALAR_X8, batch_eq_8) {
   VBinaryMicrokernelTester()
     .batch_size(8)
-    .Test(xnn_f32_vdiv_ukernel__scalar_x8, VBinaryMicrokernelTester::OpType::Div, VBinaryMicrokernelTester::Variant::Scalar);
+    .Test(xnn_f32_vdiv_ukernel__scalar_x8, VBinaryMicrokernelTester::OpType::Div);
 }
 
 TEST(F32_VDIV__SCALAR_X8, batch_div_8) {
   for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
     VBinaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vdiv_ukernel__scalar_x8, VBinaryMicrokernelTester::OpType::Div, VBinaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vdiv_ukernel__scalar_x8, VBinaryMicrokernelTester::OpType::Div);
   }
 }
 
@@ -380,7 +380,7 @@
   for (size_t batch_size = 1; batch_size < 8; batch_size++) {
     VBinaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vdiv_ukernel__scalar_x8, VBinaryMicrokernelTester::OpType::Div, VBinaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vdiv_ukernel__scalar_x8, VBinaryMicrokernelTester::OpType::Div);
   }
 }
 
@@ -388,7 +388,7 @@
   for (size_t batch_size = 9; batch_size < 16; batch_size++) {
     VBinaryMicrokernelTester()
       .batch_size(batch_size)
-      .Test(xnn_f32_vdiv_ukernel__scalar_x8, VBinaryMicrokernelTester::OpType::Div, VBinaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vdiv_ukernel__scalar_x8, VBinaryMicrokernelTester::OpType::Div);
   }
 }
 
@@ -397,7 +397,7 @@
     VBinaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace_a(true)
-      .Test(xnn_f32_vdiv_ukernel__scalar_x8, VBinaryMicrokernelTester::OpType::Div, VBinaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vdiv_ukernel__scalar_x8, VBinaryMicrokernelTester::OpType::Div);
   }
 }
 
@@ -406,7 +406,7 @@
     VBinaryMicrokernelTester()
       .batch_size(batch_size)
       .inplace_b(true)
-      .Test(xnn_f32_vdiv_ukernel__scalar_x8, VBinaryMicrokernelTester::OpType::Div, VBinaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vdiv_ukernel__scalar_x8, VBinaryMicrokernelTester::OpType::Div);
   }
 }
 
@@ -416,6 +416,6 @@
       .batch_size(batch_size)
       .inplace_a(true)
       .inplace_b(true)
-      .Test(xnn_f32_vdiv_ukernel__scalar_x8, VBinaryMicrokernelTester::OpType::Div, VBinaryMicrokernelTester::Variant::Scalar);
+      .Test(xnn_f32_vdiv_ukernel__scalar_x8, VBinaryMicrokernelTester::OpType::Div);
   }
 }