Change aie.device op from NoTerminator to SingleBlockImplicitTerminator (#1936)

Author: fifield

include/aie/Dialect/AIE/IR/AIEOps.td

@@ -28,7 +28,7 @@ class AIE_Op<string mnemonic, list<Trait> traits = []> :
 
 def AIE_DeviceOp: AIE_Op<"device", [
     AIETarget, HasParent<"mlir::ModuleOp">,
-    SymbolTable, SingleBlock, NoTerminator, IsolatedFromAbove
+    SymbolTable, SingleBlockImplicitTerminator<"EndOp">, IsolatedFromAbove
   ]> {
   let summary = "Define an AIE design targetting a complete device";
   let description = [{
@@ -63,7 +63,6 @@ def AIE_DeviceOp: AIE_Op<"device", [
   let extraClassDeclaration = [{
     const xilinx::AIE::AIETargetModel &getTargetModel();
   }];
-  let hasVerifier = 1;
 }
 
 def AIE_TileOp: AIE_Op<"tile", [

include/aie/Dialect/AIE/Transforms/AIEPasses.h

@@ -70,7 +70,7 @@ struct AIEPathfinderPass : AIERoutePathfinderFlowsBase<AIEPathfinderPass> {
       : analyzer(std::move(analyzer)) {}
 
   void runOnOperation() override;
-  void runOnFlow(DeviceOp d, mlir::OpBuilder &builder);
+  void runOnFlow(DeviceOp d);
   void runOnPacketFlow(DeviceOp d, mlir::OpBuilder &builder);
 
   typedef std::pair<mlir::Operation *, Port> PhysPort;

lib/Conversion/AIEToConfiguration/AIEToConfiguration.cpp

@@ -432,6 +432,7 @@ xilinx::AIE::convertTransactionBinaryToMLIR(mlir::MLIRContext *ctx,
                                  AIEDevice::npu1};
   auto device = builder.create<DeviceOp>(loc, devices[columns - 1]);
   device.getRegion().emplaceBlock();
+  DeviceOp::ensureTerminator(device.getBodyRegion(), builder, loc);
   builder.setInsertionPointToStart(device.getBody());
 
   // convert the parsed ops to MLIR

lib/Dialect/AIE/IR/AIEDialect.cpp

@@ -1128,8 +1128,6 @@ const AIETargetModel &DeviceOp::getTargetModel() {
   return xilinx::AIE::getTargetModel(getDevice());
 }
 
-LogicalResult DeviceOp::verify() { return success(); }
-
 //===----------------------------------------------------------------------===//
 // TileOp
 //===----------------------------------------------------------------------===//

lib/Dialect/AIE/Transforms/AIEAssignBuffers.cpp

@@ -463,7 +463,7 @@ struct AIEAssignBufferAddressesPass
 
   void runOnOperation() override {
     DeviceOp device = getOperation();
-    OpBuilder builder = OpBuilder::atBlockEnd(device.getBody());
+    OpBuilder builder = OpBuilder::atBlockTerminator(device.getBody());
     // Make sure all the buffers have a name
     int counter = 0;
     device.walk<WalkOrder::PreOrder>([&](BufferOp buffer) {

lib/Dialect/AIE/Transforms/AIEAssignLockIDs.cpp

@@ -35,7 +35,7 @@ struct AIEAssignLockIDsPass : AIEAssignLockIDsBase<AIEAssignLockIDsPass> {
 
   void runOnOperation() override {
     DeviceOp device = getOperation();
-    OpBuilder rewriter = OpBuilder::atBlockEnd(device.getBody());
+    OpBuilder rewriter = OpBuilder::atBlockTerminator(device.getBody());
 
     // All of the lock ops on a tile, separated into ops which have been
     // assigned to a lock, and ops which have not.

lib/Dialect/AIE/Transforms/AIECanonicalizeDevice.cpp

@@ -45,6 +45,8 @@ struct AIECanonicalizeDevicePass
     deviceOp.getRegion().takeBody(moduleOp.getBodyRegion());
     new (&moduleOp->getRegion(0)) Region(moduleOp);
     moduleOp->getRegion(0).emplaceBlock();
+
+    DeviceOp::ensureTerminator(deviceOp.getBodyRegion(), builder, location);
     OpBuilder builder2 = OpBuilder::atBlockBegin(moduleOp.getBody());
     builder2.insert(deviceOp);
   }

lib/Dialect/AIE/Transforms/AIECreatePathFindFlows.cpp

@@ -174,7 +174,7 @@ struct ConvertFlowsToInterconnect : OpConversionPattern<FlowOp> {
 
 namespace xilinx::AIE {
 
-void AIEPathfinderPass::runOnFlow(DeviceOp d, OpBuilder &builder) {
+void AIEPathfinderPass::runOnFlow(DeviceOp d) {
   // Apply rewrite rule to switchboxes to add assignments to every 'connect'
   // operation inside
   ConversionTarget target(getContext());
@@ -928,15 +928,15 @@ void AIEPathfinderPass::runOnOperation() {
   DeviceOp d = getOperation();
   if (failed(analyzer.runAnalysis(d)))
     return signalPassFailure();
-  OpBuilder builder = OpBuilder::atBlockEnd(d.getBody());
+  OpBuilder builder = OpBuilder::atBlockTerminator(d.getBody());
 
   if (clRouteCircuit)
-    runOnFlow(d, builder);
+    runOnFlow(d);
   if (clRoutePacket)
     runOnPacketFlow(d, builder);
 
   // Populate wires between switchboxes and tiles.
-  builder.setInsertionPointToEnd(d.getBody());
+  builder.setInsertionPoint(d.getBody()->getTerminator());
   for (int col = 0; col <= analyzer.getMaxCol(); col++) {
     for (int row = 0; row <= analyzer.getMaxRow(); row++) {
       TileOp tile;

lib/Dialect/AIE/Transforms/AIEFindFlows.cpp

@@ -226,7 +226,7 @@ class ConnectivityAnalysis {
 static void findFlowsFrom(TileOp op, ConnectivityAnalysis &analysis,
                           OpBuilder &rewriter) {
   Operation *Op = op.getOperation();
-  rewriter.setInsertionPointToEnd(Op->getBlock());
+  rewriter.setInsertionPoint(Op->getBlock()->getTerminator());
 
   std::vector bundles = {WireBundle::Core, WireBundle::DMA};
   for (WireBundle bundle : bundles) {
@@ -276,7 +276,7 @@ struct AIEFindFlowsPass : public AIEFindFlowsBase<AIEFindFlowsPass> {
     ConnectivityAnalysis analysis(d);
     d.getTargetModel().validate();
 
-    OpBuilder builder = OpBuilder::atBlockEnd(d.getBody());
+    OpBuilder builder = OpBuilder::atBlockTerminator(d.getBody());
     for (auto tile : d.getOps<TileOp>()) {
       findFlowsFrom(tile, analysis, builder);
     }

lib/Dialect/AIE/Transforms/AIEGenerateColumnControlOverlay.cpp

@@ -187,7 +187,7 @@ struct AIEGenerateColumnControlOverlayPass
   void runOnOperation() override {
     DeviceOp device = getOperation();
     const auto &targetModel = device.getTargetModel();
-    OpBuilder builder = OpBuilder::atBlockEnd(device.getBody());
+    OpBuilder builder = OpBuilder::atBlockTerminator(device.getBody());
 
     if (targetModel.getTargetArch() == AIEArch::AIE1)
       return; // Disable this pass for AIE1; AIE1 support NYI.
@@ -314,7 +314,7 @@ struct AIEGenerateColumnControlOverlayPass
     auto availableShimChans =
         getAvailableShimChans(device, shimTile, shimWireBundle, isShimMM2S);
 
-    builder.setInsertionPointToEnd(device.getBody());
+    builder.setInsertionPoint(device.getBody()->getTerminator());
     for (auto tOp : ctrlTiles) {
       if (tOp->hasAttr("controller_id"))
         ctrlPktFlowID =