Remove special handling for runtime -> compiler dep (#4396)
Now that the VM generated op definitions are checked in, we can avoid
this weird special casing.
I think there should be more cleanup around `IREE_ENABLE_MLIR` in
general, but deferring that for another change.
Tested:
Built and tested with compiler and mlir disabled
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0260777..a2d3aa5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -518,11 +518,6 @@
if(${IREE_BUILD_COMPILER})
add_subdirectory(iree/compiler)
-elseif(${IREE_ENABLE_MLIR})
- # If not building the compiler, tablegen is still needed
- # to generate vm ops so deep include it only.
- add_subdirectory(iree/compiler/Dialect/IREE/Tools)
- add_subdirectory(iree/compiler/Dialect/VM/Tools)
endif()
if(${IREE_BUILD_JAVA_BINDINGS})
diff --git a/iree/tools/CMakeLists.txt b/iree/tools/CMakeLists.txt
index bea4bc5..8af7554 100644
--- a/iree/tools/CMakeLists.txt
+++ b/iree/tools/CMakeLists.txt
@@ -135,7 +135,7 @@
iree::vm::bytecode_module
)
-if(${IREE_ENABLE_MLIR})
+if(${IREE_BUILD_COMPILER})
iree_cc_binary(
NAME
iree-tblgen
@@ -151,9 +151,7 @@
MLIRTableGen
HOSTONLY
)
-endif()
-if(${IREE_BUILD_COMPILER})
iree_cc_library(
NAME
init_iree_passes_and_dialects
@@ -370,10 +368,19 @@
iree::vm::bytecode_module
HOSTONLY
)
+
+ add_custom_target(IreeFileCheck ALL
+ COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/IreeFileCheck.sh IreeFileCheck
+ )
+ if(${IREE_MLIR_DEP_MODE} STREQUAL "BUNDLED")
+ add_custom_target(BundledLLVMFileCheck ALL
+ COMMAND ${CMAKE_COMMAND} -E create_symlink $<TARGET_FILE:FileCheck> FileCheck
+ DEPENDS FileCheck
+ )
+ endif()
endif(${IREE_BUILD_COMPILER})
# If cross-compiling, we need to declare iree-translate under host configuration
-
# unconditionally because we need to run it on host to generate VM modules
# for tests.
if(${IREE_BUILD_COMPILER} OR CMAKE_CROSSCOMPILING)
@@ -387,15 +394,3 @@
HOSTONLY
)
endif()
-
-if(${IREE_ENABLE_MLIR})
- add_custom_target(IreeFileCheck ALL
- COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/IreeFileCheck.sh IreeFileCheck
- )
- if(${IREE_MLIR_DEP_MODE} STREQUAL "BUNDLED")
- add_custom_target(BundledLLVMFileCheck ALL
- COMMAND ${CMAKE_COMMAND} -E create_symlink $<TARGET_FILE:FileCheck> FileCheck
- DEPENDS FileCheck
- )
- endif()
-endif()
