Revert 731ee5 due to failing tests.

Reverts 731ee52

LiteRT-PiperOrigin-RevId: 828439725

Author: ai-edge-bot

litert/cc/BUILD

@@ -357,7 +357,6 @@ litert_device_test(
 #         "requires-gpu-nvidia",
 #     ],
 #     deps = [
-#         ":litert_common",
 #         ":litert_compiled_model",
 #         ":litert_element_type",
 #         ":litert_environment",

litert/cc/litert_compiled_model_gpu_test.cc

@@ -29,7 +29,6 @@
 #include "litert/c/litert_event_type.h"
 #include "litert/c/litert_profiler_event.h"
 #include "litert/cc/internal/litert_platform_support.h"
-#include "litert/cc/litert_common.h"
 #include "litert/cc/litert_compiled_model.h"
 #include "litert/cc/litert_element_type.h"
 #include "litert/cc/litert_environment.h"
@@ -387,28 +386,6 @@ TEST_P(CompiledModelGpuTest, PartialDelegation) {
   }
 }
 
-TEST_P(CompiledModelGpuTest, PartialDelegationNoCpuFallbackError) {
-  constexpr const char* kModelPartilaFileName = "simple_cast_and_add_op.tflite";
-  LITERT_ASSERT_OK_AND_ASSIGN(
-      auto model,
-      Model::CreateFromFile(testing::GetTestFilePath(kModelPartilaFileName)));
-
-  auto env = litert::Environment::Create({});
-  ASSERT_TRUE(env);
-
-  auto compilation_options = Options::Create();
-  compilation_options->SetHardwareAccelerators(HwAccelerators::kGpu);
-  LITERT_ASSERT_OK_AND_ASSIGN(auto gpu_options, litert::GpuOptions::Create());
-  LITERT_ASSERT_OK(
-      gpu_options.EnableExternalTensorsMode(CompiledModelGpuTest::GetParam()));
-  compilation_options->AddOpaqueOptions(std::move(gpu_options));
-
-  auto compiled_model_res =
-      CompiledModel::Create(*env, model, *compilation_options);
-  EXPECT_FALSE(compiled_model_res.HasValue());
-  EXPECT_EQ(compiled_model_res.Error().Status(), kLiteRtStatusErrorCompilation);
-}
-
 TEST_P(CompiledModelGpuTest, BasicAdd3dCstInt32) {
   constexpr const char* kInt32ModelFileName = "simple_add3d_cst_int32.tflite";
   constexpr const int32_t kInt32TestInput0Tensor[] = {1, 2, 3, 4, 5, 6};

litert/runtime/accelerators/xnnpack/xnnpack_accelerator.cc

@@ -109,17 +109,6 @@ class CpuAccelerator final
     LiteRtUnwrapDelegate(delegate_wrapper, &xnnpack_delegate);
     TfLiteXNNPackDelegateDelete(xnnpack_delegate);
   }
-
-  // Returns true to indicate the XNNPack delegate is responsible for JIT
-  // compilation.
-  static LiteRtStatus IsTfLiteDelegateResponsibleForJitCompilation(
-      LiteRtAcceleratorT* accelerator, bool* does_jit_compilation) {
-    LITERT_RETURN_IF_ERROR(does_jit_compilation,
-                           litert::ErrorStatusBuilder::InvalidArgument())
-        << "`does_jit_compilation` pointer is null.";
-    *does_jit_compilation = true;
-    return kLiteRtStatusOk;
-  }
 };
 
 }  // namespace
@@ -142,11 +131,6 @@ LiteRtStatus LiteRtRegisterCpuAccelerator(LiteRtEnvironment environment) {
   LITERT_ASSIGN_OR_RETURN(auto accelerator_impl,
                           litert::CpuAccelerator::Create());
 
-  LITERT_RETURN_IF_ERROR(
-      LiteRtSetIsAcceleratorDelegateResponsibleForJitCompilation(
-          accelerator.get(), litert::CpuAccelerator::
-                                 IsTfLiteDelegateResponsibleForJitCompilation));
-
   LITERT_RETURN_IF_ERROR(LiteRtRegisterAccelerator(
       environment, accelerator.release(), accelerator_impl.release(),
       litert::CpuAccelerator::Destroy));

litert/tools/BUILD

@@ -399,35 +399,25 @@ cc_library(
 # )
 # copybara:uncomment_end
 
+#copybara:comment_begin(google-only)
 cc_test(
     name = "benchmark_litert_model_test",
     srcs = ["benchmark_litert_model_test.cc"],
     data = ["//litert/test:testdata/mobilenet_v2_1.0_224.tflite"],
-    deps = [
-        ":benchmark_litert_model",
-        "//tflite/core/c:private_c_api_types",
-        "//tflite/tools/benchmark:benchmark_model_lib",
-        "//tflite/tools/benchmark:benchmark_params",
-        "@com_google_googletest//:gtest_main",
-    ],
+    tags = ["requires-gpu-nvidia"],
+    deps =
+        [
+            ":benchmark_litert_model",
+            "@com_google_googletest//:gtest_main",
+            # copybara:uncomment_begin(google-only)
+            # "//litert/runtime/accelerators/gpu:ml_drift_cl_accelerator",  # buildcleaner: keep
+            # copybara:uncomment_end
+            "//tflite/core/c:private_c_api_types",
+            "//tflite/tools/benchmark:benchmark_model_lib",
+            "//tflite/tools/benchmark:benchmark_params",
+        ],
 )
-
-# copybara:uncomment_begin(google-only)
-# cc_test(
-#     name = "benchmark_litert_model_gpu_test",
-#     srcs = ["benchmark_litert_model_gpu_test.cc"],
-#     data = ["//litert/test:testdata/mobilenet_v2_1.0_224.tflite"],
-#     tags = ["requires-gpu-nvidia"],
-#     deps = [
-#         ":benchmark_litert_model",
-#         "@com_google_googletest//:gtest_main",
-#         "//litert/runtime/accelerators/gpu:ml_drift_cl_accelerator",  # buildcleaner: keep
-#         "//tflite/core/c:private_c_api_types",
-#         "//tflite/tools/benchmark:benchmark_model_lib",
-#         "//tflite/tools/benchmark:benchmark_params",
-#     ],
-# )
-# copybara:uncomment_end
+#copybara:comment_end
 
 cc_library(
     name = "tensor_utils",

litert/tools/benchmark_litert_model_gpu_test.cc

@@ -70,6 +70,41 @@ TEST(BenchmarkLiteRtModelTest, GetModelSizeFromPathSucceeded) {
   EXPECT_GE(listener.results_.model_size_mb(), 0);
 }
 
+TEST(BenchmarkLiteRtModelTest, GPUAcceleration) {
+  // MSAN does not support GPU tests.
+#if defined(MEMORY_SANITIZER) || defined(THREAD_SANITIZER)
+  GTEST_SKIP() << "GPU tests are not supported In msan";
+#endif
+  BenchmarkParams params = BenchmarkLiteRtModel::DefaultParams();
+  params.Set<std::string>("graph", kModelPath);
+  params.Set<std::string>("signature_to_run_for", kSignatureToRunFor);
+  params.Set<bool>("use_cpu", false);
+  params.Set<bool>("use_gpu", true);
+  params.Set<bool>("require_full_delegation", true);
+
+  BenchmarkLiteRtModel benchmark = BenchmarkLiteRtModel(std::move(params));
+
+  EXPECT_EQ(benchmark.Run(), kTfLiteOk);
+}
+
+TEST(BenchmarkLiteRtModelTest, GPUAccelerationWithProfiler) {
+  // MSAN does not support GPU tests.
+#if defined(MEMORY_SANITIZER) || defined(THREAD_SANITIZER)
+  GTEST_SKIP() << "GPU tests are not supported In msan";
+#endif
+  BenchmarkParams params = BenchmarkLiteRtModel::DefaultParams();
+  params.Set<std::string>("graph", kModelPath);
+  params.Set<std::string>("signature_to_run_for", kSignatureToRunFor);
+  params.Set<bool>("use_cpu", false);
+  params.Set<bool>("use_gpu", true);
+  params.Set<bool>("require_full_delegation", true);
+  params.Set<bool>("use_profiler", true);
+
+  BenchmarkLiteRtModel benchmark = BenchmarkLiteRtModel(std::move(params));
+
+  EXPECT_EQ(benchmark.Run(), kTfLiteOk);
+}
+
 TEST(BenchmarkLiteRtModelTest, BenchmarkWithResultFilePath) {
   BenchmarkParams params = BenchmarkLiteRtModel::DefaultParams();
   params.Set<std::string>("graph", kModelPath);