Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Apply fixes needed for the openlane 2.1.* upgrade #64

Merged
merged 3 commits into from
Sep 20, 2024
Merged

Apply fixes needed for the openlane 2.1.* upgrade #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb45685
fix: add --docker-no-tty to openlane2 command line
Sep 6, 2024
97ec98f
fix: adjust glob pattern for util percentage
Sep 6, 2024
69c0372
fix: make klayout version compatible with recent openlane2
Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions project.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ def harden(self):
shutil.rmtree("runs/wokwi", ignore_errors=True)
os.makedirs("runs/wokwi", exist_ok=True)
progress = "--hide-progress-bar" if "CI" in os.environ else ""
harden_cmd = f"python -m openlane --pdk-root $PDK_ROOT --dockerized --run-tag wokwi --force-run-dir runs/wokwi {progress} src/config_merged.json"
harden_cmd = f"python -m openlane --pdk-root $PDK_ROOT --docker-no-tty --dockerized --run-tag wokwi --force-run-dir runs/wokwi {progress} src/config_merged.json"
else:
# requires PDK, PDK_ROOT, OPENLANE_ROOT & OPENLANE_IMAGE_NAME to be set in local environment
harden_cmd = "docker run --rm -v $OPENLANE_ROOT:/openlane -v $PDK_ROOT:$PDK_ROOT -v $(pwd):/work -e PDK=$PDK -e PDK_ROOT=$PDK_ROOT -u $(id -u $USER):$(id -g $USER) $OPENLANE_IMAGE_NAME ./flow.tcl -overwrite -design /work/src -run_path /work/runs -config_file /work/src/config_merged.json -tag wokwi"
Expand Down Expand Up @@ -851,7 +851,7 @@ def print_stats(self):
"runs/wokwi/*-openroad-globalplacement/openroad-globalplacement.log"
)
util_log = glob.glob(os.path.join(self.local_dir, util_glob))[0]
util_label = "[INFO GPL-0019] Util(%):"
util_label = "[INFO GPL-0019] Util:"
util_line = next(
line for line in open(util_log) if line.startswith(util_label)
)
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies = [
"cocotb",
"gdstk",
"GitPython",
"klayout>=0.28.17.post1,<0.29.0",
"klayout<0.30.0,>=0.29.0",
"mistune",
"numpy<2",
"pre-commit",
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ importlib-resources==6.4.0
# via wasmtime
iniconfig==2.0.0
# via pytest
klayout==0.28.17.post1
klayout==0.29.6
# via tt-support-tools (pyproject.toml)
markdown-it-py==3.0.0
# via rich
Expand Down
Loading