pdn: remove ordering information

Signed-off-by: Peter Gadfort <[email protected]>

Author: gadfort

src/pdn/src/connect.cpp

@@ -7,7 +7,6 @@
 #include <cmath>
 #include <map>
 #include <memory>
-#include <optional>
 #include <regex>
 #include <set>
 #include <tuple>
@@ -399,16 +398,14 @@ bool Connect::startsBelow(const Connect* other) const
   return layer0_->getNumber() < other->getLowerLayer()->getNumber();
 }
 
-void Connect::report(const std::optional<int>& order) const
+void Connect::report() const
 {
   auto* logger = grid_->getLogger();
   auto* block = grid_->getBlock();
   const double dbu_per_micron = block->getDbUnitsPerMicron();
 
-  logger->report("  Connect layers {} -> {}{}",
-                 layer0_->getName(),
-                 layer1_->getName(),
-                 order.has_value() ? fmt::format(" ({})", *order) : "");
+  logger->report(
+      "  Connect layers {} -> {}", layer0_->getName(), layer1_->getName());
   if (!fixed_generate_vias_.empty() || !fixed_tech_vias_.empty()) {
     std::string vias;
     for (auto* via : fixed_generate_vias_) {

src/pdn/src/connect.h

@@ -5,7 +5,6 @@
 
 #include <map>
 #include <memory>
-#include <optional>
 #include <set>
 #include <string>
 #include <tuple>
@@ -50,7 +49,7 @@ class Connect
   int getSplitCutPitch(odb::dbTechLayer* layer) const;
   bool getSplitCutStagger(odb::dbTechLayer* layer) const;
 
-  void report(const std::optional<int>& order = {}) const;
+  void report() const;
 
   odb::dbTechLayer* getLowerLayer() const { return layer0_; }
   odb::dbTechLayer* getUpperLayer() const { return layer1_; }

src/pdn/src/grid.cpp

@@ -453,24 +453,21 @@ void Grid::report() const
     }
   }
   if (!connect_.empty()) {
-    std::vector<std::pair<Connect*, int>> connect;
+    std::vector<Connect*> connect;
     connect.reserve(connect_.size());
     for (const auto& conn : connect_) {
-      connect.emplace_back(conn.get(), connect.size() + 1);
-    }
-    std::ranges::sort(
-        connect,
-        [](const std::pair<Connect*, int>& l,
-           const std::pair<Connect*, int>& r) {
-          int l_lower = l.first->getLowerLayer()->getRoutingLevel();
-          int l_upper = l.first->getUpperLayer()->getRoutingLevel();
-          int r_lower = r.first->getLowerLayer()->getRoutingLevel();
-          int r_upper = r.first->getUpperLayer()->getRoutingLevel();
-          return std::tie(l_lower, l_upper) < std::tie(r_lower, r_upper);
-        });
+      connect.push_back(conn.get());
+    }
+    std::ranges::sort(connect, [](const Connect* l, const Connect* r) {
+      int l_lower = l->getLowerLayer()->getRoutingLevel();
+      int l_upper = l->getUpperLayer()->getRoutingLevel();
+      int r_lower = r->getLowerLayer()->getRoutingLevel();
+      int r_upper = r->getUpperLayer()->getRoutingLevel();
+      return std::tie(l_lower, l_upper) < std::tie(r_lower, r_upper);
+    });
     logger->report("Connect:");
-    for (const auto& [connect, order] : connect) {
-      connect->report(order);
+    for (Connect* conn : connect) {
+      conn->report();
     }
   }
   if (!pin_layers_.empty()) {

src/pdn/test/asap7_M1_M3_followpins_staggered.ok

@@ -25,7 +25,7 @@ Straps:
     Offset: 0.0000
     Snap to grid: false
 Connect:
-  Connect layers M1 -> M3 (1)
+  Connect layers M1 -> M3
     Split cuts:
       Layer: M2 with pitch 1.0000 staggered
 [INFO PDN-0001] Inserting grid: Core

src/pdn/test/macros_grid_check.ok

@@ -35,8 +35,8 @@ Straps:
     Offset: 2.5000
     Snap to grid: false
 Connect:
-  Connect layers metal1 -> metal4 (1)
-  Connect layers metal4 -> metal7 (2)
+  Connect layers metal1 -> metal4
+  Connect layers metal4 -> metal7
 Grid name: sram - dcache.data.data_arrays_0.data_arrays_0_ext.mem
 Type: Instance
 Halo:

src/pdn/test/power_switch.ok

@@ -40,8 +40,8 @@ Straps:
     Offset: 13.6000
     Snap to grid: false
 Connect:
-  Connect layers met1 -> met4 (1)
-  Connect layers met4 -> met5 (2)
+  Connect layers met1 -> met4
+  Connect layers met4 -> met5
 Switched power cell: POWER_SWITCH
   Control net: nPWRUP
   Network type: DAISY

src/pdn/test/region_temp_sensor_different_region_name.ok

@@ -46,8 +46,8 @@ Straps:
     Offset: 13.6000
     Snap to grid: false
 Connect:
-  Connect layers met1 -> met4 (1)
-  Connect layers met4 -> met5 (2)
+  Connect layers met1 -> met4
+  Connect layers met4 -> met5
 Voltage domain: TemperatureAnalog
   Floorplan region: TEMP_ANALOG
   Power net: VIN
@@ -89,5 +89,5 @@ Straps:
     Offset: 13.6000
     Snap to grid: false
 Connect:
-  Connect layers met1 -> met4 (1)
-  Connect layers met4 -> met5 (2)
+  Connect layers met1 -> met4
+  Connect layers met4 -> met5

src/pdn/test/report.ok

@@ -331,7 +331,7 @@ Straps:
     Offset: 2.0000
     Snap to grid: false
 Connect:
-  Connect layers metal1 -> metal4 (2)
-  Connect layers metal4 -> metal7 (1)
-  Connect layers metal7 -> metal8 (4)
-  Connect layers metal8 -> metal9 (3)
+  Connect layers metal1 -> metal4
+  Connect layers metal4 -> metal7
+  Connect layers metal7 -> metal8
+  Connect layers metal8 -> metal9