factor: trim using lists

[factor.git] / extra / compiler / cfg / gvn / gvn.factor

diff --git a/extra/compiler/cfg/gvn/gvn.factor b/extra/compiler/cfg/gvn/gvn.factor
index ef449ce4591208ce275eecec2121600347d238ff..a1c77878a9a762a6aa7bb9251a884abbfc48d32c 100644 (file)
--- a/extra/compiler/cfg/gvn/gvn.factor
+++ b/extra/compiler/cfg/gvn/gvn.factor
@@ -1,29 +1,16 @@
 ! Copyright (C) 2008, 2010 Slava Pestov, 2011 Alex Vondrak
 ! See http://factorcode.org/license.txt for BSD license.
-USING: namespaces arrays assocs hashtables kernel accessors fry
-grouping sorting sets sequences locals
-cpu.architecture
-sequences.deep
-compiler.cfg
-compiler.cfg.rpo
-compiler.cfg.def-use
-compiler.cfg.utilities
-compiler.cfg.instructions
-compiler.cfg.predecessors
-compiler.cfg.gvn.alien
-compiler.cfg.gvn.avail
-compiler.cfg.gvn.comparisons
-compiler.cfg.gvn.graph
-compiler.cfg.gvn.math
-compiler.cfg.gvn.rewrite
-compiler.cfg.gvn.slots
-compiler.cfg.gvn.misc
-compiler.cfg.gvn.expressions ;
+USING: accessors arrays assocs compiler.cfg compiler.cfg.def-use
+compiler.cfg.gvn.avail compiler.cfg.gvn.expressions
+compiler.cfg.gvn.graph compiler.cfg.gvn.rewrite
+compiler.cfg.instructions compiler.cfg.predecessors
+compiler.cfg.rpo compiler.cfg.utilities grouping kernel
+namespaces sequences sequences.deep ;
 IN: compiler.cfg.gvn
 
 GENERIC: simplify ( insn -- insn' )
 
-M: insn simplify dup rewrite [ simplify ] [ ] ?if ;
+M: insn simplify dup rewrite [ simplify ] [ dup >avail-insn-uses ] ?if ;
 M: array simplify [ simplify ] map ;
 M: ##copy simplify ;
 
@@ -96,7 +83,7 @@ M: ##copy gcse defs-available ;
     ] [ drop defs-available ] if ;
 
 : eliminate-redundancy ( insn -- insn' )
-    dup >expr exprs>vns get at
+    dup >expr exprs>vns get at >avail-vreg
     [ ?eliminate ] [ defs-available ] if* ;
 
 M: ##phi gcse
@@ -113,12 +100,15 @@ M: insn gcse
 
 : eliminate-common-subexpressions ( cfg -- )
     final-iteration? on
+    compute-congruence-classes
     dup compute-avail-sets
     [ gcse-step ] simple-optimization ;
 
-: value-numbering ( cfg -- cfg )
-    needs-predecessors
-    dup determine-value-numbers
-    dup eliminate-common-subexpressions
-
-    cfg-changed predecessors-changed ;
+: value-numbering ( cfg -- )
+    {
+        needs-predecessors
+        determine-value-numbers
+        eliminate-common-subexpressions
+        cfg-changed
+        predecessors-changed
+    } apply-passes ;