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

Author: oharboe

docs/tutorials/FlowTutorial.md

@@ -106,7 +106,7 @@ Log                       Elapsed seconds
 1_1_yosys                          2
 3_3_place_gp                       1
 4_1_cts                            8
-5_2_TritonRoute                   10
+5_2_route                   10
 6_1_merge                         10
 6_report                           3
 ```
@@ -315,13 +315,13 @@ abc.constr klayout.lyt klayout_tech.lef lib
 
 | `logs`                 |                        |                       |
 |------------------------|------------------------|-----------------------|
-| `1_1_yosys.log`        | `3_1_place_gp.log`     | `5_2_TritonRoute.log` |
+| `1_1_yosys.log`        | `3_1_place_gp.log`     | `5_2_route.log` |
 | `2_1_floorplan.log`    | `3_2_place_iop.log`    | `6_1_merge.log`       |
 | `2_2_floorplan_io.log` | `3_3_resizer.log`      | `6_report.log`        |
 | `2_3_tdms_place.log`   | `3_4_opendp.log`       |                       |
-| `2_4_mplace.log`       | `4_1_cts.log`          |                       |
-| `2_5_tapcell.log`      | `4_2_cts_fillcell.log` |                       |
-| `2_6_pdn.log`          | `5_1_fastroute.log`    |                       |
+| `2_4_floorplan_macro.log`       | `4_1_cts.log`          |                       |
+| `2_5_floorplan_tapcell.log`      | `4_2_cts_fillcell.log` |                       |
+| `2_6_floorplan_pdn.log`          | `5_1_grt.log`    |                       |
 
 
 -   `results/sky130hd/ibex/base`
@@ -393,13 +393,13 @@ The log structure is as follows:
 
 | `logs`                 |                        |                       |
 |------------------------|------------------------|-----------------------|
-| `1_1_yosys.log`        | `3_1_place_gp.log`     | `5_2_TritonRoute.log` |
+| `1_1_yosys.log`        | `3_1_place_gp.log`     | `5_2_route.log` |
 | `2_1_floorplan.log`    | `3_2_place_iop.log`    | `6_1_merge.log`       |
 | `2_2_floorplan_io.log` | `3_3_resizer.log`      | `6_report.log`        |
 | `2_3_tdms_place.log`   | `3_4_opendp.log`       |                       |
-| `2_4_mplace.log`       | `4_1_cts.log`          |                       |
-| `2_5_tapcell.log`      | `4_2_cts_fillcell.log` |                       |
-| `2_6_pdn.log`          | `5_1_fastroute.log`    |                       |
+| `2_4_floorplan_macro.log`       | `4_1_cts.log`          |                       |
+| `2_5_floorplan_tapcell.log`      | `4_2_cts_fillcell.log` |                       |
+| `2_6_floorplan_pdn.log`          | `5_1_grt.log`    |                       |
 
 ### Area
 

flow/Makefile

@@ -499,13 +499,13 @@ $(eval $(call do-step,2_4_floorplan_macro,$(RESULTS_DIR)/2_3_floorplan_tdms.odb
 # STEP 5: Tapcell and Welltie insertion
 #-------------------------------------------------------------------------------
 $(RESULTS_DIR)/2_5_floorplan_tapcell.odb: $(RESULTS_DIR)/2_4_floorplan_macro.odb $(TAPCELL_TCL)
-	($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/tapcell.tcl -metrics $(LOG_DIR)/2_5_tapcell.json) 2>&1 | tee $(LOG_DIR)/2_5_tapcell.log
+	($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/tapcell.tcl -metrics $(LOG_DIR)/2_5_floorplan_tapcell.json) 2>&1 | tee $(LOG_DIR)/2_5_floorplan_tapcell.log
 
 
 # STEP 6: PDN generation
 #-------------------------------------------------------------------------------
 $(RESULTS_DIR)/2_6_floorplan_pdn.odb: $(RESULTS_DIR)/2_5_floorplan_tapcell.odb $(PDN_TCL)
-	($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/pdn.tcl -metrics $(LOG_DIR)/2_6_pdn.json) 2>&1 | tee $(LOG_DIR)/2_6_pdn.log
+	($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/pdn.tcl -metrics $(LOG_DIR)/2_6_floorplan_pdn.json) 2>&1 | tee $(LOG_DIR)/2_6_floorplan_pdn.log
 
 $(RESULTS_DIR)/2_floorplan.odb: $(RESULTS_DIR)/2_6_floorplan_pdn.odb
 	cp $< $@
@@ -552,7 +552,7 @@ $(RESULTS_DIR)/3_3_place_gp.odb: $(RESULTS_DIR)/3_2_place_iop.odb $(RESULTS_DIR)
 # STEP 4: Resizing & Buffering
 #-------------------------------------------------------------------------------
 $(RESULTS_DIR)/3_4_place_resized.odb: $(RESULTS_DIR)/3_3_place_gp.odb $(RESULTS_DIR)/2_floorplan.sdc
-	($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/resize.tcl -metrics $(LOG_DIR)/3_4_resizer.json) 2>&1 | tee $(LOG_DIR)/3_4_resizer.log
+	($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/resize.tcl -metrics $(LOG_DIR)/3_4_place_resized.json) 2>&1 | tee $(LOG_DIR)/3_4_place_resized.log
 
 .PHONY: clean_resize
 clean_resize:
@@ -561,7 +561,7 @@ clean_resize:
 # STEP 5: Detail placement
 #-------------------------------------------------------------------------------
 $(RESULTS_DIR)/3_5_place_dp.odb: $(RESULTS_DIR)/3_4_place_resized.odb
-	($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/detail_place.tcl -metrics $(LOG_DIR)/3_5_opendp.json) 2>&1 | tee $(LOG_DIR)/3_5_opendp.log
+	($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/detail_place.tcl -metrics $(LOG_DIR)/3_5_place_dp.json) 2>&1 | tee $(LOG_DIR)/3_5_place_dp.log
 
 $(RESULTS_DIR)/3_place.odb: $(RESULTS_DIR)/3_5_place_dp.odb
 	cp $< $@
@@ -630,7 +630,7 @@ route: $(RESULTS_DIR)/5_route.odb \
 # STEP 1: Run global route
 #-------------------------------------------------------------------------------
 $(RESULTS_DIR)/5_1_grt.odb: $(RESULTS_DIR)/4_cts.odb $(FASTROUTE_TCL) $(PRE_GLOBAL_ROUTE)
-	($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/global_route.tcl -metrics $(LOG_DIR)/5_1_fastroute.json) 2>&1 | tee $(LOG_DIR)/5_1_fastroute.log
+	($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/global_route.tcl -metrics $(LOG_DIR)/5_1_grt.json) 2>&1 | tee $(LOG_DIR)/5_1_grt.log
 
 
 # STEP 2: Run detailed route
@@ -640,7 +640,7 @@ $(RESULTS_DIR)/5_2_route.odb: $(RESULTS_DIR)/5_1_grt.odb
 else
 $(RESULTS_DIR)/5_2_route.odb: $(RESULTS_DIR)/4_cts.odb
 endif
-	($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/detail_route.tcl -metrics $(LOG_DIR)/5_2_TritonRoute.json) 2>&1 | tee $(LOG_DIR)/5_2_TritonRoute.log
+	($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/detail_route.tcl -metrics $(LOG_DIR)/5_2_route.json) 2>&1 | tee $(LOG_DIR)/5_2_route.log
 
 $(RESULTS_DIR)/5_route.odb: $(RESULTS_DIR)/5_2_route.odb
 	cp $< $@
@@ -701,7 +701,7 @@ elapsed:
 
 ifneq ($(USE_FILL),)
 $(RESULTS_DIR)/6_1_fill.odb: $(RESULTS_DIR)/5_route.odb $(FILL_CONFIG)
-	($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/density_fill.tcl -metrics $(LOG_DIR)/6_density_fill.json) 2>&1 | tee $(LOG_DIR)/6_density_fill.log
+	($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/density_fill.tcl -metrics $(LOG_DIR)/6_1_fill.json) 2>&1 | tee $(LOG_DIR)/6_1_fill.log
 else
 $(RESULTS_DIR)/6_1_fill.odb: $(RESULTS_DIR)/5_route.odb
 	cp $< $@

flow/designs/asap7/mock-array/Element/config.mk

@@ -14,11 +14,13 @@ export GPL_ROUTABILITY_DRIVEN = 0
 
 export CORE_AREA = $(shell \
   export MOCK_ARRAY_TABLE="$(MOCK_ARRAY_TABLE)" && \
+  export MOCK_ARRAY_SCALE="$(MOCK_ARRAY_SCALE)" && \
   cd $(dir $(DESIGN_CONFIG))/../ && \
   python3 -c "import config; print(f'{config.ce_margin_x} {config.ce_margin_y} {config.ce_width - config.ce_margin_x} {config.ce_height - config.ce_margin_y}')")
 
 export DIE_AREA = $(shell \
   export MOCK_ARRAY_TABLE="$(MOCK_ARRAY_TABLE)" && \
+  export MOCK_ARRAY_SCALE="$(MOCK_ARRAY_SCALE)" && \
   cd $(dir $(DESIGN_CONFIG))/../ && \
   python3 -c "import config; print(f'0 0 {config.ce_width} {config.ce_height}')")
 

flow/designs/asap7/mock-array/Element/constraints.sdc

@@ -4,7 +4,7 @@ set cols [expr {[info exists ::env(MOCK_ARRAY_COLS)] ? $::env(MOCK_ARRAY_COLS) :
 
 set clk_name clock
 set clk_port_name clock
-set clk_period 8000
+set clk_period 2000
 
 set clk_port [get_ports $clk_port_name]
 create_clock -period $clk_period -waveform [list 0 [expr $clk_period / 2]] -name $clk_name $clk_port

flow/designs/asap7/mock-array/config.mk

@@ -14,11 +14,13 @@ export PLACE_DENSITY          = 0.30
 
 export CORE_AREA = $(shell \
   export MOCK_ARRAY_TABLE="$(MOCK_ARRAY_TABLE)"  && \
+  export MOCK_ARRAY_SCALE="$(MOCK_ARRAY_SCALE)" && \
   cd $(dir $(DESIGN_CONFIG)) && \
   python3 -c "import config ; print(f'{config.margin_x} {config.margin_y} {config.core_width + config.margin_x} {config.core_height + config.margin_y}')")
 
 export DIE_AREA  = $(shell \
   export MOCK_ARRAY_TABLE="$(MOCK_ARRAY_TABLE)" && \
+  export MOCK_ARRAY_SCALE="$(MOCK_ARRAY_SCALE)" && \
   cd $(dir $(DESIGN_CONFIG)) && \
   python3 -c "import config; print(f'{0} {0} {config.die_width} {config.die_height}')")
 
@@ -49,3 +51,10 @@ export DETAILED_ROUTE_ARGS   = -bottom_routing_layer M2 -top_routing_layer M7 -s
 # same information to other stages in the flow.
 export MIN_ROUTING_LAYER = M2
 export MAX_ROUTING_LAYER = M7
+
+# works with 28 or more iterations as of writing, so give it a few more.
+export GLOBAL_ROUTE_ARGS=-congestion_iterations 40 -verbose
+
+# ensure we have some rows, so we don't get a bad clock skew.
+export MACRO_HALO_X            = 0.5
+export MACRO_HALO_Y            = 0.5

flow/designs/asap7/mock-array/config.py

@@ -1,10 +1,15 @@
 import os
 
-# routing pitch for M4, M5 and M6 tied to placement grid at 2.16
-# therefore, the optimal placement and Element size should be multiple of 2.16
-# set grid x and y
-placement_grid_x     = 2.16
-placement_grid_y     = 2.16
+# Routing pitches for relevant metal layers.
+#  For x, this is M5; for y, this is M4.
+#  Pitches are specified in OpenROAD-flow-scripts/flow/platforms/asap7/lef/asap7_tech_1x_201209.lef.
+#  For asap7, x and y pitch is the same.
+#
+# make_tracks M5 -x_offset 0.012 -x_pitch 0.048 -y_offset 0.012 -y_pitch 0.048
+#
+# the macro needs to be on a multiple of the track pattern
+placement_grid_x     = 0.048 * int(os.environ.get("MOCK_ARRAY_SCALE"))
+placement_grid_y     = 0.048 * int(os.environ.get("MOCK_ARRAY_SCALE"))
 
 # number of Elements in row and column, can be control by user via environment variable 
 # MOCK_ARRAY_TABLE (rows, cols, width, height, pitch_x, pitch_y)

flow/designs/asap7/mock-array/constraints.sdc

@@ -1,6 +1,6 @@
 set sdc_version 2.0
 
-set clk_period 8000
+set clk_period 2000
 create_clock [get_ports clock] -period $clk_period -waveform [list 0 [expr $clk_period/2]]
 
 set clk_name  clock

flow/designs/asap7/mock-array/defaults.mk

@@ -3,10 +3,12 @@
 # current unit is configured as 2.16 which is on the routing grid for M5
 
 # table of Elements - (rows cols width height pitch_x pitch_y)
-export MOCK_ARRAY_TABLE         ?= 8 8 4 4 5 5
+export MOCK_ARRAY_TABLE         ?= 8 8 20 20 20 21
 
 # Element'd data width
-export MOCK_ARRAY_DATAWIDTH     ?= 8
+export MOCK_ARRAY_DATAWIDTH     ?= 64
 
 # Must be zero for routing by abutment
-export MACRO_BLOCKAGE_HALO      ?= 0.5
+export MACRO_BLOCKAGE_HALO      ?= 0
+
+export MOCK_ARRAY_SCALE         ?= 45

flow/designs/asap7/mock-array/macro-placement.tcl

@@ -9,8 +9,16 @@ for {set row 0} {$row < $rows} {incr row} {
   for {set col 0} {$col < $cols} {incr col} {
     set inst [$block findInst [format "ces_%d_%d" $row $col]]
 
-    set x [expr int((($array_offset_x + (($placement_grid_x * $pitch_x) * $col)) * $units))]
-    set y [expr int((($array_offset_y + (($placement_grid_y * $pitch_y) * $row)) * $units))]
+    set x [expr round((($array_offset_x + (($placement_grid_x * $pitch_x) * $col)) * $units))]
+    set y [expr round((($array_offset_y + (($placement_grid_y * $pitch_y) * $row)) * $units))]
+
+    # belt and suspenders check... ASAP7 macro placement must be aligned to 0.048um
+    if {$x % 48 != 0} {
+        error "x=$x is not divisible by 48"
+    }
+    if {$y % 48 != 0} {
+        error "y=$y is not divisible by 48"
+    }
 
     $inst setOrient R0
     $inst setOrigin $x $y