Enable WAsm MVP tests in WAsm SIMD builds
PiperOrigin-RevId: 318530711
diff --git a/test/f32-clamp.cc b/test/f32-clamp.cc
index 8e0b190..cc9d8ec 100644
--- a/test/f32-clamp.cc
+++ b/test/f32-clamp.cc
@@ -747,7 +747,7 @@
#endif // !XNN_ARCH_ASMJS && !XNN_ARCH_WASM && !XNN_COMPILER_MSVC && !XNN_COMPILER_ICC
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_CLAMP__WASM_X1, batch_eq_1) {
ClampMicrokernelTester()
.batch_size(1)
@@ -794,10 +794,10 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_CLAMP__WASM_X2, batch_eq_2) {
ClampMicrokernelTester()
.batch_size(2)
@@ -860,10 +860,10 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_CLAMP__WASM_X4, batch_eq_4) {
ClampMicrokernelTester()
.batch_size(4)
@@ -926,7 +926,7 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_CLAMP__SCALAR_X1, batch_eq_1) {
diff --git a/test/f32-dwconv-minmax.cc b/test/f32-dwconv-minmax.cc
index 54b48f5..85a0b9a 100644
--- a/test/f32-dwconv-minmax.cc
+++ b/test/f32-dwconv-minmax.cc
@@ -20129,7 +20129,7 @@
#endif // XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_DWCONV_MINMAX_UP1X4__WASM, c_eq_1) {
DWConvMicrokernelTester()
.cr(1)
@@ -20255,10 +20255,10 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_DWCONV_MINMAX_UP1X4__WASM_ACC2, c_eq_1) {
DWConvMicrokernelTester()
.cr(1)
@@ -20384,10 +20384,10 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_DWCONV_MINMAX_UP2X4__WASM, c_eq_2) {
DWConvMicrokernelTester()
.cr(2)
@@ -20555,10 +20555,10 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_DWCONV_MINMAX_UP2X4__WASM_ACC2, c_eq_2) {
DWConvMicrokernelTester()
.cr(2)
@@ -20726,10 +20726,10 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_DWCONV_MINMAX_UP1X9__WASM, c_eq_1) {
DWConvMicrokernelTester()
.cr(1)
@@ -20855,10 +20855,10 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_DWCONV_MINMAX_UP1X9__WASM_ACC2, c_eq_1) {
DWConvMicrokernelTester()
.cr(1)
@@ -20984,10 +20984,10 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_DWCONV_MINMAX_UP2X9__WASM, c_eq_2) {
DWConvMicrokernelTester()
.cr(2)
@@ -21155,10 +21155,10 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_DWCONV_MINMAX_UP2X9__WASM_ACC2, c_eq_2) {
DWConvMicrokernelTester()
.cr(2)
@@ -21326,10 +21326,10 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_DWCONV_MINMAX_UP1X25__WASM, c_eq_1) {
DWConvMicrokernelTester()
.cr(1)
@@ -21455,10 +21455,10 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_DWCONV_MINMAX_UP1X25__WASM_ACC2, c_eq_1) {
DWConvMicrokernelTester()
.cr(1)
@@ -21584,10 +21584,10 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_DWCONV_MINMAX_UP2X25__WASM, c_eq_2) {
DWConvMicrokernelTester()
.cr(2)
@@ -21755,10 +21755,10 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_DWCONV_MINMAX_UP2X25__WASM_ACC2, c_eq_2) {
DWConvMicrokernelTester()
.cr(2)
@@ -21926,7 +21926,7 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_DWCONV_MINMAX_UP1X4__SCALAR, c_eq_1) {
diff --git a/test/f32-dwconv.cc b/test/f32-dwconv.cc
index 7ad4e77..49306c4 100644
--- a/test/f32-dwconv.cc
+++ b/test/f32-dwconv.cc
@@ -638,7 +638,7 @@
#endif // XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_DWCONV_UP1X4__WASM, c_eq_1) {
DWConvMicrokernelTester()
.cr(1)
@@ -718,10 +718,10 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_DWCONV_UP1X4__WASM_ACC2, c_eq_1) {
DWConvMicrokernelTester()
.cr(1)
@@ -801,10 +801,10 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_DWCONV_UP2X4__WASM, c_eq_2) {
DWConvMicrokernelTester()
.cr(2)
@@ -904,10 +904,10 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_DWCONV_UP2X4__WASM_ACC2, c_eq_2) {
DWConvMicrokernelTester()
.cr(2)
@@ -1007,10 +1007,10 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_DWCONV_UP1X9__WASM, c_eq_1) {
DWConvMicrokernelTester()
.cr(1)
@@ -1090,10 +1090,10 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_DWCONV_UP1X9__WASM_ACC2, c_eq_1) {
DWConvMicrokernelTester()
.cr(1)
@@ -1173,10 +1173,10 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_DWCONV_UP2X9__WASM, c_eq_2) {
DWConvMicrokernelTester()
.cr(2)
@@ -1276,10 +1276,10 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_DWCONV_UP2X9__WASM_ACC2, c_eq_2) {
DWConvMicrokernelTester()
.cr(2)
@@ -1379,10 +1379,10 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_DWCONV_UP1X25__WASM, c_eq_1) {
DWConvMicrokernelTester()
.cr(1)
@@ -1462,10 +1462,10 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_DWCONV_UP1X25__WASM_ACC2, c_eq_1) {
DWConvMicrokernelTester()
.cr(1)
@@ -1545,10 +1545,10 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_DWCONV_UP2X25__WASM, c_eq_2) {
DWConvMicrokernelTester()
.cr(2)
@@ -1648,10 +1648,10 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_DWCONV_UP2X25__WASM_ACC2, c_eq_2) {
DWConvMicrokernelTester()
.cr(2)
@@ -1751,7 +1751,7 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_DWCONV_UP1X4__SCALAR, c_eq_1) {
diff --git a/test/f32-gemm-minmax.cc b/test/f32-gemm-minmax.cc
index 7ce4000..c6ae955 100644
--- a/test/f32-gemm-minmax.cc
+++ b/test/f32-gemm-minmax.cc
@@ -57625,7 +57625,7 @@
#endif // XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_GEMM_MINMAX_1X4__WASM, k_eq_1) {
GemmMicrokernelTester()
.mr(1)
@@ -57955,10 +57955,10 @@
.cm_stride(7)
.Test(xnn_f32_gemm_minmax_ukernel_1x4__wasm, GemmMicrokernelTester::Variant::Scalar);
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_GEMM_MINMAX_2X4__WASM, k_eq_1) {
GemmMicrokernelTester()
.mr(2)
@@ -58288,10 +58288,10 @@
.cm_stride(7)
.Test(xnn_f32_gemm_minmax_ukernel_2x4__wasm, GemmMicrokernelTester::Variant::Scalar);
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_GEMM_MINMAX_4X4__WASM, k_eq_1) {
GemmMicrokernelTester()
.mr(4)
@@ -58621,10 +58621,10 @@
.cm_stride(7)
.Test(xnn_f32_gemm_minmax_ukernel_4x4__wasm, GemmMicrokernelTester::Variant::Scalar);
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_GEMM_MINMAX_4X2__WASM, k_eq_1) {
GemmMicrokernelTester()
.mr(4)
@@ -58954,7 +58954,7 @@
.cm_stride(5)
.Test(xnn_f32_gemm_minmax_ukernel_4x2__wasm, GemmMicrokernelTester::Variant::Scalar);
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_GEMM_MINMAX_1X4__SCALAR, k_eq_1) {
diff --git a/test/f32-gemm-relu.cc b/test/f32-gemm-relu.cc
index a60fcef..c37dcee 100644
--- a/test/f32-gemm-relu.cc
+++ b/test/f32-gemm-relu.cc
@@ -1634,7 +1634,7 @@
#endif // XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_GEMM_RELU_1X4__WASM, k_eq_1) {
GemmMicrokernelTester()
.mr(1)
@@ -1938,10 +1938,10 @@
.cm_stride(7)
.Test(xnn_f32_gemm_relu_ukernel_1x4__wasm);
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_GEMM_RELU_2X4__WASM, k_eq_1) {
GemmMicrokernelTester()
.mr(2)
@@ -2245,10 +2245,10 @@
.cm_stride(7)
.Test(xnn_f32_gemm_relu_ukernel_2x4__wasm);
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_GEMM_RELU_4X4__WASM, k_eq_1) {
GemmMicrokernelTester()
.mr(4)
@@ -2552,10 +2552,10 @@
.cm_stride(7)
.Test(xnn_f32_gemm_relu_ukernel_4x4__wasm);
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_GEMM_RELU_4X2__WASM, k_eq_1) {
GemmMicrokernelTester()
.mr(4)
@@ -2859,7 +2859,7 @@
.cm_stride(5)
.Test(xnn_f32_gemm_relu_ukernel_4x2__wasm);
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_GEMM_RELU_1X4__SCALAR, k_eq_1) {
diff --git a/test/f32-gemm.cc b/test/f32-gemm.cc
index ceed6d2..b77544e 100644
--- a/test/f32-gemm.cc
+++ b/test/f32-gemm.cc
@@ -1634,7 +1634,7 @@
#endif // XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_GEMM_1X4__WASM, k_eq_1) {
GemmMicrokernelTester()
.mr(1)
@@ -1938,10 +1938,10 @@
.cm_stride(7)
.Test(xnn_f32_gemm_ukernel_1x4__wasm);
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_GEMM_2X4__WASM, k_eq_1) {
GemmMicrokernelTester()
.mr(2)
@@ -2245,10 +2245,10 @@
.cm_stride(7)
.Test(xnn_f32_gemm_ukernel_2x4__wasm);
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_GEMM_4X4__WASM, k_eq_1) {
GemmMicrokernelTester()
.mr(4)
@@ -2552,10 +2552,10 @@
.cm_stride(7)
.Test(xnn_f32_gemm_ukernel_4x4__wasm);
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_GEMM_4X2__WASM, k_eq_1) {
GemmMicrokernelTester()
.mr(4)
@@ -2859,7 +2859,7 @@
.cm_stride(5)
.Test(xnn_f32_gemm_ukernel_4x2__wasm);
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_GEMM_1X4__SCALAR, k_eq_1) {
diff --git a/test/f32-gemminc-minmax.cc b/test/f32-gemminc-minmax.cc
index 90c883e..785b55c 100644
--- a/test/f32-gemminc-minmax.cc
+++ b/test/f32-gemminc-minmax.cc
@@ -52366,7 +52366,7 @@
#endif // XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_GEMMINC_MINMAX_1X4__WASM, k_eq_1) {
GemmMicrokernelTester()
.mr(1)
@@ -52696,10 +52696,10 @@
.cm_stride(7)
.Test(xnn_f32_gemminc_minmax_ukernel_1x4__wasm, GemmMicrokernelTester::Variant::Scalar);
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_GEMMINC_MINMAX_2X4__WASM, k_eq_1) {
GemmMicrokernelTester()
.mr(2)
@@ -53029,10 +53029,10 @@
.cm_stride(7)
.Test(xnn_f32_gemminc_minmax_ukernel_2x4__wasm, GemmMicrokernelTester::Variant::Scalar);
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_GEMMINC_MINMAX_4X4__WASM, k_eq_1) {
GemmMicrokernelTester()
.mr(4)
@@ -53362,7 +53362,7 @@
.cm_stride(7)
.Test(xnn_f32_gemminc_minmax_ukernel_4x4__wasm, GemmMicrokernelTester::Variant::Scalar);
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_GEMMINC_MINMAX_1X4__SCALAR, k_eq_1) {
diff --git a/test/f32-hswish.cc b/test/f32-hswish.cc
index d5a0ea4..8f4927d 100644
--- a/test/f32-hswish.cc
+++ b/test/f32-hswish.cc
@@ -927,7 +927,7 @@
#endif // XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_HSWISH__WASM_X1, batch_eq_1) {
HSwishMicrokernelTester()
.batch_size(1)
@@ -950,10 +950,10 @@
.Test(xnn_f32_hswish_ukernel__wasm_x1, HSwishMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_HSWISH__WASM_X2, batch_eq_2) {
HSwishMicrokernelTester()
.batch_size(2)
@@ -992,10 +992,10 @@
.Test(xnn_f32_hswish_ukernel__wasm_x2, HSwishMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_HSWISH__WASM_X4, batch_eq_4) {
HSwishMicrokernelTester()
.batch_size(4)
@@ -1034,7 +1034,7 @@
.Test(xnn_f32_hswish_ukernel__wasm_x4, HSwishMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_HSWISH__SCALAR_X1, batch_eq_1) {
diff --git a/test/f32-igemm-minmax.cc b/test/f32-igemm-minmax.cc
index 9f9eed6..ca1e566 100644
--- a/test/f32-igemm-minmax.cc
+++ b/test/f32-igemm-minmax.cc
@@ -57912,7 +57912,7 @@
#endif // XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_IGEMM_MINMAX_1X4__WASM, k_eq_1) {
GemmMicrokernelTester()
.mr(1)
@@ -58284,10 +58284,10 @@
.cm_stride(7)
.Test(xnn_f32_igemm_minmax_ukernel_1x4__wasm, GemmMicrokernelTester::Variant::Scalar);
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_IGEMM_MINMAX_2X4__WASM, k_eq_1) {
GemmMicrokernelTester()
.mr(2)
@@ -58659,10 +58659,10 @@
.cm_stride(7)
.Test(xnn_f32_igemm_minmax_ukernel_2x4__wasm, GemmMicrokernelTester::Variant::Scalar);
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_IGEMM_MINMAX_4X4__WASM, k_eq_1) {
GemmMicrokernelTester()
.mr(4)
@@ -59034,10 +59034,10 @@
.cm_stride(7)
.Test(xnn_f32_igemm_minmax_ukernel_4x4__wasm, GemmMicrokernelTester::Variant::Scalar);
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_IGEMM_MINMAX_4X2__WASM, k_eq_1) {
GemmMicrokernelTester()
.mr(4)
@@ -59409,7 +59409,7 @@
.cm_stride(5)
.Test(xnn_f32_igemm_minmax_ukernel_4x2__wasm, GemmMicrokernelTester::Variant::Scalar);
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_IGEMM_MINMAX_1X4__SCALAR, k_eq_1) {
diff --git a/test/f32-igemm-relu.cc b/test/f32-igemm-relu.cc
index 8d77235..e6b5f0d 100644
--- a/test/f32-igemm-relu.cc
+++ b/test/f32-igemm-relu.cc
@@ -1682,7 +1682,7 @@
#endif // XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_IGEMM_RELU_1X4__WASM, k_eq_1) {
GemmMicrokernelTester()
.mr(1)
@@ -2028,10 +2028,10 @@
.cm_stride(7)
.Test(xnn_f32_igemm_relu_ukernel_1x4__wasm);
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_IGEMM_RELU_2X4__WASM, k_eq_1) {
GemmMicrokernelTester()
.mr(2)
@@ -2377,10 +2377,10 @@
.cm_stride(7)
.Test(xnn_f32_igemm_relu_ukernel_2x4__wasm);
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_IGEMM_RELU_4X4__WASM, k_eq_1) {
GemmMicrokernelTester()
.mr(4)
@@ -2726,10 +2726,10 @@
.cm_stride(7)
.Test(xnn_f32_igemm_relu_ukernel_4x4__wasm);
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_IGEMM_RELU_4X2__WASM, k_eq_1) {
GemmMicrokernelTester()
.mr(4)
@@ -3075,7 +3075,7 @@
.cm_stride(5)
.Test(xnn_f32_igemm_relu_ukernel_4x2__wasm);
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_IGEMM_RELU_1X4__SCALAR, k_eq_1) {
diff --git a/test/f32-igemm.cc b/test/f32-igemm.cc
index c10ebfa..b44e649 100644
--- a/test/f32-igemm.cc
+++ b/test/f32-igemm.cc
@@ -1267,7 +1267,7 @@
#endif // XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_IGEMM_1X4__WASM, k_eq_1) {
GemmMicrokernelTester()
.mr(1)
@@ -1613,10 +1613,10 @@
.cm_stride(7)
.Test(xnn_f32_igemm_ukernel_1x4__wasm);
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_IGEMM_2X4__WASM, k_eq_1) {
GemmMicrokernelTester()
.mr(2)
@@ -1962,10 +1962,10 @@
.cm_stride(7)
.Test(xnn_f32_igemm_ukernel_2x4__wasm);
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_IGEMM_4X4__WASM, k_eq_1) {
GemmMicrokernelTester()
.mr(4)
@@ -2311,10 +2311,10 @@
.cm_stride(7)
.Test(xnn_f32_igemm_ukernel_4x4__wasm);
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_IGEMM_4X2__WASM, k_eq_1) {
GemmMicrokernelTester()
.mr(4)
@@ -2660,7 +2660,7 @@
.cm_stride(5)
.Test(xnn_f32_igemm_ukernel_4x2__wasm);
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_IGEMM_1X4__SCALAR, k_eq_1) {
diff --git a/test/f32-prelu.cc b/test/f32-prelu.cc
index 8e2857b..232b944 100644
--- a/test/f32-prelu.cc
+++ b/test/f32-prelu.cc
@@ -2119,7 +2119,7 @@
#endif // XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_PRELU__WASM_2X1, channels_eq_1) {
PReLUMicrokernelTester()
.rows(2)
@@ -2207,10 +2207,10 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_PRELU__WASM_2X4, channels_eq_4) {
PReLUMicrokernelTester()
.rows(2)
@@ -2316,7 +2316,7 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_PRELU__SCALAR_2X1, channels_eq_1) {
diff --git a/test/f32-vadd-minmax.cc b/test/f32-vadd-minmax.cc
index 67337ab..ed0357e 100644
--- a/test/f32-vadd-minmax.cc
+++ b/test/f32-vadd-minmax.cc
@@ -1213,7 +1213,7 @@
#endif // XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VADD_MINMAX__WASM_X1, batch_eq_1) {
VBinOpMicrokernelTester()
.batch_size(1)
@@ -1273,10 +1273,10 @@
.Test(xnn_f32_vadd_minmax_ukernel__wasm_x1, VBinOpMicrokernelTester::OpType::Add, VBinOpMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VADD_MINMAX__WASM_X2, batch_eq_2) {
VBinOpMicrokernelTester()
.batch_size(2)
@@ -1352,10 +1352,10 @@
.Test(xnn_f32_vadd_minmax_ukernel__wasm_x2, VBinOpMicrokernelTester::OpType::Add, VBinOpMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VADD_MINMAX__WASM_X4, batch_eq_4) {
VBinOpMicrokernelTester()
.batch_size(4)
@@ -1431,7 +1431,7 @@
.Test(xnn_f32_vadd_minmax_ukernel__wasm_x4, VBinOpMicrokernelTester::OpType::Add, VBinOpMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VADD_MINMAX__SCALAR_X1, batch_eq_1) {
diff --git a/test/f32-vaddc-minmax.cc b/test/f32-vaddc-minmax.cc
index ca7c1f9..20e7e3b 100644
--- a/test/f32-vaddc-minmax.cc
+++ b/test/f32-vaddc-minmax.cc
@@ -687,7 +687,7 @@
#endif // !XNN_ARCH_ASMJS && !XNN_ARCH_WASM && !XNN_COMPILER_MSVC && !XNN_COMPILER_ICC
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VADDC_MINMAX__WASM_X1, batch_eq_1) {
VBinOpCMicrokernelTester()
.batch_size(1)
@@ -728,10 +728,10 @@
.Test(xnn_f32_vaddc_minmax_ukernel__wasm_x1, VBinOpCMicrokernelTester::OpType::AddC, VBinOpCMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VADDC_MINMAX__WASM_X2, batch_eq_2) {
VBinOpCMicrokernelTester()
.batch_size(2)
@@ -788,10 +788,10 @@
.Test(xnn_f32_vaddc_minmax_ukernel__wasm_x2, VBinOpCMicrokernelTester::OpType::AddC, VBinOpCMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VADDC_MINMAX__WASM_X4, batch_eq_4) {
VBinOpCMicrokernelTester()
.batch_size(4)
@@ -848,7 +848,7 @@
.Test(xnn_f32_vaddc_minmax_ukernel__wasm_x4, VBinOpCMicrokernelTester::OpType::AddC, VBinOpCMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VADDC_MINMAX__SCALAR_X1, batch_eq_1) {
diff --git a/test/f32-vdiv-minmax.cc b/test/f32-vdiv-minmax.cc
index 1abfb60..44e6d57 100644
--- a/test/f32-vdiv-minmax.cc
+++ b/test/f32-vdiv-minmax.cc
@@ -1213,7 +1213,7 @@
#endif // XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VDIV_MINMAX__WASM_X1, batch_eq_1) {
VBinOpMicrokernelTester()
.batch_size(1)
@@ -1273,10 +1273,10 @@
.Test(xnn_f32_vdiv_minmax_ukernel__wasm_x1, VBinOpMicrokernelTester::OpType::Div, VBinOpMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VDIV_MINMAX__WASM_X2, batch_eq_2) {
VBinOpMicrokernelTester()
.batch_size(2)
@@ -1352,10 +1352,10 @@
.Test(xnn_f32_vdiv_minmax_ukernel__wasm_x2, VBinOpMicrokernelTester::OpType::Div, VBinOpMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VDIV_MINMAX__WASM_X4, batch_eq_4) {
VBinOpMicrokernelTester()
.batch_size(4)
@@ -1431,7 +1431,7 @@
.Test(xnn_f32_vdiv_minmax_ukernel__wasm_x4, VBinOpMicrokernelTester::OpType::Div, VBinOpMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VDIV_MINMAX__SCALAR_X1, batch_eq_1) {
diff --git a/test/f32-vdivc-minmax.cc b/test/f32-vdivc-minmax.cc
index cc03d6b..c66a977 100644
--- a/test/f32-vdivc-minmax.cc
+++ b/test/f32-vdivc-minmax.cc
@@ -687,7 +687,7 @@
#endif // !XNN_ARCH_ASMJS && !XNN_ARCH_WASM && !XNN_COMPILER_MSVC && !XNN_COMPILER_ICC
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VDIVC_MINMAX__WASM_X1, batch_eq_1) {
VBinOpCMicrokernelTester()
.batch_size(1)
@@ -728,10 +728,10 @@
.Test(xnn_f32_vdivc_minmax_ukernel__wasm_x1, VBinOpCMicrokernelTester::OpType::DivC, VBinOpCMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VDIVC_MINMAX__WASM_X2, batch_eq_2) {
VBinOpCMicrokernelTester()
.batch_size(2)
@@ -788,10 +788,10 @@
.Test(xnn_f32_vdivc_minmax_ukernel__wasm_x2, VBinOpCMicrokernelTester::OpType::DivC, VBinOpCMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VDIVC_MINMAX__WASM_X4, batch_eq_4) {
VBinOpCMicrokernelTester()
.batch_size(4)
@@ -848,7 +848,7 @@
.Test(xnn_f32_vdivc_minmax_ukernel__wasm_x4, VBinOpCMicrokernelTester::OpType::DivC, VBinOpCMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VDIVC_MINMAX__SCALAR_X1, batch_eq_1) {
diff --git a/test/f32-vlrelu.cc b/test/f32-vlrelu.cc
index 2e2911d..a4798ee 100644
--- a/test/f32-vlrelu.cc
+++ b/test/f32-vlrelu.cc
@@ -843,7 +843,7 @@
#endif // !XNN_ARCH_ASMJS && !XNN_ARCH_WASM && !XNN_COMPILER_MSVC && !XNN_COMPILER_ICC
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VLRELU__WASM_X1, batch_eq_1) {
VUnOpMicrokernelTester()
.batch_size(1)
@@ -877,10 +877,10 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VLRELU__WASM_X2, batch_eq_2) {
VUnOpMicrokernelTester()
.batch_size(2)
@@ -930,10 +930,10 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VLRELU__WASM_X4, batch_eq_4) {
VUnOpMicrokernelTester()
.batch_size(4)
@@ -983,7 +983,7 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VLRELU__SCALAR_X1, batch_eq_1) {
diff --git a/test/f32-vmax.cc b/test/f32-vmax.cc
index 01c3f95..58fd4a4 100644
--- a/test/f32-vmax.cc
+++ b/test/f32-vmax.cc
@@ -941,7 +941,7 @@
#endif // XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VMAX__WASM_X1, batch_eq_1) {
VBinOpMicrokernelTester()
.batch_size(1)
@@ -983,10 +983,10 @@
.Test(xnn_f32_vmax_ukernel__wasm_x1, VBinOpMicrokernelTester::OpType::Max, VBinOpMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VMAX__WASM_X2, batch_eq_2) {
VBinOpMicrokernelTester()
.batch_size(2)
@@ -1044,10 +1044,10 @@
.Test(xnn_f32_vmax_ukernel__wasm_x2, VBinOpMicrokernelTester::OpType::Max, VBinOpMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VMAX__WASM_X4, batch_eq_4) {
VBinOpMicrokernelTester()
.batch_size(4)
@@ -1105,7 +1105,7 @@
.Test(xnn_f32_vmax_ukernel__wasm_x4, VBinOpMicrokernelTester::OpType::Max, VBinOpMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VMAX__SCALAR_X1, batch_eq_1) {
diff --git a/test/f32-vmaxc.cc b/test/f32-vmaxc.cc
index cd62037..5f2c231 100644
--- a/test/f32-vmaxc.cc
+++ b/test/f32-vmaxc.cc
@@ -487,7 +487,7 @@
#endif // !XNN_ARCH_ASMJS && !XNN_ARCH_WASM && !XNN_COMPILER_MSVC && !XNN_COMPILER_ICC
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VMAXC__WASM_X1, batch_eq_1) {
VBinOpCMicrokernelTester()
.batch_size(1)
@@ -510,10 +510,10 @@
.Test(xnn_f32_vmaxc_ukernel__wasm_x1, VBinOpCMicrokernelTester::OpType::MaxC, VBinOpCMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VMAXC__WASM_X2, batch_eq_2) {
VBinOpCMicrokernelTester()
.batch_size(2)
@@ -552,10 +552,10 @@
.Test(xnn_f32_vmaxc_ukernel__wasm_x2, VBinOpCMicrokernelTester::OpType::MaxC, VBinOpCMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VMAXC__WASM_X4, batch_eq_4) {
VBinOpCMicrokernelTester()
.batch_size(4)
@@ -594,7 +594,7 @@
.Test(xnn_f32_vmaxc_ukernel__wasm_x4, VBinOpCMicrokernelTester::OpType::MaxC, VBinOpCMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VMAXC__SCALAR_X1, batch_eq_1) {
diff --git a/test/f32-vmin.cc b/test/f32-vmin.cc
index 81aad2d..d16b5dd 100644
--- a/test/f32-vmin.cc
+++ b/test/f32-vmin.cc
@@ -941,7 +941,7 @@
#endif // XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VMIN__WASM_X1, batch_eq_1) {
VBinOpMicrokernelTester()
.batch_size(1)
@@ -983,10 +983,10 @@
.Test(xnn_f32_vmin_ukernel__wasm_x1, VBinOpMicrokernelTester::OpType::Min, VBinOpMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VMIN__WASM_X2, batch_eq_2) {
VBinOpMicrokernelTester()
.batch_size(2)
@@ -1044,10 +1044,10 @@
.Test(xnn_f32_vmin_ukernel__wasm_x2, VBinOpMicrokernelTester::OpType::Min, VBinOpMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VMIN__WASM_X4, batch_eq_4) {
VBinOpMicrokernelTester()
.batch_size(4)
@@ -1105,7 +1105,7 @@
.Test(xnn_f32_vmin_ukernel__wasm_x4, VBinOpMicrokernelTester::OpType::Min, VBinOpMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VMIN__SCALAR_X1, batch_eq_1) {
diff --git a/test/f32-vminc.cc b/test/f32-vminc.cc
index b2c3713..f043b3a 100644
--- a/test/f32-vminc.cc
+++ b/test/f32-vminc.cc
@@ -487,7 +487,7 @@
#endif // !XNN_ARCH_ASMJS && !XNN_ARCH_WASM && !XNN_COMPILER_MSVC && !XNN_COMPILER_ICC
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VMINC__WASM_X1, batch_eq_1) {
VBinOpCMicrokernelTester()
.batch_size(1)
@@ -510,10 +510,10 @@
.Test(xnn_f32_vminc_ukernel__wasm_x1, VBinOpCMicrokernelTester::OpType::MinC, VBinOpCMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VMINC__WASM_X2, batch_eq_2) {
VBinOpCMicrokernelTester()
.batch_size(2)
@@ -552,10 +552,10 @@
.Test(xnn_f32_vminc_ukernel__wasm_x2, VBinOpCMicrokernelTester::OpType::MinC, VBinOpCMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VMINC__WASM_X4, batch_eq_4) {
VBinOpCMicrokernelTester()
.batch_size(4)
@@ -594,7 +594,7 @@
.Test(xnn_f32_vminc_ukernel__wasm_x4, VBinOpCMicrokernelTester::OpType::MinC, VBinOpCMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VMINC__SCALAR_X1, batch_eq_1) {
diff --git a/test/f32-vmul-minmax.cc b/test/f32-vmul-minmax.cc
index 441bc17..3c9b2a5 100644
--- a/test/f32-vmul-minmax.cc
+++ b/test/f32-vmul-minmax.cc
@@ -1213,7 +1213,7 @@
#endif // XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VMUL_MINMAX__WASM_X1, batch_eq_1) {
VBinOpMicrokernelTester()
.batch_size(1)
@@ -1273,10 +1273,10 @@
.Test(xnn_f32_vmul_minmax_ukernel__wasm_x1, VBinOpMicrokernelTester::OpType::Mul, VBinOpMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VMUL_MINMAX__WASM_X2, batch_eq_2) {
VBinOpMicrokernelTester()
.batch_size(2)
@@ -1352,10 +1352,10 @@
.Test(xnn_f32_vmul_minmax_ukernel__wasm_x2, VBinOpMicrokernelTester::OpType::Mul, VBinOpMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VMUL_MINMAX__WASM_X4, batch_eq_4) {
VBinOpMicrokernelTester()
.batch_size(4)
@@ -1431,7 +1431,7 @@
.Test(xnn_f32_vmul_minmax_ukernel__wasm_x4, VBinOpMicrokernelTester::OpType::Mul, VBinOpMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VMUL_MINMAX__SCALAR_X1, batch_eq_1) {
diff --git a/test/f32-vmulc-minmax.cc b/test/f32-vmulc-minmax.cc
index 6979d73..0c7b55e 100644
--- a/test/f32-vmulc-minmax.cc
+++ b/test/f32-vmulc-minmax.cc
@@ -687,7 +687,7 @@
#endif // !XNN_ARCH_ASMJS && !XNN_ARCH_WASM && !XNN_COMPILER_MSVC && !XNN_COMPILER_ICC
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VMULC_MINMAX__WASM_X1, batch_eq_1) {
VBinOpCMicrokernelTester()
.batch_size(1)
@@ -728,10 +728,10 @@
.Test(xnn_f32_vmulc_minmax_ukernel__wasm_x1, VBinOpCMicrokernelTester::OpType::MulC, VBinOpCMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VMULC_MINMAX__WASM_X2, batch_eq_2) {
VBinOpCMicrokernelTester()
.batch_size(2)
@@ -788,10 +788,10 @@
.Test(xnn_f32_vmulc_minmax_ukernel__wasm_x2, VBinOpCMicrokernelTester::OpType::MulC, VBinOpCMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VMULC_MINMAX__WASM_X4, batch_eq_4) {
VBinOpCMicrokernelTester()
.batch_size(4)
@@ -848,7 +848,7 @@
.Test(xnn_f32_vmulc_minmax_ukernel__wasm_x4, VBinOpCMicrokernelTester::OpType::MulC, VBinOpCMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VMULC_MINMAX__SCALAR_X1, batch_eq_1) {
diff --git a/test/f32-vmulcaddc-minmax.cc b/test/f32-vmulcaddc-minmax.cc
index 10d3291..0f1f361 100644
--- a/test/f32-vmulcaddc-minmax.cc
+++ b/test/f32-vmulcaddc-minmax.cc
@@ -1249,7 +1249,7 @@
#endif // !XNN_ARCH_ASMJS && !XNN_ARCH_WASM && !XNN_COMPILER_MSVC && !XNN_COMPILER_ICC
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VMULCADDC_C1__WASM_2X, channels_eq_1) {
VMulCAddCMicrokernelTester()
.channel_tile(1)
@@ -1368,10 +1368,10 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VMULCADDC_C2__WASM_2X, channels_eq_2) {
VMulCAddCMicrokernelTester()
.channel_tile(2)
@@ -1510,10 +1510,10 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VMULCADDC_C4__WASM_2X, channels_eq_4) {
VMulCAddCMicrokernelTester()
.channel_tile(4)
@@ -1652,7 +1652,7 @@
}
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VMULCADDC_C1__SCALAR_2X, channels_eq_1) {
diff --git a/test/f32-vrdivc-minmax.cc b/test/f32-vrdivc-minmax.cc
index 173b26d..4f2810e 100644
--- a/test/f32-vrdivc-minmax.cc
+++ b/test/f32-vrdivc-minmax.cc
@@ -687,7 +687,7 @@
#endif // !XNN_ARCH_ASMJS && !XNN_ARCH_WASM && !XNN_COMPILER_MSVC && !XNN_COMPILER_ICC
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VRDIVC_MINMAX__WASM_X1, batch_eq_1) {
VBinOpCMicrokernelTester()
.batch_size(1)
@@ -728,10 +728,10 @@
.Test(xnn_f32_vrdivc_minmax_ukernel__wasm_x1, VBinOpCMicrokernelTester::OpType::RDivC, VBinOpCMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VRDIVC_MINMAX__WASM_X2, batch_eq_2) {
VBinOpCMicrokernelTester()
.batch_size(2)
@@ -788,10 +788,10 @@
.Test(xnn_f32_vrdivc_minmax_ukernel__wasm_x2, VBinOpCMicrokernelTester::OpType::RDivC, VBinOpCMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VRDIVC_MINMAX__WASM_X4, batch_eq_4) {
VBinOpCMicrokernelTester()
.batch_size(4)
@@ -848,7 +848,7 @@
.Test(xnn_f32_vrdivc_minmax_ukernel__wasm_x4, VBinOpCMicrokernelTester::OpType::RDivC, VBinOpCMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VRDIVC_MINMAX__SCALAR_X1, batch_eq_1) {
diff --git a/test/f32-vrsubc-minmax.cc b/test/f32-vrsubc-minmax.cc
index 5303da8..d4c9837 100644
--- a/test/f32-vrsubc-minmax.cc
+++ b/test/f32-vrsubc-minmax.cc
@@ -687,7 +687,7 @@
#endif // !XNN_ARCH_ASMJS && !XNN_ARCH_WASM && !XNN_COMPILER_MSVC && !XNN_COMPILER_ICC
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VRSUBC_MINMAX__WASM_X1, batch_eq_1) {
VBinOpCMicrokernelTester()
.batch_size(1)
@@ -728,10 +728,10 @@
.Test(xnn_f32_vrsubc_minmax_ukernel__wasm_x1, VBinOpCMicrokernelTester::OpType::RSubC, VBinOpCMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VRSUBC_MINMAX__WASM_X2, batch_eq_2) {
VBinOpCMicrokernelTester()
.batch_size(2)
@@ -788,10 +788,10 @@
.Test(xnn_f32_vrsubc_minmax_ukernel__wasm_x2, VBinOpCMicrokernelTester::OpType::RSubC, VBinOpCMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VRSUBC_MINMAX__WASM_X4, batch_eq_4) {
VBinOpCMicrokernelTester()
.batch_size(4)
@@ -848,7 +848,7 @@
.Test(xnn_f32_vrsubc_minmax_ukernel__wasm_x4, VBinOpCMicrokernelTester::OpType::RSubC, VBinOpCMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VRSUBC_MINMAX__SCALAR_X1, batch_eq_1) {
diff --git a/test/f32-vsub-minmax.cc b/test/f32-vsub-minmax.cc
index 7c7832a..8769a7e 100644
--- a/test/f32-vsub-minmax.cc
+++ b/test/f32-vsub-minmax.cc
@@ -1213,7 +1213,7 @@
#endif // XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VSUB_MINMAX__WASM_X1, batch_eq_1) {
VBinOpMicrokernelTester()
.batch_size(1)
@@ -1273,10 +1273,10 @@
.Test(xnn_f32_vsub_minmax_ukernel__wasm_x1, VBinOpMicrokernelTester::OpType::Sub, VBinOpMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VSUB_MINMAX__WASM_X2, batch_eq_2) {
VBinOpMicrokernelTester()
.batch_size(2)
@@ -1352,10 +1352,10 @@
.Test(xnn_f32_vsub_minmax_ukernel__wasm_x2, VBinOpMicrokernelTester::OpType::Sub, VBinOpMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VSUB_MINMAX__WASM_X4, batch_eq_4) {
VBinOpMicrokernelTester()
.batch_size(4)
@@ -1431,7 +1431,7 @@
.Test(xnn_f32_vsub_minmax_ukernel__wasm_x4, VBinOpMicrokernelTester::OpType::Sub, VBinOpMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VSUB_MINMAX__SCALAR_X1, batch_eq_1) {
diff --git a/test/f32-vsubc-minmax.cc b/test/f32-vsubc-minmax.cc
index 20a9cdd..d373bfe 100644
--- a/test/f32-vsubc-minmax.cc
+++ b/test/f32-vsubc-minmax.cc
@@ -687,7 +687,7 @@
#endif // !XNN_ARCH_ASMJS && !XNN_ARCH_WASM && !XNN_COMPILER_MSVC && !XNN_COMPILER_ICC
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VSUBC_MINMAX__WASM_X1, batch_eq_1) {
VBinOpCMicrokernelTester()
.batch_size(1)
@@ -728,10 +728,10 @@
.Test(xnn_f32_vsubc_minmax_ukernel__wasm_x1, VBinOpCMicrokernelTester::OpType::SubC, VBinOpCMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VSUBC_MINMAX__WASM_X2, batch_eq_2) {
VBinOpCMicrokernelTester()
.batch_size(2)
@@ -788,10 +788,10 @@
.Test(xnn_f32_vsubc_minmax_ukernel__wasm_x2, VBinOpCMicrokernelTester::OpType::SubC, VBinOpCMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
-#if XNN_ARCH_WASM
+#if XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VSUBC_MINMAX__WASM_X4, batch_eq_4) {
VBinOpCMicrokernelTester()
.batch_size(4)
@@ -848,7 +848,7 @@
.Test(xnn_f32_vsubc_minmax_ukernel__wasm_x4, VBinOpCMicrokernelTester::OpType::SubC, VBinOpCMicrokernelTester::Variant::Scalar);
}
}
-#endif // XNN_ARCH_WASM
+#endif // XNN_ARCH_WASM || XNN_ARCH_WASMSIMD
TEST(F32_VSUBC_MINMAX__SCALAR_X1, batch_eq_1) {
diff --git a/tools/xnncommon.py b/tools/xnncommon.py
index f28a73f..2979003 100644
--- a/tools/xnncommon.py
+++ b/tools/xnncommon.py
@@ -41,7 +41,7 @@
"fma3": ["x86-32", "x86-64"],
"avx2": ["x86-32", "x86-64"],
"avx512f": ["x86-32", "x86-64"],
- "wasm": ["wasm"],
+ "wasm": ["wasm", "wasmsimd"],
"wasmsimd": ["wasmsimd"],
"psimd": [],
}
@@ -67,7 +67,10 @@
isa = None
for target_part in target_name.split("_"):
if target_part in _ARCH_TO_MACRO_MAP:
- arch = [target_part]
+ if target_part in _ISA_TO_ARCH_MAP:
+ arch = _ISA_TO_ARCH_MAP[target_part]
+ else:
+ arch = [target_part]
elif target_part in _ISA_TO_ARCH_MAP:
isa = target_part
if isa and not arch: