Skip to content

Commit d84cf91

Browse files
committed
Merge remote-tracking branch 'origin/master' into secure-update-OR
2 parents cf8e59f + 237d929 commit d84cf91

File tree

14 files changed

+311
-308
lines changed

14 files changed

+311
-308
lines changed

flow/Makefile

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -783,12 +783,20 @@ $(RESULTS_DIR)/6_final.def: $(LOG_DIR)/6_report.log
783783
do-finish:
784784
$(UNSET_AND_MAKE) do-6_1_fill do-6_1_fill.sdc do-6_final.sdc do-6_report elapsed
785785

786-
# Skipping resize can be useful for mock abstracts
786+
.PHONY: skip_place
787+
skip_place: $(RESULTS_DIR)/2_floorplan.odb $(RESULTS_DIR)/2_floorplan.sdc
788+
cp $(RESULTS_DIR)/2_floorplan.odb $(RESULTS_DIR)/3_1_place_gp_skip_io.odb
789+
cp $(RESULTS_DIR)/2_floorplan.odb $(RESULTS_DIR)/3_2_place_iop.odb
790+
cp $(RESULTS_DIR)/2_floorplan.odb $(RESULTS_DIR)/3_3_place_gp.odb
791+
cp $(RESULTS_DIR)/2_floorplan.odb $(RESULTS_DIR)/3_4_place_resized.odb
792+
cp $(RESULTS_DIR)/2_floorplan.odb $(RESULTS_DIR)/3_5_place_dp.odb
793+
cp $(RESULTS_DIR)/2_floorplan.odb $(RESULTS_DIR)/3_place.odb
794+
cp $(RESULTS_DIR)/2_floorplan.sdc $(RESULTS_DIR)/3_place.sdc
795+
787796
.PHONY: skip_resize
788797
skip_resize: $(RESULTS_DIR)/3_3_place_gp.odb
789798
cp $(RESULTS_DIR)/3_3_place_gp.odb $(RESULTS_DIR)/3_4_place_resized.odb
790799

791-
# Skipping CTS can be useful to smoketest later stages.
792800
.PHONY: skip_cts
793801
skip_cts: $(RESULTS_DIR)/3_place.odb $(RESULTS_DIR)/3_place.sdc
794802
# mock all intermediate results
@@ -797,18 +805,24 @@ skip_cts: $(RESULTS_DIR)/3_place.odb $(RESULTS_DIR)/3_place.sdc
797805
cp $(RESULTS_DIR)/3_place.sdc $(RESULTS_DIR)/4_cts.sdc
798806
cp $(RESULTS_DIR)/3_place.odb $(RESULTS_DIR)/4_cts.odb
799807

800-
# Skipping route can be useful to create a mock abstract
801808
.PHONY: skip_route
802809
skip_route: $(RESULTS_DIR)/4_cts.odb $(RESULTS_DIR)/4_cts.sdc
803810
cp $(RESULTS_DIR)/3_place.odb $(RESULTS_DIR)/5_1_grt.odb
804811
cp $(RESULTS_DIR)/3_place.odb $(RESULTS_DIR)/5_2_route.odb
805812
cp $(RESULTS_DIR)/3_place.odb $(RESULTS_DIR)/6_1_fill.odb
806813
touch $(RESULTS_DIR)/6_final.spef
807814

808-
# To create a mock abstract quickly, good enough to iterate quickly on
809-
# floorplanning and detailed route at higher levels, run:
815+
# A mock abstract is a fully or partially eviscerated macro. A mock
816+
# abstract can be useful when creating bug reports, previewing
817+
# macro placement, testing detailed routing, or other quick smoke-tests
818+
# at the top level.
819+
#
820+
# When creating a mock abstract, depending on what needs to be tested,
821+
# stages can be skipped.
822+
#
823+
# Leave out "skip_" targes as approperiate:
810824
#
811-
# make skip_resize skip_cts skip_route generate_abstract
825+
# make skip_place skip_cts skip_route generate_abstract
812826
.PHONY: generate_abstract
813827
generate_abstract: $(RESULTS_DIR)/6_final.gds $(RESULTS_DIR)/6_final.def $(RESULTS_DIR)/6_final.v $(RESULTS_DIR)/6_final.sdc
814828
$(UNSET_AND_MAKE) do-generate_abstract

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export DIE_AREA = $(shell \
2424

2525
export IO_CONSTRAINTS = designs/asap7/mock-array/Element/io.tcl
2626

27-
export PDN_TCL = designs/asap7/mock-array/Element/pdn.tcl
27+
export PDN_TCL = $(FLOW_HOME)/platforms/asap7/openRoad/pdn/BLOCK_grid_strategy.tcl
2828

2929
# If this design isn't quickly done in detailed routing, something is wrong.
3030
# At time of adding this option, only 3 iterations were needed for 0

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ include designs/asap7/mock-array/defaults.mk
33
export DESIGN_NAME = MockArray
44
export DESIGN_NICKNAME = mock-array
55

6-
export VERILOG_FILES_BLACKBOX = designs/src/mock-array/Element.v
76
export VERILOG_FILES = designs/src/mock-array/*.v
87

98
export SDC_FILE = designs/asap7/mock-array/constraints.sdc
@@ -32,7 +31,7 @@ export MACRO_PLACEMENT_TCL = ./designs/asap7/mock-array/macro-placement.tcl
3231

3332
export IO_CONSTRAINTS = designs/asap7/mock-array/io.tcl
3433

35-
export PDN_TCL = designs/asap7/mock-array/pdn.tcl
34+
export PDN_TCL = $(FLOW_HOME)/platforms/asap7/openRoad/pdn/BLOCKS_grid_strategy.tcl
3635

3736
# Target to force generation of Verilog per user settings MOCK_ARRAY_TABLE (rows, cols)
3837
verilog:

flow/designs/asap7/mock-array/pdn.tcl

Lines changed: 0 additions & 33 deletions
This file was deleted.

flow/designs/asap7/sram-64x16/config.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
export DESIGN_NAME = SramBridge
22
export DESIGN_NICKNAME = SramBridge
33

4-
export VERILOG_FILES_BLACKBOX = designs/src/sram-64x16/SRAM2RW16x32.v
54
export VERILOG_FILES = designs/src/sram-64x16/*.sv
65

76
export SDC_FILE = designs/asap7/sram-64x16/constraints.sdc

flow/designs/gf180/uart-blocks/config.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ export SDC_FILE = ./designs/$(PLATFORM)/$(DESIGN_NICKNAME)/constraint.sdc
88

99
export BLOCKS = uart_rx
1010

11-
export VERILOG_FILES_BLACKBOX = ./designs/src/uart-no-param/uart_rx.v
12-
1311
export DIE_AREA = 0 0 430 430
1412
export CORE_AREA = 10 10 420 420
1513

flow/designs/sky130hd/aes/config.mk

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ export PLATFORM = sky130hd
55
export VERILOG_FILES = $(sort $(wildcard ./designs/src/$(DESIGN_NICKNAME)/*.v))
66
export SDC_FILE = ./designs/$(PLATFORM)/$(DESIGN_NICKNAME)/constraint.sdc
77

8-
export CORE_UTILIZATION = 20
8+
export PLACE_PINS_ARGS = -min_distance 4 -min_distance_in_tracks
9+
10+
export CORE_UTILIZATION = 20
911
export CORE_ASPECT_RATIO = 1
1012
export CORE_MARGIN = 2
1113

12-
export PLACE_DENSITY = 0.65
14+
export PLACE_DENSITY = 0.6
1315
export TNS_END_PERCENT = 100

0 commit comments

Comments
 (0)