Rename ".module" to ".vmfb" in generated IREE bytecode modules. (#4729)
diff --git a/bindings/tflite/BUILD b/bindings/tflite/BUILD
index ac31217..76a50ae 100644
--- a/bindings/tflite/BUILD
+++ b/bindings/tflite/BUILD
@@ -69,7 +69,7 @@
# TODO(benvanik): bazel/cmake to include this generated file.
# Checked in right now until I can figure it out.
# data = [
- # "//bindings/tflite/testdata:add.module",
+ # "//bindings/tflite/testdata:add.vmfb",
# ],
deps = [
":shim",
diff --git a/build_tools/cmake/iree_bytecode_module.cmake b/build_tools/cmake/iree_bytecode_module.cmake
index 64f8fd0..5441953 100644
--- a/build_tools/cmake/iree_bytecode_module.cmake
+++ b/build_tools/cmake/iree_bytecode_module.cmake
@@ -64,12 +64,12 @@
set(_ARGS "${_FLAGS}")
list(APPEND _ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${_RULE_SRC}")
list(APPEND _ARGS "-o")
- list(APPEND _ARGS "${_RULE_NAME}.module")
+ list(APPEND _ARGS "${_RULE_NAME}.vmfb")
# Depending on the binary instead of the target here given we might not have
# a target in this CMake invocation when cross-compiling.
add_custom_command(
- OUTPUT "${_RULE_NAME}.module"
+ OUTPUT "${_RULE_NAME}.vmfb"
COMMAND ${_TRANSLATE_TOOL_EXECUTABLE} ${_ARGS}
# Changes to either the translation tool or the input source should
# trigger rebuilding.
@@ -90,7 +90,7 @@
IDENTIFIER
"${_RULE_NAME}"
GENERATED_SRCS
- "${_RULE_NAME}.module"
+ "${_RULE_NAME}.vmfb"
CC_FILE_OUTPUT
"${_RULE_NAME}.cc"
H_FILE_OUTPUT
diff --git a/build_tools/cmake/iree_check_test.cmake b/build_tools/cmake/iree_check_test.cmake
index 99e91e5..e1f4141 100644
--- a/build_tools/cmake/iree_check_test.cmake
+++ b/build_tools/cmake/iree_check_test.cmake
@@ -99,7 +99,7 @@
# TODO(b/146898896): It would be nice if this were something we could query
# rather than having to know the conventions used by iree_bytecode_module.
- set(_MODULE_FILE_NAME "${_MODULE_NAME}.module")
+ set(_MODULE_FILE_NAME "${_MODULE_NAME}.vmfb")
# iree_bytecode_module does not define a target, only a custom command.
# We need to create a target that depends on the command to ensure the
diff --git a/iree/samples/emitc_modules/CMakeLists.txt b/iree/samples/emitc_modules/CMakeLists.txt
index e4914ca..772fcde 100644
--- a/iree/samples/emitc_modules/CMakeLists.txt
+++ b/iree/samples/emitc_modules/CMakeLists.txt
@@ -13,7 +13,7 @@
# limitations under the License.
if(${IREE_ENABLE_EMITC})
- # TODO(simon-camp): We are only interested in the output of iree-translate, i.e. add_module.module
+ # TODO(simon-camp): We are only interested in the output of iree-translate, i.e. add_module.vmfb
# TODO(marbre): Use a custom command or rather implement a new CMake function.
iree_bytecode_module(
NAME
diff --git a/iree/tools/compilation.bzl b/iree/tools/compilation.bzl
index d5f7a14..b3a85be 100644
--- a/iree/tools/compilation.bzl
+++ b/iree/tools/compilation.bzl
@@ -28,13 +28,13 @@
name = name,
srcs = [src],
outs = [
- "%s.module" % (name),
+ "%s.vmfb" % (name),
],
cmd = " && ".join([
" ".join([
"$(location %s)" % (translate_tool),
" ".join(flags),
- "-o $(location %s.module)" % (name),
+ "-o $(location %s.vmfb)" % (name),
"$(location %s)" % (src),
]),
]),
@@ -50,7 +50,7 @@
cc_embed_data(
name = "%s_cc" % (name),
identifier = name,
- srcs = ["%s.module" % (name)],
+ srcs = ["%s.vmfb" % (name)],
cc_file_output = "%s.cc" % (name),
h_file_output = "%s.h" % (name),
cpp_namespace = cc_namespace,
diff --git a/iree/vm/test/BUILD b/iree/vm/test/BUILD
index 7df20ef..fd338f9 100644
--- a/iree/vm/test/BUILD
+++ b/iree/vm/test/BUILD
@@ -34,12 +34,12 @@
cc_embed_data(
name = "all_bytecode_modules_cc",
srcs = [
- ":arithmetic_ops.module",
- ":arithmetic_ops_i64.module",
- ":comparison_ops.module",
- ":control_flow_ops.module",
- ":list_ops.module",
- ":shift_ops.module",
+ ":arithmetic_ops.vmfb",
+ ":arithmetic_ops_i64.vmfb",
+ ":comparison_ops.vmfb",
+ ":control_flow_ops.vmfb",
+ ":list_ops.vmfb",
+ ":shift_ops.vmfb",
],
cc_file_output = "all_bytecode_modules.cc",
cpp_namespace = "iree::vm::test",
diff --git a/iree/vm/test/CMakeLists.txt b/iree/vm/test/CMakeLists.txt
index 88a4220..0a9491c 100644
--- a/iree/vm/test/CMakeLists.txt
+++ b/iree/vm/test/CMakeLists.txt
@@ -22,12 +22,12 @@
NAME
all_bytecode_modules_cc
GENERATED_SRCS
- "arithmetic_ops.module"
- "arithmetic_ops_i64.module"
- "comparison_ops.module"
- "control_flow_ops.module"
- "list_ops.module"
- "shift_ops.module"
+ "arithmetic_ops.vmfb"
+ "arithmetic_ops_i64.vmfb"
+ "comparison_ops.vmfb"
+ "control_flow_ops.vmfb"
+ "list_ops.vmfb"
+ "shift_ops.vmfb"
CC_FILE_OUTPUT
"all_bytecode_modules.cc"
H_FILE_OUTPUT
