working..

Author: robtaylor

chipflow_lib/__init__.py

@@ -9,6 +9,10 @@
 import tomli
 from pathlib import Path
 from pydantic import ValidationError
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from .config_models import Config
 
 __version__ = importlib.metadata.version("chipflow_lib")
 
@@ -48,7 +52,7 @@ def _ensure_chipflow_root():
     return _ensure_chipflow_root.root
 
 
-def _parse_config() -> 'ChipFlowConfig':
+def _parse_config() -> 'Config':
     """Parse the chipflow.toml configuration file."""
     chipflow_root = _ensure_chipflow_root()
     config_file = Path(chipflow_root) / "chipflow.toml"
@@ -60,7 +64,7 @@ def _parse_config() -> 'ChipFlowConfig':
         raise ChipFlowError(f"TOML Error found when loading {config_file}: {e.msg} at line {e.lineno}, column {e.colno}")
 
 
-def _parse_config_file(config_file) -> 'ChipFlowConfig':
+def _parse_config_file(config_file) -> 'Config':
     """Parse a specific chipflow.toml configuration file."""
 
     with open(config_file, "rb") as f:
@@ -81,4 +85,3 @@ def _parse_config_file(config_file) -> 'ChipFlowConfig':
         raise ChipFlowError(f"Validation error in chipflow.toml:\n{error_str}")
 
 
-from .config_models import Config

chipflow_lib/config_models.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-2-Clause
 import re
-from typing import Dict, Optional, Literal, Any, List, TYPE_CHECKING
+from typing import Dict, Optional, Literal, Any, List
 
 from pydantic import BaseModel, model_validator, ValidationInfo, field_validator
 

chipflow_lib/pin_lock.py

@@ -22,9 +22,10 @@ def lock_pins() -> None:
     oldlock = None
 
     if lockfile.exists():
+        print("Reusing current pin allocation from `pins.lock`")
         oldlock = LockFile.model_validate_json(lockfile.read_text())
-    print(f"Old Lock =\n{pformat(oldlock)}")
-    print(f"Locking pins: {'using pins.lock' if lockfile.exists() else ''}")
+    logger.debug(f"Old Lock =\n{pformat(oldlock)}")
+    logger.debug(f"Locking pins: {'using pins.lock' if lockfile.exists() else ''}")
 
     # Get package definition from dict instead of Pydantic model
     package_name = config.chipflow.silicon.package
@@ -37,7 +38,7 @@ def lock_pins() -> None:
     for name, component in top.items():
         package_def.register_component(name, component)
 
-    newlock = package_def.allocate_pins(process, oldlock)
+    newlock = package_def.allocate_pins(config, process, oldlock)
 
     with open(lockfile, 'w') as f:
         f.write(newlock.model_dump_json(indent=2, serialize_as_any=True))

chipflow_lib/platforms/utils.py

@@ -6,7 +6,6 @@
 
 
 from collections import OrderedDict, deque
-from collections.abc import MutableMapping
 from dataclasses import dataclass, asdict
 from enum import Enum, IntEnum, StrEnum
 from math import ceil, floor
@@ -22,15 +21,13 @@
 )
 
 
-from amaranth import Const, ClockDomain, Fragment
+from amaranth import Const
 from amaranth.lib import wiring, io, meta
 from amaranth.lib.wiring import In, Out
 from pydantic import (
         ConfigDict, TypeAdapter, PlainSerializer,
-        WithJsonSchema, with_config,
-        GetCoreSchemaHandler
+        WithJsonSchema, with_config
         )
-from pydantic_core import core_schema, CoreSchema
 
 
 from .. import ChipFlowError, _ensure_chipflow_root, _get_cls_by_reference
@@ -109,11 +106,9 @@ class IOModel(_IOModelOptions):
 def io_annotation_schema():
     class Model(pydantic.BaseModel):
         data_td: IOModel
-    print(Model.model_json_schema())
 
     PydanticModel = TypeAdapter(IOModel)
-    #schema = PydanticModel.json_schema()
-    schema = Model.model_json_schema()
+    schema = PydanticModel.json_schema()
     schema['$schema'] = "https://json-schema.org/draft/2020-12/schema"
     schema['$id'] = IO_ANNOTATION_SCHEMA
     return schema

pdm.lock

@@ -13,7 +13,7 @@ authors = [
 ]
 license = {file = "LICENSE.md"}
 
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 dependencies = [
     "amaranth[builtin-yosys]>=0.5,<0.7",
     "amaranth-soc @ git+https://github.com/amaranth-lang/amaranth-soc",
@@ -29,6 +29,7 @@ dependencies = [
     "pydantic>=2.8",
     "halo>=0.0.31",
     "pyrefly>=0.21.0",
+    "amaranth-stubs>=0.1.1",
 ]
 
 [project.scripts]
@@ -72,7 +73,7 @@ test.cmd = "pytest"
 test-cov.cmd = "pytest --cov=chipflow_lib --cov-report=term"
 test-cov-html.cmd = "pytest --cov=chipflow_lib --cov-report=html"
 test-docs.cmd = "sphinx-build -b doctest docs/ docs/_build"
-lint.composite = [ "ruff check", "pyrefly check"]
+lint.composite = [ "ruff check", "pyrefly check chipflow_lib"]
 docs.cmd = "sphinx-build docs/ docs/_build/ -W --keep-going"
 test-silicon.cmd = "pytest tests/test_silicon_platform.py tests/test_silicon_platform_additional.py tests/test_silicon_platform_amaranth.py tests/test_silicon_platform_build.py tests/test_silicon_platform_port.py --cov=chipflow_lib.platforms.silicon --cov-report=term"
 _check-project.call = "tools.check_project:main"

pyproject.toml

@@ -13,6 +13,7 @@
     _parse_config_file,
     _parse_config
 )
+from chipflow_lib.config_model import Config, ChipFlowConfig
 
 
 class TestCoreUtilities(unittest.TestCase):
@@ -104,16 +105,16 @@ def test_parse_config_file_valid(self):
 
         config = _parse_config_file(config_path)
 
-        self.assertIn("chipflow", config)
-        self.assertEqual(config["chipflow"]["project_name"], "test_project")
-        self.assertEqual(config["chipflow"]["silicon"]["process"], "sky130")
+        assert config.chipflow
+        self.assertEqual(config.chipflow.project_name, "test_project")
+        self.assertEqual(config.chipflow.silicon.process, "sky130")
 
     @mock.patch("chipflow_lib._ensure_chipflow_root")
     @mock.patch("chipflow_lib._parse_config_file")
     def test_parse_config(self, mock_parse_config_file, mock_ensure_chipflow_root):
         """Test _parse_config which uses _ensure_chipflow_root and _parse_config_file"""
         mock_ensure_chipflow_root.return_value = "/mock/chipflow/root"
-        mock_parse_config_file.return_value = {"chipflow": {"test": "value"}}
+        mock_parse_config_file.return_value = Config(chipflow=ChipFlowConfig(project_name='test', top={'test','test'}))
 
         config = _parse_config()
 
@@ -123,4 +124,5 @@ def test_parse_config(self, mock_parse_config_file, mock_ensure_chipflow_root):
                         if hasattr(mock_parse_config_file.call_args[0][0], 'as_posix')
                         else mock_parse_config_file.call_args[0][0],
                         "/mock/chipflow/root/chipflow.toml")
-        self.assertEqual(config, {"chipflow": {"test": "value"}})
+        self.assertEqual(config.chipflow.project_name, "test")
+        self.assertEqual(config.chipflow.project_name.top, {'test': 'test'})

tests/test_init.py

@@ -2,6 +2,7 @@
 import logging
 import pytest  #noqa
 
+from amaranth import Const
 from amaranth.lib import io
 
 from chipflow_lib.platforms.utils import IOSignature, OutputIOSignature, InputIOSignature, BidirIOSignature
@@ -75,7 +76,7 @@ def test_signature_factory_functions():
     """Test the factory functions for creating IOSignatures"""
 
     # Test OutputIOSignature factory
-    output_sig = OutputIOSignature(width=32, init=0x12345678)
+    output_sig = OutputIOSignature(width=32, init=Const.cast(0x12345678))
     assert output_sig.direction == io.Direction.Output
     assert output_sig.width == 32