Move mask_table into VBINARY[C] AVX microkernel parameters
Unblock amalgamation for F32 VBINARY[C] AVX microkernels
PiperOrigin-RevId: 418999851
diff --git a/test/f32-vrdivc-relu.cc b/test/f32-vrdivc-relu.cc
index 498df3b..fa7aa7e 100644
--- a/test/f32-vrdivc-relu.cc
+++ b/test/f32-vrdivc-relu.cc
@@ -148,14 +148,14 @@
TEST(F32_VRDIVC_RELU__WASM_X1, batch_eq_1) {
VBinaryCMicrokernelTester()
.batch_size(1)
- .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x1, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .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++) {
VBinaryCMicrokernelTester()
.batch_size(batch_size)
- .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x1, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x1, VBinaryCMicrokernelTester::OpType::RDivC);
}
}
@@ -164,7 +164,7 @@
VBinaryCMicrokernelTester()
.batch_size(batch_size)
.inplace(true)
- .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x1, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x1, VBinaryCMicrokernelTester::OpType::RDivC);
}
}
#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD || XNN_ARCH_WASMRELAXEDSIMD
@@ -174,14 +174,14 @@
TEST(F32_VRDIVC_RELU__WASM_X2, batch_eq_2) {
VBinaryCMicrokernelTester()
.batch_size(2)
- .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x2, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .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) {
VBinaryCMicrokernelTester()
.batch_size(batch_size)
- .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x2, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x2, VBinaryCMicrokernelTester::OpType::RDivC);
}
}
@@ -189,7 +189,7 @@
for (size_t batch_size = 1; batch_size < 2; batch_size++) {
VBinaryCMicrokernelTester()
.batch_size(batch_size)
- .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x2, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x2, VBinaryCMicrokernelTester::OpType::RDivC);
}
}
@@ -197,7 +197,7 @@
for (size_t batch_size = 3; batch_size < 4; batch_size++) {
VBinaryCMicrokernelTester()
.batch_size(batch_size)
- .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x2, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x2, VBinaryCMicrokernelTester::OpType::RDivC);
}
}
@@ -206,7 +206,7 @@
VBinaryCMicrokernelTester()
.batch_size(batch_size)
.inplace(true)
- .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x2, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x2, VBinaryCMicrokernelTester::OpType::RDivC);
}
}
#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD || XNN_ARCH_WASMRELAXEDSIMD
@@ -216,14 +216,14 @@
TEST(F32_VRDIVC_RELU__WASM_X4, batch_eq_4) {
VBinaryCMicrokernelTester()
.batch_size(4)
- .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x4, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .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) {
VBinaryCMicrokernelTester()
.batch_size(batch_size)
- .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x4, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x4, VBinaryCMicrokernelTester::OpType::RDivC);
}
}
@@ -231,7 +231,7 @@
for (size_t batch_size = 1; batch_size < 4; batch_size++) {
VBinaryCMicrokernelTester()
.batch_size(batch_size)
- .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x4, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x4, VBinaryCMicrokernelTester::OpType::RDivC);
}
}
@@ -239,7 +239,7 @@
for (size_t batch_size = 5; batch_size < 8; batch_size++) {
VBinaryCMicrokernelTester()
.batch_size(batch_size)
- .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x4, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x4, VBinaryCMicrokernelTester::OpType::RDivC);
}
}
@@ -248,7 +248,7 @@
VBinaryCMicrokernelTester()
.batch_size(batch_size)
.inplace(true)
- .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x4, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x4, VBinaryCMicrokernelTester::OpType::RDivC);
}
}
#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD || XNN_ARCH_WASMRELAXEDSIMD
@@ -258,14 +258,14 @@
TEST(F32_VRDIVC_RELU__WASM_X8, batch_eq_8) {
VBinaryCMicrokernelTester()
.batch_size(8)
- .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x8, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .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) {
VBinaryCMicrokernelTester()
.batch_size(batch_size)
- .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x8, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x8, VBinaryCMicrokernelTester::OpType::RDivC);
}
}
@@ -273,7 +273,7 @@
for (size_t batch_size = 1; batch_size < 8; batch_size++) {
VBinaryCMicrokernelTester()
.batch_size(batch_size)
- .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x8, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x8, VBinaryCMicrokernelTester::OpType::RDivC);
}
}
@@ -281,7 +281,7 @@
for (size_t batch_size = 9; batch_size < 16; batch_size++) {
VBinaryCMicrokernelTester()
.batch_size(batch_size)
- .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x8, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x8, VBinaryCMicrokernelTester::OpType::RDivC);
}
}
@@ -290,7 +290,7 @@
VBinaryCMicrokernelTester()
.batch_size(batch_size)
.inplace(true)
- .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x8, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__wasm_x8, VBinaryCMicrokernelTester::OpType::RDivC);
}
}
#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD || XNN_ARCH_WASMRELAXEDSIMD
@@ -299,14 +299,14 @@
TEST(F32_VRDIVC_RELU__SCALAR_X1, batch_eq_1) {
VBinaryCMicrokernelTester()
.batch_size(1)
- .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x1, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x1, VBinaryCMicrokernelTester::OpType::RDivC);
}
TEST(F32_VRDIVC_RELU__SCALAR_X1, batch_gt_1) {
for (size_t batch_size = 2; batch_size < 10; batch_size++) {
VBinaryCMicrokernelTester()
.batch_size(batch_size)
- .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x1, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x1, VBinaryCMicrokernelTester::OpType::RDivC);
}
}
@@ -315,7 +315,7 @@
VBinaryCMicrokernelTester()
.batch_size(batch_size)
.inplace(true)
- .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x1, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x1, VBinaryCMicrokernelTester::OpType::RDivC);
}
}
@@ -323,14 +323,14 @@
TEST(F32_VRDIVC_RELU__SCALAR_X2, batch_eq_2) {
VBinaryCMicrokernelTester()
.batch_size(2)
- .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x2, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x2, VBinaryCMicrokernelTester::OpType::RDivC);
}
TEST(F32_VRDIVC_RELU__SCALAR_X2, batch_div_2) {
for (size_t batch_size = 4; batch_size < 20; batch_size += 2) {
VBinaryCMicrokernelTester()
.batch_size(batch_size)
- .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x2, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x2, VBinaryCMicrokernelTester::OpType::RDivC);
}
}
@@ -338,7 +338,7 @@
for (size_t batch_size = 1; batch_size < 2; batch_size++) {
VBinaryCMicrokernelTester()
.batch_size(batch_size)
- .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x2, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x2, VBinaryCMicrokernelTester::OpType::RDivC);
}
}
@@ -346,7 +346,7 @@
for (size_t batch_size = 3; batch_size < 4; batch_size++) {
VBinaryCMicrokernelTester()
.batch_size(batch_size)
- .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x2, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x2, VBinaryCMicrokernelTester::OpType::RDivC);
}
}
@@ -355,7 +355,7 @@
VBinaryCMicrokernelTester()
.batch_size(batch_size)
.inplace(true)
- .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x2, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x2, VBinaryCMicrokernelTester::OpType::RDivC);
}
}
@@ -363,14 +363,14 @@
TEST(F32_VRDIVC_RELU__SCALAR_X4, batch_eq_4) {
VBinaryCMicrokernelTester()
.batch_size(4)
- .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x4, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x4, VBinaryCMicrokernelTester::OpType::RDivC);
}
TEST(F32_VRDIVC_RELU__SCALAR_X4, batch_div_4) {
for (size_t batch_size = 8; batch_size < 40; batch_size += 4) {
VBinaryCMicrokernelTester()
.batch_size(batch_size)
- .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x4, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x4, VBinaryCMicrokernelTester::OpType::RDivC);
}
}
@@ -378,7 +378,7 @@
for (size_t batch_size = 1; batch_size < 4; batch_size++) {
VBinaryCMicrokernelTester()
.batch_size(batch_size)
- .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x4, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x4, VBinaryCMicrokernelTester::OpType::RDivC);
}
}
@@ -386,7 +386,7 @@
for (size_t batch_size = 5; batch_size < 8; batch_size++) {
VBinaryCMicrokernelTester()
.batch_size(batch_size)
- .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x4, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x4, VBinaryCMicrokernelTester::OpType::RDivC);
}
}
@@ -395,7 +395,7 @@
VBinaryCMicrokernelTester()
.batch_size(batch_size)
.inplace(true)
- .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x4, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x4, VBinaryCMicrokernelTester::OpType::RDivC);
}
}
@@ -403,14 +403,14 @@
TEST(F32_VRDIVC_RELU__SCALAR_X8, batch_eq_8) {
VBinaryCMicrokernelTester()
.batch_size(8)
- .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x8, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x8, VBinaryCMicrokernelTester::OpType::RDivC);
}
TEST(F32_VRDIVC_RELU__SCALAR_X8, batch_div_8) {
for (size_t batch_size = 16; batch_size < 80; batch_size += 8) {
VBinaryCMicrokernelTester()
.batch_size(batch_size)
- .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x8, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x8, VBinaryCMicrokernelTester::OpType::RDivC);
}
}
@@ -418,7 +418,7 @@
for (size_t batch_size = 1; batch_size < 8; batch_size++) {
VBinaryCMicrokernelTester()
.batch_size(batch_size)
- .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x8, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x8, VBinaryCMicrokernelTester::OpType::RDivC);
}
}
@@ -426,7 +426,7 @@
for (size_t batch_size = 9; batch_size < 16; batch_size++) {
VBinaryCMicrokernelTester()
.batch_size(batch_size)
- .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x8, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x8, VBinaryCMicrokernelTester::OpType::RDivC);
}
}
@@ -435,6 +435,6 @@
VBinaryCMicrokernelTester()
.batch_size(batch_size)
.inplace(true)
- .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x8, VBinaryCMicrokernelTester::OpType::RDivC, VBinaryCMicrokernelTester::Variant::Scalar);
+ .Test(xnn_f32_vrdivc_relu_ukernel__scalar_x8, VBinaryCMicrokernelTester::OpType::RDivC);
}
}