Clean up dependencies.

The BUILD currently redundantly links a number of sources via different libraries (diamonds in the dependency graph), this is a step towards untangling this. PiperOrigin-RevId: 642054479
google · Jun 11, 2024 · 1a6f88e · 1a6f88e
1 parent 56fa083
commit 1a6f88e
Show file tree

Hide file tree

Showing 35 changed files with 690 additions and 640 deletions.
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -213,11 +213,11 @@ JIT_WASMSIMD32_SRCS = JIT_WASM32_SRCS + JIT_WASMSIMD32_COMMONS_SRCS + WASMSIMD32
 
 JIT_WASMRELAXEDSIMD32_SRCS = JIT_WASMSIMD32_SRCS + JIT_WASMRELAXEDSIMD32_COMMONS_SRCS + WASMRELAXEDSIMD32_JIT_MICROKERNEL_SRCS
 
-ALL_MICROKERNEL_SRCS = ALL_NEON_AARCH64_MICROKERNEL_SRCS + ALL_NEONBF16_AARCH64_MICROKERNEL_SRCS + ALL_NEONDOT_AARCH64_MICROKERNEL_SRCS + ALL_NEONFMA_AARCH64_MICROKERNEL_SRCS + ALL_NEONFP16ARITH_AARCH64_MICROKERNEL_SRCS + ALL_ARMSIMD32_MICROKERNEL_SRCS + ALL_AVX_MICROKERNEL_SRCS + ALL_AVXVNNI_MICROKERNEL_SRCS + ALL_AVX2_MICROKERNEL_SRCS + ALL_AVX512F_MICROKERNEL_SRCS + ALL_AVX512SKX_MICROKERNEL_SRCS + ALL_AVX512VBMI_MICROKERNEL_SRCS + ALL_AVX512VNNI_MICROKERNEL_SRCS + ALL_AVX512VNNIGFNI_MICROKERNEL_SRCS + ALL_AVX512AMX_MICROKERNEL_SRCS + ALL_AVX512FP16_MICROKERNEL_SRCS + ALL_F16C_MICROKERNEL_SRCS + ALL_FMA_MICROKERNEL_SRCS + ALL_FMA3_MICROKERNEL_SRCS + ALL_FP16ARITH_MICROKERNEL_SRCS + ALL_HEXAGON_MICROKERNEL_SRCS + ALL_NEON_MICROKERNEL_SRCS + ALL_NEONBF16_MICROKERNEL_SRCS + ALL_NEONDOT_MICROKERNEL_SRCS + ALL_NEONDOTFP16ARITH_MICROKERNEL_SRCS + ALL_NEONFMA_MICROKERNEL_SRCS + ALL_NEONFP16_MICROKERNEL_SRCS + ALL_NEONFP16ARITH_MICROKERNEL_SRCS + ALL_NEONV8_MICROKERNEL_SRCS + ALL_RVV_MICROKERNEL_SRCS + ALL_RVVFP16ARITH_MICROKERNEL_SRCS + ALL_SCALAR_MICROKERNEL_SRCS + ALL_SSE_MICROKERNEL_SRCS + ALL_SSE2_MICROKERNEL_SRCS + ALL_SSE41_MICROKERNEL_SRCS + ALL_SSSE3_MICROKERNEL_SRCS + ALL_WASM_MICROKERNEL_SRCS + ALL_WASMRELAXEDSIMD_MICROKERNEL_SRCS + ALL_WASMSIMD_MICROKERNEL_SRCS + AARCH32_ASM_MICROKERNEL_SRCS + AARCH64_ASM_MICROKERNEL_SRCS + WASM32_ASM_MICROKERNEL_SRCS + ["src/microparams-init.c"]
+ALL_MICROKERNEL_SRCS = ALL_NEON_AARCH64_MICROKERNEL_SRCS + ALL_NEONBF16_AARCH64_MICROKERNEL_SRCS + ALL_NEONDOT_AARCH64_MICROKERNEL_SRCS + ALL_NEONFMA_AARCH64_MICROKERNEL_SRCS + ALL_NEONFP16ARITH_AARCH64_MICROKERNEL_SRCS + ALL_ARMSIMD32_MICROKERNEL_SRCS + ALL_AVX_MICROKERNEL_SRCS + ALL_AVXVNNI_MICROKERNEL_SRCS + ALL_AVX2_MICROKERNEL_SRCS + ALL_AVX512F_MICROKERNEL_SRCS + ALL_AVX512SKX_MICROKERNEL_SRCS + ALL_AVX512VBMI_MICROKERNEL_SRCS + ALL_AVX512VNNI_MICROKERNEL_SRCS + ALL_AVX512VNNIGFNI_MICROKERNEL_SRCS + ALL_AVX512AMX_MICROKERNEL_SRCS + ALL_AVX512FP16_MICROKERNEL_SRCS + ALL_F16C_MICROKERNEL_SRCS + ALL_FMA_MICROKERNEL_SRCS + ALL_FMA3_MICROKERNEL_SRCS + ALL_FP16ARITH_MICROKERNEL_SRCS + ALL_HEXAGON_MICROKERNEL_SRCS + ALL_HVX_MICROKERNEL_SRCS + ALL_NEON_MICROKERNEL_SRCS + ALL_NEONBF16_MICROKERNEL_SRCS + ALL_NEONDOT_MICROKERNEL_SRCS + ALL_NEONDOTFP16ARITH_MICROKERNEL_SRCS + ALL_NEONFMA_MICROKERNEL_SRCS + ALL_NEONFP16_MICROKERNEL_SRCS + ALL_NEONFP16ARITH_MICROKERNEL_SRCS + ALL_NEONV8_MICROKERNEL_SRCS + ALL_RVV_MICROKERNEL_SRCS + ALL_RVVFP16ARITH_MICROKERNEL_SRCS + ALL_SCALAR_MICROKERNEL_SRCS + ALL_SSE_MICROKERNEL_SRCS + ALL_SSE2_MICROKERNEL_SRCS + ALL_SSE41_MICROKERNEL_SRCS + ALL_SSSE3_MICROKERNEL_SRCS + ALL_WASM_MICROKERNEL_SRCS + ALL_WASMRELAXEDSIMD_MICROKERNEL_SRCS + ALL_WASMSIMD_MICROKERNEL_SRCS + AARCH32_ASM_MICROKERNEL_SRCS + AARCH64_ASM_MICROKERNEL_SRCS + WASM32_ASM_MICROKERNEL_SRCS
 
 filegroup(
     name = "microkernel_source_files",
-    data = ALL_NEON_AARCH64_MICROKERNEL_SRCS + ALL_NEONBF16_AARCH64_MICROKERNEL_SRCS + ALL_NEONDOT_AARCH64_MICROKERNEL_SRCS + ALL_NEONFMA_AARCH64_MICROKERNEL_SRCS + ALL_NEONFP16ARITH_AARCH64_MICROKERNEL_SRCS + ALL_ARMSIMD32_MICROKERNEL_SRCS + ALL_AVX_MICROKERNEL_SRCS + ALL_AVXVNNI_MICROKERNEL_SRCS + ALL_AVX2_MICROKERNEL_SRCS + ALL_AVX512F_MICROKERNEL_SRCS + ALL_AVX512SKX_MICROKERNEL_SRCS + ALL_AVX512VBMI_MICROKERNEL_SRCS + ALL_AVX512VNNI_MICROKERNEL_SRCS + ALL_AVX512VNNIGFNI_MICROKERNEL_SRCS + ALL_AVX512AMX_MICROKERNEL_SRCS + ALL_AVX512FP16_MICROKERNEL_SRCS + ALL_F16C_MICROKERNEL_SRCS + ALL_FMA_MICROKERNEL_SRCS + ALL_FMA3_MICROKERNEL_SRCS + ALL_FP16ARITH_MICROKERNEL_SRCS + ALL_HEXAGON_MICROKERNEL_SRCS + ALL_HVX_MICROKERNEL_SRCS + ALL_NEON_MICROKERNEL_SRCS + ALL_NEONBF16_MICROKERNEL_SRCS + ALL_NEONDOT_MICROKERNEL_SRCS + ALL_NEONDOTFP16ARITH_MICROKERNEL_SRCS + ALL_NEONFMA_MICROKERNEL_SRCS + ALL_NEONFP16_MICROKERNEL_SRCS + ALL_NEONFP16ARITH_MICROKERNEL_SRCS + ALL_NEONV8_MICROKERNEL_SRCS + ALL_RVV_MICROKERNEL_SRCS + ALL_RVVFP16ARITH_MICROKERNEL_SRCS + ALL_SCALAR_MICROKERNEL_SRCS + ALL_SSE_MICROKERNEL_SRCS + ALL_SSE2_MICROKERNEL_SRCS + ALL_SSE41_MICROKERNEL_SRCS + ALL_SSSE3_MICROKERNEL_SRCS + ALL_WASM_MICROKERNEL_SRCS + ALL_WASMRELAXEDSIMD_MICROKERNEL_SRCS + ALL_WASMSIMD_MICROKERNEL_SRCS + AARCH32_ASM_MICROKERNEL_SRCS + AARCH64_ASM_MICROKERNEL_SRCS + WASM32_ASM_MICROKERNEL_SRCS + ["src/microparams-init.c"],
+    data = ALL_MICROKERNEL_SRCS + ["src/microparams-init.c"],
     visibility = xnnpack_visibility(),
 )
 
@@ -280,7 +280,7 @@ xnnpack_cc_library(
     name = "hardware_config",
     srcs = ["src/configs/hardware-config.c"],
     hdrs = [
-        "src/xnnpack/config.h",
+        "src/xnnpack/hardware-config.h",
         "src/xnnpack/microfnptr.h",
         "src/xnnpack/microparams.h",
     ],
@@ -345,6 +345,7 @@ xnnpack_cc_library(
     ],
     hdrs = [
         "src/xnnpack/config.h",
+        "src/xnnpack/config-types.h",
         "src/xnnpack/microfnptr.h",
         "src/xnnpack/microparams.h",
     ],
@@ -381,7 +382,6 @@ xnnpack_cc_library(
     name = "params",
     srcs = ["src/params.c"],
     hdrs = [
-        "src/xnnpack/config.h",
         "src/xnnpack/microfnptr.h",
         "src/xnnpack/params.h",
     ],

diff --git a/bench/BUILD.bazel b/bench/BUILD.bazel
@@ -24,6 +24,7 @@ MICROKERNEL_BENCHMARK_DEPS = [
     "//:test_microkernels",
     "//:common",
     "//:enable_assembly",
+    "//:hardware_config",
     "//:jit",
     "//:microkernels_h",
     "//:packing",
@@ -53,9 +54,10 @@ xnnpack_cc_library(
     }),
     visibility = xnnpack_visibility(),
     deps = [
-        "//:XNNPACK",
         "//:allocator",
         "//:common",
+        "//:hardware_config",
+        "//:memory",
         "//:params",
         "@com_google_benchmark//:benchmark",
     ] + select({
@@ -126,6 +128,7 @@ xnnpack_benchmark(
     ],
     deps = MICROKERNEL_BENCHMARK_DEPS + [
         "//:indirection",
+        "//:microkernel_configs",
         "//:microkernel_utils",
         "//:operators",
     ],
@@ -254,9 +257,7 @@ xnnpack_benchmark(
 
 xnnpack_benchmark(
     name = "qu8_gemm_bench",
-    srcs = [
-        "qu8-gemm.cc",
-    ],
+    srcs = ["qu8-gemm.cc"],
     copts = xnnpack_optional_ruy_copts() + xnnpack_optional_gemmlowp_copts(),
     deps = MICROKERNEL_BENCHMARK_DEPS + [
         ":gemm_benchmark",
@@ -404,7 +405,6 @@ xnnpack_benchmark(
     srcs = [
         "f16-gemm-minmax.cc",
         "gemm.h",
-        "google/gemm.h",
     ],
     copts = xnnpack_optional_ruy_copts(),
     deps = MICROKERNEL_BENCHMARK_DEPS + [
@@ -556,6 +556,7 @@ xnnpack_benchmark(
         "f16-conv-hwc2chw.cc",
     ],
     deps = MICROKERNEL_BENCHMARK_DEPS + [
+        "//:operators",
     ],
 )
 
@@ -688,7 +689,6 @@ xnnpack_benchmark(
     srcs = [
         "f32-gemm-minmax.cc",
         "gemm.h",
-        "google/gemm.h",
     ],
     copts = xnnpack_optional_ruy_copts(),
     deps = MICROKERNEL_BENCHMARK_DEPS + [
@@ -704,7 +704,6 @@ xnnpack_benchmark(
     srcs = [
         "f32-gemm-goi-minmax.cc",
         "gemm.h",
-        "google/gemm.h",
     ],
     copts = xnnpack_optional_ruy_copts(),
     deps = MICROKERNEL_BENCHMARK_DEPS + [
@@ -1021,7 +1020,6 @@ xnnpack_cc_library(
     name = "spmm_benchmark",
     hdrs = [
         "gemm.h",
-        "google/gemm.h",
         "spmm-benchmark.h",
     ],
     deps = MICROKERNEL_BENCHMARK_DEPS + [
@@ -1156,6 +1154,7 @@ xnnpack_benchmark(
     ],
     deps = MICROKERNEL_BENCHMARK_DEPS + [
         "//:XNNPACK",
+        "//:microkernel_configs",
         "//:models_h",
         "//models:fp16_mobilenet_v1",
         "//models:fp16_mobilenet_v2",
@@ -1172,6 +1171,7 @@ xnnpack_benchmark(
     ],
     deps = MICROKERNEL_BENCHMARK_DEPS + [
         "//:XNNPACK",
+        "//:microkernel_configs",
         "//:models_h",
         "//models:fp16_mobilenet_v1",
         "//models:fp16_mobilenet_v2",
@@ -1188,6 +1188,7 @@ xnnpack_benchmark(
     ],
     deps = MICROKERNEL_BENCHMARK_DEPS + [
         "//:XNNPACK",
+        "//:microkernel_configs",
         "//:models_h",
         "//models:fp32_mobilenet_v1",
         "//models:fp32_mobilenet_v1_jit",
@@ -1208,6 +1209,7 @@ xnnpack_benchmark(
     ],
     deps = MICROKERNEL_BENCHMARK_DEPS + [
         "//:XNNPACK",
+        "//:microkernel_configs",
         "//:models_h",
         "//models:fp32_mobilenet_v1",
         "//models:fp32_mobilenet_v1_jit",
@@ -1228,6 +1230,7 @@ xnnpack_benchmark(
     ],
     deps = MICROKERNEL_BENCHMARK_DEPS + [
         "//:XNNPACK",
+        "//:microkernel_configs",
         "//:models_h",
         "//models:qs8_mobilenet_v1",
         "//models:qs8_mobilenet_v2",
@@ -1242,6 +1245,7 @@ xnnpack_benchmark(
     ],
     deps = MICROKERNEL_BENCHMARK_DEPS + [
         "//:XNNPACK",
+        "//:microkernel_configs",
         "//:models_h",
         "//models:qs8_mobilenet_v1",
         "//models:qs8_mobilenet_v2",
@@ -1256,6 +1260,7 @@ xnnpack_benchmark(
     ],
     deps = MICROKERNEL_BENCHMARK_DEPS + [
         "//:XNNPACK",
+        "//:microkernel_configs",
         "//:models_h",
         "//models:qu8_mobilenet_v1",
         "//models:qu8_mobilenet_v2",
@@ -1272,6 +1277,7 @@ xnnpack_benchmark(
     ],
     deps = MICROKERNEL_BENCHMARK_DEPS + [
         "//:XNNPACK",
+        "//:microkernel_configs",
         "//:models_h",
         "//models:qu8_mobilenet_v1",
         "//models:qu8_mobilenet_v2",

diff --git a/bench/f16-dwconv.cc b/bench/f16-dwconv.cc
@@ -23,7 +23,6 @@
 #include <xnnpack/microfnptr.h>
 #include <xnnpack/microkernel-utils.h>
 #include <xnnpack/microparams-init.h>
-#include <xnnpack/operator.h>
 #include <xnnpack/pack.h>
 
 

diff --git a/bench/f16-dwconv2d-chw.cc b/bench/f16-dwconv2d-chw.cc
@@ -22,7 +22,6 @@
 #include <xnnpack/indirection.h>
 #include <xnnpack/microfnptr.h>
 #include <xnnpack/microparams-init.h>
-#include <xnnpack/operator.h>
 #include <xnnpack/pack.h>
 
 

diff --git a/bench/f16-f32acc-igemm.cc b/bench/f16-f32acc-igemm.cc
@@ -22,7 +22,6 @@
 #include <xnnpack/indirection.h>
 #include <xnnpack/microfnptr.h>
 #include <xnnpack/microparams-init.h>
-#include <xnnpack/operator.h>
 #include <xnnpack/pack.h>
 
 

diff --git a/bench/f16-igemm.cc b/bench/f16-igemm.cc
@@ -22,7 +22,6 @@
 #include <xnnpack/indirection.h>
 #include <xnnpack/microfnptr.h>
 #include <xnnpack/microparams-init.h>
-#include <xnnpack/operator.h>
 #include <xnnpack/pack.h>
 
 

diff --git a/bench/f32-dwconv.cc b/bench/f32-dwconv.cc
@@ -23,7 +23,6 @@
 #include <xnnpack/microfnptr.h>
 #include <xnnpack/microkernel-utils.h>
 #include <xnnpack/microparams-init.h>
-#include <xnnpack/operator.h>
 #include <xnnpack/pack.h>
 
 

diff --git a/bench/f32-dwconv2d-chw.cc b/bench/f32-dwconv2d-chw.cc
@@ -22,7 +22,6 @@
 #include <xnnpack/indirection.h>
 #include <xnnpack/microfnptr.h>
 #include <xnnpack/microparams-init.h>
-#include <xnnpack/operator.h>
 #include <xnnpack/pack.h>
 
 

diff --git a/bench/f32-igemm.cc b/bench/f32-igemm.cc
@@ -19,7 +19,6 @@
 #include <xnnpack/common.h>
 #include <xnnpack/igemm.h>
 #include <xnnpack/indirection.h>
-#include <xnnpack/operator.h>
 #include <xnnpack/microfnptr.h>
 #include <xnnpack/microparams-init.h>
 #include <xnnpack/pack.h>

diff --git a/bench/qs8-dwconv.cc b/bench/qs8-dwconv.cc
@@ -18,12 +18,12 @@
 #include <xnnpack.h>
 #include <xnnpack/aligned-allocator.h>
 #include <xnnpack/common.h>
+#include <xnnpack/config.h>
 #include <xnnpack/dwconv.h>
 #include <xnnpack/indirection.h>
 #include <xnnpack/microfnptr.h>
 #include <xnnpack/microkernel-utils.h>
 #include <xnnpack/microparams-init.h>
-#include <xnnpack/operator.h>
 #include <xnnpack/pack.h>
 
 

diff --git a/bench/qu8-dwconv-e2e.cc b/bench/qu8-dwconv-e2e.cc
@@ -16,6 +16,7 @@
 #include <benchmark/benchmark.h>
 
 #include <xnnpack.h>
+#include <xnnpack/config.h>
 #include <xnnpack/dwconv.h>
 #include <xnnpack/microfnptr.h>
 #include <xnnpack/microparams-init.h>

diff --git a/bench/utils.cc b/bench/utils.cc
@@ -26,7 +26,7 @@
 
 #include <xnnpack.h>
 #include <xnnpack/allocator.h>
-#include <xnnpack/config.h>
+#include <xnnpack/hardware-config.h>
 
 #include "bench/utils.h"
 

diff --git a/bench/x16-packw.cc b/bench/x16-packw.cc
@@ -14,6 +14,7 @@
 #include "bench/utils.h"
 
 #include <xnnpack/common.h>
+#include <xnnpack/hardware-config.h>
 #include <xnnpack/packw.h>
 
 

diff --git a/bench/x32-packw.cc b/bench/x32-packw.cc
@@ -14,6 +14,7 @@
 #include "bench/utils.h"
 
 #include <xnnpack/common.h>
+#include <xnnpack/hardware-config.h>
 #include <xnnpack/packw.h>
 
 

diff --git a/bench/x32-transpose.cc b/bench/x32-transpose.cc
@@ -15,7 +15,7 @@
 #include <xnnpack.h>
 #include <xnnpack/aligned-allocator.h>
 #include <xnnpack/common.h>
-#include <xnnpack/config.h>
+#include <xnnpack/hardware-config.h>
 #include <xnnpack/microfnptr.h>
 #include <xnnpack/microparams-init.h>
 #include <xnnpack/transpose.h>

diff --git a/bench/x8-packw.cc b/bench/x8-packw.cc
@@ -14,6 +14,7 @@
 #include "bench/utils.h"
 
 #include <xnnpack/common.h>
+#include <xnnpack/hardware-config.h>
 #include <xnnpack/packw.h>
 
 

diff --git a/src/configs/hardware-config.c b/src/configs/hardware-config.c
@@ -42,7 +42,7 @@
   #include <wasm_simd128.h>
 #endif
 
-#include <xnnpack/config.h>
+#include <xnnpack/hardware-config.h>
 #include <xnnpack/log.h>
 
 #if XNN_ARCH_X86_64 && defined(__linux__) && !defined(CHROMIUM)

diff --git a/src/operator-utils.c b/src/operator-utils.c
@@ -11,7 +11,6 @@
 #include <xnnpack.h>  // For xnn_operator_t.
 #include <xnnpack/allocator.h>
 #include <xnnpack/common.h>  // For XNN_ALLOCATION_ALIGNMENT.
-#include <xnnpack/config.h>
 #include <xnnpack/log.h>
 #include <xnnpack/math.h>
 #include <xnnpack/operator-utils.h>

diff --git a/src/xnnpack/compute.h b/src/xnnpack/compute.h
@@ -11,7 +11,8 @@
 
 #include <xnnpack.h>
 #include <xnnpack/common.h>
-#include <xnnpack/config.h>
+#include <xnnpack/microfnptr.h>
+#include <xnnpack/microparams.h>
 #include <xnnpack/math.h>