Renaming VM2 -> VM.
PiperOrigin-RevId: 287698448
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c714526..0abe8c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,7 +106,6 @@
add_subdirectory(iree/base)
add_subdirectory(iree/hal)
-add_subdirectory(iree/rt)
add_subdirectory(iree/schemas)
add_subdirectory(iree/testing)
add_subdirectory(iree/vm)
diff --git a/bindings/python/pyiree/BUILD b/bindings/python/pyiree/BUILD
index a7c2063..9ee6bbc 100644
--- a/bindings/python/pyiree/BUILD
+++ b/bindings/python/pyiree/BUILD
@@ -144,12 +144,12 @@
"@com_google_absl//absl/types:variant",
"//iree/compiler/Utils",
"//iree/modules/hal",
- "//iree/vm2",
- "//iree/vm2:bytecode_module",
- "//iree/vm2:invocation",
- "//iree/vm2:module",
- "//iree/vm2:ref",
- "//iree/vm2:variant_list",
+ "//iree/vm",
+ "//iree/vm:bytecode_module",
+ "//iree/vm:invocation",
+ "//iree/vm:module",
+ "//iree/vm:ref",
+ "//iree/vm:variant_list",
"@llvm-project//mlir:IR",
"//iree/base:api",
"//iree/base:status",
diff --git a/bindings/python/pyiree/function_abi.cc b/bindings/python/pyiree/function_abi.cc
index 455d63f..1fad6e6 100644
--- a/bindings/python/pyiree/function_abi.cc
+++ b/bindings/python/pyiree/function_abi.cc
@@ -24,8 +24,8 @@
#include "iree/base/signature_mangle.h"
#include "iree/hal/api.h"
#include "iree/modules/hal/hal_module.h"
-#include "iree/vm2/ref.h"
-#include "iree/vm2/variant_list.h"
+#include "iree/vm/ref.h"
+#include "iree/vm/variant_list.h"
namespace iree {
namespace python {
diff --git a/bindings/python/pyiree/vm.cc b/bindings/python/pyiree/vm.cc
index 7d92d1a..620ccff 100644
--- a/bindings/python/pyiree/vm.cc
+++ b/bindings/python/pyiree/vm.cc
@@ -20,8 +20,8 @@
#include "bindings/python/pyiree/status_utils.h"
#include "iree/base/api.h"
#include "iree/modules/hal/hal_module.h"
-#include "iree/vm2/invocation.h"
-#include "iree/vm2/module.h"
+#include "iree/vm/invocation.h"
+#include "iree/vm/module.h"
namespace iree {
namespace python {
diff --git a/bindings/python/pyiree/vm.h b/bindings/python/pyiree/vm.h
index 89a826e..0ecbcce 100644
--- a/bindings/python/pyiree/vm.h
+++ b/bindings/python/pyiree/vm.h
@@ -19,9 +19,9 @@
#include "bindings/python/pyiree/binding.h"
#include "bindings/python/pyiree/host_types.h"
#include "iree/base/api.h"
-#include "iree/vm2/api.h"
-#include "iree/vm2/bytecode_module.h"
-#include "iree/vm2/variant_list.h"
+#include "iree/vm/api.h"
+#include "iree/vm/bytecode_module.h"
+#include "iree/vm/variant_list.h"
namespace iree {
namespace python {
diff --git a/integrations/tensorflow/compiler/TFSavedModelAdoptExports.cpp b/integrations/tensorflow/compiler/TFSavedModelAdoptExports.cpp
index b20a9a9..98ea2b8 100644
--- a/integrations/tensorflow/compiler/TFSavedModelAdoptExports.cpp
+++ b/integrations/tensorflow/compiler/TFSavedModelAdoptExports.cpp
@@ -175,7 +175,7 @@
auto exported_names = mlir::tf_saved_model::GetExportedNames(func);
if (exported_names.empty()) continue;
- // TODO(laurenzo): After VM2 rework, we should just keep the
+ // TODO(laurenzo): After VM rework, we should just keep the
// function name as-is and create explicit export ops for each exported
// function.
if (exported_names.size() > 1) {
diff --git a/iree/modules/hal/BUILD b/iree/modules/hal/BUILD
index 9b11538..1b0121b 100644
--- a/iree/modules/hal/BUILD
+++ b/iree/modules/hal/BUILD
@@ -28,7 +28,7 @@
"//iree/hal:api",
"//iree/hal:command_queue",
"//iree/hal:device",
- "//iree/vm2",
+ "//iree/vm",
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/memory",
"@com_google_absl//absl/strings",
diff --git a/iree/modules/hal/CMakeLists.txt b/iree/modules/hal/CMakeLists.txt
index 0aa38ae..b377474 100644
--- a/iree/modules/hal/CMakeLists.txt
+++ b/iree/modules/hal/CMakeLists.txt
@@ -26,7 +26,7 @@
iree::hal::api
iree::hal::command_queue
iree::hal::device
- iree::vm2
+ iree::vm
absl::core_headers
absl::memory
absl::strings
diff --git a/iree/modules/hal/hal_module.h b/iree/modules/hal/hal_module.h
index 096530a..c311670 100644
--- a/iree/modules/hal/hal_module.h
+++ b/iree/modules/hal/hal_module.h
@@ -19,7 +19,7 @@
#include "iree/base/api.h"
#include "iree/hal/api.h"
-#include "iree/vm2/api.h"
+#include "iree/vm/api.h"
#ifdef __cplusplus
extern "C" {
diff --git a/iree/samples/custom_modules/BUILD b/iree/samples/custom_modules/BUILD
index 1d0aa63..083553c 100644
--- a/iree/samples/custom_modules/BUILD
+++ b/iree/samples/custom_modules/BUILD
@@ -36,8 +36,8 @@
"//iree/base:api",
"//iree/base:logging",
"//iree/testing:gtest_main",
- "//iree/vm2",
- "//iree/vm2:bytecode_module",
+ "//iree/vm",
+ "//iree/vm:bytecode_module",
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/strings",
],
@@ -49,6 +49,6 @@
hdrs = ["native_module.h"],
deps = [
"//iree/base:api",
- "//iree/vm2",
+ "//iree/vm",
],
)
diff --git a/iree/samples/custom_modules/custom_modules_test.cc b/iree/samples/custom_modules/custom_modules_test.cc
index 24863be..c0178e0 100644
--- a/iree/samples/custom_modules/custom_modules_test.cc
+++ b/iree/samples/custom_modules/custom_modules_test.cc
@@ -21,8 +21,8 @@
#include "iree/samples/custom_modules/custom_modules_test_module.h"
#include "iree/samples/custom_modules/native_module.h"
#include "iree/testing/gtest.h"
-#include "iree/vm2/api.h"
-#include "iree/vm2/bytecode_module.h"
+#include "iree/vm/api.h"
+#include "iree/vm/bytecode_module.h"
namespace {
diff --git a/iree/samples/custom_modules/native_module.h b/iree/samples/custom_modules/native_module.h
index 39a09f7..580630c 100644
--- a/iree/samples/custom_modules/native_module.h
+++ b/iree/samples/custom_modules/native_module.h
@@ -18,7 +18,7 @@
#include <stdint.h>
#include "iree/base/api.h"
-#include "iree/vm2/api.h"
+#include "iree/vm/api.h"
#ifdef __cplusplus
extern "C" {
diff --git a/iree/samples/simple_embedding/BUILD b/iree/samples/simple_embedding/BUILD
index 4a9cbf5..724118b 100644
--- a/iree/samples/simple_embedding/BUILD
+++ b/iree/samples/simple_embedding/BUILD
@@ -50,8 +50,8 @@
"//iree/base:logging",
"//iree/hal:api",
"//iree/modules/hal",
- "//iree/vm2:bytecode_module",
- "//iree/vm2",
+ "//iree/vm:bytecode_module",
+ "//iree/vm",
# These are the drivers we support running with and can produce
# executables for from the source MLIR.
diff --git a/iree/samples/simple_embedding/simple_embedding_test.cc b/iree/samples/simple_embedding/simple_embedding_test.cc
index a8ab3fc..c54e519 100644
--- a/iree/samples/simple_embedding/simple_embedding_test.cc
+++ b/iree/samples/simple_embedding/simple_embedding_test.cc
@@ -21,8 +21,8 @@
#include "iree/hal/api.h"
#include "iree/modules/hal/hal_module.h"
#include "iree/testing/gtest.h"
-#include "iree/vm2/api.h"
-#include "iree/vm2/bytecode_module.h"
+#include "iree/vm/api.h"
+#include "iree/vm/bytecode_module.h"
// Compiled module embedded here to avoid file IO:
#include "iree/samples/simple_embedding/simple_embedding_test_bytecode_module.h"
diff --git a/iree/tools/BUILD b/iree/tools/BUILD
index c52b9df..9aff7f3 100644
--- a/iree/tools/BUILD
+++ b/iree/tools/BUILD
@@ -101,8 +101,8 @@
"//iree/compiler/Dialect/VM/Transforms",
"//iree/hal:api",
"//iree/modules/hal",
- "//iree/vm2",
- "//iree/vm2:bytecode_module",
+ "//iree/vm",
+ "//iree/vm:bytecode_module",
"@llvm-project//llvm:support",
"@llvm-project//mlir:IR",
"@llvm-project//mlir:Parser",
diff --git a/iree/tools/run_mlir_main.cc b/iree/tools/run_mlir_main.cc
index b7f341f..b7da105 100644
--- a/iree/tools/run_mlir_main.cc
+++ b/iree/tools/run_mlir_main.cc
@@ -60,8 +60,8 @@
#include "iree/compiler/Translation/IREEVM.h"
#include "iree/hal/api.h"
#include "iree/modules/hal/hal_module.h"
-#include "iree/vm2/api.h"
-#include "iree/vm2/bytecode_module.h"
+#include "iree/vm/api.h"
+#include "iree/vm/bytecode_module.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/InitLLVM.h"
diff --git a/iree/vm2/BUILD b/iree/vm/BUILD
similarity index 99%
rename from iree/vm2/BUILD
rename to iree/vm/BUILD
index 4d94172..c31f106 100644
--- a/iree/vm2/BUILD
+++ b/iree/vm/BUILD
@@ -217,7 +217,7 @@
)
cc_library(
- name = "vm2",
+ name = "vm",
hdrs = [
"api.h",
],
diff --git a/iree/vm2/CMakeLists.txt b/iree/vm/CMakeLists.txt
similarity index 79%
rename from iree/vm2/CMakeLists.txt
rename to iree/vm/CMakeLists.txt
index c4ab328..e8ad376 100644
--- a/iree/vm2/CMakeLists.txt
+++ b/iree/vm/CMakeLists.txt
@@ -34,12 +34,12 @@
"bytecode_module_impl.h"
"bytecode_op_table.h"
DEPS
- iree::vm2::bytecode_op_table_gen
- iree::vm2::module
- iree::vm2::ref
- iree::vm2::stack
- iree::vm2::types
- iree::vm2::value
+ iree::vm::bytecode_op_table_gen
+ iree::vm::module
+ iree::vm::ref
+ iree::vm::stack
+ iree::vm::types
+ iree::vm::value
iree::base::api
iree::base::flatbuffer_util
iree::base::target_platform
@@ -56,10 +56,10 @@
# SRCS
# "bytecode_module_benchmark.cc"
# DEPS
-# iree::vm2::bytecode_module
-# iree::vm2::bytecode_module_benchmark_module_cc
-# iree::vm2::module
-# iree::vm2::stack
+# iree::vm::bytecode_module
+# iree::vm::bytecode_module_benchmark_module_cc
+# iree::vm::module
+# iree::vm::stack
# iree::base::api
# iree::base::logging
# #TODO(marbre): Add dep iree::testing::benchmark_main
@@ -85,7 +85,7 @@
SRCS
"bytecode_module_test.cc"
DEPS
- iree::vm2::bytecode_module
+ iree::vm::bytecode_module
gtest_main
)
@@ -108,9 +108,9 @@
SRCS
"context.c"
DEPS
- iree::vm2::instance
- iree::vm2::module
- iree::vm2::stack
+ iree::vm::instance
+ iree::vm::module
+ iree::vm::stack
iree::base::api
)
@@ -122,7 +122,7 @@
SRCS
"instance.c"
DEPS
- iree::vm2::types
+ iree::vm::types
iree::base::api
)
@@ -134,9 +134,9 @@
SRCS
"invocation.c"
DEPS
- iree::vm2::context
- iree::vm2::module
- iree::vm2::variant_list
+ iree::vm::context
+ iree::vm::module
+ iree::vm::variant_list
iree::base::api
)
@@ -168,7 +168,7 @@
SRCS
"ref_test.cc"
DEPS
- iree::vm2::ref
+ iree::vm::ref
iree::base::api
iree::base::ref_ptr
gtest_main
@@ -182,8 +182,8 @@
SRCS
"stack.c"
DEPS
- iree::vm2::module
- iree::vm2::ref
+ iree::vm::module
+ iree::vm::ref
iree::base::api
)
@@ -193,8 +193,8 @@
SRCS
"stack_test.cc"
DEPS
- iree::vm2::ref
- iree::vm2::stack
+ iree::vm::ref
+ iree::vm::stack
iree::base::api
iree::base::ref_ptr
gtest_main
@@ -208,7 +208,7 @@
SRCS
"types.c"
DEPS
- iree::vm2::ref
+ iree::vm::ref
iree::base::api
)
@@ -227,24 +227,24 @@
SRCS
"variant_list.c"
DEPS
- iree::vm2::ref
- iree::vm2::value
+ iree::vm::ref
+ iree::vm::value
)
iree_cc_library(
NAME
- vm2
+ vm
HDRS
"api.h"
DEPS
- iree::vm2::context
- iree::vm2::instance
- iree::vm2::invocation
- iree::vm2::module
- iree::vm2::ref
- iree::vm2::stack
- iree::vm2::types
- iree::vm2::value
- iree::vm2::variant_list
+ iree::vm::context
+ iree::vm::instance
+ iree::vm::invocation
+ iree::vm::module
+ iree::vm::ref
+ iree::vm::stack
+ iree::vm::types
+ iree::vm::value
+ iree::vm::variant_list
iree::base::api
)
diff --git a/iree/vm2/api.h b/iree/vm/api.h
similarity index 64%
rename from iree/vm2/api.h
rename to iree/vm/api.h
index c1c416e..06e839e 100644
--- a/iree/vm2/api.h
+++ b/iree/vm/api.h
@@ -12,18 +12,18 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef IREE_VM2_API_H_
-#define IREE_VM2_API_H_
+#ifndef IREE_VM_API_H_
+#define IREE_VM_API_H_
#include "iree/base/api.h"
-#include "iree/vm2/context.h"
-#include "iree/vm2/instance.h"
-#include "iree/vm2/invocation.h"
-#include "iree/vm2/module.h"
-#include "iree/vm2/ref.h"
-#include "iree/vm2/stack.h"
-#include "iree/vm2/types.h"
-#include "iree/vm2/value.h"
-#include "iree/vm2/variant_list.h"
+#include "iree/vm/context.h"
+#include "iree/vm/instance.h"
+#include "iree/vm/invocation.h"
+#include "iree/vm/module.h"
+#include "iree/vm/ref.h"
+#include "iree/vm/stack.h"
+#include "iree/vm/types.h"
+#include "iree/vm/value.h"
+#include "iree/vm/variant_list.h"
-#endif // IREE_VM2_API_H_
+#endif // IREE_VM_API_H_
diff --git a/iree/vm2/bytecode_dispatch.c b/iree/vm/bytecode_dispatch.c
similarity index 99%
rename from iree/vm2/bytecode_dispatch.c
rename to iree/vm/bytecode_dispatch.c
index b6c24ce..2bedc29 100644
--- a/iree/vm2/bytecode_dispatch.c
+++ b/iree/vm/bytecode_dispatch.c
@@ -16,8 +16,8 @@
#include <string.h>
#include "iree/base/target_platform.h"
-#include "iree/vm2/bytecode_module_impl.h"
-#include "iree/vm2/bytecode_op_table.h"
+#include "iree/vm/bytecode_module_impl.h"
+#include "iree/vm/bytecode_op_table.h"
// Enable to get some verbose logging; better than nothing until we have some
// better tooling.
diff --git a/iree/vm2/bytecode_dispatch_test.cc b/iree/vm/bytecode_dispatch_test.cc
similarity index 95%
rename from iree/vm2/bytecode_dispatch_test.cc
rename to iree/vm/bytecode_dispatch_test.cc
index 25fe69e..45d73ab 100644
--- a/iree/vm2/bytecode_dispatch_test.cc
+++ b/iree/vm/bytecode_dispatch_test.cc
@@ -21,12 +21,12 @@
#include "absl/strings/match.h"
#include "iree/base/logging.h"
#include "iree/testing/gtest.h"
-#include "iree/vm2/bytecode_dispatch_test_module.h"
-#include "iree/vm2/bytecode_module.h"
-#include "iree/vm2/context.h"
-#include "iree/vm2/instance.h"
-#include "iree/vm2/invocation.h"
-#include "iree/vm2/module.h"
+#include "iree/vm/bytecode_dispatch_test_module.h"
+#include "iree/vm/bytecode_module.h"
+#include "iree/vm/context.h"
+#include "iree/vm/instance.h"
+#include "iree/vm/invocation.h"
+#include "iree/vm/module.h"
namespace {
diff --git a/iree/vm2/bytecode_dispatch_test.mlir b/iree/vm/bytecode_dispatch_test.mlir
similarity index 100%
rename from iree/vm2/bytecode_dispatch_test.mlir
rename to iree/vm/bytecode_dispatch_test.mlir
diff --git a/iree/vm2/bytecode_module.cc b/iree/vm/bytecode_module.cc
similarity index 99%
rename from iree/vm2/bytecode_module.cc
rename to iree/vm/bytecode_module.cc
index 39012f7..c9f8ef5 100644
--- a/iree/vm2/bytecode_module.cc
+++ b/iree/vm/bytecode_module.cc
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "iree/vm2/bytecode_module.h"
+#include "iree/vm/bytecode_module.h"
#include <string.h>
#include "iree/base/api.h"
#include "iree/base/flatbuffer_util.h"
-#include "iree/vm2/bytecode_module_impl.h"
-#include "iree/vm2/ref.h"
-#include "iree/vm2/stack.h"
+#include "iree/vm/bytecode_module_impl.h"
+#include "iree/vm/ref.h"
+#include "iree/vm/stack.h"
// TODO(benvanik): replace with flatcc version so this file can be pure C.
#include "flatbuffers/flatbuffers.h"
diff --git a/iree/vm2/bytecode_module.h b/iree/vm/bytecode_module.h
similarity index 97%
rename from iree/vm2/bytecode_module.h
rename to iree/vm/bytecode_module.h
index 25c76a0..2db39f5 100644
--- a/iree/vm2/bytecode_module.h
+++ b/iree/vm/bytecode_module.h
@@ -18,7 +18,7 @@
#include <stdint.h>
#include "iree/base/api.h"
-#include "iree/vm2/module.h"
+#include "iree/vm/module.h"
#ifdef __cplusplus
extern "C" {
diff --git a/iree/vm2/bytecode_module_benchmark.cc b/iree/vm/bytecode_module_benchmark.cc
similarity index 98%
rename from iree/vm2/bytecode_module_benchmark.cc
rename to iree/vm/bytecode_module_benchmark.cc
index d7bf30f..4f558b6 100644
--- a/iree/vm2/bytecode_module_benchmark.cc
+++ b/iree/vm/bytecode_module_benchmark.cc
@@ -17,10 +17,10 @@
#include "benchmark/benchmark.h"
#include "iree/base/api.h"
#include "iree/base/logging.h"
-#include "iree/vm2/bytecode_module.h"
-#include "iree/vm2/bytecode_module_benchmark_module.h"
-#include "iree/vm2/module.h"
-#include "iree/vm2/stack.h"
+#include "iree/vm/bytecode_module.h"
+#include "iree/vm/bytecode_module_benchmark_module.h"
+#include "iree/vm/module.h"
+#include "iree/vm/stack.h"
namespace {
diff --git a/iree/vm2/bytecode_module_benchmark.mlir b/iree/vm/bytecode_module_benchmark.mlir
similarity index 100%
rename from iree/vm2/bytecode_module_benchmark.mlir
rename to iree/vm/bytecode_module_benchmark.mlir
diff --git a/iree/vm2/bytecode_module_impl.h b/iree/vm/bytecode_module_impl.h
similarity index 96%
rename from iree/vm2/bytecode_module_impl.h
rename to iree/vm/bytecode_module_impl.h
index c5c936b..02c2044 100644
--- a/iree/vm2/bytecode_module_impl.h
+++ b/iree/vm/bytecode_module_impl.h
@@ -18,11 +18,11 @@
#include <stdint.h>
#include "iree/base/api.h"
-#include "iree/vm2/module.h"
-#include "iree/vm2/ref.h"
-#include "iree/vm2/stack.h"
-#include "iree/vm2/types.h"
-#include "iree/vm2/value.h"
+#include "iree/vm/module.h"
+#include "iree/vm/ref.h"
+#include "iree/vm/stack.h"
+#include "iree/vm/types.h"
+#include "iree/vm/value.h"
#ifdef __cplusplus
extern "C" {
diff --git a/iree/vm2/bytecode_module_test.cc b/iree/vm/bytecode_module_test.cc
similarity index 95%
rename from iree/vm2/bytecode_module_test.cc
rename to iree/vm/bytecode_module_test.cc
index 3de016a..f8eec64 100644
--- a/iree/vm2/bytecode_module_test.cc
+++ b/iree/vm/bytecode_module_test.cc
@@ -16,7 +16,7 @@
// This means mostly just flatbuffer verification, module interface functions,
// etc. bytecode_dispatch_test.cc covers actual dispatch.
-#include "iree/vm2/bytecode_module.h"
+#include "iree/vm/bytecode_module.h"
#include "iree/testing/gtest.h"
diff --git a/iree/vm2/context.c b/iree/vm/context.c
similarity index 99%
rename from iree/vm2/context.c
rename to iree/vm/context.c
index 7729648..73e5a26 100644
--- a/iree/vm2/context.c
+++ b/iree/vm/context.c
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "iree/vm2/context.h"
+#include "iree/vm/context.h"
#include <assert.h>
#include <stdatomic.h>
diff --git a/iree/vm2/context.h b/iree/vm/context.h
similarity index 95%
rename from iree/vm2/context.h
rename to iree/vm/context.h
index 2fb097e..d096907 100644
--- a/iree/vm2/context.h
+++ b/iree/vm/context.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef IREE_VM2_CONTEXT_H_
-#define IREE_VM2_CONTEXT_H_
+#ifndef IREE_VM_CONTEXT_H_
+#define IREE_VM_CONTEXT_H_
#include "iree/base/api.h"
-#include "iree/vm2/instance.h"
-#include "iree/vm2/module.h"
-#include "iree/vm2/stack.h"
+#include "iree/vm/instance.h"
+#include "iree/vm/module.h"
+#include "iree/vm/stack.h"
#ifdef __cplusplus
extern "C" {
@@ -92,4 +92,4 @@
} // extern "C"
#endif // __cplusplus
-#endif // IREE_VM2_CONTEXT_H_
+#endif // IREE_VM_CONTEXT_H_
diff --git a/iree/vm2/instance.c b/iree/vm/instance.c
similarity index 96%
rename from iree/vm2/instance.c
rename to iree/vm/instance.c
index de30ea9..b2bfe39 100644
--- a/iree/vm2/instance.c
+++ b/iree/vm/instance.c
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "iree/vm2/instance.h"
+#include "iree/vm/instance.h"
#include <stdatomic.h>
-#include "iree/vm2/types.h"
+#include "iree/vm/types.h"
struct iree_vm_instance {
atomic_intptr_t ref_count;
diff --git a/iree/vm2/instance.h b/iree/vm/instance.h
similarity index 94%
rename from iree/vm2/instance.h
rename to iree/vm/instance.h
index 387dca1..363584a 100644
--- a/iree/vm2/instance.h
+++ b/iree/vm/instance.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef IREE_IREE_VM2_INSTANCE_H_
-#define IREE_IREE_VM2_INSTANCE_H_
+#ifndef IREE_VM_INSTANCE_H_
+#define IREE_VM_INSTANCE_H_
#include "iree/base/api.h"
@@ -57,4 +57,4 @@
} // extern "C"
#endif // __cplusplus
-#endif // IREE_IREE_VM2_INSTANCE_H_
+#endif // IREE_VM_INSTANCE_H_
diff --git a/iree/vm2/invocation.c b/iree/vm/invocation.c
similarity index 98%
rename from iree/vm2/invocation.c
rename to iree/vm/invocation.c
index fa6d6a2..175c5cc 100644
--- a/iree/vm2/invocation.c
+++ b/iree/vm/invocation.c
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "iree/vm2/invocation.h"
+#include "iree/vm/invocation.h"
static iree_status_t iree_vm_validate_function_inputs(
iree_vm_function_t function, iree_vm_variant_list_t* inputs) {
diff --git a/iree/vm2/invocation.h b/iree/vm/invocation.h
similarity index 95%
rename from iree/vm2/invocation.h
rename to iree/vm/invocation.h
index 0d7a345..fc80156 100644
--- a/iree/vm2/invocation.h
+++ b/iree/vm/invocation.h
@@ -14,13 +14,13 @@
// See iree/base/api.h for documentation on the API conventions used.
-#ifndef IREE_VM2_INVOCATION_H_
-#define IREE_VM2_INVOCATION_H_
+#ifndef IREE_VM_INVOCATION_H_
+#define IREE_VM_INVOCATION_H_
#include "iree/base/api.h"
-#include "iree/vm2/context.h"
-#include "iree/vm2/module.h"
-#include "iree/vm2/variant_list.h"
+#include "iree/vm/context.h"
+#include "iree/vm/module.h"
+#include "iree/vm/variant_list.h"
#ifdef __cplusplus
extern "C" {
@@ -101,4 +101,4 @@
} // extern "C"
#endif // __cplusplus
-#endif // IREE_VM2_INVOCATION_H_
+#endif // IREE_VM_INVOCATION_H_
diff --git a/iree/vm2/module.c b/iree/vm/module.c
similarity index 99%
rename from iree/vm2/module.c
rename to iree/vm/module.c
index 7bd27e6..2d1626e 100644
--- a/iree/vm2/module.c
+++ b/iree/vm/module.c
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "iree/vm2/module.h"
+#include "iree/vm/module.h"
#include <stdatomic.h>
#include <string.h>
diff --git a/iree/vm2/module.h b/iree/vm/module.h
similarity index 100%
rename from iree/vm2/module.h
rename to iree/vm/module.h
diff --git a/iree/vm2/ref.c b/iree/vm/ref.c
similarity index 99%
rename from iree/vm2/ref.c
rename to iree/vm/ref.c
index 1d80f18..505731b 100644
--- a/iree/vm2/ref.c
+++ b/iree/vm/ref.c
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "iree/vm2/ref.h"
+#include "iree/vm/ref.h"
#include <assert.h>
#include <stdatomic.h>
diff --git a/iree/vm2/ref.h b/iree/vm/ref.h
similarity index 100%
rename from iree/vm2/ref.h
rename to iree/vm/ref.h
diff --git a/iree/vm2/ref_test.cc b/iree/vm/ref_test.cc
similarity index 99%
rename from iree/vm2/ref_test.cc
rename to iree/vm/ref_test.cc
index 6bf301e..44ccaff 100644
--- a/iree/vm2/ref_test.cc
+++ b/iree/vm/ref_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "iree/vm2/ref.h"
+#include "iree/vm/ref.h"
#include <cstddef>
#include <cstring>
diff --git a/iree/vm2/stack.c b/iree/vm/stack.c
similarity index 98%
rename from iree/vm2/stack.c
rename to iree/vm/stack.c
index 08ccc6b..2610d6f 100644
--- a/iree/vm2/stack.c
+++ b/iree/vm/stack.c
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "iree/vm2/stack.h"
+#include "iree/vm/stack.h"
#include <string.h>
-#include "iree/vm2/module.h"
+#include "iree/vm/module.h"
IREE_API_EXPORT iree_status_t IREE_API_CALL iree_vm_stack_init(
iree_vm_state_resolver_t state_resolver, iree_vm_stack_t* out_stack) {
diff --git a/iree/vm2/stack.h b/iree/vm/stack.h
similarity index 98%
rename from iree/vm2/stack.h
rename to iree/vm/stack.h
index 886a1bc..701f4bb 100644
--- a/iree/vm2/stack.h
+++ b/iree/vm/stack.h
@@ -20,8 +20,8 @@
#include <stdint.h>
#include "iree/base/api.h"
-#include "iree/vm2/module.h"
-#include "iree/vm2/ref.h"
+#include "iree/vm/module.h"
+#include "iree/vm/ref.h"
#ifdef __cplusplus
extern "C" {
diff --git a/iree/vm2/stack_test.cc b/iree/vm/stack_test.cc
similarity index 99%
rename from iree/vm2/stack_test.cc
rename to iree/vm/stack_test.cc
index 85617df..8f14532 100644
--- a/iree/vm2/stack_test.cc
+++ b/iree/vm/stack_test.cc
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "iree/vm2/stack.h"
+#include "iree/vm/stack.h"
#include <cstring>
#include "iree/base/api.h"
#include "iree/base/ref_ptr.h"
#include "iree/testing/gtest.h"
-#include "iree/vm2/ref.h"
+#include "iree/vm/ref.h"
namespace {
diff --git a/iree/vm2/types.c b/iree/vm/types.c
similarity index 98%
rename from iree/vm2/types.c
rename to iree/vm/types.c
index 9e7d2c9..b7e0562 100644
--- a/iree/vm2/types.c
+++ b/iree/vm/types.c
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "iree/vm2/types.h"
+#include "iree/vm/types.h"
static iree_vm_ref_type_descriptor_t iree_vm_ro_byte_buffer_descriptor = {0};
diff --git a/iree/vm2/types.h b/iree/vm/types.h
similarity index 99%
rename from iree/vm2/types.h
rename to iree/vm/types.h
index 9978ea8..981203a 100644
--- a/iree/vm2/types.h
+++ b/iree/vm/types.h
@@ -19,7 +19,7 @@
#include <stdint.h>
#include "iree/base/api.h"
-#include "iree/vm2/ref.h"
+#include "iree/vm/ref.h"
#ifdef __cplusplus
extern "C" {
diff --git a/iree/vm2/value.h b/iree/vm/value.h
similarity index 93%
rename from iree/vm2/value.h
rename to iree/vm/value.h
index 7986c21..f11392e 100644
--- a/iree/vm2/value.h
+++ b/iree/vm/value.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef IREE_VM2_VALUE_H_
-#define IREE_VM2_VALUE_H_
+#ifndef IREE_VM_VALUE_H_
+#define IREE_VM_VALUE_H_
#include <stdint.h>
@@ -46,4 +46,4 @@
} // extern "C"
#endif // __cplusplus
-#endif // IREE_VM2_VALUE_H_
+#endif // IREE_VM_VALUE_H_
diff --git a/iree/vm2/variant_list.c b/iree/vm/variant_list.c
similarity index 98%
rename from iree/vm2/variant_list.c
rename to iree/vm/variant_list.c
index f027aab..bc59992 100644
--- a/iree/vm2/variant_list.c
+++ b/iree/vm/variant_list.c
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "iree/vm2/variant_list.h"
+#include "iree/vm/variant_list.h"
struct iree_vm_variant_list {
iree_allocator_t allocator;
diff --git a/iree/vm2/variant_list.h b/iree/vm/variant_list.h
similarity index 95%
rename from iree/vm2/variant_list.h
rename to iree/vm/variant_list.h
index 96b918d..b31a042 100644
--- a/iree/vm2/variant_list.h
+++ b/iree/vm/variant_list.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef IREE_VM2_VARIANT_LIST_H_
-#define IREE_VM2_VARIANT_LIST_H_
+#ifndef IREE_VM_VARIANT_LIST_H_
+#define IREE_VM_VARIANT_LIST_H_
#include <stdint.h>
-#include "iree/vm2/ref.h"
-#include "iree/vm2/value.h"
+#include "iree/vm/ref.h"
+#include "iree/vm/value.h"
#ifdef __cplusplus
extern "C" {
@@ -104,4 +104,4 @@
} // extern "C"
#endif // __cplusplus
-#endif // IREE_VM2_VARIANT_LIST_H_
+#endif // IREE_VM_VARIANT_LIST_H_
