siliconcompiler 0.28.9__py3-none-any.whl → 0.29.1__py3-none-any.whl

siliconcompiler/tools/yosys/syn_fpga.tcl

@@ -125,6 +125,30 @@ if { [string match {ice*} $sc_partname] } {
     yosys proc
     yosys flatten
 
+    # Note there are two possibilities for how macro mapping might be done:
+    # using the extract command (to pattern match user RTL against
+    # the techmap) or using the techmap command.  The latter is better
+    # for mapping simple multipliers; the former is better (for now)
+    # for mapping more complex DSP blocks (MAC, pipelined blocks, etc).
+    # and is also more easily extensible to arbitrary hard macros.
+    # Run separate passes of both to get best of both worlds
+
+    # An extract pass needs to happen prior to other optimizations,
+    # otherwise yosys can transform its internal model into something
+    # that doesn't match the patterns defined in the extract library
+    if { [sc_cfg_exists fpga $sc_partname file yosys_extractlib] } {
+        set sc_syn_extractlibs \
+            [sc_cfg_get fpga $sc_partname file yosys_extractlib]
+
+        foreach extractlib $sc_syn_extractlibs {
+            yosys log "Run extract with $extractlib"
+            yosys extract -map $extractlib
+        }
+    }
+
+    # Other hard macro passes can happen after the generic optimization
+    # passes take place.
+
     #Generic optimization passes; this is a fusion of the VTR reference
     #flow and the Yosys synth_ice40 flow
     yosys opt_expr
@@ -141,28 +165,12 @@ if { [string match {ice*} $sc_partname] } {
     yosys opt_expr
     yosys opt_clean
 
+    # Here is a remaining customization pass for DSP tech mapping
+
     #Map DSP blocks before doing anything else,
     #so that we don't convert any math blocks
     #into other primitives
 
-    # Note there are two possibilities for how mapping might be done:
-    # using the extract command (to pattern match user RTL against
-    # the techmap) or using the techmap command.  The latter is better
-    # for mapping simple multipliers; the former is better (for now)
-    # for mapping more complex DSP blocks (MAC, pipelined blocks, etc).
-    # and also more extensible to arbitrary hard macros.  Run separate
-    # passes of both to get best of both worlds
-
-    if { [sc_cfg_exists fpga $sc_partname file yosys_extractlib] } {
-        set sc_syn_extractlibs \
-            [sc_cfg_get fpga $sc_partname file yosys_extractlib]
-
-        foreach extractlib $sc_syn_extractlibs {
-            yosys log "Run extract with $extractlib"
-            yosys extract -map $extractlib
-        }
-    }
-
     if { [sc_cfg_exists fpga $sc_partname file yosys_dsp_techmap] } {
         set sc_syn_dsp_library \
             [sc_cfg_get fpga $sc_partname file yosys_dsp_techmap]
@@ -234,4 +242,3 @@ yosys echo on
 # Write Netlist
 ########################################################
 yosys write_blif "outputs/${sc_design}.blif"
-yosys write_json "outputs/${sc_design}.netlist.json"

siliconcompiler/toolscripts/_tools.json

@@ -1,7 +1,7 @@
 {
   "openroad": {
     "git-url": "https://github.com/The-OpenROAD-Project/OpenROAD.git",
-    "git-commit": "8300b5293dec4c0a0ef26cd2ba7ca6101714e155",
+    "git-commit": "1ed6a7edfda56bef82938573bf0fadc48bd8ff34",
     "docker-cmds": [
       "# Remove OR-Tools files",
       "RUN rm -f $SC_PREFIX/Makefile $SC_PREFIX/README.md",
@@ -36,7 +36,7 @@
     "auto-update": false
   },
   "klayout": {
-    "version": "0.29.8",
+    "version": "0.29.10",
     "git-url": "https://github.com/KLayout/klayout.git",
     "docker-skip": true,
     "auto-update": true,
@@ -45,12 +45,12 @@
   },
   "sv2v": {
     "git-url": "https://github.com/zachjs/sv2v.git",
-    "git-commit": "7808819c48c167978aeb5ef34c6e5ed416e90875",
+    "git-commit": "aa0a885699ca8f4fc1d07ef34fb041c6f37b1ba3",
     "auto-update": true
   },
   "verilator": {
     "git-url": "https://github.com/verilator/verilator.git",
-    "git-commit": "563faeb33f3b9b5374f558f54adfea11873f1cd7",
+    "git-commit": "v5.030",
     "auto-update": true
   },
   "bambu": {
@@ -91,7 +91,7 @@
   },
   "yosys": {
     "git-url": "https://github.com/YosysHQ/yosys.git",
-    "git-commit": "0.47",
+    "git-commit": "v0.48",
     "version-prefix": "",
     "auto-update": true
   },

siliconcompiler/utils/__init__.py

@@ -333,7 +333,7 @@ def _resolve_env_vars(chip, filepath):
     # variables that don't exist in environment get ignored by `expandvars`,
     # but we can do our own error checking to ensure this doesn't result in
     # silent bugs
-    envvars = re.findall(r'\$(\w+)', resolved_path)
+    envvars = re.findall(r'\$\{?(\w+)\}?', resolved_path)
     for var in envvars:
         chip.logger.warning(f'Variable {var} in {filepath} not defined in environment')
 
@@ -401,7 +401,7 @@ def find_sc_file(chip, filename, missing_ok=False, search_paths=None):
     return result
 
 
-def get_plugins(system):
+def get_plugins(system, name=None):
     '''
     Search for python modules with a specific function
     '''
@@ -409,7 +409,11 @@ def get_plugins(system):
     plugins = []
     discovered_plugins = entry_points(group=f'siliconcompiler.{system}')
     for plugin in discovered_plugins:
-        plugins.append(plugin.load())
+        if name:
+            if plugin.name == name:
+                plugins.append(plugin.load())
+        else:
+            plugins.append(plugin.load())
 
     return plugins
 

{siliconcompiler-0.28.9.dist-info → siliconcompiler-0.29.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: siliconcompiler
-Version: 0.28.9
+Version: 0.29.1
 Summary: A compiler framework that automates translation from source code to silicon.
 Author-email: Andreas Olofsson <andreas.d.olofsson@gmail.com>
 License: Apache License 2.0
@@ -26,54 +26,59 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp==3.10.11; python_version <= "3.8"
-Requires-Dist: aiohttp==3.11.2; python_version >= "3.9"
+Requires-Dist: aiohttp==3.11.11; python_version >= "3.9"
 Requires-Dist: requests==2.32.3
 Requires-Dist: PyYAML==6.0.2
 Requires-Dist: pandas>=1.1.5
 Requires-Dist: Jinja2>=2.11.3
 Requires-Dist: graphviz==0.20.3
 Requires-Dist: distro==1.9.0
-Requires-Dist: packaging<24,>=21.3
+Requires-Dist: packaging<25,>=21.3
 Requires-Dist: psutil>=5.8.0
 Requires-Dist: Pillow==10.4.0; python_version <= "3.8"
-Requires-Dist: Pillow==11.0.0; python_version >= "3.9"
-Requires-Dist: GitPython==3.1.43
-Requires-Dist: lambdapdk>=0.1.38
+Requires-Dist: Pillow==11.1.0; python_version >= "3.9"
+Requires-Dist: GitPython==3.1.44
+Requires-Dist: lambdapdk>=0.1.44
 Requires-Dist: PyGithub==2.5.0
 Requires-Dist: urllib3>=1.26.0
 Requires-Dist: fasteners==0.19
-Requires-Dist: fastjsonschema==2.20.0
+Requires-Dist: fastjsonschema==2.21.1
 Requires-Dist: docker==7.1.0
 Requires-Dist: importlib_metadata; python_version < "3.10"
 Requires-Dist: sc-surelog==1.84.1
-Requires-Dist: orjson==3.10.11
-Requires-Dist: streamlit==1.40.1; python_full_version != "3.9.7"
+Requires-Dist: orjson==3.10.13
+Requires-Dist: streamlit==1.40.1; python_version <= "3.8"
+Requires-Dist: streamlit==1.41.1; python_version >= "3.9" and python_full_version != "3.9.7"
 Requires-Dist: streamlit_agraph==0.0.45; python_full_version != "3.9.7"
 Requires-Dist: streamlit-antd-components==0.3.2; python_full_version != "3.9.7"
 Requires-Dist: streamlit_javascript==0.1.5; python_full_version != "3.9.7"
 Requires-Dist: streamlit-autorefresh==1.0.1; python_full_version != "3.9.7"
 Provides-Extra: test
-Requires-Dist: pytest==8.3.3; extra == "test"
+Requires-Dist: pytest==8.3.4; extra == "test"
 Requires-Dist: pytest-xdist==3.6.1; extra == "test"
 Requires-Dist: pytest-timeout==2.3.1; extra == "test"
-Requires-Dist: pytest-asyncio==0.24.0; extra == "test"
+Requires-Dist: pytest-asyncio==0.24.0; python_version <= "3.8" and extra == "test"
+Requires-Dist: pytest-asyncio==0.25.1; python_version >= "3.9" and extra == "test"
 Requires-Dist: pytest-cov==5.0.0; python_version <= "3.8" and extra == "test"
 Requires-Dist: pytest-cov==6.0.0; python_version >= "3.9" and extra == "test"
 Requires-Dist: responses==0.25.3; extra == "test"
 Requires-Dist: PyVirtualDisplay==3.0; extra == "test"
-Requires-Dist: flake8==7.1.1; extra == "test"
-Requires-Dist: tclint==0.4.2; extra == "test"
-Requires-Dist: codespell==2.3.0; extra == "test"
+Provides-Extra: lint
+Requires-Dist: flake8==7.1.1; extra == "lint"
+Requires-Dist: tclint==0.5.0; extra == "lint"
+Requires-Dist: codespell==2.3.0; extra == "lint"
 Provides-Extra: docs
 Requires-Dist: Sphinx==8.1.3; extra == "docs"
 Requires-Dist: pip-licenses==5.0.0; extra == "docs"
-Requires-Dist: pydata-sphinx-theme==0.16.0; extra == "docs"
+Requires-Dist: pydata-sphinx-theme==0.16.1; extra == "docs"
 Requires-Dist: sc-leflib>=0.2.0; extra == "docs"
 Provides-Extra: profile
 Requires-Dist: gprof2dot==2024.6.6; extra == "profile"
 Provides-Extra: examples
 Requires-Dist: migen==0.9.2; extra == "examples"
-Requires-Dist: lambdalib==0.3.1; extra == "examples"
+Requires-Dist: lambdalib==0.3.2; extra == "examples"
+Provides-Extra: optimizer
+Requires-Dist: google-vizier[jax]==0.1.20; python_version >= "3.10" and extra == "optimizer"
 
 ![SiliconCompiler](https://raw.githubusercontent.com/siliconcompiler/siliconcompiler/main/docs/_static/sc_logo_with_text.png)