Update

[ghstack-poisoned]

Author: swolchok

shim_et/xplat/executorch/build/build_variables.bzl

@@ -15,7 +15,7 @@
 # unnecessary duplication, and people will invariably forget to update one or the other.
 # 3) List them somewhere CMake and Buck can both get at them; that's this file. Buck
 # files can load() it, and our CMake build evaluates it with Python. (See
-# append_filelist in build/Codegen.cmake.)
+# executorch_append_filelist in build/Codegen.cmake.)
 #
 # Inconveniently, the Buck target layout is much more granular than the CMake library
 # layout, leading to several complications:
@@ -230,6 +230,27 @@ PORTABLE_KERNELS_SRCS = [
     "kernels/portable/cpu/pattern/unary_ufunc_realhbf16.cpp",
 ]
 
+KERNELS_UTIL_ALL_DEPS_SRCS = [
+    "kernels/portable/cpu/util/activation_ops_util.cpp",
+    "kernels/portable/cpu/util/advanced_index_util.cpp",
+    "kernels/portable/cpu/util/arange_util.cpp",
+    "kernels/portable/cpu/util/broadcast_util.cpp",
+    "kernels/portable/cpu/util/copy_ops_util.cpp",
+    "kernels/portable/cpu/util/delinearize_index.cpp",
+    "kernels/portable/cpu/util/distance_util.cpp",
+    "kernels/portable/cpu/util/dtype_util.cpp",
+    "kernels/portable/cpu/util/index_util.cpp",
+    "kernels/portable/cpu/util/kernel_ops_util.cpp",
+    "kernels/portable/cpu/util/matmul_ops_util.cpp",
+    "kernels/portable/cpu/util/normalization_ops_util.cpp",
+    "kernels/portable/cpu/util/padding_util.cpp",
+    "kernels/portable/cpu/util/reduce_util.cpp",
+    "kernels/portable/cpu/util/repeat_util.cpp",
+    "kernels/portable/cpu/util/select_copy_util.cpp",
+    "kernels/portable/cpu/util/slice_util.cpp",
+    "kernels/portable/cpu/util/upsample_util.cpp",
+]
+
 OPTIMIZED_KERNELS_SRCS = [
     "kernels/optimized/cpu/binary_ops.cpp",
     "kernels/optimized/cpu/op_add.cpp",
@@ -297,11 +318,24 @@ OPTIMIZED_NATIVE_CPU_OPS_SRCS = [
     "kernels/optimized/cpu/op_where.cpp",
 ]
 
+TEST_BACKEND_COMPILER_LIB_SRCS = [
+    "runtime/executor/test/test_backend_compiler_lib.cpp",
+]
+
 EXTENSION_DATA_LOADER_SRCS = [
     "extension/data_loader/file_data_loader.cpp",
     "extension/data_loader/mmap_data_loader.cpp",
 ]
 
+EXTENSION_EVALUE_UTIL_SRCS = [
+    "extension/evalue_util/print_evalue.cpp",
+]
+
+EXTENSION_FLAT_TENSOR_SRCS = [
+    "extension/flat_tensor/flat_tensor_data_map.cpp",
+    "extension/flat_tensor/serialize/flat_tensor_header.cpp",
+]
+
 EXTENSION_MODULE_SRCS = [
     "extension/module/module.cpp",
 ]

tools/cmake/Codegen.cmake

@@ -346,7 +346,7 @@ endfunction()
 
 # Append the file list in the variable named `name` in build/build_variables.bzl
 # to the variable named `outputvar` in the caller's scope.
-function(append_filelist name outputvar)
+function(executorch_append_filelist name outputvar)
   # configure_file adds its input to the list of CMAKE_RERUN dependencies
   configure_file(
     ${PROJECT_SOURCE_DIR}/shim_et/xplat/executorch/build/build_variables.bzl
@@ -390,12 +390,16 @@ function(executorch_validate_build_variables)
       EXECUTORCH_SRCS
       EXECUTORCH_CORE_SRCS
       PORTABLE_KERNELS_SRCS
+      KERNELS_UTIL_ALL_DEPS_SRCS
       OPTIMIZED_KERNELS_SRCS
       QUANTIZED_KERNELS_SRCS
       PROGRAM_SCHEMA_SRCS
       OPTIMIZED_CPUBLAS_SRCS
       OPTIMIZED_NATIVE_CPU_OPS_SRCS
+      TEST_BACKEND_COMPILER_LIB_SRCS
       EXTENSION_DATA_LOADER_SRCS
+      EXTENSION_EVALUE_UTIL_SRCS
+      EXTENSION_FLAT_TENSOR_SRCS
       EXTENSION_MODULE_SRCS
       EXTENSION_RUNNER_UTIL_SRCS
       EXTENSION_LLM_RUNNER_SRCS
@@ -419,12 +423,16 @@ function(executorch_validate_build_variables)
       _executorch__srcs
       _executorch_core__srcs
       _portable_kernels__srcs
+      _kernels_util_all_deps__srcs
       _optimized_kernels__srcs
       _quantized_kernels__srcs
       _program_schema__srcs
       _optimized_cpublas__srcs
       _optimized_native_cpu_ops__srcs
+      _test_backend_compiler_lib__srcs
       _extension_data_loader__srcs
+      _extension_evalue_util__srcs
+      _extension_flat_tensor__srcs
       _extension_module__srcs
       _extension_runner_util__srcs
       _extension_llm_runner__srcs
@@ -450,21 +458,22 @@ function(executorch_validate_build_variables)
     if("${filelist_and_varname_1}" STREQUAL "_custom_ops__srcs")
       continue()
     endif()
-    append_filelist(
+    executorch_append_filelist(
       ${filelist_and_varname_0}
       "${filelist_and_varname_1}_from_build_variables"
     )
     if(NOT ${filelist_and_varname_1} STREQUAL
        ${filelist_and_varname_1}_from_build_variables
     )
       list(JOIN ${filelist_and_varname_1} "\n" pretty_buck_generated_list)
-      list(JOIN ${filelist_and_varname_1}_from_build_variables "\n" pretty_hardcoded_list)
+      list(JOIN ${filelist_and_varname_1}_from_build_variables "\n"
+           pretty_hardcoded_list
+      )
       message(
         FATAL_ERROR
           "Buck-generated ${filelist_and_varname_1} does not match hardcoded "
           "${filelist_and_varname_0} in build_variables.bzl. Left: "
-          "${pretty_buck_generated_list}\n "
-          "Right: ${pretty_hardcoded_list}"
+          "${pretty_buck_generated_list}\n " "Right: ${pretty_hardcoded_list}"
       )
     endif()
   endforeach()