From f646b96226e925d1712135f516398b5089f5e943 Mon Sep 17 00:00:00 2001 From: Noam Cohen Date: Mon, 27 Jul 2026 14:01:07 +0200 Subject: [PATCH 1/3] naja fix for mutliple designs in lib files --- thirdparty/naja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thirdparty/naja b/thirdparty/naja index e1a649e2..64744cef 160000 --- a/thirdparty/naja +++ b/thirdparty/naja @@ -1 +1 @@ -Subproject commit e1a649e2fce182d8b7ca5c5c80ab5d04aad3ffa3 +Subproject commit 64744cef1f86864efa18c382b1988bd32e1d0b18 From f359f6c277a6c732bbd129d7c4c2e40bfe186a02 Mon Sep 17 00:00:00 2001 From: Noam Cohen Date: Tue, 28 Jul 2026 14:44:25 +0200 Subject: [PATCH 2/3] ci: bump najaeda to 0.7.18 --- .github/workflows/regress-imc.yml | 2 +- .github/workflows/regress-ki.yml | 2 +- .github/workflows/regress-lec.yml | 2 +- .github/workflows/regress-pdr.yml | 2 +- .github/workflows/regress-sec.yml | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/regress-imc.yml b/.github/workflows/regress-imc.yml index d0b9ad5a..e217d340 100644 --- a/.github/workflows/regress-imc.yml +++ b/.github/workflows/regress-imc.yml @@ -239,7 +239,7 @@ jobs: sec-encoding=${{ env.SEC_ENCODING }} - name: Install najaeda - run: pip install najaeda==0.7.15 + run: pip install najaeda==0.7.18 - name: Generate TinyRocket edited and CSRFile SEC examples working-directory: ${{github.workspace}}/example diff --git a/.github/workflows/regress-ki.yml b/.github/workflows/regress-ki.yml index 20c5c632..4e1ff411 100644 --- a/.github/workflows/regress-ki.yml +++ b/.github/workflows/regress-ki.yml @@ -239,7 +239,7 @@ jobs: sec-encoding=${{ env.SEC_ENCODING }} - name: Install najaeda - run: pip install najaeda==0.7.15 + run: pip install najaeda==0.7.18 - name: Generate TinyRocket edited and CSRFile SEC examples working-directory: ${{github.workspace}}/example diff --git a/.github/workflows/regress-lec.yml b/.github/workflows/regress-lec.yml index c8489b41..9793ed50 100644 --- a/.github/workflows/regress-lec.yml +++ b/.github/workflows/regress-lec.yml @@ -152,7 +152,7 @@ jobs: regress/tinyrocket_verilog/config.yaml - name: Install najaeda - run: pip install najaeda==0.7.15 + run: pip install najaeda==0.7.18 - name: Execute edit.py working-directory: ${{github.workspace}}/example diff --git a/.github/workflows/regress-pdr.yml b/.github/workflows/regress-pdr.yml index cdeb52be..ac6e9c36 100644 --- a/.github/workflows/regress-pdr.yml +++ b/.github/workflows/regress-pdr.yml @@ -248,7 +248,7 @@ jobs: sec-encoding=${{ env.SEC_ENCODING }} - name: Install najaeda - run: pip install najaeda==0.7.15 + run: pip install najaeda==0.7.18 - name: Generate TinyRocket edited and CSRFile SEC examples working-directory: ${{github.workspace}}/example diff --git a/.github/workflows/regress-sec.yml b/.github/workflows/regress-sec.yml index a5624f52..e1de3d52 100644 --- a/.github/workflows/regress-sec.yml +++ b/.github/workflows/regress-sec.yml @@ -274,7 +274,7 @@ jobs: env: CASE_GENERATOR: ${{ matrix.case.generator }} run: | - pip install najaeda==0.7.15 + pip install najaeda==0.7.18 case "${CASE_GENERATOR}" in csrfile) python extract_tinyrocket_csrfile_sec.py @@ -646,7 +646,7 @@ jobs: set -euo pipefail export LD_LIBRARY_PATH="${{github.workspace}}/stage/lib:${LD_LIBRARY_PATH:-}" - pip install najaeda==0.7.15 + pip install najaeda==0.7.18 cleanup_negative_edit() { ( From 694e0771a3c2cbc292e4e20b7c2e4251b5c72088 Mon Sep 17 00:00:00 2001 From: Noam Cohen Date: Tue, 28 Jul 2026 17:31:31 +0200 Subject: [PATCH 3/3] test: regenerate Naja IF fixtures for 0.7.18 --- example/tinyrocket_edited.v | 6 +++--- .../tinyrocket_naja.if/db_implementation.snl | Bin 3210264 -> 3210264 bytes example/tinyrocket_naja.if/snl.mf | 8 ++++---- .../db_implementation.snl | Bin 3210238 -> 3210238 bytes example/tinyrocket_naja_edited.if/snl.mf | 8 ++++---- example/tinyrocket_sec_probe.v | 6 +++--- example/tinyrocket_sec_probe_edited.v | 6 +++--- .../db_implementation.snl | Bin 3210278 -> 3210278 bytes example/tinyrocket_sec_probe_naja.if/snl.mf | 8 ++++---- .../db_implementation.snl | Bin 3210256 -> 3210256 bytes .../snl.mf | 8 ++++---- thirdparty/naja | 2 +- 12 files changed, 26 insertions(+), 26 deletions(-) diff --git a/example/tinyrocket_edited.v b/example/tinyrocket_edited.v index 9682f94a..158b040e 100644 --- a/example/tinyrocket_edited.v +++ b/example/tinyrocket_edited.v @@ -1,8 +1,8 @@ //////////////////////////////////////////////////////////////////////////////// -// Fri Jul 17 00:15:50 2026 +// Tue Jul 28 16:36:16 2026 // Verilog file for RocketTile -// naja version: 0.7.15 -// Git hash: e1a649e +// naja version: 0.7.18 +// Git hash: 03c31df //////////////////////////////////////////////////////////////////////////////// (* keep_hierarchy=1 *) diff --git a/example/tinyrocket_naja.if/db_implementation.snl b/example/tinyrocket_naja.if/db_implementation.snl index 522cccf14b79c03b45bf36879105202ef5090598..405fb274625866e7e05287c4af8f0f149f490967 100644 GIT binary patch delta 274 zcmYk$xeftQ0EJ;=u5GMiXNL_COsL~L_COsL~wVVFoGgDi5$qktkxD8o|oRplXnWn0+N7F9T?p^gTcXrYY`y6B;g0fx#J Vu66rAESGl|BaAUo%lq`=egIgvSB3xp diff --git a/example/tinyrocket_naja.if/snl.mf b/example/tinyrocket_naja.if/snl.mf index 5c2ace77..119db595 100644 --- a/example/tinyrocket_naja.if/snl.mf +++ b/example/tinyrocket_naja.if/snl.mf @@ -1,8 +1,8 @@ ################################################################################ -# Fri Jul 17 00:15:44 2026 +# Tue Jul 28 16:36:08 2026 # SNL manifest -# naja version: 0.7.15 -# Git hash: e1a649e +# naja version: 0.7.18 +# Git hash: 03c31df ################################################################################ V 0 1 0 -P 0.7.15 e1a649e +P 0.7.18 03c31df diff --git a/example/tinyrocket_naja_edited.if/db_implementation.snl b/example/tinyrocket_naja_edited.if/db_implementation.snl index abb49c09e49d809c4125804fbc141d85d45f6c44..8c961e4163fb0f298ad12e314066c02486938d4e 100644 GIT binary patch delta 274 zcmYk$ISv6~0L5`*KHJ!4?Autz&R8m~W9XbjK_dB%ppa0yfaE)XQlXVh;}#Ny_!lIK zU-#b2dp|GQ8|$sM^`G^b7u0=zOB1{K%5>z?(;*N*5FvySQA^LTYX9lo<7f)Ge;J4( zhBy*x|4JS<->7657E(wfgDi5$qktkxD69FZa+kldEo^CvDr%^s0S8UA&_)Mc^w7ru YLuCs$b^Sjq7dICpj4@G*+w|mq05_Ld9RL6T delta 274 zcmYk$ISv6~0L5`LKHJ!4?Autz&R8m~W9XbjK_dB%ppa0yfaE)XQlXVh;}#Ny_!lIK zU-#b2dp|GQ8|$sM)zAK!7u0;ZrRlr*%5>z?^FttjAVLTuqL!Xv)&A4F$I%pW|1uCo z3~?mX{*^pzzER0AEToV|23h2gM*&5YP*(F*iU0JE^aPH7-OOqx9Q3K04upz2><{9 diff --git a/example/tinyrocket_naja_edited.if/snl.mf b/example/tinyrocket_naja_edited.if/snl.mf index 0b6bac96..095a47f7 100644 --- a/example/tinyrocket_naja_edited.if/snl.mf +++ b/example/tinyrocket_naja_edited.if/snl.mf @@ -1,8 +1,8 @@ ################################################################################ -# Fri Jul 17 00:15:50 2026 +# Tue Jul 28 16:36:16 2026 # SNL manifest -# naja version: 0.7.15 -# Git hash: e1a649e +# naja version: 0.7.18 +# Git hash: 03c31df ################################################################################ V 0 1 0 -P 0.7.15 e1a649e +P 0.7.18 03c31df diff --git a/example/tinyrocket_sec_probe.v b/example/tinyrocket_sec_probe.v index 84639dd5..3d1025af 100644 --- a/example/tinyrocket_sec_probe.v +++ b/example/tinyrocket_sec_probe.v @@ -1,8 +1,8 @@ //////////////////////////////////////////////////////////////////////////////// -// Fri Jul 17 00:15:51 2026 +// Tue Jul 28 16:36:17 2026 // Verilog file for RocketTile -// naja version: 0.7.15 -// Git hash: e1a649e +// naja version: 0.7.18 +// Git hash: 03c31df //////////////////////////////////////////////////////////////////////////////// (* keep_hierarchy=1 *) diff --git a/example/tinyrocket_sec_probe_edited.v b/example/tinyrocket_sec_probe_edited.v index 0382e699..e61c1b4e 100644 --- a/example/tinyrocket_sec_probe_edited.v +++ b/example/tinyrocket_sec_probe_edited.v @@ -1,8 +1,8 @@ //////////////////////////////////////////////////////////////////////////////// -// Fri Jul 17 00:15:51 2026 +// Tue Jul 28 16:36:17 2026 // Verilog file for RocketTile -// naja version: 0.7.15 -// Git hash: e1a649e +// naja version: 0.7.18 +// Git hash: 03c31df //////////////////////////////////////////////////////////////////////////////// (* keep_hierarchy=1 *) diff --git a/example/tinyrocket_sec_probe_naja.if/db_implementation.snl b/example/tinyrocket_sec_probe_naja.if/db_implementation.snl index b6d9b2db04caca1cf6a57ffc15b74fa394681931..a0d490313fef40d12ce7e5920f7aa3717b5ce079 100644 GIT binary patch delta 274 zcmYk$DGtI=0EA&mANyMNtt@4SvM6kCg5?qjNJ!oh5G3F@0m+jHBmzrP!!bw|zkmes zxtYnF-#6`y%}(3-FZ#j_>OQ}riM_K>FE#%Aczpch^VC(HS7QN;dwTMJieodA&vx+ z>iABbw*RSItqqt+BZDk*$fJNFN+_eER_p3jeix)AEYwg(15LEhMh9K=(8mBnj4)P~ Uu&w)Vh>y~7CzxWU9C!Y(KTp$H>;M1& delta 274 zcmYk%ISRs107X#~<2)tKQyk)~aj2}b5+VDrP!N7=XCde&#J>Pbi`b`e8Dixv6f916 zdGPkHo3h7dr|i^AaOsDYfNCh}!SQTMto$G}gb+pqQN-lRj~mVZ`tUsKnmE4WNFa$6 z((?GuoVNd|aMwBvWRXK21r$+285LAflkU2H72gG6Y9<