Merge pull request #2874 from siliconcompiler/fix-openroad-driver

update openroad driver

Author: gadfort

siliconcompiler/tools/openroad/floorplan.py

@@ -1,4 +1,5 @@
 from siliconcompiler.tools._common import input_provides, add_common_file, get_tool_task
+from siliconcompiler.tools._common.asic import set_tool_task_var
 from siliconcompiler.tools.openroad.openroad import setup as setup_tool
 from siliconcompiler.tools.openroad.openroad import build_pex_corners
 from siliconcompiler.tools.openroad.openroad import post_process as or_post_process
@@ -46,6 +47,10 @@ def setup(chip):
              'script to insert the padring',
              field='help')
 
+    set_tool_task_var(chip, param_key='remove_synth_buffers',
+                      default_value=True,
+                      schelp='remove buffers inserted by synthesis')
+
     snap = chip.get('tool', tool, 'task', task, 'var', 'ifp_snap_strategy',
                     step=step, index=index)[0]
     snaps_allowed = ('none', 'site', 'manufacturing_grid')

siliconcompiler/tools/openroad/openroad.py

@@ -583,10 +583,16 @@ def _define_pad_params(chip):
 
 
 def _define_rsz_params(chip):
+    set_tool_task_var(chip, param_key='rsz_skip_setup_repair',
+                      default_value=False,
+                      schelp='skip setup timing repair')
     set_tool_task_var(chip, param_key='rsz_setup_slack_margin',
                       default_value='0.0',
                       schelp='specifies the margin to apply when performing setup repair '
                              'in library timing units')
+    set_tool_task_var(chip, param_key='rsz_skip_hold_repair',
+                      default_value=False,
+                      schelp='skip hold timing repair')
     set_tool_task_var(chip, param_key='rsz_hold_slack_margin',
                       default_value='0.0',
                       schelp='specifies the margin to apply when performing setup repair '
@@ -920,9 +926,12 @@ def _set_reports(chip, reports):
     def check_enabled(type):
         for key in (('tool', tool, 'task', task, 'var', f'skip_{type}'),
                     ('option', 'var', f'openroad_skip_{type}')):
-            if chip.valid(*key) and \
-               chip.get(*key, step=step, index=index) == ["true"]:
-                return False
+            if chip.valid(*key):
+                if chip.get(*key, field='pernode') == 'never':
+                    if chip.get(*key) == ["true"]:
+                        return False
+                    elif chip.get(*key, step=step, index=index) == ["true"]:
+                        return False
         return True
 
     for report in reports:

siliconcompiler/tools/openroad/scripts/sc_cts.tcl

@@ -31,8 +31,6 @@ if { [llength [all_clocks]] > 0 } {
 
   sc_detailed_placement
 
-  estimate_parasitics -placement
-
   set repair_timing_args []
   if { $openroad_rsz_skip_pin_swap == "true" } {
     lappend repair_timing_args "-skip_pin_swap"
@@ -41,18 +39,25 @@ if { [llength [all_clocks]] > 0 } {
     lappend repair_timing_args "-skip_gate_cloning"
   }
 
-  repair_timing -setup -verbose \
-    -setup_margin $openroad_rsz_setup_slack_margin \
-    -hold_margin $openroad_rsz_hold_slack_margin \
-    -repair_tns $openroad_rsz_repair_tns \
-    {*}$repair_timing_args
+  if { [lindex [sc_cfg_tool_task_get var rsz_skip_setup_repair] 0] != "true" } {
+    estimate_parasitics -placement
 
-  estimate_parasitics -placement
-  repair_timing -hold -verbose \
-    -setup_margin $openroad_rsz_setup_slack_margin \
-    -hold_margin $openroad_rsz_hold_slack_margin \
-    -repair_tns $openroad_rsz_repair_tns \
-    {*}$repair_timing_args
+    repair_timing -setup -verbose \
+      -setup_margin $openroad_rsz_setup_slack_margin \
+      -hold_margin $openroad_rsz_hold_slack_margin \
+      -repair_tns $openroad_rsz_repair_tns \
+      {*}$repair_timing_args
+  }
+
+  if { [lindex [sc_cfg_tool_task_get var rsz_skip_hold_repair] 0] != "true" } {
+    estimate_parasitics -placement
+
+    repair_timing -hold -verbose \
+      -setup_margin $openroad_rsz_setup_slack_margin \
+      -hold_margin $openroad_rsz_hold_slack_margin \
+      -repair_tns $openroad_rsz_repair_tns \
+      {*}$repair_timing_args
+  }
 
   sc_detailed_placement
 }

siliconcompiler/tools/openroad/scripts/sc_floorplan.tcl

@@ -330,6 +330,9 @@ if { [sc_design_has_unplaced_macros] } {
     # technologies we support do not, so we don't include that step for now.
   }
 }
+
+sc_print_macro_information
+
 if { [sc_design_has_unplaced_macros] } {
   utl::error FLW 1 "Design contains unplaced macros."
 }
@@ -402,4 +405,6 @@ foreach net [sc_psm_check_nets] {
 # Remove buffers inserted by synthesis
 ###########################
 
-remove_buffers
+if { [lindex [sc_cfg_tool_task_get var remove_synth_buffers] 0] == "true" } {
+  remove_buffers
+}

siliconcompiler/tools/openroad/scripts/sc_procs.tcl

@@ -220,6 +220,34 @@ proc sc_design_has_unplaced_macros { } {
   return false
 }
 
+###########################
+# Print macros placement
+###########################
+
+proc sc_print_macro_information { } {
+  set print_header "true"
+  foreach inst [[ord::get_db_block] getInsts] {
+    if { [$inst isBlock] } {
+      set master [$inst getMaster]
+      set status [$inst getPlacementStatus]
+
+      if { $print_header == "true" } {
+        puts "Macro placement information"
+        set print_header "false"
+      }
+      if { [$inst isPlaced] } {
+        set location [$inst getLocation]
+        set orient [$inst getOrient]
+        set xloc [ord::dbu_to_microns [lindex $location 0]]
+        set yloc [ord::dbu_to_microns [lindex $location 1]]
+        puts "[$inst getName] ([$master getName]): $status at ($xloc um, $yloc um) $orient"
+      } else {
+        utl::warn FLW 1 "[$inst getName] ([$master getName]): UNPLACED"
+      }
+    }
+  }
+}
+
 ###########################
 # Design has unplaced pads
 ###########################