Skip to content

Commit ea83ecf

Browse files
lansergerobtaylor
authored andcommitted
Updated to have single process in configs for now.
1 parent 5401647 commit ea83ecf

File tree

4 files changed

+8
-11
lines changed

4 files changed

+8
-11
lines changed

chipflow_lib/__init__.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,14 @@ def _ensure_chipflow_root():
7474
"silicon": {
7575
"type": "object",
7676
"required": [
77-
"processes",
77+
"process",
7878
"package",
7979
],
8080
"additionalProperties": False,
8181
"properties": {
82-
"processes": {
83-
"type": "array",
84-
"items": {
85-
"type": "string",
86-
"enum": ["sky130", "gf180", "customer1", "gf130bcd", "ihp_sg13g2"]
87-
}
82+
"process": {
83+
"type": "string",
84+
"enum": ["sky130", "gf180", "customer1", "gf130bcd", "ihp_sg13g2"]
8885
},
8986
"package": {
9087
"enum": ["caravel", "cf20", "pga144"]

chipflow_lib/pin_lock.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def lock_pins() -> None:
8686
oldlock = LockFile.model_validate_json(json_string)
8787

8888
print(f"Locking pins: {'using pins.lock' if lockfile.exists() else ''}")
89-
processes = config["chipflow"]["silicon"]["process"]
89+
process_name = config["chipflow"]["silicon"]["process"]
9090
package_name = config["chipflow"]["silicon"]["package"]
9191

9292
if package_name not in PACKAGE_DEFINITIONS:
@@ -146,7 +146,7 @@ def lock_pins() -> None:
146146
_map, _ = allocate_pins(k, v, pins)
147147
port_map.add_ports(component, k, _map)
148148

149-
newlock = LockFile(processes=processes,
149+
newlock = LockFile(process=process_name,
150150
package=package,
151151
port_map=port_map,
152152
metadata=interfaces)

chipflow_lib/platforms/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ class LockFile(pydantic.BaseModel):
416416
port_map: Mapping of components to interfaces to port
417417
metadata: Amaranth metadata, for reference
418418
"""
419-
processes: List[Process]
419+
process: Process
420420
package: Package
421421
port_map: PortMap
422422
metadata: dict

chipflow_lib/steps/silicon.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ def submit(self, rtlil_path, *, dry_run=False):
152152
config = {
153153
"dependency_versions": dep_versions,
154154
"silicon": {
155-
"process": self.silicon_config["processes"][0],
155+
"process": self.silicon_config["process"],
156156
"pad_ring": self.silicon_config["package"],
157157
"pads": pads,
158158
"power": self.silicon_config.get("power", {})

0 commit comments

Comments
 (0)