From cbb95cb5172a084cb7221007b4cdb2326ca3abf9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 Dec 2024 00:20:44 +0000 Subject: [PATCH 1/7] Bump version --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9d96f37ab..c8c68669b 100644 --- a/Makefile +++ b/Makefile @@ -153,7 +153,7 @@ ifeq ($(OS), Haiku) CXXFLAGS += -D_DEFAULT_SOURCE endif -YOSYS_VER := 0.48+45 +YOSYS_VER := 0.48+47 # Note: We arrange for .gitcommit to contain the (short) commit hash in # tarballs generated with git-archive(1) using .gitattributes. The git repo From 1ae0d8432f306edf9f05fc960794046e3d397f88 Mon Sep 17 00:00:00 2001 From: mikesinouye Date: Thu, 2 Jan 2025 08:59:11 -0800 Subject: [PATCH 2/7] Approximately double the max hash table size --- kernel/hashlib.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/hashlib.h b/kernel/hashlib.h index 6927702e1..9aac70f2a 100644 --- a/kernel/hashlib.h +++ b/kernel/hashlib.h @@ -324,10 +324,10 @@ template struct hash_ops> { } }; -inline int hashtable_size(int min_size) +inline unsigned int hashtable_size(unsigned int min_size) { // Primes as generated by https://oeis.org/A175953 - static std::vector zero_and_some_primes = { + static std::vector zero_and_some_primes = { 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, 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, 121590311, 151987889, 189984863, 237481091, 296851369, 371064217, 463830313, 579787991, 724735009, 905918777, 1132398479, 1415498113, - 1769372713 + 1769372713, 2211715897, 2764644871, 2764644887, 3455806139 }; for (auto p : zero_and_some_primes) 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."); for (auto p : zero_and_some_primes) From de9cb5a60c041447e7e85f2cbfb1d8911f0bda44 Mon Sep 17 00:00:00 2001 From: mikesinouye Date: Thu, 2 Jan 2025 11:05:30 -0800 Subject: [PATCH 3/7] Remove spurious prime --- kernel/hashlib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/hashlib.h b/kernel/hashlib.h index 9aac70f2a..188b176b4 100644 --- a/kernel/hashlib.h +++ b/kernel/hashlib.h @@ -337,7 +337,7 @@ inline unsigned int hashtable_size(unsigned int min_size) 25499291, 31874149, 39842687, 49803361, 62254207, 77817767, 97272239, 121590311, 151987889, 189984863, 237481091, 296851369, 371064217, 463830313, 579787991, 724735009, 905918777, 1132398479, 1415498113, - 1769372713, 2211715897, 2764644871, 2764644887, 3455806139 + 1769372713, 2211715897, 2764644887, 3455806139 }; for (auto p : zero_and_some_primes) From 17a53b83852886654a781eb9238e528d9c52484d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 4 Jan 2025 00:20:29 +0000 Subject: [PATCH 4/7] Bump version --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c8c68669b..6f5fec6a2 100644 --- a/Makefile +++ b/Makefile @@ -153,7 +153,7 @@ ifeq ($(OS), Haiku) CXXFLAGS += -D_DEFAULT_SOURCE endif -YOSYS_VER := 0.48+47 +YOSYS_VER := 0.48+51 # Note: We arrange for .gitcommit to contain the (short) commit hash in # tarballs generated with git-archive(1) using .gitattributes. The git repo From 6affb9b5ce5dc4dd8a7de54569751316ed4d57cf Mon Sep 17 00:00:00 2001 From: Akash Levy Date: Sat, 4 Jan 2025 21:35:46 -0800 Subject: [PATCH 5/7] Remove yosys-slang for now --- .gitmodules | 3 --- yosys-slang | 1 - 2 files changed, 4 deletions(-) delete mode 160000 yosys-slang diff --git a/.gitmodules b/.gitmodules index cbbae7f31..1a080163c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "verific"] path = verific url = git@github.com:silimate/verific.git -[submodule "yosys-slang"] - path = yosys-slang - url = git@github.com:silimate/yosys-slang.git [submodule "abc"] path = abc url = https://github.com/YosysHQ/abc diff --git a/yosys-slang b/yosys-slang deleted file mode 160000 index 3a3779d2c..000000000 --- a/yosys-slang +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3a3779d2cbb85995fbd80b298f93682a3f12eefd From ace5b02cbc200c781791a6102455d097445be5a2 Mon Sep 17 00:00:00 2001 From: Akash Levy Date: Sat, 4 Jan 2025 21:39:08 -0800 Subject: [PATCH 6/7] Bump update --- verific | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/verific b/verific index 3992c3755..28f6e71a8 160000 --- a/verific +++ b/verific @@ -1 +1 @@ -Subproject commit 3992c3755bec1ec68c6889509e33f6607873813f +Subproject commit 28f6e71a8d96018dd7b301ba84883061df4327ca From adfcaa998597b711925a6ce9d4a739ce92a56a96 Mon Sep 17 00:00:00 2001 From: Akash Levy Date: Sun, 5 Jan 2025 06:40:35 -0800 Subject: [PATCH 7/7] Fix verific dependency --- verific | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/verific b/verific index 28f6e71a8..3992c3755 160000 --- a/verific +++ b/verific @@ -1 +1 @@ -Subproject commit 28f6e71a8d96018dd7b301ba84883061df4327ca +Subproject commit 3992c3755bec1ec68c6889509e33f6607873813f