stomp.cli: simplify

[factor.git] / basis / compiler / cfg / ssa / destruction / destruction.factor

diff --git a/basis/compiler/cfg/ssa/destruction/destruction.factor b/basis/compiler/cfg/ssa/destruction/destruction.factor
index 8a0d41a9b2822f49f88cd9a13bbfa2ccc9ed0fd2..b962f67316e33f4d61f2eb01740263cd12d3c627 100644 (file)
--- a/basis/compiler/cfg/ssa/destruction/destruction.factor
+++ b/basis/compiler/cfg/ssa/destruction/destruction.factor
@@ -1,97 +1,15 @@
 ! Copyright (C) 2009, 2011 Slava Pestov.
-! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays assocs combinators compiler.cfg.def-use
-compiler.cfg.dominance compiler.cfg.instructions
-compiler.cfg.liveness compiler.cfg.parallel-copy
-compiler.cfg.registers compiler.cfg.rpo compiler.cfg.ssa.cssa
-compiler.cfg.ssa.destruction.leaders
-compiler.cfg.ssa.interference
+! See https://factorcode.org/license.txt for BSD license.
+USING: accessors assocs compiler.cfg.def-use compiler.cfg.dominance
+compiler.cfg.instructions compiler.cfg.liveness
+compiler.cfg.parallel-copy compiler.cfg.rpo compiler.cfg.ssa.cssa
+compiler.cfg.ssa.destruction.coalescing compiler.cfg.ssa.destruction.leaders
 compiler.cfg.ssa.interference.live-ranges compiler.cfg.utilities
-cpu.architecture fry kernel make namespaces sequences sets sorting ;
-FROM: namespaces => set ;
+kernel make sequences namespaces ;
 IN: compiler.cfg.ssa.destruction
 
-SYMBOL: class-element-map
-
 <PRIVATE
 
-SYMBOL: copies
-
-: value-of ( vreg -- value )
-    dup insn-of dup ##tagged>integer? [ nip src>> ] [ drop ] if ;
-
-: init-coalescing ( -- )
-    defs get
-    [ keys unique leader-map set ]
-    [
-        [ [ dup dup value-of ] dip <vreg-info> 1array ] assoc-map
-        class-element-map set
-    ] bi
-    V{ } clone copies set ;
-
-: coalesce-elements ( merged follower leader -- )
-    class-element-map get [ delete-at ] [ set-at ] bi-curry bi* ;
-
-: coalesce-vregs ( merged follower leader -- )
-    2dup swap leader-map get set-at coalesce-elements ;
-
-GENERIC: prepare-insn ( insn -- )
-
-M: insn prepare-insn drop ;
-
-M: alien-call-insn prepare-insn drop ;
-
-M: vreg-insn prepare-insn
-    [ temp-vregs [ leader-map get conjoin ] each ]
-    [
-        [ defs-vregs ] [ uses-vregs ] bi
-        2dup [ empty? not ] both? [
-            [ first ] bi@
-            2dup [ rep-of reg-class-of ] bi@ eq?
-            [ 2array copies get push ] [ 2drop ] if
-        ] [ 2drop ] if
-    ] bi ;
-
-M: ##copy prepare-insn
-    [ dst>> ] [ src>> ] bi 2array copies get push ;
-
-M: ##parallel-copy prepare-insn
-    values>> copies get push-all ;
-
-: leaders ( vreg1 vreg2 -- vreg1' vreg2' )
-    [ leader ] bi@ ;
-
-: vregs-interfere? ( vreg1 vreg2 -- merged/f ? )
-    [ class-element-map get at ] bi@ sets-interfere? ;
-
-ERROR: vregs-shouldn't-interfere vreg1 vreg2 ;
-
-: try-eliminate-copy ( follower leader must? -- )
-    -rot leaders 2dup = [ 3drop ] [
-        2dup vregs-interfere? [
-            drop rot [ vregs-shouldn't-interfere ] [ 2drop ] if
-        ] [ -rot coalesce-vregs drop ] if
-    ] if ;
-
-: try-eliminate-copies ( pairs must? -- )
-    '[ first2 _ try-eliminate-copy ] each ;
-
-M: ##tagged>integer prepare-insn
-    [ dst>> ] [ src>> ] bi t try-eliminate-copy ;
-
-: zip-scalar ( scalar seq -- pairs )
-    [ 2array ] with map ;
-
-M: ##phi prepare-insn
-    [ dst>> ] [ inputs>> values ] bi zip-scalar
-    natural-sort t try-eliminate-copies ;
-
-: prepare-coalescing ( cfg -- )
-    init-coalescing [ [ prepare-insn ] each ] simple-analysis ;
-
-: perform-coalescing ( cfg -- )
-    prepare-coalescing copies get f try-eliminate-copies ;
-
 GENERIC: cleanup-insn ( insn -- )
 
 : useful-copy? ( insn -- ? )
@@ -125,7 +43,7 @@ PRIVATE>
         compute-insns
         compute-live-sets
         compute-live-ranges
-        perform-coalescing
+        coalesce-cfg
         cleanup-cfg
         compute-live-sets
     } apply-passes ;