[Mlir-commits] [mlir] 3acc58c - Revert "Fix CMake dependencies on mlir-linalg-ods-yaml-gen" (#113229)

[llvmlistbot at llvm.org]

Author: Mehdi Amini
Date: 2024-10-21T15:28:20-07:00
New Revision: 3acc58c1bba375345ab1abd7e95a379d1d64cea8

URL: https://github.com/llvm/llvm-project/commit/3acc58c1bba375345ab1abd7e95a379d1d64cea8
DIFF: https://github.com/llvm/llvm-project/commit/3acc58c1bba375345ab1abd7e95a379d1d64cea8.diff

LOG: Revert "Fix CMake dependencies on mlir-linalg-ods-yaml-gen" (#113229)

Reverts llvm/llvm-project#112224

Many bots are broken

Added: 
    

Modified: 
    llvm/cmake/modules/AddLLVM.cmake
    mlir/include/mlir/Dialect/Linalg/IR/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
index eba27c267702d5..c62b5649facae1 100644
--- a/llvm/cmake/modules/AddLLVM.cmake
+++ b/llvm/cmake/modules/AddLLVM.cmake
@@ -2618,13 +2618,13 @@ function(get_host_tool_path tool_name setting_name exe_var_name target_var_name)
     set(target_name "")
   elseif(LLVM_USE_HOST_TOOLS)
     get_native_tool_path(${tool_name} exe_name)
-    set(target_name host_${tool_name})
+    set(target_name ${exe_name})
   else()
     set(exe_name $<TARGET_FILE:${tool_name}>)
     set(target_name ${tool_name})
   endif()
-  set(${exe_var_name} "${exe_name}")
-  set(${target_var_name} "${target_name}")
+  set(${exe_var_name} "${exe_name}" CACHE STRING "")
+  set(${target_var_name} "${target_name}" CACHE STRING "")
 endfunction()
 
 function(setup_host_tool tool_name setting_name exe_var_name target_var_name)
@@ -2632,8 +2632,8 @@ function(setup_host_tool tool_name setting_name exe_var_name target_var_name)
   # Set up a native tool build if necessary
   if(LLVM_USE_HOST_TOOLS AND NOT ${setting_name})
     build_native_tool(${tool_name} exe_name DEPENDS ${tool_name})
-    add_custom_target(${${target_var_name}} DEPENDS ${exe_name})
+    add_custom_target(${target_var_name} DEPENDS ${exe_name})
     get_subproject_title(subproject_title)
-    set_target_properties(${${target_var_name}} PROPERTIES FOLDER "${subproject_title}/Native")
+    set_target_properties(${target_var_name} PROPERTIES FOLDER "${subproject_title}/Native")
   endif()
 endfunction()

diff  --git a/mlir/include/mlir/Dialect/Linalg/IR/CMakeLists.txt b/mlir/include/mlir/Dialect/Linalg/IR/CMakeLists.txt
index 71214b4404c550..289c0e4bbdaf68 100644
--- a/mlir/include/mlir/Dialect/Linalg/IR/CMakeLists.txt
+++ b/mlir/include/mlir/Dialect/Linalg/IR/CMakeLists.txt
@@ -15,10 +15,13 @@ function(add_linalg_ods_yaml_gen yaml_ast_file output_file)
     MAIN_DEPENDENCY
     ${YAML_AST_SOURCE}
     DEPENDS
+    ${MLIR_LINALG_ODS_YAML_GEN_EXE}
     ${MLIR_LINALG_ODS_YAML_GEN_TARGET})
   add_custom_target(
     MLIR${output_file}YamlIncGen
     DEPENDS
+    ${MLIR_LINALG_ODS_YAML_GEN_EXE}
+    ${MLIR_LINALG_ODS_YAML_GEN_TARGET}
     ${GEN_ODS_FILE} ${GEN_CPP_FILE})
   set_target_properties(MLIR${output_file}YamlIncGen PROPERTIES FOLDER "MLIR/Tablegenning")
   list(APPEND LLVM_TARGET_DEPENDS ${GEN_ODS_FILE})