Skip to content

Commit 5840184

Browse files
malibertymaliberty
committed
Merge branch 'master' into asap7-dont-use2
2 parents 3559158 + b14dd6d commit 5840184

File tree

110 files changed

+1084
-56038
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+1084
-56038
lines changed

‎.github/dependabot.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
1-
21
version: 2
32
updates:
43
- package-ecosystem: "github-actions"
54
directory: "/"
65
schedule:
76
interval: "daily"
8-
- package-ecosystem: "gitsubmodule"
9-
directory: "/"
10-
schedule:
11-
interval: "daily"
12-
ignore:
13-
- dependency-name: "abc"
14-
update-types: ["version-update:semver-major"]

‎flow/Makefile‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
# DESIGN_CONFIG=./designs/asap7/ibex/config.mk
5959
# DESIGN_CONFIG=./designs/asap7/jpeg/config.mk
6060
# DESIGN_CONFIG=./designs/asap7/megaboom/config.mk
61-
# DESIGN_CONFIG=./designs/asap7/mock-array/config.mk
6261
# DESIGN_CONFIG=./designs/asap7/riscv32i/config.mk
6362
# DESIGN_CONFIG=./designs/asap7/swerv_wrapper/config.mk
6463
# DESIGN_CONFIG=./designs/asap7/uart/config.mk
@@ -393,6 +392,17 @@ do-$(1)$(if $(4),$(4),):
393392
cp $(RESULTS_DIR)/$(2) $(RESULTS_DIR)/$(1)$(if $(4),$(4),.odb)
394393
endef
395394

395+
# ==============================================================================
396+
397+
# Custom target to go from synthesis to placement in a single OpenROAD run
398+
$(eval $(call do-step,1_3_floorplan_to_place, $(RESULTS_DIR)/1_synth.v $(RESULTS_DIR)/1_synth.sdc,floorplan_to_place))
399+
400+
.PHONY: floorplan_to_place
401+
floorplan_to_place: $(RESULTS_DIR)/1_synth.v $(RESULTS_DIR)/1_synth.sdc
402+
$(UNSET_AND_MAKE) do-1_3_floorplan_to_place
403+
404+
# ==============================================================================
405+
396406
$(eval $(call do-step,1_3_synth,$(RESULTS_DIR)/1_synth.v $(RESULTS_DIR)/1_synth.sdc,synth_odb))
397407

398408
$(eval $(call do-step,2_1_floorplan,$(RESULTS_DIR)/1_synth.v $(RESULTS_DIR)/1_synth.sdc $(TECH_LEF) $(SC_LEF) $(ADDITIONAL_LEFS) $(FOOTPRINT) $(SIG_MAP_FILE) $(FOOTPRINT_TCL) $(LIB_FILES) $(IO_CONSTRAINTS),floorplan))

‎flow/designs/asap7/aes-block/rules-base.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"compare": "<="
2929
},
3030
"cts__timing__setup__ws": {
31-
"value": -86.9,
31+
"value": -105.0,
3232
"compare": ">="
3333
},
3434
"cts__timing__setup__tns": {
@@ -40,15 +40,15 @@
4040
"compare": ">="
4141
},
4242
"cts__timing__hold__tns": {
43-
"value": -22.5,
43+
"value": -90.0,
4444
"compare": ">="
4545
},
4646
"globalroute__antenna_diodes_count": {
4747
"value": 100,
4848
"compare": "<="
4949
},
5050
"globalroute__timing__setup__ws": {
51-
"value": -76.0,
51+
"value": -94.9,
5252
"compare": ">="
5353
},
5454
"globalroute__timing__setup__tns": {
@@ -60,7 +60,7 @@
6060
"compare": ">="
6161
},
6262
"globalroute__timing__hold__tns": {
63-
"value": -22.5,
63+
"value": -90.0,
6464
"compare": ">="
6565
},
6666
"detailedroute__route__wirelength": {
@@ -84,19 +84,19 @@
8484
"compare": ">="
8585
},
8686
"detailedroute__timing__setup__tns": {
87-
"value": -22.5,
87+
"value": -90.0,
8888
"compare": ">="
8989
},
9090
"detailedroute__timing__hold__ws": {
9191
"value": -22.5,
9292
"compare": ">="
9393
},
9494
"detailedroute__timing__hold__tns": {
95-
"value": -22.5,
95+
"value": -90.0,
9696
"compare": ">="
9797
},
9898
"finish__timing__setup__ws": {
99-
"value": -49.0,
99+
"value": -69.2,
100100
"compare": ">="
101101
},
102102
"finish__timing__setup__tns": {
@@ -108,7 +108,7 @@
108108
"compare": ">="
109109
},
110110
"finish__timing__hold__tns": {
111-
"value": -22.5,
111+
"value": -90.0,
112112
"compare": ">="
113113
},
114114
"finish__design__instance__area": {

‎flow/designs/asap7/aes-mbff/rules-base.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"compare": "<="
2929
},
3030
"cts__timing__setup__ws": {
31-
"value": -35.3,
31+
"value": -52.6,
3232
"compare": ">="
3333
},
3434
"cts__timing__setup__tns": {
@@ -40,15 +40,15 @@
4040
"compare": ">="
4141
},
4242
"cts__timing__hold__tns": {
43-
"value": -19.0,
43+
"value": -76.0,
4444
"compare": ">="
4545
},
4646
"globalroute__antenna_diodes_count": {
4747
"value": 100,
4848
"compare": "<="
4949
},
5050
"globalroute__timing__setup__ws": {
51-
"value": -38.4,
51+
"value": -55.5,
5252
"compare": ">="
5353
},
5454
"globalroute__timing__setup__tns": {
@@ -60,7 +60,7 @@
6060
"compare": ">="
6161
},
6262
"globalroute__timing__hold__tns": {
63-
"value": -19.0,
63+
"value": -76.0,
6464
"compare": ">="
6565
},
6666
"detailedroute__route__wirelength": {
@@ -84,19 +84,19 @@
8484
"compare": ">="
8585
},
8686
"detailedroute__timing__setup__tns": {
87-
"value": -19.0,
87+
"value": -76.0,
8888
"compare": ">="
8989
},
9090
"detailedroute__timing__hold__ws": {
9191
"value": -19.0,
9292
"compare": ">="
9393
},
9494
"detailedroute__timing__hold__tns": {
95-
"value": -19.0,
95+
"value": -76.0,
9696
"compare": ">="
9797
},
9898
"finish__timing__setup__ws": {
99-
"value": -23.6,
99+
"value": -41.5,
100100
"compare": ">="
101101
},
102102
"finish__timing__setup__tns": {
@@ -108,7 +108,7 @@
108108
"compare": ">="
109109
},
110110
"finish__timing__hold__tns": {
111-
"value": -19.0,
111+
"value": -76.0,
112112
"compare": ">="
113113
},
114114
"finish__design__instance__area": {

‎flow/designs/asap7/aes/rules-base.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"compare": "<="
2929
},
3030
"cts__timing__setup__ws": {
31-
"value": -26.1,
31+
"value": -43.9,
3232
"compare": ">="
3333
},
3434
"cts__timing__setup__tns": {
@@ -40,15 +40,15 @@
4040
"compare": ">="
4141
},
4242
"cts__timing__hold__tns": {
43-
"value": -19.0,
43+
"value": -76.0,
4444
"compare": ">="
4545
},
4646
"globalroute__antenna_diodes_count": {
4747
"value": 100,
4848
"compare": "<="
4949
},
5050
"globalroute__timing__setup__ws": {
51-
"value": -37.7,
51+
"value": -54.9,
5252
"compare": ">="
5353
},
5454
"globalroute__timing__setup__tns": {
@@ -60,7 +60,7 @@
6060
"compare": ">="
6161
},
6262
"globalroute__timing__hold__tns": {
63-
"value": -19.0,
63+
"value": -76.0,
6464
"compare": ">="
6565
},
6666
"detailedroute__route__wirelength": {
@@ -84,19 +84,19 @@
8484
"compare": ">="
8585
},
8686
"detailedroute__timing__setup__tns": {
87-
"value": -19.0,
87+
"value": -76.0,
8888
"compare": ">="
8989
},
9090
"detailedroute__timing__hold__ws": {
9191
"value": -19.0,
9292
"compare": ">="
9393
},
9494
"detailedroute__timing__hold__tns": {
95-
"value": -19.0,
95+
"value": -76.0,
9696
"compare": ">="
9797
},
9898
"finish__timing__setup__ws": {
99-
"value": -25.3,
99+
"value": -43.1,
100100
"compare": ">="
101101
},
102102
"finish__timing__setup__tns": {
@@ -108,7 +108,7 @@
108108
"compare": ">="
109109
},
110110
"finish__timing__hold__tns": {
111-
"value": -19.0,
111+
"value": -76.0,
112112
"compare": ">="
113113
},
114114
"finish__design__instance__area": {

‎flow/designs/asap7/aes_lvt/rules-base.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@
3232
"compare": ">="
3333
},
3434
"cts__timing__setup__tns": {
35-
"value": -18.0,
35+
"value": -72.0,
3636
"compare": ">="
3737
},
3838
"cts__timing__hold__ws": {
3939
"value": -18.0,
4040
"compare": ">="
4141
},
4242
"cts__timing__hold__tns": {
43-
"value": -18.0,
43+
"value": -72.0,
4444
"compare": ">="
4545
},
4646
"globalroute__antenna_diodes_count": {
@@ -52,15 +52,15 @@
5252
"compare": ">="
5353
},
5454
"globalroute__timing__setup__tns": {
55-
"value": -44.6,
55+
"value": -72.0,
5656
"compare": ">="
5757
},
5858
"globalroute__timing__hold__ws": {
5959
"value": -18.0,
6060
"compare": ">="
6161
},
6262
"globalroute__timing__hold__tns": {
63-
"value": -18.0,
63+
"value": -72.0,
6464
"compare": ">="
6565
},
6666
"detailedroute__route__wirelength": {
@@ -84,31 +84,31 @@
8484
"compare": ">="
8585
},
8686
"detailedroute__timing__setup__tns": {
87-
"value": -18.0,
87+
"value": -72.0,
8888
"compare": ">="
8989
},
9090
"detailedroute__timing__hold__ws": {
9191
"value": -18.0,
9292
"compare": ">="
9393
},
9494
"detailedroute__timing__hold__tns": {
95-
"value": -18.0,
95+
"value": -72.0,
9696
"compare": ">="
9797
},
9898
"finish__timing__setup__ws": {
9999
"value": -18.0,
100100
"compare": ">="
101101
},
102102
"finish__timing__setup__tns": {
103-
"value": -18.0,
103+
"value": -72.0,
104104
"compare": ">="
105105
},
106106
"finish__timing__hold__ws": {
107107
"value": -18.0,
108108
"compare": ">="
109109
},
110110
"finish__timing__hold__tns": {
111-
"value": -18.0,
111+
"value": -72.0,
112112
"compare": ">="
113113
},
114114
"finish__design__instance__area": {

0 commit comments

Comments
 (0)