Skip to content

Commit 14ab6e4

Browse files
committed
Merge remote-tracking branch 'origin/master' into HEAD
2 parents 0ce0ce9 + ca88d27 commit 14ab6e4

File tree

13 files changed

+832
-540
lines changed

13 files changed

+832
-540
lines changed

flow/Makefile

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -432,11 +432,6 @@ clean_synth:
432432
floorplan: $(RESULTS_DIR)/2_floorplan.odb \
433433
$(RESULTS_DIR)/2_floorplan.sdc
434434

435-
.PHONY: floorplan_info
436-
floorplan_info:
437-
@echo DIE_AREA=$(DIE_AREA)
438-
@echo CORE_AREA=$(CORE_AREA)
439-
440435
# ==============================================================================
441436

442437
ifneq ($(FOOTPRINT),)
@@ -445,7 +440,7 @@ else ifneq ($(FOOTPRINT_TCL),)
445440
IS_CHIP = 1
446441
endif
447442

448-
UNSET_AND_MAKE = @bash -c 'for var in $(ISSUE_VARIABLES_NAMES); do unset $$var; done; echo $(MAKE) DESIGN_CONFIG=$(DESIGN_CONFIG) $$@; $(MAKE) DESIGN_CONFIG=$(DESIGN_CONFIG) $$@' --
443+
UNSET_AND_MAKE = @bash -c 'for var in $(UNSET_VARIABLES_NAMES); do unset $$var; done; echo $(MAKE) DESIGN_CONFIG=$(DESIGN_CONFIG) $$@; $(MAKE) DESIGN_CONFIG=$(DESIGN_CONFIG) $$@' --
449444

450445
# Separate dependency checking and doing a step. This can
451446
# be useful to retest a stage without having to delete the
@@ -858,6 +853,10 @@ RESULTS_OAS = $(notdir $(sort $(wildcard $(RESULTS_DIR)/*.oas)))
858853
$(foreach file,$(RESULTS_DEF) $(RESULTS_GDS) $(RESULTS_OAS),klayout_$(file)): klayout_%: $(OBJECTS_DIR)/klayout.lyt
859854
$(KLAYOUT_CMD) -nn $(OBJECTS_DIR)/klayout.lyt $(RESULTS_DIR)/$*
860855

856+
.PHONY: gui_synth
857+
gui_synth:
858+
$(OPENROAD_GUI_CMD) $(SCRIPTS_DIR)/sta-synth.tcl
859+
861860
.PHONY: gui_floorplan
862861
gui_floorplan: gui_2_floorplan.odb
863862
.PHONY: gui_place
@@ -885,6 +884,18 @@ $(foreach file,$(RESULTS_ODB),$(file).def): %.def:
885884
$(foreach file,$(RESULTS_ODB),$(file).v): %.v:
886885
ODB_FILE=$(RESULTS_DIR)/$* VERILOG_FILE=$(RESULTS_DIR)/$@ $(OPENROAD_CMD) $(SCRIPTS_DIR)/write_verilog.tcl
887886

887+
# Drop into yosys with all environment variables, useful to for instance
888+
# debug synthesis, or run other commands aftewards, such as "show" to
889+
# generate a .dot file of the design to visualize designs.
890+
.PHONY: yosys
891+
yosys:
892+
$(YOSYS_CMD)
893+
894+
# Drop into a bash shell with all environment variables, useful for debugging
895+
.PHONY: bash
896+
bash:
897+
bash
898+
888899
.PHONY: all_defs
889900
all_defs : $(foreach file,$(RESULTS_ODB),$(file).def)
890901
.PHONY: all_verilog
@@ -894,7 +905,11 @@ all_verilog : $(foreach file,$(RESULTS_ODB),$(file).v)
894905
handoff : all_defs all_verilog
895906

896907
.PHONY: print-%
897-
print-%: ; @echo $* = $($*)
908+
# Print any variable, for instance: make print-DIE_AREA
909+
print-% : ; @echo $* = $($*)
910+
911+
.PHONY: test-unset-and-make-%
912+
test-unset-and-make-%: ; $(UNSET_AND_MAKE) $*
898913

899914
# Utilities
900915
#-------------------------------------------------------------------------------

flow/designs/asap7/swerv_wrapper/metadata-base-ok.json

Lines changed: 222 additions & 143 deletions
Large diffs are not rendered by default.

flow/designs/asap7/swerv_wrapper/rules-base.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"compare": ">="
4949
},
5050
"detailedroute__route__wirelength": {
51-
"value": 1991530,
51+
"value": 1987252,
5252
"compare": "<="
5353
},
5454
"detailedroute__route__drc_errors": {
@@ -64,7 +64,7 @@
6464
"compare": "<="
6565
},
6666
"finish__timing__drv__max_slew_limit": {
67-
"value": -2.53,
67+
"value": -1.17,
6868
"compare": ">="
6969
},
7070
"finish__timing__drv__max_fanout_limit": {
@@ -80,7 +80,7 @@
8080
"compare": "<="
8181
},
8282
"finish__timing__drv__hold_violation_count": {
83-
"value": 10,
83+
"value": 612,
8484
"compare": "<="
8585
},
8686
"finish__timing__wns_percent_delay": {

0 commit comments

Comments
 (0)