Re-structure CPU/GPU accelerator registration.

LiteRT-PiperOrigin-RevId: 893621181

Author: niuchl

litert/c/internal/BUILD

@@ -447,21 +447,6 @@ _HEADER_FILES_FOR_SHARED_LIB = [
 
 exports_files(srcs = _HEADER_FILES_FOR_SHARED_LIB)
 
-cc_library(
-    name = "litert_static_accelerator_registry",
-    srcs = ["litert_static_accelerator_registry.cc"],
-    hdrs = ["litert_static_accelerator_registry.h"],
-    visibility = [
-        "//litert/runtime/accelerators:__subpackages__",
-        "//third_party/odml/litert/ml_drift:__subpackages__",
-    ],
-    deps = [
-        ":litert_accelerator_def",
-        "//litert/c:litert_common",
-    ],
-    alwayslink = 1,
-)
-
 filegroup(
     name = "internal_headers",
     srcs = _HEADER_FILES_FOR_SHARED_LIB,

litert/c/internal/CMakeLists.txt

@@ -26,7 +26,6 @@ set(LITERT_C_INTERNAL_HEADERS
     internal/litert_runtime_c_api.h
     internal/litert_runtime_context.h
     internal/litert_scheduling_info.h
-    internal/litert_static_accelerator_registry.h
     internal/litert_tensor_buffer_registry.h
 )
 
@@ -36,7 +35,6 @@ set(LITERT_C_INTERNAL_SOURCES
     internal/litert_delegate_wrapper.cc
     internal/litert_external_litert_buffer_context.cc
     internal/litert_runtime_context.cc
-    internal/litert_static_accelerator_registry.cc
     internal/litert_tensor_buffer_registry.cc
 )
 

litert/c/internal/litert_static_accelerator_registry.h

@@ -18,6 +18,9 @@ cmake_minimum_required(VERSION 3.20)
 set(LITERT_RUNTIME_SOURCES
     accelerator_registry.cc
     accelerators/auto_registration.cc
+    accelerators/cpu_registry.cc
+    accelerators/gpu_registry.cc
+    accelerators/registration_helper.cc
     accelerators/dispatch/dispatch_accelerator.cc
     accelerators/xnnpack/xnnpack_accelerator.cc
     ahwb_buffer.cc
@@ -73,10 +76,6 @@ if(APPLE)
   target_link_libraries(litert_runtime PRIVATE "-framework Metal" "-framework Foundation" "-framework OpenGL")
 endif()
 
-target_compile_options(litert_runtime PRIVATE
-    -DLITERT_USE_XNNPACK
-)
-
 target_include_directories(litert_runtime
     PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>

litert/runtime/CMakeLists.txt

@@ -23,27 +23,59 @@ cc_library(
     name = "auto_registration",
     srcs = ["auto_registration.cc"],
     hdrs = ["auto_registration.h"],
-    copts = select({
-        "//litert/build_common:litert_disable_cpu": [],
-        "//conditions:default": [
-            "-DLITERT_USE_XNNPACK",
-        ],
-    }),
     deps = [
+        ":cpu_registry",
+        ":gpu_registry",
+        ":registration_helper",
         "//litert/c:litert_any",
         "//litert/c:litert_common",
         "//litert/c:litert_environment_options",
         "//litert/c/internal:litert_accelerator_def",
         "//litert/c/internal:litert_accelerator_registration",
         "//litert/c/internal:litert_logging",
-        "//litert/c/internal:litert_static_accelerator_registry",
         "//litert/c/internal:litert_tensor_buffer_registry_header",
         "//litert/cc:litert_expected",
         "//litert/cc:litert_macros",
-        "//litert/cc/internal:litert_shared_library",
         "//litert/core:environment",
         "//litert/runtime/accelerators/dispatch:dispatch_accelerator",
         "@com_google_absl//absl/strings",
+    ],
+)
+
+cc_library(
+    name = "accelerator_implementation_helper",
+    hdrs = ["accelerator_implementation_helper.h"],
+    deps = [
+        "//litert/c:litert_common",
+        "//litert/c/internal:litert_accelerator_registration",
+        "//litert/cc:litert_expected",
+        "//litert/cc:litert_macros",
+        "@com_google_absl//absl/strings:string_view",
+    ],
+)
+
+cc_library(
+    name = "registration_helper",
+    srcs = ["registration_helper.cc"],
+    hdrs = ["registration_helper.h"],
+    deps = [
+        "//litert/c:litert_common",
+        "//litert/c/internal:litert_accelerator_def",
+        "//litert/c/internal:litert_accelerator_registration",
+        "//litert/c/internal:litert_tensor_buffer_registry_header",
+        "//litert/cc:litert_macros",
+    ],
+)
+
+cc_library(
+    name = "cpu_registry",
+    srcs = ["cpu_registry.cc"],
+    hdrs = ["cpu_registry.h"],
+    deps = [
+        ":registration_helper",
+        "//litert/c:litert_common",
+        "//litert/c/internal:litert_accelerator_def",
+        "//litert/c/internal:litert_logging",
     ] + select({
         "//litert/build_common:litert_disable_cpu": [],
         "//conditions:default": [
@@ -53,13 +85,20 @@ cc_library(
 )
 
 cc_library(
-    name = "accelerator_implementation_helper",
-    hdrs = ["accelerator_implementation_helper.h"],
+    name = "gpu_registry",
+    srcs = ["gpu_registry.cc"],
+    hdrs = ["gpu_registry.h"],
     deps = [
+        ":registration_helper",
+        "//litert/c:litert_any",
         "//litert/c:litert_common",
-        "//litert/c/internal:litert_accelerator_registration",
+        "//litert/c:litert_environment_options",
+        "//litert/c/internal:litert_accelerator_def",
+        "//litert/c/internal:litert_logging",
         "//litert/cc:litert_expected",
         "//litert/cc:litert_macros",
-        "@com_google_absl//absl/strings:string_view",
+        "//litert/cc/internal:litert_shared_library",
+        "//litert/core:environment",
+        "@com_google_absl//absl/strings",
     ],
 )