Remove x3 sample tile versions of bfly4 and fftr

PiperOrigin-RevId: 471770054
google · Sep 2, 2022 · 1de2ce1 · 1de2ce1
1 parent 3f47df6
commit 1de2ce1
Show file tree

Hide file tree

Showing 13 changed files with 11 additions and 490 deletions.
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -620,12 +620,10 @@ PROD_SCALAR_RISCV_MICROKERNEL_SRCS = [
 ALL_SCALAR_MICROKERNEL_SRCS = [
     "src/cs16-bfly4/gen/scalar-x1.c",
     "src/cs16-bfly4/gen/scalar-x2.c",
-    "src/cs16-bfly4/gen/scalar-x3.c",
     "src/cs16-bfly4/gen/scalar-x4.c",
     "src/cs16-bfly4/samples1-scalar.c",
     "src/cs16-fftr/gen/scalar-x1.c",
     "src/cs16-fftr/gen/scalar-x2.c",
-    "src/cs16-fftr/gen/scalar-x3.c",
     "src/cs16-fftr/gen/scalar-x4.c",
     "src/cs16-vsquareabs/gen/scalar-x1.c",
     "src/cs16-vsquareabs/gen/scalar-x2.c",

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -608,12 +608,10 @@ SET(PROD_SCALAR_RISCV_MICROKERNEL_SRCS
 SET(ALL_SCALAR_MICROKERNEL_SRCS
   src/cs16-bfly4/gen/scalar-x1.c
   src/cs16-bfly4/gen/scalar-x2.c
-  src/cs16-bfly4/gen/scalar-x3.c
   src/cs16-bfly4/gen/scalar-x4.c
   src/cs16-bfly4/samples1-scalar.c
   src/cs16-fftr/gen/scalar-x1.c
   src/cs16-fftr/gen/scalar-x2.c
-  src/cs16-fftr/gen/scalar-x3.c
   src/cs16-fftr/gen/scalar-x4.c
   src/cs16-vsquareabs/gen/scalar-x1.c
   src/cs16-vsquareabs/gen/scalar-x2.c

diff --git a/bench/cs16-bfly4.cc b/bench/cs16-bfly4.cc
@@ -85,8 +85,6 @@ BENCHMARK_CAPTURE(cs16_bfly4, scalar_x1, xnn_cs16_bfly4_ukernel__scalar_x1)
   ->Apply(BenchmarkKernelSize)->UseRealTime();
 BENCHMARK_CAPTURE(cs16_bfly4, scalar_x2, xnn_cs16_bfly4_ukernel__scalar_x2)
   ->Apply(BenchmarkKernelSize)->UseRealTime();
-BENCHMARK_CAPTURE(cs16_bfly4, scalar_x3, xnn_cs16_bfly4_ukernel__scalar_x3)
-  ->Apply(BenchmarkKernelSize)->UseRealTime();
 BENCHMARK_CAPTURE(cs16_bfly4, scalar_x4, xnn_cs16_bfly4_ukernel__scalar_x4)
   ->Apply(BenchmarkKernelSize)->UseRealTime();
 

diff --git a/bench/cs16-fftr.cc b/bench/cs16-fftr.cc
@@ -58,7 +58,6 @@ static void BenchmarkKernelSize(benchmark::internal::Benchmark* b)
 
 BENCHMARK_CAPTURE(cs16_fftr, cs16_scalar_x1, xnn_cs16_fftr_ukernel__scalar_x1)->Apply(BenchmarkKernelSize)->UseRealTime();
 BENCHMARK_CAPTURE(cs16_fftr, cs16_scalar_x2, xnn_cs16_fftr_ukernel__scalar_x2)->Apply(BenchmarkKernelSize)->UseRealTime();
-BENCHMARK_CAPTURE(cs16_fftr, cs16_scalar_x3, xnn_cs16_fftr_ukernel__scalar_x3)->Apply(BenchmarkKernelSize)->UseRealTime();
 BENCHMARK_CAPTURE(cs16_fftr, cs16_scalar_x4, xnn_cs16_fftr_ukernel__scalar_x4)->Apply(BenchmarkKernelSize)->UseRealTime();
 
 #ifndef XNNPACK_BENCHMARK_NO_MAIN

diff --git a/scripts/generate-cs16-bfly4.sh b/scripts/generate-cs16-bfly4.sh
@@ -7,7 +7,6 @@
 ################################### SCALAR ###################################
 tools/xngen src/cs16-bfly4/scalar.c.in -D SAMPLE_TILE=1 -o src/cs16-bfly4/gen/scalar-x1.c &
 tools/xngen src/cs16-bfly4/scalar.c.in -D SAMPLE_TILE=2 -o src/cs16-bfly4/gen/scalar-x2.c &
-tools/xngen src/cs16-bfly4/scalar.c.in -D SAMPLE_TILE=3 -o src/cs16-bfly4/gen/scalar-x3.c &
 tools/xngen src/cs16-bfly4/scalar.c.in -D SAMPLE_TILE=4 -o src/cs16-bfly4/gen/scalar-x4.c &
 
 ################################## Unit tests #################################

diff --git a/scripts/generate-cs16-fftr.sh b/scripts/generate-cs16-fftr.sh
@@ -7,7 +7,6 @@
 ################################### SCALAR ###################################
 tools/xngen src/cs16-fftr/scalar.c.in -D SAMPLE_TILE=1 -o src/cs16-fftr/gen/scalar-x1.c &
 tools/xngen src/cs16-fftr/scalar.c.in -D SAMPLE_TILE=2 -o src/cs16-fftr/gen/scalar-x2.c &
-tools/xngen src/cs16-fftr/scalar.c.in -D SAMPLE_TILE=3 -o src/cs16-fftr/gen/scalar-x3.c &
 tools/xngen src/cs16-fftr/scalar.c.in -D SAMPLE_TILE=4 -o src/cs16-fftr/gen/scalar-x4.c &
 
 ################################## Unit tests #################################

diff --git a/src/cs16-bfly4/gen/scalar-x3.c b/src/cs16-bfly4/gen/scalar-x3.c