Merge branch 'Xilinx:main' into main

jackl-xilinx · Apr 9, 2024 · 5198394 · 5198394
2 parents 916cd2c + 0774644
commit 5198394
Show file tree

Hide file tree

Showing 141 changed files with 184 additions and 37 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -287,7 +287,7 @@ endif()
 # Last because each of these has its own CMakeLists.txt which reloads/re-finds LLVM, thus resettings globals.
 add_subdirectory(reference_designs)
 add_subdirectory(test)
-add_subdirectory(tutorials)
+add_subdirectory(mlir_tutorials)
 add_subdirectory(cmake/modules)
 
 get_filename_component(COMPILER_DIRECTORY ${CMAKE_CXX_COMPILER} DIRECTORY)

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/IR/TransformInterfaces.h"
+#include "mlir/Dialect/Transform/Interfaces/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/IR/TransformInterfaces.td"
+include "mlir/Dialect/Transform/Interfaces/TransformInterfaces.td"
 include "mlir/Dialect/Transform/IR/TransformTypes.td"
 include "mlir/Interfaces/SideEffectInterfaces.td"
 include "mlir/IR/OpBase.td"

diff --git a/lib/Dialect/AIE/Transforms/AIEObjectFifoStatefulTransform.cpp b/lib/Dialect/AIE/Transforms/AIEObjectFifoStatefulTransform.cpp
@@ -848,6 +848,34 @@ struct AIEObjectFifoStatefulTransformPass
                       std::vector<std::vector<int>> &dependencies, Value base,
                       int64_t step, bool inLoop) {
     std::vector<Operation *> duplicatedOperations; // operations in current
+    // Recursive function to replace operands, uses recursion to handle nested
+    // loop structures.
+    std::function<void(Operation *, unsigned &, unsigned)> replaceOpsNested =
+        [&](Operation *op, unsigned &opIndex,
+            unsigned numDuplications) -> void {
+      if (auto loopOp = dyn_cast<scf::ForOp>(op)) {
+        Block *body = loopOp.getBody();
+        auto withoutTerminator = --body->end();
+        // NOTE(jornt): This only handles the cases where the nested scf::for is
+        // located at the start of the body. This should be the most common
+        // case, but is not fully generic.
+        if (auto nestedLoop = dyn_cast<scf::ForOp>(body->begin())) {
+          opIndex++;
+          replaceOperands(builder, nestedLoop, opIndex, base, step, inLoop,
+                          numDuplications, dependencies, duplicatedOperations);
+          replaceOpsNested(nestedLoop, opIndex, numDuplications);
+        } else {
+          for (auto loopBodyOp = body->begin(); loopBodyOp != withoutTerminator;
+               ++loopBodyOp) {
+            opIndex++;
+            replaceOperands(builder, &*loopBodyOp, opIndex, base, step, inLoop,
+                            numDuplications, dependencies,
+                            duplicatedOperations);
+          }
+        }
+      }
+    };
+
     // duplication iteration
     for (int i = 0; i < numDuplications; i++) {
       duplicatedOperations.clear();
@@ -858,17 +886,7 @@ struct AIEObjectFifoStatefulTransformPass
         replaceOperands(builder, clone, opIndex, base, step, inLoop, i,
                         dependencies, duplicatedOperations);
         builder.insert(clone);
-
-        if (auto nestedLoop = dyn_cast<scf::ForOp>(clone)) {
-          Block *body = nestedLoop.getBody();
-          auto withoutTerminator = --body->end();
-          for (auto loopOp = body->begin(); loopOp != withoutTerminator;
-               ++loopOp) {
-            opIndex++;
-            replaceOperands(builder, &*loopOp, opIndex, base, step, inLoop, i,
-                            dependencies, duplicatedOperations);
-          }
-        }
+        replaceOpsNested(clone, opIndex, i);
       }
     }
   }

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/tutorials/CMakeLists.txt → mlir_tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt → mlir_tutorials/CMakeLists.txt
diff --git a/tutorials/README.md → mlir_tutorials/README.md b/tutorials/README.md → mlir_tutorials/README.md
diff --git a/tutorials/images/OF_broadcast.png → mlir_tutorials/images/OF_broadcast.png b/tutorials/images/OF_broadcast.png → mlir_tutorials/images/OF_broadcast.png
diff --git a/tutorials/images/OF_external_mem.png → mlir_tutorials/images/OF_external_mem.png b/tutorials/images/OF_external_mem.png → mlir_tutorials/images/OF_external_mem.png
diff --git a/tutorials/images/OF_non_shared.png → mlir_tutorials/images/OF_non_shared.png b/tutorials/images/OF_non_shared.png → mlir_tutorials/images/OF_non_shared.png
diff --git a/tutorials/images/OF_shared.png → mlir_tutorials/images/OF_shared.png b/tutorials/images/OF_shared.png → mlir_tutorials/images/OF_shared.png
diff --git a/tutorials/images/answer1.jpg → mlir_tutorials/images/answer1.jpg b/tutorials/images/answer1.jpg → mlir_tutorials/images/answer1.jpg
diff --git a/tutorials/images/diagram0.jpg → mlir_tutorials/images/diagram0.jpg b/tutorials/images/diagram0.jpg → mlir_tutorials/images/diagram0.jpg
diff --git a/tutorials/images/diagram1.png → mlir_tutorials/images/diagram1.png b/tutorials/images/diagram1.png → mlir_tutorials/images/diagram1.png
diff --git a/tutorials/images/diagram10.jpg → mlir_tutorials/images/diagram10.jpg b/tutorials/images/diagram10.jpg → mlir_tutorials/images/diagram10.jpg
diff --git a/tutorials/images/diagram11.jpg → mlir_tutorials/images/diagram11.jpg b/tutorials/images/diagram11.jpg → mlir_tutorials/images/diagram11.jpg
diff --git a/tutorials/images/diagram3.png → mlir_tutorials/images/diagram3.png b/tutorials/images/diagram3.png → mlir_tutorials/images/diagram3.png
diff --git a/tutorials/images/diagram4.png → mlir_tutorials/images/diagram4.png b/tutorials/images/diagram4.png → mlir_tutorials/images/diagram4.png
diff --git a/tutorials/images/diagram5.jpg → mlir_tutorials/images/diagram5.jpg b/tutorials/images/diagram5.jpg → mlir_tutorials/images/diagram5.jpg
diff --git a/tutorials/images/diagram6.png → mlir_tutorials/images/diagram6.png b/tutorials/images/diagram6.png → mlir_tutorials/images/diagram6.png
diff --git a/tutorials/images/diagram7.jpg → mlir_tutorials/images/diagram7.jpg b/tutorials/images/diagram7.jpg → mlir_tutorials/images/diagram7.jpg
diff --git a/tutorials/images/diagram8.jpg → mlir_tutorials/images/diagram8.jpg b/tutorials/images/diagram8.jpg → mlir_tutorials/images/diagram8.jpg
diff --git a/tutorials/images/diagram9.png → mlir_tutorials/images/diagram9.png b/tutorials/images/diagram9.png → mlir_tutorials/images/diagram9.png
diff --git a/tutorials/images/intro1.png → mlir_tutorials/images/intro1.png b/tutorials/images/intro1.png → mlir_tutorials/images/intro1.png
diff --git a/tutorials/images/intro2.png → mlir_tutorials/images/intro2.png b/tutorials/images/intro2.png → mlir_tutorials/images/intro2.png
diff --git a/tutorials/images/intro3.png → mlir_tutorials/images/intro3.png b/tutorials/images/intro3.png → mlir_tutorials/images/intro3.png
diff --git a/tutorials/images/intro4.png → mlir_tutorials/images/intro4.png b/tutorials/images/intro4.png → mlir_tutorials/images/intro4.png
diff --git a/tutorials/images/intro5.png → mlir_tutorials/images/intro5.png b/tutorials/images/intro5.png → mlir_tutorials/images/intro5.png
diff --git a/tutorials/images/routing_visualization.png → ...utorials/images/routing_visualization.png b/tutorials/images/routing_visualization.png → ...utorials/images/routing_visualization.png
diff --git a/tutorials/images/wave0.jpg → mlir_tutorials/images/wave0.jpg b/tutorials/images/wave0.jpg → mlir_tutorials/images/wave0.jpg
diff --git a/tutorials/images/wave1.jpg → mlir_tutorials/images/wave1.jpg b/tutorials/images/wave1.jpg → mlir_tutorials/images/wave1.jpg
diff --git a/tutorials/lit.cfg.py → mlir_tutorials/lit.cfg.py b/tutorials/lit.cfg.py → mlir_tutorials/lit.cfg.py
diff --git a/tutorials/lit.local.cfg → mlir_tutorials/lit.local.cfg b/tutorials/lit.local.cfg → mlir_tutorials/lit.local.cfg
diff --git a/tutorials/lit.site.cfg.py.in → mlir_tutorials/lit.site.cfg.py.in b/tutorials/lit.site.cfg.py.in → mlir_tutorials/lit.site.cfg.py.in
diff --git a/tutorials/makefile-common → mlir_tutorials/makefile-common b/tutorials/makefile-common → mlir_tutorials/makefile-common
diff --git a/tutorials/scripts/visualize.py → mlir_tutorials/scripts/visualize.py b/tutorials/scripts/visualize.py → mlir_tutorials/scripts/visualize.py
diff --git a/tutorials/tutorial-1/Makefile → mlir_tutorials/tutorial-1/Makefile b/tutorials/tutorial-1/Makefile → mlir_tutorials/tutorial-1/Makefile
diff --git a/tutorials/tutorial-1/README.md → mlir_tutorials/tutorial-1/README.md b/tutorials/tutorial-1/README.md → mlir_tutorials/tutorial-1/README.md
diff --git a/tutorials/tutorial-1/aie.mlir → mlir_tutorials/tutorial-1/aie.mlir b/tutorials/tutorial-1/aie.mlir → mlir_tutorials/tutorial-1/aie.mlir
diff --git a/tutorials/tutorial-1/answers/aie_q5.mlir → ..._tutorials/tutorial-1/answers/aie_q5.mlir b/tutorials/tutorial-1/answers/aie_q5.mlir → ..._tutorials/tutorial-1/answers/aie_q5.mlir
diff --git a/tutorials/tutorial-1/answers/aie_q6.mlir → ..._tutorials/tutorial-1/answers/aie_q6.mlir b/tutorials/tutorial-1/answers/aie_q6.mlir → ..._tutorials/tutorial-1/answers/aie_q6.mlir
diff --git a/tutorials/tutorial-1/test.cpp → mlir_tutorials/tutorial-1/test.cpp b/tutorials/tutorial-1/test.cpp → mlir_tutorials/tutorial-1/test.cpp
diff --git a/tutorials/tutorial-10/README.md → mlir_tutorials/tutorial-10/README.md b/tutorials/tutorial-10/README.md → mlir_tutorials/tutorial-10/README.md
diff --git a/tutorials/tutorial-11/README.md → mlir_tutorials/tutorial-11/README.md b/tutorials/tutorial-11/README.md → mlir_tutorials/tutorial-11/README.md
diff --git a/tutorials/tutorial-2/README.md → mlir_tutorials/tutorial-2/README.md b/tutorials/tutorial-2/README.md → mlir_tutorials/tutorial-2/README.md
diff --git a/tutorials/tutorial-2/tutorial-2a/Makefile → ...tutorials/tutorial-2/tutorial-2a/Makefile b/tutorials/tutorial-2/tutorial-2a/Makefile → ...tutorials/tutorial-2/tutorial-2a/Makefile
diff --git a/tutorials/tutorial-2/tutorial-2a/README.md → ...utorials/tutorial-2/tutorial-2a/README.md b/tutorials/tutorial-2/tutorial-2a/README.md → ...utorials/tutorial-2/tutorial-2a/README.md
diff --git a/tutorials/tutorial-2/tutorial-2a/aie.mlir → ...tutorials/tutorial-2/tutorial-2a/aie.mlir b/tutorials/tutorial-2/tutorial-2a/aie.mlir → ...tutorials/tutorial-2/tutorial-2a/aie.mlir
diff --git a/tutorials/tutorial-2/tutorial-2a/test.cpp → ...tutorials/tutorial-2/tutorial-2a/test.cpp b/tutorials/tutorial-2/tutorial-2a/test.cpp → ...tutorials/tutorial-2/tutorial-2a/test.cpp
diff --git a/tutorials/tutorial-2/tutorial-2b/Makefile → ...tutorials/tutorial-2/tutorial-2b/Makefile b/tutorials/tutorial-2/tutorial-2b/Makefile → ...tutorials/tutorial-2/tutorial-2b/Makefile
diff --git a/tutorials/tutorial-2/tutorial-2b/README.md → ...utorials/tutorial-2/tutorial-2b/README.md b/tutorials/tutorial-2/tutorial-2b/README.md → ...utorials/tutorial-2/tutorial-2b/README.md
diff --git a/tutorials/tutorial-2/tutorial-2b/aie.mlir → ...tutorials/tutorial-2/tutorial-2b/aie.mlir b/tutorials/tutorial-2/tutorial-2b/aie.mlir → ...tutorials/tutorial-2/tutorial-2b/aie.mlir
diff --git a/...al-2/tutorial-2b/answers/tutorial-2b.gtkw → ...al-2/tutorial-2b/answers/tutorial-2b.gtkw b/...al-2/tutorial-2b/answers/tutorial-2b.gtkw → ...al-2/tutorial-2b/answers/tutorial-2b.gtkw
diff --git a/tutorials/tutorial-2/tutorial-2b/test.cpp → ...tutorials/tutorial-2/tutorial-2b/test.cpp b/tutorials/tutorial-2/tutorial-2b/test.cpp → ...tutorials/tutorial-2/tutorial-2b/test.cpp
diff --git a/tutorials/tutorial-2/tutorial-2c/Makefile → ...tutorials/tutorial-2/tutorial-2c/Makefile b/tutorials/tutorial-2/tutorial-2c/Makefile → ...tutorials/tutorial-2/tutorial-2c/Makefile
diff --git a/tutorials/tutorial-2/tutorial-2c/README.md → ...utorials/tutorial-2/tutorial-2c/README.md b/tutorials/tutorial-2/tutorial-2c/README.md → ...utorials/tutorial-2/tutorial-2c/README.md
diff --git a/tutorials/tutorial-2/tutorial-2c/aie.mlir → ...tutorials/tutorial-2/tutorial-2c/aie.mlir b/tutorials/tutorial-2/tutorial-2c/aie.mlir → ...tutorials/tutorial-2/tutorial-2c/aie.mlir
diff --git a/...rial-2/tutorial-2c/answers/aie_empty.mlir → ...rial-2/tutorial-2c/answers/aie_empty.mlir b/...rial-2/tutorial-2c/answers/aie_empty.mlir → ...rial-2/tutorial-2c/answers/aie_empty.mlir
diff --git a/...2/tutorial-2c/answers/aie_real_empty.mlir → ...2/tutorial-2c/answers/aie_real_empty.mlir b/...2/tutorial-2c/answers/aie_real_empty.mlir → ...2/tutorial-2c/answers/aie_real_empty.mlir
diff --git a/...orial-2/tutorial-2c/answers/test_perf.cpp → ...orial-2/tutorial-2c/answers/test_perf.cpp b/...orial-2/tutorial-2c/answers/test_perf.cpp → ...orial-2/tutorial-2c/answers/test_perf.cpp
diff --git a/tutorials/tutorial-2/tutorial-2c/test.cpp → ...tutorials/tutorial-2/tutorial-2c/test.cpp b/tutorials/tutorial-2/tutorial-2c/test.cpp → ...tutorials/tutorial-2/tutorial-2c/test.cpp
diff --git a/tutorials/tutorial-3/Makefile → mlir_tutorials/tutorial-3/Makefile b/tutorials/tutorial-3/Makefile → mlir_tutorials/tutorial-3/Makefile
diff --git a/tutorials/tutorial-3/README.md → mlir_tutorials/tutorial-3/README.md b/tutorials/tutorial-3/README.md → mlir_tutorials/tutorial-3/README.md
diff --git a/tutorials/tutorial-3/aie.mlir → mlir_tutorials/tutorial-3/aie.mlir b/tutorials/tutorial-3/aie.mlir → mlir_tutorials/tutorial-3/aie.mlir
diff --git a/tutorials/tutorial-3/answers/aie_perf.mlir → ...utorials/tutorial-3/answers/aie_perf.mlir b/tutorials/tutorial-3/answers/aie_perf.mlir → ...utorials/tutorial-3/answers/aie_perf.mlir
diff --git a/tutorials/tutorial-3/answers/test_perf.cpp → ...utorials/tutorial-3/answers/test_perf.cpp b/tutorials/tutorial-3/answers/test_perf.cpp → ...utorials/tutorial-3/answers/test_perf.cpp
diff --git a/tutorials/tutorial-3/objectFifo_ver/Makefile → ...orials/tutorial-3/objectFifo_ver/Makefile b/tutorials/tutorial-3/objectFifo_ver/Makefile → ...orials/tutorial-3/objectFifo_ver/Makefile
diff --git a/...rials/tutorial-3/objectFifo_ver/README.md → ...rials/tutorial-3/objectFifo_ver/README.md b/...rials/tutorial-3/objectFifo_ver/README.md → ...rials/tutorial-3/objectFifo_ver/README.md
diff --git a/tutorials/tutorial-3/objectFifo_ver/aie.mlir → ...orials/tutorial-3/objectFifo_ver/aie.mlir b/tutorials/tutorial-3/objectFifo_ver/aie.mlir → ...orials/tutorial-3/objectFifo_ver/aie.mlir
diff --git a/tutorials/tutorial-3/objectFifo_ver/test.cpp → ...orials/tutorial-3/objectFifo_ver/test.cpp b/tutorials/tutorial-3/objectFifo_ver/test.cpp → ...orials/tutorial-3/objectFifo_ver/test.cpp
diff --git a/tutorials/tutorial-3/test.cpp → mlir_tutorials/tutorial-3/test.cpp b/tutorials/tutorial-3/test.cpp → mlir_tutorials/tutorial-3/test.cpp
diff --git a/tutorials/tutorial-4/Makefile → mlir_tutorials/tutorial-4/Makefile b/tutorials/tutorial-4/Makefile → mlir_tutorials/tutorial-4/Makefile
diff --git a/tutorials/tutorial-4/README.md → mlir_tutorials/tutorial-4/README.md b/tutorials/tutorial-4/README.md → mlir_tutorials/tutorial-4/README.md
diff --git a/tutorials/tutorial-4/aie.mlir → mlir_tutorials/tutorial-4/aie.mlir b/tutorials/tutorial-4/aie.mlir → mlir_tutorials/tutorial-4/aie.mlir
diff --git a/tutorials/tutorial-4/flow/Makefile → mlir_tutorials/tutorial-4/flow/Makefile b/tutorials/tutorial-4/flow/Makefile → mlir_tutorials/tutorial-4/flow/Makefile
diff --git a/tutorials/tutorial-4/flow/README.md → mlir_tutorials/tutorial-4/flow/README.md b/tutorials/tutorial-4/flow/README.md → mlir_tutorials/tutorial-4/flow/README.md
diff --git a/tutorials/tutorial-4/flow/aie.mlir → mlir_tutorials/tutorial-4/flow/aie.mlir b/tutorials/tutorial-4/flow/aie.mlir → mlir_tutorials/tutorial-4/flow/aie.mlir
diff --git a/...rials/tutorial-4/flow/answers/aie_q5.mlir → ...rials/tutorial-4/flow/answers/aie_q5.mlir b/...rials/tutorial-4/flow/answers/aie_q5.mlir → ...rials/tutorial-4/flow/answers/aie_q5.mlir
diff --git a/...als/tutorial-4/flow/answers/test_perf.cpp → ...als/tutorial-4/flow/answers/test_perf.cpp b/...als/tutorial-4/flow/answers/test_perf.cpp → ...als/tutorial-4/flow/answers/test_perf.cpp
diff --git a/...rials/tutorial-4/flow/answers/test_q5.cpp → ...rials/tutorial-4/flow/answers/test_q5.cpp b/...rials/tutorial-4/flow/answers/test_q5.cpp → ...rials/tutorial-4/flow/answers/test_q5.cpp
diff --git a/...orial-4/flow/answers/tutorial-4_perf.gtkw → ...orial-4/flow/answers/tutorial-4_perf.gtkw b/...orial-4/flow/answers/tutorial-4_perf.gtkw → ...orial-4/flow/answers/tutorial-4_perf.gtkw
diff --git a/tutorials/tutorial-4/flow/test.cpp → mlir_tutorials/tutorial-4/flow/test.cpp b/tutorials/tutorial-4/flow/test.cpp → mlir_tutorials/tutorial-4/flow/test.cpp
diff --git a/tutorials/tutorial-4/switchbox/Makefile → mlir_tutorials/tutorial-4/switchbox/Makefile b/tutorials/tutorial-4/switchbox/Makefile → mlir_tutorials/tutorial-4/switchbox/Makefile
diff --git a/tutorials/tutorial-4/switchbox/README.md → ..._tutorials/tutorial-4/switchbox/README.md b/tutorials/tutorial-4/switchbox/README.md → ..._tutorials/tutorial-4/switchbox/README.md
diff --git a/tutorials/tutorial-4/switchbox/aie.mlir → mlir_tutorials/tutorial-4/switchbox/aie.mlir b/tutorials/tutorial-4/switchbox/aie.mlir → mlir_tutorials/tutorial-4/switchbox/aie.mlir
diff --git a/...al-4/switchbox/path/pathfinder_input.mlir → ...al-4/switchbox/path/pathfinder_input.mlir b/...al-4/switchbox/path/pathfinder_input.mlir → ...al-4/switchbox/path/pathfinder_input.mlir
diff --git a/tutorials/tutorial-4/switchbox/test.cpp → mlir_tutorials/tutorial-4/switchbox/test.cpp b/tutorials/tutorial-4/switchbox/test.cpp → mlir_tutorials/tutorial-4/switchbox/test.cpp
diff --git a/tutorials/tutorial-4/test.cpp → mlir_tutorials/tutorial-4/test.cpp b/tutorials/tutorial-4/test.cpp → mlir_tutorials/tutorial-4/test.cpp
diff --git a/tutorials/tutorial-5/Makefile → mlir_tutorials/tutorial-5/Makefile b/tutorials/tutorial-5/Makefile → mlir_tutorials/tutorial-5/Makefile
diff --git a/tutorials/tutorial-5/README.md → mlir_tutorials/tutorial-5/README.md b/tutorials/tutorial-5/README.md → mlir_tutorials/tutorial-5/README.md
diff --git a/tutorials/tutorial-5/aie.mlir → mlir_tutorials/tutorial-5/aie.mlir b/tutorials/tutorial-5/aie.mlir → mlir_tutorials/tutorial-5/aie.mlir
diff --git a/tutorials/tutorial-5/flow/Makefile → mlir_tutorials/tutorial-5/flow/Makefile b/tutorials/tutorial-5/flow/Makefile → mlir_tutorials/tutorial-5/flow/Makefile
diff --git a/tutorials/tutorial-5/flow/README.md → mlir_tutorials/tutorial-5/flow/README.md b/tutorials/tutorial-5/flow/README.md → mlir_tutorials/tutorial-5/flow/README.md
diff --git a/tutorials/tutorial-5/flow/aie.mlir → mlir_tutorials/tutorial-5/flow/aie.mlir b/tutorials/tutorial-5/flow/aie.mlir → mlir_tutorials/tutorial-5/flow/aie.mlir
diff --git a/tutorials/tutorial-5/flow/test.cpp → mlir_tutorials/tutorial-5/flow/test.cpp b/tutorials/tutorial-5/flow/test.cpp → mlir_tutorials/tutorial-5/flow/test.cpp
@@ -86,7 +86,7 @@ int main(int argc, char *argv[]) {
   mlir_aie_release_ddr_test_buffer_in_lock(_xaie, 1, 0);
   mlir_aie_release_ddr_test_buffer_out_lock(_xaie, 1, 0);
 
-  if(mlir_aie_acquire_ddr_test_buffer_out_lock(_xaie, 0, 1000) == XAIE_OK)
+  if (mlir_aie_acquire_ddr_test_buffer_out_lock(_xaie, 0, 1000) == XAIE_OK)
     printf("Acquired ddr output lock(0). Output shim dma done.\n");
   else
     printf("Timed out (1000) while trying to acquire ddr output lock (0).\n");

diff --git a/tutorials/tutorial-5/test.cpp → mlir_tutorials/tutorial-5/test.cpp b/tutorials/tutorial-5/test.cpp → mlir_tutorials/tutorial-5/test.cpp
diff --git a/tutorials/tutorial-6/Makefile → mlir_tutorials/tutorial-6/Makefile b/tutorials/tutorial-6/Makefile → mlir_tutorials/tutorial-6/Makefile
diff --git a/tutorials/tutorial-6/README.md → mlir_tutorials/tutorial-6/README.md b/tutorials/tutorial-6/README.md → mlir_tutorials/tutorial-6/README.md
diff --git a/tutorials/tutorial-6/aie.mlir → mlir_tutorials/tutorial-6/aie.mlir b/tutorials/tutorial-6/aie.mlir → mlir_tutorials/tutorial-6/aie.mlir
diff --git a/tutorials/tutorial-6/test.cpp → mlir_tutorials/tutorial-6/test.cpp b/tutorials/tutorial-6/test.cpp → mlir_tutorials/tutorial-6/test.cpp
diff --git a/tutorials/tutorial-7/Makefile → mlir_tutorials/tutorial-7/Makefile b/tutorials/tutorial-7/Makefile → mlir_tutorials/tutorial-7/Makefile
diff --git a/tutorials/tutorial-7/README.md → mlir_tutorials/tutorial-7/README.md b/tutorials/tutorial-7/README.md → mlir_tutorials/tutorial-7/README.md
diff --git a/tutorials/tutorial-7/aie.mlir → mlir_tutorials/tutorial-7/aie.mlir b/tutorials/tutorial-7/aie.mlir → mlir_tutorials/tutorial-7/aie.mlir
diff --git a/tutorials/tutorial-7/flow/Makefile → mlir_tutorials/tutorial-7/flow/Makefile b/tutorials/tutorial-7/flow/Makefile → mlir_tutorials/tutorial-7/flow/Makefile
diff --git a/tutorials/tutorial-7/flow/README.md → mlir_tutorials/tutorial-7/flow/README.md b/tutorials/tutorial-7/flow/README.md → mlir_tutorials/tutorial-7/flow/README.md
diff --git a/tutorials/tutorial-7/flow/aie.mlir → mlir_tutorials/tutorial-7/flow/aie.mlir b/tutorials/tutorial-7/flow/aie.mlir → mlir_tutorials/tutorial-7/flow/aie.mlir
diff --git a/tutorials/tutorial-7/flow/test.cpp → mlir_tutorials/tutorial-7/flow/test.cpp b/tutorials/tutorial-7/flow/test.cpp → mlir_tutorials/tutorial-7/flow/test.cpp
diff --git a/tutorials/tutorial-7/switchbox/Makefile → mlir_tutorials/tutorial-7/switchbox/Makefile b/tutorials/tutorial-7/switchbox/Makefile → mlir_tutorials/tutorial-7/switchbox/Makefile
diff --git a/tutorials/tutorial-7/switchbox/README.md → ..._tutorials/tutorial-7/switchbox/README.md b/tutorials/tutorial-7/switchbox/README.md → ..._tutorials/tutorial-7/switchbox/README.md
diff --git a/tutorials/tutorial-7/switchbox/aie.mlir → mlir_tutorials/tutorial-7/switchbox/aie.mlir b/tutorials/tutorial-7/switchbox/aie.mlir → mlir_tutorials/tutorial-7/switchbox/aie.mlir
diff --git a/tutorials/tutorial-7/switchbox/test.cpp → mlir_tutorials/tutorial-7/switchbox/test.cpp b/tutorials/tutorial-7/switchbox/test.cpp → mlir_tutorials/tutorial-7/switchbox/test.cpp
diff --git a/tutorials/tutorial-7/test.cpp → mlir_tutorials/tutorial-7/test.cpp b/tutorials/tutorial-7/test.cpp → mlir_tutorials/tutorial-7/test.cpp
diff --git a/tutorials/tutorial-8/Makefile → mlir_tutorials/tutorial-8/Makefile b/tutorials/tutorial-8/Makefile → mlir_tutorials/tutorial-8/Makefile
diff --git a/tutorials/tutorial-8/README.md → mlir_tutorials/tutorial-8/README.md b/tutorials/tutorial-8/README.md → mlir_tutorials/tutorial-8/README.md
diff --git a/tutorials/tutorial-8/aie.mlir → mlir_tutorials/tutorial-8/aie.mlir b/tutorials/tutorial-8/aie.mlir → mlir_tutorials/tutorial-8/aie.mlir
diff --git a/tutorials/tutorial-8/answers/aie.mlir → mlir_tutorials/tutorial-8/answers/aie.mlir b/tutorials/tutorial-8/answers/aie.mlir → mlir_tutorials/tutorial-8/answers/aie.mlir
diff --git a/tutorials/tutorial-8/kernel1.cc → mlir_tutorials/tutorial-8/kernel1.cc b/tutorials/tutorial-8/kernel1.cc → mlir_tutorials/tutorial-8/kernel1.cc
diff --git a/tutorials/tutorial-8/kernel2.cc → mlir_tutorials/tutorial-8/kernel2.cc b/tutorials/tutorial-8/kernel2.cc → mlir_tutorials/tutorial-8/kernel2.cc
diff --git a/tutorials/tutorial-8/test.cpp → mlir_tutorials/tutorial-8/test.cpp b/tutorials/tutorial-8/test.cpp → mlir_tutorials/tutorial-8/test.cpp
diff --git a/tutorials/tutorial-9/Makefile → mlir_tutorials/tutorial-9/Makefile b/tutorials/tutorial-9/Makefile → mlir_tutorials/tutorial-9/Makefile
diff --git a/tutorials/tutorial-9/README.md → mlir_tutorials/tutorial-9/README.md b/tutorials/tutorial-9/README.md → mlir_tutorials/tutorial-9/README.md
diff --git a/tutorials/tutorial-9/aie.mlir → mlir_tutorials/tutorial-9/aie.mlir b/tutorials/tutorial-9/aie.mlir → mlir_tutorials/tutorial-9/aie.mlir
diff --git a/tutorials/tutorial-9/answers/aie_matmul.mlir → ...orials/tutorial-9/answers/aie_matmul.mlir b/tutorials/tutorial-9/answers/aie_matmul.mlir → ...orials/tutorial-9/answers/aie_matmul.mlir
diff --git a/...s/tutorial-9/answers/test_matmul_perf.cpp → ...s/tutorial-9/answers/test_matmul_perf.cpp b/...s/tutorial-9/answers/test_matmul_perf.cpp → ...s/tutorial-9/answers/test_matmul_perf.cpp
diff --git a/tutorials/tutorial-9/answers/test_perf.cpp → ...utorials/tutorial-9/answers/test_perf.cpp b/tutorials/tutorial-9/answers/test_perf.cpp → ...utorials/tutorial-9/answers/test_perf.cpp
diff --git a/...rials/tutorial-9/external_kernel/Makefile → ...rials/tutorial-9/external_kernel/Makefile b/...rials/tutorial-9/external_kernel/Makefile → ...rials/tutorial-9/external_kernel/Makefile
diff --git a/...ials/tutorial-9/external_kernel/kernel.cc → ...ials/tutorial-9/external_kernel/kernel.cc b/...ials/tutorial-9/external_kernel/kernel.cc → ...ials/tutorial-9/external_kernel/kernel.cc
diff --git a/...rials/tutorial-9/external_kernel/kernel.h → ...rials/tutorial-9/external_kernel/kernel.h b/...rials/tutorial-9/external_kernel/kernel.h → ...rials/tutorial-9/external_kernel/kernel.h
diff --git a/tutorials/tutorial-9/external_kernel/sim.tcl → ...orials/tutorial-9/external_kernel/sim.tcl b/tutorials/tutorial-9/external_kernel/sim.tcl → ...orials/tutorial-9/external_kernel/sim.tcl
diff --git a/tutorials/tutorial-9/external_kernel/test.cc → ...orials/tutorial-9/external_kernel/test.cc b/tutorials/tutorial-9/external_kernel/test.cc → ...orials/tutorial-9/external_kernel/test.cc
diff --git a/...rials/tutorial-9/external_kernel/test.prx → ...rials/tutorial-9/external_kernel/test.prx b/...rials/tutorial-9/external_kernel/test.prx → ...rials/tutorial-9/external_kernel/test.prx
diff --git a/tutorials/tutorial-9/matmul_kernel/Makefile → ...torials/tutorial-9/matmul_kernel/Makefile b/tutorials/tutorial-9/matmul_kernel/Makefile → ...torials/tutorial-9/matmul_kernel/Makefile
diff --git a/tutorials/tutorial-9/matmul_kernel/kernel.cc → ...orials/tutorial-9/matmul_kernel/kernel.cc b/tutorials/tutorial-9/matmul_kernel/kernel.cc → ...orials/tutorial-9/matmul_kernel/kernel.cc
diff --git a/tutorials/tutorial-9/matmul_kernel/kernel.h → ...torials/tutorial-9/matmul_kernel/kernel.h b/tutorials/tutorial-9/matmul_kernel/kernel.h → ...torials/tutorial-9/matmul_kernel/kernel.h
diff --git a/tutorials/tutorial-9/matmul_kernel/sim.tcl → ...utorials/tutorial-9/matmul_kernel/sim.tcl b/tutorials/tutorial-9/matmul_kernel/sim.tcl → ...utorials/tutorial-9/matmul_kernel/sim.tcl
diff --git a/tutorials/tutorial-9/matmul_kernel/test.cc → ...utorials/tutorial-9/matmul_kernel/test.cc b/tutorials/tutorial-9/matmul_kernel/test.cc → ...utorials/tutorial-9/matmul_kernel/test.cc
diff --git a/tutorials/tutorial-9/matmul_kernel/test.prx → ...torials/tutorial-9/matmul_kernel/test.prx b/tutorials/tutorial-9/matmul_kernel/test.prx → ...torials/tutorial-9/matmul_kernel/test.prx
diff --git a/tutorials/tutorial-9/test.cpp → mlir_tutorials/tutorial-9/test.cpp b/tutorials/tutorial-9/test.cpp → mlir_tutorials/tutorial-9/test.cpp
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -3,26 +3,29 @@
 
 include(AddMLIRPython)
 
-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()
+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}/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})
+  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()
 endif()
 
 # The AIE copy of the MLIR bindings is in the `aie.mlir` namespace.

diff --git a/test/objectFifo-stateful-transform/nested_loop_test.mlir b/test/objectFifo-stateful-transform/nested_loop_test.mlir
@@ -0,0 +1,126 @@
+//===- nested_loop_test.mlir -----------------------------------------*- MLIR -*-===//
+//
+// Copyright (C) 2024, Advanced Micro Devices, Inc.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+// Date: April 3rd 2024
+//
+//===----------------------------------------------------------------------===//
+
+// RUN: aie-opt --aie-objectFifo-stateful-transform %s | FileCheck %s
+
+// CHECK-LABEL: aie.device(ipu)
+//       CHECK:   scf.for
+//       CHECK:   {
+//       CHECK:     aie.use_lock
+//       CHECK:     memref.reinterpret_cast
+//       CHECK:     aie.use_lock
+//       CHECK:     memref.reinterpret_cast
+//       CHECK:     scf.for
+//       CHECK:     {
+//       CHECK:       scf.for
+//       CHECK:       {
+//       CHECK:         scf.for
+//       CHECK:         {
+//       CHECK:           scf.for
+//       CHECK:           {
+//       CHECK:             scf.for
+//       CHECK:             {
+//       CHECK:               scf.for
+//       CHECK:               {
+//       CHECK:                 memref.load
+//       CHECK:                 memref.load
+//       CHECK:                 memref.load
+//       CHECK:                 arith.muli
+//       CHECK:                 arith.addi
+//       CHECK:                 memref.store
+//       CHECK:               }
+//       CHECK:             }
+//       CHECK:           }
+//       CHECK:         }
+//       CHECK:       }
+//       CHECK:     }
+//       CHECK:     aie.use_lock
+//       CHECK:     aie.use_lock
+//       CHECK:     aie.use_lock
+//       CHECK:     memref.reinterpret_cast
+//       CHECK:     aie.use_lock
+//       CHECK:     memref.reinterpret_cast
+//       CHECK:     scf.for
+//       CHECK:     {
+//       CHECK:       scf.for
+//       CHECK:       {
+//       CHECK:         scf.for
+//       CHECK:         {
+//       CHECK:           scf.for
+//       CHECK:           {
+//       CHECK:             scf.for
+//       CHECK:             {
+//       CHECK:               scf.for
+//       CHECK:               {
+//       CHECK:                 memref.load
+//       CHECK:                 memref.load
+//       CHECK:                 memref.load
+//       CHECK:                 arith.muli
+//       CHECK:                 arith.addi
+//       CHECK:                 memref.store
+//       CHECK:               }
+//       CHECK:             }
+//       CHECK:           }
+//       CHECK:         }
+//       CHECK:       }
+//       CHECK:     }
+//       CHECK:     aie.use_lock
+//       CHECK:     aie.use_lock
+//       CHECK:   }
+
+aie.device(ipu) {
+  %tile_0_1 = aie.tile(0, 1)
+  %tile_1_2 = aie.tile(1, 2)
+  %tile_0_2 = aie.tile(0, 2)
+  aie.objectfifo @in2(%tile_0_1, {%tile_0_2, %tile_1_2}, 4 : i32) : !aie.objectfifo<memref<32x64xi32, 1>>
+  aie.objectfifo @in7(%tile_0_1, {%tile_1_2}, 4 : i32) : !aie.objectfifo<memref<64x32xi32, 1>>
+  aie.objectfifo @in8(%tile_1_2, {%tile_0_1}, 4 : i32) : !aie.objectfifo<memref<32x32xi32, 1>>
+  %core_1_2 = aie.core(%tile_1_2) {
+    %c8 = arith.constant 8 : index
+    %c1 = arith.constant 1 : index
+    %c4 = arith.constant 4 : index
+    %c0 = arith.constant 0 : index
+    %c64 = arith.constant 64 : index
+    %c960 = arith.constant 960 : index
+    %0 = aie.objectfifo.acquire @in8(Produce, 1) : !aie.objectfifosubview<memref<32x32xi32, 1>>
+    %1 = aie.objectfifo.subview.access %0[0] : !aie.objectfifosubview<memref<32x32xi32, 1>> -> memref<32x32xi32, 1>
+    %reinterpret_cast = memref.reinterpret_cast %1 to offset: [0], sizes: [4, 8, 4, 8], strides: [256, 32, 8, 1] : memref<32x32xi32, 1> to memref<4x8x4x8xi32, 1>
+    aie.objectfifo.release @in2(Consume, 1)
+    aie.objectfifo.release @in7(Consume, 1)
+    scf.for %arg0 = %c64 to %c960 step %c64 {
+      %10 = aie.objectfifo.acquire @in2(Consume, 1) : !aie.objectfifosubview<memref<32x64xi32, 1>>
+      %11 = aie.objectfifo.subview.access %10[0] : !aie.objectfifosubview<memref<32x64xi32, 1>> -> memref<32x64xi32, 1>
+      %reinterpret_cast_4 = memref.reinterpret_cast %11 to offset: [0], sizes: [8, 8, 4, 8], strides: [256, 32, 8, 1] : memref<32x64xi32, 1> to memref<8x8x4x8xi32, 1>
+      %12 = aie.objectfifo.acquire @in7(Consume, 1) : !aie.objectfifosubview<memref<64x32xi32, 1>>
+      %13 = aie.objectfifo.subview.access %12[0] : !aie.objectfifosubview<memref<64x32xi32, 1>> -> memref<64x32xi32, 1>
+      %reinterpret_cast_5 = memref.reinterpret_cast %13 to offset: [0], sizes: [4, 8, 8, 8], strides: [512, 64, 8, 1] : memref<64x32xi32, 1> to memref<4x8x8x8xi32, 1>
+      scf.for %arg1 = %c0 to %c8 step %c1 {
+        scf.for %arg2 = %c0 to %c4 step %c1 {
+          scf.for %arg3 = %c0 to %c8 step %c1 {
+            scf.for %arg4 = %c0 to %c4 step %c1 {
+              scf.for %arg5 = %c0 to %c8 step %c1 {
+                scf.for %arg6 = %c0 to %c8 step %c1 {
+                  %14 = memref.load %reinterpret_cast_4[%arg3, %arg1, %arg4, %arg6] : memref<8x8x4x8xi32, 1>
+                  %15 = memref.load %reinterpret_cast_5[%arg2, %arg3, %arg6, %arg5] : memref<4x8x8x8xi32, 1>
+                  %16 = memref.load %reinterpret_cast[%arg2, %arg1, %arg4, %arg5] : memref<4x8x4x8xi32, 1>
+                  %17 = arith.muli %14, %15 : i32
+                  %18 = arith.addi %16, %17 : i32
+                  memref.store %18, %reinterpret_cast[%arg2, %arg1, %arg4, %arg5] : memref<4x8x4x8xi32, 1>
+                }
+              }
+            }
+          }
+        }
+      }
+      aie.objectfifo.release @in2(Consume, 1)
+      aie.objectfifo.release @in7(Consume, 1)
+    }
+    aie.end
+  }
+}
diff --git a/utils/clone-llvm.sh b/utils/clone-llvm.sh
@@ -13,8 +13,8 @@
 ##===----------------------------------------------------------------------===##
 
 # The LLVM commit to use.
-LLVM_PROJECT_COMMIT=60dda1fc6ef82c5d7fe54000e6c0a21e7bafdeb5
-DATETIME=2024031100
+LLVM_PROJECT_COMMIT=d022f6b8ff94bb13d12d39f23a3c3e7836e90756
+DATETIME=2024040913
 WHEEL_VERSION=19.0.0.$DATETIME+${LLVM_PROJECT_COMMIT:0:8}
 
 ############################################################################################