Rename BILINEAR microkernels into IBILINEAR
- Indicate the use of indirection buffers
- Prepare for alternative BILINEAR micro-kernels without indirection buffer
PiperOrigin-RevId: 300064208
diff --git a/BUILD.bazel b/BUILD.bazel
index b015dec..6c5d50c 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -84,9 +84,6 @@
"src/f32-argmaxpool/9x-scalar-c1.c",
"src/f32-avgpool/9p8x-scalar-c1.c",
"src/f32-avgpool/9x-scalar-c1.c",
- "src/f32-bilinear/gen/scalar-c1.c",
- "src/f32-bilinear/gen/scalar-c2.c",
- "src/f32-bilinear/gen/scalar-c4.c",
"src/f32-clamp/scalar.c",
"src/f32-conv-hwc/3x3s2p0p1c3x4-scalar-1x1.c",
"src/f32-conv-hwc/3x3s2p1c3x4-scalar-1x1.c",
@@ -120,6 +117,9 @@
"src/f32-hswish/gen/scalar-x1.c",
"src/f32-hswish/gen/scalar-x2.c",
"src/f32-hswish/gen/scalar-x4.c",
+ "src/f32-ibilinear/gen/scalar-c1.c",
+ "src/f32-ibilinear/gen/scalar-c2.c",
+ "src/f32-ibilinear/gen/scalar-c4.c",
"src/f32-igemm/gen/1x4-scalar.c",
"src/f32-igemm/gen/2x4-scalar.c",
"src/f32-igemm/gen/4x2-scalar.c",
@@ -336,8 +336,6 @@
"src/f32-argmaxpool/9x-psimd-c4.c",
"src/f32-avgpool/9p8x-psimd-c4.c",
"src/f32-avgpool/9x-psimd-c4.c",
- "src/f32-bilinear/gen/psimd-c4.c",
- "src/f32-bilinear/gen/psimd-c8.c",
"src/f32-clamp/psimd.c",
"src/f32-dwconv/gen/up4x25-psimd-acc2.c",
"src/f32-dwconv/gen/up4x25-psimd.c",
@@ -374,6 +372,8 @@
"src/f32-gemm/gen-inc/6x8s4-psimd.c",
"src/f32-hswish/gen/psimd-x4.c",
"src/f32-hswish/gen/psimd-x8.c",
+ "src/f32-ibilinear/gen/psimd-c4.c",
+ "src/f32-ibilinear/gen/psimd-c8.c",
"src/f32-igemm/gen/1x8-psimd-loadsplat.c",
"src/f32-igemm/gen/1x8-psimd-splat.c",
"src/f32-igemm/gen/1x8s4-psimd.c",
@@ -458,8 +458,6 @@
NEON_UKERNELS = [
"src/f32-avgpool/9p8x-neon-c4.c",
"src/f32-avgpool/9x-neon-c4.c",
- "src/f32-bilinear/gen/neon-c4.c",
- "src/f32-bilinear/gen/neon-c8.c",
"src/f32-clamp/neon.c",
"src/f32-dwconv/gen/up4x9-neon.c",
"src/f32-dwconv/gen/up4x9-neon-acc2.c",
@@ -501,6 +499,8 @@
"src/f32-gemm/gen-inc/8x8s4-neon.c",
"src/f32-hswish/gen/neon-x4.c",
"src/f32-hswish/gen/neon-x8.c",
+ "src/f32-ibilinear/gen/neon-c4.c",
+ "src/f32-ibilinear/gen/neon-c8.c",
"src/f32-igemm/gen/1x8-neon-lane-ld64.c",
"src/f32-igemm/gen/4x2-neon-lane-ld64.c",
"src/f32-igemm/gen/4x4-neon-lane-ld64.c",
@@ -629,8 +629,8 @@
]
NEONFMA_UKERNELS = [
- "src/f32-bilinear/gen/neonfma-c4.c",
- "src/f32-bilinear/gen/neonfma-c8.c",
+ "src/f32-ibilinear/gen/neonfma-c4.c",
+ "src/f32-ibilinear/gen/neonfma-c8.c",
"src/f32-igemm/gen/1x8-neonfma-dup-ld64.c",
"src/f32-igemm/gen/4x8-neonfma-dup-ld128.c",
"src/f32-igemm/gen/4x8-neonfma-dup-ld64.c",
@@ -866,8 +866,6 @@
SSE_UKERNELS = [
"src/f32-avgpool/9p8x-sse-c4.c",
"src/f32-avgpool/9x-sse-c4.c",
- "src/f32-bilinear/gen/sse-c4.c",
- "src/f32-bilinear/gen/sse-c8.c",
"src/f32-clamp/sse.c",
"src/f32-dwconv-spchw/3x3p1-sse.c",
"src/f32-dwconv-spchw/3x3s2p1-sse.c",
@@ -901,6 +899,8 @@
"src/f32-gemm/gen-inc/4x8s4-sse.c",
"src/f32-hswish/gen/sse-x4.c",
"src/f32-hswish/gen/sse-x8.c",
+ "src/f32-ibilinear/gen/sse-c4.c",
+ "src/f32-ibilinear/gen/sse-c8.c",
"src/f32-igemm/gen/1x8-sse-dup.c",
"src/f32-igemm/gen/1x8-sse-load1.c",
"src/f32-igemm/gen/1x8s4-sse.c",
@@ -1465,7 +1465,6 @@
"src/requantization/gemmlowp-requantization.h",
"src/xnnpack/argmaxpool.h",
"src/xnnpack/avgpool.h",
- "src/xnnpack/bilinear.h",
"src/xnnpack/clamp.h",
"src/xnnpack/common.h",
"src/xnnpack/conv.h",
@@ -1473,6 +1472,7 @@
"src/xnnpack/gavgpool.h",
"src/xnnpack/gemm.h",
"src/xnnpack/hswish.h",
+ "src/xnnpack/ibilinear.h",
"src/xnnpack/igemm.h",
"src/xnnpack/intrinsics-polyfill.h",
"src/xnnpack/lut.h",
@@ -2418,10 +2418,10 @@
)
xnnpack_unit_test(
- name = "f32_bilinear_test",
+ name = "f32_ibilinear_test",
srcs = [
- "test/f32-bilinear.cc",
- "test/bilinear-microkernel-tester.h",
+ "test/f32-ibilinear.cc",
+ "test/ibilinear-microkernel-tester.h",
"src/xnnpack/AlignedAllocator.h",
] + MICROKERNEL_TEST_HDRS,
deps = MICROKERNEL_TEST_DEPS,