Skip to content

naja fix for mutliple design representation in lib files #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nanocoh merged 3 commits into from
Jul 28, 2026
Merged

naja fix for mutliple design representation in lib files #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f646b96
naja fix for mutliple designs in lib files
nanocoh Jul 27, 2026
f359f6c
ci: bump najaeda to 0.7.18
nanocoh Jul 28, 2026
694e077
test: regenerate Naja IF fixtures for 0.7.18
nanocoh Jul 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/regress-imc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/regress-ki.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/regress-lec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/regress-pdr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/regress-sec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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() {
(
Expand Down
6 changes: 3 additions & 3 deletions example/tinyrocket_edited.v
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 *)
Expand Down
Binary file modified example/tinyrocket_naja.if/db_implementation.snl
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions example/tinyrocket_naja.if/snl.mf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Binary file modified example/tinyrocket_naja_edited.if/db_implementation.snl
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions example/tinyrocket_naja_edited.if/snl.mf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions example/tinyrocket_sec_probe.v
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 *)
Expand Down
6 changes: 3 additions & 3 deletions example/tinyrocket_sec_probe_edited.v
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 *)
Expand Down
Binary file modified example/tinyrocket_sec_probe_naja.if/db_implementation.snl
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions example/tinyrocket_sec_probe_naja.if/snl.mf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
################################################################################
# Fri Jul 17 00:15:51 2026
# Tue Jul 28 16:36:17 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
Binary file modified example/tinyrocket_sec_probe_naja_edited.if/db_implementation.snl
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions example/tinyrocket_sec_probe_naja_edited.if/snl.mf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
################################################################################
# Fri Jul 17 00:15:51 2026
# Tue Jul 28 16:36:17 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
2 changes: 1 addition & 1 deletion thirdparty/naja
Open in desktop
Submodule naja updated 51 files
+3 −0 src/apps/naja_edit/NajaEdit.cpp
+2 −1 src/bne/actions.cpp
+10 −6 src/core/NajaPerf.cpp
+4 −2 src/core/NajaPerf.h
+1 −1 src/core/NajaVersion.h.in
+19 −3 src/dnl/DNL.h
+33 −18 src/dnl/DNL_impl.h
+4 −0 src/najaeda/najaeda/docs/source/api.rst
+14 −3 src/najaeda/najaeda/docs/source/raw_api.rst
+23 −1 src/najaeda/najaeda/netlist.py
+25 −5 src/nl/formats/liberty/SNLLibertyConstructor.cpp
+13 −0 src/nl/formats/liberty/SNLLibertyConstructor.h
+128 −49 src/nl/formats/systemverilog/frontend/SNLSVConstructor.cpp
+12 −1 src/nl/formats/verilog/backend/SNLVRLDumper.cpp
+22 −5 src/nl/formats/verilog/frontend/SNLVRLConstructor.cpp
+2 −0 src/nl/formats/verilog/frontend/SNLVRLConstructor.h
+76 −0 src/nl/formats/verilog/frontend/SNLVRLConstructorUtils.cpp
+5 −1 src/nl/formats/verilog/frontend/SNLVRLConstructorUtils.h
+8 −0 src/nl/netlist/serialization/capnp/SNLCapnPImplementation.cpp
+3 −1 src/nl/netlist/snl/SNLBitNet.h
+10 −0 src/nl/netlist/snl/SNLBusNet.cpp
+2 −0 src/nl/netlist/snl/SNLBusNet.h
+16 −2 src/nl/netlist/snl/SNLEquipotential.cpp
+3 −1 src/nl/netlist/snl/SNLEquipotential.h
+3 −1 src/nl/netlist/snl/SNLNet.cpp
+24 −6 src/nl/netlist/snl/SNLNet.h
+5 −3 src/nl/python/naja_wrapping/PyNaja.cpp
+3 −1 src/nl/python/naja_wrapping/PySNLBitNet.cpp
+6 −0 src/nl/python/naja_wrapping/PySNLEquipotential.cpp
+7 −1 src/nl/python/naja_wrapping/PySNLNet.cpp
+3 −1 src/nl/python/naja_wrapping/PySNLNetType.cpp
+2 −1 src/optimization/Reduction.cpp
+23 −12 test/core/NajaPerfTests.cpp
+57 −0 test/dnl/DNLTests.cpp
+21 −0 test/najaeda/test_najaeda_netlist0.py
+8 −0 test/najaeda/test_najaeda_netlist2.py
+81 −0 test/nl/formats/liberty/SNLLibertyConstructorTest0.cpp
+10 −0 test/nl/formats/systemverilog/frontend/SNLSVConstructorCoverage.md
+190 −107 test/nl/formats/systemverilog/frontend/SNLSVConstructorTestSimple.cpp
+46 −0 test/nl/formats/verilog/backend/SNLVRLDumperTest1.cpp
+21 −9 test/nl/formats/verilog/backend/SNLVRLDumperTestGate0.cpp
+84 −0 test/nl/formats/verilog/frontend/SNLVRLConstructorTest1.cpp
+62 −0 test/nl/formats/verilog/frontend/SNLVRLConstructorUtilsTest0.cpp
+37 −0 test/nl/python/naja_wrapping/test_naja_logging.py
+12 −0 test/nl/python/naja_wrapping/test_snlequipotential.py
+14 −0 test/nl/python/naja_wrapping/test_snlnet.py
+2 −0 test/nl/snl/kernel/SNLDesignCloneTest.cpp
+26 −0 test/nl/snl/kernel/SNLEquipotentialTest1.cpp
+48 −0 test/nl/snl/kernel/SNLNetTest.cpp
+14 −4 test/nl/snl/serialization/capnp/SNLCapnPTest2.cpp
+1 −1 thirdparty/naja-if
Loading