Skip to content

Commit bf030fd

Browse files
malibertymaliberty
authored
Merge pull request #1214 from Pinata-Consulting/makefile-share-stem-for-odb-json-log
makefile: .odb, .log and .json now share stem
2 parents f5cb56b + 297bfd0 commit bf030fd

File tree

3 files changed

+23
-23
lines changed

3 files changed

+23
-23
lines changed

‎docs/tutorials/FlowTutorial.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ Log Elapsed seconds
106106
1_1_yosys 2
107107
3_3_place_gp 1
108108
4_1_cts 8
109-
5_2_TritonRoute 10
109+
5_2_route 10
110110
6_1_merge 10
111111
6_report 3
112112
```
@@ -315,13 +315,13 @@ abc.constr klayout.lyt klayout_tech.lef lib
315315

316316
| `logs` | | |
317317
|------------------------|------------------------|-----------------------|
318-
| `1_1_yosys.log` | `3_1_place_gp.log` | `5_2_TritonRoute.log` |
318+
| `1_1_yosys.log` | `3_1_place_gp.log` | `5_2_route.log` |
319319
| `2_1_floorplan.log` | `3_2_place_iop.log` | `6_1_merge.log` |
320320
| `2_2_floorplan_io.log` | `3_3_resizer.log` | `6_report.log` |
321321
| `2_3_tdms_place.log` | `3_4_opendp.log` | |
322-
| `2_4_mplace.log` | `4_1_cts.log` | |
323-
| `2_5_tapcell.log` | `4_2_cts_fillcell.log` | |
324-
| `2_6_pdn.log` | `5_1_fastroute.log` | |
322+
| `2_4_floorplan_macro.log` | `4_1_cts.log` | |
323+
| `2_5_floorplan_tapcell.log` | `4_2_cts_fillcell.log` | |
324+
| `2_6_floorplan_pdn.log` | `5_1_grt.log` | |
325325

326326

327327
- `results/sky130hd/ibex/base`
@@ -393,13 +393,13 @@ The log structure is as follows:
393393

394394
| `logs` | | |
395395
|------------------------|------------------------|-----------------------|
396-
| `1_1_yosys.log` | `3_1_place_gp.log` | `5_2_TritonRoute.log` |
396+
| `1_1_yosys.log` | `3_1_place_gp.log` | `5_2_route.log` |
397397
| `2_1_floorplan.log` | `3_2_place_iop.log` | `6_1_merge.log` |
398398
| `2_2_floorplan_io.log` | `3_3_resizer.log` | `6_report.log` |
399399
| `2_3_tdms_place.log` | `3_4_opendp.log` | |
400-
| `2_4_mplace.log` | `4_1_cts.log` | |
401-
| `2_5_tapcell.log` | `4_2_cts_fillcell.log` | |
402-
| `2_6_pdn.log` | `5_1_fastroute.log` | |
400+
| `2_4_floorplan_macro.log` | `4_1_cts.log` | |
401+
| `2_5_floorplan_tapcell.log` | `4_2_cts_fillcell.log` | |
402+
| `2_6_floorplan_pdn.log` | `5_1_grt.log` | |
403403

404404
### Area
405405

‎flow/Makefile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -475,18 +475,18 @@ endif
475475
# STEP 4: Macro Placement
476476
#-------------------------------------------------------------------------------
477477
$(RESULTS_DIR)/2_4_floorplan_macro.odb: $(RESULTS_DIR)/2_3_floorplan_tdms.odb $(RESULTS_DIR)/1_synth.v $(RESULTS_DIR)/1_synth.sdc $(MACRO_PLACEMENT) $(MACRO_PLACEMENT_TCL)
478-
($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/macro_place.tcl -metrics $(LOG_DIR)/2_4_mplace.json) 2>&1 | tee $(LOG_DIR)/2_4_mplace.log
478+
($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/macro_place.tcl -metrics $(LOG_DIR)/2_4_floorplan_macro.json) 2>&1 | tee $(LOG_DIR)/2_4_floorplan_macro.log
479479

480480
# STEP 5: Tapcell and Welltie insertion
481481
#-------------------------------------------------------------------------------
482482
$(RESULTS_DIR)/2_5_floorplan_tapcell.odb: $(RESULTS_DIR)/2_4_floorplan_macro.odb $(TAPCELL_TCL)
483-
($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/tapcell.tcl -metrics $(LOG_DIR)/2_5_tapcell.json) 2>&1 | tee $(LOG_DIR)/2_5_tapcell.log
483+
($(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
484484

485485

486486
# STEP 6: PDN generation
487487
#-------------------------------------------------------------------------------
488488
$(RESULTS_DIR)/2_6_floorplan_pdn.odb: $(RESULTS_DIR)/2_5_floorplan_tapcell.odb $(PDN_TCL)
489-
($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/pdn.tcl -metrics $(LOG_DIR)/2_6_pdn.json) 2>&1 | tee $(LOG_DIR)/2_6_pdn.log
489+
($(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
490490

491491
$(RESULTS_DIR)/2_floorplan.odb: $(RESULTS_DIR)/2_6_floorplan_pdn.odb
492492
cp $< $@
@@ -533,7 +533,7 @@ $(RESULTS_DIR)/3_3_place_gp.odb: $(RESULTS_DIR)/3_2_place_iop.odb $(RESULTS_DIR)
533533
# STEP 4: Resizing & Buffering
534534
#-------------------------------------------------------------------------------
535535
$(RESULTS_DIR)/3_4_place_resized.odb: $(RESULTS_DIR)/3_3_place_gp.odb $(RESULTS_DIR)/2_floorplan.sdc
536-
($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/resize.tcl -metrics $(LOG_DIR)/3_4_resizer.json) 2>&1 | tee $(LOG_DIR)/3_4_resizer.log
536+
($(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
537537

538538
.PHONY: clean_resize
539539
clean_resize:
@@ -542,7 +542,7 @@ clean_resize:
542542
# STEP 5: Detail placement
543543
#-------------------------------------------------------------------------------
544544
$(RESULTS_DIR)/3_5_place_dp.odb: $(RESULTS_DIR)/3_4_place_resized.odb
545-
($(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
545+
($(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
546546

547547
$(RESULTS_DIR)/3_place.odb: $(RESULTS_DIR)/3_5_place_dp.odb
548548
cp $< $@
@@ -611,7 +611,7 @@ route: $(RESULTS_DIR)/5_route.odb \
611611
# STEP 1: Run global route
612612
#-------------------------------------------------------------------------------
613613
$(RESULTS_DIR)/5_1_grt.odb: $(RESULTS_DIR)/4_cts.odb $(FASTROUTE_TCL) $(PRE_GLOBAL_ROUTE)
614-
($(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
614+
($(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
615615

616616

617617
# STEP 2: Run detailed route
@@ -621,7 +621,7 @@ $(RESULTS_DIR)/5_2_route.odb: $(RESULTS_DIR)/5_1_grt.odb
621621
else
622622
$(RESULTS_DIR)/5_2_route.odb: $(RESULTS_DIR)/4_cts.odb
623623
endif
624-
($(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
624+
($(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
625625

626626
$(RESULTS_DIR)/5_route.odb: $(RESULTS_DIR)/5_2_route.odb
627627
cp $< $@
@@ -682,7 +682,7 @@ elapsed:
682682

683683
ifneq ($(USE_FILL),)
684684
$(RESULTS_DIR)/6_1_fill.odb: $(RESULTS_DIR)/5_route.odb $(FILL_CONFIG)
685-
($(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
685+
($(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
686686
else
687687
$(RESULTS_DIR)/6_1_fill.odb: $(RESULTS_DIR)/5_route.odb
688688
cp $< $@

‎flow/util/genMetrics.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -272,20 +272,20 @@ def extract_metrics(cwd, platform, design, flow_variant, output, hier_json):
272272
# =========================================================================
273273
merge_jsons(logPath, metrics_dict, "2_*.json")
274274

275-
extractGnuTime('floorplan', metrics_dict, logPath + '/2_4_mplace.log')
275+
extractGnuTime('floorplan', metrics_dict, logPath + '/2_4_floorplan_macro.log')
276276

277277
# Place
278278
# =========================================================================
279279

280280
merge_jsons(logPath, metrics_dict, "3_*.json")
281-
extractGnuTime('globalplace', metrics_dict, logPath + '/3_4_resizer.log')
282-
extractGnuTime('placeopt', metrics_dict, logPath + '/3_4_resizer.log')
281+
extractGnuTime('globalplace', metrics_dict, logPath + '/3_4_place_resized.log')
282+
extractGnuTime('placeopt', metrics_dict, logPath + '/3_4_place_resized.log')
283283
extractTagFromFile('detailedplace__design__violations',
284284
metrics_dict,
285285
'^\[INFO FLW-0012\] Placement violations (\S+).',
286-
logPath + '/3_5_opendp.log', defaultNotFound=0)
286+
logPath + '/3_5_place_dp.log', defaultNotFound=0)
287287

288-
extractGnuTime('detailedplace', metrics_dict, logPath + '/3_5_opendp.log')
288+
extractGnuTime('detailedplace', metrics_dict, logPath + '/3_5_place_dp.log')
289289

290290
# CTS
291291
# =======================================================================
@@ -309,7 +309,7 @@ def extract_metrics(cwd, platform, design, flow_variant, output, hier_json):
309309
extractTagFromFile('globalroute__timing__clock__slack',
310310
metrics_dict,
311311
'^\[INFO FLW-....\] Clock .* slack (\S+)',
312-
logPath + '/5_1_fastroute.log')
312+
logPath + '/5_1_grt.log')
313313

314314
# Finish
315315
# =========================================================================

0 commit comments

Comments
 (0)