Skip to content

Commit 91f941b

Browse files
committed
[autorelease] Update to Yosys 0.49 and WASI SDK 0.25.
Also, enable the `write_json` pass.
1 parent 262690d commit 91f941b

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

.github/workflows/package.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
uses: actions/checkout@v4
1010
with:
1111
fetch-depth: 0
12-
submodules: true
12+
submodules: recursive
1313
- name: Set up Python
1414
uses: actions/setup-python@v5
1515
with:
@@ -42,10 +42,13 @@ jobs:
4242
pip install dist/amaranth_yosys-*.whl
4343
python -m amaranth_yosys --help
4444
python -m amaranth_yosys \
45-
-p "read_ilang tests/inverter.il" \
45+
-p "read_rtlil tests/inverter.il" \
4646
-p "proc -nomux" \
4747
-p "memory_collect" \
48-
-p "write_verilog"
48+
-p "write_rtlil" \
49+
-p "write_verilog" \
50+
-p "proc" \
51+
-p "write_json"
4952
- name: Print ccache statistics
5053
run: |
5154
ccache -s

build.sh

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
#!/bin/sh -ex
22

3-
WASI_SDK=wasi-sdk-19.0
4-
WASI_SDK_URL=https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-19/wasi-sdk-19.0-linux.tar.gz
3+
WASI_SDK=wasi-sdk-25.0-x86_64-linux
4+
WASI_SDK_URL=https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk-25.0-x86_64-linux.tar.gz
55
if ! [ -d ${WASI_SDK} ]; then curl -L ${WASI_SDK_URL} | tar xzf -; fi
66

77
# This script does a lot of really awful things to Yosys to make the WASM artifact smaller.
8-
# That's necessary to reduce the startup latency, since currently wasmtime-py does not cache
9-
# the compiled code.
8+
# This improves startup latency and reduces download size.
109

1110
cat >yosys-src/Makefile.conf <<END
1211
export PATH := $(pwd)/${WASI_SDK}/bin:${PATH}
@@ -62,6 +61,7 @@ YOSYS_VER_STR='Amaranth Yosys $(YOSYS_VER) '"(PyPI ver ${YOSYS_PYPI_VER}, git sh
6261
YOSYS_OBJS="\
6362
kernel/version_${YOSYS_GIT_REV}.cc \
6463
kernel/driver.o \
64+
kernel/json.o \
6565
kernel/register.o \
6666
kernel/rtlil.o \
6767
kernel/log.o \
@@ -70,12 +70,14 @@ kernel/mem.o \
7070
kernel/ff.o \
7171
kernel/fmt.o \
7272
kernel/scopeinfo.o \
73+
kernel/cellaigs.o \
7374
kernel/satgen.o \
7475
kernel/qcsat.o \
7576
kernel/yosys.o \
7677
libs/bigint/BigInteger.o \
7778
libs/bigint/BigUnsigned.o \
7879
libs/sha1/sha1.o \
80+
libs/json11/json11.o \
7981
libs/ezsat/ezsat.o \
8082
libs/ezsat/ezminisat.o \
8183
libs/minisat/Options.o \
@@ -138,6 +140,7 @@ passes/techmap/simplemap.o \
138140
backends/rtlil/rtlil_backend.o \
139141
backends/cxxrtl/cxxrtl_backend.o \
140142
backends/verilog/verilog_backend.o \
143+
backends/json/json.o \
141144
"
142145
make -C yosys-src GIT_REV="${YOSYS_GIT_REV}" YOSYS_VER_STR="${YOSYS_VER_STR}" OBJS="${YOSYS_OBJS}" PRETTY=0 CXX="ccache clang"
143146

yosys-src

Submodule yosys-src updated 630 files

0 commit comments

Comments
 (0)