PyIBIS-AMI 9.0.0__tar.gz → 9.2.0__tar.gz

pyibis_ami-9.2.0/PKG-INFO

@@ -0,0 +1,111 @@
+Metadata-Version: 2.4
+Name: pyibis-ami
+Version: 9.2.0
+Summary: Facilitates working directly with IBIS-AMI DLLs from the Python command prompt.
+Author-email: David Banas <capn.freako@gmail.com>
+Project-URL: Documentation, https://pyibis-ami.readthedocs.io/en/latest/
+Project-URL: Wiki, https://github.com/capn-freako/PyAMI/wiki
+Project-URL: GitHub, https://github.com/capn-freako/PyAMI
+Project-URL: PyPi, https://pypi.org/project/PyIBIS-AMI/
+Keywords: ibis-ami
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Console
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Topic :: System :: Emulators
+Classifier: Topic :: Utilities
+Requires-Python: <3.14,>=3.10
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: chaco==6.1.1
+Requires-Dist: click==8.4.2
+Requires-Dist: empy==4.2.1
+Requires-Dist: importlib_resources==7.1.0
+Requires-Dist: jupyter==1.1.1
+Requires-Dist: lxml-html-clean==0.4.5
+Requires-Dist: matplotlib>=3.6.1
+Requires-Dist: numpy>=1.26
+Requires-Dist: papermill==2.7.0
+Requires-Dist: parsec==3.17
+Requires-Dist: reportlab==5.0.0
+Requires-Dist: scipy>=1.15
+Requires-Dist: traits==7.1.0
+Requires-Dist: traitsui==8.0.0
+Requires-Dist: types-reportlab==4.5.1.20260712
+Dynamic: license-file
+
+[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/capn-freako/PyAMI/master.svg)](https://results.pre-commit.ci/latest/github/capn-freako/PyAMI/master)
+
+# PyIBIS-AMI
+
+PyIBIS-AMI is a Python package of tools useful in the development and testing of IBIS-AMI models.
+This library is used in [PyBERT](https://github.com/capn-freako/PyBERT) and also provides three
+command line applications.
+
+It can be installed via: `pip install PyIBIS-AMI`.
+
+[View API/Developer's Documentation.](https://pyibis-ami.readthedocs.io/en/latest/)
+
+## Command Line Tools
+
+### IBIS-AMI Model Testing
+
+**PyIBIS-AMI Native:**
+
+```
+% test-model -h
+Usage: test-model [OPTIONS] IBIS_FILE
+
+Options:
+  -m, --model TEXT   Name of IBIS-AMI model to test.
+  -p, --params TEXT  Directory containing test configuration sweeps.
+  -d, --debug        Provide extra debugging information.
+  --version          Show the version and exit.
+  -h, --help         Show this message and exit.
+```
+
+**IBIS v8.0:**
+
+% check-ami -h
+Usage: check-ami [OPTIONS] IBIS_FILE
+
+  Run [AMI Test Configuration] blocks embedded in an IBIS file (IBIS 8.0
+  §10.11).
+
+  Parses IBIS_FILE, locates the target model, then calls AMI_Init() (and
+  AMI_GetWave() for Time_domain configs) and compares the outputs against the
+  golden data files referenced in each [AMI Test Configuration] block.
+
+  Exits with status 1 if any configuration fails.
+
+Options:
+  -m, --model-name TEXT  Name of the [Model] to test.  Required when the .ibs
+                         file defines more than one model.
+  -c, --config TEXT      Name of a single [AMI Test Configuration] to run.
+                         Runs all configs when omitted.
+  --tol-ir FLOAT         Absolute tolerance for impulse-response comparison.
+                         [default: 1e-06]
+  --tol-wave FLOAT       Absolute tolerance for waveform comparison.
+                         [default: 1e-06]
+  -h, --help             Show this message and exit.
+
+### IBIS-AMI Model Pre-build Configuration
+
+```
+ami_config -h
+Usage: ami_config [OPTIONS] PY_FILE
+
+  Configure IBIS-AMI model C++ source code, IBIS model, and AMI file.
+
+  py_file: name of model configuration file (*.py)
+
+Options:
+  -h, --help  Show this message and exit.
+```

pyibis_ami-9.2.0/README.md

@@ -0,0 +1,68 @@
+[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/capn-freako/PyAMI/master.svg)](https://results.pre-commit.ci/latest/github/capn-freako/PyAMI/master)
+
+# PyIBIS-AMI
+
+PyIBIS-AMI is a Python package of tools useful in the development and testing of IBIS-AMI models.
+This library is used in [PyBERT](https://github.com/capn-freako/PyBERT) and also provides three
+command line applications.
+
+It can be installed via: `pip install PyIBIS-AMI`.
+
+[View API/Developer's Documentation.](https://pyibis-ami.readthedocs.io/en/latest/)
+
+## Command Line Tools
+
+### IBIS-AMI Model Testing
+
+**PyIBIS-AMI Native:**
+
+```
+% test-model -h
+Usage: test-model [OPTIONS] IBIS_FILE
+
+Options:
+  -m, --model TEXT   Name of IBIS-AMI model to test.
+  -p, --params TEXT  Directory containing test configuration sweeps.
+  -d, --debug        Provide extra debugging information.
+  --version          Show the version and exit.
+  -h, --help         Show this message and exit.
+```
+
+**IBIS v8.0:**
+
+% check-ami -h
+Usage: check-ami [OPTIONS] IBIS_FILE
+
+  Run [AMI Test Configuration] blocks embedded in an IBIS file (IBIS 8.0
+  §10.11).
+
+  Parses IBIS_FILE, locates the target model, then calls AMI_Init() (and
+  AMI_GetWave() for Time_domain configs) and compares the outputs against the
+  golden data files referenced in each [AMI Test Configuration] block.
+
+  Exits with status 1 if any configuration fails.
+
+Options:
+  -m, --model-name TEXT  Name of the [Model] to test.  Required when the .ibs
+                         file defines more than one model.
+  -c, --config TEXT      Name of a single [AMI Test Configuration] to run.
+                         Runs all configs when omitted.
+  --tol-ir FLOAT         Absolute tolerance for impulse-response comparison.
+                         [default: 1e-06]
+  --tol-wave FLOAT       Absolute tolerance for waveform comparison.
+                         [default: 1e-06]
+  -h, --help             Show this message and exit.
+
+### IBIS-AMI Model Pre-build Configuration
+
+```
+ami_config -h
+Usage: ami_config [OPTIONS] PY_FILE
+
+  Configure IBIS-AMI model C++ source code, IBIS model, and AMI file.
+
+  py_file: name of model configuration file (*.py)
+
+Options:
+  -h, --help  Show this message and exit.
+```

{pyibis_ami-9.0.0 → pyibis_ami-9.2.0}/pyproject.toml

@@ -5,25 +5,27 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "pyibis-ami"
 description = "Facilitates working directly with IBIS-AMI DLLs from the Python command prompt."
-version = "9.0.0"
+version = "9.2.0"
 authors = [ {name = "David Banas",     email = "capn.freako@gmail.com"}
           ]
 readme = "README.md"
-requires-python = ">=3.10,<3.13"
+requires-python = ">=3.10,<3.14"
 dependencies = [
-    "chaco>=6.0.0",
-    "click>=8.1.3",
-    "empy>=3.3.4",
-    "importlib_resources",
-    "jupyter",
-    "lxml-html-clean>=0.4.4",
+    "chaco==6.1.1",
+    "click==8.4.2",
+    "empy==4.2.1",
+    "importlib_resources==7.1.0",
+    "jupyter==1.1.1",
+    "lxml-html-clean==0.4.5",
     "matplotlib>=3.6.1",
-    "numpy>=1.26,<1.27",
-    "papermill",
-    "parsec>=3.15",
-    "reportlab>=4.4.10",
-    "scipy>=1.9",
-    "types-reportlab>=4.4.10.20260223",
+    "numpy>=1.26",
+    "papermill==2.7.0",
+    "parsec==3.17",
+    "reportlab==5.0.0",
+    "scipy>=1.15",
+    "traits==7.1.0",
+    "traitsui==8.0.0",
+    "types-reportlab==4.5.1.20260712",
 ]
 keywords=["ibis-ami"]
 classifiers=[
@@ -36,6 +38,7 @@ classifiers=[
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: Implementation :: CPython",
     "Topic :: System :: Emulators",
     "Topic :: Utilities",
@@ -52,6 +55,7 @@ ami-config = "pyibisami.ami.config:main"
 run-tests = "pyibisami.tools.run_tests:main"
 run-notebook = "pyibisami.tools.run_notebook:main"
 test-model = "pyibisami.testing.test_models:main"
+check-ami = "pyibisami.testing.ami_test_config:main"
 
 [tool.setuptools.packages.find]
 where = ["src"]

pyibis_ami-9.2.0/src/pyibis_ami.egg-info/PKG-INFO

@@ -0,0 +1,111 @@
+Metadata-Version: 2.4
+Name: pyibis-ami
+Version: 9.2.0
+Summary: Facilitates working directly with IBIS-AMI DLLs from the Python command prompt.
+Author-email: David Banas <capn.freako@gmail.com>
+Project-URL: Documentation, https://pyibis-ami.readthedocs.io/en/latest/
+Project-URL: Wiki, https://github.com/capn-freako/PyAMI/wiki
+Project-URL: GitHub, https://github.com/capn-freako/PyAMI
+Project-URL: PyPi, https://pypi.org/project/PyIBIS-AMI/
+Keywords: ibis-ami
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Console
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Topic :: System :: Emulators
+Classifier: Topic :: Utilities
+Requires-Python: <3.14,>=3.10
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: chaco==6.1.1
+Requires-Dist: click==8.4.2
+Requires-Dist: empy==4.2.1
+Requires-Dist: importlib_resources==7.1.0
+Requires-Dist: jupyter==1.1.1
+Requires-Dist: lxml-html-clean==0.4.5
+Requires-Dist: matplotlib>=3.6.1
+Requires-Dist: numpy>=1.26
+Requires-Dist: papermill==2.7.0
+Requires-Dist: parsec==3.17
+Requires-Dist: reportlab==5.0.0
+Requires-Dist: scipy>=1.15
+Requires-Dist: traits==7.1.0
+Requires-Dist: traitsui==8.0.0
+Requires-Dist: types-reportlab==4.5.1.20260712
+Dynamic: license-file
+
+[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/capn-freako/PyAMI/master.svg)](https://results.pre-commit.ci/latest/github/capn-freako/PyAMI/master)
+
+# PyIBIS-AMI
+
+PyIBIS-AMI is a Python package of tools useful in the development and testing of IBIS-AMI models.
+This library is used in [PyBERT](https://github.com/capn-freako/PyBERT) and also provides three
+command line applications.
+
+It can be installed via: `pip install PyIBIS-AMI`.
+
+[View API/Developer's Documentation.](https://pyibis-ami.readthedocs.io/en/latest/)
+
+## Command Line Tools
+
+### IBIS-AMI Model Testing
+
+**PyIBIS-AMI Native:**
+
+```
+% test-model -h
+Usage: test-model [OPTIONS] IBIS_FILE
+
+Options:
+  -m, --model TEXT   Name of IBIS-AMI model to test.
+  -p, --params TEXT  Directory containing test configuration sweeps.
+  -d, --debug        Provide extra debugging information.
+  --version          Show the version and exit.
+  -h, --help         Show this message and exit.
+```
+
+**IBIS v8.0:**
+
+% check-ami -h
+Usage: check-ami [OPTIONS] IBIS_FILE
+
+  Run [AMI Test Configuration] blocks embedded in an IBIS file (IBIS 8.0
+  §10.11).
+
+  Parses IBIS_FILE, locates the target model, then calls AMI_Init() (and
+  AMI_GetWave() for Time_domain configs) and compares the outputs against the
+  golden data files referenced in each [AMI Test Configuration] block.
+
+  Exits with status 1 if any configuration fails.
+
+Options:
+  -m, --model-name TEXT  Name of the [Model] to test.  Required when the .ibs
+                         file defines more than one model.
+  -c, --config TEXT      Name of a single [AMI Test Configuration] to run.
+                         Runs all configs when omitted.
+  --tol-ir FLOAT         Absolute tolerance for impulse-response comparison.
+                         [default: 1e-06]
+  --tol-wave FLOAT       Absolute tolerance for waveform comparison.
+                         [default: 1e-06]
+  -h, --help             Show this message and exit.
+
+### IBIS-AMI Model Pre-build Configuration
+
+```
+ami_config -h
+Usage: ami_config [OPTIONS] PY_FILE
+
+  Configure IBIS-AMI model C++ source code, IBIS model, and AMI file.
+
+  py_file: name of model configuration file (*.py)
+
+Options:
+  -h, --help  Show this message and exit.
+```

{pyibis_ami-9.0.0 → pyibis_ami-9.2.0}/src/pyibis_ami.egg-info/SOURCES.txt

@@ -44,6 +44,7 @@ src/pyibisami/ibis/file.py
 src/pyibisami/ibis/model.py
 src/pyibisami/ibis/parser.py
 src/pyibisami/testing/__init__.py
+src/pyibisami/testing/ami_test_config.py
 src/pyibisami/testing/ami_tests.py
 src/pyibisami/testing/ami_tests_helpers.py
 src/pyibisami/testing/ibis_file_tests.py
@@ -58,4 +59,5 @@ src/pyibisami/util/ami.py
 src/pyibisami/util/misc.py
 src/pyibisami/util/plot.py
 src/pyibisami/util/reportlab.py
+tests/test_ami_test_config.py
 tests/test_run_tests.py

{pyibis_ami-9.0.0 → pyibis_ami-9.2.0}/src/pyibis_ami.egg-info/entry_points.txt

@@ -1,5 +1,6 @@
 [console_scripts]
 ami-config = pyibisami.ami.config:main
+check-ami = pyibisami.testing.ami_test_config:main
 run-notebook = pyibisami.tools.run_notebook:main
 run-tests = pyibisami.tools.run_tests:main
 test-model = pyibisami.testing.test_models:main

pyibis_ami-9.2.0/src/pyibis_ami.egg-info/requires.txt

@@ -0,0 +1,15 @@
+chaco==6.1.1
+click==8.4.2
+empy==4.2.1
+importlib_resources==7.1.0
+jupyter==1.1.1
+lxml-html-clean==0.4.5
+matplotlib>=3.6.1
+numpy>=1.26
+papermill==2.7.0
+parsec==3.17
+reportlab==5.0.0
+scipy>=1.15
+traits==7.1.0
+traitsui==8.0.0
+types-reportlab==4.5.1.20260712

{pyibis_ami-9.0.0 → pyibis_ami-9.2.0}/src/pyibisami/__init__.py

@@ -17,6 +17,6 @@ try:
 except Exception as err:  # pylint: disable=broad-exception-caught
     __version__ = f"{err} (dev)"
 
-__date__ = "May 25, 2026"
+__date__ = "June 18, 2026"
 __authors__ = "David Banas & David Patterson"
 __copy__ = "Copyright (c) 2012 David Banas, 2019 David Patterson"

{pyibis_ami-9.0.0 → pyibis_ami-9.2.0}/src/pyibisami/ami/model.py

@@ -12,7 +12,7 @@ import copy as cp
 from ctypes import CDLL, byref, c_char_p, c_double  # pylint: disable=no-name-in-module
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, Optional, TypeAlias
+from typing import Any, Optional, TypeAlias, TypedDict
 
 from matplotlib import pyplot as plt
 import numpy as np
@@ -109,6 +109,17 @@ def interpFile(filename: str, sample_per: float) -> Rvec:
     return np.array(res)
 
 
+_DEFAULT_ROW_SIZE = 128
+
+
+class _InitData(TypedDict):
+    channel_response: Any  # ctypes array: c_double * N
+    row_size: int
+    num_aggressors: int
+    sample_interval: c_double
+    bit_time: c_double
+
+
 class AMIModelInitializer:
     """
     Class containing the initialization data for an instance of ``AMIModel``.
@@ -125,16 +136,6 @@ class AMIModelInitializer:
 
     # pylint: disable=too-few-public-methods,too-many-instance-attributes
 
-    ami_params = {"root_name": ""}
-
-    _init_data = {
-        "channel_response": (c_double * 128)(0.0, 1.0, 0.0),
-        "row_size": 128,
-        "num_aggressors": 0,
-        "sample_interval": c_double(25.0e-12),
-        "bit_time": c_double(0.1e-9),
-    }
-
     def __init__(self, ami_params: dict, info_params: Optional[dict] = None, **optional_args):
         """
         Constructor accepts a mandatory dictionary containing the AMI
@@ -176,25 +177,31 @@ class AMIModelInitializer:
             Default) 100e-12 (10 Gbits/s)
         """
 
-        self.ami_params = {"root_name": ""}
-        self.ami_params.update(ami_params)
+        self._init_data: _InitData = {
+            "channel_response": (c_double * _DEFAULT_ROW_SIZE)(0.0, 1.0, 0.0),
+            "row_size": _DEFAULT_ROW_SIZE,
+            "num_aggressors": 0,
+            "sample_interval": c_double(25.0e-12),
+            "bit_time": c_double(0.1e-9),
+        }
+        self.ami_params = {"root_name": "", **ami_params}
         self.info_params = info_params
 
         # Need to reverse sort, in order to catch ``sample_interval`` and ``row_size``,
         # before ``channel_response``, since ``channel_response`` depends upon ``sample_interval``,
         # when ``h`` is a file name, and overwrites ``row_size``, in any case.
-        keys = list(optional_args.keys())
+        keys: list[str] = list(optional_args.keys())
         keys.sort(reverse=True)
         if keys:
             for key in keys:
                 if key in self._init_data:
-                    self._init_data[key] = optional_args[key]
+                    self._init_data[key] = optional_args[key]  # type: ignore[literal-required]
 
     def __str__(self):
         return "\n\t".join([
             "AMIModelInitializer instance:",
             f"`ami_params`: {self.ami_params}",
-            f"`info_params`: {self._info_params}"])
+            f"`info_params`: {self.info_params}"])
 
     def _getChannelResponse(self):
         return list(map(float, self._init_data["channel_response"]))
@@ -336,26 +343,15 @@ class AMIModel:  # pylint: disable=too-many-instance-attributes
             self._amiClose(self._ami_mem_handle)
 
         # Set up the AMI_Init() arguments.
+        # channel_response must be fetched as a ctypes array; the public property returns a plain list.
         self._channel_response = (   # pylint: disable=attribute-defined-outside-init
-            init_object._init_data[  # pylint: disable=protected-access
-                "channel_response"
-            ]
+            init_object._init_data["channel_response"]  # pylint: disable=protected-access
         )
         self._initOut = cp.copy(self._channel_response)  # type: ignore  # pylint: disable=attribute-defined-outside-init
-        self._row_size = init_object._init_data[  # pylint: disable=protected-access,attribute-defined-outside-init
-            "row_size"
-        ]
-        self._num_aggressors = init_object._init_data[  # pylint: disable=protected-access,attribute-defined-outside-init
-            "num_aggressors"
-        ]
-        self._sample_interval = (    # pylint: disable=attribute-defined-outside-init
-            init_object._init_data[  # pylint: disable=protected-access
-                "sample_interval"
-            ]
-        )
-        self._bit_time = init_object._init_data[  # pylint: disable=protected-access,attribute-defined-outside-init
-            "bit_time"
-        ]
+        self._row_size = init_object.row_size  # pylint: disable=attribute-defined-outside-init
+        self._num_aggressors = init_object.num_aggressors  # pylint: disable=attribute-defined-outside-init
+        self._sample_interval = c_double(init_object.sample_interval)  # pylint: disable=attribute-defined-outside-init
+        self._bit_time = c_double(init_object.bit_time)  # pylint: disable=attribute-defined-outside-init
         self._info_params = init_object.info_params  # pylint: disable=attribute-defined-outside-init
 
         # Check GetWave() consistency if possible.
@@ -538,10 +534,10 @@ class AMIModel:  # pylint: disable=too-many-instance-attributes
         Returns:
             Dictionary containing the following keys
 
-                - "imp_resp_init": The model's impulse response, from its `AMI_Init()` function (V/sample).
-                - "out_resp_init": `imp_resp_init` convolved with the channel.
-                - "imp_resp_getw": The model's impulse response, from its `AMI_GetWave()` function (V/sample).
-                - "out_resp_getw": `imp_resp_getw` convolved with the channel.
+                - ``IMP_RESP_INIT``: The model's impulse response, from its `AMI_Init()` function (V/sample).
+                - ``OUT_RESP_INIT``: `imp_resp_init` convolved with the channel.
+                - ``IMP_RESP_GETW``: The model's impulse response, from its `AMI_GetWave()` function (V/sample).
+                - ``OUT_RESP_GETW``: `imp_resp_getw` convolved with the channel.
 
         Notes:
             1. If either set of keys (i.e. - "..._init" or "..._getw")
@@ -571,8 +567,8 @@ class AMIModel:  # pylint: disable=too-many-instance-attributes
                 ignore_bits = info_params["Ignore_Bits"].pvalue
 
         # Capture/convert instance variables.
-        chnl_imp = np.array(self.channel_response) * ts     # input (a.k.a. - "channel") impulse response (V/sample)
-        out_imp = np.array(self.initOut) * ts               # output impulse response (V/sample)
+        chnl_imp = np.array(self.channel_response[:self.row_size]) * ts   # input (a.k.a. - "channel") impulse response (V/sample)
+        out_imp = np.array(self.initOut[:self.row_size]) * ts             # output impulse response (V/sample)
 
         # Calculate some needed intermediate values.
         nspui = int(ui / ts)            # samps per UI

{pyibis_ami-9.0.0 → pyibis_ami-9.2.0}/src/pyibisami/ami/parser.py

@@ -367,7 +367,8 @@ integ = lexeme(regex(r"[-+]?[0-9]+"))
 nat = lexeme(regex(r"[0-9]+"))
 # tap_ix = (integ << whitespace).parsecmap(int2tap)  # Doesn't work!
 # tap_ix = integ.parsecmap(int2tap)  # Breaks parsing of node names that begin with a numeral!
-tap_ix = integ.parsecmap(int2tap) << whitespace
+# tap_ix = integ.parsecmap(int2tap) << whitespace  # This fails; I don't know why.
+tap_ix = lexeme(integ.parsecmap(int2tap))  # This works, as an alternative to the line above.
 symbol = lexeme(regex(r"[0-9a-zA-Z_][^\s()]*"))
 true = lexeme(string("True")).result(True)
 false = lexeme(string("False")).result(False)

{pyibis_ami-9.0.0 → pyibis_ami-9.2.0}/src/pyibisami/ibis/model.py

@@ -285,8 +285,13 @@ class Model(HasTraits):  # pylint: disable=too-many-instance-attributes
 
         self._exec32Wins, self._exec32Lins = [], []
         self._exec64Wins, self._exec64Lins = [], []
+        self._test_configs = {}
+        self._executables = []
         if "algorithmic_model" in subDict:
-            execs = subDict["algorithmic_model"]
+            algo_model_data = subDict["algorithmic_model"]
+            execs = algo_model_data.get("executables", [])
+            self._test_configs = algo_model_data.get("test_configs", {})
+            self._executables = execs
             exec64s, exec32s = partition(is64, execs)
             self._exec32Wins, self._exec32Lins = splitExecs(exec32s)
             self._exec64Wins, self._exec64Lins = splitExecs(exec64s)
@@ -402,3 +407,13 @@ class Model(HasTraits):  # pylint: disable=too-many-instance-attributes
             "32-bit": {"lin": self._exec32Lins, "win": self._exec32Wins},
             "64-bit": {"lin": self._exec64Lins, "win": self._exec64Wins}
         }
+
+    @property
+    def test_configs(self) -> dict:
+        "Named [AMI Test Configuration] blocks from the IBIS file."
+        return self._test_configs
+
+    @property
+    def executables(self) -> list:
+        "Raw ordered list of Executable entries from [Algorithmic Model], for executable_index lookup."
+        return self._executables

{pyibis_ami-9.0.0 → pyibis_ami-9.2.0}/src/pyibisami/ibis/parser.py

@@ -106,6 +106,8 @@ def rest_line() -> GenParser[str]:  # type: ignore
 skip_line: Parser = lexeme(rest_line).result("(Skipped.)")
 name_only: Parser = regex(r"[_a-zA-Z0-9/\.()#-]+")
 name: Parser = word(name_only)
+# Parameters must begin with a letter in column 1.
+param_name: Parser = word(regex(r"^[a-zA-Z]\w*", re.MULTILINE))
 symbol: Parser = lexeme(regex(r"[a-zA-Z_][^\s()\[\]]*"))
 true: Parser = lexeme(string("True")).result(True)
 false: Parser = lexeme(string("False")).result(False)
@@ -187,6 +189,31 @@ ex_line: Parser = (
 )
 
 
+@generate("[AMI Test Configuration] subparam")
+def ami_tc_param() -> GenParser[tuple[str, str]]:
+    "Parse a single [AMI Test Configuration] subparameter line."
+    pname = yield param_name
+    pval = yield rest_line
+    return (pname.lower(), pval.strip())
+
+
+@generate("[AMI Test Configuration]")
+def ami_test_config() -> GenParser[tuple[str, dict[str, str]]]:
+    "Parse [AMI Test Configuration] block (name + subparameters)."
+    cfg_name = yield rest_line
+    params = yield many(ami_tc_param)
+    return (cfg_name.strip(), dict(params))
+
+
+@generate("[Algorithmic Model]")
+def algo_model() -> GenParser[dict]:
+    "Parse [Algorithmic Model]: Executable lines then optional [AMI Test Configuration] blocks."
+    execs = yield many1(ex_line)
+    cfg_pairs = yield many(keyword("ami_test_configuration") >> ami_test_config)
+    yield keyword("end_algorithmic_model")
+    return {"executables": execs, "test_configs": dict(cfg_pairs)}
+
+
 def manyTrue(p: Parser) -> Parser:
     "Run a parser multiple times, filtering ``False`` results."
 
@@ -271,8 +298,7 @@ model_type = reduce(try_choice, model_type_parsers)
 @generate("IBIS parameter")
 def param() -> GenParser[tuple[str, Any]]:
     "Parse IBIS parameter."
-    # Parameters must begin with a letter in column 1.
-    pname = yield word(regex(r"^[a-zA-Z]\w*", re.MULTILINE))
+    pname = yield param_name
     if DEBUG:
         print(f"Parsing parameter {pname}...", end="", flush=True)
     match pname:  # Handle special cases.
@@ -370,7 +396,7 @@ Model_keywords: dict[str, Parser] = {
     "pulldown": many1(vi_line),
     "pullup": many1(vi_line),
     "ramp": ramp,
-    "algorithmic_model": many1(ex_line) << keyword("end_algorithmic_model"),
+    "algorithmic_model": algo_model,
     "voltage_range": typminmax,
     "temperature_range": typminmax,
     "gnd_clamp": many1(vi_line),