build_variables.bzl: make CUSTOM_OPS_SRCS usable in BUCK (#13357)

Making the structure in this file mirror buck's worldview more closely
when it makes sense. #8268
(Also piggybacked a fixup for a continue() I left for this target in
#8326.)

Author: swolchok

extension/llm/custom_ops/targets.bzl

@@ -1,3 +1,4 @@
+load("@fbsource//xplat/executorch/build:build_variables.bzl", "EXTENSION_LLM_CUSTOM_OPS_BUCK_SRCS")
 load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
 load(
     "@fbsource//xplat/executorch/kernels/optimized:lib_defs.bzl",
@@ -30,12 +31,7 @@ def define_common_targets():
     for mkl_dep in ["", "_mkl_noomp"]:
         runtime.cxx_library(
             name = "custom_ops" + mkl_dep,
-            srcs = [
-                "op_fallback.cpp",
-                "op_fast_hadamard_transform.cpp",
-                "op_sdpa.cpp",
-                "op_update_cache.cpp",
-            ],
+            srcs = EXTENSION_LLM_CUSTOM_OPS_BUCK_SRCS,
             exported_headers = [
                 "op_fallback.h",
                 "op_fast_hadamard_transform.h",

shim_et/xplat/executorch/build/build_variables.bzl

@@ -493,13 +493,15 @@ VULKAN_SCHEMA_SRCS = [
     "backends/vulkan/serialization/schema.fbs",
 ]
 
-CUSTOM_OPS_SRCS = [
-    "extension/llm/custom_ops/op_fallback.cpp",
-    "extension/llm/custom_ops/op_fast_hadamard_transform.cpp",
-    "extension/llm/custom_ops/op_sdpa.cpp",
-    "extension/llm/custom_ops/op_update_cache.cpp",
+EXTENSION_LLM_CUSTOM_OPS_BUCK_SRCS = [
+    "op_fallback.cpp",
+    "op_fast_hadamard_transform.cpp",
+    "op_sdpa.cpp",
+    "op_update_cache.cpp",
+]
+
+CUSTOM_OPS_SRCS = ["extension/llm/custom_ops/" + x for x in EXTENSION_LLM_CUSTOM_OPS_BUCK_SRCS] + [
     "extension/llm/custom_ops/spinquant/fast_hadamard_transform.cpp",
-    "kernels/portable/cpu/util/reduce_util.cpp",
 ]
 
 LLAMA_RUNNER_SRCS = [

tools/cmake/Codegen.cmake

@@ -455,9 +455,6 @@ function(executorch_validate_build_variables)
   foreach(filelist_and_varname IN ZIP_LISTS BUILD_VARIABLES_FILELISTS
                                   BUILD_VARIABLES_VARNAMES
   )
-    if("${filelist_and_varname_1}" STREQUAL "_custom_ops__srcs")
-      continue()
-    endif()
     executorch_append_filelist(
       ${filelist_and_varname_0}
       "${filelist_and_varname_1}_from_build_variables"