Skip to content

Commit 9ba7dc8

Browse files
committed
revert: yosys version to match other fork
1 parent 7efe078 commit 9ba7dc8

File tree

381 files changed

+3153
-43861
lines changed

Some content is hidden

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

381 files changed

+3153
-43861
lines changed

yosys/.gitcommit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
543faed9c8c
1+
$Format:%h$

yosys/.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
run: sudo apt-get install bison flex libreadline-dev tcl-dev libffi-dev
1515

1616
- name: Checkout repository
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v3
1818

1919
- name: Initialize CodeQL
20-
uses: github/codeql-action/init@v3
20+
uses: github/codeql-action/init@v2
2121
with:
2222
languages: cpp
2323
queries: security-extended,security-and-quality
@@ -26,4 +26,4 @@ jobs:
2626
run: make yosys -j6
2727

2828
- name: Perform CodeQL Analysis
29-
uses: github/codeql-action/analyze@v3
29+
uses: github/codeql-action/analyze@v2

yosys/.github/workflows/emcc.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ jobs:
66
emcc:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: mymindstorm/setup-emsdk@v14
10-
- uses: actions/checkout@v4
9+
- uses: mymindstorm/setup-emsdk@v11
10+
- uses: actions/checkout@v3
1111
- name: Build
1212
run: |
1313
make config-emcc
1414
make YOSYS_VER=latest
15-
- uses: actions/upload-artifact@v4
15+
- uses: actions/upload-artifact@v3
1616
with:
1717
name: yosysjs
1818
path: yosysjs-latest.zip

yosys/.github/workflows/test-linux.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ jobs:
4343
sudo apt-get install $CC $CXX
4444
echo "CC=$CC" >> $GITHUB_ENV
4545
echo "CXX=$CXX" >> $GITHUB_ENV
46-
echo "CXXFLAGS=-Wp,-D_GLIBCXX_ASSERTIONS" >> $GITHUB_ENV
4746
env:
4847
CC: ${{ matrix.compiler }}
4948

@@ -79,22 +78,19 @@ jobs:
7978
$CXX --version
8079
8180
- name: Checkout Yosys
82-
uses: actions/checkout@v4
81+
uses: actions/checkout@v3
8382

8483
- name: Get iverilog
8584
shell: bash
8685
run: |
8786
git clone https://github.com/steveicarus/iverilog.git
88-
cd iverilog
89-
git checkout 192b6aec96fde982e6ddcb28b346d5893aa8e874
90-
echo "IVERILOG_GIT=$(git rev-parse HEAD)" >> $GITHUB_ENV
9187
9288
- name: Cache iverilog
9389
id: cache-iverilog
94-
uses: actions/cache@v4
90+
uses: actions/cache@v3
9591
with:
9692
path: .local/
97-
key: ${{ matrix.os.id }}-${{ env.IVERILOG_GIT }}
93+
key: ${{ matrix.os.id }}-${{ hashFiles('iverilog/.git/refs/heads/master') }}
9894

9995
- name: Build iverilog
10096
if: steps.cache-iverilog.outputs.cache-hit != 'true'
@@ -111,14 +107,10 @@ jobs:
111107
shell: bash
112108
run: |
113109
make config-${CC%%-*}
114-
make -j${{ env.procs }} CXXSTD=${{ matrix.cpp_std }} CC=$CC CXX=$CC LD=$CC
110+
make -j${{ env.procs }} CCXXSTD=${{ matrix.cpp_std }} CC=$CC CXX=$CC LD=$CC
115111
116112
- name: Run tests
117113
if: (matrix.cpp_std == 'c++11') && (matrix.compiler == 'gcc-11')
118114
shell: bash
119115
run: |
120116
make -j${{ env.procs }} test CXXSTD=${{ matrix.cpp_std }} CC=$CC CXX=$CC LD=$CC
121-
122-
- name: Log yosys-config output
123-
run: |
124-
./yosys-config || true

yosys/.github/workflows/test-macos.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
matrix:
1010
os:
11-
- { id: macos-13, name: 'Ventura' }
11+
- { id: macos-11, name: 'Big Sur' }
1212
cpp_std:
1313
- 'c++11'
1414
- 'c++17'
@@ -35,22 +35,19 @@ jobs:
3535
cc --version
3636
3737
- name: Checkout Yosys
38-
uses: actions/checkout@v4
38+
uses: actions/checkout@v3
3939

4040
- name: Get iverilog
4141
shell: bash
4242
run: |
4343
git clone https://github.com/steveicarus/iverilog.git
44-
cd iverilog
45-
git checkout 192b6aec96fde982e6ddcb28b346d5893aa8e874
46-
echo "IVERILOG_GIT=$(git rev-parse HEAD)" >> $GITHUB_ENV
4744
4845
- name: Cache iverilog
4946
id: cache-iverilog
50-
uses: actions/cache@v4
47+
uses: actions/cache@v3
5148
with:
5249
path: .local/
53-
key: ${{ matrix.os.id }}-${{ env.IVERILOG_GIT }}
50+
key: ${{ matrix.os.id }}-${{ hashFiles('iverilog/.git/refs/heads/master') }}
5451

5552
- name: Build iverilog
5653
if: steps.cache-iverilog.outputs.cache-hit != 'true'

yosys/.github/workflows/version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v3
1414
with:
1515
fetch-depth: 0
1616
- name: Take last commit

yosys/.github/workflows/vs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ jobs:
66
yosys-vcxsrc:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v4
9+
- uses: actions/checkout@v3
1010
- name: Build
1111
run: make vcxsrc YOSYS_VER=latest
12-
- uses: actions/upload-artifact@v4
12+
- uses: actions/upload-artifact@v3
1313
with:
1414
name: vcxsrc
1515
path: yosys-win32-vcxsrc-latest.zip
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: windows-2019
1919
needs: yosys-vcxsrc
2020
steps:
21-
- uses: actions/download-artifact@v4
21+
- uses: actions/download-artifact@v3
2222
with:
2323
name: vcxsrc
2424
path: .

yosys/.github/workflows/wasi.yml

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

yosys/.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
*.o
22
*.d
3-
*.dwo
43
.*.swp
54
*.gch
65
*.gcda
76
*.gcno
8-
*~
97
__pycache__
108
/.cproject
119
/.project

yosys/.gitmodules

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

yosys/CHANGELOG

Lines changed: 0 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -2,116 +2,6 @@
22
List of major changes and improvements between releases
33
=======================================================
44

5-
Yosys 0.37 .. Yosys 0.38
6-
--------------------------
7-
* New commands and options
8-
- Added option "-tech" to "opt_lut" pass.
9-
- Added option "-nokeep_prints" to "hierarchy" pass.
10-
- Added option "-nolower" to "async2sync" and "clk2fflogic" pass.
11-
- Added option "-lower" to "chformal" pass.
12-
13-
* Various
14-
- Added $check cell to represent assertions with messages.
15-
- Allow capturing $print cell output in CXXRTL.
16-
- Added API to overwrite existing pass from plugin.
17-
- Follow the XDG Base Directory Specification for storing history files.
18-
- Without a known top module, derive all deferred modules (hierarchy pass).
19-
- Detect and error out on combinational loops in write_aiger.
20-
21-
* Verific support
22-
- Added option "-no-split-complex-ports" to "verific -import".
23-
24-
Yosys 0.36 .. Yosys 0.37
25-
--------------------------
26-
* New commands and options
27-
- Added option "-nodisplay" to read_verilog.
28-
29-
* SystemVerilog
30-
- Correct hierarchical path names for structs and unions.
31-
32-
* Various
33-
- Print hierarchy for failed assertions in "sim" pass.
34-
- Add "--present-only" option to "yosys-witness" to omit unused signals.
35-
- Implement a generic record/replay interface for CXXRTL.
36-
- Improved readability of emitted code with "write_verilog".
37-
38-
Yosys 0.35 .. Yosys 0.36
39-
--------------------------
40-
* New commands and options
41-
- Added option "--" to pass arguments down to tcl when using -c option.
42-
- Added ability on MacOS and Windows to pass options after arguments on cli.
43-
- Added option "-cmp2softlogic" to synth_lattice.
44-
- Added option "-lowpower" to "booth" pass.
45-
46-
* QuickLogic support
47-
- Added "K6N10f" support.
48-
- Added "-nodsp", "-nocarry", "-nobram" and "-bramtypes" options to
49-
"synth_quicklogic" pass.
50-
- Added "ql_bram_merge" pass to merge 18K BRAM cells into TDP36K.
51-
- Added "ql_bram_types" pass to change TDP36K depending on configuration.
52-
- Added "ql_dsp_io_regs" pass to update QL_DSP2 depending on configuration.
53-
- Added "ql_dsp_macc" pass to infer multiplier-accumulator DSP cells.
54-
- Added "ql_dsp_simd" pass to merge DSP pairs to operate in SIMD mode.
55-
56-
* ECP5,iCE40 and Gowin support
57-
- Enabled abc9 by default, added "-noabc9" option to disable.
58-
59-
* MachXO3 support
60-
- Quality of results improvements.
61-
- Enabled "booth" pass by default for it in "synth_lattice".
62-
63-
* Various
64-
- Improved "peepopt" by adding shiftadd pattern support.
65-
- Added "--incremental" mode to smtbmc.
66-
67-
Yosys 0.34 .. Yosys 0.35
68-
--------------------------
69-
* Various
70-
- Improvements on "peepopt" shiftmul matcher.
71-
- Improvements on "ram_style" attributes handling.
72-
73-
* Verific support
74-
- Improved static elaboration for VHDL and mixed HDL designs.
75-
- Expose "hdlname" attribute with original module name.
76-
- Expose "architecture" attribute with VHDL architecture name.
77-
78-
Yosys 0.33 .. Yosys 0.34
79-
--------------------------
80-
* New commands and options
81-
- Added option "-assert" to "sim" pass.
82-
- Added option "-noinitstate" to "sim" pass.
83-
- Added option "-dont_use" to "abc" pass.
84-
- Added "dft_tag" pass to create tagging logic for data flow tracking.
85-
- Added "future" pass to resolve future sampled value functions.
86-
- Added "booth" pass to map $mul cells to Booth multipliers.
87-
- Added option "-booth" to "synth" pass.
88-
89-
* SystemVerilog
90-
- Added support for assignments within expressions, e.g., `x[y++] = z;` or
91-
`x = (y *= 2) - 1;`.
92-
93-
* Verific support
94-
- "src" attribute contain full location info.
95-
- module parameters are kept after import.
96-
- accurate access order semantics in memory inference.
97-
- better "bind" support for mixed language projects.
98-
99-
* Various
100-
- "show" command displays dot instead of box for wire aliases.
101-
102-
Yosys 0.32 .. Yosys 0.33
103-
--------------------------
104-
* Various
105-
- Added "$print" cell, produced by "$display" and "$write"
106-
Verilog tasks.
107-
- Added "$print" cell handling in CXXRTL.
108-
109-
* Lattice FPGA support
110-
- Added generic "synth_lattice" pass (for now MachXO2/XO3/XO3D)
111-
- Removed "synth_machxo2" pass
112-
- Pass "ecp5_gsr" renamed to "lattice_gsr"
113-
- "synth_machxo2" equivalent is "synth_lattice -family xo2"
114-
1155
Yosys 0.31 .. Yosys 0.32
1166
--------------------------
1177
* Verific support

yosys/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ add_custom_command(OUTPUT yosys-bin
2020
# -C ${CMAKE_CURRENT_BINARY_DIR}
2121
# -f ${CMAKE_CURRENT_SOURCE_DIR}/Makefile #(out-of-tree) build directory
2222
PREFIX=${CMAKE_BINARY_DIR}
23-
# -j${CUSTOM_BUILD_PARALLEL_LEVEL}
23+
-j${CUSTOM_BUILD_PARALLEL_LEVEL}
2424
> /dev/null
2525

2626
COMMAND ${MAKE_PROGRAM} install ENABLE_ABC=0
@@ -43,4 +43,4 @@ add_custom_target(yosys ALL DEPENDS yosys-bin)
4343
# INTERFACE_INCLUDE_DIRECTORIES ${YOSYS_INCLUDE_DIRS})
4444

4545

46-
#install(FILES ${BINARY_LIB_FILE1} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
46+
#install(FILES ${BINARY_LIB_FILE1} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})

0 commit comments

Comments
 (0)