Skip to content

Commit fd4b2bd

Browse files
authored
Update yosys version to 0.44 (#2510)
This commit also disables creating `$scopeinfo` cells in large designs tests. `$scopeinfo` is Yosys internal cell and should be removed before passing netlist to another tool.
2 parents 1ca7c1c + 6b3dd53 commit fd4b2bd

File tree

6 files changed

+8
-7
lines changed

6 files changed

+8
-7
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ jobs:
376376
overwrite: true
377377
file_glob: true
378378

379-
# Synlig requires yosys version 0.39 or later
379+
# Synlig requires yosys version 0.40 or later
380380
# which is currently not available in debian repositories.
381381
# This test can be uncommented when required version will be available.
382382
# test-release-with-packaged-yosys:
@@ -462,7 +462,7 @@ jobs:
462462
(tuttest README.md path-setup; tuttest README.md example-uhdm-ver2) | bash -
463463
tuttest README.md example-multiple-files | (. <(tuttest README.md path-setup) && yosys)
464464
465-
# Synlig requires yosys version 0.39 or later
465+
# Synlig requires yosys version 0.40 or later
466466
# which is currently not available in debian repositories.
467467
# This test can be uncommented when required version will be available.
468468
# test-plugin-with-packaged-yosys:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Before installing the plugin, check that Yosys is installed and correctly config
1515
yosys-config --help
1616
```
1717

18-
The required Yosys version is 0.39 or later.
18+
The required Yosys version is 0.40 or later.
1919
Note that the yosys package with required version is currently unavailable in any Debian repository.
2020
If you don't have Yosys, skip to the [Installation from source](#installation-from-source) section to build Yosys from the source.
2121

tests/opentitan/0001_Add_opentitan_patch_for_uhdm.patch

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,13 +146,14 @@ index 8d6cf89b6..6480e08ba 100644
146146
toplevel: top_earlgrey_nexysvideo
147147
parameters:
148148
- BootRomInitFile
149-
@@ -64,6 +64,15 @@ targets:
149+
@@ -64,6 +64,16 @@ targets:
150150
tools:
151151
vivado:
152152
part: "xc7a200tsbg484-1" # Nexys Video
153153
+ synth: "yosys"
154154
+ yosys_synth_options: ['-flatten', '-iopad', '-noclkbuf', '-family xc7', "frontend=surelog"]
155155
+ yosys_read_options: ['-noassert', '-dump_ast1', '-dump_ast2', '-no_dump_ptr']
156+
+ yosys_extra_passes: ['delete */t:\$scopeinfo']
156157
+ surelog_options: ['-DSYNTHESIS', '-synth']
157158
+ yosys:
158159
+ arch: "xilinx"

third_party/Build.yosys.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ endif
6565
# Variable evaluation: in recipe, ${var}
6666
define ${ts}.build_command
6767
cd ${${ts}.src_dir}
68-
${MAKE} ${${ts}.make_args} --no-print-directory
68+
${MAKE} ${${ts}.make_args} --no-print-directory ENABLE_LTO=0
6969
endef
7070

7171
define ${ts}.install_command

third_party/yosys

Submodule yosys updated 486 files

third_party/yosys_mod/synlig_simplify.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -852,7 +852,7 @@ bool synlig_simplify(Yosys::AST::AstNode *ast_node, bool const_fold, bool at_zer
852852
// when $display()/$write() functions are used in an initial block, print them during synthesis
853853
Fmt fmt = ast_node->processFormat(stage, /*sformat_like=*/false, default_base);
854854
if (ast_node->str.substr(0, 8) == "$display")
855-
fmt.append_string("\n");
855+
fmt.append_literal("\n");
856856
log("%s", fmt.render().c_str());
857857
} else {
858858
// when $display()/$write() functions are used in an always block, simplify the expressions and

0 commit comments

Comments
 (0)