commit f135feef5ad315fab0df335f52219bfbeeabf767
author Jacques Pienaar <jpienaar@google.com> Tue Oct 18 12:59:00 2022 -0700
committer GitHub <noreply@github.com> Tue Oct 18 19:59:00 2022 +0000
tree f93dc23a12e06a6bce0f0c65108b013c8a8555a4
parent 4d1b61368ce94b254b57caba66b0cca5b3bda032

Update for pending strictness change in layering check (#10828)

Post https://reviews.llvm.org/D132779 the layering check will be
stricter.

runtime/src/iree/base/internal/BUILD

diff --git a/runtime/src/iree/base/internal/BUILD b/runtime/src/iree/base/internal/BUILD
index 4e3331e..ec36536 100644
--- a/runtime/src/iree/base/internal/BUILD
+++ b/runtime/src/iree/base/internal/BUILD
@@ -127,6 +127,7 @@
         ":synchronization",
         "//build_tools:default_linkopts",
         "//build_tools:dl",
+        "//runtime/src/iree/base",
         "//runtime/src/iree/base:core_headers",
         "//runtime/src/iree/base:tracing",
     ],
@@ -164,6 +165,7 @@
         ":file_io",
         ":internal",
         "//runtime/src/iree/base",
+        "//runtime/src/iree/base:target_platform",
         "//runtime/src/iree/base:tracing",
     ],
 )

runtime/src/iree/base/internal/CMakeLists.txt

diff --git a/runtime/src/iree/base/internal/CMakeLists.txt b/runtime/src/iree/base/internal/CMakeLists.txt
index 72c4b7c..6112c7f 100644
--- a/runtime/src/iree/base/internal/CMakeLists.txt
+++ b/runtime/src/iree/base/internal/CMakeLists.txt
@@ -120,6 +120,7 @@
     ::internal
     ::path
     ::synchronization
+    iree::base
     iree::base::core_headers
     iree::base::tracing
   PUBLIC
@@ -165,6 +166,7 @@
     ::file_io
     ::internal
     iree::base
+    iree::base::target_platform
     iree::base::tracing
   PUBLIC
 )

runtime/src/iree/hal/drivers/BUILD

diff --git a/runtime/src/iree/hal/drivers/BUILD b/runtime/src/iree/hal/drivers/BUILD
index 50bbea7..be59996 100644
--- a/runtime/src/iree/hal/drivers/BUILD
+++ b/runtime/src/iree/hal/drivers/BUILD
@@ -46,6 +46,7 @@
     deps = [
                "//runtime/src/iree/base",
                "//runtime/src/iree/base:tracing",
+               "//runtime/src/iree/hal",
            ] + select({
                ":cuda_enabled": ["//runtime/src/iree/hal/drivers/cuda/registration"],
                "//conditions:default": [],

runtime/src/iree/hal/local/loaders/registration/BUILD

diff --git a/runtime/src/iree/hal/local/loaders/registration/BUILD b/runtime/src/iree/hal/local/loaders/registration/BUILD
index 85b82f7..e9cc50a 100644
--- a/runtime/src/iree/hal/local/loaders/registration/BUILD
+++ b/runtime/src/iree/hal/local/loaders/registration/BUILD
@@ -44,6 +44,7 @@
     hdrs = ["init.h"],
     deps = [
         "//runtime/src/iree/base",
+        "//runtime/src/iree/hal",
         "//runtime/src/iree/hal/local",
     ] + select({
         ":embedded-elf_enabled": ["//runtime/src/iree/hal/local/loaders:embedded_elf_loader"],

runtime/src/iree/modules/hal/utils/buffer_diagnostics.h

diff --git a/runtime/src/iree/modules/hal/utils/buffer_diagnostics.h b/runtime/src/iree/modules/hal/utils/buffer_diagnostics.h
index 2d5c74b..8c03b22 100644
--- a/runtime/src/iree/modules/hal/utils/buffer_diagnostics.h
+++ b/runtime/src/iree/modules/hal/utils/buffer_diagnostics.h
@@ -13,7 +13,6 @@
 #include "iree/hal/api.h"
 #include "iree/modules/hal/types.h"
 #include "iree/vm/api.h"
-#include "iree/vm/shims.h"
 
 //===----------------------------------------------------------------------===//
 // iree_hal_buffer_t

runtime/src/iree/task/BUILD

diff --git a/runtime/src/iree/task/BUILD b/runtime/src/iree/task/BUILD
index d8e8400..4513ea3 100644
--- a/runtime/src/iree/task/BUILD
+++ b/runtime/src/iree/task/BUILD
@@ -35,6 +35,7 @@
     hdrs = ["api.h"],
     deps = [
         ":task",
+        "//runtime/src/iree/base",
         "//runtime/src/iree/base:tracing",
         "//runtime/src/iree/base/internal:flags",
     ],

runtime/src/iree/task/CMakeLists.txt

diff --git a/runtime/src/iree/task/CMakeLists.txt b/runtime/src/iree/task/CMakeLists.txt
index 02e5fb7..bf3895e 100644
--- a/runtime/src/iree/task/CMakeLists.txt
+++ b/runtime/src/iree/task/CMakeLists.txt
@@ -31,6 +31,7 @@
     "api.c"
   DEPS
     ::task
+    iree::base
     iree::base::internal::flags
     iree::base::tracing
   PUBLIC

runtime/src/iree/vm/bytecode_disasm.h

diff --git a/runtime/src/iree/vm/bytecode_disasm.h b/runtime/src/iree/vm/bytecode_disasm.h
index 2c73025..e946df9 100644
--- a/runtime/src/iree/vm/bytecode_disasm.h
+++ b/runtime/src/iree/vm/bytecode_disasm.h
@@ -10,9 +10,9 @@
 #include <stdio.h>
 
 #include "iree/base/string_builder.h"
+#include "iree/vm/api.h"
 #include "iree/vm/bytecode_dispatch_util.h"
 #include "iree/vm/bytecode_module_impl.h"
-#include "iree/vm/stack.h"
 
 // Controls how bytecode disassembly is formatted.
 typedef enum iree_vm_bytecode_disasm_format_e {