Revert "bump llvm (#1193)"

This reverts commit 0774644.
Xilinx · Apr 9, 2024 · b477add · b477add
1 parent 0774644
commit b477add
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 27 deletions.
diff --git a/include/aie/Dialect/AIEVec/TransformOps/AIEVecTransformOps.h b/include/aie/Dialect/AIEVec/TransformOps/AIEVecTransformOps.h
@@ -15,7 +15,7 @@ class GenericOp;
 } // namespace linalg
 } // namespace mlir
 
-#include "mlir/Dialect/Transform/Interfaces/TransformInterfaces.h"
+#include "mlir/Dialect/Transform/IR/TransformInterfaces.h"
 
 #define GET_OP_CLASSES
 #include "aie/Dialect/AIEVec/TransformOps/AIEVecTransformOps.h.inc"

diff --git a/include/aie/Dialect/AIEVec/TransformOps/AIEVecTransformOps.td b/include/aie/Dialect/AIEVec/TransformOps/AIEVecTransformOps.td
@@ -11,7 +11,7 @@
 include "mlir/Dialect/PDL/IR/PDLTypes.td"
 include "mlir/Dialect/Transform/IR/TransformAttrs.td"
 include "mlir/Dialect/Transform/IR/TransformDialect.td"
-include "mlir/Dialect/Transform/Interfaces/TransformInterfaces.td"
+include "mlir/Dialect/Transform/IR/TransformInterfaces.td"
 include "mlir/Dialect/Transform/IR/TransformTypes.td"
 include "mlir/Interfaces/SideEffectInterfaces.td"
 include "mlir/IR/OpBase.td"

diff --git a/lib/Dialect/AIEVec/TransformOps/AIEVecTransformOps.cpp b/lib/Dialect/AIEVec/TransformOps/AIEVecTransformOps.cpp
@@ -10,8 +10,8 @@
 #include "mlir/Dialect/Bufferization/IR/Bufferization.h"
 #include "mlir/Dialect/Linalg/IR/Linalg.h"
 #include "mlir/Dialect/Linalg/Utils/Utils.h"
+#include "mlir/Dialect/Transform/IR/TransformInterfaces.h"
 #include "mlir/Dialect/Transform/IR/TransformTypes.h"
-#include "mlir/Dialect/Transform/Interfaces/TransformInterfaces.h"
 #include "mlir/Dialect/Transform/Utils/Utils.h"
 #include "mlir/Dialect/Vector/IR/VectorOps.h"
 

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -3,29 +3,26 @@
 
 include(AddMLIRPython)
 
-option(AIE_REINSTALL_PYTHON_ENV_PACKAGES "pip install python requirements" ON)
-if (AIE_REINSTALL_PYTHON_ENV_PACKAGES)
-  execute_process(
-    COMMAND_ERROR_IS_FATAL ANY
-    COMMAND ${Python3_EXECUTABLE} -m
-      pip install -r ${CMAKE_CURRENT_SOURCE_DIR}/requirements.txt
-    RESULT_VARIABLE CMD_ERROR
-    OUTPUT_VARIABLE CMD_OUTPUT
-  )
-  if(NOT CMD_ERROR EQUAL "0")
-    message(FATAL_ERROR "pip install requirements.txt failed:" ${CMD_OUTPUT})
-  endif()
+execute_process(
+  COMMAND_ERROR_IS_FATAL ANY
+  COMMAND ${Python3_EXECUTABLE} -m
+    pip install -r ${CMAKE_CURRENT_SOURCE_DIR}/requirements.txt
+  RESULT_VARIABLE CMD_ERROR
+  OUTPUT_VARIABLE CMD_OUTPUT
+)
+if(NOT CMD_ERROR EQUAL "0")
+  message(FATAL_ERROR "pip install requirements.txt failed:" ${CMD_OUTPUT})
+endif()
 
-  execute_process(
-    COMMAND_ERROR_IS_FATAL ANY
-    COMMAND ${Python3_EXECUTABLE} -m
-      pip install -r ${CMAKE_CURRENT_SOURCE_DIR}/aie-python-extras-req.txt --force-reinstall
-    RESULT_VARIABLE CMD_ERROR
-    OUTPUT_VARIABLE CMD_OUTPUT
-  )
-  if(NOT CMD_ERROR EQUAL "0")
-    message(FATAL_ERROR "pip install aie-python-extras-req.txt failed:" ${CMD_OUTPUT})
-  endif()
+execute_process(
+  COMMAND_ERROR_IS_FATAL ANY
+  COMMAND ${Python3_EXECUTABLE} -m
+    pip install -r ${CMAKE_CURRENT_SOURCE_DIR}/aie-python-extras-req.txt --force-reinstall
+  RESULT_VARIABLE CMD_ERROR
+  OUTPUT_VARIABLE CMD_OUTPUT
+)
+if(NOT CMD_ERROR EQUAL "0")
+  message(FATAL_ERROR "pip install aie-python-extras-req.txt failed:" ${CMD_OUTPUT})
 endif()
 
 # The AIE copy of the MLIR bindings is in the `aie.mlir` namespace.

diff --git a/utils/clone-llvm.sh b/utils/clone-llvm.sh
@@ -13,8 +13,8 @@
 ##===----------------------------------------------------------------------===##
 
 # The LLVM commit to use.
-LLVM_PROJECT_COMMIT=d022f6b8ff94bb13d12d39f23a3c3e7836e90756
-DATETIME=2024040913
+LLVM_PROJECT_COMMIT=60dda1fc6ef82c5d7fe54000e6c0a21e7bafdeb5
+DATETIME=2024031100
 WHEEL_VERSION=19.0.0.$DATETIME+${LLVM_PROJECT_COMMIT:0:8}
 
 ############################################################################################