Skip to content

Commit f30fbc8

Browse files
committed
Send pinlock for config to api
1 parent 49594f9 commit f30fbc8

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

.github/workflows/main.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ jobs:
7777
CHIPFLOW_API_ORIGIN: 'https://build-staging.chipflow.org'
7878
CHIPFLOW_API_KEY_ID: ${{ secrets.CHIPFLOW_API_KEY_ID }}
7979
CHIPFLOW_API_KEY_SECRET: ${{ secrets.CHIPFLOW_API_KEY_SECRET }}
80-
CHIPFLOW_BACKEND_VERSION: b7afdbf
8180

8281
test-submit-dry:
8382
runs-on: ubuntu-latest

chipflow_lib/steps/silicon.py

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
from amaranth import *
1616

1717
from .. import ChipFlowError
18-
from ..platforms import SiliconPlatform, top_interfaces
18+
from ..platforms import SiliconPlatform, top_interfaces, load_pinlock
1919

2020

2121
logger = logging.getLogger(__name__)
@@ -160,17 +160,9 @@ def submit(self, rtlil_path, *, dry_run=False, wait=False):
160160
f"dir={port.direction}, width={width}")
161161
pads[padname] = {'loc': port.pins[0], 'type': port.direction.value}
162162

163-
# Use the Pydantic models to access configuration data
164-
silicon_model = self.config_model.chipflow.silicon
165-
config = {
166-
"dependency_versions": dep_versions,
167-
"silicon": {
168-
"process": str(silicon_model.process),
169-
"pad_ring": silicon_model.package,
170-
"pads": pads,
171-
"power": {k: {"type": v.type, "loc": v.loc} for k, v in silicon_model.power.items()}
172-
}
173-
}
163+
pinlock = load_pinlock()
164+
config = pinlock.to_json()
165+
174166
if dry_run:
175167
print(f"data=\n{json.dumps(data, indent=2)}")
176168
print(f"files['config']=\n{json.dumps(config, indent=2)}")

0 commit comments

Comments
 (0)