riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Compare commits

base: riscv:8311df890c23372a2208f77655a9afd0dda6ad76
Branches Tags
riscv:main
riscv:krys/reduce_warnings
riscv:emil/han-carlson-adder
riscv:emil/blockrom-driver-conflict
riscv:emil/opt_expr-limit-effort
riscv:emil/make-test-faster
riscv:setenv_pass
riscv:docs-preview-noguidelines
riscv:krys/refactor_selections
riscv:krys/get_blackbox_attribute
riscv:emil/autoidx-option
riscv:emil/hashlib-interface
riscv:krys/blackboxes
riscv:emil/yosys-config-version
riscv:emil/clockgate-liberty
riscv:emil/opt_merge-hashing
riscv:hierarchy_notify_top_attr
riscv:dlfcn-submodule
riscv:emil/fix-filterlib-roundtrip
riscv:ql_noflatten_option
riscv:emil/path-sep-refactor
riscv:docs-preview-cmdref_groups
riscv:emil/idstring-in-fold
riscv:emil/fix-mac-lto-plugins
riscv:emil/readme-mac-lto
riscv:emil/pyosys-fix-segfault
riscv:docs-preview-cellhelp
riscv:lofty/ql-oopsie
riscv:emil/log-deprecated-temp
riscv:emil/document-perffile
riscv:micko/ci_functional
riscv:emil/prove-hash-sensitivity
riscv:emil/fix-fsmdata-insertion
riscv:emil/proc_dff-rule-order
riscv:aiju/docs_gvpack_fix
riscv:emil/nix-cross-compile
riscv:krys/quotes
riscv:emil/src-attribute-std-string
riscv:emil/proc_rom-src-test
riscv:emil/main-nohash
riscv:emil/sigspec-union-nohash
riscv:emil/swap-disposable
riscv:claire/vay
riscv:krys/abc-safe
riscv:emil/bitpattern-comments
riscv:emil/sigspec-union
riscv:emil/sigspec-hell
riscv:emil/cell-playground-3
riscv:lofty/remove-sorts
riscv:emil/special-src-attribute
riscv:emil/tag-dict-inherit
riscv:emil/small-astnode
riscv:emil/nix-brokey
riscv:emil/cell-playground
riscv:krys/fix-4427
riscv:emil/tracy
riscv:emil/bufnorm-notes
riscv:update_flake_lock_action
riscv:ywb_asserts
riscv:emil/nix
riscv:lofty/intel_alm-memory_libmap
riscv:mmicko/orig_params
riscv:krys/ql-tests
riscv:ecp5_2_lattice
riscv:lofty/abc9-by-default
riscv:efb
riscv:nexus_2_lattice
riscv:claire/toposort
riscv:mmicko/verific
riscv:aki/clang_tidy
riscv:aki/wire_limit
riscv:jix/witness_flow
riscv:lofty/abc9-output-conflict
riscv:claire/ipc
riscv:claire/fix2728
riscv:sanitizers
riscv:verific-improvements
riscv:eddie/clean_unused_init
riscv:eddie/sta
riscv:eddie/ecp5_init
riscv:eddie/fix1649
riscv:0.47
riscv:0.46
riscv:0.45
riscv:docs-previewtest
riscv:yosys-0.44
riscv:resources
riscv:yosys-0.43
riscv:yosys-0.42
riscv:yosys-0.41
riscv:yosys-0.40
riscv:yosys-0.39
riscv:yosys-0.38
riscv:yosys-0.37
riscv:yosys-0.36
riscv:yosys-0.35
riscv:yosys-0.34
riscv:yosys-0.33
riscv:yosys-0.32
riscv:yosys-0.31
riscv:yosys-0.30
riscv:yosys-0.29
riscv:yosys-0.28
riscv:yosys-0.27
riscv:yosys-0.26
riscv:yosys-0.25
riscv:yosys-0.24
riscv:yosys-0.23
riscv:yosys-0.22
riscv:yosys-0.21
riscv:yosys-0.20
riscv:yosys-0.19
riscv:yosys-0.18
riscv:yosys-0.17
riscv:yosys-0.16
riscv:yosys-0.15
riscv:yosys-0.14
riscv:yosys-0.13
riscv:yosys-0.12
riscv:yosys-0.11
riscv:yosys-0.10
riscv:yosys-0.9
riscv:yosys-0.8
riscv:yosys-0.7
riscv:yosys-0.6
riscv:yosys-0.5
riscv:yosys-0.4
riscv:yosys-0.3.0
riscv:yosys-0.2.0
...
compare: riscv:44b0e57a5ac85e8fe52874835f4b74784fa5f56a
Branches Tags
riscv:main
riscv:krys/reduce_warnings
riscv:emil/han-carlson-adder
riscv:emil/blockrom-driver-conflict
riscv:emil/opt_expr-limit-effort
riscv:emil/make-test-faster
riscv:setenv_pass
riscv:docs-preview-noguidelines
riscv:krys/refactor_selections
riscv:krys/get_blackbox_attribute
riscv:emil/autoidx-option
riscv:emil/hashlib-interface
riscv:krys/blackboxes
riscv:emil/yosys-config-version
riscv:emil/clockgate-liberty
riscv:emil/opt_merge-hashing
riscv:hierarchy_notify_top_attr
riscv:dlfcn-submodule
riscv:emil/fix-filterlib-roundtrip
riscv:ql_noflatten_option
riscv:emil/path-sep-refactor
riscv:docs-preview-cmdref_groups
riscv:emil/idstring-in-fold
riscv:emil/fix-mac-lto-plugins
riscv:emil/readme-mac-lto
riscv:emil/pyosys-fix-segfault
riscv:docs-preview-cellhelp
riscv:lofty/ql-oopsie
riscv:emil/log-deprecated-temp
riscv:emil/document-perffile
riscv:micko/ci_functional
riscv:emil/prove-hash-sensitivity
riscv:emil/fix-fsmdata-insertion
riscv:emil/proc_dff-rule-order
riscv:aiju/docs_gvpack_fix
riscv:emil/nix-cross-compile
riscv:krys/quotes
riscv:emil/src-attribute-std-string
riscv:emil/proc_rom-src-test
riscv:emil/main-nohash
riscv:emil/sigspec-union-nohash
riscv:emil/swap-disposable
riscv:claire/vay
riscv:krys/abc-safe
riscv:emil/bitpattern-comments
riscv:emil/sigspec-union
riscv:emil/sigspec-hell
riscv:emil/cell-playground-3
riscv:lofty/remove-sorts
riscv:emil/special-src-attribute
riscv:emil/tag-dict-inherit
riscv:emil/small-astnode
riscv:emil/nix-brokey
riscv:emil/cell-playground
riscv:krys/fix-4427
riscv:emil/tracy
riscv:emil/bufnorm-notes
riscv:update_flake_lock_action
riscv:ywb_asserts
riscv:emil/nix
riscv:lofty/intel_alm-memory_libmap
riscv:mmicko/orig_params
riscv:krys/ql-tests
riscv:ecp5_2_lattice
riscv:lofty/abc9-by-default
riscv:efb
riscv:nexus_2_lattice
riscv:claire/toposort
riscv:mmicko/verific
riscv:aki/clang_tidy
riscv:aki/wire_limit
riscv:jix/witness_flow
riscv:lofty/abc9-output-conflict
riscv:claire/ipc
riscv:claire/fix2728
riscv:sanitizers
riscv:verific-improvements
riscv:eddie/clean_unused_init
riscv:eddie/sta
riscv:eddie/ecp5_init
riscv:eddie/fix1649
riscv:0.47
riscv:0.46
riscv:0.45
riscv:docs-previewtest
riscv:yosys-0.44
riscv:resources
riscv:yosys-0.43
riscv:yosys-0.42
riscv:yosys-0.41
riscv:yosys-0.40
riscv:yosys-0.39
riscv:yosys-0.38
riscv:yosys-0.37
riscv:yosys-0.36
riscv:yosys-0.35
riscv:yosys-0.34
riscv:yosys-0.33
riscv:yosys-0.32
riscv:yosys-0.31
riscv:yosys-0.30
riscv:yosys-0.29
riscv:yosys-0.28
riscv:yosys-0.27
riscv:yosys-0.26
riscv:yosys-0.25
riscv:yosys-0.24
riscv:yosys-0.23
riscv:yosys-0.22
riscv:yosys-0.21
riscv:yosys-0.20
riscv:yosys-0.19
riscv:yosys-0.18
riscv:yosys-0.17
riscv:yosys-0.16
riscv:yosys-0.15
riscv:yosys-0.14
riscv:yosys-0.13
riscv:yosys-0.12
riscv:yosys-0.11
riscv:yosys-0.10
riscv:yosys-0.9
riscv:yosys-0.8
riscv:yosys-0.7
riscv:yosys-0.6
riscv:yosys-0.5
riscv:yosys-0.4
riscv:yosys-0.3.0
riscv:yosys-0.2.0

12 Commits
8311df890c ... 44b0e57a5a

Author SHA1 Message Date
N. Engelhardt 44b0e57a5a
Merge df72f30141 into 6f3376cbe6 2024-11-28 12:24:15 +01:00
KrystalDelusion 6f3376cbe6
Merge pull request #4730 from YosysHQ/krys/downstream-docs 
Improvements for downstream-distro maintainability.
 2024-11-28 14:35:16 +13:00
github-actions[bot] 87742fa688 Bump version 2024-11-28 01:26:26 +00:00
Martin Povišer 646c5a19a8
Merge pull request #4776 from YosysHQ/krys/get_blackbox_attribute 
Move get_blackbox_attribute method to Module instead of AttrObject
 2024-11-28 00:25:16 +01:00
Martin Povišer 1717a0b9c0
Merge pull request #4721 from ldoolitt/main 
kernel/drivertools.h: avoid maybe-uninitialized compile warnings
 2024-11-28 00:09:43 +01:00
KrystalDelusion f428163252
Move get_blackbox_attribute method to Module instead of AttrObject 2024-11-28 11:19:16 +13:00
Krystine Sherwin e649c1a8e1
Docs: Accept empty string for release envvar 2024-11-20 12:31:12 +13:00
Krystine Sherwin 44b68fb498
Docs: Add check for envvar to disable todos 2024-11-20 12:18:17 +13:00
Krystine Sherwin 1476eaba00
Docs: Add fallback for missing furo_ys 
This is mainly intended for (latex)pdf builds which do not use the furo-ys html theme, where the yosys script syntax highlighting can safely fallback to plaintext.  This effectively makes `furo-ys` an optional dependency to simplify distro-package maintainability.
See also #4725.
 2024-11-12 16:23:12 +13:00
N. Engelhardt df72f30141 synth_quicklogic: add -noflatten option 2024-11-11 11:22:05 +01:00
Larry Doolittle 3ae9ca7c2b drivertools.h: switch from log_assert(0) to log_abort() for new feature 2024-11-08 10:30:11 -08:00
Larry Doolittle d36a387aca kernel/drivertools.h: avoid maybe-uninitialized compile warnings 
Initialize "unsigned int inner" in hash() functions
Includes a log_assert() that might help catch corrupted data structures
or future incomplete modification of DriveType definition
 2024-11-07 19:49:25 -08:00
5 changed files with 31 additions and 7 deletions
Show Stats Expand all files Collapse all files

2
Makefile
View File

@ -155,7 +155,7 @@ ifeq ($(OS), Haiku)
CXXFLAGS += -D_DEFAULT_SOURCE CXXFLAGS += -D_DEFAULT_SOURCE
endif endif
YOSYS_VER := 0.47+121 YOSYS_VER := 0.47+135
# Note: We arrange for .gitcommit to contain the (short) commit hash in # Note: We arrange for .gitcommit to contain the (short) commit hash in
# tarballs generated with git-archive(1) using .gitattributes. The git repo # tarballs generated with git-archive(1) using .gitattributes. The git repo

11
docs/source/conf.py
View File

@ -56,6 +56,9 @@ if os.getenv("READTHEDOCS"):
else: else:
release = yosys_ver release = yosys_ver
todo_include_todos = False todo_include_todos = False
elif os.getenv("YOSYS_DOCS_RELEASE") is not None:
release = yosys_ver
todo_include_todos = False
else: else:
release = yosys_ver release = yosys_ver
todo_include_todos = True todo_include_todos = True
@ -87,5 +90,9 @@ def setup(app: Sphinx) -> None:
from util.RtlilLexer import RtlilLexer from util.RtlilLexer import RtlilLexer
app.add_lexer("RTLIL", RtlilLexer) app.add_lexer("RTLIL", RtlilLexer)
from furo_ys.lexers.YoscryptLexer import YoscryptLexer try:
app.add_lexer("yoscrypt", YoscryptLexer) from furo_ys.lexers.YoscryptLexer import YoscryptLexer
app.add_lexer("yoscrypt", YoscryptLexer)
except ModuleNotFoundError:
from pygments.lexers.special import TextLexer
app.add_lexer("yoscrypt", TextLexer)

10
kernel/drivertools.h
View File

@ -364,7 +364,7 @@ public:
unsigned int hash() const unsigned int hash() const
{ {
unsigned int inner; unsigned int inner = 0;
switch (type_) switch (type_)
{ {
case DriveType::NONE: case DriveType::NONE:
@ -385,6 +385,9 @@ public:
case DriveType::MULTIPLE: case DriveType::MULTIPLE:
inner = multiple_.hash(); inner = multiple_.hash();
break; break;
default:
log_abort();
break;
} }
return mkhash((unsigned int)type_, inner); return mkhash((unsigned int)type_, inner);
} }
@ -912,7 +915,7 @@ public:
unsigned int hash() const unsigned int hash() const
{ {
unsigned int inner; unsigned int inner = 0;
switch (type_) switch (type_)
{ {
case DriveType::NONE: case DriveType::NONE:
@ -933,6 +936,9 @@ public:
case DriveType::MULTIPLE: case DriveType::MULTIPLE:
inner = multiple_.hash(); inner = multiple_.hash();
break; break;
default:
log_abort();
break;
} }
return mkhash((unsigned int)type_, inner); return mkhash((unsigned int)type_, inner);
} }

5
kernel/rtlil.h
View File

@ -814,6 +814,7 @@ struct RTLIL::AttrObject
void set_bool_attribute(const RTLIL::IdString &id, bool value=true); void set_bool_attribute(const RTLIL::IdString &id, bool value=true);
bool get_bool_attribute(const RTLIL::IdString &id) const; bool get_bool_attribute(const RTLIL::IdString &id) const;
[[deprecated("Use Module::get_blackbox_attribute() instead.")]]
bool get_blackbox_attribute(bool ignore_wb=false) const { bool get_blackbox_attribute(bool ignore_wb=false) const {
return get_bool_attribute(ID::blackbox) || (!ignore_wb && get_bool_attribute(ID::whitebox)); return get_bool_attribute(ID::blackbox) || (!ignore_wb && get_bool_attribute(ID::whitebox));
} }
@ -1291,6 +1292,10 @@ public:
virtual void optimize(); virtual void optimize();
virtual void makeblackbox(); virtual void makeblackbox();
bool get_blackbox_attribute(bool ignore_wb=false) const {
return get_bool_attribute(ID::blackbox) || (!ignore_wb && get_bool_attribute(ID::whitebox));
}
void connect(const RTLIL::SigSig &conn); void connect(const RTLIL::SigSig &conn);
void connect(const RTLIL::SigSpec &lhs, const RTLIL::SigSpec &rhs); void connect(const RTLIL::SigSpec &lhs, const RTLIL::SigSpec &rhs);
void new_connections(const std::vector<RTLIL::SigSig> &new_conn); void new_connections(const std::vector<RTLIL::SigSig> &new_conn);

10
techlibs/quicklogic/synth_quicklogic.cc
View File

@ -78,7 +78,7 @@ struct SynthQuickLogicPass : public ScriptPass {
} }
string top_opt, blif_file, edif_file, family, currmodule, verilog_file, lib_path; string top_opt, blif_file, edif_file, family, currmodule, verilog_file, lib_path;
bool abc9, inferAdder, nobram, bramTypes, dsp; bool abc9, inferAdder, nobram, bramTypes, dsp, flatten;
void clear_flags() override void clear_flags() override
{ {
@ -94,6 +94,7 @@ struct SynthQuickLogicPass : public ScriptPass {
bramTypes = false; bramTypes = false;
lib_path = "+/quicklogic/"; lib_path = "+/quicklogic/";
dsp = true; dsp = true;
flatten = true;
} }
void set_scratchpad_defaults(RTLIL::Design *design) { void set_scratchpad_defaults(RTLIL::Design *design) {
@ -158,6 +159,10 @@ struct SynthQuickLogicPass : public ScriptPass {
dsp = false; dsp = false;
continue; continue;
} }
if (args[argidx] == "-noflatten") {
flatten = false;
continue;
}
break; break;
} }
extra_args(args, argidx, design); extra_args(args, argidx, design);
@ -202,7 +207,8 @@ struct SynthQuickLogicPass : public ScriptPass {
if (check_label("prepare")) { if (check_label("prepare")) {
run("proc"); run("proc");
run("flatten"); if (flatten)
run("flatten", "(unless -noflatten)");
if (help_mode || family == "pp3") { if (help_mode || family == "pp3") {
run("tribuf -logic", " (for pp3)"); run("tribuf -logic", " (for pp3)");
} }