Making ref_cc.h an implementation detail of iree/vm/ref.h. (iree-org#…

…10948)
Destinywck · Oct 28, 2022 · 3072817 · 3072817
1 parent 7a9b84c
commit 3072817
Show file tree

Hide file tree

Showing 29 changed files with 16 additions and 40 deletions.
diff --git a/compiler/src/iree/compiler/ConstEval/BUILD b/compiler/src/iree/compiler/ConstEval/BUILD
@@ -80,7 +80,6 @@ iree_compiler_cc_library(
         "//runtime/src/iree/tooling:vm_util",
         "//runtime/src/iree/vm",
         "//runtime/src/iree/vm:bytecode_module",
-        "//runtime/src/iree/vm:cc",
         "@llvm-project//mlir:IR",
     ],
 )
diff --git a/compiler/src/iree/compiler/ConstEval/CMakeLists.txt b/compiler/src/iree/compiler/ConstEval/CMakeLists.txt
@@ -70,7 +70,6 @@ iree_cc_library(
     iree::tooling::vm_util
     iree::vm
     iree::vm::bytecode_module
-    iree::vm::cc
   PUBLIC
 )
 

diff --git a/compiler/src/iree/compiler/ConstEval/Runtime.h b/compiler/src/iree/compiler/ConstEval/Runtime.h
@@ -11,7 +11,6 @@
 #include "iree/hal/api.h"
 #include "iree/vm/api.h"
 #include "iree/vm/bytecode_module.h"
-#include "iree/vm/ref_cc.h"
 #include "mlir/IR/BuiltinAttributes.h"
 #include "mlir/IR/BuiltinOps.h"
 

diff --git a/runtime/src/iree/modules/check/check_test.cc b/runtime/src/iree/modules/check/check_test.cc
@@ -20,7 +20,6 @@
 #include "iree/testing/status_matchers.h"
 #include "iree/tooling/device_util.h"
 #include "iree/vm/api.h"
-#include "iree/vm/ref_cc.h"
 
 namespace iree {
 namespace {

diff --git a/runtime/src/iree/modules/check/module.cc b/runtime/src/iree/modules/check/module.cc
@@ -22,8 +22,8 @@
 #include "iree/hal/api.h"
 #include "iree/modules/hal/module.h"
 #include "iree/testing/gtest.h"
+#include "iree/vm/api.h"
 #include "iree/vm/native_module_cc.h"
-#include "iree/vm/ref_cc.h"
 
 //===----------------------------------------------------------------------===//
 // VM module interface implementation

diff --git a/runtime/src/iree/tooling/BUILD b/runtime/src/iree/tooling/BUILD
@@ -52,7 +52,6 @@ cc_library(
         "//runtime/src/iree/hal",
         "//runtime/src/iree/modules/hal",
         "//runtime/src/iree/vm",
-        "//runtime/src/iree/vm:cc",
     ],
 )
 
@@ -68,7 +67,6 @@ cc_test(
         "//runtime/src/iree/testing:gtest",
         "//runtime/src/iree/testing:gtest_main",
         "//runtime/src/iree/vm",
-        "//runtime/src/iree/vm:cc",
     ],
 )
 
@@ -158,7 +156,7 @@ cc_library(
         "//runtime/src/iree/base",
         "//runtime/src/iree/base:tracing",
         "//runtime/src/iree/base/internal:span",
-        "//runtime/src/iree/vm:cc",
+        "//runtime/src/iree/vm",
     ],
 )
 
@@ -174,7 +172,6 @@ cc_test(
         "//runtime/src/iree/testing:gtest",
         "//runtime/src/iree/testing:gtest_main",
         "//runtime/src/iree/vm",
-        "//runtime/src/iree/vm:cc",
     ],
 )
 

diff --git a/runtime/src/iree/tooling/CMakeLists.txt b/runtime/src/iree/tooling/CMakeLists.txt
@@ -57,7 +57,6 @@ iree_cc_library(
     iree::hal
     iree::modules::hal
     iree::vm
-    iree::vm::cc
   PUBLIC
 )
 
@@ -75,7 +74,6 @@ iree_cc_test(
     iree::testing::gtest
     iree::testing::gtest_main
     iree::vm
-    iree::vm::cc
 )
 
 iree_cc_library(
@@ -180,7 +178,7 @@ iree_cc_library(
     iree::base
     iree::base::internal::span
     iree::base::tracing
-    iree::vm::cc
+    iree::vm
   PUBLIC
 )
 
@@ -198,7 +196,6 @@ iree_cc_test(
     iree::testing::gtest
     iree::testing::gtest_main
     iree::vm
-    iree::vm::cc
 )
 
 # libyaml does not build cleanly on bare-metal systems

diff --git a/runtime/src/iree/tooling/comparison.cc b/runtime/src/iree/tooling/comparison.cc
@@ -16,7 +16,7 @@
 #include "iree/modules/hal/module.h"
 #include "iree/tooling/buffer_view_matchers.h"
 #include "iree/tooling/vm_util.h"
-#include "iree/vm/ref_cc.h"
+#include "iree/vm/api.h"
 
 using namespace iree;
 

diff --git a/runtime/src/iree/tooling/comparison_test.cc b/runtime/src/iree/tooling/comparison_test.cc
@@ -13,7 +13,6 @@
 #include "iree/testing/status_matchers.h"
 #include "iree/tooling/vm_util_cc.h"
 #include "iree/vm/api.h"
-#include "iree/vm/ref_cc.h"
 
 namespace iree {
 namespace {

diff --git a/runtime/src/iree/tooling/vm_util_cc.cc b/runtime/src/iree/tooling/vm_util_cc.cc
@@ -8,7 +8,7 @@
 
 #include <vector>
 
-#include "iree/vm/ref_cc.h"
+#include "iree/vm/api.h"
 
 namespace iree {
 

diff --git a/runtime/src/iree/tooling/vm_util_test.cc b/runtime/src/iree/tooling/vm_util_test.cc
@@ -12,7 +12,6 @@
 #include "iree/tooling/device_util.h"
 #include "iree/tooling/vm_util_cc.h"
 #include "iree/vm/api.h"
-#include "iree/vm/ref_cc.h"
 
 namespace iree {
 namespace {

diff --git a/runtime/src/iree/vm/BUILD b/runtime/src/iree/vm/BUILD
@@ -36,7 +36,6 @@ iree_runtime_cc_library(
     hdrs = [
         "native_module_cc.h",
         "native_module_packing.h",
-        "ref_cc.h",
     ],
     deps = [
         ":vm",
@@ -61,6 +60,7 @@ iree_runtime_cc_library(
         "module.c",
         "native_module.c",
         "ref.c",
+        "ref_cc.h",
         "shims.c",
         "stack.c",
     ],

diff --git a/runtime/src/iree/vm/CMakeLists.txt b/runtime/src/iree/vm/CMakeLists.txt
@@ -27,7 +27,6 @@ iree_cc_library(
   HDRS
     "native_module_cc.h"
     "native_module_packing.h"
-    "ref_cc.h"
   DEPS
     ::vm
     iree::base
@@ -61,6 +60,7 @@ iree_cc_library(
     "module.c"
     "native_module.c"
     "ref.c"
+    "ref_cc.h"
     "shims.c"
     "stack.c"
   DEPS

diff --git a/runtime/src/iree/vm/list_test.cc b/runtime/src/iree/vm/list_test.cc
@@ -13,7 +13,7 @@
 #include "iree/testing/gtest.h"
 #include "iree/testing/status_matchers.h"
 #include "iree/vm/instance.h"
-#include "iree/vm/ref_cc.h"
+#include "iree/vm/ref.h"
 
 class A : public iree::vm::RefObject<A> {
  public:

diff --git a/runtime/src/iree/vm/native_module_packing.h b/runtime/src/iree/vm/native_module_packing.h
@@ -16,7 +16,6 @@
 #include "iree/base/internal/span.h"
 #include "iree/vm/module.h"
 #include "iree/vm/ref.h"
-#include "iree/vm/ref_cc.h"
 #include "iree/vm/stack.h"
 
 // std::string_view is available starting in C++17.

diff --git a/runtime/src/iree/vm/native_module_test.cc b/runtime/src/iree/vm/native_module_test.cc
@@ -15,7 +15,7 @@
 #include "iree/vm/instance.h"
 #include "iree/vm/invocation.h"
 #include "iree/vm/list.h"
-#include "iree/vm/ref_cc.h"
+#include "iree/vm/ref.h"
 #include "iree/vm/value.h"
 
 namespace iree {

diff --git a/runtime/src/iree/vm/ref.h b/runtime/src/iree/vm/ref.h
@@ -327,4 +327,9 @@ struct ref_type_descriptor {
     return name##_descriptor.type;                                          \
   }
 
+// Optional C++ iree::vm::ref<T> wrapper.
+#ifdef __cplusplus
+#include "iree/vm/ref_cc.h"
+#endif  // __cplusplus
+
 #endif  // IREE_VM_REF_H_
diff --git a/runtime/src/iree/vm/ref_test.cc b/runtime/src/iree/vm/ref_test.cc
@@ -11,7 +11,7 @@
 #include "iree/base/api.h"
 #include "iree/testing/gtest.h"
 #include "iree/testing/status_matchers.h"
-#include "iree/vm/ref_cc.h"
+#include "iree/vm/ref.h"
 
 namespace {
 

diff --git a/samples/custom_module/module.cc b/samples/custom_module/module.cc
@@ -9,8 +9,8 @@
 #include <cstdio>
 
 #include "iree/base/api.h"
+#include "iree/vm/api.h"
 #include "iree/vm/native_module_cc.h"
-#include "iree/vm/ref_cc.h"
 
 // NOTE: this module is written in C++ using the native module wrapper and uses
 // template magic to handle marshaling arguments. For a lot of uses this is a

diff --git a/samples/emitc_modules/BUILD b/samples/emitc_modules/BUILD
@@ -31,7 +31,6 @@ iree_runtime_cc_test(
         "//runtime/src/iree/testing:gtest",
         "//runtime/src/iree/testing:gtest_main",
         "//runtime/src/iree/vm",
-        "//runtime/src/iree/vm:cc",
     ],
 )
 
@@ -63,6 +62,5 @@ iree_runtime_cc_test(
         "//runtime/src/iree/testing:gtest",
         "//runtime/src/iree/testing:gtest_main",
         "//runtime/src/iree/vm",
-        "//runtime/src/iree/vm:cc",
     ],
 )
diff --git a/samples/emitc_modules/CMakeLists.txt b/samples/emitc_modules/CMakeLists.txt
@@ -30,7 +30,6 @@ iree_cc_test(
     iree::testing::gtest
     iree::testing::gtest_main
     iree::vm
-    iree::vm::cc
 )
 
 iree_cc_test(
@@ -45,7 +44,6 @@ iree_cc_test(
     iree::testing::gtest
     iree::testing::gtest_main
     iree::vm
-    iree::vm::cc
 )
 
 iree_c_module(

diff --git a/samples/emitc_modules/add_module_test.cc b/samples/emitc_modules/add_module_test.cc
@@ -10,7 +10,6 @@
 #include "iree/testing/gtest.h"
 #include "iree/testing/status_matchers.h"
 #include "iree/vm/api.h"
-#include "iree/vm/ref_cc.h"
 
 namespace iree {
 namespace {

diff --git a/samples/emitc_modules/import_module_test.cc b/samples/emitc_modules/import_module_test.cc
@@ -8,7 +8,6 @@
 #include "iree/testing/gtest.h"
 #include "iree/testing/status_matchers.h"
 #include "iree/vm/api.h"
-#include "iree/vm/ref_cc.h"
 #include "samples/emitc_modules/import_module_a.h"
 #include "samples/emitc_modules/import_module_b.h"
 

diff --git a/tools/BUILD b/tools/BUILD
@@ -35,7 +35,6 @@ cc_binary(
         "//runtime/src/iree/tooling:device_util",
         "//runtime/src/iree/tooling:vm_util_cc",
         "//runtime/src/iree/vm",
-        "//runtime/src/iree/vm:cc",
         "@com_google_benchmark//:benchmark",
     ],
 )
@@ -138,7 +137,6 @@ cc_binary(
         "//runtime/src/iree/tooling:vm_util_cc",
         "//runtime/src/iree/vm",
         "//runtime/src/iree/vm:bytecode_module",
-        "//runtime/src/iree/vm:cc",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:IR",
         "@llvm-project//mlir:LLVMToLLVMIRTranslation",
@@ -163,7 +161,6 @@ cc_binary(
         "//runtime/src/iree/tooling:device_util",
         "//runtime/src/iree/tooling:vm_util_cc",
         "//runtime/src/iree/vm",
-        "//runtime/src/iree/vm:cc",
     ],
 )
 

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -55,7 +55,6 @@ iree_cc_binary(
     iree::tooling::device_util
     iree::tooling::vm_util_cc
     iree::vm
-    iree::vm::cc
 )
 
 iree_cc_binary(
@@ -131,7 +130,6 @@ iree_cc_binary(
     iree::tooling::device_util
     iree::tooling::vm_util_cc
     iree::vm
-    iree::vm::cc
 )
 
 iree_cc_binary(
@@ -262,7 +260,6 @@ if(IREE_BUILD_COMPILER)
       iree::tooling::vm_util_cc
       iree::vm
       iree::vm::bytecode_module
-      iree::vm::cc
     DATA
       ${IREE_LLD_TARGET}
     HOSTONLY

diff --git a/tools/android/run_module_app/src/main.cc b/tools/android/run_module_app/src/main.cc
@@ -19,7 +19,6 @@
 #include "iree/tooling/vm_util_cc.h"
 #include "iree/vm/api.h"
 #include "iree/vm/bytecode_module.h"
-#include "iree/vm/ref_cc.h"
 
 namespace iree {
 namespace {

diff --git a/tools/iree-benchmark-module-main.cc b/tools/iree-benchmark-module-main.cc
@@ -70,7 +70,6 @@
 #include "iree/tooling/device_util.h"
 #include "iree/tooling/vm_util_cc.h"
 #include "iree/vm/api.h"
-#include "iree/vm/ref_cc.h"
 
 constexpr char kNanosecondsUnitString[] = "ns";
 constexpr char kMicrosecondsUnitString[] = "us";

diff --git a/tools/iree-run-mlir-main.cc b/tools/iree-run-mlir-main.cc
@@ -54,7 +54,6 @@
 #include "iree/tooling/vm_util_cc.h"
 #include "iree/vm/api.h"
 #include "iree/vm/bytecode_module.h"
-#include "iree/vm/ref_cc.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"

diff --git a/tools/iree-run-module-main.cc b/tools/iree-run-module-main.cc
@@ -22,7 +22,6 @@
 #include "iree/tooling/device_util.h"
 #include "iree/tooling/vm_util_cc.h"
 #include "iree/vm/api.h"
-#include "iree/vm/ref_cc.h"
 
 IREE_FLAG(string, entry_function, "",
           "Name of a function contained in the module specified by module_file "