Skip to content

Commit 62558e9

Browse files
eder-matheuseder-matheus
authored
Merge branch 'YosysHQ:main' into master
2 parents b9277f5 + 05d1d56 commit 62558e9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1700
-442
lines changed

‎.github/actions/setup-build-env/action.yml‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ runs:
4242
if: runner.os == 'Linux' && inputs.get-build-deps == 'true'
4343
uses: awalsh128/cache-apt-pkgs-action@v1.6.0
4444
with:
45-
packages: bison clang flex libffi-dev libfl-dev libreadline-dev pkg-config tcl-dev zlib1g-dev
45+
packages: bison clang flex libffi-dev libfl-dev libreadline-dev pkg-config tcl-dev zlib1g-dev libgtest-dev
4646
version: ${{ inputs.runs-on }}-buildys
4747

4848
- name: Linux docs dependencies
@@ -52,15 +52,6 @@ runs:
5252
packages: graphviz xdot
5353
version: ${{ inputs.runs-on }}-docsys
5454

55-
# if updating test dependencies, make sure to update
56-
# docs/source/yosys_internals/extending_yosys/test_suites.rst to match.
57-
- name: Linux test dependencies
58-
if: runner.os == 'Linux' && inputs.get-test-deps == 'true'
59-
uses: awalsh128/cache-apt-pkgs-action@v1.6.0
60-
with:
61-
packages: libgtest-dev
62-
version: ${{ inputs.runs-on }}-testys
63-
6455
- name: Install macOS Dependencies
6556
if: runner.os == 'macOS'
6657
shell: bash

‎.github/workflows/extra-builds.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ jobs:
103103
ENABLE_ZLIB := 0
104104
105105
CXXFLAGS += -I$(pwd)/flex-prefix/include
106+
LINKFLAGS += -Wl,-z,stack-size=8388608 -Wl,--stack-first -Wl,--strip-all
106107
END
107108
108109
make -C build -f ../Makefile CXX=clang -j$(nproc)

‎.github/workflows/test-build.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ jobs:
7272
cd build
7373
make -f ../Makefile config-$CC
7474
make -f ../Makefile -j$procs
75+
make -f ../Makefile unit-test -j$procs
7576
7677
- name: Log yosys-config output
7778
run: |
@@ -81,7 +82,7 @@ jobs:
8182
shell: bash
8283
run: |
8384
cd build
84-
tar -cvf ../build.tar share/ yosys yosys-*
85+
tar -cvf ../build.tar share/ yosys yosys-* libyosys.so
8586
8687
- name: Store build artifact
8788
uses: actions/upload-artifact@v4
@@ -131,7 +132,7 @@ jobs:
131132
- name: Run tests
132133
shell: bash
133134
run: |
134-
make -j$procs test TARGETS= EXTRA_TARGETS= CONFIG=$CC
135+
make -j$procs vanilla-test TARGETS= EXTRA_TARGETS= CONFIG=$CC
135136
136137
- name: Report errors
137138
if: ${{ failure() }}

‎.github/workflows/test-sanitizers.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,11 @@ jobs:
6565
- name: Run tests
6666
shell: bash
6767
run: |
68-
make -j$procs test TARGETS= EXTRA_TARGETS=
68+
make -j$procs vanilla-test TARGETS= EXTRA_TARGETS=
6969
7070
- name: Report errors
7171
if: ${{ failure() }}
7272
shell: bash
7373
run: |
7474
find tests/**/*.err -print -exec cat {} \;
7575
76-
- name: Run unit tests
77-
shell: bash
78-
run: |
79-
make -j$procs unit-test ENABLE_LIBYOSYS=1

‎.github/workflows/test-verific-cfg.yml‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
name: Build various Verific configurations
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
test-verific-cfg:
8+
if: github.repository_owner == 'YosysHQ'
9+
runs-on: [self-hosted, linux, x64, fast]
10+
steps:
11+
- name: Checkout Yosys
12+
uses: actions/checkout@v4
13+
with:
14+
persist-credentials: false
15+
submodules: true
16+
- name: Runtime environment
17+
run: |
18+
echo "procs=$(nproc)" >> $GITHUB_ENV
19+
20+
- name: verific [SV]
21+
run: |
22+
make config-clang
23+
echo "ENABLE_VERIFIC := 1" >> Makefile.conf
24+
echo "ENABLE_VERIFIC_SYSTEMVERILOG := 1" >> Makefile.conf
25+
echo "ENABLE_VERIFIC_VHDL := 0" >> Makefile.conf
26+
echo "ENABLE_VERIFIC_HIER_TREE := 0" >> Makefile.conf
27+
echo "ENABLE_VERIFIC_EDIF := 0" >> Makefile.conf
28+
echo "ENABLE_VERIFIC_LIBERTY := 0" >> Makefile.conf
29+
echo "ENABLE_VERIFIC_YOSYSHQ_EXTENSIONS := 0" >> Makefile.conf
30+
echo "ENABLE_CCACHE := 1" >> Makefile.conf
31+
make -j$procs
32+
33+
- name: verific [VHDL]
34+
run: |
35+
make config-clang
36+
echo "ENABLE_VERIFIC := 1" >> Makefile.conf
37+
echo "ENABLE_VERIFIC_SYSTEMVERILOG := 0" >> Makefile.conf
38+
echo "ENABLE_VERIFIC_VHDL := 1" >> Makefile.conf
39+
echo "ENABLE_VERIFIC_HIER_TREE := 0" >> Makefile.conf
40+
echo "ENABLE_VERIFIC_EDIF := 0" >> Makefile.conf
41+
echo "ENABLE_VERIFIC_LIBERTY := 0" >> Makefile.conf
42+
echo "ENABLE_VERIFIC_YOSYSHQ_EXTENSIONS := 0" >> Makefile.conf
43+
echo "ENABLE_CCACHE := 1" >> Makefile.conf
44+
make -j$procs
45+
46+
- name: verific [SV + VHDL]
47+
run: |
48+
make config-clang
49+
echo "ENABLE_VERIFIC := 1" >> Makefile.conf
50+
echo "ENABLE_VERIFIC_SYSTEMVERILOG := 1" >> Makefile.conf
51+
echo "ENABLE_VERIFIC_VHDL := 1" >> Makefile.conf
52+
echo "ENABLE_VERIFIC_HIER_TREE := 0" >> Makefile.conf
53+
echo "ENABLE_VERIFIC_EDIF := 0" >> Makefile.conf
54+
echo "ENABLE_VERIFIC_LIBERTY := 0" >> Makefile.conf
55+
echo "ENABLE_VERIFIC_YOSYSHQ_EXTENSIONS := 0" >> Makefile.conf
56+
echo "ENABLE_CCACHE := 1" >> Makefile.conf
57+
make -j$procs
58+
59+
- name: verific [SV + HIER]
60+
run: |
61+
make config-clang
62+
echo "ENABLE_VERIFIC := 1" >> Makefile.conf
63+
echo "ENABLE_VERIFIC_SYSTEMVERILOG := 1" >> Makefile.conf
64+
echo "ENABLE_VERIFIC_VHDL := 0" >> Makefile.conf
65+
echo "ENABLE_VERIFIC_HIER_TREE := 1" >> Makefile.conf
66+
echo "ENABLE_VERIFIC_EDIF := 0" >> Makefile.conf
67+
echo "ENABLE_VERIFIC_LIBERTY := 0" >> Makefile.conf
68+
echo "ENABLE_VERIFIC_YOSYSHQ_EXTENSIONS := 0" >> Makefile.conf
69+
echo "ENABLE_CCACHE := 1" >> Makefile.conf
70+
make -j$procs
71+
72+
- name: verific [VHDL + HIER]
73+
run: |
74+
make config-clang
75+
echo "ENABLE_VERIFIC := 1" >> Makefile.conf
76+
echo "ENABLE_VERIFIC_SYSTEMVERILOG := 0" >> Makefile.conf
77+
echo "ENABLE_VERIFIC_VHDL := 1" >> Makefile.conf
78+
echo "ENABLE_VERIFIC_HIER_TREE := 1" >> Makefile.conf
79+
echo "ENABLE_VERIFIC_EDIF := 0" >> Makefile.conf
80+
echo "ENABLE_VERIFIC_LIBERTY := 0" >> Makefile.conf
81+
echo "ENABLE_VERIFIC_YOSYSHQ_EXTENSIONS := 0" >> Makefile.conf
82+
echo "ENABLE_CCACHE := 1" >> Makefile.conf
83+
make -j$procs
84+
85+
- name: verific [SV + VHDL + HIER]
86+
run: |
87+
make config-clang
88+
echo "ENABLE_VERIFIC := 1" >> Makefile.conf
89+
echo "ENABLE_VERIFIC_SYSTEMVERILOG := 1" >> Makefile.conf
90+
echo "ENABLE_VERIFIC_VHDL := 1" >> Makefile.conf
91+
echo "ENABLE_VERIFIC_HIER_TREE := 1" >> Makefile.conf
92+
echo "ENABLE_VERIFIC_EDIF := 0" >> Makefile.conf
93+
echo "ENABLE_VERIFIC_LIBERTY := 0" >> Makefile.conf
94+
echo "ENABLE_VERIFIC_YOSYSHQ_EXTENSIONS := 0" >> Makefile.conf
95+
echo "ENABLE_CCACHE := 1" >> Makefile.conf
96+
make -j$procs
97+
98+
- name: verific [SV + VHDL + HIER + EDIF + LIBERTY]
99+
run: |
100+
make config-clang
101+
echo "ENABLE_VERIFIC := 1" >> Makefile.conf
102+
echo "ENABLE_VERIFIC_SYSTEMVERILOG := 1" >> Makefile.conf
103+
echo "ENABLE_VERIFIC_VHDL := 1" >> Makefile.conf
104+
echo "ENABLE_VERIFIC_HIER_TREE := 1" >> Makefile.conf
105+
echo "ENABLE_VERIFIC_EDIF := 1" >> Makefile.conf
106+
echo "ENABLE_VERIFIC_LIBERTY := 1" >> Makefile.conf
107+
echo "ENABLE_VERIFIC_YOSYSHQ_EXTENSIONS := 0" >> Makefile.conf
108+
echo "ENABLE_CCACHE := 1" >> Makefile.conf
109+
make -j$procs

‎.github/workflows/test-verific.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
6969
- name: Run Yosys tests
7070
run: |
71-
make -j$procs test
71+
make -j$procs vanilla-test
7272
7373
- name: Run Verific specific Yosys tests
7474
run: |
@@ -80,11 +80,6 @@ jobs:
8080
run: |
8181
make -C sby run_ci
8282
83-
- name: Run unit tests
84-
shell: bash
85-
run: |
86-
make -j$procs unit-test ENABLE_LTO=1 ENABLE_LIBYOSYS=1
87-
8883
test-pyosys:
8984
needs: pre-job
9085
if: ${{ needs.pre-job.outputs.should_skip != 'true' && github.repository == 'YosysHQ/Yosys' }}

‎.github/workflows/update-flake-lock.yml‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎.github/workflows/version.yml‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎CHANGELOG‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,24 @@
22
List of major changes and improvements between releases
33
=======================================================
44

5-
Yosys 0.62 .. Yosys 0.63-dev
5+
Yosys 0.63 .. Yosys 0.64-dev
66
--------------------------
77

8+
Yosys 0.62 .. Yosys 0.63
9+
--------------------------
10+
* Various
11+
- Added DSP inference for Gowin GW1N and GW2A.
12+
- Added support for subtract in preadder for Xilinx arch.
13+
- Added infrastructure to run a sat solver as a command.
14+
15+
* New commands and options
16+
- Added "-ignore-unknown-cells" option to "equiv_induct"
17+
and "equiv_simple" pass.
18+
- Added "-force-params" option to "memory_libmap" pass.
19+
- Added "-select-solver" option to "sat" pass.
20+
- Added "-default_params" option to "write_verilog" pass.
21+
- Added "-nodsp" option to "synth_gowin" pass.
22+
823
Yosys 0.61 .. Yosys 0.62
924
--------------------------
1025
* Various

‎Dockerfile‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)