Fix some random broken targets related to vendor device runtime tests.

LiteRT-PiperOrigin-RevId: 820533694

Author: LukeBoyer

litert/cc/BUILD

@@ -18,6 +18,7 @@ load("@rules_cc//cc:cc_test.bzl", "cc_test")
 
 # copybara:uncomment load("@rules_cc//cc:objc_library.bzl", "objc_library")
 load("//litert/build_common:flavor_transition.bzl", "flavored_cc_alias")
+load("//litert/build_common:litert_build_defs.bzl", "cc_library_with_testonly_vis")
 load("//litert/build_common:special_rule.bzl", "gles_headers", "gles_linkopts", "litert_android_linkopts")
 load("//litert/integration_test:litert_device.bzl", "litert_device_exec", "litert_device_test")
 # copybara:uncomment load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test")
@@ -697,10 +698,10 @@ cc_test(
     ],
 )
 
-cc_library(
+cc_library_with_testonly_vis(
     name = "litert_environment",
     hdrs = ["litert_environment.h"],
-    visibility = [
+    vis = [
         # copybara:uncomment_begin(oss litert_lm)
         # "//litert:litert_cc_users_static_link",
         # copybara:uncomment_end_and_comment_begin
@@ -1055,10 +1056,10 @@ litert_device_exec(
     target = ":litert_tensor_buffer_test",
 )
 
-cc_library(
+cc_library_with_testonly_vis(
     name = "litert_options",
     hdrs = ["litert_options.h"],
-    visibility = [
+    vis = [
         # copybara:uncomment_begin(oss litert_lm)
         # "//litert:litert_cc_users_static_link",
         # copybara:uncomment_end_and_comment_begin

litert/cc/litert_compiled_model_google_tensor_test.cc

@@ -27,11 +27,11 @@
 #include "litert/c/litert_event_type.h"
 #include "litert/c/litert_gl_types.h"
 #include "litert/c/litert_tensor_buffer_types.h"
+#include "litert/cc/internal/litert_platform_support.h"
 #include "litert/cc/litert_compiled_model.h"
 #include "litert/cc/litert_environment.h"
 #include "litert/cc/litert_event.h"
 #include "litert/cc/litert_model.h"
-#include "litert/cc/litert_platform_support.h"
 #include "litert/cc/litert_tensor_buffer.h"
 #include "litert/test/common.h"
 #include "litert/test/matchers.h"

litert/integration_test/BUILD

@@ -162,6 +162,8 @@ litert_device_test(
     backend_id = "mediatek",
     deps = [
         "//litert/cc:litert_shared_library",
+        "//litert/cc/options:litert_mediatek_options",
+        "//litert/test:matchers",
         "//litert/vendors/mediatek:neuron_adapter_api",
         "@com_google_googletest//:gtest_main",
     ],
@@ -209,7 +211,8 @@ litert_device_test(
 #
 # GOOGLE_TENSOR_GUITAR_TARGS_SMALL = [
 #     ":google_tensor_smoketest",
-#     "//litert/runtime/dispatch:dispatch_delegate_google_tensor_test",
+#     # TODO: lukeboyer - Reenable once vis is updated.
+#     # "//litert/runtime/dispatch:dispatch_delegate_google_tensor_test",
 #     "//litert/runtime/dispatch:dispatch_delegate_cascade_google_tensor_test",
 #     "//litert/runtime/dispatch:dispatch_delegate_mixed_cascade_google_tensor_test",
 #     "//litert/cc:litert_compiled_model_gpu_device_test",

litert/integration_test/smoketests/mediatek_smoketest.cc

@@ -18,6 +18,8 @@
 
 #include <gtest/gtest.h>
 #include "litert/cc/litert_shared_library.h"
+#include "litert/cc/options/litert_mediatek_options.h"
+#include "litert/test/matchers.h"
 #include "litert/vendors/mediatek/neuron_adapter_api.h"
 
 namespace litert::test {
@@ -42,8 +44,9 @@ TEST(MediaTekSmokeTest, LoadLibsFromEnvPath) {
 }
 
 TEST(MediaTekSmokeTest, NeuronAdapterApiCreate) {
-  auto neuron_adapter_api =
-      litert::mediatek::NeuronAdapterApi::Create(std::nullopt);
+  auto mediatek_options = mediatek::MediatekOptions::Create();
+  auto neuron_adapter_api = litert::mediatek::NeuronAdapterApi::Create(
+      std::nullopt, mediatek_options);
   ASSERT_TRUE(neuron_adapter_api.HasValue());
 }
 

litert/runtime/dispatch/BUILD

@@ -192,9 +192,15 @@ litert_device_test(
         "//conditions:default": [],
     }),
     linkopts = gles_linkopts(),
+    # TODO: gt team update visibility.
+    tags = [
+        "nobuilder",
+        "notap",
+    ],
     deps = [
         ":dispatch_delegate",
         ":dispatch_opaque_options",
+        "//platforms/darwinn/tachyon/core/fence",
         "@com_google_googletest//:gtest_main",
         "@com_google_absl//absl/log",
         "@com_google_absl//absl/log:absl_log",
@@ -207,16 +213,14 @@ litert_device_test(
         "//litert/cc:litert_environment",
         "//litert/cc:litert_event",
         "//litert/cc:litert_expected",
-        "//litert/cc/dynamic_runtime:litert_compiled_model",
-        "//litert/cc/dynamic_runtime:litert_environment",
-        "//litert/cc/dynamic_runtime:litert_event",
         "//litert/cc/dynamic_runtime:litert_model",
         "//litert/cc/dynamic_runtime:litert_options",
         "//litert/cc/dynamic_runtime:litert_tensor_buffer",
-        "//litert/core/model:model_buffer",
         "//litert/core/util:flatbuffer_tools",
         "//litert/runtime:external_litert_buffer_context",
         "//litert/runtime:tensor_buffer",
+        "//litert/runtime:tensor_identifier",
+        "//litert/runtime:tfl_utils",
         "//litert/test:common",
         "//litert/test:matchers",
         "//litert/test:simple_model_npu",

litert/vendors/google_tensor/dispatch/BUILD

@@ -95,6 +95,11 @@ litert_device_test(
         "//litert/test:testdata/simple_model_google_tensor.bin",
         "//litert/test:testdata/simple_model_npu.tflite",
     ],
+    # TODO: google_tensor team fix visibility for fence deps.
+    tags = [
+        "nobuilder",
+        "notap",
+    ],
     deps = [
         "//litert/c:litert_runtime_c_api_shared_lib",
         "//litert/cc:litert_expected",
@@ -124,6 +129,11 @@ litert_device_test(
         "//tools/cc_target_os:android": ["-layering_check"],
         "//conditions:default": [],
     }),
+    # TODO: google_tensor team fix visibility for fence deps.
+    tags = [
+        "nobuilder",
+        "notap",
+    ],
     deps = [
         "@com_google_googletest//:gtest_main",
         "@com_google_absl//absl/log",

litert/vendors/mediatek/dispatch/BUILD

@@ -89,8 +89,8 @@ litert_device_test(
         ":dispatch_api",
         "//litert/c:litert_runtime_c_api_shared_lib",
         "//litert/cc:litert_any",
-        "//litert/cc:litert_environment",
-        "//litert/cc/internal:litert_options",
+        "//litert/cc:litert_environment_testonly",
+        "//litert/cc:litert_options_testonly",
         "//litert/core:filesystem_testonly",
         "//litert/test:common",
         "//litert/test:matchers",

litert/vendors/mediatek/dispatch/dispatch_api_mediatek_test.cc

@@ -312,7 +312,8 @@ TEST(MediaTek, DispatchApiWithAhwb) {
   {
     ABSL_LOG(INFO) << "Checking output...";
     void* host_mem_addr;
-    ASSERT_EQ(LiteRtLockTensorBuffer(output_tensor_buffer, &host_mem_addr),
+    ASSERT_EQ(LiteRtLockTensorBuffer(output_tensor_buffer, &host_mem_addr,
+                                     kLiteRtTensorBufferLockModeRead),
               kLiteRtStatusOk);
     auto output = absl::MakeSpan(static_cast<const float*>(host_mem_addr),
                                  kTestOutputSize);
@@ -543,12 +544,14 @@ TEST(MediaTek, DispatchApiWithDmaBuf) {
     ABSL_LOG(INFO) << "Filling inputs with data";
     void* host_mem_addr;
 
-    ASSERT_EQ(LiteRtLockTensorBuffer(input_0_tensor_buffer, &host_mem_addr),
+    ASSERT_EQ(LiteRtLockTensorBuffer(input_0_tensor_buffer, &host_mem_addr,
+                                     kLiteRtTensorBufferLockModeRead),
               kLiteRtStatusOk);
     std::memcpy(host_mem_addr, kTestInput0Tensor, sizeof(kTestInput0Tensor));
     ASSERT_EQ(LiteRtUnlockTensorBuffer(input_0_tensor_buffer), kLiteRtStatusOk);
 
-    ASSERT_EQ(LiteRtLockTensorBuffer(input_1_tensor_buffer, &host_mem_addr),
+    ASSERT_EQ(LiteRtLockTensorBuffer(input_1_tensor_buffer, &host_mem_addr,
+                                     kLiteRtTensorBufferLockModeRead),
               kLiteRtStatusOk);
     std::memcpy(host_mem_addr, kTestInput1Tensor, sizeof(kTestInput1Tensor));
     ASSERT_EQ(LiteRtUnlockTensorBuffer(input_1_tensor_buffer), kLiteRtStatusOk);
@@ -568,7 +571,8 @@ TEST(MediaTek, DispatchApiWithDmaBuf) {
   {
     ABSL_LOG(INFO) << "Checking output...";
     void* host_mem_addr;
-    ASSERT_EQ(LiteRtLockTensorBuffer(output_tensor_buffer, &host_mem_addr),
+    ASSERT_EQ(LiteRtLockTensorBuffer(output_tensor_buffer, &host_mem_addr,
+                                     kLiteRtTensorBufferLockModeRead),
               kLiteRtStatusOk);
     auto output = absl::MakeSpan(static_cast<const float*>(host_mem_addr),
                                  kTestOutputSize);
@@ -587,13 +591,15 @@ TEST(MediaTek, DispatchApiWithDmaBuf) {
     ABSL_LOG(INFO) << "Filling inputs with data";
     void* host_mem_addr;
 
-    ASSERT_EQ(LiteRtLockTensorBuffer(input_0_tensor_buffer, &host_mem_addr),
+    ASSERT_EQ(LiteRtLockTensorBuffer(input_0_tensor_buffer, &host_mem_addr,
+                                     kLiteRtTensorBufferLockModeRead),
               kLiteRtStatusOk);
     std::memcpy(host_mem_addr, kTestInput0Tensor_2,
                 sizeof(kTestInput0Tensor_2));
     ASSERT_EQ(LiteRtUnlockTensorBuffer(input_0_tensor_buffer), kLiteRtStatusOk);
 
-    ASSERT_EQ(LiteRtLockTensorBuffer(input_1_tensor_buffer, &host_mem_addr),
+    ASSERT_EQ(LiteRtLockTensorBuffer(input_1_tensor_buffer, &host_mem_addr,
+                                     kLiteRtTensorBufferLockModeRead),
               kLiteRtStatusOk);
     std::memcpy(host_mem_addr, kTestInput1Tensor_2,
                 sizeof(kTestInput1Tensor_2));
@@ -614,7 +620,8 @@ TEST(MediaTek, DispatchApiWithDmaBuf) {
   {
     ABSL_LOG(INFO) << "Checking output...";
     void* host_mem_addr;
-    ASSERT_EQ(LiteRtLockTensorBuffer(output_tensor_buffer, &host_mem_addr),
+    ASSERT_EQ(LiteRtLockTensorBuffer(output_tensor_buffer, &host_mem_addr,
+                                     kLiteRtTensorBufferLockModeRead),
               kLiteRtStatusOk);
     auto output = absl::MakeSpan(static_cast<const float*>(host_mem_addr),
                                  kTestOutputSize);