Skip to content

Commit 3ec889a

Browse files
arthurjoloarthurjolo
committed
merge to master
Signed-off-by: arthurjolo <[email protected]>
2 parents f6c55f4 + 2f2cf54 commit 3ec889a

File tree

62 files changed

+391
-393
lines changed

Some content is hidden

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

62 files changed

+391
-393
lines changed

‎docs/user/FlowVariables.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,6 @@ configuration file.
206206
- [LATCH_MAP_FILE](#LATCH_MAP_FILE)
207207
- [MAX_UNGROUP_SIZE](#MAX_UNGROUP_SIZE)
208208
- [MIN_BUF_CELL_AND_PORTS](#MIN_BUF_CELL_AND_PORTS)
209-
- [RESYNTH_AREA_RECOVER](#RESYNTH_AREA_RECOVER)
210-
- [RESYNTH_TIMING_RECOVER](#RESYNTH_TIMING_RECOVER)
211209
- [SDC_FILE](#SDC_FILE)
212210
- [SDC_GUT](#SDC_GUT)
213211
- [SYNTH_BLACKBOXES](#SYNTH_BLACKBOXES)
@@ -250,6 +248,8 @@ configuration file.
250248
- [PLACE_PINS_ARGS](#PLACE_PINS_ARGS)
251249
- [PLACE_SITE](#PLACE_SITE)
252250
- [REMOVE_ABC_BUFFERS](#REMOVE_ABC_BUFFERS)
251+
- [RESYNTH_AREA_RECOVER](#RESYNTH_AREA_RECOVER)
252+
- [RESYNTH_TIMING_RECOVER](#RESYNTH_TIMING_RECOVER)
253253
- [RTLMP_AREA_WT](#RTLMP_AREA_WT)
254254
- [RTLMP_ARGS](#RTLMP_ARGS)
255255
- [RTLMP_BOUNDARY_WT](#RTLMP_BOUNDARY_WT)

‎flow/Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ $(DONT_USE_LIBS): $$(filter %$$(@F) %$$(@F).gz,$(LIB_FILES))
337337
@mkdir -p $(OBJECTS_DIR)/lib
338338
$(UTILS_DIR)/preprocessLib.py -i $^ -o $@
339339

340-
$(OBJECTS_DIR)/lib/merged.lib:
340+
$(OBJECTS_DIR)/lib/merged.lib: $(DONT_USE_LIBS)
341341
$(UTILS_DIR)/mergeLib.pl $(PLATFORM)_merged $(DONT_USE_LIBS) > $@
342342

343343
# Pre-process KLayout tech
@@ -437,19 +437,19 @@ $(SDC_FILE_CLOCK_PERIOD): $(SDC_FILE)
437437
mkdir -p $(dir $@)
438438
echo $(ABC_CLOCK_PERIOD_IN_PS) > $@
439439

440-
YOSYS_DEPENDENCIES=$(DONT_USE_LIBS) $(WRAPPED_LIBS) $(DONT_USE_SC_LIB) $(DFF_LIB_FILE) $(VERILOG_FILES) $(SYNTH_NETLIST_FILES) $(LATCH_MAP_FILE) $(ADDER_MAP_FILE) $(SDC_FILE_CLOCK_PERIOD)
440+
YOSYS_DEPENDENCIES=$(DONT_USE_LIBS) $(WRAPPED_LIBS) $(DFF_LIB_FILE) $(VERILOG_FILES) $(SYNTH_NETLIST_FILES) $(LATCH_MAP_FILE) $(ADDER_MAP_FILE) $(SDC_FILE_CLOCK_PERIOD)
441441

442442
.PHONY: yosys-dependencies
443443
yosys-dependencies: $(YOSYS_DEPENDENCIES)
444444

445445
.PHONY: do-yosys
446-
do-yosys:
446+
do-yosys: $(DONT_USE_SC_LIB)
447447
mkdir -p $(RESULTS_DIR) $(LOG_DIR) $(REPORTS_DIR) $(OBJECTS_DIR)
448448
(export VERILOG_FILES=$(RESULTS_DIR)/1_synth.rtlil; \
449449
$(TIME_CMD) $(YOSYS_EXE) $(YOSYS_FLAGS) -c $(SYNTH_SCRIPT)) 2>&1 | tee $(abspath $(LOG_DIR)/1_1_yosys.log)
450450

451451
.PHONY: do-yosys-canonicalize
452-
do-yosys-canonicalize: yosys-dependencies
452+
do-yosys-canonicalize: yosys-dependencies $(DONT_USE_SC_LIB)
453453
mkdir -p $(RESULTS_DIR) $(LOG_DIR) $(REPORTS_DIR) $(OBJECTS_DIR)
454454
($(TIME_CMD) $(YOSYS_EXE) $(YOSYS_FLAGS) -c $(SCRIPTS_DIR)/synth_canonicalize.tcl) 2>&1 | tee $(abspath $(LOG_DIR)/1_1_yosys_canonicalize.log)
455455

@@ -594,7 +594,7 @@ endef
594594

595595
# STEP 1: Translate verilog to odb
596596
#-------------------------------------------------------------------------------
597-
$(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),floorplan))
597+
$(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) $(DONT_USE_SC_LIB),floorplan))
598598

599599
# STEP 2: Random IO placement
600600
#-------------------------------------------------------------------------------
@@ -619,7 +619,7 @@ $(eval $(call do-copy,2_floorplan,2_5_floorplan_pdn.odb,))
619619
$(RESULTS_DIR)/2_floorplan.sdc: $(RESULTS_DIR)/2_1_floorplan.odb
620620

621621
.PHONY: do-floorplan
622-
do-floorplan:
622+
do-floorplan: $(DONT_USE_SC_LIB)
623623
$(UNSET_AND_MAKE) do-2_1_floorplan do-2_2_floorplan_io do-2_3_floorplan_macro do-2_4_floorplan_tapcell do-2_5_floorplan_pdn do-2_floorplan do-2_floorplan.sdc
624624

625625
.PHONY: clean_floorplan

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@
2424
"compare": "<="
2525
},
2626
"cts__design__instance__count__hold_buffer": {
27-
"value": 1087,
27+
"value": 1025,
2828
"compare": "<="
2929
},
3030
"globalroute__antenna_diodes_count": {
3131
"value": 0,
3232
"compare": "<="
3333
},
3434
"detailedroute__route__wirelength": {
35-
"value": 75547,
35+
"value": 72180,
3636
"compare": "<="
3737
},
3838
"detailedroute__route__drc_errors": {
@@ -48,23 +48,23 @@
4848
"compare": "<="
4949
},
5050
"finish__timing__setup__ws": {
51-
"value": -104.94,
51+
"value": -89.24,
5252
"compare": ">="
5353
},
5454
"finish__design__instance__area": {
55-
"value": 7371,
55+
"value": 7362,
5656
"compare": "<="
5757
},
5858
"finish__timing__drv__setup_violation_count": {
5959
"value": 478,
6060
"compare": "<="
6161
},
6262
"finish__timing__drv__hold_violation_count": {
63-
"value": 399,
63+
"value": 388,
6464
"compare": "<="
6565
},
6666
"finish__timing__wns_percent_delay": {
67-
"value": -22.74,
67+
"value": -21.75,
6868
"compare": ">="
6969
}
7070
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"compare": "<="
4949
},
5050
"finish__timing__setup__ws": {
51-
"value": -83.87,
51+
"value": -78.86,
5252
"compare": ">="
5353
},
5454
"finish__design__instance__area": {
@@ -64,7 +64,7 @@
6464
"compare": "<="
6565
},
6666
"finish__timing__wns_percent_delay": {
67-
"value": -24.19,
67+
"value": -23.22,
6868
"compare": ">="
6969
}
7070
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"compare": "<="
3333
},
3434
"detailedroute__route__wirelength": {
35-
"value": 683727,
35+
"value": 653875,
3636
"compare": "<="
3737
},
3838
"detailedroute__route__drc_errors": {
@@ -48,7 +48,7 @@
4848
"compare": "<="
4949
},
5050
"finish__timing__setup__ws": {
51-
"value": -152.08,
51+
"value": -98.65,
5252
"compare": ">="
5353
},
5454
"finish__design__instance__area": {

‎flow/designs/asap7/gcd-ccs/rules-base.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
{
22
"synth__design__instance__area__stdcell": {
3-
"value": 54.33,
3+
"value": 43.38,
44
"compare": "<="
55
},
66
"constraints__clocks__count": {
77
"value": 1,
88
"compare": "=="
99
},
1010
"placeopt__design__instance__area": {
11-
"value": 64,
11+
"value": 53,
1212
"compare": "<="
1313
},
1414
"placeopt__design__instance__count__stdcell": {
15-
"value": 639,
15+
"value": 543,
1616
"compare": "<="
1717
},
1818
"detailedplace__design__violations": {
1919
"value": 0,
2020
"compare": "=="
2121
},
2222
"cts__design__instance__count__setup_buffer": {
23-
"value": 101,
23+
"value": 47,
2424
"compare": "<="
2525
},
2626
"cts__design__instance__count__hold_buffer": {
@@ -32,7 +32,7 @@
3232
"compare": "<="
3333
},
3434
"detailedroute__route__wirelength": {
35-
"value": 1712,
35+
"value": 1357,
3636
"compare": "<="
3737
},
3838
"detailedroute__route__drc_errors": {
@@ -48,23 +48,23 @@
4848
"compare": "<="
4949
},
5050
"finish__timing__setup__ws": {
51-
"value": -92.68,
51+
"value": -80.19,
5252
"compare": ">="
5353
},
5454
"finish__design__instance__area": {
55-
"value": 75,
55+
"value": 58,
5656
"compare": "<="
5757
},
5858
"finish__timing__drv__setup_violation_count": {
59-
"value": 47,
59+
"value": 45,
6060
"compare": "<="
6161
},
6262
"finish__timing__drv__hold_violation_count": {
6363
"value": 100,
6464
"compare": "<="
6565
},
6666
"finish__timing__wns_percent_delay": {
67-
"value": -38.48,
67+
"value": -34.82,
6868
"compare": ">="
6969
}
7070
}

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
{
22
"synth__design__instance__area__stdcell": {
3-
"value": 54.33,
3+
"value": 43.38,
44
"compare": "<="
55
},
66
"constraints__clocks__count": {
77
"value": 1,
88
"compare": "=="
99
},
1010
"placeopt__design__instance__area": {
11-
"value": 65,
11+
"value": 53,
1212
"compare": "<="
1313
},
1414
"placeopt__design__instance__count__stdcell": {
15-
"value": 639,
15+
"value": 543,
1616
"compare": "<="
1717
},
1818
"detailedplace__design__violations": {
1919
"value": 0,
2020
"compare": "=="
2121
},
2222
"cts__design__instance__count__setup_buffer": {
23-
"value": 155,
23+
"value": 57,
2424
"compare": "<="
2525
},
2626
"cts__design__instance__count__hold_buffer": {
@@ -32,7 +32,7 @@
3232
"compare": "<="
3333
},
3434
"detailedroute__route__wirelength": {
35-
"value": 1755,
35+
"value": 1454,
3636
"compare": "<="
3737
},
3838
"detailedroute__route__drc_errors": {
@@ -48,23 +48,23 @@
4848
"compare": "<="
4949
},
5050
"finish__timing__setup__ws": {
51-
"value": -77.18,
51+
"value": -74.47,
5252
"compare": ">="
5353
},
5454
"finish__design__instance__area": {
55-
"value": 80,
55+
"value": 62,
5656
"compare": "<="
5757
},
5858
"finish__timing__drv__setup_violation_count": {
59-
"value": 47,
59+
"value": 27,
6060
"compare": "<="
6161
},
6262
"finish__timing__drv__hold_violation_count": {
6363
"value": 100,
6464
"compare": "<="
6565
},
6666
"finish__timing__wns_percent_delay": {
67-
"value": -33.9,
67+
"value": -33.05,
6868
"compare": ">="
6969
}
7070
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"synth__design__instance__area__stdcell": {
3-
"value": 7151.38,
3+
"value": 7116.74,
44
"compare": "<="
55
},
66
"constraints__clocks__count": {
@@ -12,19 +12,19 @@
1212
"compare": "<="
1313
},
1414
"placeopt__design__instance__count__stdcell": {
15-
"value": 67398,
15+
"value": 67290,
1616
"compare": "<="
1717
},
1818
"detailedplace__design__violations": {
1919
"value": 0,
2020
"compare": "=="
2121
},
2222
"cts__design__instance__count__setup_buffer": {
23-
"value": 5861,
23+
"value": 5851,
2424
"compare": "<="
2525
},
2626
"cts__design__instance__count__hold_buffer": {
27-
"value": 5861,
27+
"value": 5851,
2828
"compare": "<="
2929
},
3030
"globalroute__antenna_diodes_count": {
@@ -56,7 +56,7 @@
5656
"compare": "<="
5757
},
5858
"finish__timing__drv__setup_violation_count": {
59-
"value": 2930,
59+
"value": 2926,
6060
"compare": "<="
6161
},
6262
"finish__timing__drv__hold_violation_count": {

‎flow/designs/asap7/mock-alu/rules-base.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@
88
"compare": "=="
99
},
1010
"placeopt__design__instance__area": {
11-
"value": 1908,
11+
"value": 1898,
1212
"compare": "<="
1313
},
1414
"placeopt__design__instance__count__stdcell": {
15-
"value": 14796,
15+
"value": 14790,
1616
"compare": "<="
1717
},
1818
"detailedplace__design__violations": {
1919
"value": 0,
2020
"compare": "=="
2121
},
2222
"cts__design__instance__count__setup_buffer": {
23-
"value": 1287,
23+
"value": 1286,
2424
"compare": "<="
2525
},
2626
"cts__design__instance__count__hold_buffer": {
27-
"value": 1287,
27+
"value": 1286,
2828
"compare": "<="
2929
},
3030
"globalroute__antenna_diodes_count": {
@@ -48,7 +48,7 @@
4848
"compare": "<="
4949
},
5050
"finish__timing__setup__ws": {
51-
"value": -537.65,
51+
"value": -518.89,
5252
"compare": ">="
5353
},
5454
"finish__design__instance__area": {
@@ -64,7 +64,7 @@
6464
"compare": "<="
6565
},
6666
"finish__timing__wns_percent_delay": {
67-
"value": -98.82,
67+
"value": -98.1,
6868
"compare": ">="
6969
}
7070
}

‎flow/designs/asap7/mock-array/rules-base.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"synth__design__instance__area__stdcell": {
3-
"value": 113607.14,
3+
"value": 38101.34,
44
"compare": "<="
55
},
66
"constraints__clocks__count": {
@@ -48,7 +48,7 @@
4848
"compare": "<="
4949
},
5050
"finish__timing__setup__ws": {
51-
"value": -32.57,
51+
"value": 0.0,
5252
"compare": ">="
5353
},
5454
"finish__design__instance__area": {

0 commit comments

Comments
 (0)