update mlir-aie and llvm (Xilinx#790)

* updates for mlir-aie

* update mlir-aie and llvm

* clang-format

Author: fifield

mlir/lib/Conversion/AIRRtToNpuPass.cpp

@@ -1096,7 +1096,7 @@ struct AIRRtToNpuPass : public impl::AIRRtToNpuBase<AIRRtToNpuPass> {
       auto d = getDeviceForSegmentLoad(s);
       if (!f || !d)
         continue;
-      f->moveAfter(&d.getBody()->back());
+      f->moveBefore(d.getBody()->getTerminator());
     }
   }
 
@@ -1563,8 +1563,10 @@ struct AIRRtToNpuPass : public impl::AIRRtToNpuBase<AIRRtToNpuPass> {
             /* use_next_bd */ 0,
             /* valid_bd */ 1, /* lock_rel_val */ 0, /* lock_rel_id */ 0,
             /* lock_acq_enable */ 0, /* lock_acq_val */ 0, /* lock_acq_id */ 0,
-            /* d0_zero_before*/ 0, /* d1_zero_before*/ 0, /* d2_zero_before*/ 0,
-            /* d0_zero_after*/ 0, /* d1_zero_after*/ 0, /* d2_zero_after*/ 0);
+            /* d0_zero_before */ 0, /* d1_zero_before */ 0,
+            /* d2_zero_before */ 0,
+            /* d0_zero_after */ 0, /* d1_zero_after */ 0,
+            /* d2_zero_after */ 0);
         uint32_t addr = (dstColIndex << target_model.getColumnShift()) |
                         (0x1D004 + bdID * 0x20);
         builder.create<AIEX::NpuAddressPatchOp>(builder.getUnknownLoc(), addr,

mlir/lib/Conversion/AIRToAIEPass.cpp

@@ -381,7 +381,7 @@ void outlineAIECores(OpBuilder &builder, AIE::DeviceOp aie_device,
             fn = func::FuncOp::create(aie_device.getLoc(), call.getCallee(),
                                       call.getCalleeType());
             fn.setPrivate();
-            aie_device.push_back(fn);
+            aie_device.insert(aie_device.getBody()->getTerminator(), fn);
           }
         }
       });
@@ -543,8 +543,8 @@ void createAIEModulesAndOutlineCores(
         AIE::AIEDeviceAttr::get(builder.getContext(), options.device));
     aie_dev->setAttr(SymbolTable::getSymbolAttrName(),
                      StringAttr::get(builder.getContext(), segment_name));
-
-    aie_dev.getRegion().emplaceBlock();
+    AIE::DeviceOp::ensureTerminator(aie_dev.getRegion(), builder,
+                                    aie_dev.getLoc());
     seg.walk([&](xilinx::air::HerdOp h) {
       aie_modules.push_back({aie_dev, h});
     });
@@ -568,7 +568,8 @@ void createAIEModulesAndOutlineCores(
         AIE::AIEDeviceAttr::get(builder.getContext(), options.device));
     aie_dev->setAttr(SymbolTable::getSymbolAttrName(),
                      StringAttr::get(builder.getContext(), segment_name));
-    aie_dev.getRegion().emplaceBlock();
+    AIE::DeviceOp::ensureTerminator(aie_dev.getRegion(), builder,
+                                    aie_dev.getLoc());
     aie_modules.push_back({aie_dev, herd});
   };
   for (auto &p : aie_modules) {
@@ -1715,7 +1716,7 @@ class AIRToAIEPass : public air::impl::AIRToAIEBase<AIRToAIEPass> {
       return flowOp;
 
     OpBuilder builder(aie_device);
-    builder.setInsertionPointToEnd(aie_device.getBody());
+    builder.setInsertionPoint(aie_device.getBody()->getTerminator());
     return builder.create<AIE::FlowOp>(builder.getUnknownLoc(), source,
                                        sourceBundle, sourceChannel, dest,
                                        destBundle, destChannel);
@@ -1801,7 +1802,7 @@ class AIRToAIEPass : public air::impl::AIRToAIEBase<AIRToAIEPass> {
       return packetFlowOp;
     }
 
-    builder.setInsertionPointToEnd(aie_device.getBody());
+    builder.setInsertionPoint(aie_device.getBody()->getTerminator());
     return createPacketFlowOp(builder, flowID, source, sourceBundle,
                               sourceChannel, dest, destBundle, destChannel);
   }
@@ -2984,7 +2985,7 @@ class AIRToAIEPass : public air::impl::AIRToAIEBase<AIRToAIEPass> {
       // Generate aie.shim_dma op
       AIE::ShimDMAOp shimDMA = getShimDMAOp(tile);
       if (!shimDMA) {
-        builder.setInsertionPointToEnd(device.getBody());
+        builder.setInsertionPoint(device.getBody()->getTerminator());
         shimDMA = builder.create<AIE::ShimDMAOp>(builder.getUnknownLoc(),
                                                  builder.getIndexType(), tile);
       }
@@ -3031,7 +3032,7 @@ class AIRToAIEPass : public air::impl::AIRToAIEBase<AIRToAIEPass> {
       // Generate aie.memtile_dma op
       AIE::MemTileDMAOp memTileDMA = getMemTileDMAOp(tile);
       if (!memTileDMA) {
-        builder.setInsertionPointToEnd(device.getBody());
+        builder.setInsertionPoint(device.getBody()->getTerminator());
         memTileDMA = builder.create<AIE::MemTileDMAOp>(
             builder.getUnknownLoc(), builder.getIndexType(), tile);
       }
@@ -3110,7 +3111,7 @@ class AIRToAIEPass : public air::impl::AIRToAIEBase<AIRToAIEPass> {
         }
         int destChan = 1; // todo: allocation?
 
-        builder.setInsertionPointToEnd(device.getBody());
+        builder.setInsertionPoint(device.getBody()->getTerminator());
         auto keep_pkt_header = builder.getBoolAttr(true);
         (void)createPacketFlowOp(
             builder, flowID, srcTile, AIE::WireBundle::Trace, 0, destTile,
@@ -3187,11 +3188,7 @@ class AIRToAIEPass : public air::impl::AIRToAIEBase<AIRToAIEPass> {
     if (clTestPatterns.find("lower-scf-tokens") != std::string::npos)
       patterns.insert<LowerScfTokenPattern>(ctx);
 
-    OpBuilder builder(ctx);
-    AIE::DeviceOp deviceOp = builder.create<AIE::DeviceOp>(
-        builder.getUnknownLoc(),
-        AIE::AIEDeviceAttr::get(builder.getContext(), *device));
-    ShimTileAllocator shimTileAlloc(deviceOp.getTargetModel());
+    ShimTileAllocator shimTileAlloc(AIE::getTargetModel(*device));
     std::map<Operation *, AIE::ObjectFifoCreateOp> linksToComplete;
     if (clTestPatterns.find("lower-air-channels") != std::string::npos) {
       patterns.insert<LowerAIRChannelsPattern>(
@@ -3348,7 +3345,7 @@ class AIRToAIEPass : public air::impl::AIRToAIEBase<AIRToAIEPass> {
                               "supported for AIE1.");
         } else {
           // AIE2 dma metadata format
-          builder.setInsertionPointToEnd(device.getBody());
+          builder.setInsertionPoint(device.getBody()->getTerminator());
           createShimDMAAllocationOps(
               builder, ctx, herd, shimDmaAlloc.s2mm_allocs,
               AIE::DMAChannelDir::S2MM, chan_renumber_reverse_map);
@@ -3380,7 +3377,7 @@ class AIRToAIEPass : public air::impl::AIRToAIEBase<AIRToAIEPass> {
                              "supported for AIE1.");
         } else {
           // AIE2 memtile dma metadata format
-          builder.setInsertionPointToEnd(device.getBody());
+          builder.setInsertionPoint(device.getBody()->getTerminator());
           createShimDMAAllocationOps(
               builder, ctx, seg, shimDmaAlloc.s2mm_allocs,
               AIE::DMAChannelDir::S2MM, chan_renumber_reverse_map);
@@ -3642,7 +3639,8 @@ FailureOr<ModuleOp> convertAIRToAIE(mlir::RewriterBase &rewriter,
     auto devOp = rewriter.create<AIE::DeviceOp>(
         aie_module.getLoc(),
         AIE::AIEDeviceAttr::get(rewriter.getContext(), options.device));
-    devOp.getRegion().emplaceBlock();
+    AIE::DeviceOp::ensureTerminator(devOp.getRegion(), rewriter,
+                                    devOp.getLoc());
     outlineAIECores(rewriter, devOp, h, tileToHerdMap, options);
 
     auto ctx = aie_module->getContext();

utils/clone-llvm.sh

@@ -14,7 +14,7 @@
 #
 ##===----------------------------------------------------------------------===##
 
-export commithash=08af115d97e39223b5cc8bdbc56b1dfb758bf6d3
+export commithash=0611a668d1389c8573e83eeafa6d5f6172c4cbc2
 target_dir=llvm
 
 # clone llvm if it is not there already

utils/clone-mlir-aie.sh

@@ -14,7 +14,7 @@
 #
 ##===----------------------------------------------------------------------===##
 
-export HASH=f85a4a974fd59c82c878656d2b1536b4c2e74453
+export HASH=c21dee7eeff5f68758d639fb9e246a0f36189077
 target_dir=mlir-aie
 
 if [[ ! -d $target_dir ]]; then