Merge remote-tracking branch 'origin/master' into secure_hrtlmp_default

ravi-varadarajan · ravi-varadarajan · commit 5c32c5a90786 · 2022-12-09T05:24:07.000-08:00
Signed-off-by: Ravi Varadarajan &lt;rvaradarajan@ucsd.edu&gt;
diff --git a/flow/designs/sky130hd/chameleon/config.mk b/flow/designs/sky130hd/chameleon/config.mk
@@ -45,7 +45,6 @@ export ADDITIONAL_LEFS  = $(chameleon_DIR)/lef/apb_sys_0.lef \
                           $(chameleon_DIR)/lef/ibex_wrapper.lef
 
 export MACRO_PLACEMENT = $(chameleon_DIR)/chameleon.macro_placment.cfg
-export MACRO_EXTENSION = 1
 
 export FP_PDN_RAIL_WIDTH = 0.48
 export FP_PDN_RAIL_OFFSET = 0
diff --git a/flow/platforms/nangate45/fastroute.tcl b/flow/platforms/nangate45/fastroute.tcl
@@ -2,4 +2,3 @@ set_global_routing_layer_adjustment metal2-metal3 0.5
 set_global_routing_layer_adjustment metal4-$::env(MAX_ROUTING_LAYER) 0.25
 
 set_routing_layers -signal $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER)
-set_macro_extension 2
diff --git a/flow/platforms/sky130hd/fastroute.tcl b/flow/platforms/sky130hd/fastroute.tcl
@@ -2,6 +2,3 @@ set_global_routing_layer_adjustment $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING
 
 set_routing_layers -signal $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER)
 
-if {[info exist env(MACRO_EXTENSION)]} {
-  set_macro_extension $::env(MACRO_EXTENSION)
-}
diff --git a/flow/platforms/sky130hd_fakestack/fastroute.tcl b/flow/platforms/sky130hd_fakestack/fastroute.tcl
@@ -2,6 +2,3 @@ set_global_routing_layer_adjustment $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING
 
 set_routing_layers -signal $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER)
 
-if {[info exist env(MACRO_EXTENSION)]} {
-  set_macro_extension $::env(MACRO_EXTENSION)
-}
diff --git a/flow/scripts/global_route.tcl b/flow/scripts/global_route.tcl
@@ -11,7 +11,6 @@ if {[info exist env(FASTROUTE_TCL)]} {
 } else {
   set_global_routing_layer_adjustment $env(MIN_ROUTING_LAYER)-$env(MAX_ROUTING_LAYER) 0.5
   set_routing_layers -signal $env(MIN_ROUTING_LAYER)-$env(MAX_ROUTING_LAYER)
-  set_macro_extension 2
 }
 
 global_route -guide_file $env(RESULTS_DIR)/route.guide \
diff --git a/flow/scripts/report_metrics.tcl b/flow/scripts/report_metrics.tcl
@@ -1,4 +1,9 @@
 proc report_metrics { when {include_erc true} {include_clock_skew true} } {
+  puts "\n=========================================================================="
+  puts "$when check_setup"
+  puts "--------------------------------------------------------------------------"
+  check_setup
+
   puts "\n=========================================================================="
   puts "$when report_tns"
   puts "--------------------------------------------------------------------------"
diff --git a/flow/scripts/save_images.tcl b/flow/scripts/save_images.tcl
@@ -74,4 +74,9 @@ for {set i 0} {$i <= 5} {incr i} {
 }
 gui::clear_selections
 
+foreach clock [get_clocks *] {
+  set clock_name [get_name $clock]
+  gui::save_clocktree_image $::env(REPORTS_DIR)/cts_$clock_name.webp $clock_name
+}
+
 gui::restore_display_controls
diff --git a/tools/OpenROAD b/tools/OpenROAD
@@ -1 +1 @@
-Subproject commit 2a9ef5fa175f38558e01681e98a7572316b3b17b
+Subproject commit af06128eaa8129290efef18f33aa2df70cf9d4e4

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,3 @@ set_global_routing_layer_adjustment metal2-metal3 0.5`
`2`	`2`	`set_global_routing_layer_adjustment metal4-$::env(MAX_ROUTING_LAYER) 0.25`
`3`	`3`
`4`	`4`	`set_routing_layers -signal $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER)`
`5`		`-set_macro_extension 2`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ if {[info exist env(FASTROUTE_TCL)]} {`
`11`	`11`	`} else {`
`12`	`12`	`set_global_routing_layer_adjustment $env(MIN_ROUTING_LAYER)-$env(MAX_ROUTING_LAYER) 0.5`
`13`	`13`	`set_routing_layers -signal $env(MIN_ROUTING_LAYER)-$env(MAX_ROUTING_LAYER)`
`14`		`- set_macro_extension 2`
`15`	`14`	`}`
`16`	`15`
`17`	`16`	`global_route -guide_file $env(RESULTS_DIR)/route.guide \`
Original file line number	Diff line number	Diff line change
`@@ -74,4 +74,9 @@ for {set i 0} {$i <= 5} {incr i} {`
`74`	`74`	`}`
`75`	`75`	`gui::clear_selections`
`76`	`76`
	`77`	`+foreach clock [get_clocks *] {`
	`78`	`+ set clock_name [get_name $clock]`
	`79`	`+ gui::save_clocktree_image $::env(REPORTS_DIR)/cts_$clock_name.webp $clock_name`
	`80`	`+}`
	`81`	`+`
`77`	`82`	`gui::restore_display_controls`