Moved iree-check-module-main.cc to iree/tools (#4312)
This keeps all tools in the same place so that it's easy to find/switch between them.
Fixes https://github.com/google/iree/issues/1986
diff --git a/build_tools/bazel/iree_check_test.bzl b/build_tools/bazel/iree_check_test.bzl
index 5db74df..83dffcf 100644
--- a/build_tools/bazel/iree_check_test.bzl
+++ b/build_tools/bazel/iree_check_test.bzl
@@ -65,7 +65,7 @@
"$(location :%s)" % bytecode_module_name,
] + runner_args,
data = [":%s" % bytecode_module_name],
- test_binary = "//iree/modules/check:iree-check-module",
+ test_binary = "//iree/tools:iree-check-module",
tags = tags + ["driver=%s" % driver],
**kwargs
)
diff --git a/build_tools/cmake/iree_check_test.cmake b/build_tools/cmake/iree_check_test.cmake
index 96cdfa8..c3cf32e 100644
--- a/build_tools/cmake/iree_check_test.cmake
+++ b/build_tools/cmake/iree_check_test.cmake
@@ -105,7 +105,7 @@
add_dependencies(
"${_NAME}"
"${_MODULE_TARGET_NAME}"
- iree_modules_check_iree-check-module
+ iree_tools_iree-check-module
)
iree_package_ns(_PACKAGE_NS)
@@ -125,7 +125,7 @@
${_TEST_NAME}
COMMAND
"${CMAKE_SOURCE_DIR}/build_tools/cmake/run_android_test.${IREE_HOST_SCRIPT_EXT}"
- "${_ANDROID_REL_DIR}/$<TARGET_FILE_NAME:iree_modules_check_iree-check-module>"
+ "${_ANDROID_REL_DIR}/$<TARGET_FILE_NAME:iree_tools_iree-check-module>"
"--driver=${_RULE_DRIVER}"
"${_ANDROID_REL_DIR}/${_MODULE_FILE_NAME}"
${_RULE_RUNNER_ARGS}
@@ -137,7 +137,7 @@
_ENVIRONMENT_VARS
TEST_ANDROID_ABS_DIR=${_ANDROID_ABS_DIR}
TEST_DATA=${CMAKE_CURRENT_BINARY_DIR}/${_MODULE_FILE_NAME}
- TEST_EXECUTABLE=$<TARGET_FILE:iree_modules_check_iree-check-module>
+ TEST_EXECUTABLE=$<TARGET_FILE:iree_tools_iree-check-module>
)
set_property(TEST ${_TEST_NAME} PROPERTY ENVIRONMENT ${_ENVIRONMENT_VARS})
iree_add_test_environment_properties(${_TEST_NAME})
@@ -147,7 +147,7 @@
"${_TEST_NAME}"
COMMAND
"${CMAKE_SOURCE_DIR}/build_tools/cmake/run_test.${IREE_HOST_SCRIPT_EXT}"
- "$<TARGET_FILE:iree_modules_check_iree-check-module>"
+ "$<TARGET_FILE:iree_tools_iree-check-module>"
"--driver=${_RULE_DRIVER}"
"${CMAKE_CURRENT_BINARY_DIR}/${_MODULE_FILE_NAME}"
${_RULE_RUNNER_ARGS}
diff --git a/iree/modules/check/BUILD b/iree/modules/check/BUILD
index 4686574..c83a511 100644
--- a/iree/modules/check/BUILD
+++ b/iree/modules/check/BUILD
@@ -40,28 +40,6 @@
],
)
-cc_binary(
- name = "iree-check-module",
- testonly = True,
- srcs = ["iree-check-module-main.cc"],
- deps = [
- ":native_module",
- "//iree/base:api",
- "//iree/base:core_headers",
- "//iree/base:file_io",
- "//iree/base:flags",
- "//iree/base:status",
- "//iree/base:tracing",
- "//iree/hal/drivers",
- "//iree/modules/hal",
- "//iree/testing:gtest",
- "//iree/tools/utils:vm_util",
- "//iree/vm:bytecode_module",
- "@com_google_absl//absl/flags:flag",
- "@com_google_absl//absl/strings",
- ],
-)
-
cc_library(
name = "native_module",
testonly = True,
diff --git a/iree/modules/check/CMakeLists.txt b/iree/modules/check/CMakeLists.txt
index 3d8dc84..ea43202 100644
--- a/iree/modules/check/CMakeLists.txt
+++ b/iree/modules/check/CMakeLists.txt
@@ -39,30 +39,6 @@
)
endif()
-iree_cc_binary(
- NAME
- iree-check-module
- OUT
- iree-check-module
- SRCS
- "iree-check-module-main.cc"
- DEPS
- ::native_module
- absl::flags
- absl::strings
- iree::base::api
- iree::base::core_headers
- iree::base::file_io
- iree::base::flags
- iree::base::status
- iree::base::tracing
- iree::hal::drivers
- iree::modules::hal
- iree::testing::gtest
- iree::tools::utils::vm_util
- iree::vm::bytecode_module
- TESTONLY
-)
iree_cc_library(
NAME
diff --git a/iree/modules/check/test/BUILD b/iree/modules/check/test/BUILD
index 916c867..162109c 100644
--- a/iree/modules/check/test/BUILD
+++ b/iree/modules/check/test/BUILD
@@ -25,8 +25,8 @@
name = "lit",
srcs = glob(["*.mlir"]),
data = [
- "//iree/modules/check:iree-check-module",
"//iree/tools:IreeFileCheck",
+ "//iree/tools:iree-check-module",
"//iree/tools:iree-translate",
],
tags = ["hostonly"],
diff --git a/iree/modules/check/test/CMakeLists.txt b/iree/modules/check/test/CMakeLists.txt
index 43636c0..f29865e 100644
--- a/iree/modules/check/test/CMakeLists.txt
+++ b/iree/modules/check/test/CMakeLists.txt
@@ -21,8 +21,8 @@
SRCS
"${_GLOB_X_MLIR}"
DATA
- iree::modules::check::iree-check-module
iree::tools::IreeFileCheck
+ iree::tools::iree-check-module
iree::tools::iree-translate
LABELS
"hostonly"
diff --git a/iree/tools/BUILD b/iree/tools/BUILD
index d5cdc4c..2b2d4df 100644
--- a/iree/tools/BUILD
+++ b/iree/tools/BUILD
@@ -49,6 +49,28 @@
)
cc_binary(
+ name = "iree-check-module",
+ testonly = True,
+ srcs = ["iree-check-module-main.cc"],
+ deps = [
+ "//iree/base:api",
+ "//iree/base:core_headers",
+ "//iree/base:file_io",
+ "//iree/base:flags",
+ "//iree/base:status",
+ "//iree/base:tracing",
+ "//iree/hal/drivers",
+ "//iree/modules/check:native_module",
+ "//iree/modules/hal",
+ "//iree/testing:gtest",
+ "//iree/tools/utils:vm_util",
+ "//iree/vm:bytecode_module",
+ "@com_google_absl//absl/flags:flag",
+ "@com_google_absl//absl/strings",
+ ],
+)
+
+cc_binary(
name = "iree-dump-module",
srcs = ["iree-dump-module-main.cc"],
deps = [
diff --git a/iree/tools/CMakeLists.txt b/iree/tools/CMakeLists.txt
index aedd56b..bea4bc5 100644
--- a/iree/tools/CMakeLists.txt
+++ b/iree/tools/CMakeLists.txt
@@ -78,6 +78,31 @@
iree_cc_binary(
NAME
+ iree-check-module
+ OUT
+ iree-check-module
+ SRCS
+ "iree-check-module-main.cc"
+ DEPS
+ iree::modules::check::native_module
+ absl::flags
+ absl::strings
+ iree::base::api
+ iree::base::core_headers
+ iree::base::file_io
+ iree::base::flags
+ iree::base::status
+ iree::base::tracing
+ iree::hal::drivers
+ iree::modules::hal
+ iree::testing::gtest
+ iree::tools::utils::vm_util
+ iree::vm::bytecode_module
+ TESTONLY
+)
+
+iree_cc_binary(
+ NAME
iree-dump-module
OUT
iree-dump-module
diff --git a/iree/modules/check/iree-check-module-main.cc b/iree/tools/iree-check-module-main.cc
similarity index 100%
rename from iree/modules/check/iree-check-module-main.cc
rename to iree/tools/iree-check-module-main.cc
