siliconcompiler 0.29.0__py3-none-any.whl → 0.29.2__py3-none-any.whl

siliconcompiler/tools/yosys/syn_asic.tcl

@@ -92,8 +92,6 @@ if { [sc_cfg_tool_task_exists {file} synthesis_libraries_macros] } {
 }
 set sc_mainlib [lindex $sc_logiclibs 0]
 
-set sc_dff_library \
-    [lindex [sc_cfg_tool_task_get {file} dff_liberty_file] 0]
 set sc_abc_constraints \
     [lindex [sc_cfg_tool_task_get {file} abc_constraint_file] 0]
 
@@ -265,6 +263,10 @@ yosys synth {*}$synth_args -top $sc_design -run fine:check
 # Some place and route tools cannot handle these in the output Verilog,
 # so remove them here.
 yosys delete {*/t:$print}
+yosys chformal -remove
+
+# Recheck hierarchy to remove all unused modules
+yosys hierarchy -top $sc_design
 
 yosys opt -purge
 
@@ -305,14 +307,36 @@ if { [sc_cfg_tool_task_get var autoname] == "true" } {
     yosys rename -wire
 }
 
+if { [lindex [sc_cfg_tool_task_get var map_clockgates] 0] == "true" } {
+    set clockgate_dont_use []
+    foreach lib "$sc_logiclibs $sc_macrolibs" {
+        foreach cell [sc_cfg_get library $lib asic cells dontuse] {
+            lappend clockgate_dont_use -dont_use $cell
+        }
+    }
+    set clockgate_liberty []
+    foreach lib_file "$sc_libraries $sc_macro_libraries" {
+        lappend clockgate_dont_use "-liberty" $lib_file
+    }
+
+    yosys clockgate \
+        {*}$clockgate_dont_use \
+        {*}$clockgate_liberty \
+        -min_net_size [lindex [sc_cfg_tool_task_get var min_clockgate_fanout] 0]
+}
+
 set dfflibmap_dont_use []
 foreach lib "$sc_logiclibs $sc_macrolibs" {
     foreach cell [sc_cfg_get library $lib asic cells dontuse] {
         lappend dfflibmap_dont_use -dont_use $cell
     }
 }
+set dfflibmap_liberty []
+foreach lib_file "$sc_libraries $sc_macro_libraries" {
+    lappend dfflibmap_liberty "-liberty" $lib_file
+}
 
-yosys dfflibmap {*}$dfflibmap_dont_use -liberty $sc_dff_library
+yosys dfflibmap {*}$dfflibmap_dont_use {*}$dfflibmap_liberty
 
 # perform final techmap and opt in case previous techmaps introduced constructs that need
 # techmapping
@@ -358,8 +382,10 @@ foreach lib_file $sc_libraries {
 }
 set abc_dont_use []
 foreach lib "$sc_logiclibs $sc_macrolibs" {
-    foreach cell [sc_cfg_get library $lib asic cells dontuse] {
-        lappend abc_dont_use -dont_use $cell
+    foreach group "dontuse hold clkbuf clkgate clklogic" {
+        foreach cell [sc_cfg_get library $lib asic cells $group] {
+            lappend abc_dont_use -dont_use $cell
+        }
     }
 }
 
@@ -397,7 +423,6 @@ if {
 yosys clean -purge
 
 set stat_libs []
-lappend stat_libs "-liberty" $sc_dff_library
 foreach lib_file "$sc_libraries $sc_macro_libraries" {
     lappend stat_libs "-liberty" $lib_file
 }

siliconcompiler/tools/yosys/syn_fpga.py

@@ -1,14 +1,14 @@
-from siliconcompiler.tools.yosys.yosys import syn_setup, syn_post_process
+from siliconcompiler.tools.yosys import syn_setup, syn_post_process
 import json
 from siliconcompiler import sc_open
 from siliconcompiler.tools._common import get_tool_task, record_metric
-from siliconcompiler.targets import fpgaflow_demo
 
 
 ######################################################################
 # Make Docs
 ######################################################################
 def make_docs(chip):
+    from siliconcompiler.targets import fpgaflow_demo
     chip.set('fpga', 'partname', 'ice40up5k-sg48')
     chip.use(fpgaflow_demo)
 
@@ -93,7 +93,6 @@ def setup_fpga(chip):
                  ",".join(['fpga', part_name, 'file', 'yosys_memory_techmap']),
                  step=step, index=index)
 
-    chip.add('tool', tool, 'task', task, 'output', design + '.netlist.json', step=step, index=index)
     chip.add('tool', tool, 'task', task, 'output', design + '.blif', step=step, index=index)
 
 

siliconcompiler/tools/yosys/syn_fpga.tcl

@@ -242,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": "8495fc80c78f4ab98bebd8cf2050fa63bc0b93c1",
+    "git-commit": "beba944a7c9eaface2ae88040ac721272b22e9d3",
     "docker-cmds": [
       "# Remove OR-Tools files",
       "RUN rm -f $SC_PREFIX/Makefile $SC_PREFIX/README.md",
@@ -45,12 +45,12 @@
   },
   "sv2v": {
     "git-url": "https://github.com/zachjs/sv2v.git",
-    "git-commit": "5a636724d783edd403ac4618d6cc4def72e39cbc",
+    "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": {
@@ -131,5 +131,10 @@
     "git-commit": "v7.0",
     "git-url": "https://github.com/MikePopoloski/slang.git",
     "auto-update": true
+  },
+  "gtkwave": {
+    "git-commit": "v3.3.116",
+    "git-url": "https://github.com/gtkwave/gtkwave.git",
+    "auto-update": false
   }
 }

siliconcompiler/toolscripts/rhel9/install-gtkwave.sh

@@ -0,0 +1,40 @@
+#!/bin/sh
+
+set -e
+
+# Get directory of script
+src_path=$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)/..
+
+sudo yum group install -y "Development Tools"
+sudo yum install -y gtk3-devel \
+    bzip2-devel xz-devel tcl-devel tk-devel
+sudo dnf config-manager --set-enabled devel || true
+sudo yum install -y Judy-devel
+sudo dnf config-manager --set-disabled devel || true
+
+mkdir -p deps
+cd deps
+
+args=
+if [ ! -z ${PREFIX} ]; then
+    args=--prefix="$PREFIX"
+fi
+
+wget http://ftp.gnu.org/pub/gnu/gperf/gperf-3.1.tar.gz
+tar xvf gperf-3.1.tar.gz
+cd gperf-3.1
+./configure $args
+make -j$(nproc)
+sudo make install
+cd ..
+
+git clone $(python3 ${src_path}/_tools.py --tool gtkwave --field git-url) gtkwave
+cd gtkwave
+git checkout $(python3 ${src_path}/_tools.py --tool gtkwave --field git-commit)
+
+cd gtkwave3-gtk3
+
+./autogen.sh
+./configure --enable-gtk3 $args
+make -j$(nproc)
+sudo make install

siliconcompiler/toolscripts/ubuntu20/install-gtkwave.sh

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -e
+
+# Get directory of script
+src_path=$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)/..
+
+sudo apt-get install -y build-essential gperf libgtk-3-dev \
+    libbz2-dev libjudy-dev liblzma-dev tcl-dev tk-dev
+
+mkdir -p deps
+cd deps
+
+git clone $(python3 ${src_path}/_tools.py --tool gtkwave --field git-url) gtkwave
+cd gtkwave
+git checkout $(python3 ${src_path}/_tools.py --tool gtkwave --field git-commit)
+
+args=
+if [ ! -z ${PREFIX} ]; then
+    args=--prefix="$PREFIX"
+fi
+
+cd gtkwave3-gtk3
+
+./autogen.sh
+./configure --enable-gtk3 $args
+make -j$(nproc)
+sudo make install

siliconcompiler/toolscripts/ubuntu22/install-gtkwave.sh

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -e
+
+# Get directory of script
+src_path=$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)/..
+
+sudo apt-get install -y build-essential gperf libgtk-3-dev \
+    libbz2-dev libjudy-dev liblzma-dev tcl-dev tk-dev
+
+mkdir -p deps
+cd deps
+
+git clone $(python3 ${src_path}/_tools.py --tool gtkwave --field git-url) gtkwave
+cd gtkwave
+git checkout $(python3 ${src_path}/_tools.py --tool gtkwave --field git-commit)
+
+args=
+if [ ! -z ${PREFIX} ]; then
+    args=--prefix="$PREFIX"
+fi
+
+cd gtkwave3-gtk3
+
+./autogen.sh
+./configure --enable-gtk3 $args
+make -j$(nproc)
+sudo make install

siliconcompiler/toolscripts/ubuntu24/install-gtkwave.sh

@@ -0,0 +1,29 @@
+#!/bin/sh
+
+set -e
+
+# Get directory of script
+src_path=$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)/..
+
+sudo apt-get install -y build-essential gperf libgtk-3-dev \
+    libbz2-dev libjudy-dev liblzma-dev tcl-dev tk-dev autotools-dev \
+    automake
+
+mkdir -p deps
+cd deps
+
+git clone $(python3 ${src_path}/_tools.py --tool gtkwave --field git-url) gtkwave
+cd gtkwave
+git checkout $(python3 ${src_path}/_tools.py --tool gtkwave --field git-commit)
+
+args=
+if [ ! -z ${PREFIX} ]; then
+    args=--prefix="$PREFIX"
+fi
+
+cd gtkwave3-gtk3
+
+./autogen.sh
+./configure --enable-gtk3 $args
+make -j$(nproc)
+sudo make install

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/utils/showtools.py

@@ -5,6 +5,7 @@ from siliconcompiler.tools.openroad import screenshot as openroad_screenshot
 from siliconcompiler.tools.vpr import show as vpr_show
 from siliconcompiler.tools.vpr import screenshot as vpr_screenshot
 from siliconcompiler.tools.yosys import screenshot as yosys_screenshot
+from siliconcompiler.tools.gtkwave import show as gtkwave_show
 
 
 def setup(chip):
@@ -29,3 +30,5 @@ def setup(chip):
 
     chip.register_showtool('v', yosys_screenshot)
     chip.register_showtool('vg', yosys_screenshot)
+
+    chip.register_showtool('vcd', gtkwave_show)

{siliconcompiler-0.29.0.dist-info → siliconcompiler-0.29.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: siliconcompiler
-Version: 0.29.0
+Version: 0.29.2
 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,7 +26,7 @@ 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.10; 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
@@ -36,9 +36,9 @@ Requires-Dist: distro==1.9.0
 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.40
+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
@@ -46,9 +46,9 @@ 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.12
+Requires-Dist: orjson==3.10.14
 Requires-Dist: streamlit==1.40.1; python_version <= "3.8"
-Requires-Dist: streamlit==1.40.2; python_version >= "3.9" and python_full_version != "3.9.7"
+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"
@@ -57,10 +57,11 @@ Provides-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.2; 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: responses==0.25.5; extra == "test"
 Requires-Dist: PyVirtualDisplay==3.0; extra == "test"
 Provides-Extra: lint
 Requires-Dist: flake8==7.1.1; extra == "lint"
@@ -69,13 +70,15 @@ 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.2; extra == "examples"
+Provides-Extra: optimizer
+Requires-Dist: google-vizier[jax]==0.1.21; python_version >= "3.10" and extra == "optimizer"
 
 ![SiliconCompiler](https://raw.githubusercontent.com/siliconcompiler/siliconcompiler/main/docs/_static/sc_logo_with_text.png)