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

TEMPORARY BASE #65

Merged
merged 9 commits into from
Nov 8, 2023
Merged

TEMPORARY BASE #65

merged 9 commits into from
Nov 8, 2023

Conversation

tim-hoffman
Copy link

@tim-hoffman tim-hoffman commented Oct 24, 2023

When we're ready to update llvm branch, this should be added as a "rebase and merge" or "merge commit" to preserve the PR history.

@tim-hoffman tim-hoffman marked this pull request as draft October 24, 2023 18:21
@tim-hoffman tim-hoffman changed the title FIRST MERGE FOR TEMPORARY BASE TEMPORARY BASE Oct 24, 2023
tim-hoffman and others added 9 commits October 31, 2023 14:32
…#63)

* Update array function tracking
* Update test
* Clean up compiler output
* skip body extraction when the loop has 0 iterations
* Modify interpreter to distinguish between circom functions and loop body functions
* [VAN-676] duplicate extracted functions when flattening branch buckets
* [VAN-670] generate and flatten subcmp counter/run
* impl Debug for Env to be more friendly, expand on test case comment
* remove debug println
* fix: conditions not flattening in non-generated methods
* [VAN-582] properly convert mapped to indexed when there are multiple versions of the subcomponent
* fix XFAIL test outputs so they pass
* add test cases
* handle CallBucket return case in mapped_to_indexed
* fix body_extractor assertion failure
* fix segfault from improper GEP
* use BucketId as key to speed up SimplificationPass
* fix function name to reflect actual usage
* Remove functions that cannot be reached from any template
Co-authored-by: Daniel Dominguez <[email protected]>
…ing the functions (#55)

* Refactor StoreBucket to avoid generating call to "llvm.donothing"
prevent "build" and "run" functions from different templates from merging but all others are open to merging
@tim-hoffman tim-hoffman marked this pull request as ready for review November 6, 2023 18:33
@tim-hoffman tim-hoffman self-assigned this Nov 6, 2023
@tim-hoffman
Copy link
Author

tim-hoffman commented Nov 6, 2023

All of the commits with PR refs were already reviewed. So only the changes from the first 2 and last 1 commits have not already gone through review but they're minor:
f68e4f0 enables loop body extraction and make all tests pass with it enabled
7971ed9 fix a minor compile issue from the revert (or whatever)
e5b719e update tests case expected outputs now that all changes are merged into one branch

@0xddom
Copy link
Collaborator

0xddom commented Nov 7, 2023

Do you want me to approve this or do you want to wait? Are we ready to merge back to llvm?

@tim-hoffman
Copy link
Author

Do you want me to approve this or do you want to wait? Are we ready to merge back to llvm?

Ready from my side. So whenever you guys are ready from the Vanguard side.

Copy link
Collaborator

@0xddom 0xddom left a comment

Choose a reason for hiding this comment

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

Lets go then

@tim-hoffman tim-hoffman merged commit 2090517 into llvm Nov 8, 2023
3 checks passed
@tim-hoffman tim-hoffman deleted the llvm-v2 branch November 8, 2023 15:39
@tim-hoffman tim-hoffman restored the llvm-v2 branch November 8, 2023 15:40
@tim-hoffman tim-hoffman deleted the llvm-v2 branch March 29, 2024 14:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants