diff --git a/flow/scripts/read_liberty.tcl b/flow/scripts/read_liberty.tcl index 52c8e0c01a..0c77bc9d57 100644 --- a/flow/scripts/read_liberty.tcl +++ b/flow/scripts/read_liberty.tcl @@ -1,11 +1,19 @@ #Read Liberty +# With corners, every library is read once and then bound to the scene of +# each corner that lists it. define_scene resolves a library by the +# filename read_liberty was given. if { [env_var_exists_and_non_empty CORNERS] } { - # corners - define_corners {*}$::env(CORNERS) + set corner_libs [dict create] + set read_libs {} foreach corner $::env(CORNERS) { set LIBKEY "[string toupper $corner]_LIB_FILES" foreach libFile $::env($LIBKEY) { - log_cmd read_liberty -corner $corner [lib_file_to_read $libFile] + set lib [lib_file_to_read $libFile] + if { $lib ni $read_libs } { + log_cmd read_liberty $lib + lappend read_libs $lib + } + dict lappend corner_libs $corner $lib } unset LIBKEY } @@ -22,11 +30,19 @@ if { [env_var_exists_and_non_empty CORNERS] } { # _pre_layout variants (ideal clock) are for pre-CTS consumers that # select lib files themselves. foreach libFile [auto_memories_views .lib] { + log_cmd read_liberty $libFile if { [env_var_exists_and_non_empty CORNERS] } { foreach corner $::env(CORNERS) { - log_cmd read_liberty -corner $corner $libFile + dict lappend corner_libs $corner $libFile } - } else { - log_cmd read_liberty $libFile } } + +if { [env_var_exists_and_non_empty CORNERS] } { + foreach corner $::env(CORNERS) { + log_cmd define_scene $corner -liberty [dict get $corner_libs $corner] + } + # The first corner is the command scene, as define_corners left it. + log_cmd set_scene [lindex $::env(CORNERS) 0] + unset corner corner_libs read_libs +} diff --git a/flow/scripts/report_metrics.tcl b/flow/scripts/report_metrics.tcl index ed6f2ec6ef..eebea039a3 100644 --- a/flow/scripts/report_metrics.tcl +++ b/flow/scripts/report_metrics.tcl @@ -270,8 +270,8 @@ proc report_metrics { stage when { include_erc true } { include_clock_skew true if { [env_var_exists_and_non_empty CORNERS] } { foreach corner $::env(CORNERS) { report_puts "Corner: $corner" - report_power -corner $corner >> $filename - report_power_metric -corner $corner + report_power -scene $corner >> $filename + report_power_metric -scene $corner } unset corner } else { diff --git a/tools/OpenROAD b/tools/OpenROAD index 6932b6296c..3af796df56 160000 --- a/tools/OpenROAD +++ b/tools/OpenROAD @@ -1 +1 @@ -Subproject commit 6932b6296c65aebaadae64850f5a23265758ead0 +Subproject commit 3af796df56a170c0dc446fa17177a28a711a7354