Skip to content

Commit 4aca251

Browse files
authored
Merge branch 'master' into at_plot_util
Signed-off-by: Song Luar <[email protected]>
2 parents 27012ae + 33a09a8 commit 4aca251

30 files changed

+945
-641
lines changed

docs/tutorials/FlowTutorial.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ OpenROAD-flow-scripts installation is complete.
6969
Launch the docker with OpenROAD-flow-scripts container as follows:
7070

7171
```shell
72-
docker run --rm -it -u $(id -u ${USER}):$(id -g ${USER}) -v $(pwd)/flow:/OpenROAD-flow-scripts/flow openroad/flow-ubuntu22-builder
72+
docker run --rm -it -u $(id -u ${USER}):$(id -g ${USER}) -v $(pwd)/flow:/OpenROAD-flow-scripts/flow openroad/flow-ubuntu22.04-builder
7373
```
7474

7575
:::{seealso}

docs/user/FlowVariables.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ configuration file.
9898
| <a name="GND_NETS_VOLTAGES"></a>GND_NETS_VOLTAGES| Used for IR Drop calculation.| |
9999
| <a name="GPL_ROUTABILITY_DRIVEN"></a>GPL_ROUTABILITY_DRIVEN| Specifies whether the placer should use routability driven placement.| |
100100
| <a name="GPL_TIMING_DRIVEN"></a>GPL_TIMING_DRIVEN| Specifies whether the placer should use timing driven placement.| |
101-
| <a name="GUI_NO_TIMING"></a>GUI_NO_TIMING| Skip loading timing for a faster GUI load.| |
101+
| <a name="GUI_TIMING"></a>GUI_TIMING| Load timing information when opening GUI. For large designs, this can be quite time consuming. Useful to disable when investigating non-timing aspects like floorplan, placement, routing, etc.| |
102102
| <a name="HOLD_SLACK_MARGIN"></a>HOLD_SLACK_MARGIN| Specifies a time margin for the slack when fixing hold violations. This option allows you to overfix.| |
103103
| <a name="IO_PLACER_H"></a>IO_PLACER_H| The metal layer on which to place the I/O pins horizontally (top and bottom of the die).| |
104104
| <a name="IO_PLACER_V"></a>IO_PLACER_V| The metal layer on which to place the I/O pins vertically (sides of the die).| |
@@ -292,7 +292,7 @@ configuration file.
292292
- [GENERATE_ARTIFACTS_ON_FAILURE](#GENERATE_ARTIFACTS_ON_FAILURE)
293293
- [GLOBAL_PLACEMENT_ARGS](#GLOBAL_PLACEMENT_ARGS)
294294
- [GND_NETS_VOLTAGES](#GND_NETS_VOLTAGES)
295-
- [GUI_NO_TIMING](#GUI_NO_TIMING)
295+
- [GUI_TIMING](#GUI_TIMING)
296296
- [HOLD_SLACK_MARGIN](#HOLD_SLACK_MARGIN)
297297
- [IR_DROP_LAYER](#IR_DROP_LAYER)
298298
- [KLAYOUT_TECH_FILE](#KLAYOUT_TECH_FILE)

docs/user/InstructionsForAutoTuner.md

+1
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ Assuming the virtual environment is setup at `./tools/AutoTuner/autotuner_env`:
221221
./tools/AutoTuner/setup.sh
222222
python3 ./tools/AutoTuner/test/smoke_test_sweep.py
223223
python3 ./tools/AutoTuner/test/smoke_test_tune.py
224+
python3 ./tools/AutoTuner/test/smoke_test_sample_iteration.py
224225
```
225226

226227
## Citation

etc/DependencyInstaller.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,8 @@ _installUbuntuPackages() {
195195
docker-ce \
196196
docker-ce-cli \
197197
containerd.io \
198-
docker-buildx-plugin
198+
docker-buildx-plugin \
199+
docker-compose-plugin
199200
fi
200201
}
201202

flow/Makefile

+13-14
Original file line numberDiff line numberDiff line change
@@ -448,8 +448,7 @@ $(WRAPPED_LIBS):
448448
# |____/ |_| |_| \_| |_| |_| |_|_____|____/___|____/
449449
#
450450
.PHONY: synth
451-
synth: $(RESULTS_DIR)/1_synth.v \
452-
$(RESULTS_DIR)/1_synth.sdc
451+
synth: $(RESULTS_DIR)/1_synth.v
453452

454453
.PHONY: synth-report
455454
synth-report: synth
@@ -506,10 +505,6 @@ $(RESULTS_DIR)/1_synth.rtlil: $(YOSYS_DEPENDENCIES)
506505
$(RESULTS_DIR)/1_1_yosys.v: $(RESULTS_DIR)/1_synth.rtlil
507506
$(UNSET_AND_MAKE) do-yosys-keep-hierarchy do-yosys
508507

509-
$(RESULTS_DIR)/1_synth.sdc: $(SDC_FILE)
510-
mkdir -p $(RESULTS_DIR)
511-
cp $(SDC_FILE) $(RESULTS_DIR)/1_synth.sdc
512-
513508
.PHONY: do-synth
514509
do-synth:
515510
mkdir -p $(RESULTS_DIR) $(LOG_DIR) $(REPORTS_DIR)
@@ -570,9 +565,11 @@ open_$(1): open_$(2)
570565
endef
571566

572567
define OPEN_GUI
573-
.PHONY: $(1)_$(2)
574-
$(1)_$(2):
575-
$(3)=$(RESULTS_DIR)/$(2) $(4) $(SCRIPTS_DIR)/gui.tcl
568+
.PHONY: open_$(1) gui_$(1)
569+
open_$(1):
570+
$(2)=$(RESULTS_DIR)/$(1) $(OPENROAD_NO_EXIT_CMD) $(SCRIPTS_DIR)/open.tcl
571+
gui_$(1):
572+
$$(UNSET_AND_MAKE) GUI_SHOW=1 open_$(1)
576573
endef
577574

578575
# Separate dependency checking and doing a step. This can
@@ -795,6 +792,10 @@ $(eval $(call do-copy,5_route,4_cts.sdc,,.sdc))
795792
do-route:
796793
$(UNSET_AND_MAKE) do-5_1_grt do-5_2_route do-5_3_fillcell do-5_route do-5_route.sdc
797794

795+
.PHONY: do-grt
796+
do-grt:
797+
$(UNSET_AND_MAKE) do-5_1_grt
798+
798799
.PHONY: clean_route
799800
clean_route:
800801
rm -rf output*/ results*.out.dmp layer_*.mps
@@ -1024,10 +1025,8 @@ $(eval $(call OPEN_GUI_SHORTCUT,route,5_route.odb))
10241025
$(eval $(call OPEN_GUI_SHORTCUT,grt,5_1_grt.odb))
10251026
$(eval $(call OPEN_GUI_SHORTCUT,final,6_final.odb))
10261027

1027-
$(foreach file,$(RESULTS_DEF),$(eval $(call OPEN_GUI,gui,$(file),DEF_FILE,$(OPENROAD_GUI_CMD))))
1028-
$(foreach file,$(RESULTS_ODB),$(eval $(call OPEN_GUI,gui,$(file),ODB_FILE,$(OPENROAD_GUI_CMD))))
1029-
$(foreach file,$(RESULTS_DEF),$(eval $(call OPEN_GUI,open,$(file),DEF_FILE,$(OPENROAD_NO_EXIT_CMD))))
1030-
$(foreach file,$(RESULTS_ODB),$(eval $(call OPEN_GUI,open,$(file),ODB_FILE,$(OPENROAD_NO_EXIT_CMD))))
1028+
$(foreach file,$(RESULTS_DEF),$(eval $(call OPEN_GUI,$(file),DEF_FILE)))
1029+
$(foreach file,$(RESULTS_ODB),$(eval $(call OPEN_GUI,$(file),ODB_FILE)))
10311030

10321031
# Write a def for the corresponding odb
10331032
$(foreach file,$(RESULTS_ODB),$(file).def): %.def:
@@ -1070,7 +1069,7 @@ klayout:
10701069

10711070
.phony: run
10721071
run:
1073-
$(OPENROAD_CMD) -no_splash $(RUN_SCRIPT)
1072+
$(OPENROAD_CMD) -no_splash $(if $(filter %.py,$(RUN_SCRIPT)),-python) $(RUN_SCRIPT)
10741073

10751074
# Utilities
10761075
#-------------------------------------------------------------------------------

0 commit comments

Comments
 (0)