Remove rndna requantization scheme, it is unused.

PiperOrigin-RevId: 686826446
yolanda15 · Oct 17, 2024 · 345a76a · 345a76a
1 parent 25dad76
commit 345a76a
Show file tree

Hide file tree

Showing 31 changed files with 105 additions and 3,325 deletions.
diff --git a/bench/qs8-requantization.cc b/bench/qs8-requantization.cc
@@ -72,12 +72,6 @@ static void qs8_requantization(
     ->Apply(benchmark::utils::UnaryElementwiseParameters<int32_t, int8_t>)
     ->UseRealTime();
 
-  BENCHMARK_CAPTURE(qs8_requantization, rndna__neon,
-                    xnn_qs8_requantize_rndna__neon,
-                    benchmark::utils::CheckNEON)
-    ->Apply(benchmark::utils::UnaryElementwiseParameters<int32_t, int8_t>)
-    ->UseRealTime();
-
   BENCHMARK_CAPTURE(qs8_requantization, rndnu__neon_mull,
                     xnn_qs8_requantize_rndnu__neon_mull,
                     benchmark::utils::CheckNEON)
@@ -116,21 +110,6 @@ static void qs8_requantization(
     ->Apply(benchmark::utils::UnaryElementwiseParameters<int32_t, int8_t>)
     ->UseRealTime();
 
-  BENCHMARK_CAPTURE(qs8_requantization, rndna__sse2,
-                    xnn_qs8_requantize_rndna__sse2)
-    ->Apply(benchmark::utils::UnaryElementwiseParameters<int32_t, int8_t>)
-    ->UseRealTime();
-  BENCHMARK_CAPTURE(qs8_requantization, rndna__ssse3,
-                    xnn_qs8_requantize_rndna__ssse3,
-                    benchmark::utils::CheckSSSE3)
-    ->Apply(benchmark::utils::UnaryElementwiseParameters<int32_t, int8_t>)
-    ->UseRealTime();
-  BENCHMARK_CAPTURE(qs8_requantization, rndna__sse41,
-                    xnn_qs8_requantize_rndna__sse41,
-                    benchmark::utils::CheckSSE41)
-    ->Apply(benchmark::utils::UnaryElementwiseParameters<int32_t, int8_t>)
-    ->UseRealTime();
-
   BENCHMARK_CAPTURE(qs8_requantization, rndnu__sse41_sra,
                     xnn_qs8_requantize_rndnu__sse41_sra,
                     benchmark::utils::CheckSSE41)
@@ -169,19 +148,6 @@ BENCHMARK_CAPTURE(qs8_requantization, gemmlowp__scalar,
   ->Apply(benchmark::utils::UnaryElementwiseParameters<int32_t, int8_t>)
   ->UseRealTime();
 
-BENCHMARK_CAPTURE(qs8_requantization, rndna__scalar_signed64,
-                  xnn_qs8_requantize_rndna__scalar_signed64)
-  ->Apply(benchmark::utils::UnaryElementwiseParameters<int32_t, int8_t>)
-  ->UseRealTime();
-BENCHMARK_CAPTURE(qs8_requantization, rndna__scalar_unsigned32,
-                  xnn_qs8_requantize_rndna__scalar_unsigned32)
-  ->Apply(benchmark::utils::UnaryElementwiseParameters<int32_t, int8_t>)
-  ->UseRealTime();
-BENCHMARK_CAPTURE(qs8_requantization, rndna__scalar_unsigned64,
-                  xnn_qs8_requantize_rndna__scalar_unsigned64)
-  ->Apply(benchmark::utils::UnaryElementwiseParameters<int32_t, int8_t>)
-  ->UseRealTime();
-
 BENCHMARK_CAPTURE(qs8_requantization, rndnu__scalar,
                   xnn_qs8_requantize_rndnu__scalar)
   ->Apply(benchmark::utils::UnaryElementwiseParameters<int32_t, int8_t>)

diff --git a/bench/qu8-requantization.cc b/bench/qu8-requantization.cc
@@ -71,12 +71,6 @@ static void qu8_requantization(
                     benchmark::utils::CheckNEON)
     ->Apply(benchmark::utils::UnaryElementwiseParameters<int32_t, uint8_t>)
     ->UseRealTime();
-
-  BENCHMARK_CAPTURE(qu8_requantization, rndna__neon,
-                    xnn_qu8_requantize_rndna__neon,
-                    benchmark::utils::CheckNEON)
-    ->Apply(benchmark::utils::UnaryElementwiseParameters<int32_t, uint8_t>)
-    ->UseRealTime();
 #endif  // XNN_ARCH_ARM || XNN_ARCH_ARM64
 
 #if XNN_ARCH_X86 || XNN_ARCH_X86_64
@@ -99,21 +93,6 @@ static void qu8_requantization(
                     benchmark::utils::CheckSSE41)
     ->Apply(benchmark::utils::UnaryElementwiseParameters<int32_t, uint8_t>)
     ->UseRealTime();
-
-  BENCHMARK_CAPTURE(qu8_requantization, rndna__sse2,
-                    xnn_qu8_requantize_rndna__sse2)
-    ->Apply(benchmark::utils::UnaryElementwiseParameters<int32_t, uint8_t>)
-    ->UseRealTime();
-  BENCHMARK_CAPTURE(qu8_requantization, rndna__ssse3,
-                    xnn_qu8_requantize_rndna__ssse3,
-                    benchmark::utils::CheckSSSE3)
-    ->Apply(benchmark::utils::UnaryElementwiseParameters<int32_t, uint8_t>)
-    ->UseRealTime();
-  BENCHMARK_CAPTURE(qu8_requantization, rndna__sse41,
-                    xnn_qu8_requantize_rndna__sse41,
-                    benchmark::utils::CheckSSE41)
-    ->Apply(benchmark::utils::UnaryElementwiseParameters<int32_t, uint8_t>)
-    ->UseRealTime();
 #endif  // XNN_ARCH_X86 || XNN_ARCH_X86_64
 
 #if XNN_ARCH_WASMSIMD || XNN_ARCH_WASMRELAXEDSIMD
@@ -142,19 +121,6 @@ BENCHMARK_CAPTURE(qu8_requantization, gemmlowp__scalar,
   ->Apply(benchmark::utils::UnaryElementwiseParameters<int32_t, uint8_t>)
   ->UseRealTime();
 
-BENCHMARK_CAPTURE(qu8_requantization, rndna__scalar_signed64,
-                  xnn_qu8_requantize_rndna__scalar_signed64)
-  ->Apply(benchmark::utils::UnaryElementwiseParameters<int32_t, uint8_t>)
-  ->UseRealTime();
-BENCHMARK_CAPTURE(qu8_requantization, rndna__scalar_unsigned32,
-                  xnn_qu8_requantize_rndna__scalar_unsigned32)
-  ->Apply(benchmark::utils::UnaryElementwiseParameters<int32_t, uint8_t>)
-  ->UseRealTime();
-BENCHMARK_CAPTURE(qu8_requantization, rndna__scalar_unsigned64,
-                  xnn_qu8_requantize_rndna__scalar_unsigned64)
-  ->Apply(benchmark::utils::UnaryElementwiseParameters<int32_t, uint8_t>)
-  ->UseRealTime();
-
 #ifndef XNNPACK_BENCHMARK_NO_MAIN
 BENCHMARK_MAIN();
 #endif
diff --git a/cmake/gen/neon_microkernels.cmake b/cmake/gen/neon_microkernels.cmake
@@ -721,7 +721,6 @@ SET(NON_PROD_NEON_MICROKERNEL_SRCS
   src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-neon-c64.c
   src/qs8-requantization/qs8-requantization-fp32-neon.c
   src/qs8-requantization/qs8-requantization-gemmlowp-neon.c
-  src/qs8-requantization/qs8-requantization-rndna-neon.c
   src/qs8-requantization/qs8-requantization-rndnu-neon-mull.c
   src/qs8-requantization/qs8-requantization-rndnu-neon-qdmulh.c
   src/qs8-rsum/gen/qs8-rsum-neon-u16.c
@@ -837,7 +836,6 @@ SET(NON_PROD_NEON_MICROKERNEL_SRCS
   src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u64.c
   src/qu8-requantization/qu8-requantization-fp32-neon.c
   src/qu8-requantization/qu8-requantization-gemmlowp-neon.c
-  src/qu8-requantization/qu8-requantization-rndna-neon.c
   src/qu8-rsum/gen/qu8-rsum-neon-u16.c
   src/qu8-rsum/gen/qu8-rsum-neon-u64-acc2.c
   src/qu8-rsum/gen/qu8-rsum-neon-u64-acc4.c

diff --git a/cmake/gen/scalar_microkernels.cmake b/cmake/gen/scalar_microkernels.cmake
@@ -724,9 +724,6 @@ SET(NON_PROD_SCALAR_MICROKERNEL_SRCS
   src/qs8-requantization/qs8-requantization-fp32-scalar-fmagic.c
   src/qs8-requantization/qs8-requantization-fp32-scalar-lrintf.c
   src/qs8-requantization/qs8-requantization-gemmlowp-scalar.c
-  src/qs8-requantization/qs8-requantization-rndna-scalar-signed64.c
-  src/qs8-requantization/qs8-requantization-rndna-scalar-unsigned32.c
-  src/qs8-requantization/qs8-requantization-rndna-scalar-unsigned64.c
   src/qs8-requantization/qs8-requantization-rndnu-scalar.c
   src/qs8-rsum/gen/qs8-rsum-scalar-u1.c
   src/qs8-rsum/gen/qs8-rsum-scalar-u2.c
@@ -863,9 +860,6 @@ SET(NON_PROD_SCALAR_MICROKERNEL_SRCS
   src/qu8-requantization/qu8-requantization-fp32-scalar-fmagic.c
   src/qu8-requantization/qu8-requantization-fp32-scalar-lrintf.c
   src/qu8-requantization/qu8-requantization-gemmlowp-scalar.c
-  src/qu8-requantization/qu8-requantization-rndna-scalar-signed64.c
-  src/qu8-requantization/qu8-requantization-rndna-scalar-unsigned32.c
-  src/qu8-requantization/qu8-requantization-rndna-scalar-unsigned64.c
   src/qu8-rsum/gen/qu8-rsum-scalar-u1.c
   src/qu8-rsum/gen/qu8-rsum-scalar-u2.c
   src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u2.c

diff --git a/cmake/gen/sse2_microkernels.cmake b/cmake/gen/sse2_microkernels.cmake
@@ -272,7 +272,6 @@ SET(NON_PROD_SSE2_MICROKERNEL_SRCS
   src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x4c2s4-minmax-fp32-sse2-ld128.c
   src/qs8-requantization/qs8-requantization-fp32-sse2.c
   src/qs8-requantization/qs8-requantization-gemmlowp-sse2.c
-  src/qs8-requantization/qs8-requantization-rndna-sse2.c
   src/qs8-vadd/gen/qs8-vadd-minmax-sse2-mul16-ld64-u16.c
   src/qs8-vadd/gen/qs8-vadd-minmax-sse2-mul16-ld64-u24.c
   src/qs8-vadd/gen/qs8-vadd-minmax-sse2-mul16-ld64-u32.c
@@ -344,7 +343,6 @@ SET(NON_PROD_SSE2_MICROKERNEL_SRCS
   src/qu8-igemm/gen/qu8-igemm-4x4c2s4-minmax-fp32-sse2-ld128.c
   src/qu8-requantization/qu8-requantization-fp32-sse2.c
   src/qu8-requantization/qu8-requantization-gemmlowp-sse2.c
-  src/qu8-requantization/qu8-requantization-rndna-sse2.c
   src/qu8-rsum/gen/qu8-rsum-sse2-u16.c
   src/qu8-rsum/gen/qu8-rsum-sse2-u64-acc2.c
   src/qu8-rsum/gen/qu8-rsum-sse2-u64-acc4.c

diff --git a/cmake/gen/sse41_microkernels.cmake b/cmake/gen/sse41_microkernels.cmake
@@ -280,7 +280,6 @@ SET(NON_PROD_SSE41_MICROKERNEL_SRCS
   src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-sse41-c32.c
   src/qs8-requantization/qs8-requantization-fp32-sse41.c
   src/qs8-requantization/qs8-requantization-gemmlowp-sse41.c
-  src/qs8-requantization/qs8-requantization-rndna-sse41.c
   src/qs8-requantization/qs8-requantization-rndnu-sse41-sra.c
   src/qs8-requantization/qs8-requantization-rndnu-sse41-srl.c
   src/qs8-vadd/gen/qs8-vadd-minmax-sse41-mul16-ld64-u16.c
@@ -374,7 +373,6 @@ SET(NON_PROD_SSE41_MICROKERNEL_SRCS
   src/qu8-igemm/gen/qu8-igemm-4x4c2s4-minmax-fp32-sse41-ld64.c
   src/qu8-igemm/gen/qu8-igemm-4x4c2s4-minmax-fp32-sse41-ld128.c
   src/qu8-requantization/qu8-requantization-gemmlowp-sse41.c
-  src/qu8-requantization/qu8-requantization-rndna-sse41.c
   src/qu8-vadd/gen/qu8-vadd-minmax-sse41-mul16-ld64-u16.c
   src/qu8-vadd/gen/qu8-vadd-minmax-sse41-mul32-ld32-u8.c
   src/qu8-vadd/gen/qu8-vadd-minmax-sse41-mul32-ld32-u16.c

diff --git a/cmake/gen/ssse3_microkernels.cmake b/cmake/gen/ssse3_microkernels.cmake
@@ -39,7 +39,6 @@ SET(NON_PROD_SSSE3_MICROKERNEL_SRCS
   src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-3x4c8-minmax-ssse3-madd.c
   src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4c8-minmax-ssse3-madd-prfm.c
   src/qs8-requantization/qs8-requantization-gemmlowp-ssse3.c
-  src/qs8-requantization/qs8-requantization-rndna-ssse3.c
   src/qs8-rsum/gen/qs8-rsum-ssse3-u16.c
   src/qs8-rsum/gen/qs8-rsum-ssse3-u64-acc2.c
   src/qs8-rsum/gen/qs8-rsum-ssse3-u64-acc4.c
@@ -52,7 +51,6 @@ SET(NON_PROD_SSSE3_MICROKERNEL_SRCS
   src/qu8-rdsum/gen/qu8-rdsum-7p7x-ssse3-c16.c
   src/qu8-rdsum/gen/qu8-rdsum-7p7x-ssse3-c32.c
   src/qu8-requantization/qu8-requantization-gemmlowp-ssse3.c
-  src/qu8-requantization/qu8-requantization-rndna-ssse3.c
   src/qu8-vcvt/gen/qu8-vcvt-ssse3-u16.c
   src/qu8-vhswish/gen/qu8-vhswish-ssse3-u16.c
   src/qu8-vhswish/gen/qu8-vhswish-ssse3-u32.c

diff --git a/gen/neon_microkernels.bzl b/gen/neon_microkernels.bzl
@@ -718,7 +718,6 @@ NON_PROD_NEON_MICROKERNEL_SRCS = [
     "src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-neon-c64.c",
     "src/qs8-requantization/qs8-requantization-fp32-neon.c",
     "src/qs8-requantization/qs8-requantization-gemmlowp-neon.c",
-    "src/qs8-requantization/qs8-requantization-rndna-neon.c",
     "src/qs8-requantization/qs8-requantization-rndnu-neon-mull.c",
     "src/qs8-requantization/qs8-requantization-rndnu-neon-qdmulh.c",
     "src/qs8-rsum/gen/qs8-rsum-neon-u16.c",
@@ -834,7 +833,6 @@ NON_PROD_NEON_MICROKERNEL_SRCS = [
     "src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u64.c",
     "src/qu8-requantization/qu8-requantization-fp32-neon.c",
     "src/qu8-requantization/qu8-requantization-gemmlowp-neon.c",
-    "src/qu8-requantization/qu8-requantization-rndna-neon.c",
     "src/qu8-rsum/gen/qu8-rsum-neon-u16.c",
     "src/qu8-rsum/gen/qu8-rsum-neon-u64-acc2.c",
     "src/qu8-rsum/gen/qu8-rsum-neon-u64-acc4.c",

diff --git a/gen/scalar_microkernels.bzl b/gen/scalar_microkernels.bzl
@@ -721,9 +721,6 @@ NON_PROD_SCALAR_MICROKERNEL_SRCS = [
     "src/qs8-requantization/qs8-requantization-fp32-scalar-fmagic.c",
     "src/qs8-requantization/qs8-requantization-fp32-scalar-lrintf.c",
     "src/qs8-requantization/qs8-requantization-gemmlowp-scalar.c",
-    "src/qs8-requantization/qs8-requantization-rndna-scalar-signed64.c",
-    "src/qs8-requantization/qs8-requantization-rndna-scalar-unsigned32.c",
-    "src/qs8-requantization/qs8-requantization-rndna-scalar-unsigned64.c",
     "src/qs8-requantization/qs8-requantization-rndnu-scalar.c",
     "src/qs8-rsum/gen/qs8-rsum-scalar-u1.c",
     "src/qs8-rsum/gen/qs8-rsum-scalar-u2.c",
@@ -860,9 +857,6 @@ NON_PROD_SCALAR_MICROKERNEL_SRCS = [
     "src/qu8-requantization/qu8-requantization-fp32-scalar-fmagic.c",
     "src/qu8-requantization/qu8-requantization-fp32-scalar-lrintf.c",
     "src/qu8-requantization/qu8-requantization-gemmlowp-scalar.c",
-    "src/qu8-requantization/qu8-requantization-rndna-scalar-signed64.c",
-    "src/qu8-requantization/qu8-requantization-rndna-scalar-unsigned32.c",
-    "src/qu8-requantization/qu8-requantization-rndna-scalar-unsigned64.c",
     "src/qu8-rsum/gen/qu8-rsum-scalar-u1.c",
     "src/qu8-rsum/gen/qu8-rsum-scalar-u2.c",
     "src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u2.c",

diff --git a/gen/sse2_microkernels.bzl b/gen/sse2_microkernels.bzl
@@ -269,7 +269,6 @@ NON_PROD_SSE2_MICROKERNEL_SRCS = [
     "src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x4c2s4-minmax-fp32-sse2-ld128.c",
     "src/qs8-requantization/qs8-requantization-fp32-sse2.c",
     "src/qs8-requantization/qs8-requantization-gemmlowp-sse2.c",
-    "src/qs8-requantization/qs8-requantization-rndna-sse2.c",
     "src/qs8-vadd/gen/qs8-vadd-minmax-sse2-mul16-ld64-u16.c",
     "src/qs8-vadd/gen/qs8-vadd-minmax-sse2-mul16-ld64-u24.c",
     "src/qs8-vadd/gen/qs8-vadd-minmax-sse2-mul16-ld64-u32.c",
@@ -341,7 +340,6 @@ NON_PROD_SSE2_MICROKERNEL_SRCS = [
     "src/qu8-igemm/gen/qu8-igemm-4x4c2s4-minmax-fp32-sse2-ld128.c",
     "src/qu8-requantization/qu8-requantization-fp32-sse2.c",
     "src/qu8-requantization/qu8-requantization-gemmlowp-sse2.c",
-    "src/qu8-requantization/qu8-requantization-rndna-sse2.c",
     "src/qu8-rsum/gen/qu8-rsum-sse2-u16.c",
     "src/qu8-rsum/gen/qu8-rsum-sse2-u64-acc2.c",
     "src/qu8-rsum/gen/qu8-rsum-sse2-u64-acc4.c",

diff --git a/gen/sse41_microkernels.bzl b/gen/sse41_microkernels.bzl
@@ -277,7 +277,6 @@ NON_PROD_SSE41_MICROKERNEL_SRCS = [
     "src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-sse41-c32.c",
     "src/qs8-requantization/qs8-requantization-fp32-sse41.c",
     "src/qs8-requantization/qs8-requantization-gemmlowp-sse41.c",
-    "src/qs8-requantization/qs8-requantization-rndna-sse41.c",
     "src/qs8-requantization/qs8-requantization-rndnu-sse41-sra.c",
     "src/qs8-requantization/qs8-requantization-rndnu-sse41-srl.c",
     "src/qs8-vadd/gen/qs8-vadd-minmax-sse41-mul16-ld64-u16.c",
@@ -371,7 +370,6 @@ NON_PROD_SSE41_MICROKERNEL_SRCS = [
     "src/qu8-igemm/gen/qu8-igemm-4x4c2s4-minmax-fp32-sse41-ld64.c",
     "src/qu8-igemm/gen/qu8-igemm-4x4c2s4-minmax-fp32-sse41-ld128.c",
     "src/qu8-requantization/qu8-requantization-gemmlowp-sse41.c",
-    "src/qu8-requantization/qu8-requantization-rndna-sse41.c",
     "src/qu8-vadd/gen/qu8-vadd-minmax-sse41-mul16-ld64-u16.c",
     "src/qu8-vadd/gen/qu8-vadd-minmax-sse41-mul32-ld32-u8.c",
     "src/qu8-vadd/gen/qu8-vadd-minmax-sse41-mul32-ld32-u16.c",

diff --git a/gen/ssse3_microkernels.bzl b/gen/ssse3_microkernels.bzl
@@ -36,7 +36,6 @@ NON_PROD_SSSE3_MICROKERNEL_SRCS = [
     "src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-3x4c8-minmax-ssse3-madd.c",
     "src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4c8-minmax-ssse3-madd-prfm.c",
     "src/qs8-requantization/qs8-requantization-gemmlowp-ssse3.c",
-    "src/qs8-requantization/qs8-requantization-rndna-ssse3.c",
     "src/qs8-rsum/gen/qs8-rsum-ssse3-u16.c",
     "src/qs8-rsum/gen/qs8-rsum-ssse3-u64-acc2.c",
     "src/qs8-rsum/gen/qs8-rsum-ssse3-u64-acc4.c",
@@ -49,7 +48,6 @@ NON_PROD_SSSE3_MICROKERNEL_SRCS = [
     "src/qu8-rdsum/gen/qu8-rdsum-7p7x-ssse3-c16.c",
     "src/qu8-rdsum/gen/qu8-rdsum-7p7x-ssse3-c32.c",
     "src/qu8-requantization/qu8-requantization-gemmlowp-ssse3.c",
-    "src/qu8-requantization/qu8-requantization-rndna-ssse3.c",
     "src/qu8-vcvt/gen/qu8-vcvt-ssse3-u16.c",
     "src/qu8-vhswish/gen/qu8-vhswish-ssse3-u16.c",
     "src/qu8-vhswish/gen/qu8-vhswish-ssse3-u32.c",