sw:vec_iree: Fix iree-compile CMake path Match CMake function change in https://github.com/iree-org/iree/pull/11764 Change-Id: I4ddd3445cbd52f609c818ad45cbd7b98c563ee75
diff --git a/cmake/springbok_static_module.cmake b/cmake/springbok_static_module.cmake index 2fd6b45..099a615 100644 --- a/cmake/springbok_static_module.cmake +++ b/cmake/springbok_static_module.cmake
@@ -47,7 +47,9 @@ set(_MLIR_SRC "${_RULE_SRC}") string(FIND "${_RULE_SRC}" ".tflite" _IS_TFLITE REVERSE) if(${_IS_TFLITE} GREATER 0) - iree_get_executable_path(IREE_IMPORT_TFLITE_TOOL "iree-import-tflite") + if(NOT TARGET iree-import-tflite) + iree_import_binary(NAME "iree-import-tflite") + endif() set(_MLIR_SRC "${CMAKE_CURRENT_BINARY_DIR}/${_RULE_NAME}.mlir") get_filename_component(_SRC_PATH "${_RULE_SRC}" REALPATH) set(_ARGS "${_SRC_PATH}") @@ -59,14 +61,13 @@ OUTPUT "${_RULE_NAME}.mlir" COMMAND - ${IREE_IMPORT_TFLITE_TOOL} + iree-import-tflite ${_ARGS} DEPENDS - ${IREE_IMPORT_TFLITE_TOOL} + iree-import-tflite ) endif() - iree_get_executable_path(_COMPILER_TOOL "iree-compile") iree_package_name(_PACKAGE_NAME) iree_package_ns(_PACKAGE_NS) @@ -110,8 +111,8 @@ add_custom_command( OUTPUT ${_OUTPUT_FILES} - COMMAND ${_COMPILER_TOOL} ${_COMPILER_ARGS} - DEPENDS ${_COMPILER_TOOL} ${_MLIR_SRC} + COMMAND iree-compile ${_COMPILER_ARGS} + DEPENDS iree-compile ${_MLIR_SRC} ) set(_EMITC_LIB_NAME "${_PACKAGE_NAME}_${_MODULE_NAME}")
diff --git a/cmake/springbok_vmvx_module.cmake b/cmake/springbok_vmvx_module.cmake index 5487e94..a720a40 100644 --- a/cmake/springbok_vmvx_module.cmake +++ b/cmake/springbok_vmvx_module.cmake
@@ -44,7 +44,9 @@ set(_MLIR_SRC "${_RULE_SRC}") string(FIND "${_RULE_SRC}" ".tflite" _IS_TFLITE REVERSE) if(${_IS_TFLITE} GREATER 0) - iree_get_executable_path(IREE_IMPORT_TFLITE_TOOL "iree-import-tflite") + if(NOT TARGET iree-import-tflite) + iree_import_binary(NAME "iree-import-tflite") + endif() set(_MLIR_SRC "${CMAKE_CURRENT_BINARY_DIR}/${_RULE_NAME}.mlir") get_filename_component(_SRC_PATH "${_RULE_SRC}" REALPATH) set(_ARGS "${_SRC_PATH}") @@ -56,14 +58,13 @@ OUTPUT "${_RULE_NAME}.mlir" COMMAND - ${IREE_IMPORT_TFLITE_TOOL} + iree-import-tflite ${_ARGS} DEPENDS - ${IREE_IMPORT_TFLITE_TOOL} + iree-import-tflite ) endif() - iree_get_executable_path(_COMPILER_TOOL "iree-compile") iree_package_name(_PACKAGE_NAME) iree_package_ns(_PACKAGE_NS) @@ -90,8 +91,8 @@ add_custom_command( OUTPUT ${_H_FILE_NAME} - COMMAND ${_COMPILER_TOOL} ${_COMPILER_ARGS} - DEPENDS ${_COMPILER_TOOL} ${_MLIR_SRC} + COMMAND iree-compile ${_COMPILER_ARGS} + DEPENDS iree-compile ${_MLIR_SRC} ) set(_EMITC_LIB_NAME "${_PACKAGE_NAME}_${_MODULE_NAME}")