diff --git a/nix/openroad.nix b/nix/openroad.nix index 21b33267..b2ba3b12 100644 --- a/nix/openroad.nix +++ b/nix/openroad.nix @@ -43,8 +43,8 @@ clang-tools_14, buildEnv, makeBinaryWrapper, - rev ? "edf00dff99f6c40d67a30c0e22a8191c5d2ed9d6", - sha256 ? "sha256-J649SIC/IHtiKiMvY8XrteyFkNM0WeQ6hfKIYdtE81g=", + rev ? "73c1f495d0a2476768a300871d4ae1d42bb4c389", + sha256 ? "sha256-kdJIxlsRvDtyFrHRpNSbZZwjgzCyfYMalsiV2HZZypk=", # environments, openroad, buildPythonEnvForInterpreter, diff --git a/nix/opensta.nix b/nix/opensta.nix index 84b15442..2d00ad74 100644 --- a/nix/opensta.nix +++ b/nix/opensta.nix @@ -26,8 +26,8 @@ cudd, zlib, eigen, - rev ? "b5f3a02b33b8ae1739ace8a329fde94434711dd6", - sha256 ? "sha256-s9Qn8Hkxuzvx7sZdaa/RX8X4Rp4w/kTVdnrmsRvC8wo=", + rev ? "aa598a2f14c5c142e90391a69988523505e7db3d", + sha256 ? "sha256-vrOZ7fHp3g5eylL4o6IKuBXug8iz58xgF6Zaf9LYnHg=", }: clangStdenv.mkDerivation (finalAttrs: { name = "opensta"; diff --git a/openlane/scripts/openroad/pdn.tcl b/openlane/scripts/openroad/pdn.tcl index b89ecae8..59e8af62 100644 --- a/openlane/scripts/openroad/pdn.tcl +++ b/openlane/scripts/openroad/pdn.tcl @@ -41,9 +41,7 @@ foreach {net} "$::env(VDD_NETS) $::env(GND_NETS)" { # at all. i.e. PDN generation has completely failed. # This is a fallback file. set f [open $report_file "w"] - puts $f "violation type: no nodes" - puts $f " srcs: " - puts $f " - N/A" + puts $f "" close $f if { [catch {check_power_grid -net $net -error_file $report_file} err] } { diff --git a/openlane/steps/openroad.py b/openlane/steps/openroad.py index a358145e..43fbe1da 100644 --- a/openlane/steps/openroad.py +++ b/openlane/steps/openroad.py @@ -15,6 +15,7 @@ import os import re import json +import textwrap import tempfile import functools import subprocess @@ -1128,9 +1129,9 @@ def get_psm_error_count(rpt: io.TextIOWrapper) -> int: vio_type = line[len(VIO_TYPE_PFX) :].strip() sio.write(f"- type: {vio_type}\n") elif "bbox = " in line: - sio.write(line.replace("bbox = ", "- bbox =")) + sio.write(f" {textwrap.dedent(line.replace('bbox = ', '- bbox ='))}") else: - sio.write(line) + sio.write(f" {textwrap.dedent(line)}") sio.seek(0) violations = yaml.load(sio, Loader=yaml.SafeLoader) or [] diff --git a/test/steps/all b/test/steps/all index 94aa1efe..0a299da0 160000 --- a/test/steps/all +++ b/test/steps/all @@ -1 +1 @@ -Subproject commit 94aa1efe6dfd004003bdabb670279c5d3fa9d46b +Subproject commit 0a299da0550a2f55aea911d2b8f0c5c16e9ab87a