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.

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

fix: align bbmalloc implementations #1513

Merged
merged 5 commits into from
Aug 11, 2023
Merged

fix: align bbmalloc implementations #1513

merged 5 commits into from
Aug 11, 2023

Conversation

ludamad
Copy link
Collaborator

@ludamad ludamad commented Aug 10, 2023

This was wrong in circuits. This should have never been duplicated (mea culpa). The implementations drifted with the WASI SDK version 20 push.

Don't think we hit issues with this, but they'd be nasty if we did.

@ludamad ludamad requested a review from dbanks12 August 10, 2023 19:03
@@ -1,8 +1,5 @@
#include "aes128.hpp"

#define WASM_EXPORT __attribute__((visibility("default")))
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I cleaned up the places WASM_EXPORT was used while untangling errors. This now takes advantage that 'extern C' is implied by WASM_EXPORT.

@@ -77,14 +77,6 @@ template <size_t TREE_HEIGHT> void rightfill_with_zeroleaves(std::vector<NT::fr>

} // namespace

// Note: We don't have a simple way of calling the barretenberg c-bind.
// Mimic bbmalloc behaviour.
Copy link
Collaborator Author

@ludamad ludamad Aug 10, 2023

Choose a reason for hiding this comment

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

Laziness on my part initially. Goes back to hackathon. Easy now at least to provide a way to call the function while iterating circuits.

@ludamad ludamad changed the title feat: align bbmalloc implementations fix: align bbmalloc implementations Aug 10, 2023
@ludamad ludamad enabled auto-merge (squash) August 10, 2023 19:26
@ludamad ludamad requested a review from Maddiaa0 August 10, 2023 21:15
Copy link
Collaborator

@dbanks12 dbanks12 left a comment

Choose a reason for hiding this comment

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

Nice cleanup! Thanks!

Copy link
Contributor

@Rumata888 Rumata888 left a comment

Choose a reason for hiding this comment

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

Everything looks great. LGTM

@ludamad ludamad merged commit c512fcd into master Aug 11, 2023
@ludamad ludamad deleted the ad/bbmalloc-align-impl branch August 11, 2023 13:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants