Merge pull request #10143 from osamahammad21/drt-serialize

DRT: fix RouterConfiguration Serialization

Author: maliberty

src/drt/include/drt/TritonRoute.h

@@ -60,7 +60,7 @@ struct ParamStruct
 {
   std::string outputMazeFile;
   std::string outputDrcFile;
-  std::optional<int> drcReportIterStep;
+  int drcReportIterStep = 0;
   std::string outputGuideCoverageFile;
   std::string dbProcessNode;
   bool enableViaGen = false;
@@ -77,7 +77,7 @@ struct ParamStruct
   int minAccessPoints = -1;
   bool saveGuideUpdates = false;
   std::string repairPDNLayerName;
-  int num_threads;
+  int num_threads = 1;
 };
 
 class TritonRoute

src/drt/src/TritonRoute.cpp

@@ -1277,7 +1277,7 @@ void TritonRoute::setUnidirectionalLayer(const std::string& layerName)
                    "Non-routing layer {} can't be set unidirectional",
                    layerName);
   }
-  router_cfg_->unidirectional_layers_.insert(dbLayer);
+  router_cfg_->unidirectional_layer_names_.insert(layerName);
 }
 
 void TritonRoute::setParams(const ParamStruct& params)

src/drt/src/TritonRoute.i

@@ -70,13 +70,9 @@ void detailed_route_cmd(const char* outputMazeFile,
 {
   auto* router = ord::OpenRoad::openRoad()->getTritonRoute();
   const int num_threads = ord::OpenRoad::openRoad()->getThreadCount();
-  std::optional<int> drcReportIterStepOpt;
-  if (drcReportIterStep > 0) {
-    drcReportIterStepOpt = drcReportIterStep;
-  }
   router->setParams({outputMazeFile,
                     outputDrcFile,
-                    drcReportIterStepOpt,
+                    drcReportIterStep,
                     outputGuideCoverageFile,
                     dbProcessNode,
                     enableViaGen,

src/drt/src/dr/FlexDR.cpp

@@ -693,8 +693,8 @@ void FlexDR::reportIterationViolations() const
       }
     }
   }
-  if ((router_cfg_->DRC_RPT_ITER_STEP && iter_ > 0
-       && iter_ % router_cfg_->DRC_RPT_ITER_STEP.value() == 0)
+  if ((router_cfg_->DRC_RPT_ITER_STEP > 0 && iter_ > 0
+       && iter_ % router_cfg_->DRC_RPT_ITER_STEP == 0)
       || logger_->debugCheck(DRT, "autotuner", 1)
       || logger_->debugCheck(DRT, "report", 1)) {
     router_->reportDRC(

src/drt/src/global.h

@@ -8,16 +8,15 @@
 #include <limits>
 #include <memory>
 #include <optional>
+#include <set>
 #include <string>
-#include <unordered_set>
 
 #include "db/obj/frMarker.h"
 #include "frBaseTypes.h"
 
 namespace odb {
 class Point;
 class Rect;
-class dbTechLayer;
 }  // namespace odb
 
 namespace drt {
@@ -27,7 +26,7 @@ struct RouterConfiguration
   std::string DBPROCESSNODE;
   std::string OUT_MAZE_FILE;
   std::string DRC_RPT_FILE;
-  std::optional<int> DRC_RPT_ITER_STEP = std::nullopt;
+  int DRC_RPT_ITER_STEP = 0;  // 0 means disabled
   std::string GUIDE_REPORT_FILE;
 
   // to be removed
@@ -95,8 +94,11 @@ struct RouterConfiguration
   frLayerNum REPAIR_PDN_LAYER_NUM = -1;
   frLayerNum GC_IGNORE_PDN_LAYER_NUM = -1;
 
-  // unidirectional layers
-  std::unordered_set<odb::dbTechLayer*> unidirectional_layers_;
+  // unidirectional layers (stored as layer names)
+  std::set<std::string> unidirectional_layer_names_;
+
+  template <class Archive>
+  void serialize(Archive& ar, unsigned int version);
 };
 
 constexpr int DIRBITSIZE = 3;

src/drt/src/io/io.cpp

@@ -1565,7 +1565,8 @@ void io::Parser::setRoutingLayerProperties(odb::dbTechLayer* layer,
     getTech()->addUConstraint(std::move(uCon));
     tmpLayer->addLef58SpacingWrongDirConstraint(rptr);
   }
-  if (router_cfg_->unidirectional_layers_.contains(layer)) {
+  if (router_cfg_->unidirectional_layer_names_.find(layer->getName())
+      != router_cfg_->unidirectional_layer_names_.end()) {
     tmpLayer->setUnidirectional(true);
   }
   if (layer->isRectOnly()) {

src/drt/src/serialization.h

@@ -16,6 +16,7 @@
 #include "boost/serialization/array.hpp"
 #include "boost/serialization/list.hpp"
 #include "boost/serialization/map.hpp"
+#include "boost/serialization/optional.hpp"
 #include "boost/serialization/set.hpp"
 #include "boost/serialization/split_member.hpp"
 #include "boost/serialization/unique_ptr.hpp"
@@ -747,52 +748,83 @@ void serializeViaDef(Archive& ar, const frViaDef*& viadef)
 template <class Archive>
 void serializeGlobals(Archive& ar, RouterConfiguration* router_cfg)
 {
-  (ar) & router_cfg->DBPROCESSNODE;
-  (ar) & router_cfg->OUT_MAZE_FILE;
-  (ar) & router_cfg->DRC_RPT_FILE;
-  (ar) & router_cfg->OR_SEED;
-  (ar) & router_cfg->OR_K;
-  (ar) & router_cfg->MAX_THREADS;
-  (ar) & router_cfg->BATCHSIZE;
-  (ar) & router_cfg->BATCHSIZETA;
-  (ar) & router_cfg->MTSAFEDIST;
-  (ar) & router_cfg->DRCSAFEDIST;
-  (ar) & router_cfg->VERBOSE;
-  (ar) & router_cfg->BOTTOM_ROUTING_LAYER;
-  (ar) & router_cfg->TOP_ROUTING_LAYER;
-  (ar) & router_cfg->ALLOW_PIN_AS_FEEDTHROUGH;
-  (ar) & router_cfg->USENONPREFTRACKS;
-  (ar) & router_cfg->USEMINSPACING_OBS;
-  (ar) & router_cfg->ENABLE_BOUNDARY_MAR_FIX;
-  (ar) & router_cfg->ENABLE_VIA_GEN;
-  (ar) & router_cfg->VIAINPIN_BOTTOMLAYER_NAME;
-  (ar) & router_cfg->VIAINPIN_TOPLAYER_NAME;
-  (ar) & router_cfg->VIAINPIN_BOTTOMLAYERNUM;
-  (ar) & router_cfg->VIAINPIN_TOPLAYERNUM;
-  (ar) & router_cfg->VIA_ACCESS_LAYERNUM;
-  (ar) & router_cfg->MINNUMACCESSPOINT_MACROCELLPIN;
-  (ar) & router_cfg->MINNUMACCESSPOINT_STDCELLPIN;
-  (ar) & router_cfg->ACCESS_PATTERN_END_ITERATION_NUM;
-  (ar) & router_cfg->END_ITERATION;
-  (ar) & router_cfg->NDR_NETS_RIPUP_HARDINESS;
-  (ar) & router_cfg->CLOCK_NETS_TRUNK_RIPUP_HARDINESS;
-  (ar) & router_cfg->CLOCK_NETS_LEAF_RIPUP_HARDINESS;
-  (ar) & router_cfg->AUTO_TAPER_NDR_NETS;
-  (ar) & router_cfg->TAPERBOX_RADIUS;
-  (ar) & router_cfg->NDR_NETS_ABS_PRIORITY;
-  (ar) & router_cfg->CLOCK_NETS_ABS_PRIORITY;
-  (ar) & router_cfg->TAPINCOST;
-  (ar) & router_cfg->TAALIGNCOST;
-  (ar) & router_cfg->TADRCCOST;
-  (ar) & router_cfg->TASHAPEBLOATWIDTH;
-  (ar) & router_cfg->VIACOST;
-  (ar) & router_cfg->GRIDCOST;
-  (ar) & router_cfg->ROUTESHAPECOST;
-  (ar) & router_cfg->MARKERCOST;
-  (ar) & router_cfg->MARKERBLOATWIDTH;
-  (ar) & router_cfg->BLOCKCOST;
-  (ar) & router_cfg->GUIDECOST;
-  (ar) & router_cfg->SHAPEBLOATWIDTH;
+  router_cfg->serialize(ar, 0);
+}
+
+template <class Archive>
+void RouterConfiguration::serialize(Archive& ar, const unsigned int /*version*/)
+{
+  (ar) & DBPROCESSNODE;
+  (ar) & OUT_MAZE_FILE;
+  (ar) & DRC_RPT_FILE;
+  (ar) & DRC_RPT_ITER_STEP;
+  (ar) & GUIDE_REPORT_FILE;
+
+  // to be removed
+  (ar) & OR_SEED;
+  (ar) & OR_K;
+
+  (ar) & MAX_THREADS;
+  (ar) & BATCHSIZE;
+  (ar) & BATCHSIZETA;
+  (ar) & MTSAFEDIST;
+  (ar) & DRCSAFEDIST;
+  (ar) & VERBOSE;
+  (ar) & BOTTOM_ROUTING_LAYER;
+  (ar) & TOP_ROUTING_LAYER;
+  (ar) & ALLOW_PIN_AS_FEEDTHROUGH;
+  (ar) & USENONPREFTRACKS;
+  (ar) & USEMINSPACING_OBS;
+  (ar) & ENABLE_BOUNDARY_MAR_FIX;
+  (ar) & ENABLE_VIA_GEN;
+  (ar) & CLEAN_PATCHES;
+  (ar) & DO_PA;
+  (ar) & SINGLE_STEP_DR;
+  (ar) & SAVE_GUIDE_UPDATES;
+
+  (ar) & VIAINPIN_BOTTOMLAYER_NAME;
+  (ar) & VIAINPIN_TOPLAYER_NAME;
+  (ar) & VIAINPIN_BOTTOMLAYERNUM;
+  (ar) & VIAINPIN_TOPLAYERNUM;
+
+  (ar) & VIA_ACCESS_LAYER_NAME;
+  (ar) & VIA_ACCESS_LAYERNUM;
+
+  (ar) & MINNUMACCESSPOINT_MACROCELLPIN;
+  (ar) & MINNUMACCESSPOINT_STDCELLPIN;
+  (ar) & ACCESS_PATTERN_END_ITERATION_NUM;
+  (ar) & CONGESTION_THRESHOLD;
+  (ar) & MAX_CLIPSIZE_INCREASE;
+
+  (ar) & END_ITERATION;
+
+  (ar) & NDR_NETS_RIPUP_HARDINESS;
+  (ar) & CLOCK_NETS_TRUNK_RIPUP_HARDINESS;
+  (ar) & CLOCK_NETS_LEAF_RIPUP_HARDINESS;
+  (ar) & AUTO_TAPER_NDR_NETS;
+  (ar) & TAPERBOX_RADIUS;
+  (ar) & NDR_NETS_ABS_PRIORITY;
+  (ar) & CLOCK_NETS_ABS_PRIORITY;
+
+  (ar) & TAPINCOST;
+  (ar) & TAALIGNCOST;
+  (ar) & TADRCCOST;
+  (ar) & TASHAPEBLOATWIDTH;
+
+  (ar) & VIACOST;
+  (ar) & GRIDCOST;
+  (ar) & ROUTESHAPECOST;
+  (ar) & MARKERCOST;
+  (ar) & MARKERBLOATWIDTH;
+  (ar) & BLOCKCOST;
+  (ar) & GUIDECOST;
+  (ar) & SHAPEBLOATWIDTH;
+
+  (ar) & REPAIR_PDN_LAYER_NAME;
+  (ar) & REPAIR_PDN_LAYER_NUM;
+  (ar) & GC_IGNORE_PDN_LAYER_NUM;
+
+  (ar) & unidirectional_layer_names_;
 }
 
 }  // namespace drt