mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-05-13 18:54:44 +00:00
Code Activity

Merge branch 'main' into make_excl

Browse source
This commit is contained in:
Alain Dargelas 2025-01-06 11:06:28 -08:00
commit bd3eedd570
4 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -1,9 +1,6 @@
[submodule "verific"] [submodule "verific"]
path = verific path = verific
url = git@github.com:silimate/verific.git url = git@github.com:silimate/verific.git
[submodule "yosys-slang"]
path = yosys-slang
url = git@github.com:silimate/yosys-slang.git
[submodule "abc"] [submodule "abc"]
path = abc path = abc
url = https://github.com/YosysHQ/abc url = https://github.com/YosysHQ/abc

2
Makefile
View file

@ -171,7 +171,7 @@ ifeq ($(OS), Haiku)
CXXFLAGS += -D_DEFAULT_SOURCE CXXFLAGS += -D_DEFAULT_SOURCE
endif endif
YOSYS_VER := 0.48+45 YOSYS_VER := 0.48+51
# 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

8
kernel/hashlib.h
View file

@ -324,10 +324,10 @@ template<typename T> struct hash_ops<std::optional<T>> {
} }
}; };
inline int hashtable_size(int min_size) inline unsigned int hashtable_size(unsigned int min_size)
{ {
// Primes as generated by https://oeis.org/A175953 // Primes as generated by https://oeis.org/A175953
static std::vector<int> zero_and_some_primes = { static std::vector<unsigned int> zero_and_some_primes = {
0, 23, 29, 37, 47, 59, 79, 101, 127, 163, 211, 269, 337, 431, 541, 677, 0, 23, 29, 37, 47, 59, 79, 101, 127, 163, 211, 269, 337, 431, 541, 677,
853, 1069, 1361, 1709, 2137, 2677, 3347, 4201, 5261, 6577, 8231, 10289, 853, 1069, 1361, 1709, 2137, 2677, 3347, 4201, 5261, 6577, 8231, 10289,
12889, 16127, 20161, 25219, 31531, 39419, 49277, 61603, 77017, 96281, 12889, 16127, 20161, 25219, 31531, 39419, 49277, 61603, 77017, 96281,
@ -337,13 +337,13 @@ inline int hashtable_size(int min_size)
25499291, 31874149, 39842687, 49803361, 62254207, 77817767, 97272239, 25499291, 31874149, 39842687, 49803361, 62254207, 77817767, 97272239,
121590311, 151987889, 189984863, 237481091, 296851369, 371064217, 121590311, 151987889, 189984863, 237481091, 296851369, 371064217,
463830313, 579787991, 724735009, 905918777, 1132398479, 1415498113, 463830313, 579787991, 724735009, 905918777, 1132398479, 1415498113,
1769372713 1769372713, 2211715897, 2764644887, 3455806139
}; };
for (auto p : zero_and_some_primes) for (auto p : zero_and_some_primes)
if (p >= min_size) return p; if (p >= min_size) return p;
if (sizeof(int) == 4) if (sizeof(unsigned int) == 4)
throw std::length_error("hash table exceeded maximum size.\nDesign is likely too large for yosys to handle, if possible try not to flatten the design."); throw std::length_error("hash table exceeded maximum size.\nDesign is likely too large for yosys to handle, if possible try not to flatten the design.");
for (auto p : zero_and_some_primes) for (auto p : zero_and_some_primes)

1
yosys-slang

@ -1 +0,0 @@
Subproject commit 3a3779d2cbb85995fbd80b298f93682a3f12eefd