Update CMake packages to anchor on iree:: for top level dirs. (#9220)
Progress on https://github.com/google/iree/issues/8955, forked from the discussion at https://github.com/google/iree/pull/9203#discussion_r881838068.
This updates our CMake target mappings / package namespaces to be implicitly rooted on `iree::`, notably for the top level `build_tools/`, `samples/`, `tests/`, and `tools/` directories.
The only exceptions are
* `llvm-external-projects/`
* `tools::` targets which sit at the root (`iree-compile` instead of `iree_iree-compile`)
* `compiler/src/iree/` and `runtime/src/iree/`
With this, all of our CMake target and test names begin with `iree_`, `iree-`, or `IREE` again, so we don't have loose / unqualified names like `build_tools/benchmarks/common/benchmark_config_test`, `tools/test/benchmark_flags.txt.test`, or `runtime_bindings_python_PyExtRt`.
diff --git a/tools/BUILD b/tools/BUILD
index 27757f5..2d52f64 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -4,8 +4,15 @@
# See https://llvm.org/LICENSE.txt for license information.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-# Misc tools used to optimize, translate, and evaluate IREE.
-# Compiler tooling, like the compiler, is not designed to run on device and is tagged as "hostonly".
+# Tools IREE provides for compiling, executing, and benchmarking programs, as
+# well as other utilities.
+#
+# Only binary targets and their associated main files should go in this
+# directory. Library targets and header files should be placed in the
+# appropriate subtree, e.g. `compiler/src/iree/compiler/Tools/`.
+#
+# Programs with a dependency on the compiler are not designed to run on device
+# platforms (e.g. Android), so they are tagged "hostonly".
package(
default_visibility = ["//visibility:public"],
@@ -89,9 +96,10 @@
],
)
-cc_library(
- name = "iree_opt_main",
+cc_binary(
+ name = "iree-opt",
srcs = ["iree-opt-main.cc"],
+ tags = ["hostonly"],
deps = [
"//compiler/src/iree/compiler/Tools:init_passes_and_dialects",
"//compiler/src/iree/compiler/Tools:init_targets",
@@ -103,14 +111,6 @@
)
cc_binary(
- name = "iree-opt",
- tags = ["hostonly"],
- deps = [
- ":iree_opt_main",
- ],
-)
-
-cc_binary(
name = "iree-mlir-lsp-server",
srcs = ["iree-mlir-lsp-server.cc"],
deps = [
