Routing refactor v2 (#1643)

Xilinx · Aug 7, 2024 · b8a4890 · b8a4890
1 parent b3f51f8
commit b8a4890
Show file tree

Hide file tree

Showing 56 changed files with 1,490 additions and 10,900 deletions.
diff --git a/docs/AIERouting.md b/docs/AIERouting.md
@@ -104,7 +104,7 @@ Here is an example of how users can route the circuit-switched `test/create-flow
 
 ```
 cd ${path-to-mlir-aie}/tools/aie-routing-command-line
-aie-opt --aie-create-pathfinder-flows='keep-flow-op=true' ../../test/create-flows/broadcast.mlir \
+aie-opt --aie-create-pathfinder-flows --aie-find-flows ../../test/create-flows/broadcast.mlir \
     | aie-translate --aie-flows-to-json > example.json
 python3 visualize.py -j example.json
 ```
@@ -172,7 +172,19 @@ Similarly, to visualize a packet-switched example,
 
 ```
 cd ${path-to-mlir-aie}/tools/aie-routing-command-line
-aie-opt --aie-create-pathfinder-flows='keep-flow-op=true' ../../test/create-packet-flows/test_create_packet_flows6.mlir \
+aie-opt --aie-create-pathfinder-flows --aie-find-flows ../../test/create-packet-flows/test_create_packet_flows6.mlir \
     | aie-translate --aie-flows-to-json > example.json
 python3 visualize.py -j example.json
 ```
+
+
+## Benckmarking Routing
+
+A python script is provided to measure the wall-clock time and the length of paths routed. Simply run 
+
+```
+python3  utils/router_performance.py test/create-flows/
+python3  utils/router_performance.py test/create-packet-flows/
+```
+
+and the generated `routing_performance_results.csv` files can be found under the corresponding folders.
diff --git a/include/aie/Dialect/AIE/Transforms/AIEPasses.h b/include/aie/Dialect/AIE/Transforms/AIEPasses.h
@@ -72,21 +72,10 @@ struct AIEPathfinderPass : AIERoutePathfinderFlowsBase<AIEPathfinderPass> {
 
   typedef std::pair<mlir::Operation *, Port> PhysPort;
 
-  typedef struct {
-    SwitchboxOp sw;
-    Port sourcePort;
-    Port destPort;
-  } SwConnection;
-
   bool findPathToDest(SwitchSettings settings, TileID currTile,
                       WireBundle currDestBundle, int currDestChannel,
                       TileID finalTile, WireBundle finalDestBundle,
                       int finalDestChannel);
-
-  SwitchboxOp getSwitchbox(DeviceOp &d, int col, int row);
-
-  mlir::Operation *getOrCreateTile(mlir::OpBuilder &builder, int col, int row);
-  SwitchboxOp getOrCreateSwitchbox(mlir::OpBuilder &builder, TileOp tile);
 };
 
 } // namespace xilinx::AIE

diff --git a/include/aie/Dialect/AIE/Transforms/AIEPasses.td b/include/aie/Dialect/AIE/Transforms/AIEPasses.td
@@ -145,10 +145,7 @@ def AIERoutePathfinderFlows : Pass<"aie-create-pathfinder-flows", "DeviceOp"> {
     Option<"clRouteCircuit", "route-circuit", "bool", /*default=*/"true",
             "Flag to enable aie.flow lowering.">,      
     Option<"clRoutePacket", "route-packet", "bool", /*default=*/"true",
-            "Flag to enable aie.packetflow lowering.">,
-    Option<"clKeepFlowOp", "keep-flow-op", "bool", /*default=*/"false",
-            "Flag to not erase aie.flow/packetflow after its lowering,"
-            "used for routing visualization.">,       
+            "Flag to enable aie.packetflow lowering.">,     
   ];
 }