stomp: unescape-header and adjust-stomp-version

[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 3e6172229ab86ee6da122b5d5502de3ad6eef873..b962f67316e33f4d61f2eb01740263cd12d3c627 100644 (file)
--- a/basis/compiler/cfg/ssa/destruction/destruction.factor
+++ b/basis/compiler/cfg/ssa/destruction/destruction.factor
@@ -1,107 +1,49 @@
-! Copyright (C) 2009 Slava Pestov.
-! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays assocs fry kernel namespaces
-sequences sequences.deep
-sets vectors
-compiler.cfg.rpo
-compiler.cfg.def-use
-compiler.cfg.renaming
-compiler.cfg.dominance
-compiler.cfg.instructions
-compiler.cfg.liveness.ssa
-compiler.cfg.ssa.cssa
-compiler.cfg.ssa.interference
-compiler.cfg.ssa.interference.live-ranges
-compiler.cfg.utilities
-compiler.utilities ;
+! Copyright (C) 2009, 2011 Slava Pestov.
+! 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
+kernel make sequences namespaces ;
 IN: compiler.cfg.ssa.destruction
 
-! Maps vregs to leaders.
-SYMBOL: leader-map
+<PRIVATE
 
-: leader ( vreg -- vreg' ) leader-map get compress-path ;
+GENERIC: cleanup-insn ( insn -- )
 
-! Maps leaders to equivalence class elements.
-SYMBOL: class-element-map
+: useful-copy? ( insn -- ? )
+    [ dst>> ] [ src>> ] bi leaders = not ; inline
 
-: class-elements ( vreg -- elts ) class-element-map get at ;
+M: ##copy cleanup-insn
+    dup useful-copy? [ , ] [ drop ] if ;
 
-! Sequence of vreg pairs
-SYMBOL: copies
+M: ##parallel-copy cleanup-insn
+    values>> [ leaders ] assoc-map [ first2 = ] reject
+    parallel-copy-rep % ;
 
-: init-coalescing ( -- )
-    H{ } clone leader-map set
-    H{ } clone class-element-map set
-    V{ } clone copies set ;
+M: ##tagged>integer cleanup-insn
+    dup useful-copy? [ , ] [ drop ] if ;
 
-: classes-interfere? ( vreg1 vreg2 -- ? )
-    [ leader ] bi@ 2dup eq? [ 2drop f ] [
-        [ class-elements flatten ] bi@ sets-interfere?
-    ] if ;
+M: ##phi cleanup-insn drop ;
 
-: update-leaders ( vreg1 vreg2 -- )
-    swap leader-map get set-at ;
+M: insn cleanup-insn , ;
 
-: merge-classes ( vreg1 vreg2 -- )
-    [ [ class-elements ] bi@ push ]
-    [ drop class-element-map get delete-at ] 2bi ;
+: cleanup-cfg ( cfg -- )
+    [ [ [ cleanup-insn ] each ] V{ } make ] simple-optimization ;
 
-: eliminate-copy ( vreg1 vreg2 -- )
-    [ leader ] bi@
-    2dup eq? [ 2drop ] [
-        [ update-leaders ] [ merge-classes ] 2bi
-    ] if ;
+PRIVATE>
 
-: introduce-vreg ( vreg -- )
-    [ leader-map get conjoin ]
-    [ [ 1vector ] keep class-element-map get set-at ] bi ;
-
-GENERIC: prepare-insn ( insn -- )
-
-M: ##copy prepare-insn
-    [ dst>> ] [ src>> ] bi 2array copies get push ;
-
-M: ##phi prepare-insn
-    [ dst>> ] [ inputs>> values ] bi
-    [ eliminate-copy ] with each ;
-
-M: insn prepare-insn drop ;
-
-: prepare-block ( bb -- )
-    instructions>> [ prepare-insn ] each ;
-
-: prepare-coalescing ( cfg -- )
-    init-coalescing
-    defs get keys [ introduce-vreg ] each
-    [ prepare-block ] each-basic-block ;
-
-: process-copies ( -- )
-    copies get [
-        2dup classes-interfere?
-        [ 2drop ] [ eliminate-copy ] if
-    ] assoc-each ;
-
-: useless-copy? ( ##copy -- ? )
-    dup ##copy? [ [ dst>> ] [ src>> ] bi eq? ] [ drop f ] if ;
-
-: perform-renaming ( cfg -- )
-    leader-map get keys [ dup leader ] H{ } map>assoc renamings set
-    [
-        instructions>> [
-            [ rename-insn-defs ]
-            [ rename-insn-uses ]
-            [ [ useless-copy? ] [ ##phi? ] bi or not ] tri
-        ] filter-here
-    ] each-basic-block ;
-
-: destruct-ssa ( cfg -- cfg' )
-    dup cfg-has-phis? [
-        dup construct-cssa
-        dup compute-defs
-        dup compute-dominance
-        compute-ssa-live-sets
-        dup compute-live-ranges
-        dup prepare-coalescing
-        process-copies
-        dup perform-renaming
-    ] when ;
\ No newline at end of file
+: destruct-ssa ( cfg -- )
+    f leader-map set
+    {
+        needs-dominance
+        construct-cssa
+        compute-defs
+        compute-insns
+        compute-live-sets
+        compute-live-ranges
+        coalesce-cfg
+        cleanup-cfg
+        compute-live-sets
+    } apply-passes ;