use reject instead of [ ... not ] filter.

[factor.git] / basis / compiler / cfg / parallel-copy / parallel-copy.factor

diff --git a/basis/compiler/cfg/parallel-copy/parallel-copy.factor b/basis/compiler/cfg/parallel-copy/parallel-copy.factor
index 5a1bfcd111dd15e3e06697f4c7b65e1fde2cc478..1a7be5d8fd76f9bdc46f9172a447d4d448011721 100644 (file)
--- a/basis/compiler/cfg/parallel-copy/parallel-copy.factor
+++ b/basis/compiler/cfg/parallel-copy/parallel-copy.factor
@@ -1,60 +1,71 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: assocs compiler.cfg.hats compiler.cfg.instructions
-deques dlists fry kernel locals namespaces sequences
-hashtables ;
+USING: assocs compiler.cfg.instructions compiler.cfg.registers
+compiler.cfg.ssa.destruction.leaders cpu.architecture deques
+dlists fry kernel locals make namespaces sequences ;
+FROM: sets => conjoin ;
 IN: compiler.cfg.parallel-copy
 
-! Revisiting Out-of-SSA Translation for Correctness, Code Quality, and Efficiency
-! http://hal.archives-ouvertes.fr/docs/00/34/99/25/PDF/OutSSA-RR.pdf,
-! Algorithm 1
-
 <PRIVATE
 
-SYMBOLS: temp locs preds to-do ready ;
+SYMBOLS: locs preds to-do ready ;
 
 : init-to-do ( bs -- )
     to-do get push-all-back ;
 
 : init-ready ( bs -- )
-    locs get '[ _ key? not ] filter ready get push-all-front ;
+    locs get '[ _ key? ] reject ready get push-all-front ;
 
-: init ( mapping temp -- )
-    temp set
+: init ( mapping -- )
     <dlist> to-do set
     <dlist> ready set
     [ preds set ]
     [ [ nip dup ] H{ } assoc-map-as locs set ]
     [ keys [ init-to-do ] [ init-ready ] bi ] tri ;
 
-:: process-ready ( b quot -- )
+:: process-ready ( b quot: ( dst src -- ) -- )
     b preds get at :> a
     a locs get at :> c
     b c quot call
     b a locs get set-at
     a c = a preds get at and [ a ready get push-front ] when ; inline
 
-:: process-to-do ( b quot -- )
-    ! Note that we check if b = loc(b), not b = loc(pred(b)) as the
-    ! paper suggests. Confirmed by one of the authors at
-    ! http://www.reddit.com/comments/93253/some_lecture_notes_on_ssa_form/c0bco4f
+:: process-to-do ( b temp: ( src -- dst ) quot: ( dst src -- ) -- )
     b locs get at b = [
-        temp get b quot call
-        temp get b locs get set-at
+        b temp call :> temp
+        temp b quot call
+        temp b locs get set-at
         b ready get push-front
     ] when ; inline
 
 PRIVATE>
 
-:: parallel-mapping ( mapping temp quot -- )
+:: parallel-mapping ( mapping temp: ( src -- dst ) quot: ( dst src -- ) -- )
     [
-        mapping temp init
+        mapping init
         to-do get [
             ready get [
                 quot process-ready
             ] slurp-deque
-            quot process-to-do
+            temp quot process-to-do
         ] slurp-deque
     ] with-scope ; inline
 
-: parallel-copy ( mapping -- ) i [ ##copy ] parallel-mapping ;
\ No newline at end of file
+: parallel-copy ( mapping -- insns )
+    [ next-vreg '[ drop _ ] [ any-rep ##copy, ] parallel-mapping ] { } make ;
+
+<PRIVATE
+
+SYMBOL: temp-vregs
+
+: temp-vreg ( rep -- vreg )
+    temp-vregs get [ next-vreg-rep ] cache
+    [ leader-map get conjoin ] keep ;
+
+PRIVATE>
+
+: parallel-copy-rep ( mapping -- insns )
+    [
+        H{ } clone temp-vregs set
+        [ rep-of temp-vreg ] [ dup rep-of ##copy, ] parallel-mapping
+    ] { } make ;