Merge remote-tracking branch 'private/master' into gpl-extend-max-iter-by-routability

Author: gudeh

src/cts/src/SinkClustering.h

@@ -25,14 +25,14 @@ using utl::Logger;
 class Matching
 {
  public:
-  Matching(unsigned p0, unsigned p1) : p_0(p0), p_1(p1) {}
+  Matching(unsigned p0, unsigned p1) : p0_(p0), p1_(p1) {}
 
-  unsigned getP0() const { return p_0; }
-  unsigned getP1() const { return p_1; }
+  unsigned getP0() const { return p0_; }
+  unsigned getP1() const { return p1_; }
 
  private:
-  const unsigned p_0;
-  const unsigned p_1;
+  const unsigned p0_;
+  const unsigned p1_;
 };
 
 class SinkClustering

src/dft/README.md

@@ -90,6 +90,19 @@ a result, this should be run after placement, and after `scan_replace`.
 execute_dft_plan
 ```
 
+### Scan Optimization
+
+**Note: This is currently not implement and this command currently operates as a
+nop**
+
+Performs scan optimizations on the design reordering the flops of the scan
+chains using the latest placement information.
+
+
+```tcl
+scan_opt
+```
+
 ## Example scripts
 
 This example will create scan chains with a max length of 10 bits mixing all the
@@ -114,6 +127,7 @@ Simply run the following script:
 ./test/regression
 ```
 
+
 ## Limitations
 
 * There are no optimizations for the scan chains. This is a WIP.

src/dft/include/dft/Dft.hh

@@ -86,6 +86,9 @@ class Dft
   // Prints to stdout
   void reportDftConfig() const;
 
+  // Performs scan optimizations on the netlist
+  void scanOpt();
+
  private:
   // If we need to run pre_dft to create the internal state
   bool need_to_run_pre_dft_;

src/dft/src/Dft.cpp

@@ -177,4 +177,9 @@ std::vector<std::unique_ptr<ScanChain>> Dft::scanArchitect()
   return scan_architect->getScanChains();
 }
 
+void Dft::scanOpt()
+{
+  logger_->warn(utl::DFT, 14, "Scan Opt is not currently implemented");
+}
+
 }  // namespace dft

src/dft/src/dft.i

@@ -119,4 +119,9 @@ void report_dft_config() {
   getDft()->reportDftConfig();
 }
 
+void scan_opt()
+{
+  getDft()->scanOpt();
+}
+
 %}  // inline

src/dft/src/dft.tcl

@@ -96,3 +96,15 @@ proc report_dft_config { args } {
   sta::parse_key_args "report_dft_config" args keys {} flags {}
   dft::report_dft_config
 }
+
+
+sta::define_cmd_args "scan_opt" { }
+proc scan_opt { args } {
+  sta::parse_key_args "scan_opt" args \
+    keys {} flags {}
+
+  if { [ord::get_db_block] == "NULL" } {
+    utl::error DFT 13 "No design block found."
+  }
+  dft::scan_opt
+}

src/dpl/include/dpl/OptMirror.h

@@ -24,11 +24,17 @@ class NetBox
 {
  public:
   NetBox() = default;
-  NetBox(dbNet* net, Rect box, bool ignore);
+  NetBox(dbNet* net, const Rect& box, bool ignore);
   int64_t hpwl();
   void saveBox();
   void restoreBox();
+  bool isIgnore() const { return ignore_; }
+  dbNet* getNet() const { return net_; }
+  const Rect& getBox() const { return box_; }
 
+  void setBox(const Rect& box) { box_ = box; }
+
+ private:
   dbNet* net_ = nullptr;
   Rect box_;
   Rect box_saved_;

src/dpl/src/OptMirror.cpp

@@ -24,7 +24,7 @@ using odb::dbOrientType;
 
 static dbOrientType orientMirrorY(const dbOrientType& orient);
 
-NetBox::NetBox(dbNet* net, Rect box, bool ignore)
+NetBox::NetBox(dbNet* net, const Rect& box, bool ignore)
     : net_(net), box_(box), ignore_(ignore)
 {
 }
@@ -118,9 +118,9 @@ std::vector<dbInst*> OptimizeMirroring::findMirrorCandidates(
   unordered_set<dbInst*> existing;
   // Find inst terms on the boundary of the net boxes.
   for (NetBox* net_box : net_boxes) {
-    if (!net_box->ignore_) {
-      dbNet* net = net_box->net_;
-      Rect& box = net_box->box_;
+    if (!net_box->isIgnore()) {
+      dbNet* net = net_box->getNet();
+      const Rect& box = net_box->getBox();
       for (dbITerm* iterm : net->getITerms()) {
         dbInst* inst = iterm->getInst();
         int x, y;
@@ -204,7 +204,7 @@ int64_t OptimizeMirroring::hpwl(dbInst* inst)
     dbNet* net = iterm->getNet();
     if (net) {
       NetBox& net_box = net_box_map_[net];
-      if (!net_box.ignore_) {
+      if (!net_box.isIgnore()) {
         inst_hpwl += net_box.hpwl();
       }
     }
@@ -218,8 +218,8 @@ void OptimizeMirroring::updateNetBoxes(dbInst* inst)
     dbNet* net = iterm->getNet();
     if (net) {
       NetBox& net_box = net_box_map_[net];
-      if (!net_box.ignore_) {
-        net_box_map_[net].box_ = net->getTermBBox();
+      if (!net_box.isIgnore()) {
+        net_box_map_[net].setBox(net->getTermBBox());
       }
     }
   }

src/dpl/src/Optdp.cpp

@@ -92,21 +92,21 @@ void Opendp::improvePlacement(const int seed,
   // Everything done through a script string.
 
   DetailedParams dtParams;
-  dtParams.script_ = "";
+  dtParams.script = "";
   // Maximum independent set matching.
-  dtParams.script_ += "mis -p 10 -t 0.005;";
+  dtParams.script += "mis -p 10 -t 0.005;";
   // Global swaps.
-  dtParams.script_ += "gs -p 10 -t 0.005;";
+  dtParams.script += "gs -p 10 -t 0.005;";
   // Vertical swaps.
-  dtParams.script_ += "vs -p 10 -t 0.005;";
+  dtParams.script += "vs -p 10 -t 0.005;";
   // Small reordering.
-  dtParams.script_ += "ro -p 10 -t 0.005;";
+  dtParams.script += "ro -p 10 -t 0.005;";
   // Random moves and swaps with hpwl as a cost function.  Use
   // random moves and hpwl objective right now.
-  dtParams.script_ += "default -p 5 -f 20 -gen rng -obj hpwl -cost (hpwl);";
+  dtParams.script += "default -p 5 -f 20 -gen rng -obj hpwl -cost (hpwl);";
 
   if (disallow_one_site_gaps) {
-    dtParams.script_ += "disallow_one_site_gaps;";
+    dtParams.script += "disallow_one_site_gaps;";
   }
 
   // Run the script.

src/dpl/src/PlacementDRC.cpp

@@ -156,7 +156,7 @@ bool PlacementDRC::checkBlockedLayers(const Node* cell,
   for (GridY y1 = y_begin; y1 < y_end; y1++) {
     for (GridX x1 = x_begin; x1 < x_end; x1++) {
       const Pixel* pixel = grid_->gridPixel(x1, y1);
-      if (pixel != nullptr && pixel->blocked_layers_ & cell->getUsedLayers()) {
+      if (pixel != nullptr && pixel->blocked_layers & cell->getUsedLayers()) {
         return false;
       }
     }
@@ -242,4 +242,4 @@ DbuX PlacementDRC::gridToDbu(const GridX grid_x, const DbuX site_width) const
   return DbuX(grid_x.v * site_width.v);
 }
 
-}  // namespace dpl
+}  // namespace dpl