better results this order

vyperlang · Oct 6, 2024 · 94a9a6e · 94a9a6e
1 parent 018b6a9
commit 94a9a6e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/tests/unit/compiler/venom/test_common_subexpression_elimination.py b/tests/unit/compiler/venom/test_common_subexpression_elimination.py
@@ -17,11 +17,6 @@ def test_common_subexpression_elimination():
     bb.append_instruction("stop")
 
     ac = IRAnalysesCache(fn)
-    from vyper.venom.analysis.available_expression import AvailableExpressionAnalysis
-    avail: AvailableExpressionAnalysis = ac.request_analysis(AvailableExpressionAnalysis)
-    print(fn)
-    for inst in bb.instructions:
-        print(avail.get_available(inst))
 
     CSE(ac, fn).run_pass(1, 5)
 
@@ -43,7 +38,6 @@ def test_common_subexpression_elimination_effects_1():
 
     ac = IRAnalysesCache(fn)
 
-    #ExtractLiteralsPass(ac, fn).run_pass()
     CSE(ac, fn).run_pass()
 
     assert sum(1 for inst in bb.instructions if inst.opcode == "add") == 2, "wrong number of adds"
@@ -65,7 +59,6 @@ def test_common_subexpression_elimination_effects_2():
     bb.append_instruction("stop")
 
     ac = IRAnalysesCache(fn)
-    #ExtractLiteralsPass(ac, fn).run_pass()
     CSE(ac, fn).run_pass()
 
     assert sum(1 for inst in bb.instructions if inst.opcode == "add") == 2, "wrong number of adds"
@@ -85,7 +78,6 @@ def test_common_subexpression_elimination_effect_mstore():
     bb.append_instruction("stop")
 
     ac = IRAnalysesCache(fn)
-    #ExtractLiteralsPass(ac, fn).run_pass()
     CSE(ac, fn).run_pass(1, 5)
 
     assert (

diff --git a/vyper/venom/__init__.py b/vyper/venom/__init__.py
@@ -55,11 +55,12 @@ def _run_passes(fn: IRFunction, optimize: OptimizationLevel) -> None:
     SimplifyCFGPass(ac, fn).run_pass()
     AlgebraicOptimizationPass(ac, fn).run_pass()
     BranchOptimizationPass(ac, fn).run_pass()
-    CSE(ac, fn).run_pass(2, 10)
 
     RemoveUnusedVariablesPass(ac, fn).run_pass()
 
     StoreExpansionPass(ac, fn).run_pass()
+    CSE(ac, fn).run_pass(2, 10)
+    RemoveUnusedVariablesPass(ac, fn).run_pass()
     DFTPass(ac, fn).run_pass()