Skip to content

fix[venom]: add make_ssa pass after algebraic optimizations#4292

Merged
charles-cooper merged 15 commits intovyperlang:masterfrom
harkal:fix/make_ssa_after_algebraic
Oct 16, 2024
Merged

fix[venom]: add make_ssa pass after algebraic optimizations#4292
charles-cooper merged 15 commits intovyperlang:masterfrom
harkal:fix/make_ssa_after_algebraic

Conversation

@harkal
Copy link
Copy Markdown
Collaborator

@harkal harkal commented Oct 11, 2024 •
edited by charles-cooper
Loading

What I did

Resolve #4288 caused by unnormalised code after store elimination manipulating phi instructions. Added a test case for it.

How I did it

Perform a MakeSSA pass after algebraic optimizations

How to verify it

Commit message

This commit adds a `MakeSSA` pass after algebraic optimisations. Makes
`StoreElimination` pass skip `phi` instructions and adds a test case
that would fail without this step. The `MakeSSA` pass here results in
smaller code so we are keeping it in for now.

Resolves GH issue #4288

Description for the changelog

Cute Animal Picture

Put a link to a cute animal picture inside the parenthesis-->

@harkal harkal changed the title fix[venom]: Convert to SSA after algebraic optimizations fix[venom]: convert to SSA after algebraic optimizations Oct 11, 2024
@harkal harkal requested a review from charles-cooper October 11, 2024 17:13
@harkal harkal marked this pull request as ready for review October 11, 2024 17:15
@charles-cooper
Copy link
Copy Markdown
Member

charles-cooper commented Oct 11, 2024

How do we get unnormalized code after algebraic optimizations?

@codecov
Copy link
Copy Markdown

codecov bot commented Oct 11, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 10.00000% with 9 lines in your changes missing coverage. Please review.

Project coverage is 50.86%. Comparing base (039d369) to head (674b203).
Report is 60 commits behind head on master.

Files with missing lines Patch % Lines
vyper/venom/passes/sccp/sccp.py 0.00% 3 Missing ⚠️
vyper/venom/passes/store_elimination.py 25.00% 3 Missing ⚠️
vyper/venom/analysis/cfg.py 0.00% 2 Missing ⚠️
vyper/venom/__init__.py 0.00% 1 Missing ⚠️

❗ There is a different number of reports uploaded between BASE (039d369) and HEAD (674b203). Click for more details.

HEAD has 170 uploads less than BASE
Flag BASE (039d369) HEAD (674b203)
187 17
Additional details and impacted files 
@@             Coverage Diff             @@
##           master    #4292       +/-   ##
===========================================
- Coverage   89.39%   50.86%   -38.54%     
===========================================
  Files         112      112               
  Lines       15923    15927        +4     
  Branches     2693     2694        +1     
===========================================
- Hits        14235     8101     -6134     
- Misses       1192     7179     +5987     
- Partials      496      647      +151

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@charles-cooper
Copy link
Copy Markdown
Member

charles-cooper commented Oct 13, 2024

since MakeSSA is expensive, i think this solution works, but is not ideal. i'm ok with merging it as a kludge, but i think we want to leave a note to circle back and figure out why we are being taken out of ssa.

charles-cooper
charles-cooper requested changes Oct 13, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@charles-cooper charles-cooper left a comment

Choose a reason for hiding this comment

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

there's something strange going on -- i checked if we are still in SSA form after the store elim, simplifyCFG and algebraic optimization passes and we still are -- seems something else is going on

charles-cooper
charles-cooper reviewed Oct 14, 2024
View reviewed changes
charles-cooper
charles-cooper reviewed Oct 14, 2024
View reviewed changes
charles-cooper
charles-cooper approved these changes Oct 16, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@charles-cooper charles-cooper left a comment

Choose a reason for hiding this comment

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

magic! 🪄

@charles-cooper charles-cooper changed the title fix[venom]: convert to SSA after algebraic optimizations fix[venom]: add make_ssa pass after algebraic optimizations Oct 16, 2024
@charles-cooper charles-cooper changed the title fix[venom]: add make_ssa pass after algebraic optimizations fix[venom]: add make_ssa pass after algebraic optimizations Oct 16, 2024
@charles-cooper charles-cooper enabled auto-merge (squash) October 16, 2024 16:07
@charles-cooper charles-cooper merged commit b3ea663 into vyperlang:master Oct 16, 2024
@harkal harkal deleted the fix/make_ssa_after_algebraic branch October 16, 2024 18:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@charles-cooper charles-cooper charles-cooper approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Venom bug: IndexError: list index out of range

2 participants

@harkal @charles-cooper