Move iree/tools/ to tools/. (#9135)
Progress on https://github.com/google/iree/issues/8955.
* Bazel target names: `//iree/tools:iree-opt` -> `//tools:iree-opt`
* CMake target names: `iree::tools::iree-opt` -> `iree-opt`
* Updated docs, scripts, and pipelines to the new source file and build directory paths
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 30d0b0f..4e22167 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -53,6 +53,8 @@
# Other Top-Level Directories
/docs/ @ScottTodd
+/samples/ @ScottTodd
+/tools/ @benvanik @GMNGeoffrey
# Main IREE directories
@@ -80,6 +82,4 @@
/runtime/src/iree/hal/vulkan/ @antiagainst @ScottTodd
# Other IREE directories
-/samples/ @ScottTodd
/iree/test/ @ghost
-/iree/tools/ @benvanik @GMNGeoffrey
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 684bbb9..315bb56 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -629,7 +629,7 @@
add_subdirectory(runtime)
# tools/ can depend on compiler/ and runtime/
-add_subdirectory(iree/tools)
+add_subdirectory(tools)
if(IREE_BUILD_TRACY)
if(NOT CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -641,7 +641,7 @@
endif()
endif()
-# Order constraint: The python bindings install tools targets from iree/tools
+# Order constraint: The python bindings install tools targets from tools/
# and tracy, and must come after it.
if(IREE_BUILD_PYTHON_BINDINGS)
# Write out a .env file to make IDEs and developers happy.
diff --git a/benchmarks/README.md b/benchmarks/README.md
index b6ed319..5c67c28 100644
--- a/benchmarks/README.md
+++ b/benchmarks/README.md
@@ -101,7 +101,7 @@
```sh
build_tools/benchmarks/run_benchmarks_on_linux.py \
- --normal_benchmark_tool_dir=$IREE_BUILD_DIR/iree/tools \
+ --normal_benchmark_tool_dir=$IREE_BUILD_DIR/tools \
--output results.json $IREE_BUILD_DIR
```
diff --git a/build_tools/bazel/build_core.sh b/build_tools/bazel/build_core.sh
index a3101a3..2544969 100755
--- a/build_tools/bazel/build_core.sh
+++ b/build_tools/bazel/build_core.sh
@@ -83,7 +83,7 @@
--bazelrc=build_tools/bazel/iree.bazelrc \
query \
//iree/... + //runtime/... + //samples/... + //build_tools/... + \
- //llvm-external-projects/iree-dialects/... | \
+ //tools/... + //llvm-external-projects/iree-dialects/... | \
xargs --max-args 1000000 --max-chars 1000000 --exit \
bazel \
--noworkspace_rc \
diff --git a/build_tools/bazel/iree_bytecode_module.bzl b/build_tools/bazel/iree_bytecode_module.bzl
index c625364..6adf44b 100644
--- a/build_tools/bazel/iree_bytecode_module.bzl
+++ b/build_tools/bazel/iree_bytecode_module.bzl
@@ -16,7 +16,7 @@
module = None,
flags = ["--iree-mlir-to-vm-bytecode-module"],
# TODO: Rename this to 'compile_tool'
- translate_tool = "//iree/tools:iree-compile",
+ translate_tool = "//tools:iree-compile",
linker_tool = "@llvm-project//lld:lld",
c_identifier = "",
deps = [],
diff --git a/build_tools/bazel/iree_check_test.bzl b/build_tools/bazel/iree_check_test.bzl
index 2f80442..115388d 100644
--- a/build_tools/bazel/iree_check_test.bzl
+++ b/build_tools/bazel/iree_check_test.bzl
@@ -71,7 +71,7 @@
"$(location :%s)" % bytecode_module_name,
] + runner_args,
data = [":%s" % bytecode_module_name],
- src = "//iree/tools:iree-check-module",
+ src = "//tools:iree-check-module",
tags = tags + ["driver=%s" % driver],
timeout = timeout,
**kwargs
diff --git a/build_tools/bazel_to_cmake/bazel_to_cmake.py b/build_tools/bazel_to_cmake/bazel_to_cmake.py
index 217934d..5a21b3c 100755
--- a/build_tools/bazel_to_cmake/bazel_to_cmake.py
+++ b/build_tools/bazel_to_cmake/bazel_to_cmake.py
@@ -79,9 +79,8 @@
group.add_argument(
"--root_dir",
nargs="+",
- help=
- "Converts all BUILD files under a root directory (defaults to iree, runtime)",
- default=["compiler", "iree", "runtime", "samples"])
+ help="Converts all BUILD files under a root directory",
+ default=["compiler", "iree", "runtime", "samples", "tools"])
args = parser.parse_args()
diff --git a/build_tools/bazel_to_cmake/bazel_to_cmake_converter.py b/build_tools/bazel_to_cmake/bazel_to_cmake_converter.py
index e8e7bb2..d988040 100644
--- a/build_tools/bazel_to_cmake/bazel_to_cmake_converter.py
+++ b/build_tools/bazel_to_cmake/bazel_to_cmake_converter.py
@@ -69,17 +69,16 @@
if target is None:
return ""
- # Targets in this context can't be aliases, because CMake. So we first convert
- # it in the usual way and then syntactically change it back from the pretty
- # alias name to the underscored variant. Example:
- # //iree/tools:iree-translate
- # iree::tools::iree-translate
- # iree_tools_iree-translate
+ # Convert the target name from its Bazel name to the corresponding CMake name.
+ # The specific conversion pattern depends on the target location. In general,
+ # Bazel targets are fully qualified and use slashes as delimiters, while
+ # targets in CMake are rooted on subtrees and use _ (with :: aliases).
cmake_aliases = bazel_to_cmake_targets.convert_target(target)
if len(cmake_aliases) != 1:
raise ValueError(
f"Expected a CMake alias from {target}. Got {cmake_aliases}")
target = cmake_aliases[0]
+ # Replace aliased :: target names with their explicit _ names.
target = target.replace("::", "_")
return _convert_string_arg_block(name, target, quote=False)
diff --git a/build_tools/bazel_to_cmake/bazel_to_cmake_targets.py b/build_tools/bazel_to_cmake/bazel_to_cmake_targets.py
index 879924a..8554c89 100644
--- a/build_tools/bazel_to_cmake/bazel_to_cmake_targets.py
+++ b/build_tools/bazel_to_cmake/bazel_to_cmake_targets.py
@@ -258,6 +258,11 @@
if m:
return ["iree::samples::" + _convert_bazel_path(m.group(1))]
+ # Map //tools/(.*) -> \1
+ m = re.match("^//tools[/|:](.+)", target)
+ if m:
+ return [_convert_bazel_path(m.group(1))]
+
# Default (legacy) rewrite.
if not target.startswith("@"):
return [_convert_bazel_path(target)]
diff --git a/build_tools/benchmarks/README.md b/build_tools/benchmarks/README.md
index 17e75d0..ca01f9d 100644
--- a/build_tools/benchmarks/README.md
+++ b/build_tools/benchmarks/README.md
@@ -15,7 +15,7 @@
```sh
IREE_BUILD_DIR="/path/to/IREE build root dir". It should contain the "benchmark_suites" directory built with the target "iree-benchmark-suites".
-IREE_NORMAL_TOOL_DIR="/path/to/IREE tool dir". It is usually "$IREE_BUILD_DIR/iree/tools".
+IREE_NORMAL_TOOL_DIR="/path/to/IREE tool dir". It is usually "$IREE_BUILD_DIR/tools".
IREE_TRACED_TOOL_DIR="/path/to/IREE tool dir built with IREE_ENABLE_RUNTIME_TRACING=ON".
```
diff --git a/build_tools/benchmarks/run_benchmarks_on_android.py b/build_tools/benchmarks/run_benchmarks_on_android.py
index 8876561..b1d2c8c 100755
--- a/build_tools/benchmarks/run_benchmarks_on_android.py
+++ b/build_tools/benchmarks/run_benchmarks_on_android.py
@@ -18,13 +18,13 @@
# Without trace generation
python3 run_benchmarks.py \
- --normal_benchmark_tool_dir=/path/to/normal/android/target/iree/tools/dir \
+ --normal_benchmark_tool_dir=/path/to/normal/android/target/tools/dir \
/path/to/host/build/dir
# With trace generation
python3 run_benchmarks.py \
- --normal_benchmark_tool_dir=/path/to/normal/android/target/iree/tools/dir \
- --traced_benchmark_tool_dir=/path/to/tracy/android/target/iree/tools/dir \
+ --normal_benchmark_tool_dir=/path/to/normal/android/target/tools/dir \
+ --traced_benchmark_tool_dir=/path/to/tracy/android/target/tools/dir \
--trace_capture_tool=/path/to/host/build/tracy/capture \
/path/to/host/build/dir
"""
diff --git a/build_tools/buildkite/cmake/android/arm64-v8a/benchmark2.yml b/build_tools/buildkite/cmake/android/arm64-v8a/benchmark2.yml
index 921353a..72416ed 100644
--- a/build_tools/buildkite/cmake/android/arm64-v8a/benchmark2.yml
+++ b/build_tools/buildkite/cmake/android/arm64-v8a/benchmark2.yml
@@ -12,7 +12,7 @@
- "docker run --user=$(id -u):$(id -g) --volume=\\${HOME?}:\\${HOME?} --volume=/etc/passwd:/etc/passwd:ro --volume=/etc/group:/etc/group:ro --volume=\\$PWD:\\$IREE_DOCKER_WORKDIR --workdir=\\$IREE_DOCKER_WORKDIR --rm gcr.io/iree-oss/frontends@sha256:5868b0de784a590d710c837c3799d9d52456510e6db3d555661ba5f9f87ce213 build_tools/cmake/build_android_benchmark.sh"
- "tar --exclude='*.tar.gz' --exclude='*.tgz' --exclude='*.mlir' --exclude='*.tflite' -czvf benchmark-suites-${BUILDKITE_BUILD_NUMBER}.tgz build-host/benchmark_suites"
- "find build-host/benchmark_suites -name '*.mlir' | tar -czvf source-mlir-models-${BUILDKITE_BUILD_NUMBER}.tgz -T -"
- - "tar -czvf iree-android-tools-${BUILDKITE_BUILD_NUMBER}.tgz build-android/iree/tools/iree-benchmark-module build-android-trace/iree/tools/iree-benchmark-module build-android/iree/tools/build_config.txt"
+ - "tar -czvf iree-android-tools-${BUILDKITE_BUILD_NUMBER}.tgz build-android/tools/iree-benchmark-module build-android-trace/tools/iree-benchmark-module build-android/tools/build_config.txt"
if: "build.pull_request.id == null || (build.pull_request.labels includes 'buildkite:benchmark')"
agents:
- "queue=build"
@@ -34,7 +34,7 @@
- "tar -xzvf benchmark-suites-${BUILDKITE_BUILD_NUMBER}.tgz"
- "tar -xzvf iree-android-tools-${BUILDKITE_BUILD_NUMBER}.tgz"
- "tar -xzvf tracy-capture-80f6a93d.tgz"
- - "python3 build_tools/benchmarks/run_benchmarks_on_android.py --pin-cpu-freq --pin-gpu-freq --normal_benchmark_tool_dir=build-android/iree/tools/ --traced_benchmark_tool_dir=build-android-trace/iree/tools/ --trace_capture_tool=tracy-capture -o benchmark-results-pixel-4-${BUILDKITE_BUILD_NUMBER}.json --capture_tarball=trace-captures-pixel-4-${BUILDKITE_BUILD_NUMBER}.tgz --verbose build-host/"
+ - "python3 build_tools/benchmarks/run_benchmarks_on_android.py --pin-cpu-freq --pin-gpu-freq --normal_benchmark_tool_dir=build-android/tools/ --traced_benchmark_tool_dir=build-android-trace/tools/ --trace_capture_tool=tracy-capture -o benchmark-results-pixel-4-${BUILDKITE_BUILD_NUMBER}.json --capture_tarball=trace-captures-pixel-4-${BUILDKITE_BUILD_NUMBER}.tgz --verbose build-host/"
if: "build.pull_request.id == null || (build.pull_request.labels includes 'buildkite:benchmark')"
agents:
- "android-soc=snapdragon-855"
@@ -54,7 +54,7 @@
- "tar -xzvf benchmark-suites-${BUILDKITE_BUILD_NUMBER}.tgz"
- "tar -xzvf iree-android-tools-${BUILDKITE_BUILD_NUMBER}.tgz"
- "tar -xzvf tracy-capture-80f6a93d.tgz"
- - "python3 build_tools/benchmarks/run_benchmarks_on_android.py --pin-cpu-freq --pin-gpu-freq --normal_benchmark_tool_dir=build-android/iree/tools/ --traced_benchmark_tool_dir=build-android-trace/iree/tools/ --trace_capture_tool=tracy-capture -o benchmark-results-pixel6-pro-${BUILDKITE_BUILD_NUMBER}.json --capture_tarball=trace-captures-pixel6-pro-${BUILDKITE_BUILD_NUMBER}.tgz --verbose build-host/"
+ - "python3 build_tools/benchmarks/run_benchmarks_on_android.py --pin-cpu-freq --pin-gpu-freq --normal_benchmark_tool_dir=build-android/tools/ --traced_benchmark_tool_dir=build-android-trace/tools/ --trace_capture_tool=tracy-capture -o benchmark-results-pixel6-pro-${BUILDKITE_BUILD_NUMBER}.json --capture_tarball=trace-captures-pixel6-pro-${BUILDKITE_BUILD_NUMBER}.tgz --verbose build-host/"
if: "build.pull_request.id == null || (build.pull_request.labels includes 'buildkite:benchmark')"
agents:
- "android-soc=google-tensor"
@@ -74,7 +74,7 @@
- "tar -xzvf benchmark-suites-${BUILDKITE_BUILD_NUMBER}.tgz"
- "tar -xzvf iree-android-tools-${BUILDKITE_BUILD_NUMBER}.tgz"
- "tar -xzvf tracy-capture-80f6a93d.tgz"
- - "python3 build_tools/benchmarks/run_benchmarks_on_android.py --pin-cpu-freq --pin-gpu-freq --normal_benchmark_tool_dir=build-android/iree/tools/ --traced_benchmark_tool_dir=build-android-trace/iree/tools/ --trace_capture_tool=tracy-capture -o benchmark-results-galaxy-moto-edge-x30-${BUILDKITE_BUILD_NUMBER}.json --capture_tarball=trace-captures-galaxy-moto-edge-x30-${BUILDKITE_BUILD_NUMBER}.tgz --driver_filter_regex='vulkan' --verbose build-host/"
+ - "python3 build_tools/benchmarks/run_benchmarks_on_android.py --pin-cpu-freq --pin-gpu-freq --normal_benchmark_tool_dir=build-android/tools/ --traced_benchmark_tool_dir=build-android-trace/tools/ --trace_capture_tool=tracy-capture -o benchmark-results-galaxy-moto-edge-x30-${BUILDKITE_BUILD_NUMBER}.json --capture_tarball=trace-captures-galaxy-moto-edge-x30-${BUILDKITE_BUILD_NUMBER}.tgz --driver_filter_regex='vulkan' --verbose build-host/"
if: "build.pull_request.id == null || (build.pull_request.labels includes 'buildkite:benchmark')"
agents:
- "android-soc=snapdragon-8gen1"
diff --git a/build_tools/buildkite/cmake/linux/x86_64/benchmark.yml b/build_tools/buildkite/cmake/linux/x86_64/benchmark.yml
index de3f537..b6b8926 100644
--- a/build_tools/buildkite/cmake/linux/x86_64/benchmark.yml
+++ b/build_tools/buildkite/cmake/linux/x86_64/benchmark.yml
@@ -11,7 +11,7 @@
- "docker run --user=$(id -u):$(id -g) --volume=\\${HOME?}:\\${HOME?} --volume=/etc/passwd:/etc/passwd:ro --volume=/etc/group:/etc/group:ro --volume=\\$PWD:\\$IREE_DOCKER_WORKDIR --workdir=\\$IREE_DOCKER_WORKDIR --rm gcr.io/iree-oss/frontends@sha256:5868b0de784a590d710c837c3799d9d52456510e6db3d555661ba5f9f87ce213 build_tools/cmake/build_linux_benchmark.sh"
- "tar --exclude='*.tar.gz' --exclude='*.tgz' --exclude='*.mlir' --exclude='*.tflite' -czvf benchmark-suites-${BUILDKITE_BUILD_NUMBER}.tgz build-host/benchmark_suites"
- "find build-host/benchmark_suites -name '*.mlir' | tar -czvf source-mlir-models-${BUILDKITE_BUILD_NUMBER}.tgz -T -"
- - "tar -czvf iree-linux-x86_64-tools-${BUILDKITE_BUILD_NUMBER}.tgz build-linux-x86_64/iree/tools/iree-benchmark-module build-linux-x86_64/iree/tools/build_config.txt"
+ - "tar -czvf iree-linux-x86_64-tools-${BUILDKITE_BUILD_NUMBER}.tgz build-linux-x86_64/tools/iree-benchmark-module build-linux-x86_64/tools/build_config.txt"
if: "build.pull_request.id == null || (build.pull_request.labels includes 'buildkite:benchmark-x86_64')"
agents:
- "queue=build"
@@ -31,7 +31,7 @@
- "buildkite-agent artifact download --step build iree-linux-x86_64-tools-${BUILDKITE_BUILD_NUMBER}.tgz ./"
- "tar -xzvf benchmark-suites-${BUILDKITE_BUILD_NUMBER}.tgz"
- "tar -xzvf iree-linux-x86_64-tools-${BUILDKITE_BUILD_NUMBER}.tgz"
- - "python3 build_tools/benchmarks/run_benchmarks_on_linux.py --device_model=GCP-c2-standard-16 --cpu_uarch=CascadeLake --normal_benchmark_tool_dir=build-linux-x86_64/iree/tools/ -o benchmark-results-gcp-cpu-${BUILDKITE_BUILD_NUMBER}.json --verbose build-host/"
+ - "python3 build_tools/benchmarks/run_benchmarks_on_linux.py --device_model=GCP-c2-standard-16 --cpu_uarch=CascadeLake --normal_benchmark_tool_dir=build-linux-x86_64/tools/ -o benchmark-results-gcp-cpu-${BUILDKITE_BUILD_NUMBER}.json --verbose build-host/"
if: "build.pull_request.id == null || (build.pull_request.labels includes 'buildkite:benchmark-x86_64')"
agents:
- "gcp:machine-type=c2-standard-16"
diff --git a/build_tools/cmake/build_riscv.sh b/build_tools/cmake/build_riscv.sh
index 26658a7..54c5b61 100755
--- a/build_tools/cmake/build_riscv.sh
+++ b/build_tools/cmake/build_riscv.sh
@@ -78,7 +78,7 @@
)
elif [[ "${RISCV_CONFIG?}" == "rv32-baremetal" ]]; then
args+=(
- # TODO(#6353): Off until iree/tools are refactored to support threadless config.
+ # TODO(#6353): Off until tools/ are refactored to support threadless config.
-DIREE_BUILD_TESTS=OFF
-DRISCV_TOOLCHAIN_ROOT="${RISCV_RV32_NEWLIB_TOOLCHAIN_ROOT?}"
)
diff --git a/build_tools/cmake/iree_cc_binary.cmake b/build_tools/cmake/iree_cc_binary.cmake
index b971743..9f1049f 100644
--- a/build_tools/cmake/iree_cc_binary.cmake
+++ b/build_tools/cmake/iree_cc_binary.cmake
@@ -62,28 +62,35 @@
# Prefix the library with the package name, so we get: iree_package_name
iree_package_name(_PACKAGE_NAME)
iree_package_ns(_PACKAGE_NS)
- set(_NAME "${_PACKAGE_NAME}_${_RULE_NAME}")
-
- add_executable(${_NAME} "")
- # Alias the iree_package_name binary to iree::package::name.
- # This lets us more clearly map to Bazel and makes it possible to
- # disambiguate the underscores in paths vs. the separators.
- add_executable(${_PACKAGE_NS}::${_RULE_NAME} ALIAS ${_NAME})
-
- # If the binary name matches the package then treat it as a default. For
- # example, foo/bar/ library 'bar' would end up as 'foo::bar'. This isn't
- # likely to be common for binaries, but is consistent with the behavior for
- # libraries and in Bazel.
- iree_package_dir(_PACKAGE_DIR)
- if(${_RULE_NAME} STREQUAL ${_PACKAGE_DIR})
- add_executable(${_PACKAGE_NS} ALIAS ${_NAME})
+ if("${_PACKAGE_NAME}" STREQUAL "")
+ set(_NAME "${_RULE_NAME}")
+ else()
+ set(_NAME "${_PACKAGE_NAME}_${_RULE_NAME}")
endif()
- # Finally, since we have so few binaries and we also want to support
- # installing from a separate host build, binaries get an unqualified global
- # alias. This means binary names must be unique across the whole project.
- # (We could consider making this configurable).
- add_executable(${_RULE_NAME} ALIAS ${_NAME})
+ add_executable(${_NAME} "")
+
+ if(NOT "${_PACKAGE_NS}" STREQUAL "")
+ # Alias the iree_package_name binary to iree::package::name.
+ # This lets us more clearly map to Bazel and makes it possible to
+ # disambiguate the underscores in paths vs. the separators.
+ add_executable(${_PACKAGE_NS}::${_RULE_NAME} ALIAS ${_NAME})
+
+ # If the binary name matches the package then treat it as a default. For
+ # example, foo/bar/ library 'bar' would end up as 'foo::bar'. This isn't
+ # likely to be common for binaries, but is consistent with the behavior for
+ # libraries and in Bazel.
+ iree_package_dir(_PACKAGE_DIR)
+ if("${_RULE_NAME}" STREQUAL "${_PACKAGE_DIR}")
+ add_executable(${_PACKAGE_NS} ALIAS ${_NAME})
+ endif()
+
+ # Finally, since we have so few binaries and we also want to support
+ # installing from a separate host build, binaries get an unqualified global
+ # alias. This means binary names must be unique across the whole project.
+ # (We could consider making this configurable).
+ add_executable(${_RULE_NAME} ALIAS ${_NAME})
+ endif()
set_target_properties(${_NAME} PROPERTIES OUTPUT_NAME "${_RULE_NAME}")
if(_RULE_SRCS)
diff --git a/build_tools/cmake/iree_cc_library.cmake b/build_tools/cmake/iree_cc_library.cmake
index 4a9a9c2..af4d639 100644
--- a/build_tools/cmake/iree_cc_library.cmake
+++ b/build_tools/cmake/iree_cc_library.cmake
@@ -232,12 +232,14 @@
# disambiguate the underscores in paths vs. the separators.
add_library(${_PACKAGE_NS}::${_RULE_NAME} ALIAS ${_NAME})
- # If the library name matches the final component of the package then treat
- # it as a default. For example, foo/bar/ library 'bar' would end up as
- # 'foo::bar'.
- iree_package_dir(_PACKAGE_DIR)
- if(${_RULE_NAME} STREQUAL ${_PACKAGE_DIR})
- add_library(${_PACKAGE_NS} ALIAS ${_NAME})
+ if(NOT "${_PACKAGE_NS}" STREQUAL "")
+ # If the library name matches the final component of the package then treat
+ # it as a default. For example, foo/bar/ library 'bar' would end up as
+ # 'foo::bar'.
+ iree_package_dir(_PACKAGE_DIR)
+ if(${_RULE_NAME} STREQUAL ${_PACKAGE_DIR})
+ add_library(${_PACKAGE_NS} ALIAS ${_NAME})
+ endif()
endif()
endfunction()
diff --git a/build_tools/cmake/iree_check_test.cmake b/build_tools/cmake/iree_check_test.cmake
index 7c106d5..b778ea2 100644
--- a/build_tools/cmake/iree_check_test.cmake
+++ b/build_tools/cmake/iree_check_test.cmake
@@ -161,7 +161,7 @@
"${_MODULE_FILE_NAME}"
)
- set(_RUNNER_TARGET "iree_tools_iree-check-module")
+ set(_RUNNER_TARGET "iree-check-module")
# A target specifically for the test. We could combine this with the above,
# but we want that one to get pulled into iree_bytecode_module.
diff --git a/build_tools/cmake/iree_macros.cmake b/build_tools/cmake/iree_macros.cmake
index debe853..e3e38f2 100644
--- a/build_tools/cmake/iree_macros.cmake
+++ b/build_tools/cmake/iree_macros.cmake
@@ -80,14 +80,15 @@
set(_PACKAGE "iree::samples::${CMAKE_MATCH_1}")
elseif(_RELATIVE_PATH MATCHES "^samples$")
set(_PACKAGE "iree::samples")
+ elseif(_RELATIVE_PATH MATCHES "^tools$")
+ # tools/ -> "" (empty string), e.g. iree-opt -> iree-opt
+ set(_PACKAGE "")
else()
- # Default to pass-through. Examples:
- # iree/compiler/API
- # iree/tools
+ # Default to pass-through.
set(_PACKAGE "${_RELATIVE_PATH}")
endif()
- string(REPLACE "/" "::" _PACKAGE_NS ${_PACKAGE})
+ string(REPLACE "/" "::" _PACKAGE_NS "${_PACKAGE}")
if(_DEBUG_IREE_PACKAGE_NAME)
message(STATUS "iree_package_ns(): map ${_RELATIVE_PATH} -> ${_PACKAGE_NS}")
@@ -102,7 +103,7 @@
# iree_base
function(iree_package_name PACKAGE_NAME)
iree_package_ns(_PACKAGE_NS)
- string(REPLACE "::" "_" _PACKAGE_NAME ${_PACKAGE_NS})
+ string(REPLACE "::" "_" _PACKAGE_NAME "${_PACKAGE_NS}")
set(${PACKAGE_NAME} ${_PACKAGE_NAME} PARENT_SCOPE)
endfunction()
@@ -122,7 +123,7 @@
# base
function(iree_package_dir PACKAGE_DIR)
iree_package_ns(_PACKAGE_NS)
- string(FIND ${_PACKAGE_NS} "::" _END_OFFSET REVERSE)
+ string(FIND "${_PACKAGE_NS}" "::" _END_OFFSET REVERSE)
math(EXPR _END_OFFSET "${_END_OFFSET} + 2")
string(SUBSTRING ${_PACKAGE_NS} ${_END_OFFSET} -1 _PACKAGE_DIR)
set(${PACKAGE_DIR} ${_PACKAGE_DIR} PARENT_SCOPE)
diff --git a/build_tools/kokoro/gcp_ubuntu/cmake/linux/riscv64/test.sh b/build_tools/kokoro/gcp_ubuntu/cmake/linux/riscv64/test.sh
index 068a5da..ea88eee 100755
--- a/build_tools/kokoro/gcp_ubuntu/cmake/linux/riscv64/test.sh
+++ b/build_tools/kokoro/gcp_ubuntu/cmake/linux/riscv64/test.sh
@@ -56,7 +56,7 @@
}
generate_dylib_vmfb mhlo \
- "${ROOT_DIR?}/iree/tools/test/iree-run-module.mlir" \
+ "${ROOT_DIR?}/tools/test/iree-run-module.mlir" \
-o "${BUILD_RISCV_DIR?}/iree-run-module-llvm_aot.vmfb"
wget -P "${BUILD_RISCV_DIR?}/" https://github.com/tensorflow/tflite-micro/raw/aeac6f39e5c7475cea20c54e86d41e3a38312546/tensorflow/lite/micro/models/person_detect.tflite
diff --git a/build_tools/kokoro/gcp_ubuntu/cmake/linux/riscv64/tests/lit.cfg.py b/build_tools/kokoro/gcp_ubuntu/cmake/linux/riscv64/tests/lit.cfg.py
index 85d3695..1d13513 100644
--- a/build_tools/kokoro/gcp_ubuntu/cmake/linux/riscv64/tests/lit.cfg.py
+++ b/build_tools/kokoro/gcp_ubuntu/cmake/linux/riscv64/tests/lit.cfg.py
@@ -20,7 +20,7 @@
(os.getenv("QEMU_RV64_BIN"), os.getenv("RISCV_TOOLCHAIN_ROOT")))
config.environment["TEST_MODULE_CMD"] = (
- "%s %s/iree/tools/iree-run-module --driver=dylib" %
+ "%s %s/tools/iree-run-module --driver=dylib" %
(config.environment["TEST_CMD"], os.getenv("BUILD_RISCV_DIR")))
config.test_exec_root = os.getenv("BUILD_RISCV_DIR") + \
diff --git a/compiler/src/iree/compiler/Bindings/Native/Transforms/test/BUILD b/compiler/src/iree/compiler/Bindings/Native/Transforms/test/BUILD
index 13368df..58505b7 100644
--- a/compiler/src/iree/compiler/Bindings/Native/Transforms/test/BUILD
+++ b/compiler/src/iree/compiler/Bindings/Native/Transforms/test/BUILD
@@ -23,7 +23,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Bindings/Native/Transforms/test/CMakeLists.txt b/compiler/src/iree/compiler/Bindings/Native/Transforms/test/CMakeLists.txt
index 0b1ef96..206d72f 100644
--- a/compiler/src/iree/compiler/Bindings/Native/Transforms/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Bindings/Native/Transforms/test/CMakeLists.txt
@@ -17,7 +17,7 @@
"wrap_entry_points.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Bindings/TFLite/Transforms/test/BUILD b/compiler/src/iree/compiler/Bindings/TFLite/Transforms/test/BUILD
index 11165a7..e006180 100644
--- a/compiler/src/iree/compiler/Bindings/TFLite/Transforms/test/BUILD
+++ b/compiler/src/iree/compiler/Bindings/TFLite/Transforms/test/BUILD
@@ -23,7 +23,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Bindings/TFLite/Transforms/test/CMakeLists.txt b/compiler/src/iree/compiler/Bindings/TFLite/Transforms/test/CMakeLists.txt
index a8a67ec..6142c35 100644
--- a/compiler/src/iree/compiler/Bindings/TFLite/Transforms/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Bindings/TFLite/Transforms/test/CMakeLists.txt
@@ -17,7 +17,7 @@
"wrap_entry_points.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Codegen/Common/test/BUILD b/compiler/src/iree/compiler/Codegen/Common/test/BUILD
index af8b15d..f44b137 100644
--- a/compiler/src/iree/compiler/Codegen/Common/test/BUILD
+++ b/compiler/src/iree/compiler/Codegen/Common/test/BUILD
@@ -46,7 +46,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Codegen/Common/test/CMakeLists.txt b/compiler/src/iree/compiler/Codegen/Common/test/CMakeLists.txt
index 4699dd3..b71a981 100644
--- a/compiler/src/iree/compiler/Codegen/Common/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Codegen/Common/test/CMakeLists.txt
@@ -38,7 +38,7 @@
"vectorize_linalg_mmt4d.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Codegen/Dialect/test/BUILD b/compiler/src/iree/compiler/Codegen/Dialect/test/BUILD
index 71b440e..27e94c0 100644
--- a/compiler/src/iree/compiler/Codegen/Dialect/test/BUILD
+++ b/compiler/src/iree/compiler/Codegen/Dialect/test/BUILD
@@ -25,7 +25,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Codegen/Dialect/test/CMakeLists.txt b/compiler/src/iree/compiler/Codegen/Dialect/test/CMakeLists.txt
index 425fc66..42e5184 100644
--- a/compiler/src/iree/compiler/Codegen/Dialect/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Codegen/Dialect/test/CMakeLists.txt
@@ -17,7 +17,7 @@
"lowering_config_attr.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Codegen/LLVMCPU/test/BUILD b/compiler/src/iree/compiler/Codegen/LLVMCPU/test/BUILD
index fb0a509..a39f6cd 100644
--- a/compiler/src/iree/compiler/Codegen/LLVMCPU/test/BUILD
+++ b/compiler/src/iree/compiler/Codegen/LLVMCPU/test/BUILD
@@ -48,8 +48,8 @@
cfg = "//compiler:lit.cfg.py",
data = ["linalg_transform_spec.mlir"],
tools = [
- "//iree/tools:iree-compile",
- "//iree/tools:iree-opt",
+ "//tools:iree-compile",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Codegen/LLVMCPU/test/CMakeLists.txt b/compiler/src/iree/compiler/Codegen/LLVMCPU/test/CMakeLists.txt
index 160817f..bc04b2c 100644
--- a/compiler/src/iree/compiler/Codegen/LLVMCPU/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Codegen/LLVMCPU/test/CMakeLists.txt
@@ -35,8 +35,8 @@
"verify_linalg_transform_legality.mlir"
TOOLS
FileCheck
- iree::tools::iree-compile
- iree::tools::iree-opt
+ iree-compile
+ iree-opt
DATA
linalg_transform_spec.mlir
)
diff --git a/compiler/src/iree/compiler/Codegen/LLVMGPU/test/BUILD b/compiler/src/iree/compiler/Codegen/LLVMGPU/test/BUILD
index c83ad09..182722f 100644
--- a/compiler/src/iree/compiler/Codegen/LLVMGPU/test/BUILD
+++ b/compiler/src/iree/compiler/Codegen/LLVMGPU/test/BUILD
@@ -37,7 +37,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Codegen/LLVMGPU/test/CMakeLists.txt b/compiler/src/iree/compiler/Codegen/LLVMGPU/test/CMakeLists.txt
index f10987b..a17c533 100644
--- a/compiler/src/iree/compiler/Codegen/LLVMGPU/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Codegen/LLVMGPU/test/CMakeLists.txt
@@ -29,7 +29,7 @@
"vectorization.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Codegen/SPIRV/test/BUILD b/compiler/src/iree/compiler/Codegen/SPIRV/test/BUILD
index c7baf06..110b0e9 100644
--- a/compiler/src/iree/compiler/Codegen/SPIRV/test/BUILD
+++ b/compiler/src/iree/compiler/Codegen/SPIRV/test/BUILD
@@ -52,7 +52,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Codegen/SPIRV/test/CMakeLists.txt b/compiler/src/iree/compiler/Codegen/SPIRV/test/CMakeLists.txt
index d6809d0..4286d4e 100644
--- a/compiler/src/iree/compiler/Codegen/SPIRV/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Codegen/SPIRV/test/CMakeLists.txt
@@ -44,7 +44,7 @@
"vectorize_tensor_pad.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Codegen/Sandbox/test/BUILD b/compiler/src/iree/compiler/Codegen/Sandbox/test/BUILD
index 9ce3255..d23c02b 100644
--- a/compiler/src/iree/compiler/Codegen/Sandbox/test/BUILD
+++ b/compiler/src/iree/compiler/Codegen/Sandbox/test/BUILD
@@ -28,7 +28,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Codegen/Sandbox/test/CMakeLists.txt b/compiler/src/iree/compiler/Codegen/Sandbox/test/CMakeLists.txt
index 951f63b..ac16be2 100644
--- a/compiler/src/iree/compiler/Codegen/Sandbox/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Codegen/Sandbox/test/CMakeLists.txt
@@ -20,7 +20,7 @@
"unroll_one_vector_op.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/ConstEval/test/BUILD b/compiler/src/iree/compiler/ConstEval/test/BUILD
index a6d0586..23a656e 100644
--- a/compiler/src/iree/compiler/ConstEval/test/BUILD
+++ b/compiler/src/iree/compiler/ConstEval/test/BUILD
@@ -23,7 +23,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/ConstEval/test/CMakeLists.txt b/compiler/src/iree/compiler/ConstEval/test/CMakeLists.txt
index 692278b..5495edb 100644
--- a/compiler/src/iree/compiler/ConstEval/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/ConstEval/test/CMakeLists.txt
@@ -17,7 +17,7 @@
"jit_globals.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/Flow/Conversion/TensorToFlow/test/BUILD b/compiler/src/iree/compiler/Dialect/Flow/Conversion/TensorToFlow/test/BUILD
index 9b2acc3..3012440 100644
--- a/compiler/src/iree/compiler/Dialect/Flow/Conversion/TensorToFlow/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/Flow/Conversion/TensorToFlow/test/BUILD
@@ -29,7 +29,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/Flow/Conversion/TensorToFlow/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Flow/Conversion/TensorToFlow/test/CMakeLists.txt
index ae0fe33..b797b99 100644
--- a/compiler/src/iree/compiler/Dialect/Flow/Conversion/TensorToFlow/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/Flow/Conversion/TensorToFlow/test/CMakeLists.txt
@@ -23,7 +23,7 @@
"reshape.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/Flow/IR/test/BUILD b/compiler/src/iree/compiler/Dialect/Flow/IR/test/BUILD
index f539d7c..18f3710 100644
--- a/compiler/src/iree/compiler/Dialect/Flow/IR/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/Flow/IR/test/BUILD
@@ -30,7 +30,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/Flow/IR/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Flow/IR/test/CMakeLists.txt
index 45d93f9..6c5df6e 100644
--- a/compiler/src/iree/compiler/Dialect/Flow/IR/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/Flow/IR/test/CMakeLists.txt
@@ -24,7 +24,7 @@
"types.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/Flow/Transforms/test/BUILD b/compiler/src/iree/compiler/Dialect/Flow/Transforms/test/BUILD
index 8191b5b..6666390 100644
--- a/compiler/src/iree/compiler/Dialect/Flow/Transforms/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/Flow/Transforms/test/BUILD
@@ -46,7 +46,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/Flow/Transforms/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Flow/Transforms/test/CMakeLists.txt
index a2c9883..7e5bf4d 100644
--- a/compiler/src/iree/compiler/Dialect/Flow/Transforms/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/Flow/Transforms/test/CMakeLists.txt
@@ -40,7 +40,7 @@
"verify_input_ir.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Conversion/HALToVM/test/BUILD b/compiler/src/iree/compiler/Dialect/HAL/Conversion/HALToVM/test/BUILD
index 3990651..6aa15a0 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Conversion/HALToVM/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/HAL/Conversion/HALToVM/test/BUILD
@@ -28,7 +28,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Conversion/HALToVM/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/HAL/Conversion/HALToVM/test/CMakeLists.txt
index cb32978..040fcd0 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Conversion/HALToVM/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/HAL/Conversion/HALToVM/test/CMakeLists.txt
@@ -22,7 +22,7 @@
"executable_ops.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Conversion/StandardToHAL/test/BUILD b/compiler/src/iree/compiler/Dialect/HAL/Conversion/StandardToHAL/test/BUILD
index bbc5501..06cbeb3 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Conversion/StandardToHAL/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/HAL/Conversion/StandardToHAL/test/BUILD
@@ -24,7 +24,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Conversion/StandardToHAL/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/HAL/Conversion/StandardToHAL/test/CMakeLists.txt
index a98e462..e1f8b88 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Conversion/StandardToHAL/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/HAL/Conversion/StandardToHAL/test/CMakeLists.txt
@@ -18,7 +18,7 @@
"structural_ops.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Conversion/StreamToHAL/test/BUILD b/compiler/src/iree/compiler/Dialect/HAL/Conversion/StreamToHAL/test/BUILD
index f360613..2f98b66 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Conversion/StreamToHAL/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/HAL/Conversion/StreamToHAL/test/BUILD
@@ -26,7 +26,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Conversion/StreamToHAL/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/HAL/Conversion/StreamToHAL/test/CMakeLists.txt
index b2ef2cd..daf243b 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Conversion/StreamToHAL/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/HAL/Conversion/StreamToHAL/test/CMakeLists.txt
@@ -20,7 +20,7 @@
"transfer_ops.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Conversion/UtilToHAL/test/BUILD b/compiler/src/iree/compiler/Dialect/HAL/Conversion/UtilToHAL/test/BUILD
index 9030265..b600064 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Conversion/UtilToHAL/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/HAL/Conversion/UtilToHAL/test/BUILD
@@ -21,7 +21,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Conversion/UtilToHAL/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/HAL/Conversion/UtilToHAL/test/CMakeLists.txt
index 3286697..80fe0fb 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Conversion/UtilToHAL/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/HAL/Conversion/UtilToHAL/test/CMakeLists.txt
@@ -17,7 +17,7 @@
"global_ops.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/HAL/IR/BUILD b/compiler/src/iree/compiler/Dialect/HAL/IR/BUILD
index 6caaaa3..849f2b7 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/IR/BUILD
+++ b/compiler/src/iree/compiler/Dialect/HAL/IR/BUILD
@@ -169,7 +169,7 @@
"HALStructs.cpp.inc",
),
],
- tblgen = "//iree/tools:iree-tblgen",
+ tblgen = "//tools:iree-tblgen",
td_file = "HALBase.td",
deps = [":td_files"],
)
diff --git a/compiler/src/iree/compiler/Dialect/HAL/IR/test/BUILD b/compiler/src/iree/compiler/Dialect/HAL/IR/test/BUILD
index d0d01e2..9c8f248 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/IR/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/HAL/IR/test/BUILD
@@ -39,7 +39,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/HAL/IR/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/HAL/IR/test/CMakeLists.txt
index a603ae1..f6a0d5b 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/IR/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/HAL/IR/test/CMakeLists.txt
@@ -33,7 +33,7 @@
"tensor_ops.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Target/CUDA/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/HAL/Target/CUDA/test/CMakeLists.txt
index f9a5046..f0b6c33 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Target/CUDA/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/HAL/Target/CUDA/test/CMakeLists.txt
@@ -13,5 +13,5 @@
"smoketest.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/test/BUILD b/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/test/BUILD
index cf1fe6e..de950d8 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/test/BUILD
@@ -23,7 +23,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//lld",
"@llvm-project//llvm:FileCheck",
],
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/test/CMakeLists.txt
index 6bc1f36..3249879 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/test/CMakeLists.txt
@@ -18,7 +18,7 @@
TOOLS
${IREE_LLD_TARGET}
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Target/MetalSPIRV/test/BUILD b/compiler/src/iree/compiler/Dialect/HAL/Target/MetalSPIRV/test/BUILD
index d8d6533..94c35ae 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Target/MetalSPIRV/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/HAL/Target/MetalSPIRV/test/BUILD
@@ -21,7 +21,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Target/MetalSPIRV/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/HAL/Target/MetalSPIRV/test/CMakeLists.txt
index 80041f5..f083a82 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Target/MetalSPIRV/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/HAL/Target/MetalSPIRV/test/CMakeLists.txt
@@ -17,7 +17,7 @@
"smoketest.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Target/ROCM/test/BUILD b/compiler/src/iree/compiler/Dialect/HAL/Target/ROCM/test/BUILD
index d8d6533..94c35ae 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Target/ROCM/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/HAL/Target/ROCM/test/BUILD
@@ -21,7 +21,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Target/ROCM/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/HAL/Target/ROCM/test/CMakeLists.txt
index 2932bd5..c193f55 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Target/ROCM/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/HAL/Target/ROCM/test/CMakeLists.txt
@@ -17,7 +17,7 @@
"smoketest.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Target/VMVX/test/BUILD b/compiler/src/iree/compiler/Dialect/HAL/Target/VMVX/test/BUILD
index adedc33..4248287 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Target/VMVX/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/HAL/Target/VMVX/test/BUILD
@@ -24,7 +24,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Target/VMVX/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/HAL/Target/VMVX/test/CMakeLists.txt
index 3330509..9105b0e 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Target/VMVX/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/HAL/Target/VMVX/test/CMakeLists.txt
@@ -18,7 +18,7 @@
"smoketest.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Target/VulkanSPIRV/test/BUILD b/compiler/src/iree/compiler/Dialect/HAL/Target/VulkanSPIRV/test/BUILD
index bd108b6..f837586 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Target/VulkanSPIRV/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/HAL/Target/VulkanSPIRV/test/BUILD
@@ -24,7 +24,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Target/VulkanSPIRV/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/HAL/Target/VulkanSPIRV/test/CMakeLists.txt
index 948a497..3ef7672 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Target/VulkanSPIRV/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/HAL/Target/VulkanSPIRV/test/CMakeLists.txt
@@ -18,7 +18,7 @@
"smoketest.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Transforms/test/BUILD b/compiler/src/iree/compiler/Dialect/HAL/Transforms/test/BUILD
index 676a847..f30fa49 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Transforms/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/HAL/Transforms/test/BUILD
@@ -34,7 +34,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Transforms/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/HAL/Transforms/test/CMakeLists.txt
index b6e72c6..fba06a9 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Transforms/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/HAL/Transforms/test/CMakeLists.txt
@@ -28,7 +28,7 @@
"verify_target_environment.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/Modules/Check/test/BUILD b/compiler/src/iree/compiler/Dialect/Modules/Check/test/BUILD
index 9a34a48..d2155f2 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/Check/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/Modules/Check/test/BUILD
@@ -24,7 +24,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/Modules/Check/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Modules/Check/test/CMakeLists.txt
index 12bb0a1..cc9886d 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/Check/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/Modules/Check/test/CMakeLists.txt
@@ -18,7 +18,7 @@
"ops.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/Modules/VMVX/Conversion/HALToVMVX/test/BUILD b/compiler/src/iree/compiler/Dialect/Modules/VMVX/Conversion/HALToVMVX/test/BUILD
index f2fea6b..e303bc2 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/VMVX/Conversion/HALToVMVX/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/Modules/VMVX/Conversion/HALToVMVX/test/BUILD
@@ -21,7 +21,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/Modules/VMVX/Conversion/HALToVMVX/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Modules/VMVX/Conversion/HALToVMVX/test/CMakeLists.txt
index 13bae78..264ea79 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/VMVX/Conversion/HALToVMVX/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/Modules/VMVX/Conversion/HALToVMVX/test/CMakeLists.txt
@@ -17,7 +17,7 @@
"interface_ops.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/Modules/VMVX/Conversion/StandardToVMVX/test/BUILD b/compiler/src/iree/compiler/Dialect/Modules/VMVX/Conversion/StandardToVMVX/test/BUILD
index 13ee77b..4a71893 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/VMVX/Conversion/StandardToVMVX/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/Modules/VMVX/Conversion/StandardToVMVX/test/BUILD
@@ -22,7 +22,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/Modules/VMVX/Conversion/StandardToVMVX/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Modules/VMVX/Conversion/StandardToVMVX/test/CMakeLists.txt
index 4665519..0305e25 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/VMVX/Conversion/StandardToVMVX/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/Modules/VMVX/Conversion/StandardToVMVX/test/CMakeLists.txt
@@ -15,7 +15,7 @@
lit
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/Modules/VMVX/Conversion/VMVXToVM/test/BUILD b/compiler/src/iree/compiler/Dialect/Modules/VMVX/Conversion/VMVXToVM/test/BUILD
index 13ee77b..4a71893 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/VMVX/Conversion/VMVXToVM/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/Modules/VMVX/Conversion/VMVXToVM/test/BUILD
@@ -22,7 +22,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/Modules/VMVX/Conversion/VMVXToVM/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Modules/VMVX/Conversion/VMVXToVM/test/CMakeLists.txt
index 92a7315..0590898 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/VMVX/Conversion/VMVXToVM/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/Modules/VMVX/Conversion/VMVXToVM/test/CMakeLists.txt
@@ -15,7 +15,7 @@
lit
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/Modules/VMVX/IR/test/BUILD b/compiler/src/iree/compiler/Dialect/Modules/VMVX/IR/test/BUILD
index 13ee77b..4a71893 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/VMVX/IR/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/Modules/VMVX/IR/test/BUILD
@@ -22,7 +22,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/Modules/VMVX/IR/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Modules/VMVX/IR/test/CMakeLists.txt
index d42d125..faee920 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/VMVX/IR/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/Modules/VMVX/IR/test/CMakeLists.txt
@@ -15,7 +15,7 @@
lit
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/Modules/VMVX/Transforms/test/BUILD b/compiler/src/iree/compiler/Dialect/Modules/VMVX/Transforms/test/BUILD
index 13ee77b..4a71893 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/VMVX/Transforms/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/Modules/VMVX/Transforms/test/BUILD
@@ -22,7 +22,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/Modules/VMVX/Transforms/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Modules/VMVX/Transforms/test/CMakeLists.txt
index fede7d9..2d1146f 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/VMVX/Transforms/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/Modules/VMVX/Transforms/test/CMakeLists.txt
@@ -15,7 +15,7 @@
lit
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/Stream/Conversion/FlowToStream/test/BUILD b/compiler/src/iree/compiler/Dialect/Stream/Conversion/FlowToStream/test/BUILD
index f0ce2d0..0ff6b55 100644
--- a/compiler/src/iree/compiler/Dialect/Stream/Conversion/FlowToStream/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/Stream/Conversion/FlowToStream/test/BUILD
@@ -25,7 +25,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/Stream/Conversion/FlowToStream/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Stream/Conversion/FlowToStream/test/CMakeLists.txt
index c5ac6b0..82ea148 100644
--- a/compiler/src/iree/compiler/Dialect/Stream/Conversion/FlowToStream/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/Stream/Conversion/FlowToStream/test/CMakeLists.txt
@@ -19,7 +19,7 @@
"tensor_ops.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/Stream/Conversion/HALToStream/test/BUILD b/compiler/src/iree/compiler/Dialect/Stream/Conversion/HALToStream/test/BUILD
index 284ba63..98a0202 100644
--- a/compiler/src/iree/compiler/Dialect/Stream/Conversion/HALToStream/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/Stream/Conversion/HALToStream/test/BUILD
@@ -23,7 +23,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/Stream/Conversion/HALToStream/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Stream/Conversion/HALToStream/test/CMakeLists.txt
index e0e8d80..59524df 100644
--- a/compiler/src/iree/compiler/Dialect/Stream/Conversion/HALToStream/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/Stream/Conversion/HALToStream/test/CMakeLists.txt
@@ -17,7 +17,7 @@
"abi_ops.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/Stream/Conversion/StandardToStream/test/BUILD b/compiler/src/iree/compiler/Dialect/Stream/Conversion/StandardToStream/test/BUILD
index 2fd8b39..33aaef9 100644
--- a/compiler/src/iree/compiler/Dialect/Stream/Conversion/StandardToStream/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/Stream/Conversion/StandardToStream/test/BUILD
@@ -24,7 +24,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/Stream/Conversion/StandardToStream/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Stream/Conversion/StandardToStream/test/CMakeLists.txt
index 66bfa3c..996c665 100644
--- a/compiler/src/iree/compiler/Dialect/Stream/Conversion/StandardToStream/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/Stream/Conversion/StandardToStream/test/CMakeLists.txt
@@ -18,7 +18,7 @@
"structural_ops.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/Stream/Conversion/UtilToStream/test/BUILD b/compiler/src/iree/compiler/Dialect/Stream/Conversion/UtilToStream/test/BUILD
index 9030265..b600064 100644
--- a/compiler/src/iree/compiler/Dialect/Stream/Conversion/UtilToStream/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/Stream/Conversion/UtilToStream/test/BUILD
@@ -21,7 +21,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/Stream/Conversion/UtilToStream/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Stream/Conversion/UtilToStream/test/CMakeLists.txt
index b612078..8df683d 100644
--- a/compiler/src/iree/compiler/Dialect/Stream/Conversion/UtilToStream/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/Stream/Conversion/UtilToStream/test/CMakeLists.txt
@@ -17,7 +17,7 @@
"global_ops.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/Stream/IR/test/BUILD b/compiler/src/iree/compiler/Dialect/Stream/IR/test/BUILD
index d88ef66..80851bd 100644
--- a/compiler/src/iree/compiler/Dialect/Stream/IR/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/Stream/IR/test/BUILD
@@ -34,7 +34,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/Stream/IR/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Stream/IR/test/CMakeLists.txt
index 8e7df83..eb112be 100644
--- a/compiler/src/iree/compiler/Dialect/Stream/IR/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/Stream/IR/test/CMakeLists.txt
@@ -28,7 +28,7 @@
"timepoint_ops.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/Stream/Transforms/test/BUILD b/compiler/src/iree/compiler/Dialect/Stream/Transforms/test/BUILD
index fb85ac8..b46e40a 100644
--- a/compiler/src/iree/compiler/Dialect/Stream/Transforms/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/Stream/Transforms/test/BUILD
@@ -46,7 +46,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/Stream/Transforms/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Stream/Transforms/test/CMakeLists.txt
index ecb1bcd..0c41984 100644
--- a/compiler/src/iree/compiler/Dialect/Stream/Transforms/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/Stream/Transforms/test/CMakeLists.txt
@@ -40,7 +40,7 @@
"specialize_dispatches.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/Util/Conversion/test/BUILD b/compiler/src/iree/compiler/Dialect/Util/Conversion/test/BUILD
index 6bc164c..b038a21 100644
--- a/compiler/src/iree/compiler/Dialect/Util/Conversion/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/Util/Conversion/test/BUILD
@@ -21,7 +21,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/Util/Conversion/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Util/Conversion/test/CMakeLists.txt
index 9de890a..5ab00f7 100644
--- a/compiler/src/iree/compiler/Dialect/Util/Conversion/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/Util/Conversion/test/CMakeLists.txt
@@ -17,7 +17,7 @@
"hint_ops.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/Util/IR/test/BUILD b/compiler/src/iree/compiler/Dialect/Util/IR/test/BUILD
index 3221fa9..e1e720d 100644
--- a/compiler/src/iree/compiler/Dialect/Util/IR/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/Util/IR/test/BUILD
@@ -36,7 +36,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/Util/IR/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Util/IR/test/CMakeLists.txt
index 3867fab..52d0b5d 100644
--- a/compiler/src/iree/compiler/Dialect/Util/IR/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/Util/IR/test/CMakeLists.txt
@@ -30,7 +30,7 @@
"structural_ops.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/Util/Transforms/test/BUILD b/compiler/src/iree/compiler/Dialect/Util/Transforms/test/BUILD
index 1782a7d..81de2f1 100644
--- a/compiler/src/iree/compiler/Dialect/Util/Transforms/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/Util/Transforms/test/BUILD
@@ -37,7 +37,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/Util/Transforms/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Util/Transforms/test/CMakeLists.txt
index 3bd3253..a6f269d 100644
--- a/compiler/src/iree/compiler/Dialect/Util/Transforms/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/Util/Transforms/test/CMakeLists.txt
@@ -31,7 +31,7 @@
"test_float_range_analysis_linalg.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/VM/Analysis/test/BUILD b/compiler/src/iree/compiler/Dialect/VM/Analysis/test/BUILD
index 6065e78..a23a53b 100644
--- a/compiler/src/iree/compiler/Dialect/VM/Analysis/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/VM/Analysis/test/BUILD
@@ -24,7 +24,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/VM/Analysis/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/VM/Analysis/test/CMakeLists.txt
index d4148c8..482bfa5 100644
--- a/compiler/src/iree/compiler/Dialect/VM/Analysis/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/VM/Analysis/test/CMakeLists.txt
@@ -18,7 +18,7 @@
"value_liveness.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/VM/Conversion/MathToVM/test/BUILD b/compiler/src/iree/compiler/Dialect/VM/Conversion/MathToVM/test/BUILD
index 68297c5..1827206 100644
--- a/compiler/src/iree/compiler/Dialect/VM/Conversion/MathToVM/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/VM/Conversion/MathToVM/test/BUILD
@@ -23,7 +23,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/VM/Conversion/MathToVM/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/VM/Conversion/MathToVM/test/CMakeLists.txt
index ee6f360..35d70fc 100644
--- a/compiler/src/iree/compiler/Dialect/VM/Conversion/MathToVM/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/VM/Conversion/MathToVM/test/CMakeLists.txt
@@ -17,7 +17,7 @@
"arithmetic_ops.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/VM/Conversion/MemRefToVM/test/BUILD b/compiler/src/iree/compiler/Dialect/VM/Conversion/MemRefToVM/test/BUILD
index f295974..347d7e8 100644
--- a/compiler/src/iree/compiler/Dialect/VM/Conversion/MemRefToVM/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/VM/Conversion/MemRefToVM/test/BUILD
@@ -23,7 +23,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/VM/Conversion/MemRefToVM/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/VM/Conversion/MemRefToVM/test/CMakeLists.txt
index 5d6404c..98b9149 100644
--- a/compiler/src/iree/compiler/Dialect/VM/Conversion/MemRefToVM/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/VM/Conversion/MemRefToVM/test/CMakeLists.txt
@@ -17,7 +17,7 @@
"load_store_ops.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/VM/Conversion/StandardToVM/test/BUILD b/compiler/src/iree/compiler/Dialect/VM/Conversion/StandardToVM/test/BUILD
index ea5a03f..069d852 100644
--- a/compiler/src/iree/compiler/Dialect/VM/Conversion/StandardToVM/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/VM/Conversion/StandardToVM/test/BUILD
@@ -31,7 +31,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/VM/Conversion/StandardToVM/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/VM/Conversion/StandardToVM/test/CMakeLists.txt
index 1c6e9bd..385b9f6 100644
--- a/compiler/src/iree/compiler/Dialect/VM/Conversion/StandardToVM/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/VM/Conversion/StandardToVM/test/CMakeLists.txt
@@ -25,7 +25,7 @@
"structural_ops.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/VM/Conversion/UtilToVM/test/BUILD b/compiler/src/iree/compiler/Dialect/VM/Conversion/UtilToVM/test/BUILD
index 0318539..27719c3 100644
--- a/compiler/src/iree/compiler/Dialect/VM/Conversion/UtilToVM/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/VM/Conversion/UtilToVM/test/BUILD
@@ -28,7 +28,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/VM/Conversion/UtilToVM/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/VM/Conversion/UtilToVM/test/CMakeLists.txt
index 6aa4565..87d26f8 100644
--- a/compiler/src/iree/compiler/Dialect/VM/Conversion/UtilToVM/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/VM/Conversion/UtilToVM/test/CMakeLists.txt
@@ -22,7 +22,7 @@
"status_ops.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/VM/Conversion/VMToEmitC/test/BUILD b/compiler/src/iree/compiler/Dialect/VM/Conversion/VMToEmitC/test/BUILD
index dd260ec..8670397 100644
--- a/compiler/src/iree/compiler/Dialect/VM/Conversion/VMToEmitC/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/VM/Conversion/VMToEmitC/test/BUILD
@@ -56,7 +56,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/VM/Conversion/VMToEmitC/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/VM/Conversion/VMToEmitC/test/CMakeLists.txt
index f9cd1f1..1706fd3 100644
--- a/compiler/src/iree/compiler/Dialect/VM/Conversion/VMToEmitC/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/VM/Conversion/VMToEmitC/test/CMakeLists.txt
@@ -45,7 +45,7 @@
"type_conversion.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/VM/IR/BUILD b/compiler/src/iree/compiler/Dialect/VM/IR/BUILD
index d74b50a..7bd1227 100644
--- a/compiler/src/iree/compiler/Dialect/VM/IR/BUILD
+++ b/compiler/src/iree/compiler/Dialect/VM/IR/BUILD
@@ -123,7 +123,7 @@
"VMOpEncoder.cpp.inc",
),
],
- tblgen = "//iree/tools:iree-tblgen",
+ tblgen = "//tools:iree-tblgen",
td_file = "VMOps.td",
deps = [":td_files"],
)
@@ -157,7 +157,7 @@
"VMStructs.cpp.inc",
),
],
- tblgen = "//iree/tools:iree-tblgen",
+ tblgen = "//tools:iree-tblgen",
td_file = "VMBase.td",
deps = [":td_files"],
)
diff --git a/compiler/src/iree/compiler/Dialect/VM/IR/test/BUILD b/compiler/src/iree/compiler/Dialect/VM/IR/test/BUILD
index 7508265..69e3bf4 100644
--- a/compiler/src/iree/compiler/Dialect/VM/IR/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/VM/IR/test/BUILD
@@ -43,7 +43,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/VM/IR/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/VM/IR/test/CMakeLists.txt
index f10f8ac..28d8ba2 100644
--- a/compiler/src/iree/compiler/Dialect/VM/IR/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/VM/IR/test/CMakeLists.txt
@@ -37,7 +37,7 @@
"structural_ops.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/VM/Target/Bytecode/test/BUILD b/compiler/src/iree/compiler/Dialect/VM/Target/Bytecode/test/BUILD
index 5d11508..09ae599 100644
--- a/compiler/src/iree/compiler/Dialect/VM/Target/Bytecode/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/VM/Target/Bytecode/test/BUILD
@@ -25,7 +25,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-translate",
+ "//tools:iree-translate",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/VM/Target/Bytecode/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/VM/Target/Bytecode/test/CMakeLists.txt
index 288b1be..c34074c 100644
--- a/compiler/src/iree/compiler/Dialect/VM/Target/Bytecode/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/VM/Target/Bytecode/test/CMakeLists.txt
@@ -19,7 +19,7 @@
"reflection_attrs.mlir"
TOOLS
FileCheck
- iree::tools::iree-translate
+ iree-translate
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/VM/Target/C/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/VM/Target/C/test/CMakeLists.txt
index d6263eb..887db5c 100644
--- a/compiler/src/iree/compiler/Dialect/VM/Target/C/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/VM/Target/C/test/CMakeLists.txt
@@ -14,5 +14,5 @@
"${_GLOB_X_MLIR}"
TOOLS
FileCheck
- iree::tools::iree-translate
+ iree-translate
)
diff --git a/compiler/src/iree/compiler/Dialect/VM/Transforms/test/BUILD b/compiler/src/iree/compiler/Dialect/VM/Transforms/test/BUILD
index aeb7172..7d81db8 100644
--- a/compiler/src/iree/compiler/Dialect/VM/Transforms/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/VM/Transforms/test/BUILD
@@ -28,7 +28,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/VM/Transforms/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/VM/Transforms/test/CMakeLists.txt
index 6139f3d..f0cb3bf 100644
--- a/compiler/src/iree/compiler/Dialect/VM/Transforms/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/VM/Transforms/test/CMakeLists.txt
@@ -22,7 +22,7 @@
"sink_defining_ops.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/Vulkan/IR/test/BUILD b/compiler/src/iree/compiler/Dialect/Vulkan/IR/test/BUILD
index e131e45..fbb0f21 100644
--- a/compiler/src/iree/compiler/Dialect/Vulkan/IR/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/Vulkan/IR/test/BUILD
@@ -21,7 +21,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/Vulkan/IR/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Vulkan/IR/test/CMakeLists.txt
index c0ed980..1c9bea4 100644
--- a/compiler/src/iree/compiler/Dialect/Vulkan/IR/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/Vulkan/IR/test/CMakeLists.txt
@@ -17,7 +17,7 @@
"target_env.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/Vulkan/Utils/test/BUILD b/compiler/src/iree/compiler/Dialect/Vulkan/Utils/test/BUILD
index 3709c87..3eeb01c 100644
--- a/compiler/src/iree/compiler/Dialect/Vulkan/Utils/test/BUILD
+++ b/compiler/src/iree/compiler/Dialect/Vulkan/Utils/test/BUILD
@@ -32,7 +32,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Dialect/Vulkan/Utils/test/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Vulkan/Utils/test/CMakeLists.txt
index cc4062a..49a6498 100644
--- a/compiler/src/iree/compiler/Dialect/Vulkan/Utils/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Dialect/Vulkan/Utils/test/CMakeLists.txt
@@ -21,7 +21,7 @@
"target_env_conversion.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/InputConversion/Common/test/BUILD b/compiler/src/iree/compiler/InputConversion/Common/test/BUILD
index 54c6711..a3eedd7 100644
--- a/compiler/src/iree/compiler/InputConversion/Common/test/BUILD
+++ b/compiler/src/iree/compiler/InputConversion/Common/test/BUILD
@@ -28,7 +28,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/InputConversion/Common/test/CMakeLists.txt b/compiler/src/iree/compiler/InputConversion/Common/test/CMakeLists.txt
index ab3b248..936595d 100644
--- a/compiler/src/iree/compiler/InputConversion/Common/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/InputConversion/Common/test/CMakeLists.txt
@@ -20,7 +20,7 @@
"top_level_scf_to_cfg.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/InputConversion/MHLO/test/BUILD b/compiler/src/iree/compiler/InputConversion/MHLO/test/BUILD
index 50582c5..96befb7 100644
--- a/compiler/src/iree/compiler/InputConversion/MHLO/test/BUILD
+++ b/compiler/src/iree/compiler/InputConversion/MHLO/test/BUILD
@@ -36,7 +36,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/InputConversion/MHLO/test/CMakeLists.txt b/compiler/src/iree/compiler/InputConversion/MHLO/test/CMakeLists.txt
index 1d7a367..da1f66d 100644
--- a/compiler/src/iree/compiler/InputConversion/MHLO/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/InputConversion/MHLO/test/CMakeLists.txt
@@ -28,7 +28,7 @@
"verify_compiler_mhlo_input_legality.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/InputConversion/TMTensor/test/BUILD b/compiler/src/iree/compiler/InputConversion/TMTensor/test/BUILD
index 44586cd..3e6ae41 100644
--- a/compiler/src/iree/compiler/InputConversion/TMTensor/test/BUILD
+++ b/compiler/src/iree/compiler/InputConversion/TMTensor/test/BUILD
@@ -34,7 +34,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/InputConversion/TMTensor/test/CMakeLists.txt b/compiler/src/iree/compiler/InputConversion/TMTensor/test/CMakeLists.txt
index c14be54..4fc4be4 100644
--- a/compiler/src/iree/compiler/InputConversion/TMTensor/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/InputConversion/TMTensor/test/CMakeLists.txt
@@ -21,7 +21,7 @@
"convert_tm_tensor_to_linalg_ext.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/InputConversion/TOSA/test/BUILD b/compiler/src/iree/compiler/InputConversion/TOSA/test/BUILD
index 7bc7784..14b9191 100644
--- a/compiler/src/iree/compiler/InputConversion/TOSA/test/BUILD
+++ b/compiler/src/iree/compiler/InputConversion/TOSA/test/BUILD
@@ -25,7 +25,7 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/InputConversion/TOSA/test/CMakeLists.txt b/compiler/src/iree/compiler/InputConversion/TOSA/test/CMakeLists.txt
index 079af4a..d2b57da 100644
--- a/compiler/src/iree/compiler/InputConversion/TOSA/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/InputConversion/TOSA/test/CMakeLists.txt
@@ -17,7 +17,7 @@
"verify_compiler_tosa_input_legality.mlir"
TOOLS
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Translation/test/BUILD b/compiler/src/iree/compiler/Translation/test/BUILD
index 506a27a..51f6dd7 100644
--- a/compiler/src/iree/compiler/Translation/test/BUILD
+++ b/compiler/src/iree/compiler/Translation/test/BUILD
@@ -27,8 +27,8 @@
),
cfg = "//compiler:lit.cfg.py",
tools = [
- "//iree/tools:iree-compile",
- "//iree/tools:iree-translate",
+ "//tools:iree-compile",
+ "//tools:iree-translate",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/compiler/src/iree/compiler/Translation/test/CMakeLists.txt b/compiler/src/iree/compiler/Translation/test/CMakeLists.txt
index afc5155..e0a58f3 100644
--- a/compiler/src/iree/compiler/Translation/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Translation/test/CMakeLists.txt
@@ -19,8 +19,8 @@
"streams.mlir"
TOOLS
FileCheck
- iree::tools::iree-compile
- iree::tools::iree-translate
+ iree-compile
+ iree-translate
)
### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/docs/developers/design_docs/cuda_backend.md b/docs/developers/design_docs/cuda_backend.md
index 71c59df..5216126 100644
--- a/docs/developers/design_docs/cuda_backend.md
+++ b/docs/developers/design_docs/cuda_backend.md
@@ -75,7 +75,7 @@
```shell
# First translate into a VM bytecode module.
-$ ../iree-build/iree/tools/iree-compile \
+$ ../iree-build/tools/iree-compile \
--iree-input-type=mhlo \
--iree-mlir-to-vm-bytecode-module \
--iree-hal-target-backends=cuda \
@@ -83,7 +83,7 @@
-o /tmp/mhlo-add.vmfb
# Run the module through CUDA HAL backend.
-$ ../iree-build/iree/tools/iree-run-module \
+$ ../iree-build/tools/iree-run-module \
--driver=cuda \
--module_file=/tmp/mhlo-add.vmfb \
--entry_function=add \
diff --git a/docs/developers/developing_iree/benchmarking.md b/docs/developers/developing_iree/benchmarking.md
index 2f78b64..82c5721 100644
--- a/docs/developers/developing_iree/benchmarking.md
+++ b/docs/developers/developing_iree/benchmarking.md
@@ -19,7 +19,7 @@
To use `iree-benchmark-module`, generate an IREE module for the target backend:
```shell
-$ bazel run //iree/tools:iree-compile -- \
+$ bazel run //tools:iree-compile -- \
--iree-mlir-to-vm-bytecode-module \
--iree-hal-target-backends=vmvx \
$PWD/samples/models/simple_abs.mlir \
@@ -29,7 +29,7 @@
and then benchmark an exported function in that module:
```shell
-$ bazel run //iree/tools:iree-benchmark-module -- \
+$ bazel run //tools:iree-benchmark-module -- \
--module_file=/tmp/module.fb \
--driver=vmvx \
--entry_function=abs \
@@ -62,7 +62,7 @@
[disable CPU scaling](#cpu-configuration).
```shell
-$ bazel build -c opt //iree/tools:iree-benchmark-module
+$ bazel build -c opt //tools:iree-benchmark-module
```
Another thing to consider is that depending on where you are running the
@@ -76,7 +76,7 @@
Now we'll actually invoke the binary:
```shell
-$ ./bazel-bin/iree/tools/iree-benchmark-module \
+$ ./bazel-bin/tools/iree-benchmark-module \
--module_file=/tmp/module.fb \
--driver=vmvx \
--entry_function=abs \
@@ -107,7 +107,7 @@
`-iree-flow-export-benchmark-funcs` flag set:
```shell
-$ build/iree/tools/iree-compile \
+$ build/tools/iree-compile \
--iree-input-type=mhlo \
--iree-mlir-to-vm-bytecode-module \
--iree-flow-export-benchmark-funcs \
@@ -120,7 +120,7 @@
in that module:
```shell
-$ build/iree/tools/iree-benchmark-module
+$ build/tools/iree-benchmark-module
--module_file=/tmp/fullyconnected.vmfb
--driver=vmvx
```
diff --git a/docs/developers/developing_iree/developer_overview.md b/docs/developers/developing_iree/developer_overview.md
index 2637476..d28d505 100644
--- a/docs/developers/developing_iree/developer_overview.md
+++ b/docs/developers/developing_iree/developer_overview.md
@@ -52,7 +52,7 @@
* Shared data storage format definitions, primarily using
[FlatBuffers](https://google.github.io/flatbuffers/)
-[iree/tools/](https://github.com/google/iree/blob/main/iree/tools/)
+[tools/](https://github.com/google/iree/blob/main/tools/)
* Assorted tools used to optimize, translate, and evaluate IREE
@@ -90,7 +90,7 @@
[test file](https://github.com/google/iree/blob/main/iree/compiler/Dialect/Util/Transforms/test/drop_compiler_hints.mlir):
```shell
-$ ../iree-build/iree/tools/iree-opt \
+$ ../iree-build/tools/iree-opt \
--split-input-file \
--mlir-print-ir-before-all \
--iree-drop-compiler-hints \
@@ -103,7 +103,7 @@
model file:
```shell
-$ ../iree-build/iree/tools/iree-opt \
+$ ../iree-build/tools/iree-opt \
--iree-transformation-pipeline \
--iree-hal-target-backends=vmvx \
$PWD/iree/test/e2e/models/fullyconnected.mlir
@@ -121,7 +121,7 @@
For example, to translate `simple.mlir` to an IREE module:
```shell
-$ ../iree-build/iree/tools/iree-compile \
+$ ../iree-build/tools/iree-compile \
--iree-hal-target-backends=vmvx \
$PWD/samples/models/simple_abs.mlir \
-o /tmp/simple_abs_vmvx.vmfb
@@ -155,7 +155,7 @@
above on IREE's VMVX driver:
```shell
-$ ../iree-build/iree/tools/iree-run-module \
+$ ../iree-build/tools/iree-run-module \
--module_file=/tmp/simple_abs_vmvx.vmfb \
--driver=vmvx \
--entry_function=abs \
@@ -171,7 +171,7 @@
[check framework](https://github.com/google/iree/tree/main/docs/developing_iree/testing_guide.md#end-to-end-tests).
```shell
-$ ../iree-build/iree/tools/iree-compile \
+$ ../iree-build/tools/iree-compile \
--iree-input-type=mhlo \
--iree-mlir-to-vm-bytecode-module \
--iree-hal-target-backends=vmvx \
@@ -180,7 +180,7 @@
```
```shell
-$ ../iree-build/iree/tools/iree-check-module \
+$ ../iree-build/tools/iree-check-module \
/tmp/abs.vmfb \
--driver=vmvx
```
@@ -198,7 +198,7 @@
[samples/models/simple_abs.mlir](https://github.com/google/iree/blob/main/samples/models/simple_abs.mlir):
```shell
-$ ../iree-build/iree/tools/iree-run-mlir \
+$ ../iree-build/tools/iree-run-mlir \
$PWD/samples/models/simple_abs.mlir \
--function-input="f32=-2" \
--iree-hal-target-backends=vmvx
@@ -212,7 +212,7 @@
For example, to inspect the module translated above:
```shell
-$ ../iree-build/iree/tools/iree-dump-module /tmp/simple_abs_vmvx.vmfb
+$ ../iree-build/tools/iree-dump-module /tmp/simple_abs_vmvx.vmfb
```
### Useful generic flags
diff --git a/docs/developers/developing_iree/e2e_benchmarking.md b/docs/developers/developing_iree/e2e_benchmarking.md
index 21ca1c9..ef00976 100644
--- a/docs/developers/developing_iree/e2e_benchmarking.md
+++ b/docs/developers/developing_iree/e2e_benchmarking.md
@@ -115,7 +115,7 @@
on VMVX run:
```shell
-$ iree/tools/iree-benchmark-module \
+$ tools/iree-benchmark-module \
--module_file=/tmp/iree/modules/MatrixOpsStaticModule/iree_vmvx/compiled.vmfb \
--driver=vmvx \
--entry_function=matmul_lhs_batch \
@@ -192,10 +192,10 @@
```shell
# After following the instructions above up to 'Build all targets', the
# iree-benchmark-module binary should be in the following directory:
-$ ls build-android/iree/tools/
+$ ls build-android/tools/
# Copy the benchmarking binary to phone.
-$ adb push build-android/iree/tools/iree-benchmark-module /data/local/tmp
+$ adb push build-android/tools/iree-benchmark-module /data/local/tmp
```
### 4.2 Push the IREE's compilation / benchmarking artifacts to the device
diff --git a/docs/developers/developing_iree/llvm_version_bump.md b/docs/developers/developing_iree/llvm_version_bump.md
index 766ee53..28eaa27 100644
--- a/docs/developers/developing_iree/llvm_version_bump.md
+++ b/docs/developers/developing_iree/llvm_version_bump.md
@@ -65,7 +65,7 @@
Bazel can help, especially for catching nit-picky strict things:
```
-bazel build iree/tools:iree-compile
+bazel build tools:iree-compile
bazel test iree/compiler/...
```
diff --git a/docs/developers/developing_iree/profiling_cpu_events.md b/docs/developers/developing_iree/profiling_cpu_events.md
index 13c8ee8..54e0358 100644
--- a/docs/developers/developing_iree/profiling_cpu_events.md
+++ b/docs/developers/developing_iree/profiling_cpu_events.md
@@ -62,7 +62,7 @@
```shell
perf record -o /tmp/perf.data \
- ./iree/tools/iree-benchmark-module \
+ ./tools/iree-benchmark-module \
--driver=dylib \
... command-line arguments of iree-benchmark-module as usual ...
```
@@ -72,7 +72,7 @@
```shell
perf record -o /tmp/perf.data -e L1-dcache-load-misses \
- ./iree/tools/iree-benchmark-module \
+ ./tools/iree-benchmark-module \
--driver=dylib \
... command-line arguments of iree-benchmark-module as usual ...
```
diff --git a/docs/developers/developing_iree/profiling_vulkan_gpu.md b/docs/developers/developing_iree/profiling_vulkan_gpu.md
index 814adbc..4e4c204 100644
--- a/docs/developers/developing_iree/profiling_vulkan_gpu.md
+++ b/docs/developers/developing_iree/profiling_vulkan_gpu.md
@@ -21,7 +21,7 @@
app. In IREE we have a simple Android native app wrapper to help package
IREE core libraries together with a specific VM bytecode invocation into an
Android app. The wrapper and its documentation are placed at
-[`iree/tools/android/run_module_app/`](https://github.com/google/iree/tree/main/iree/tools/android/run_module_app).
+[`tools/android/run_module_app/`](https://github.com/google/iree/tree/main/tools/android/run_module_app).
For example, to package a module compiled from the following `mhlo-dot.mlir` as
an Android app:
@@ -35,7 +35,7 @@
```shell
# First translate into a VM bytecode module
-$ /path/to/iree/build/iree/tools/iree-compile -- \
+$ /path/to/iree/build/tools/iree-compile -- \
--iree-input-type=mhlo \
--iree-mlir-to-vm-bytecode-module \
--iree-hal-target-backends=vulkan-spirv \
@@ -43,7 +43,7 @@
-o /tmp/mhlo-dot.vmfb
# Then package the Android app
-$ /path/to/iree/source/iree/tools/android/run_module_app/build_apk.sh \
+$ /path/to/iree/source/tools/android/run_module_app/build_apk.sh \
./build-apk \
--driver vulkan \
--module_file /tmp/mhlo-dot.vmfb \
diff --git a/docs/developers/developing_iree/testing_guide.md b/docs/developers/developing_iree/testing_guide.md
index ed9f758..c190d44 100644
--- a/docs/developers/developing_iree/testing_guide.md
+++ b/docs/developers/developing_iree/testing_guide.md
@@ -152,7 +152,7 @@
srcs = glob(["*.mlir"]),
tools = [
"@llvm-project//llvm:FileCheck",
- "//iree/tools:iree-opt",
+ "//tools:iree-opt",
],
)
```
@@ -168,7 +168,7 @@
"arithmetic_ops.mlir"
DATA
FileCheck
- iree::tools::iree-opt
+ iree-opt
)
```
diff --git a/docs/developers/get_started/building_with_bazel_linux.md b/docs/developers/get_started/building_with_bazel_linux.md
index 9c644f2..5fd18da 100644
--- a/docs/developers/get_started/building_with_bazel_linux.md
+++ b/docs/developers/get_started/building_with_bazel_linux.md
@@ -94,14 +94,14 @@
Build all of IREE's 'tools' directory:
```shell
-$ bazel build iree/tools/...
+$ bazel build tools/...
```
Check out what was built:
```shell
-$ ls bazel-bin/iree/tools/
-$ ./bazel-bin/iree/tools/iree-compile --help
+$ ls bazel-bin/tools/
+$ ./bazel-bin/tools/iree-compile --help
```
Translate a
@@ -109,6 +109,6 @@
and execute a function in the compiled module:
```shell
-$ ./bazel-bin/iree/tools/iree-run-mlir ./samples/models/simple_abs.mlir \
- --function-input="f32=-2" --iree-hal-target-backends=vmvx -print-mlir
+$ ./bazel-bin/tools/iree-run-mlir ./samples/models/simple_abs.mlir \
+ --function-input="f32=-2" --iree-hal-target-backends=vmvx --print-mlir
```
diff --git a/docs/developers/get_started/building_with_bazel_macos.md b/docs/developers/get_started/building_with_bazel_macos.md
index 1bce0e6..00149b1 100644
--- a/docs/developers/get_started/building_with_bazel_macos.md
+++ b/docs/developers/get_started/building_with_bazel_macos.md
@@ -97,14 +97,14 @@
Build all of IREE's 'tools' directory:
```shell
-$ bazel build iree/tools/...
+$ bazel build tools/...
```
Check out what was built:
```shell
-$ ls bazel-bin/iree/tools/
-$ ./bazel-bin/iree/tools/iree-compile --help
+$ ls bazel-bin/tools/
+$ ./bazel-bin/tools/iree-compile --help
```
Translate a
@@ -112,6 +112,6 @@
and execute a function in the compiled module:
```shell
-$ ./bazel-bin/iree/tools/iree-run-mlir ./samples/models/simple_abs.mlir \
- --function-input="f32=-2" --iree-hal-target-backends=vmvx -print-mlir
+$ ./bazel-bin/tools/iree-run-mlir ./samples/models/simple_abs.mlir \
+ --function-input="f32=-2" --iree-hal-target-backends=vmvx --print-mlir
```
diff --git a/docs/developers/get_started/building_with_bazel_windows.md b/docs/developers/get_started/building_with_bazel_windows.md
index 28005ea..b90f6a4 100644
--- a/docs/developers/get_started/building_with_bazel_windows.md
+++ b/docs/developers/get_started/building_with_bazel_windows.md
@@ -100,14 +100,14 @@
Build all of IREE's 'tools' directory:
```powershell
-> bazel build iree/tools/...
+> bazel build tools/...
```
Check out what was built:
```powershell
> dir bazel-bin\iree\tools\
-> .\bazel-bin\iree\tools\iree-compile.exe --help
+> .\bazel-bin\tools\iree-compile.exe --help
```
Translate a
@@ -115,5 +115,5 @@
and execute a function in the compiled module:
```powershell
-> .\bazel-bin\iree\tools\iree-run-mlir.exe .\iree\samples\models\simple_abs.mlir --function-input="f32=-2" --iree-hal-target-backends=vmvx -print-mlir
+> .\bazel-bin\tools\iree-run-mlir.exe .\iree\samples\models\simple_abs.mlir --function-input="f32=-2" --iree-hal-target-backends=vmvx --print-mlir
```
diff --git a/docs/website/docs/building-from-source/android.md b/docs/website/docs/building-from-source/android.md
index b983306..a69159b 100644
--- a/docs/website/docs/building-from-source/android.md
+++ b/docs/website/docs/building-from-source/android.md
@@ -120,7 +120,7 @@
Push the Android runtime tools to the device, along with any flatbuffer files:
``` shell
-adb push ../iree-build-android/iree/tools/iree-run-module /data/local/tmp/
+adb push ../iree-build-android/tools/iree-run-module /data/local/tmp/
adb shell chmod +x /data/local/tmp/iree-run-module
adb push /tmp/simple_abs_vmvx.vmfb /data/local/tmp/
```
diff --git a/docs/website/docs/building-from-source/getting-started.md b/docs/website/docs/building-from-source/getting-started.md
index 1d8170f..eaf312a 100644
--- a/docs/website/docs/building-from-source/getting-started.md
+++ b/docs/website/docs/building-from-source/getting-started.md
@@ -122,8 +122,8 @@
Check out the contents of the 'tools' build directory:
``` shell
-ls ../iree-build/iree/tools/
-../iree-build/iree/tools/iree-compile --help
+ls ../iree-build/tools/
+../iree-build/tools/iree-compile --help
```
<!-- TODO(scotttodd): troubleshooting section? link to github issues? -->
diff --git a/docs/website/docs/building-from-source/riscv.md b/docs/website/docs/building-from-source/riscv.md
index 2207e1f..838f80f 100644
--- a/docs/website/docs/building-from-source/riscv.md
+++ b/docs/website/docs/building-from-source/riscv.md
@@ -116,7 +116,7 @@
${QEMU_BIN} \
-cpu rv64 \
-L ${RISCV_TOOLCHAIN_ROOT}/sysroot/ \
- ../iree-build-riscv/iree/tools/iree-run-module \
+ ../iree-build-riscv/tools/iree-run-module \
--driver=vmvx \
--module_file=/tmp/simple_abs_vmvx.vmfb \
--entry_function=abs \
@@ -145,7 +145,7 @@
with the additional command-line flags
```shell hl_lines="3 4 5 6 7 8"
-iree/tools/iree-compile \
+tools/iree-compile \
--iree-mlir-to-vm-bytecode-module \
--iree-hal-target-backends=dylib-llvm-aot \
--iree-llvm-target-triple=riscv64 \
@@ -162,7 +162,7 @@
${QEMU_BIN} \
-cpu rv64,x-v=true,x-k=true,vlen=256,elen=64,vext_spec=v1.0 \
-L ${RISCV_TOOLCHAIN_ROOT}/sysroot/ \
- ../iree-build-riscv/iree/tools/iree-run-module \
+ ../iree-build-riscv/tools/iree-run-module \
--driver=dylib \
--module_file=mobilenet-dylib.vmfb \
--entry_function=predict \
diff --git a/docs/website/docs/deployment-configurations/cpu-dylib.md b/docs/website/docs/deployment-configurations/cpu-dylib.md
index f9a72e6..fd7b289 100644
--- a/docs/website/docs/deployment-configurations/cpu-dylib.md
+++ b/docs/website/docs/deployment-configurations/cpu-dylib.md
@@ -73,7 +73,7 @@
configuring for the host.
!!! tip
- `iree-compile` is under `iree-build/iree/tools/` directory. You may want to
+ `iree-compile` is under `iree-build/tools/` directory. You may want to
include this path in your system's `PATH` environment variable.
## Compile and run the model
@@ -118,7 +118,7 @@
In the build directory, run the following command:
``` shell hl_lines="2"
-iree/tools/iree-run-module \
+tools/iree-run-module \
--driver=dylib \
--module_file=mobilenet-dylib.vmfb \
--entry_function=predict \
diff --git a/docs/website/docs/deployment-configurations/gpu-cuda-rocm.md b/docs/website/docs/deployment-configurations/gpu-cuda-rocm.md
index 13283a3..cc1039d 100644
--- a/docs/website/docs/deployment-configurations/gpu-cuda-rocm.md
+++ b/docs/website/docs/deployment-configurations/gpu-cuda-rocm.md
@@ -126,7 +126,7 @@
In the build directory:
``` shell hl_lines="3-6"
- iree/tools/iree-compile \
+ tools/iree-compile \
--iree-mlir-to-vm-bytecode-module \
--iree-hal-target-backends=rocm \
--iree-rocm-target-chip=<...> \
@@ -157,7 +157,7 @@
=== "Nvidia/CUDA"
``` shell hl_lines="2"
- iree/tools/iree-run-module \
+ tools/iree-run-module \
--driver=cuda \
--module_file=mobilenet-cuda.vmfb \
--entry_function=predict \
@@ -167,7 +167,7 @@
=== "AMD/ROCm"
``` shell hl_lines="2"
- iree/tools/iree-run-module \
+ tools/iree-run-module \
--driver=rocm \
--module_file=mobilenet-rocm.vmfb \
--entry_function=predict \
diff --git a/docs/website/docs/deployment-configurations/gpu-vulkan.md b/docs/website/docs/deployment-configurations/gpu-vulkan.md
index 8612437..05aecc7 100644
--- a/docs/website/docs/deployment-configurations/gpu-vulkan.md
+++ b/docs/website/docs/deployment-configurations/gpu-vulkan.md
@@ -175,7 +175,7 @@
In the build directory, run the following command:
``` shell hl_lines="2"
-iree/tools/iree-run-module \
+tools/iree-run-module \
--driver=vulkan \
--module_file=mobilenet-vulkan.vmfb \
--entry_function=predict \
diff --git a/experimental/web/generate_web_metrics.sh b/experimental/web/generate_web_metrics.sh
index 0257df0..880c2a4 100644
--- a/experimental/web/generate_web_metrics.sh
+++ b/experimental/web/generate_web_metrics.sh
@@ -110,8 +110,8 @@
###############################################################################
# Either build from source (setting this path), or use from the python packages.
-# IREE_COMPILE_PATH=~/code/iree-build/iree/tools/iree-compile
-# IREE_COMPILE_PATH="D:\dev\projects\iree-build\iree\tools\iree-compile"
+# IREE_COMPILE_PATH=~/code/iree-build/tools/iree-compile
+# IREE_COMPILE_PATH="D:\dev\projects\iree-build\tools\iree-compile"
IREE_COMPILE_PATH=iree-compile
# compile_program_wasm helper
diff --git a/experimental/web/run_native_benchmarks.sh b/experimental/web/run_native_benchmarks.sh
index b244bea..8b254f5 100644
--- a/experimental/web/run_native_benchmarks.sh
+++ b/experimental/web/run_native_benchmarks.sh
@@ -27,8 +27,8 @@
###############################################################################
# Either build from source (setting this path), or use from the python packages.
-# IREE_BENCHMARK_MODULE_PATH=~/code/iree-build/iree/tools/iree-benchmark-module
-# IREE_BENCHMARK_MODULE_PATH="D:\dev\projects\iree-build\iree\tools\iree-benchmark-module"
+# IREE_BENCHMARK_MODULE_PATH=~/code/iree-build/tools/iree-benchmark-module
+# IREE_BENCHMARK_MODULE_PATH="D:\dev\projects\iree-build\tools\iree-benchmark-module"
IREE_BENCHMARK_MODULE_PATH=iree-benchmark-module
echo "Benchmarking DeepLabV3..."
diff --git a/experimental/web/sample_dynamic/index.html b/experimental/web/sample_dynamic/index.html
index d26ffec..8db8b31 100644
--- a/experimental/web/sample_dynamic/index.html
+++ b/experimental/web/sample_dynamic/index.html
@@ -52,7 +52,7 @@
<p>
This tool works similarly to
- <a href="https://github.com/google/iree/blob/main/iree/tools/iree-run-module-main.cc"><code>iree-run-module</code></a>
+ <a href="https://github.com/google/iree/blob/main/tools/iree-run-module-main.cc"><code>iree-run-module</code></a>
(<a href="https://github.com/google/iree/blob/main/docs/developers/developing_iree/developer_overview.md#iree-run-module">docs</a>).
<br>It loads a compiled IREE program then lets you call exported functions.
<br><b>Note:</b> Some outputs are logged to the console.</p>
diff --git a/iree/test/e2e/linalg_transform/BUILD b/iree/test/e2e/linalg_transform/BUILD
index 3fc245a..8b24006 100644
--- a/iree/test/e2e/linalg_transform/BUILD
+++ b/iree/test/e2e/linalg_transform/BUILD
@@ -24,7 +24,7 @@
"hostonly",
],
tools = [
- "//iree/tools:iree-run-mlir",
+ "//tools:iree-run-mlir",
"@llvm-project//lld",
"@llvm-project//llvm:FileCheck",
],
diff --git a/iree/test/e2e/linalg_transform/CMakeLists.txt b/iree/test/e2e/linalg_transform/CMakeLists.txt
index c37b9b7..e866545 100644
--- a/iree/test/e2e/linalg_transform/CMakeLists.txt
+++ b/iree/test/e2e/linalg_transform/CMakeLists.txt
@@ -18,7 +18,7 @@
TOOLS
${IREE_LLD_TARGET}
FileCheck
- iree::tools::iree-run-mlir
+ iree-run-mlir
DATA
iree::test::e2e::linalg_transform::linalg_transform_spec.mlir
LABELS
diff --git a/iree/test/e2e/matmul/BUILD b/iree/test/e2e/matmul/BUILD
index 058f584..8c1ac6f 100644
--- a/iree/test/e2e/matmul/BUILD
+++ b/iree/test/e2e/matmul/BUILD
@@ -30,7 +30,7 @@
("dylib-llvm-aot", "dylib"),
("vmvx", "vmvx"),
],
- trace_runner = "//iree/tools:iree-e2e-matmul-test",
+ trace_runner = "//tools:iree-e2e-matmul-test",
) for lhs_rhs_type in [
"i8",
"f32",
@@ -55,7 +55,7 @@
"aarch64:+dotprod",
"aarch64:+i8mm",
] if lhs_rhs_type == "i8" else []),
- trace_runner = "//iree/tools:iree-e2e-matmul-test",
+ trace_runner = "//tools:iree-e2e-matmul-test",
) for lhs_rhs_type in [
"i8",
"f32",
@@ -79,7 +79,7 @@
"aarch64:+dotprod",
"aarch64:+i8mm",
] if lhs_rhs_type == "i8" else []),
- trace_runner = "//iree/tools:iree-e2e-matmul-test",
+ trace_runner = "//tools:iree-e2e-matmul-test",
) for lhs_rhs_type in [
"i8",
"f32",
@@ -107,7 +107,7 @@
"aarch64:+dotprod",
"aarch64:+i8mm",
] if lhs_rhs_type == "i8" else []),
- trace_runner = "//iree/tools:iree-e2e-matmul-test",
+ trace_runner = "//tools:iree-e2e-matmul-test",
) for lhs_rhs_type in [
"i8",
"f32",
@@ -134,7 +134,7 @@
target_backends_and_drivers = [
("cuda", "cuda"),
],
- trace_runner = "//iree/tools:iree-e2e-matmul-test",
+ trace_runner = "//tools:iree-e2e-matmul-test",
) for compilation_info in [
"LLVMGPUMatmulSimt",
]]
@@ -162,7 +162,7 @@
target_backends_and_drivers = [
("cuda", "cuda"),
],
- trace_runner = "//iree/tools:iree-e2e-matmul-test",
+ trace_runner = "//tools:iree-e2e-matmul-test",
) for compilation_info in [
"LLVMGPUMatmulTensorCore",
]]
@@ -189,7 +189,7 @@
("cuda", "cuda"),
("dylib-llvm-aot", "dylib"),
],
- trace_runner = "//iree/tools:iree-e2e-matmul-test",
+ trace_runner = "//tools:iree-e2e-matmul-test",
) for lhs_rhs_type in [
"f32",
]]
@@ -211,7 +211,7 @@
target_backends_and_drivers = [
("vulkan-spirv", "vulkan"),
],
- trace_runner = "//iree/tools:iree-e2e-matmul-test",
+ trace_runner = "//tools:iree-e2e-matmul-test",
) for vulkan_target in [
"valhall-unknown-android11",
"ampere-unknown-linux",
diff --git a/iree/test/e2e/matmul/CMakeLists.txt b/iree/test/e2e/matmul/CMakeLists.txt
index 2b14eaa..7299aef 100644
--- a/iree/test/e2e/matmul/CMakeLists.txt
+++ b/iree/test/e2e/matmul/CMakeLists.txt
@@ -19,7 +19,7 @@
"--lhs_rhs_type=i8"
"--shapes=small"
TRACE_RUNNER
- iree_tools_iree-e2e-matmul-test
+ iree-e2e-matmul-test
TARGET_BACKENDS
"dylib-llvm-aot"
"vmvx"
@@ -37,7 +37,7 @@
"--lhs_rhs_type=f32"
"--shapes=small"
TRACE_RUNNER
- iree_tools_iree-e2e-matmul-test
+ iree-e2e-matmul-test
TARGET_BACKENDS
"dylib-llvm-aot"
"vmvx"
@@ -55,7 +55,7 @@
"--lhs_rhs_type=i8"
"--shapes=small"
TRACE_RUNNER
- iree_tools_iree-e2e-matmul-test
+ iree-e2e-matmul-test
TARGET_BACKENDS
"dylib-llvm-aot"
DRIVERS
@@ -77,7 +77,7 @@
"--lhs_rhs_type=f32"
"--shapes=small"
TRACE_RUNNER
- iree_tools_iree-e2e-matmul-test
+ iree-e2e-matmul-test
TARGET_BACKENDS
"dylib-llvm-aot"
DRIVERS
@@ -97,7 +97,7 @@
"--lhs_rhs_type=i8"
"--shapes=large"
TRACE_RUNNER
- iree_tools_iree-e2e-matmul-test
+ iree-e2e-matmul-test
TARGET_BACKENDS
"dylib-llvm-aot"
DRIVERS
@@ -119,7 +119,7 @@
"--lhs_rhs_type=f32"
"--shapes=large"
TRACE_RUNNER
- iree_tools_iree-e2e-matmul-test
+ iree-e2e-matmul-test
TARGET_BACKENDS
"dylib-llvm-aot"
DRIVERS
@@ -139,7 +139,7 @@
"--lhs_rhs_type=i8"
"--shapes=small"
TRACE_RUNNER
- iree_tools_iree-e2e-matmul-test
+ iree-e2e-matmul-test
TARGET_BACKENDS
"dylib-llvm-aot"
DRIVERS
@@ -162,7 +162,7 @@
"--lhs_rhs_type=f32"
"--shapes=small"
TRACE_RUNNER
- iree_tools_iree-e2e-matmul-test
+ iree-e2e-matmul-test
TARGET_BACKENDS
"dylib-llvm-aot"
DRIVERS
@@ -184,7 +184,7 @@
"--shapes=gpu_large"
"--compilation_info=LLVMGPUMatmulSimt"
TRACE_RUNNER
- iree_tools_iree-e2e-matmul-test
+ iree-e2e-matmul-test
TARGET_BACKENDS
"cuda"
DRIVERS
@@ -207,7 +207,7 @@
"--shapes=gpu_large"
"--compilation_info=LLVMGPUMatmulTensorCore"
TRACE_RUNNER
- iree_tools_iree-e2e-matmul-test
+ iree-e2e-matmul-test
TARGET_BACKENDS
"cuda"
DRIVERS
@@ -231,7 +231,7 @@
"--lhs_rhs_type=f32"
"--shapes=large"
TRACE_RUNNER
- iree_tools_iree-e2e-matmul-test
+ iree-e2e-matmul-test
TARGET_BACKENDS
"cuda"
"dylib-llvm-aot"
@@ -258,7 +258,7 @@
"--shapes=gpu_large"
"--compilation_info=SPIRVVectorize"
TRACE_RUNNER
- iree_tools_iree-e2e-matmul-test
+ iree-e2e-matmul-test
TARGET_BACKENDS
"vulkan-spirv"
DRIVERS
@@ -279,7 +279,7 @@
"--shapes=gpu_large"
"--compilation_info=SPIRVVectorize"
TRACE_RUNNER
- iree_tools_iree-e2e-matmul-test
+ iree-e2e-matmul-test
TARGET_BACKENDS
"vulkan-spirv"
DRIVERS
diff --git a/iree/test/e2e/models/BUILD b/iree/test/e2e/models/BUILD
index 242f03f..16b2eeb 100644
--- a/iree/test/e2e/models/BUILD
+++ b/iree/test/e2e/models/BUILD
@@ -43,7 +43,7 @@
"optonly", # swiftshader is too slow in dbg
],
tools = [
- "//iree/tools:iree-run-mlir",
+ "//tools:iree-run-mlir",
"@llvm-project//lld",
"@llvm-project//llvm:FileCheck",
],
diff --git a/iree/test/e2e/models/CMakeLists.txt b/iree/test/e2e/models/CMakeLists.txt
index 66644e5..67eaff7 100644
--- a/iree/test/e2e/models/CMakeLists.txt
+++ b/iree/test/e2e/models/CMakeLists.txt
@@ -24,7 +24,7 @@
TOOLS
${IREE_LLD_TARGET}
FileCheck
- iree::tools::iree-run-mlir
+ iree-run-mlir
LABELS
"hostonly"
"optonly"
diff --git a/iree/test/e2e/regression/BUILD b/iree/test/e2e/regression/BUILD
index d13a35e..138bfc0 100644
--- a/iree/test/e2e/regression/BUILD
+++ b/iree/test/e2e/regression/BUILD
@@ -5,8 +5,8 @@
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
# Tests for end-to-end IREE support of specific features to prevent regression.
-# These should focus on support by IREE itself, not for issues with specific runner tools. Place
-# those tests in iree/tools/test/
+# These should focus on support by IREE itself, not for issues with specific runner tools.
+# Place those tests in tools/test/
load("//build_tools/bazel:enforce_glob.bzl", "enforce_glob")
load("//build_tools/bazel:iree_lit_test.bzl", "iree_lit_test_suite")
@@ -58,8 +58,8 @@
),
tags = ["hostonly"],
tools = [
- "//iree/tools:iree-opt",
- "//iree/tools:iree-run-mlir",
+ "//tools:iree-opt",
+ "//tools:iree-run-mlir",
"@llvm-project//lld",
"@llvm-project//llvm:FileCheck",
],
diff --git a/iree/test/e2e/regression/CMakeLists.txt b/iree/test/e2e/regression/CMakeLists.txt
index f9fdc07..a63866c 100644
--- a/iree/test/e2e/regression/CMakeLists.txt
+++ b/iree/test/e2e/regression/CMakeLists.txt
@@ -23,8 +23,8 @@
TOOLS
${IREE_LLD_TARGET}
FileCheck
- iree::tools::iree-opt
- iree::tools::iree-run-mlir
+ iree-opt
+ iree-run-mlir
LABELS
"hostonly"
)
diff --git a/iree/test/e2e/tensor_ops/BUILD b/iree/test/e2e/tensor_ops/BUILD
index 77402d9..5217c8b 100644
--- a/iree/test/e2e/tensor_ops/BUILD
+++ b/iree/test/e2e/tensor_ops/BUILD
@@ -21,9 +21,9 @@
],
tags = ["hostonly"],
tools = [
- "//iree/tools:iree-benchmark-module",
- "//iree/tools:iree-compile",
- "//iree/tools:iree-run-mlir",
+ "//tools:iree-benchmark-module",
+ "//tools:iree-compile",
+ "//tools:iree-run-mlir",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/iree/test/e2e/tensor_ops/CMakeLists.txt b/iree/test/e2e/tensor_ops/CMakeLists.txt
index 3c9adf2..4c66480 100644
--- a/iree/test/e2e/tensor_ops/CMakeLists.txt
+++ b/iree/test/e2e/tensor_ops/CMakeLists.txt
@@ -17,9 +17,9 @@
"tensor_cast.mlir"
TOOLS
FileCheck
- iree::tools::iree-benchmark-module
- iree::tools::iree-compile
- iree::tools::iree-run-mlir
+ iree-benchmark-module
+ iree-compile
+ iree-run-mlir
LABELS
"hostonly"
)
diff --git a/runtime/bindings/python/CMakeLists.txt b/runtime/bindings/python/CMakeLists.txt
index ba5c332..5f8497a 100644
--- a/runtime/bindings/python/CMakeLists.txt
+++ b/runtime/bindings/python/CMakeLists.txt
@@ -77,25 +77,25 @@
iree_symlink_tool(
TARGET runtime
- FROM_TOOL_TARGET iree_tools_iree-benchmark-module
+ FROM_TOOL_TARGET iree-benchmark-module
TO_EXE_NAME iree-benchmark-module
)
iree_symlink_tool(
TARGET runtime
- FROM_TOOL_TARGET iree_tools_iree-benchmark-trace
+ FROM_TOOL_TARGET iree-benchmark-trace
TO_EXE_NAME iree-benchmark-trace
)
iree_symlink_tool(
TARGET runtime
- FROM_TOOL_TARGET iree_tools_iree-run-trace
+ FROM_TOOL_TARGET iree-run-trace
TO_EXE_NAME iree-run-trace
)
iree_symlink_tool(
TARGET runtime
- FROM_TOOL_TARGET iree_tools_iree-run-module
+ FROM_TOOL_TARGET iree-run-module
TO_EXE_NAME iree-run-module
)
@@ -200,10 +200,10 @@
cmake_language(DEFER DIRECTORY "${IREE_SOURCE_DIR}"
CALL install
TARGETS
- iree_tools_iree-benchmark-module
- iree_tools_iree-benchmark-trace
- iree_tools_iree-run-module
- iree_tools_iree-run-trace
+ iree-benchmark-module
+ iree-benchmark-trace
+ iree-run-module
+ iree-run-trace
${_EXTRA_INSTALL_TOOL_TARGETS}
DESTINATION "${_INSTALL_DIR}/iree/runtime"
COMPONENT "${_INSTALL_COMPONENT}"
diff --git a/runtime/src/iree/modules/check/test/BUILD b/runtime/src/iree/modules/check/test/BUILD
index ce07852..baea012 100644
--- a/runtime/src/iree/modules/check/test/BUILD
+++ b/runtime/src/iree/modules/check/test/BUILD
@@ -27,9 +27,9 @@
cfg = "//runtime:lit.cfg.py",
tags = ["hostonly"],
tools = [
- "//iree/tools:iree-check-module",
- "//iree/tools:iree-compile",
- "//iree/tools:iree-run-module",
+ "//tools:iree-check-module",
+ "//tools:iree-compile",
+ "//tools:iree-run-module",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/runtime/src/iree/modules/check/test/CMakeLists.txt b/runtime/src/iree/modules/check/test/CMakeLists.txt
index 3a07e33..4726dc8 100644
--- a/runtime/src/iree/modules/check/test/CMakeLists.txt
+++ b/runtime/src/iree/modules/check/test/CMakeLists.txt
@@ -19,9 +19,9 @@
"unavailable.mlir"
TOOLS
FileCheck
- iree::tools::iree-check-module
- iree::tools::iree-compile
- iree::tools::iree-run-module
+ iree-check-module
+ iree-compile
+ iree-run-module
LABELS
"hostonly"
)
diff --git a/runtime/src/iree/vm/BUILD b/runtime/src/iree/vm/BUILD
index d4de7bd..b789875 100644
--- a/runtime/src/iree/vm/BUILD
+++ b/runtime/src/iree/vm/BUILD
@@ -210,7 +210,7 @@
# tbl_outs = [
# (["--gen-iree-vm-op-table-defs"], "bytecode_op_table.h"),
# ],
-# tblgen = "//iree/tools:iree-tblgen",
+# tblgen = "//tools:iree-tblgen",
# td_file = "//iree/compiler/Dialect/VM/IR:VMOps.td",
# td_srcs = [
# "//iree/compiler/Dialect/Util/IR:td_files",
@@ -272,7 +272,7 @@
src = "bytecode_module_benchmark.mlir",
c_identifier = "iree_vm_bytecode_module_benchmark_module",
flags = ["--iree-vm-ir-to-bytecode-module"],
- translate_tool = "//iree/tools:iree-translate",
+ translate_tool = "//tools:iree-translate",
)
cc_binary_benchmark(
@@ -292,7 +292,7 @@
src = "bytecode_module_size_benchmark.mlir",
c_identifier = "iree_vm_bytecode_module_size_benchmark_module",
flags = ["--iree-vm-ir-to-bytecode-module"],
- translate_tool = "//iree/tools:iree-translate",
+ translate_tool = "//tools:iree-translate",
)
iree_cmake_extra_content(
diff --git a/runtime/src/iree/vm/CMakeLists.txt b/runtime/src/iree/vm/CMakeLists.txt
index b5fea03..a0f57c1 100644
--- a/runtime/src/iree/vm/CMakeLists.txt
+++ b/runtime/src/iree/vm/CMakeLists.txt
@@ -235,7 +235,7 @@
C_IDENTIFIER
"iree_vm_bytecode_module_benchmark_module"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
FLAGS
"--iree-vm-ir-to-bytecode-module"
TESTONLY
@@ -263,7 +263,7 @@
C_IDENTIFIER
"iree_vm_bytecode_module_size_benchmark_module"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
FLAGS
"--iree-vm-ir-to-bytecode-module"
TESTONLY
diff --git a/runtime/src/iree/vm/test/BUILD b/runtime/src/iree/vm/test/BUILD
index 5eae4bd..df4cc57 100644
--- a/runtime/src/iree/vm/test/BUILD
+++ b/runtime/src/iree/vm/test/BUILD
@@ -60,166 +60,166 @@
name = "arithmetic_ops",
src = "arithmetic_ops.mlir",
flags = ["--iree-vm-ir-to-bytecode-module"],
- translate_tool = "//iree/tools:iree-translate",
+ translate_tool = "//tools:iree-translate",
)
iree_bytecode_module(
name = "arithmetic_ops_f32",
src = "arithmetic_ops_f32.mlir",
flags = ["--iree-vm-ir-to-bytecode-module"],
- translate_tool = "//iree/tools:iree-translate",
+ translate_tool = "//tools:iree-translate",
)
iree_bytecode_module(
name = "arithmetic_ops_i64",
src = "arithmetic_ops_i64.mlir",
flags = ["--iree-vm-ir-to-bytecode-module"],
- translate_tool = "//iree/tools:iree-translate",
+ translate_tool = "//tools:iree-translate",
)
iree_bytecode_module(
name = "assignment_ops",
src = "assignment_ops.mlir",
flags = ["--iree-vm-ir-to-bytecode-module"],
- translate_tool = "//iree/tools:iree-translate",
+ translate_tool = "//tools:iree-translate",
)
iree_bytecode_module(
name = "assignment_ops_f32",
src = "assignment_ops_f32.mlir",
flags = ["--iree-vm-ir-to-bytecode-module"],
- translate_tool = "//iree/tools:iree-translate",
+ translate_tool = "//tools:iree-translate",
)
iree_bytecode_module(
name = "assignment_ops_i64",
src = "assignment_ops_i64.mlir",
flags = ["--iree-vm-ir-to-bytecode-module"],
- translate_tool = "//iree/tools:iree-translate",
+ translate_tool = "//tools:iree-translate",
)
iree_bytecode_module(
name = "buffer_ops",
src = "buffer_ops.mlir",
flags = ["--iree-vm-ir-to-bytecode-module"],
- translate_tool = "//iree/tools:iree-translate",
+ translate_tool = "//tools:iree-translate",
)
iree_bytecode_module(
name = "call_ops",
src = "call_ops.mlir",
flags = ["--iree-vm-ir-to-bytecode-module"],
- translate_tool = "//iree/tools:iree-translate",
+ translate_tool = "//tools:iree-translate",
)
iree_bytecode_module(
name = "comparison_ops",
src = "comparison_ops.mlir",
flags = ["--iree-vm-ir-to-bytecode-module"],
- translate_tool = "//iree/tools:iree-translate",
+ translate_tool = "//tools:iree-translate",
)
iree_bytecode_module(
name = "comparison_ops_f32",
src = "comparison_ops_f32.mlir",
flags = ["--iree-vm-ir-to-bytecode-module"],
- translate_tool = "//iree/tools:iree-translate",
+ translate_tool = "//tools:iree-translate",
)
iree_bytecode_module(
name = "comparison_ops_i64",
src = "comparison_ops_i64.mlir",
flags = ["--iree-vm-ir-to-bytecode-module"],
- translate_tool = "//iree/tools:iree-translate",
+ translate_tool = "//tools:iree-translate",
)
iree_bytecode_module(
name = "control_flow_ops",
src = "control_flow_ops.mlir",
flags = ["--iree-vm-ir-to-bytecode-module"],
- translate_tool = "//iree/tools:iree-translate",
+ translate_tool = "//tools:iree-translate",
)
iree_bytecode_module(
name = "conversion_ops",
src = "conversion_ops.mlir",
flags = ["--iree-vm-ir-to-bytecode-module"],
- translate_tool = "//iree/tools:iree-translate",
+ translate_tool = "//tools:iree-translate",
)
iree_bytecode_module(
name = "conversion_ops_f32",
src = "conversion_ops_f32.mlir",
flags = ["--iree-vm-ir-to-bytecode-module"],
- translate_tool = "//iree/tools:iree-translate",
+ translate_tool = "//tools:iree-translate",
)
iree_bytecode_module(
name = "conversion_ops_i64",
src = "conversion_ops_i64.mlir",
flags = ["--iree-vm-ir-to-bytecode-module"],
- translate_tool = "//iree/tools:iree-translate",
+ translate_tool = "//tools:iree-translate",
)
iree_bytecode_module(
name = "global_ops",
src = "global_ops.mlir",
flags = ["--iree-vm-ir-to-bytecode-module"],
- translate_tool = "//iree/tools:iree-translate",
+ translate_tool = "//tools:iree-translate",
)
iree_bytecode_module(
name = "global_ops_f32",
src = "global_ops_f32.mlir",
flags = ["--iree-vm-ir-to-bytecode-module"],
- translate_tool = "//iree/tools:iree-translate",
+ translate_tool = "//tools:iree-translate",
)
iree_bytecode_module(
name = "global_ops_i64",
src = "global_ops_i64.mlir",
flags = ["--iree-vm-ir-to-bytecode-module"],
- translate_tool = "//iree/tools:iree-translate",
+ translate_tool = "//tools:iree-translate",
)
iree_bytecode_module(
name = "list_ops",
src = "list_ops.mlir",
flags = ["--iree-vm-ir-to-bytecode-module"],
- translate_tool = "//iree/tools:iree-translate",
+ translate_tool = "//tools:iree-translate",
)
iree_bytecode_module(
name = "list_ops_i64",
src = "list_ops_i64.mlir",
flags = ["--iree-vm-ir-to-bytecode-module"],
- translate_tool = "//iree/tools:iree-translate",
+ translate_tool = "//tools:iree-translate",
)
iree_bytecode_module(
name = "list_variant_ops",
src = "list_variant_ops.mlir",
flags = ["--iree-vm-ir-to-bytecode-module"],
- translate_tool = "//iree/tools:iree-translate",
+ translate_tool = "//tools:iree-translate",
)
iree_bytecode_module(
name = "ref_ops",
src = "ref_ops.mlir",
flags = ["--iree-vm-ir-to-bytecode-module"],
- translate_tool = "//iree/tools:iree-translate",
+ translate_tool = "//tools:iree-translate",
)
iree_bytecode_module(
name = "shift_ops",
src = "shift_ops.mlir",
flags = ["--iree-vm-ir-to-bytecode-module"],
- translate_tool = "//iree/tools:iree-translate",
+ translate_tool = "//tools:iree-translate",
)
iree_bytecode_module(
name = "shift_ops_i64",
src = "shift_ops_i64.mlir",
flags = ["--iree-vm-ir-to-bytecode-module"],
- translate_tool = "//iree/tools:iree-translate",
+ translate_tool = "//tools:iree-translate",
)
diff --git a/runtime/src/iree/vm/test/CMakeLists.txt b/runtime/src/iree/vm/test/CMakeLists.txt
index 419b77a..be720a9 100644
--- a/runtime/src/iree/vm/test/CMakeLists.txt
+++ b/runtime/src/iree/vm/test/CMakeLists.txt
@@ -56,7 +56,7 @@
SRC
"arithmetic_ops.mlir"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
FLAGS
"--iree-vm-ir-to-bytecode-module"
PUBLIC
@@ -68,7 +68,7 @@
SRC
"arithmetic_ops_f32.mlir"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
FLAGS
"--iree-vm-ir-to-bytecode-module"
PUBLIC
@@ -80,7 +80,7 @@
SRC
"arithmetic_ops_i64.mlir"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
FLAGS
"--iree-vm-ir-to-bytecode-module"
PUBLIC
@@ -92,7 +92,7 @@
SRC
"assignment_ops.mlir"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
FLAGS
"--iree-vm-ir-to-bytecode-module"
PUBLIC
@@ -104,7 +104,7 @@
SRC
"assignment_ops_f32.mlir"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
FLAGS
"--iree-vm-ir-to-bytecode-module"
PUBLIC
@@ -116,7 +116,7 @@
SRC
"assignment_ops_i64.mlir"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
FLAGS
"--iree-vm-ir-to-bytecode-module"
PUBLIC
@@ -128,7 +128,7 @@
SRC
"buffer_ops.mlir"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
FLAGS
"--iree-vm-ir-to-bytecode-module"
PUBLIC
@@ -140,7 +140,7 @@
SRC
"call_ops.mlir"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
FLAGS
"--iree-vm-ir-to-bytecode-module"
PUBLIC
@@ -152,7 +152,7 @@
SRC
"comparison_ops.mlir"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
FLAGS
"--iree-vm-ir-to-bytecode-module"
PUBLIC
@@ -164,7 +164,7 @@
SRC
"comparison_ops_f32.mlir"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
FLAGS
"--iree-vm-ir-to-bytecode-module"
PUBLIC
@@ -176,7 +176,7 @@
SRC
"comparison_ops_i64.mlir"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
FLAGS
"--iree-vm-ir-to-bytecode-module"
PUBLIC
@@ -188,7 +188,7 @@
SRC
"control_flow_ops.mlir"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
FLAGS
"--iree-vm-ir-to-bytecode-module"
PUBLIC
@@ -200,7 +200,7 @@
SRC
"conversion_ops.mlir"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
FLAGS
"--iree-vm-ir-to-bytecode-module"
PUBLIC
@@ -212,7 +212,7 @@
SRC
"conversion_ops_f32.mlir"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
FLAGS
"--iree-vm-ir-to-bytecode-module"
PUBLIC
@@ -224,7 +224,7 @@
SRC
"conversion_ops_i64.mlir"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
FLAGS
"--iree-vm-ir-to-bytecode-module"
PUBLIC
@@ -236,7 +236,7 @@
SRC
"global_ops.mlir"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
FLAGS
"--iree-vm-ir-to-bytecode-module"
PUBLIC
@@ -248,7 +248,7 @@
SRC
"global_ops_f32.mlir"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
FLAGS
"--iree-vm-ir-to-bytecode-module"
PUBLIC
@@ -260,7 +260,7 @@
SRC
"global_ops_i64.mlir"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
FLAGS
"--iree-vm-ir-to-bytecode-module"
PUBLIC
@@ -272,7 +272,7 @@
SRC
"list_ops.mlir"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
FLAGS
"--iree-vm-ir-to-bytecode-module"
PUBLIC
@@ -284,7 +284,7 @@
SRC
"list_ops_i64.mlir"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
FLAGS
"--iree-vm-ir-to-bytecode-module"
PUBLIC
@@ -296,7 +296,7 @@
SRC
"list_variant_ops.mlir"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
FLAGS
"--iree-vm-ir-to-bytecode-module"
PUBLIC
@@ -308,7 +308,7 @@
SRC
"ref_ops.mlir"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
FLAGS
"--iree-vm-ir-to-bytecode-module"
PUBLIC
@@ -320,7 +320,7 @@
SRC
"shift_ops.mlir"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
FLAGS
"--iree-vm-ir-to-bytecode-module"
PUBLIC
@@ -332,7 +332,7 @@
SRC
"shift_ops_i64.mlir"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
FLAGS
"--iree-vm-ir-to-bytecode-module"
PUBLIC
diff --git a/runtime/src/iree/vm/test/emitc/CMakeLists.txt b/runtime/src/iree/vm/test/emitc/CMakeLists.txt
index 7a4d32e..c4ef95f 100644
--- a/runtime/src/iree/vm/test/emitc/CMakeLists.txt
+++ b/runtime/src/iree/vm/test/emitc/CMakeLists.txt
@@ -54,7 +54,7 @@
FLAGS
"--iree-vm-ir-to-c-module"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
)
iree_c_module(
@@ -67,7 +67,7 @@
FLAGS
"--iree-vm-ir-to-c-module"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
)
iree_c_module(
@@ -80,7 +80,7 @@
FLAGS
"--iree-vm-ir-to-c-module"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
)
iree_c_module(
@@ -93,7 +93,7 @@
FLAGS
"--iree-vm-ir-to-c-module"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
)
iree_c_module(
@@ -106,7 +106,7 @@
FLAGS
"--iree-vm-ir-to-c-module"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
)
iree_c_module(
@@ -119,7 +119,7 @@
FLAGS
"--iree-vm-ir-to-c-module"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
)
iree_c_module(
@@ -132,7 +132,7 @@
FLAGS
"--iree-vm-ir-to-c-module"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
)
iree_c_module(
@@ -145,7 +145,7 @@
FLAGS
"--iree-vm-ir-to-c-module"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
)
iree_c_module(
@@ -158,7 +158,7 @@
FLAGS
"--iree-vm-ir-to-c-module"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
)
iree_c_module(
@@ -171,7 +171,7 @@
FLAGS
"--iree-vm-ir-to-c-module"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
)
iree_c_module(
@@ -184,7 +184,7 @@
FLAGS
"--iree-vm-ir-to-c-module"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
)
iree_c_module(
@@ -197,7 +197,7 @@
FLAGS
"--iree-vm-ir-to-c-module"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
)
iree_c_module(
@@ -210,7 +210,7 @@
FLAGS
"--iree-vm-ir-to-c-module"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
)
iree_c_module(
@@ -223,7 +223,7 @@
FLAGS
"--iree-vm-ir-to-c-module"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
)
iree_c_module(
@@ -236,7 +236,7 @@
FLAGS
"--iree-vm-ir-to-c-module"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
)
iree_c_module(
@@ -249,7 +249,7 @@
FLAGS
"--iree-vm-ir-to-c-module"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
)
iree_c_module(
@@ -262,7 +262,7 @@
FLAGS
"--iree-vm-ir-to-c-module"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
)
iree_c_module(
@@ -275,7 +275,7 @@
FLAGS
"--iree-vm-ir-to-c-module"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
)
iree_c_module(
@@ -288,7 +288,7 @@
FLAGS
"--iree-vm-ir-to-c-module"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
)
iree_c_module(
@@ -301,7 +301,7 @@
FLAGS
"--iree-vm-ir-to-c-module"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
)
iree_c_module(
@@ -314,7 +314,7 @@
FLAGS
"--iree-vm-ir-to-c-module"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
)
iree_c_module(
@@ -327,7 +327,7 @@
FLAGS
"--iree-vm-ir-to-c-module"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
)
iree_c_module(
@@ -340,7 +340,7 @@
FLAGS
"--iree-vm-ir-to-c-module"
TRANSLATE_TOOL
- iree_tools_iree-translate
+ iree-translate
)
endif()
diff --git a/samples/dynamic_shapes/README.md b/samples/dynamic_shapes/README.md
index 2a67da0..55c805f 100644
--- a/samples/dynamic_shapes/README.md
+++ b/samples/dynamic_shapes/README.md
@@ -73,7 +73,7 @@
```
cmake -B ../iree-build/ -DCMAKE_BUILD_TYPE=RelWithDebInfo .
- cmake --build ../iree-build/ --target iree_tools_iree-compile
+ cmake --build ../iree-build/ --target iree-compile
```
3. Compile the `dynamic_shapes.mlir` file using `iree-compile`. The
@@ -81,7 +81,7 @@
configuration has the best support for dynamic shapes:
```
- ../iree-build/iree/tools/iree-compile \
+ ../iree-build/tools/iree-compile \
--iree-mlir-to-vm-bytecode-module \
--iree-hal-target-backends=dylib-llvm-aot \
--iree-input-type=mhlo \
diff --git a/samples/dynamic_shapes/test.sh b/samples/dynamic_shapes/test.sh
index 21fe0e1..ad59423 100755
--- a/samples/dynamic_shapes/test.sh
+++ b/samples/dynamic_shapes/test.sh
@@ -23,10 +23,10 @@
# 2. Build the `iree-compile` tool.
cmake -B ${BUILD_DIR} -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo ${ROOT_DIR}
-cmake --build ${BUILD_DIR} --target iree_tools_iree-compile -- -k 0
+cmake --build ${BUILD_DIR} --target iree-compile -- -k 0
# 3. Compile `dynamic_shapes.mlir` using `iree-compile`.
-${BUILD_DIR}/iree/tools/iree-compile \
+${BUILD_DIR}/tools/iree-compile \
--iree-mlir-to-vm-bytecode-module \
--iree-hal-target-backends=dylib-llvm-aot \
--iree-input-type=mhlo \
diff --git a/samples/simple_embedding/README.md b/samples/simple_embedding/README.md
index bcfd7b3..7c5fd68 100644
--- a/samples/simple_embedding/README.md
+++ b/samples/simple_embedding/README.md
@@ -8,7 +8,7 @@
# Background
The main bytecode testing tool
-[iree-run-module](https://github.com/google/iree/tree/main/iree/tools/iree-run-module-main.cc)
+[iree-run-module](https://github.com/google/iree/tree/main/tools/iree-run-module-main.cc)
requires a proper operating system support to set up the runtime environment to
execute an IREE bytecode module. For embedded systems, the support such as file
system or multi-thread asynchronous control may not be available. This sample
diff --git a/samples/static_library/CMakeLists.txt b/samples/static_library/CMakeLists.txt
index d3d1d7d..8c170a0 100644
--- a/samples/static_library/CMakeLists.txt
+++ b/samples/static_library/CMakeLists.txt
@@ -11,7 +11,7 @@
endif()
# Set iree-compile binary.
-set(_COMPILE_TOOL_EXECUTABLE $<TARGET_FILE:iree_tools_iree-compile>)
+set(_COMPILE_TOOL_EXECUTABLE $<TARGET_FILE:iree-compile>)
## Example with VM bytecode module.
# Setup args for iree-compile.
diff --git a/samples/variables_and_state/README.md b/samples/variables_and_state/README.md
index e5b16fa..a2d1178 100644
--- a/samples/variables_and_state/README.md
+++ b/samples/variables_and_state/README.md
@@ -91,7 +91,7 @@
and compile the imported `counter.mlir` file using `iree-compile`:
```
-../iree-build/iree/tools/iree-compile \
+../iree-build/tools/iree-compile \
--iree-mlir-to-vm-bytecode-module \
--iree-hal-target-backends=dylib-llvm-aot \
--iree-input-type=mhlo \
diff --git a/iree/tools/BUILD b/tools/BUILD
similarity index 99%
rename from iree/tools/BUILD
rename to tools/BUILD
index 64c8267..231b532 100644
--- a/iree/tools/BUILD
+++ b/tools/BUILD
@@ -13,6 +13,8 @@
licenses = ["notice"], # Apache 2.0
)
+exports_files(["lit.cfg.py"])
+
cc_binary(
name = "iree-benchmark-module",
srcs = ["iree-benchmark-module-main.cc"],
diff --git a/iree/tools/CMakeLists.txt b/tools/CMakeLists.txt
similarity index 100%
rename from iree/tools/CMakeLists.txt
rename to tools/CMakeLists.txt
diff --git a/iree/tools/android/CMakeLists.txt b/tools/android/CMakeLists.txt
similarity index 100%
rename from iree/tools/android/CMakeLists.txt
rename to tools/android/CMakeLists.txt
diff --git a/iree/tools/android/run_module_app/AndroidManifest.xml.template b/tools/android/run_module_app/AndroidManifest.xml.template
similarity index 100%
rename from iree/tools/android/run_module_app/AndroidManifest.xml.template
rename to tools/android/run_module_app/AndroidManifest.xml.template
diff --git a/iree/tools/android/run_module_app/CMakeLists.txt b/tools/android/run_module_app/CMakeLists.txt
similarity index 100%
rename from iree/tools/android/run_module_app/CMakeLists.txt
rename to tools/android/run_module_app/CMakeLists.txt
diff --git a/iree/tools/android/run_module_app/README.md b/tools/android/run_module_app/README.md
similarity index 100%
rename from iree/tools/android/run_module_app/README.md
rename to tools/android/run_module_app/README.md
diff --git a/iree/tools/android/run_module_app/build_apk.sh b/tools/android/run_module_app/build_apk.sh
old mode 100755
new mode 100644
similarity index 98%
rename from iree/tools/android/run_module_app/build_apk.sh
rename to tools/android/run_module_app/build_apk.sh
index eee7bc9..588a799
--- a/iree/tools/android/run_module_app/build_apk.sh
+++ b/tools/android/run_module_app/build_apk.sh
@@ -141,7 +141,7 @@
# IREE project source root.
IREE_SOURCE_ROOT="$(git rev-parse --show-toplevel)"
# iree-run-module Android app source root.
-IREE_NATIVE_APP_SOURCE_ROOT="${IREE_SOURCE_ROOT?}/iree/tools/android/run_module_app"
+IREE_NATIVE_APP_SOURCE_ROOT="${IREE_SOURCE_ROOT?}/tools/android/run_module_app"
# Directory for IREE native code intermediate intermediate artifacts.
IREE_NATIVE_LIB_BUILD_DIR="${IREE_ARTIFACT_ROOT?}/iree/${IREE_BUILD_TYPE?}"
diff --git a/iree/tools/android/run_module_app/res/values/strings.xml b/tools/android/run_module_app/res/values/strings.xml
similarity index 100%
rename from iree/tools/android/run_module_app/res/values/strings.xml
rename to tools/android/run_module_app/res/values/strings.xml
diff --git a/iree/tools/android/run_module_app/src/main.cc b/tools/android/run_module_app/src/main.cc
similarity index 100%
rename from iree/tools/android/run_module_app/src/main.cc
rename to tools/android/run_module_app/src/main.cc
diff --git a/iree/tools/build_config_template.txt.in b/tools/build_config_template.txt.in
similarity index 100%
rename from iree/tools/build_config_template.txt.in
rename to tools/build_config_template.txt.in
diff --git a/iree/tools/iree-benchmark-module-main.cc b/tools/iree-benchmark-module-main.cc
similarity index 100%
rename from iree/tools/iree-benchmark-module-main.cc
rename to tools/iree-benchmark-module-main.cc
diff --git a/iree/tools/iree-benchmark-trace-main.c b/tools/iree-benchmark-trace-main.c
similarity index 100%
rename from iree/tools/iree-benchmark-trace-main.c
rename to tools/iree-benchmark-trace-main.c
diff --git a/iree/tools/iree-check-module-main.cc b/tools/iree-check-module-main.cc
similarity index 100%
rename from iree/tools/iree-check-module-main.cc
rename to tools/iree-check-module-main.cc
diff --git a/iree/tools/iree-compile-main.cc b/tools/iree-compile-main.cc
similarity index 100%
rename from iree/tools/iree-compile-main.cc
rename to tools/iree-compile-main.cc
diff --git a/iree/tools/iree-dump-module-main.c b/tools/iree-dump-module-main.c
similarity index 100%
rename from iree/tools/iree-dump-module-main.c
rename to tools/iree-dump-module-main.c
diff --git a/iree/tools/iree-e2e-matmul-test.c b/tools/iree-e2e-matmul-test.c
similarity index 100%
rename from iree/tools/iree-e2e-matmul-test.c
rename to tools/iree-e2e-matmul-test.c
diff --git a/iree/tools/iree-mlir-lsp-server.cc b/tools/iree-mlir-lsp-server.cc
similarity index 100%
rename from iree/tools/iree-mlir-lsp-server.cc
rename to tools/iree-mlir-lsp-server.cc
diff --git a/iree/tools/iree-opt-main.cc b/tools/iree-opt-main.cc
similarity index 100%
rename from iree/tools/iree-opt-main.cc
rename to tools/iree-opt-main.cc
diff --git a/iree/tools/iree-run-mlir-main.cc b/tools/iree-run-mlir-main.cc
similarity index 100%
rename from iree/tools/iree-run-mlir-main.cc
rename to tools/iree-run-mlir-main.cc
diff --git a/iree/tools/iree-run-module-main.cc b/tools/iree-run-module-main.cc
similarity index 100%
rename from iree/tools/iree-run-module-main.cc
rename to tools/iree-run-module-main.cc
diff --git a/iree/tools/iree-run-trace-main.c b/tools/iree-run-trace-main.c
similarity index 100%
rename from iree/tools/iree-run-trace-main.c
rename to tools/iree-run-trace-main.c
diff --git a/iree/tools/iree-translate-main.cc b/tools/iree-translate-main.cc
similarity index 100%
rename from iree/tools/iree-translate-main.cc
rename to tools/iree-translate-main.cc
diff --git a/tools/lit.cfg.py b/tools/lit.cfg.py
new file mode 100644
index 0000000..77a0498
--- /dev/null
+++ b/tools/lit.cfg.py
@@ -0,0 +1,32 @@
+# Copyright 2022 The IREE Authors
+#
+# Licensed under the Apache License v2.0 with LLVM Exceptions.
+# See https://llvm.org/LICENSE.txt for license information.
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+"""Lit config for IREE."""
+
+# Lint for undefined variables is disabled as config is not defined inside this
+# file, instead config is injected by way of evaluating runlit.cfg.py from
+# runlit.site.cfg.py which in turn is evaluated by lit.py.
+# pylint: disable=undefined-variable
+
+import os
+import tempfile
+
+import lit.formats
+
+config.name = "IREE"
+config.suffixes = [".mlir", ".txt"]
+config.test_format = lit.formats.ShTest(execute_external=True)
+# Forward all IREE environment variables
+passthrough_env_vars = ["VK_ICD_FILENAMES"]
+config.environment.update({
+ k: v
+ for k, v in os.environ.items()
+ if k.startswith("IREE_") or k in passthrough_env_vars
+})
+
+# Use the most preferred temp directory.
+config.test_exec_root = (os.environ.get("TEST_UNDECLARED_OUTPUTS_DIR") or
+ os.environ.get("TEST_TMPDIR") or
+ os.path.join(tempfile.gettempdir(), "lit"))
diff --git a/iree/tools/test/BUILD b/tools/test/BUILD
similarity index 81%
rename from iree/tools/test/BUILD
rename to tools/test/BUILD
index b5f827b..e388ea6 100644
--- a/iree/tools/test/BUILD
+++ b/tools/test/BUILD
@@ -29,14 +29,15 @@
],
include = ["*.mlir"],
),
+ cfg = "//tools:lit.cfg.py",
tags = [
"hostonly",
],
tools = [
- "//iree/tools:iree-benchmark-module",
- "//iree/tools:iree-compile",
- "//iree/tools:iree-run-mlir",
- "//iree/tools:iree-run-module",
+ "//tools:iree-benchmark-module",
+ "//tools:iree-compile",
+ "//tools:iree-run-mlir",
+ "//tools:iree-run-module",
"@llvm-project//lld",
"@llvm-project//llvm:FileCheck",
],
@@ -45,12 +46,13 @@
iree_lit_test_suite(
name = "benchmark_flags",
srcs = ["benchmark_flags.txt"],
+ cfg = "//tools:lit.cfg.py",
tags = [
"hostonly",
],
tools = [
- "//iree/tools:iree-benchmark-module",
- "//iree/tools:iree-compile",
+ "//tools:iree-benchmark-module",
+ "//tools:iree-compile",
"@llvm-project//llvm:FileCheck",
],
)
diff --git a/iree/tools/test/CMakeLists.txt b/tools/test/CMakeLists.txt
similarity index 81%
rename from iree/tools/test/CMakeLists.txt
rename to tools/test/CMakeLists.txt
index e243d99..899624e 100644
--- a/iree/tools/test/CMakeLists.txt
+++ b/tools/test/CMakeLists.txt
@@ -1,6 +1,6 @@
################################################################################
# Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from #
-# iree/tools/test/BUILD #
+# tools/test/BUILD #
# #
# Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary #
# CMake-only content. #
@@ -24,10 +24,10 @@
TOOLS
${IREE_LLD_TARGET}
FileCheck
- iree::tools::iree-benchmark-module
- iree::tools::iree-compile
- iree::tools::iree-run-mlir
- iree::tools::iree-run-module
+ iree-benchmark-module
+ iree-compile
+ iree-run-mlir
+ iree-run-module
LABELS
"hostonly"
)
@@ -39,8 +39,8 @@
"benchmark_flags.txt"
TOOLS
FileCheck
- iree::tools::iree-benchmark-module
- iree::tools::iree-compile
+ iree-benchmark-module
+ iree-compile
LABELS
"hostonly"
)
diff --git a/iree/tools/test/benchmark_flags.txt b/tools/test/benchmark_flags.txt
similarity index 100%
rename from iree/tools/test/benchmark_flags.txt
rename to tools/test/benchmark_flags.txt
diff --git a/iree/tools/test/iree-benchmark-module.mlir b/tools/test/iree-benchmark-module.mlir
similarity index 100%
rename from iree/tools/test/iree-benchmark-module.mlir
rename to tools/test/iree-benchmark-module.mlir
diff --git a/iree/tools/test/iree-run-mlir.mlir b/tools/test/iree-run-mlir.mlir
similarity index 100%
rename from iree/tools/test/iree-run-mlir.mlir
rename to tools/test/iree-run-mlir.mlir
diff --git a/iree/tools/test/iree-run-module.mlir b/tools/test/iree-run-module.mlir
similarity index 100%
rename from iree/tools/test/iree-run-module.mlir
rename to tools/test/iree-run-module.mlir
diff --git a/iree/tools/test/multiple_args.mlir b/tools/test/multiple_args.mlir
similarity index 100%
rename from iree/tools/test/multiple_args.mlir
rename to tools/test/multiple_args.mlir
diff --git a/iree/tools/test/multiple_exported_functions.mlir b/tools/test/multiple_exported_functions.mlir
similarity index 100%
rename from iree/tools/test/multiple_exported_functions.mlir
rename to tools/test/multiple_exported_functions.mlir
diff --git a/iree/tools/test/repeated_return.mlir b/tools/test/repeated_return.mlir
similarity index 100%
rename from iree/tools/test/repeated_return.mlir
rename to tools/test/repeated_return.mlir
diff --git a/iree/tools/test/scalars.mlir b/tools/test/scalars.mlir
similarity index 100%
rename from iree/tools/test/scalars.mlir
rename to tools/test/scalars.mlir
