Add MINMAX suffix to GEMM/IGEMM/DWCONV/PPMM micro-kernel names
PiperOrigin-RevId: 305632703
diff --git a/BUILD.bazel b/BUILD.bazel
index c26c359..1edf8c4 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -220,11 +220,11 @@
"src/math/sigmoid-scalar-p5-div.c",
"src/q8-avgpool/9p8x-scalar-c1.c",
"src/q8-avgpool/9x-scalar-c1.c",
- "src/q8-dwconv/up1x9-scalar.c",
+ "src/q8-dwconv/up1x9-minmax-scalar.c",
"src/q8-gavgpool/7p7x-scalar-c1.c",
"src/q8-gavgpool/7x-scalar-c1.c",
- "src/q8-gemm/2x2-scalar.c",
- "src/q8-igemm/2x2-scalar.c",
+ "src/q8-gemm/2x2-minmax-scalar.c",
+ "src/q8-igemm/2x2-minmax-scalar.c",
"src/q8-vadd/scalar.c",
"src/u8-clamp/scalar-x4.c",
"src/u8-lut32norm/scalar.c",
@@ -600,13 +600,13 @@
"src/f32-vmulcaddc/gen/c8-neon-2x.c",
"src/q8-avgpool/9p8x-neon-c8.c",
"src/q8-avgpool/9x-neon-c8.c",
- "src/q8-dwconv/up8x9-neon.c",
+ "src/q8-dwconv/up8x9-minmax-neon.c",
"src/q8-gavgpool/7p7x-neon-c8.c",
"src/q8-gavgpool/7x-neon-c8.c",
- "src/q8-gemm/4x8-neon.c",
- "src/q8-gemm/8x8-neon.c",
- "src/q8-igemm/4x8-neon.c",
- "src/q8-igemm/8x8-neon.c",
+ "src/q8-gemm/4x8-minmax-neon.c",
+ "src/q8-gemm/8x8-minmax-neon.c",
+ "src/q8-igemm/4x8-minmax-neon.c",
+ "src/q8-igemm/8x8-minmax-neon.c",
"src/q8-vadd/neon.c",
"src/u8-clamp/neon-x64.c",
"src/u8-maxpool/9p8x-neon-c16.c",
@@ -981,12 +981,12 @@
"src/f32-sigmoid/gen/sse2-p5-div-x24.c",
"src/q8-avgpool/9p8x-sse2-c8.c",
"src/q8-avgpool/9x-sse2-c8.c",
- "src/q8-igemm/4x4c2-sse2.c",
- "src/q8-dwconv/up8x9-sse2.c",
+ "src/q8-igemm/4x4c2-minmax-sse2.c",
+ "src/q8-dwconv/up8x9-minmax-sse2.c",
"src/q8-gavgpool/7p7x-sse2-c8.c",
"src/q8-gavgpool/7x-sse2-c8.c",
- "src/q8-gemm/2x4c8-sse2.c",
- "src/q8-gemm/4x4c2-sse2.c",
+ "src/q8-gemm/2x4c8-minmax-sse2.c",
+ "src/q8-gemm/4x4c2-minmax-sse2.c",
"src/q8-vadd/sse2.c",
"src/u8-clamp/sse2-x64.c",
"src/u8-maxpool/9p8x-sse2-c16.c",
@@ -1405,7 +1405,7 @@
]
AARCH32_ASM_UKERNELS = [
- "src/q8-dwconv/up8x9-aarch32-neon.S",
+ "src/q8-dwconv/up8x9-minmax-aarch32-neon.S",
"src/f32-gemm/4x8-minmax-aarch32-neon-cortex-a53.S",
"src/f32-gemm/4x8-minmax-aarch32-neon-cortex-a55.S",
"src/f32-gemm/gen/4x8-minmax-aarch32-neon-cortex-a75.S",
@@ -2412,9 +2412,9 @@
######################### Unit tests for micro-kernels #########################
xnnpack_unit_test(
- name = "f16_gemm_test",
+ name = "f16_gemm_minmax_test",
srcs = [
- "test/f16-gemm.cc",
+ "test/f16-gemm-minmax.cc",
"test/gemm-microkernel-tester.h",
"src/xnnpack/AlignedAllocator.h",
] + WEIGHTS_PACK_HDRS + MICROKERNEL_TEST_HDRS,
@@ -2837,9 +2837,9 @@
)
xnnpack_unit_test(
- name = "q8_igemm_test",
+ name = "q8_igemm_minmax_test",
srcs = [
- "test/q8-igemm.cc",
+ "test/q8-igemm-minmax.cc",
"test/gemm-microkernel-tester.h",
"src/xnnpack/AlignedAllocator.h",
] + WEIGHTS_PACK_HDRS + MICROKERNEL_TEST_HDRS,
@@ -2847,9 +2847,9 @@
)
xnnpack_unit_test(
- name = "q8_dwconv_test",
+ name = "q8_dwconv_minmax_test",
srcs = [
- "test/q8-dwconv.cc",
+ "test/q8-dwconv-minmax.cc",
"test/dwconv-microkernel-tester.h",
"src/xnnpack/AlignedAllocator.h",
] + WEIGHTS_PACK_HDRS + MICROKERNEL_TEST_HDRS,
@@ -2867,9 +2867,9 @@
)
xnnpack_unit_test(
- name = "q8_gemm_test",
+ name = "q8_gemm_minmax_test",
srcs = [
- "test/q8-gemm.cc",
+ "test/q8-gemm-minmax.cc",
"test/gemm-microkernel-tester.h",
"src/xnnpack/AlignedAllocator.h",
] + WEIGHTS_PACK_HDRS + MICROKERNEL_TEST_HDRS,