Bump llvm e6d16f9 (Xilinx#885)

* mlir-cpu-runner is renamed to mlir-runner * Bump llvm to e6d16f93b329f2f9618d18d0b99c6060e206cf08 * Bump llvm * Bump aie to 3a35554 * Bump mlir-aie
nod-ai · Jan 31, 2025 · e52a78a · e52a78a
1 parent e7f682f
commit e52a78a
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/mlir/lib/Conversion/ConvertToAIRPass.cpp b/mlir/lib/Conversion/ConvertToAIRPass.cpp
@@ -87,7 +87,7 @@ matchAndRewriteCopyOp(memref::CopyOp op, RewriterBase &rewriter) {
     int64_t offset;
     SmallVector<int64_t, 4> layout_strides;
     auto successStrides =
-        getStridesAndOffset(inferredType, layout_strides, offset);
+        inferredType.getStridesAndOffset(layout_strides, offset);
     if (failed(successStrides)) {
       llvm::outs() << "Failed to get strides\n";
       return; // failure();
@@ -145,7 +145,7 @@ static void extractOperandsFromSubview(memref::SubViewOp subview,
   int64_t offset;
   SmallVector<int64_t, 4> layout_strides;
   auto successStrides =
-      getStridesAndOffset(inferredType, layout_strides, offset);
+      inferredType.getStridesAndOffset(layout_strides, offset);
   if (failed(successStrides)) {
     llvm::outs() << "Failed to get strides\n";
     return; // failure();

diff --git a/mlir/lib/Dialect/AIR/IR/AIRDialect.cpp b/mlir/lib/Dialect/AIR/IR/AIRDialect.cpp
@@ -1376,7 +1376,7 @@ static SmallVector<Value> extractStridesFromMemrefType(MemRefType memrefTy,
   SmallVector<Value> strides;
   int64_t offset;
   SmallVector<int64_t, 4> layout_strides;
-  auto successStrides = getStridesAndOffset(memrefTy, layout_strides, offset);
+  auto successStrides = memrefTy.getStridesAndOffset(layout_strides, offset);
   if (failed(successStrides)) {
     llvm::outs() << "Failed to get strides\n";
     return strides;

diff --git a/mlir/test/Conversion/AIRToAIE/insert_trace_packet_flow.mlir b/mlir/test/Conversion/AIRToAIE/insert_trace_packet_flow.mlir
@@ -8,7 +8,7 @@
 // RUN: air-opt %s -air-to-aie='test-patterns=to-aie-mlir insert-trace-packet-flow=true' | FileCheck %s
 // CHECK:    aie.packet_flow(0) {
 // CEHCK:      aie.packet_source<%tile_1_1, Trace : 0>
-// CHECK:      aie.packet_dest<%tile_1_0, DMA : 1>
+// CHECK:      aie.packet_dest<%shim_pl_tile_1_0, DMA : 1>
 // CHECK:    } {keep_pkt_header = true}
 module {
 

diff --git a/programming_examples/matrix_scalar_add/single_core_dma/single_core_dma.py b/programming_examples/matrix_scalar_add/single_core_dma/single_core_dma.py
@@ -69,7 +69,7 @@ def herd_body(_tx, _ty, _sx, _sy, a, b):
                                     image_width // tile_width
                                 ),
                             )
-                            tile_num = arith.AddIOp(tile_num, tile_index1)
+                            tile_num = arith.AddIOp(tile_num.results[0], tile_index1)
 
                             # Copy a tile from the input image (a) into the L1 memory region (tile_in)
                             dma_memcpy_nd(

diff --git a/tools/air-runner/CMakeLists.txt b/tools/air-runner/CMakeLists.txt
@@ -19,4 +19,4 @@ set(LIBS
 
 target_link_libraries(air-runner PRIVATE ${LIBS})
 
-export_executable_symbols(mlir-cpu-runner)
+export_executable_symbols(mlir-runner)
diff --git a/utils/build-llvm-local.sh b/utils/build-llvm-local.sh
@@ -59,7 +59,7 @@ CMAKE_CONFIGS="\
     -DLLVM_OPTIMIZED_TABLEGEN=OFF \
     -DMLIR_ENABLE_BINDINGS_PYTHON=ON \
     -Dpybind11_DIR=${PYTHON_ROOT}/pybind11/share/cmake/pybind11 \
-    -DLLVM_DISTRIBUTION_COMPONENTS=cmake-exports;not;count;FileCheck;MLIRPythonModules;mlir-cpu-runner;mlir-linalg-ods-yaml-gen;mlir-opt;mlir-reduce;mlir-tblgen;mlir-translate;mlir-headers;mlir-cmake-exports"
+    -DLLVM_DISTRIBUTION_COMPONENTS=cmake-exports;not;count;FileCheck;MLIRPythonModules;mlir-runner;mlir-linalg-ods-yaml-gen;mlir-opt;mlir-reduce;mlir-tblgen;mlir-translate;mlir-headers;mlir-cmake-exports"
 
 if [ -x "$(command -v lld)" ]; then
   CMAKE_CONFIGS="${CMAKE_CONFIGS} -DLLVM_USE_LINKER=lld"

diff --git a/utils/clone-llvm.sh b/utils/clone-llvm.sh
@@ -14,7 +14,7 @@
 #
 ##===----------------------------------------------------------------------===##
 
-export commithash=4b06b01e62ab0cfd059f47dceeb6cd0fb96304c9
+export commithash=e6d16f93b329f2f9618d18d0b99c6060e206cf08
 target_dir=llvm
 
 # clone llvm if it is not there already

diff --git a/utils/clone-mlir-aie.sh b/utils/clone-mlir-aie.sh
@@ -14,7 +14,7 @@
 #
 ##===----------------------------------------------------------------------===##
 
-export HASH=0d03400dca76782df37ef9f945ce9820904d887f
+export HASH=3a35554470eb44deea91d016ed14389265c46dbb
 target_dir=mlir-aie
 
 if [[ ! -d $target_dir ]]; then
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,4 +19,4 @@ set(LIBS

		target_link_libraries(air-runner PRIVATE ${LIBS})

		export_executable_symbols(mlir-cpu-runner)
		export_executable_symbols(mlir-runner)