chipfoundry-cli 2.7.0__py3-none-any.whl → 2.7.2__py3-none-any.whl

chipfoundry_cli/__init__.py

@@ -1,2 +1,2 @@
 """ChipFoundry CLI package: Automate project submission to SFTP."""
-__version__ = "2.7.0"
+__version__ = "2.7.2"

chipfoundry_cli/main.py

@@ -3661,8 +3661,13 @@ def setup(project_root, repo_owner, repo_name, branch, pdk, caravel_lite,
                     )
                     # Install from GitHub source (workaround: PyPI package is under efabless, we use chipfoundry repo)
                     env = os.environ.copy()
-                    if sys.platform == 'darwin':
-                        env['LDSHARED'] = 'clang++ -dynamiclib -undefined dynamic_lookup'
+                    # cocotb 1.9.2 rewrites -bundle to -dynamiclib on the stdlib distutils
+                    # config, but an isolated pip build links with setuptools' vendored
+                    # distutils and never sees that change. Python 3.12+ has no stdlib
+                    # distutils, so this only applies to older interpreters. The venv is
+                    # created with sys.executable, so sys.version_info matches it.
+                    if sys.platform == 'darwin' and sys.version_info < (3, 12):
+                        env['SETUPTOOLS_USE_DISTUTILS'] = 'stdlib'
                     subprocess.run(
                         [
                             venv_python, '-m', 'pip', 'install', '--upgrade', '--no-cache-dir',
@@ -3710,9 +3715,22 @@ def setup(project_root, repo_owner, repo_name, branch, pdk, caravel_lite,
             except subprocess.CalledProcessError as e:
                 maybe_abort_no_space(e, "Cocotb setup")
                 had_errors = True
-                console.print(f"[red]✗[/red] Failed to set up Cocotb: {e}")
-                if e.stderr:
-                    console.print(f"[dim]{e.stderr}[/dim]")
+                cmd_parts = e.cmd if isinstance(e.cmd, (list, tuple)) else [str(e.cmd)]
+                is_cocotb_install = any(
+                    "caravel-sim-infrastructure" in str(part) for part in cmd_parts
+                )
+                if is_cocotb_install:
+                    console.print("[red]✗[/red] Failed to set up Cocotb")
+                    stderr = e.stderr or b""
+                    if isinstance(stderr, bytes):
+                        stderr = stderr.decode(errors="replace")
+                    tail = "\n".join(stderr.splitlines()[-25:])
+                    if tail:
+                        console.print(f"[dim]{tail}[/dim]")
+                else:
+                    console.print(f"[red]✗[/red] Failed to set up Cocotb: {e}")
+                    if e.stderr:
+                        console.print(f"[dim]{e.stderr}[/dim]")
             except Exception as e:
                 maybe_abort_no_space(e, "Cocotb setup")
                 had_errors = True

chipfoundry_cli/preview.py

@@ -41,6 +41,9 @@ LINT_PASSED = "passed"
 LINT_FAILED = "failed"
 LINT_SKIPPED = "skipped"
 
+AREA_SOURCE_DIE = "die_area"
+AREA_SOURCE_SYNTHESIS = "synthesis"
+
 _ELABORATE_ONLY_STRATEGIES = {
     STRATEGY_HIER_MACRO_FIRST,
     STRATEGY_HIER_MACRO_FIRST_LEGACY,
@@ -105,6 +108,30 @@ def die_area_mm2(config: Dict[str, Any]) -> Optional[Decimal]:
     return (Decimal(str(um2)) / Decimal("1000000")).quantize(Decimal("0.0001"))
 
 
+def floorplan_area_is_fixed(config: Dict[str, Any]) -> bool:
+    """True when DIE_AREA is the macro footprint LibreLane will use.
+
+    ``FP_SIZING=relative`` sizes the die from synthesized cells. Absolute
+    sizing, and a DIE_AREA with no FP_SIZING, is a fixed footprint.
+    """
+    sizing = config.get("FP_SIZING")
+    if isinstance(sizing, str) and sizing.strip().lower() == "relative":
+        return False
+    return die_area_mm2(config) is not None
+
+
+def _apply_die_area(row: Dict[str, Any], config: Dict[str, Any]) -> None:
+    """Record DIE_AREA. A fixed footprint is not replaced by synthesis later."""
+    area = die_area_mm2(config)
+    if area is None:
+        return
+    if floorplan_area_is_fixed(config):
+        row["estimated_area_mm2"] = str(area)
+        row["area_source"] = AREA_SOURCE_DIE
+    elif row.get("estimated_area_mm2") is None:
+        row["estimated_area_mm2"] = str(area)
+
+
 def _stem_from_view_path(value: Any) -> Optional[str]:
     if not isinstance(value, str) or not value.strip():
         return None
@@ -262,6 +289,7 @@ def scan_project(project_root: Path) -> Dict[str, Any]:
                     "source": "cli_preview",
                     "config_path": row["config_path"],
                     "estimated_area_mm2": None,
+                    "area_source": None,
                     "gate_count": None,
                     "instances": [],
                     "integration_strategy": None,
@@ -283,7 +311,7 @@ def scan_project(project_root: Path) -> Dict[str, Any]:
         else:
             parent = design_name.strip()
 
-        area = die_area_mm2(config)
+        is_new = parent not in macros_by_name
         parent_row = macros_by_name.setdefault(
             parent,
             {
@@ -292,19 +320,23 @@ def scan_project(project_root: Path) -> Dict[str, Any]:
                 "is_top_level": False,
                 "source": "cli_preview",
                 "config_path": row["config_path"],
-                "estimated_area_mm2": str(area) if area is not None else None,
+                "estimated_area_mm2": None,
+                "area_source": None,
                 "gate_count": None,
                 "instances": [],
                 "integration_strategy": None,
                 "lint_status": None,
             },
         )
-        if parent_row["config_path"] != row["config_path"]:
+        if is_new or not parent_row.get("config_path") or parent_row["config_path"] == row["config_path"]:
+            if not is_new and not parent_row.get("config_path"):
+                parent_row["config_path"] = row["config_path"]
+                parent_row["notes"] = f"from {row['config_path']}"
+            _apply_die_area(parent_row, config)
+        else:
             notes.append(
                 f"Multiple configs declare DESIGN_NAME {parent!r}; using {parent_row['config_path']}"
             )
-        elif area is not None and parent_row["estimated_area_mm2"] is None:
-            parent_row["estimated_area_mm2"] = str(area)
 
         macro_section = config.get("MACROS")
         if isinstance(macro_section, dict):
@@ -330,6 +362,7 @@ def scan_project(project_root: Path) -> Dict[str, Any]:
                         "source": "cli_preview",
                         "config_path": None,
                         "estimated_area_mm2": None,
+                        "area_source": None,
                         "gate_count": None,
                         "instances": [],
                         "integration_strategy": STRATEGY_HARD_IP,
@@ -362,6 +395,7 @@ def scan_project(project_root: Path) -> Dict[str, Any]:
                     "source": "cli_preview",
                     "config_path": None,
                     "estimated_area_mm2": None,
+                    "area_source": None,
                     "gate_count": None,
                     "instances": [],
                     "integration_strategy": STRATEGY_HARD_IP,
@@ -471,12 +505,13 @@ def apply_synth_metrics(
         macro["lint_status"] = LINT_FAILED
     if strategy_uses_gate_count(strategy):
         macro["gate_count"] = metrics["gate_count"]
-        area = metrics.get("estimated_area_mm2")
-        if area is not None:
-            macro["estimated_area_mm2"] = str(area)
-    elif macro.get("estimated_area_mm2") is None and metrics.get("estimated_area_mm2") is not None:
-        # Keep DIE_AREA / catalog area; do not treat Yosys cells as gates.
-        pass
+        # Cell area is the sum of synthesized gates. A fixed DIE_AREA is the
+        # footprint OpenLane will actually build.
+        if macro.get("area_source") != AREA_SOURCE_DIE:
+            area = metrics.get("estimated_area_mm2")
+            if area is not None:
+                macro["estimated_area_mm2"] = str(area)
+                macro["area_source"] = AREA_SOURCE_SYNTHESIS
 
 
 def leaf_summary(macros: Sequence[Dict[str, Any]]) -> Dict[str, Any]:
@@ -675,6 +710,7 @@ def build_preview_payload(
             "source": "cli_preview",
             "config_path": row.get("config_path"),
             "estimated_area_mm2": row.get("estimated_area_mm2"),
+            "area_source": row.get("area_source"),
             "gate_count": row.get("gate_count"),
             "instances": row.get("instances") or [],
             "integration_strategy": row.get("integration_strategy"),

{chipfoundry_cli-2.7.0.dist-info → chipfoundry_cli-2.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chipfoundry-cli
-Version: 2.7.0
+Version: 2.7.2
 Summary: CLI tool to automate ChipFoundry project submission to SFTP server
 License: Apache-2.0
 License-File: LICENSE

chipfoundry_cli-2.7.2.dist-info/RECORD

@@ -0,0 +1,13 @@
+chipfoundry_cli/__init__.py,sha256=hk8Lld7f5U8fnkyqT4PgWp34qe2KCg8Y2fF-E2DRdys,89
+chipfoundry_cli/check_refs.py,sha256=YHbtH4GSbX5xuWG02DeO4ErjXWDJDPOqUNiiMmzdZoc,1538
+chipfoundry_cli/librelane_run.py,sha256=Er8_oIW43rI9izJRBOD08aQwF12veQZd1cWyguIgzcA,14089
+chipfoundry_cli/main.py,sha256=2l4Q3AVFDzvsqe2rAa6hukwYnS8HMtgQsm88k1q8CE0,263872
+chipfoundry_cli/preview.py,sha256=FTJyso_iuh_4On5isz-nFQMcPGYiFyCRYNZdEj5u75g,36104
+chipfoundry_cli/remote_precheck_git.py,sha256=djJIAUCqJAhg6hIHRTtW7O6UnEGAbNjtW9B1rSQSiSg,13965
+chipfoundry_cli/utils.py,sha256=yh3doTLSxauFDQKTmibgc5TgpCd0emZ1QJBwkETqoDc,33688
+chipfoundry_cli/version_check.py,sha256=V_YkRpMvH3rF8roJlwx8PZh4KaD84_qy3gURYPC2W7o,6473
+chipfoundry_cli-2.7.2.dist-info/METADATA,sha256=HMTi4DEeCCfLo1bgcbwCcspWEuaO-1r_qKBisl_q0sw,37551
+chipfoundry_cli-2.7.2.dist-info/WHEEL,sha256=L-WvLdSBvJWHXv5zrQxDvNRnIgoBzLUpcbuiw19KCuQ,88
+chipfoundry_cli-2.7.2.dist-info/entry_points.txt,sha256=Kz6Q2a6HSqWHsBUH3CbAOTI5esD9KGul2THYPYUZDwI,86
+chipfoundry_cli-2.7.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+chipfoundry_cli-2.7.2.dist-info/RECORD,,

chipfoundry_cli-2.7.0.dist-info/RECORD

@@ -1,13 +0,0 @@
-chipfoundry_cli/__init__.py,sha256=izwHokbQs1-p1yLYeJx1BD0XZF0aOVadeay2ZPOULsQ,89
-chipfoundry_cli/check_refs.py,sha256=YHbtH4GSbX5xuWG02DeO4ErjXWDJDPOqUNiiMmzdZoc,1538
-chipfoundry_cli/librelane_run.py,sha256=Er8_oIW43rI9izJRBOD08aQwF12veQZd1cWyguIgzcA,14089
-chipfoundry_cli/main.py,sha256=XjealYq4oTalyjphCGAKKQEWEgopKVtVbDmQ5z8-U9E,262734
-chipfoundry_cli/preview.py,sha256=IcTx8bx9ncLap1mCR8lHGfxymWYgYakmoWtO34RmEkY,34701
-chipfoundry_cli/remote_precheck_git.py,sha256=djJIAUCqJAhg6hIHRTtW7O6UnEGAbNjtW9B1rSQSiSg,13965
-chipfoundry_cli/utils.py,sha256=yh3doTLSxauFDQKTmibgc5TgpCd0emZ1QJBwkETqoDc,33688
-chipfoundry_cli/version_check.py,sha256=V_YkRpMvH3rF8roJlwx8PZh4KaD84_qy3gURYPC2W7o,6473
-chipfoundry_cli-2.7.0.dist-info/METADATA,sha256=bvnqz32Jn5AtbkXUo92tAHixcUmomy2FQ6E-5FPy4Ks,37551
-chipfoundry_cli-2.7.0.dist-info/WHEEL,sha256=L-WvLdSBvJWHXv5zrQxDvNRnIgoBzLUpcbuiw19KCuQ,88
-chipfoundry_cli-2.7.0.dist-info/entry_points.txt,sha256=Kz6Q2a6HSqWHsBUH3CbAOTI5esD9KGul2THYPYUZDwI,86
-chipfoundry_cli-2.7.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-chipfoundry_cli-2.7.0.dist-info/RECORD,,