Merge remote-tracking branch 'origin/master' into secure-large

ravi-varadarajan · ravi-varadarajan · commit 59660e79435c · 2023-05-31T15:33:08.000-07:00
Signed-off-by: Ravi Varadarajan &lt;rvaradarajan@ucsd.edu&gt;
diff --git a/etc/DependencyInstaller.sh b/etc/DependencyInstaller.sh
@@ -10,7 +10,7 @@ else
 fi
 
 # package versions
-klayoutVersion=0.27.10
+klayoutVersion=0.28.8
 
 _installORDependencies() {
     ./tools/OpenROAD/etc/DependencyInstaller.sh ${OR_INSTALLER_ARGS}
@@ -74,9 +74,9 @@ _installUbuntuPackages() {
 
     # install KLayout
     if [[ $1 == 20.04 ]]; then
-        klayoutChecksum=8076dadfb1b790b75d284fdc9c90f70b
+        klayoutChecksum=15a26f74cf396d8a10b7985ed70ab135
     else
-        klayoutChecksum=2fb355f0e19d69be8535722185f983cc
+        klayoutChecksum=db751264399706a23d20455bb7624264
     fi
     wget https://www.klayout.org/downloads/Ubuntu-${1%.*}/klayout_${klayoutVersion}-1_amd64.deb
     md5sum -c <(echo "${klayoutChecksum} klayout_${klayoutVersion}-1_amd64.deb") || exit 1
diff --git a/flow/designs/asap7/mock-array-big/Element/config.mk b/flow/designs/asap7/mock-array-big/Element/config.mk
@@ -24,3 +24,8 @@ export PDN_TCL = designs/asap7/mock-array-big/Element/pdn.tcl
 export MAX_ROUTING_LAYER = M5
 
 export PRIVATE_DIR=designs/asap7/mock-array-big
+
+# If this design isn't quickly done in detailed routing, something is wrong.
+# At time of adding this option, only 3 iterations were needed for 0
+# violations.
+export DETAILED_ROUTE_ARGS=-droute_end_iter 10
diff --git a/flow/designs/asap7/mock-array-big/config.mk b/flow/designs/asap7/mock-array-big/config.mk
@@ -27,3 +27,8 @@ export PDN_TCL = designs/asap7/mock-array-big/pdn.tcl
 export TNS_END_PERCENT       = 100
 
 export PRIVATE_DIR=designs/asap7/mock-array-big
+
+# If this design isn't quickly done in detailed routing, something is wrong.
+# At time of adding this option, only 3 iterations were needed for 0
+# violations.
+export DETAILED_ROUTE_ARGS=-droute_end_iter 10
diff --git a/flow/designs/asap7/riscv32i/metadata-base-ok.json b/flow/designs/asap7/riscv32i/metadata-base-ok.json
diff --git a/flow/designs/asap7/riscv32i/rules-base.json b/flow/designs/asap7/riscv32i/rules-base.json
@@ -64,7 +64,7 @@
         "compare": "<="
     },
     "finish__timing__drv__max_slew_limit": {
-        "value": -0.29,
+        "value": -0.72,
         "compare": ">="
     },
     "finish__timing__drv__max_fanout_limit": {
diff --git a/flow/designs/gf12/ariane/metadata-base-ok.json b/flow/designs/gf12/ariane/metadata-base-ok.json
diff --git a/flow/designs/gf12/ariane/rules-base.json b/flow/designs/gf12/ariane/rules-base.json
@@ -64,7 +64,7 @@
         "compare": "<="
     },
     "finish__timing__drv__max_slew_limit": {
-        "value": -0.36,
+        "value": -0.73,
         "compare": ">="
     },
     "finish__timing__drv__max_fanout_limit": {
diff --git a/flow/designs/gf12/swerv_wrapper/metadata-base-ok.json b/flow/designs/gf12/swerv_wrapper/metadata-base-ok.json
diff --git a/flow/designs/gf12/swerv_wrapper/rules-base.json b/flow/designs/gf12/swerv_wrapper/rules-base.json
@@ -40,7 +40,7 @@
         "compare": "<="
     },
     "globalroute__timing__setup__ws": {
-        "value": -32.63,
+        "value": -114.78,
         "compare": ">="
     },
     "detailedroute__route__wirelength": {
diff --git a/flow/designs/nangate45/bp_multi_top/metadata-base-ok.json b/flow/designs/nangate45/bp_multi_top/metadata-base-ok.json
diff --git a/flow/designs/nangate45/bp_multi_top/rules-base.json b/flow/designs/nangate45/bp_multi_top/rules-base.json
@@ -24,11 +24,11 @@
         "compare": ">="
     },
     "cts__timing__setup__ws__pre_repair": {
-        "value": -3.82,
+        "value": -3.77,
         "compare": ">="
     },
     "cts__timing__setup__ws__post_repair": {
-        "value": -3.82,
+        "value": -3.77,
         "compare": ">="
     },
     "cts__design__instance__count__setup_buffer": {
@@ -56,23 +56,23 @@
         "compare": "<="
     },
     "finish__timing__setup__ws": {
-        "value": -2.12,
+        "value": -1.88,
         "compare": ">="
     },
     "finish__design__instance__area": {
         "value": 592910,
         "compare": "<="
     },
     "finish__timing__drv__max_slew_limit": {
-        "value": -0.2,
+        "value": -1.11,
         "compare": ">="
     },
     "finish__timing__drv__max_fanout_limit": {
         "value": -0.2,
         "compare": ">="
     },
     "finish__timing__drv__max_cap_limit": {
-        "value": -0.46,
+        "value": -0.3,
         "compare": ">="
     },
     "finish__timing__drv__setup_violation_count": {
diff --git a/flow/designs/sky130hd/microwatt/config.mk b/flow/designs/sky130hd/microwatt/config.mk
@@ -30,3 +30,5 @@ export CTS_CLUSTER_DIAMETER = 100
 export CTS_CLUSTER_SIZE = 30
 
 export export SETUP_SLACK_MARGIN = 0.2
+
+export GLOBAL_ROUTE_ARGS=-congestion_iterations 100 -verbose
diff --git a/flow/scripts/final_report.tcl b/flow/scripts/final_report.tcl
@@ -39,15 +39,17 @@ if {[info exist ::env(RCX_RULES)]} {
   if {[info exist ::env(PWR_NETS_VOLTAGES)]} {
     dict for {pwrNetName pwrNetVoltage}  {*}$::env(PWR_NETS_VOLTAGES) {
         set_pdnsim_net_voltage -net ${pwrNetName} -voltage ${pwrNetVoltage}
-        analyze_power_grid -net ${pwrNetName}
+        analyze_power_grid -net ${pwrNetName} \
+            -error_file $::env(REPORTS_DIR)/${pwrNetName}.rpt
     }
   } else {
     puts "IR drop analysis for power nets is skipped because PWR_NETS_VOLTAGES is undefined"
   }
   if {[info exist ::env(GND_NETS_VOLTAGES)]} {
     dict for {gndNetName gndNetVoltage}  {*}$::env(GND_NETS_VOLTAGES) {
         set_pdnsim_net_voltage -net ${gndNetName} -voltage ${gndNetVoltage}
-        analyze_power_grid -net ${gndNetName}
+        analyze_power_grid -net ${gndNetName} \
+            -error_file $::env(REPORTS_DIR)/${gndNetName}.rpt
     }
   } else {
     puts "IR drop analysis for ground nets is skipped because GND_NETS_VOLTAGES is undefined"
diff --git a/flow/scripts/global_route.tcl b/flow/scripts/global_route.tcl
@@ -18,7 +18,7 @@ if {[info exist env(FASTROUTE_TCL)]} {
 
 global_route -guide_file $env(RESULTS_DIR)/route.guide \
                -congestion_report_file $env(REPORTS_DIR)/congestion.rpt \
-               {*}[expr {[info exists ::env(GLOBAL_ROUTE_ARGS)] ? $::env(GLOBAL_ROUTE_ARGS) : {-congestion_iterations 100 -verbose}}]
+               {*}[expr {[info exists ::env(GLOBAL_ROUTE_ARGS)] ? $::env(GLOBAL_ROUTE_ARGS) : {-congestion_iterations 20 -verbose}}]
 
 set_propagated_clock [all_clocks]
 estimate_parasitics -global_routing
