Skip to content
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

Jump to bottom

Integrate hashtree for better hashing performance #5188

Merged
merged 12 commits into from
May 2, 2024
Merged

Integrate hashtree for better hashing performance #5188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
979eec7
wip: hashtree
arnetheduck Jul 13, 2023
042a020
bump
arnetheduck Feb 8, 2024
285fa84
Merge remote-tracking branch 'origin/unstable' into hashtree
arnetheduck Apr 2, 2024
68350c4
bump
arnetheduck Apr 3, 2024
c1e7376
bump
arnetheduck Apr 3, 2024
967a1cd
bump
arnetheduck Apr 3, 2024
467e734
bump
arnetheduck Apr 3, 2024
269e13b
let nim know about clang on windows
arnetheduck Apr 3, 2024
5afdde4
Merge branch 'unstable' into hashtree
arnetheduck May 1, 2024
1729ddf
Merge remote-tracking branch 'origin/unstable' into hashtree
arnetheduck May 1, 2024
83eb876
bump
arnetheduck May 1, 2024
6cf9f88
Merge branch 'hashtree' of github.com:status-im/nimbus-eth2 into hash…
arnetheduck May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,10 @@ jobs:
fi
fi

if [[ '${{ runner.os }}' == 'Windows' ]]; then
export NIMFLAGS="${NIMFLAGS} --cc:clang"
fi
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this imply new build requisites for https://nimbus.guide/install.html#build-prerequisites ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not really, this is something our ci builds are set up to do explicitly..

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the problem before this line was that clang pretends to be gcc (via executable name) but isn't compatible enough


export NIMFLAGS="${NIMFLAGS} ${{ matrix.nimflags-extra }}"
echo "NIMFLAGS=${NIMFLAGS}" >> $GITHUB_ENV

Expand Down Expand Up @@ -176,7 +180,7 @@ jobs:

- name: Build binaries (with trace logging enabled)
run: |
${make_cmd} -j ${ncpu} V=1 NIM_COMMIT=${{ matrix.branch }} LOG_LEVEL=TRACE NIMFLAGS="-u:release --opt:none ${{ matrix.nimflags-extra }}"
${make_cmd} -j ${ncpu} V=1 NIM_COMMIT=${{ matrix.branch }} LOG_LEVEL=TRACE NIMFLAGS="-u:release --opt:none ${NIMFLAGS}"
# The Windows image runs out of disk space, so make some room
rm -rf build nimcache

Expand Down
2 changes: 1 addition & 1 deletion vendor/nim-ssz-serialization
Open in desktop
Submodule nim-ssz-serialization updated 15 files
+8 −1 .github/workflows/ci.yml
+1 −0 .gitignore
+3 −0 .gitmodules
+1 −0 nim.cfg
+11 −2 ssz_serialization.nimble
+1 −1 ssz_serialization/codec.nim
+155 −0 ssz_serialization/digest.nim
+2 −104 ssz_serialization/merkleization.nim
+14 −10 ssz_serialization/proofs.nim
+25 −0 tests/fuzzing/fuzz_hashtree.nim
+7 −0 tests/fuzzing/nim.cfg
+2 −7 tests/test_merkleization.nim
+1 −3 tests/test_merkleization_types.nim
+1 −3 tests/test_proofs.nim
+1 −0 vendor/hashtree