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[venom]: add make_ssa pass after algebraic optimizations #4292

Merged
merged 15 commits into from
Oct 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 27 additions & 0 deletions tests/unit/compiler/venom/test_algebraic_optimizer.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import pytest

import vyper
from vyper.venom.analysis import IRAnalysesCache
from vyper.venom.basicblock import IRBasicBlock, IRLabel
from vyper.venom.context import IRContext
Expand Down Expand Up @@ -176,3 +177,29 @@ def test_offsets():
offset_count += 1

assert offset_count == 3


# Test the case of https://github.com/vyperlang/vyper/issues/4288
def test_ssa_after_algebraic_optimization():
code = """
@internal
def _do_math(x: uint256) -> uint256:
value: uint256 = x
result: uint256 = 0

if (x >> 128 != 0):
x >>= 128
if (x >> 64 != 0):
x >>= 64

if 1 < value:
result = 1

return result

@external
def run() -> uint256:
return self._do_math(10)
"""

vyper.compile_code(code, output_formats=["bytecode"])
7 changes: 7 additions & 0 deletions vyper/venom/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,13 @@
StoreElimination(ac, fn).run_pass()
SimplifyCFGPass(ac, fn).run_pass()
AlgebraicOptimizationPass(ac, fn).run_pass()
# NOTE: MakeSSA is after algebraic optimization it currently produces
# smaller code by adding some redundant phi nodes. This is not a
# problem for us, but we need to be aware of it, and should be
# removed when the dft pass is fixed to produce the smallest code
# without making the code generation more expensive by running
# MakeSSA again.
MakeSSA(ac, fn).run_pass()

Check warning on line 64 in vyper/venom/__init__.py

View check run for this annotation

Codecov / codecov/patch

vyper/venom/__init__.py#L64

Added line #L64 was not covered by tests
harkal marked this conversation as resolved.
Show resolved Hide resolved
BranchOptimizationPass(ac, fn).run_pass()
RemoveUnusedVariablesPass(ac, fn).run_pass()

Expand Down
5 changes: 4 additions & 1 deletion vyper/venom/analysis/cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@
in_bb.add_cfg_out(bb)

def invalidate(self):
from vyper.venom.analysis import DominatorTreeAnalysis, LivenessAnalysis
from vyper.venom.analysis import DFGAnalysis, DominatorTreeAnalysis, LivenessAnalysis

Check warning on line 35 in vyper/venom/analysis/cfg.py

View check run for this annotation

Codecov / codecov/patch

vyper/venom/analysis/cfg.py#L35

Added line #L35 was not covered by tests

self.analyses_cache.invalidate_analysis(DominatorTreeAnalysis)
self.analyses_cache.invalidate_analysis(LivenessAnalysis)

# be conservative - assume cfg invalidation invalidates dfg
self.analyses_cache.invalidate_analysis(DFGAnalysis)

Check warning on line 41 in vyper/venom/analysis/cfg.py

View check run for this annotation

Codecov / codecov/patch

vyper/venom/analysis/cfg.py#L41

Added line #L41 was not covered by tests
9 changes: 4 additions & 5 deletions vyper/venom/passes/sccp/sccp.py
Original file line number Diff line number Diff line change
Expand Up @@ -332,19 +332,18 @@
def _fix_phi_nodes(self):
# fix basic blocks whose cfg in was changed
# maybe this should really be done in _visit_phi
needs_sort = False

for bb in self.fn.get_basic_blocks():
cfg_in_labels = OrderedSet(in_bb.label for in_bb in bb.cfg_in)

needs_sort = False

Check warning on line 338 in vyper/venom/passes/sccp/sccp.py

View check run for this annotation

Codecov / codecov/patch

vyper/venom/passes/sccp/sccp.py#L338

Added line #L338 was not covered by tests
for inst in bb.instructions:
if inst.opcode != "phi":
break
needs_sort |= self._fix_phi_inst(inst, cfg_in_labels)

# move phi instructions to the top of the block
if needs_sort:
bb.instructions.sort(key=lambda inst: inst.opcode != "phi")
# move phi instructions to the top of the block
if needs_sort:
bb.instructions.sort(key=lambda inst: inst.opcode != "phi")

Check warning on line 346 in vyper/venom/passes/sccp/sccp.py

View check run for this annotation

Codecov / codecov/patch

vyper/venom/passes/sccp/sccp.py#L346

Added line #L346 was not covered by tests

def _fix_phi_inst(self, inst: IRInstruction, cfg_in_labels: OrderedSet):
operands = [op for label, op in inst.phi_operands if label in cfg_in_labels]
Expand Down
7 changes: 4 additions & 3 deletions vyper/venom/passes/store_elimination.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,17 @@
self.analyses_cache.invalidate_analysis(LivenessAnalysis)
self.analyses_cache.invalidate_analysis(DFGAnalysis)

def _process_store(self, dfg, inst, var, new_var):
def _process_store(self, dfg, inst, var: IRVariable, new_var: IRVariable):
"""
Process store instruction. If the variable is only used by a load instruction,
forward the variable to the load instruction.
"""
uses = dfg.get_uses(var)
if any([inst.opcode == "phi" for inst in dfg.get_uses(new_var)]):
return

Check warning on line 36 in vyper/venom/passes/store_elimination.py

View check run for this annotation

Codecov / codecov/patch

vyper/venom/passes/store_elimination.py#L36

Added line #L36 was not covered by tests

uses = dfg.get_uses(var)

Check warning on line 38 in vyper/venom/passes/store_elimination.py

View check run for this annotation

Codecov / codecov/patch

vyper/venom/passes/store_elimination.py#L38

Added line #L38 was not covered by tests
if any([inst.opcode == "phi" for inst in uses]):
return

for use_inst in uses:
for i, operand in enumerate(use_inst.operands):
if operand == var:
Expand Down
Loading