switch top-level ExecuTorch build from executorch_srcs.cmake to build_variables.bzl

CMakeLists.txt

@@ -309,9 +309,15 @@ set(_common_include_directories
 )
 
 #
-# The `_<target>_srcs` lists are defined by including ${EXECUTORCH_SRCS_FILE}.
+# The `_<target>_srcs` lists are defined by executorch_load_build_variables.
 #
-
+if(EXECUTORCH_SRCS_FILE)
+  message(
+    WARNING
+      "EXECUTORCH_SRCS_FILE is no longer necessary and will not affect the build."
+  )
+endif()
+executorch_load_build_variables()
 if(NOT EXECUTORCH_SRCS_FILE)
   # A file wasn't provided. Run a script to extract the source lists from the
   # buck2 build system and write them to a file we can include.
@@ -324,10 +330,6 @@ if(NOT EXECUTORCH_SRCS_FILE)
   executorch_validate_build_variables()
 endif()
 
-# This file defines the `_<target>__srcs` variables used below.
-message(STATUS "executorch: Using sources file ${EXECUTORCH_SRCS_FILE}")
-include(${EXECUTORCH_SRCS_FILE})
-
 # Detect if an iOS toolchain is set.
 if(CMAKE_TOOLCHAIN_FILE MATCHES ".*(iOS|ios\.toolchain)\.cmake$")
   set(CMAKE_TOOLCHAIN_IOS ON)

tools/cmake/Codegen.cmake

@@ -375,6 +375,73 @@ function(executorch_append_filelist name outputvar)
   )
 endfunction()
 
+set(EXECUTORCH_BUILD_VARIABLES_FILELISTS
+    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
+    EXTENSION_TENSOR_SRCS
+    EXTENSION_THREADPOOL_SRCS
+    EXTENSION_TRAINING_SRCS
+    TRAIN_XOR_SRCS
+    EXECUTOR_RUNNER_SRCS
+    SIZE_TEST_SRCS
+    MPS_EXECUTOR_RUNNER_SRCS
+    MPS_BACKEND_SRCS
+    MPS_SCHEMA_SRCS
+    XNN_EXECUTOR_RUNNER_SRCS
+    XNNPACK_BACKEND_SRCS
+    XNNPACK_SCHEMA_SRCS
+    VULKAN_SCHEMA_SRCS
+    CUSTOM_OPS_SRCS
+    LLAMA_RUNNER_SRCS
+)
+set(EXECUTORCH_BUILD_VARIABLES_VARNAMES
+    _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
+    _extension_tensor__srcs
+    _extension_threadpool__srcs
+    _extension_training__srcs
+    _train_xor__srcs
+    _executor_runner__srcs
+    _size_test__srcs
+    _mps_executor_runner__srcs
+    _mps_backend__srcs
+    _mps_schema__srcs
+    _xnn_executor_runner__srcs
+    _xnnpack_backend__srcs
+    _xnnpack_schema__srcs
+    _vulkan_schema__srcs
+    _custom_ops__srcs
+    _llama_runner__srcs
+)
+
 # Fail the build if the src lists in build_variables.bzl do not match the src
 # lists extracted from Buck and placed into EXECUTORCH_SRCS_FILE. This is
 # intended to be a safety mechanism while we are in the process of removing Buck
@@ -386,74 +453,9 @@ endfunction()
 # involve getting these lists to match!
 function(executorch_validate_build_variables)
   include(${EXECUTORCH_SRCS_FILE})
-  set(BUILD_VARIABLES_FILELISTS
-      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
-      EXTENSION_TENSOR_SRCS
-      EXTENSION_THREADPOOL_SRCS
-      EXTENSION_TRAINING_SRCS
-      TRAIN_XOR_SRCS
-      EXECUTOR_RUNNER_SRCS
-      SIZE_TEST_SRCS
-      MPS_EXECUTOR_RUNNER_SRCS
-      MPS_BACKEND_SRCS
-      MPS_SCHEMA_SRCS
-      XNN_EXECUTOR_RUNNER_SRCS
-      XNNPACK_BACKEND_SRCS
-      XNNPACK_SCHEMA_SRCS
-      VULKAN_SCHEMA_SRCS
-      CUSTOM_OPS_SRCS
-      LLAMA_RUNNER_SRCS
-  )
-  set(BUILD_VARIABLES_VARNAMES
-      _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
-      _extension_tensor__srcs
-      _extension_threadpool__srcs
-      _extension_training__srcs
-      _train_xor__srcs
-      _executor_runner__srcs
-      _size_test__srcs
-      _mps_executor_runner__srcs
-      _mps_backend__srcs
-      _mps_schema__srcs
-      _xnn_executor_runner__srcs
-      _xnnpack_backend__srcs
-      _xnnpack_schema__srcs
-      _vulkan_schema__srcs
-      _custom_ops__srcs
-      _llama_runner__srcs
-  )
-  foreach(filelist_and_varname IN ZIP_LISTS BUILD_VARIABLES_FILELISTS
-                                  BUILD_VARIABLES_VARNAMES
+  foreach(filelist_and_varname IN
+          ZIP_LISTS EXECUTORCH_BUILD_VARIABLES_FILELISTS
+          EXECUTORCH_BUILD_VARIABLES_VARNAMES
   )
     executorch_append_filelist(
       ${filelist_and_varname_0}
@@ -504,3 +506,18 @@ function(executorch_validate_build_variables)
     endif()
   endforeach()
 endfunction()
+
+function(executorch_load_build_variables)
+  foreach(filelist_and_varname IN
+          ZIP_LISTS EXECUTORCH_BUILD_VARIABLES_FILELISTS
+          EXECUTORCH_BUILD_VARIABLES_VARNAMES
+  )
+    executorch_append_filelist(
+      ${filelist_and_varname_0} "${filelist_and_varname_1}"
+    )
+    set(${filelist_and_varname_1}
+        "${${filelist_and_varname_1}}"
+        PARENT_SCOPE
+    )
+  endforeach()
+endfunction()