Remove duplicate functions between utils.py and platform/utils.py

- Remove top_components() and get_software_builds() from platform/utils.py
- Update all imports to use chipflow_lib.utils instead
- Keep only platform-specific compute_invert_mask() in platform/utils.py
- Consolidates utility functions in a single location
- Addresses duplication issue between chipflow_lib/utils.py and chipflow_lib/platform/utils.py

Author: robtaylor

chipflow_lib/platform/__init__.py

@@ -32,7 +32,7 @@
 
 # Base classes and utilities
 from .base import StepBase, setup_amaranth_tools
-from .utils import top_components, get_software_builds
+from ..utils import top_components, get_software_builds
 
 __all__ = [
     # Steps (primarily accessed via chipflow_lib.steps.*)

chipflow_lib/platform/silicon_step.py

@@ -20,7 +20,7 @@
 from halo import Halo
 
 from .base import StepBase, _wire_up_ports
-from .utils import top_components
+from ..utils import top_components
 from .silicon import SiliconPlatform
 from ..utils import ChipFlowError
 

chipflow_lib/platform/sim_step.py

@@ -13,9 +13,8 @@
 from amaranth import Module
 
 from .base import StepBase, _wire_up_ports
-from .utils import top_components
 from .sim import VARIABLES, TASKS, DOIT_CONFIG, SimPlatform
-from ..utils import ChipFlowError, ensure_chipflow_root
+from ..utils import ChipFlowError, ensure_chipflow_root, top_components
 
 
 EXE = ".exe" if os.name == "nt" else ""

chipflow_lib/platform/software_step.py

@@ -8,8 +8,7 @@
 
 from .base import StepBase
 from .software import SoftwarePlatform
-from .utils import top_components
-from ..utils import ChipFlowError
+from ..utils import top_components, ChipFlowError
 
 logger = logging.getLogger(__name__)
 

chipflow_lib/platform/utils.py

@@ -1,22 +1,12 @@
 # SPDX-License-Identifier: BSD-2-Clause
 """
-Platform utilities for ChipFlow.
+Platform-specific utilities for ChipFlow.
+
+This module contains utilities specific to platform operations.
+For general utilities, see chipflow_lib.utils.
 """
 
 import logging
-import pydantic
-
-from pprint import pformat
-from typing import Dict, TYPE_CHECKING
-
-from amaranth import Module
-from amaranth.lib import wiring
-
-from ..utils import ChipFlowError, get_cls_by_reference
-from .io.signatures import DATA_SCHEMA, SoftwareBuild
-
-if TYPE_CHECKING:
-    from ..config import Config
 
 logger = logging.getLogger(__name__)
 
@@ -32,47 +22,3 @@ def compute_invert_mask(invert_list):
         Integer mask where set bits indicate positions to invert
     """
     return sum(inv << bit for bit, inv in enumerate(invert_list))
-
-
-def top_components(config: 'Config') -> Dict[str, wiring.Component]:
-    """
-    Return the top level components for the design, as configured in ``chipflow.toml``
-    """
-    component_configs = {}
-    result = {}
-
-    # First pass: collect component configs
-    for name, conf in config.chipflow.top.items():
-        if '.' in name:
-            assert isinstance(conf, dict)
-            param = name.split('.')[1]
-            logger.debug(f"Config {param} = {conf} found for {name}")
-            component_configs[param] = conf
-        if name.startswith('_'):
-            raise ChipFlowError(f"Top components cannot start with '_' character, these are reserved for internal use: {name}")
-
-    # Second pass: instantiate components
-    for name, ref in config.chipflow.top.items():
-        if '.' not in name:  # Skip component configs, only process actual components
-            cls = get_cls_by_reference(ref, context=f"top component: {name}")
-            if name in component_configs:
-                result[name] = cls(component_configs[name])
-            else:
-                result[name] = cls()
-            logger.debug(f"Top members for {name}:\n{pformat(result[name].metadata.origin.signature.members)}")
-
-    return result
-
-
-def get_software_builds(m: Module, component: str):
-    """
-    Extract software build information from a module's component metadata.
-    """
-    builds = {}
-    iface = getattr(m.submodules, component).metadata.as_json()
-    for interface, interface_desc in iface['interface']['members'].items():
-        annotations = interface_desc['annotations']
-        if DATA_SCHEMA in annotations \
-        and annotations[DATA_SCHEMA]['data']['type'] == "SoftwareBuild":
-            builds[interface] = pydantic.TypeAdapter(SoftwareBuild).validate_python(annotations[DATA_SCHEMA]['data'])
-    return builds