move sky130_lefpin.map to plugin root, clarify prefixes documentation

ucb-bar · Mar 8, 2024 · 56ad76d · 56ad76d
1 parent d58c30e
commit 56ad76d
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/doc/Technology/Tech-json.rst b/doc/Technology/Tech-json.rst
@@ -17,7 +17,7 @@ Path prefixes can be supplied in multiple forms. The options are as follows (tak
 
 #. Absolute path: the path starts with "/" and refers to an absolute path on the filesystem
    * ``/path/to/a/lib/file.lib`` -> ``/path/to/a/lib/file.lib``
-#. Tech plugin relative path: the path has no "/"s and refers to a file directly inside the tech plugin folder
+#. Tech plugin relative path: the path has no "/"s and refers to a file directly inside the tech plugin folder (no subdirectories allowed, else it conflicts with 3-5. below!)
    * ``techlib.lib`` -> ``<tech plugin package>/techlib.lib``
 #. Tech cache relative path: the path starts with an identifier which is "cache" (this is used in the SKY130 example below)
    * ``cache/primitives.v`` -> ``<tech plugin cache dir>/primitives.v``

diff --git a/hammer/tech/__init__.py b/hammer/tech/__init__.py
@@ -652,7 +652,7 @@ def prepend_dir_path(self, path: str, lib: Optional[Library] = None) -> str:
 
         1. Absolute path: the path starts with "/" and refers to an absolute path on the filesystem
             /path/to/a/lib/file.lib -> /path/to/a/lib/file.lib
-        2. Tech plugin relative path: the path has no "/"s and refers to a file directly inside the tech plugin folder
+        2. Tech plugin relative path: the path has no "/"s and refers to a file directly inside the tech plugin folder (no subdirectories allowed, else it conflicts with 3-5. below!)
             techlib.lib -> <tech plugin package>/techlib.lib
         3. Tech cache relative path: the path starts with an identifier which is "cache" (this is used in the SKY130 Libraries)
             cache/primitives.v -> <tech plugin cache dir>/primitives.v

diff --git a/hammer/technology/sky130/__init__.py b/hammer/technology/sky130/__init__.py
@@ -213,7 +213,7 @@ def gen_config(self) -> None:
                 PathPrefix(id = "$SKY130_CDS", path = "technology.sky130.sky130_cds")
             ],
             libraries = libs,
-            gds_map_file = "extra/sky130_lefpin.map",
+            gds_map_file = "sky130_lefpin.map",
             physical_only_cells_list = phys_only,
             dont_use_list = dont_use,
             drc_decks = [

diff --git a/...technology/sky130/extra/sky130_lefpin.map → hammer/technology/sky130/sky130_lefpin.map b/...technology/sky130/extra/sky130_lefpin.map → hammer/technology/sky130/sky130_lefpin.map