Fix more missing deps in the build graph, and missing transitive incl…

…udes, using internal tooling. PiperOrigin-RevId: 660139555
google · Aug 7, 2024 · b038cf2 · b038cf2
1 parent 4699e31
commit b038cf2
Show file tree

Hide file tree

Showing 25 changed files with 124 additions and 22 deletions.
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -766,6 +766,7 @@ xnnpack_microkernel_cc_library(
     srcs_prod = ["src/amalgam/gen/scalar.c"],
     srcs_test = ALL_SCALAR_MICROKERNEL_SRCS,
     deps = MICROKERNEL_DEPS + [
+        ":config_hdrs",
         "@FP16",
         "@FXdiv",
     ],
@@ -1786,10 +1787,15 @@ xnnpack_cc_library(
         ":config_hdrs",
         ":logging",
         ":math",
+        ":microparams",
+        ":params",
         ":unaligned",
+        ":xnnpack_h",
         "@FP16",
     ] + xnnpack_if_kleidiai_enabled([
         "@KleidiAI//kai/ukernels/matmul",
+        "@KleidiAI//kai/ukernels/matmul:rhs_pack_kxn_qsi4cxp_qsu4cxs1s0",
+        "@KleidiAI//kai/ukernels/matmul:rhs_pack_nxk_qsi4cxp_qsu4cxs1s0",
     ]),
 )
 
@@ -2007,6 +2013,7 @@ xnnpack_cc_library(
     ],
     deps = [
         ":allocator",
+        ":logging",
         ":microkernel_configs",
         ":microparams",
         ":params",
@@ -2040,10 +2047,12 @@ xnnpack_cc_library(
     gcc_copts = xnnpack_gcc_std_copts(),
     msvc_copts = xnnpack_msvc_std_copts(),
     deps = [
-        ":cache",
+        ":allocator",
         ":common",
+        ":logging",
         ":math",
         ":operator_h",
+        ":params",
         ":xnnpack_h",
     ],
 )
@@ -2076,13 +2085,15 @@ xnnpack_cc_library(
         ":microkernel_configs",
         ":microkernel_type",
         ":microkernel_utils",
+        ":microkernels_h",
         ":microparams_init",
         ":normalization",
         ":operator_type",
         ":operator_utils",
         ":packing",
         ":params",
         ":post_operation",
+        ":quantization",
         ":xnnpack_h",
         "@FP16",
         "@pthreadpool",
@@ -2226,6 +2237,9 @@ xnnpack_cc_library(
         ":allocator",
         ":build_identifier",
         ":common",
+        ":config_hdrs",
+        ":hardware_config",
+        ":init_once",
         ":logging",
         ":math",
         ":microkernels_h",
@@ -2234,6 +2248,7 @@ xnnpack_cc_library(
         ":operators",
         ":params",
         ":subgraph",
+        "@pthreadpool",
     ],
 )
 
@@ -2257,17 +2272,11 @@ xnnpack_cc_library(
     visibility = xnnpack_visibility(),
     deps = [
         ":allocator",
-        ":build_identifier",
-        ":common",
+        ":hardware_config",
+        ":init_once",
         ":logging",
-        ":math",
-        ":microkernels_h",
-        ":microparams",
-        ":microparams_init",
-        ":operators",
         ":params",
-        ":prod_microkernels",
-        ":subgraph",
+        "@pthreadpool",
     ],
 )
 
@@ -2291,16 +2300,11 @@ xnnpack_cc_library(
     visibility = xnnpack_visibility(),
     deps = [
         ":allocator",
-        ":build_identifier",
-        ":common",
+        ":hardware_config",
+        ":init_once",
         ":logging",
-        ":math",
-        ":microkernels_h",
-        ":microparams",
-        ":microparams_init",
-        ":operators",
         ":params",
-        ":prod_microkernels",
+        "@pthreadpool",
     ],
 )
 

diff --git a/src/f16-avgpool/f16-avgpool-9p8x-minmax-f16c-c8.c b/src/f16-avgpool/f16-avgpool-9p8x-minmax-f16c-c8.c
@@ -7,8 +7,12 @@
 
 #include <immintrin.h>
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "xnnpack/avgpool.h"
-#include "xnnpack/intrinsics-polyfill.h"
+#include "xnnpack/common.h"
+#include "xnnpack/microparams.h"
 
 
 void xnn_f16_avgpool_minmax_ukernel_9p8x__f16c_c8(

diff --git a/src/f16-avgpool/f16-avgpool-9x-minmax-f16c-c8.c b/src/f16-avgpool/f16-avgpool-9x-minmax-f16c-c8.c
@@ -7,8 +7,12 @@
 
 #include <immintrin.h>
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "xnnpack/avgpool.h"
-#include "xnnpack/intrinsics-polyfill.h"
+#include "xnnpack/common.h"
+#include "xnnpack/microparams.h"
 
 
 void xnn_f16_avgpool_minmax_ukernel_9x__f16c_c8(

diff --git a/src/f16-pavgpool/f16-pavgpool-9p8x-minmax-avx2-c8.c b/src/f16-pavgpool/f16-pavgpool-9p8x-minmax-avx2-c8.c
@@ -7,7 +7,11 @@
 
 #include <immintrin.h>
 
-#include "xnnpack/intrinsics-polyfill.h"
+#include <stddef.h>
+#include <stdint.h>
+
+#include "xnnpack/common.h"
+#include "xnnpack/microparams.h"
 #include "xnnpack/pavgpool.h"
 
 

diff --git a/src/f16-pavgpool/f16-pavgpool-9x-minmax-avx2-c8.c b/src/f16-pavgpool/f16-pavgpool-9x-minmax-avx2-c8.c
@@ -7,7 +7,11 @@
 
 #include <immintrin.h>
 
-#include "xnnpack/intrinsics-polyfill.h"
+#include <stddef.h>
+#include <stdint.h>
+
+#include "xnnpack/common.h"
+#include "xnnpack/microparams.h"
 #include "xnnpack/pavgpool.h"
 
 

diff --git a/src/f32-avgpool/f32-avgpool-9p8x-minmax-scalar-c1.c b/src/f32-avgpool/f32-avgpool-9p8x-minmax-scalar-c1.c
@@ -5,8 +5,13 @@
 
 #include <assert.h>
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "xnnpack/avgpool.h"
+#include "xnnpack/common.h"
 #include "xnnpack/math.h"
+#include "xnnpack/microparams.h"
 
 
 void xnn_f32_avgpool_minmax_ukernel_9p8x__scalar_c1(

diff --git a/src/f32-avgpool/f32-avgpool-9p8x-minmax-sse-c4.c b/src/f32-avgpool/f32-avgpool-9p8x-minmax-sse-c4.c
@@ -5,9 +5,13 @@
 
 #include <assert.h>
 
+#include <stddef.h>
+#include <stdint.h>
 #include <xmmintrin.h>
 
 #include "xnnpack/avgpool.h"
+#include "xnnpack/common.h"
+#include "xnnpack/microparams.h"
 
 
 void xnn_f32_avgpool_minmax_ukernel_9p8x__sse_c4(

diff --git a/src/f32-avgpool/f32-avgpool-9x-minmax-scalar-c1.c b/src/f32-avgpool/f32-avgpool-9x-minmax-scalar-c1.c
@@ -5,8 +5,13 @@
 
 #include <assert.h>
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "xnnpack/avgpool.h"
+#include "xnnpack/common.h"
 #include "xnnpack/math.h"
+#include "xnnpack/microparams.h"
 
 
 void xnn_f32_avgpool_minmax_ukernel_9x__scalar_c1(

diff --git a/src/f32-avgpool/f32-avgpool-9x-minmax-sse-c4.c b/src/f32-avgpool/f32-avgpool-9x-minmax-sse-c4.c
@@ -5,9 +5,14 @@
 
 #include <assert.h>
 
+#include <stddef.h>
+#include <stdint.h>
 #include <xmmintrin.h>
 
+
 #include "xnnpack/avgpool.h"
+#include "xnnpack/common.h"
+#include "xnnpack/microparams.h"
 
 
 void xnn_f32_avgpool_minmax_ukernel_9x__sse_c4(

diff --git a/src/f32-pavgpool/f32-pavgpool-9p8x-minmax-scalar-c1.c b/src/f32-pavgpool/f32-pavgpool-9p8x-minmax-scalar-c1.c
@@ -5,6 +5,11 @@
 
 #include <assert.h>
 
+#include <stddef.h>
+#include <stdint.h>
+
+#include "xnnpack/common.h"
+#include "xnnpack/microparams.h"
 #include "xnnpack/pavgpool.h"
 #include "xnnpack/math.h"
 

diff --git a/src/f32-pavgpool/f32-pavgpool-9p8x-minmax-sse-c4.c b/src/f32-pavgpool/f32-pavgpool-9p8x-minmax-sse-c4.c
@@ -5,8 +5,13 @@
 
 #include <assert.h>
 
+#include <stddef.h>
+#include <stdint.h>
 #include <xmmintrin.h>
 
+
+#include "xnnpack/common.h"
+#include "xnnpack/microparams.h"
 #include "xnnpack/pavgpool.h"
 
 

diff --git a/src/f32-pavgpool/f32-pavgpool-9x-minmax-scalar-c1.c b/src/f32-pavgpool/f32-pavgpool-9x-minmax-scalar-c1.c
@@ -5,6 +5,11 @@
 
 #include <assert.h>
 
+#include <stddef.h>
+#include <stdint.h>
+
+#include "xnnpack/common.h"
+#include "xnnpack/microparams.h"
 #include "xnnpack/pavgpool.h"
 #include "xnnpack/math.h"
 

diff --git a/src/f32-pavgpool/f32-pavgpool-9x-minmax-sse-c4.c b/src/f32-pavgpool/f32-pavgpool-9x-minmax-sse-c4.c
@@ -5,8 +5,12 @@
 
 #include <assert.h>
 
+#include <stddef.h>
+#include <stdint.h>
 #include <xmmintrin.h>
 
+#include "xnnpack/common.h"
+#include "xnnpack/microparams.h"
 #include "xnnpack/pavgpool.h"
 
 

diff --git a/src/qu8-avgpool/qu8-avgpool-9p8x-minmax-fp32-scalar-imagic-c1.c b/src/qu8-avgpool/qu8-avgpool-9p8x-minmax-fp32-scalar-imagic-c1.c
@@ -8,8 +8,13 @@
 
 #include <assert.h>
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "xnnpack/avgpool.h"
+#include "xnnpack/common.h"
 #include "xnnpack/math.h"
+#include "xnnpack/microparams.h"
 
 
 void xnn_qu8_avgpool_minmax_fp32_ukernel_9p8x__scalar_imagic_c1(

diff --git a/src/qu8-avgpool/qu8-avgpool-9p8x-minmax-fp32-sse2-c8.c b/src/qu8-avgpool/qu8-avgpool-9p8x-minmax-fp32-sse2-c8.c
@@ -9,8 +9,12 @@
 #include <assert.h>
 
 #include <emmintrin.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include "xnnpack/avgpool.h"
+#include "xnnpack/common.h"
+#include "xnnpack/microparams.h"
 #include "xnnpack/unaligned.h"
 
 

diff --git a/src/qu8-avgpool/qu8-avgpool-9x-minmax-fp32-scalar-imagic-c1.c b/src/qu8-avgpool/qu8-avgpool-9x-minmax-fp32-scalar-imagic-c1.c
@@ -8,8 +8,13 @@
 
 #include <assert.h>
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "xnnpack/avgpool.h"
+#include "xnnpack/common.h"
 #include "xnnpack/math.h"
+#include "xnnpack/microparams.h"
 
 
 void xnn_qu8_avgpool_minmax_fp32_ukernel_9x__scalar_imagic_c1(

diff --git a/src/qu8-avgpool/qu8-avgpool-9x-minmax-fp32-sse2-c8.c b/src/qu8-avgpool/qu8-avgpool-9x-minmax-fp32-sse2-c8.c
@@ -9,8 +9,12 @@
 #include <assert.h>
 
 #include <emmintrin.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include "xnnpack/avgpool.h"
+#include "xnnpack/common.h"
+#include "xnnpack/microparams.h"
 #include "xnnpack/unaligned.h"
 
 

diff --git a/src/s8-vclamp/s8-vclamp-scalar-u4.c b/src/s8-vclamp/s8-vclamp-scalar-u4.c
@@ -4,8 +4,12 @@
 // LICENSE file in the root directory of this source tree.
 
 #include <assert.h>
+#include <stddef.h>
+#include <stdint.h>
 
+#include "xnnpack/common.h"
 #include "xnnpack/math.h"
+#include "xnnpack/microparams.h"
 #include "xnnpack/vunary.h"
 
 

diff --git a/src/s8-vclamp/s8-vclamp-sse2-u64.c b/src/s8-vclamp/s8-vclamp-sse2-u64.c
@@ -6,7 +6,11 @@
 #include <assert.h>
 
 #include <emmintrin.h>
+#include <stddef.h>
+#include <stdint.h>
 
+#include "xnnpack/common.h"
+#include "xnnpack/microparams.h"
 #include "xnnpack/unaligned.h"
 #include "xnnpack/vunary.h"
 

diff --git a/src/s8-vclamp/s8-vclamp-sse41-u64.c b/src/s8-vclamp/s8-vclamp-sse41-u64.c
@@ -6,7 +6,11 @@
 #include <assert.h>
 
 #include <smmintrin.h>
+#include <stddef.h>
+#include <stdint.h>
 
+#include "xnnpack/common.h"
+#include "xnnpack/microparams.h"
 #include "xnnpack/unaligned.h"
 #include "xnnpack/vunary.h"
 

diff --git a/src/subgraph/multiply2.c b/src/subgraph/multiply2.c
@@ -9,6 +9,7 @@
 #include <stdint.h>
 #include <string.h>
 
+
 #include "xnnpack.h"
 #include "xnnpack/common.h"
 #include "xnnpack/log.h"

diff --git a/src/u8-rmax/u8-rmax-scalar-u2.c b/src/u8-rmax/u8-rmax-scalar-u2.c
@@ -4,6 +4,8 @@
 // LICENSE file in the root directory of this source tree.
 
 #include <assert.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include "xnnpack/reduce.h"