librelane 3.0.0.dev33__tar.gz → 3.0.0.dev35__tar.gz

{librelane-3.0.0.dev33 → librelane-3.0.0.dev35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: librelane
-Version: 3.0.0.dev33
+Version: 3.0.0.dev35
 Summary: An infrastructure for implementing chip design flows
 Home-page: https://github.com/librelane/librelane
 License: Apache-2.0

{librelane-3.0.0.dev33 → librelane-3.0.0.dev35}/librelane/flows/cli.py

@@ -1,3 +1,7 @@
+# Copyright 2025 LibreLane Contributors
+#
+# Adapted from OpenLane 2
+#
 # Copyright 2023 Efabless Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,6 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import os
+import sys
 from functools import partial, wraps
 from concurrent.futures import ThreadPoolExecutor
 from typing import Optional, Union
@@ -21,12 +26,15 @@ from click import (
     Parameter,
     echo,
 )
+from click.formatting import join_options
 from cloup import (
     option,
     argument,
     option_group,
     Choice,
-    Path,
+    Argument,
+    Option as CloupOption,
+    Path as CloupPath,
 )
 from cloup.constraints import (
     mutually_exclusive,
@@ -39,6 +47,70 @@ from ..logging import set_log_level, verbose, err, options, LogLevels
 from ..state import State, InvalidState
 
 
+class Option(CloupOption):
+    """
+    A slight modification of cloup.Option that consumes the environment
+    variable(s) in envvar upon use.
+    """
+
+    def resolve_envvar_value(self, ctx: Context) -> Optional[str]:
+        if self.envvar is None:
+            return None
+        evs = self.envvar
+        if isinstance(evs, str):
+            evs = [evs]
+        for envvar in self.envvar:
+            rv = os.environ.pop(envvar, None)
+            if rv:
+                return rv
+        return None
+
+
+class Path(CloupPath):
+    """
+    A modification of cloup.Path that rejects paths starting with a tilde (~)
+    as too ambiguous. This is because of user confusion.
+    """
+
+    def convert(
+        self,
+        value: Union[str, os.PathLike],
+        param: Optional[Parameter],
+        ctx: Optional[Context],
+    ):
+        value = str(value)
+        assert param is not None
+        assert ctx is not None
+
+        is_cmd = False
+        if sys.platform == "win32":
+            import psutil
+
+            is_cmd = psutil.Process(os.getppid()).name().lower().endswith("cmd.exe")
+        if not is_cmd and value.startswith("~"):
+            usage, _ = join_options(param.opts)
+            if isinstance(param, Argument):
+                usage = ""
+            buffer = f"'{value}' starts with a tilde, which is ambiguous.\n"
+            buffer += "  * If you meant your home directory, make sure your POSIX shell is able to expand the tilde:\n"
+            buffer += f"    * GOOD: {ctx.command_path} {usage} {value}   …\n"
+            if usage != "":
+                buffer += f"    * BAD:  {ctx.command_path} {usage}={value}   …\n"
+            buffer += f'    * BAD:  {ctx.command_path} {usage} "{value}" …\n'
+            env_vars = []
+            if param.envvar is not None:
+                if isinstance(param.envvar, str):
+                    env_vars = [param.envvar]
+                else:
+                    env_vars = list(param.envvar)
+            for var in env_vars:
+                buffer += f"    * GOOD: {var}={value}   {ctx.command_path} …\n"
+                buffer += f'    * BAD:  {var}="{value}" {ctx.command_path} …\n'
+            buffer += '  * If you want a relative file or directory that starts with a literal "~", use an absolute path.\n'
+            self.fail(buffer, param, ctx)
+        return super().convert(value, param, ctx)
+
+
 def set_log_level_cb(
     ctx: Context,
     param: Parameter,
@@ -181,7 +253,7 @@ def cloup_flow_opts(
         Ciel is used by default for this CLI or not.
     :returns: The wrapper
     """
-    o = partial(option, show_default=True)
+    o = partial(option, cls=CloupOption, show_default=True)
 
     def decorate(f):
         if config_options:
@@ -355,21 +427,23 @@ def cloup_flow_opts(
                         dir_okay=True,
                     ),
                     is_eager=True,
-                    default=os.environ.pop("PDK_ROOT", None),
+                    envvar=["PDK_ROOT"],
                     help="Override Ciel PDK root folder. Required if Ciel is not installed, but a default value can also be set via the environment variable PDK_ROOT.",
                 ),
                 o(
                     "-p",
                     "--pdk",
                     type=str,
-                    default=os.environ.pop("PDK", "sky130A"),
+                    envvar=["PDK"],
+                    default="sky130A",
                     help="The process design kit to use.",
                 ),
                 o(
                     "-s",
                     "--scl",
                     type=str,
-                    default=os.environ.pop("STD_CELL_LIBRARY", None),
+                    envvar=["STD_CELL_LIBRARY"],
+                    # no default, default is obtained dynamically from PDK
                     help="The standard cell library to use. If None, the PDK's default standard cell library is used.",
                 ),
             )(f)

{librelane-3.0.0.dev33 → librelane-3.0.0.dev35}/librelane/scripts/magic/extract_spice.tcl

@@ -79,9 +79,11 @@ extract no capacitance
 extract no coupling
 extract no resistance
 extract no adjust
-if { ! $::env(MAGIC_NO_EXT_UNIQUE) } {
-    extract unique
+
+if { $::env(MAGIC_EXT_UNIQUE) != "none" } {
+    extract unique $::env(MAGIC_EXT_UNIQUE)
 }
+
 # extract warn all
 extract
 

{librelane-3.0.0.dev33 → librelane-3.0.0.dev35}/librelane/steps/magic.py

@@ -458,15 +458,18 @@ class SpiceExtraction(MagicStep):
         Variable(
             "MAGIC_EXT_ABSTRACT_CELLS",
             Optional[List[str]],
-            "A list of regular experssions which are matched against the cells of a "
+            "A list of regular expressions which are matched against the cells of a "
             + "the design. Matches are abstracted (black-boxed) during SPICE extraction.",
         ),
         Variable(
-            "MAGIC_NO_EXT_UNIQUE",
-            bool,
-            "Enables connections by label in LVS by skipping `extract unique` in Magic extractions.",
-            default=False,
-            deprecated_names=["LVS_CONNECT_BY_LABEL"],
+            "MAGIC_EXT_UNIQUE",
+            Literal["all", "notopports", "noports", "none"],
+            'Runs `extract unique` with the specified option. The default is "all", and "none" disables `extract unique`, allowing connections between separate nets by label in LVS.',
+            default="all",
+            deprecated_names=[
+                ("MAGIC_NO_EXT_UNIQUE", lambda o: "none" if o else "all"),
+                ("LVS_CONNECT_BY_LABEL", lambda o: "none" if o else "all"),
+            ],
         ),
         Variable(
             "MAGIC_EXT_SHORT_RESISTOR",

{librelane-3.0.0.dev33 → librelane-3.0.0.dev35}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "librelane"
-version = "3.0.0.dev33"
+version = "3.0.0.dev35"
 description = "An infrastructure for implementing chip design flows"
 # Technically, maintainer. We cannot use the maintainers field until
 # poetry-core>=2.0.0 which requires Python version 3.9+. This field does