compiler.*: moving all words only relevant for testing to compiler.test

diff --git a/basis/compiler/cfg/branch-splitting/branch-splitting-tests.factor b/basis/compiler/cfg/branch-splitting/branch-splitting-tests.factor
index 0b15d96dd79ccb2b77d14fdb7a56f6d99cf48ffa..e3e0f000f98ca977b3993bddc575d84b01440ce1 100644 (file)
--- a/basis/compiler/cfg/branch-splitting/branch-splitting-tests.factor
+++ b/basis/compiler/cfg/branch-splitting/branch-splitting-tests.factor
@@ -1,7 +1,6 @@
-USING: accessors assocs compiler.cfg.utilities compiler.cfg
-compiler.cfg.branch-splitting compiler.cfg.debugger
-compiler.cfg.predecessors compiler.cfg.rpo compiler.cfg.instructions fry kernel
-tools.test namespaces sequences vectors ;
+USING: accessors assocs compiler.cfg.branch-splitting
+compiler.cfg.instructions compiler.cfg.predecessors compiler.cfg.rpo
+compiler.cfg.utilities compiler.test fry kernel namespaces tools.test ;
 IN: compiler.cfg.branch-splitting.tests
 
 : get-predecessors ( cfg -- assoc )

diff --git a/basis/compiler/cfg/copy-prop/copy-prop-tests.factor b/basis/compiler/cfg/copy-prop/copy-prop-tests.factor
index b3c452d2f26d7bdf538b3473cc4f4fe418c61697..bf996b101768ce757f616ba211eec9013f95f14a 100644 (file)
--- a/basis/compiler/cfg/copy-prop/copy-prop-tests.factor
+++ b/basis/compiler/cfg/copy-prop/copy-prop-tests.factor
@@ -1,6 +1,6 @@
-USING: accessors compiler.cfg  compiler.cfg.copy-prop compiler.cfg.debugger
-compiler.cfg.instructions compiler.cfg.registers compiler.cfg.utilities
-cpu.architecture kernel namespaces tools.test ;
+USING: accessors compiler.cfg.copy-prop compiler.cfg.instructions
+compiler.cfg.registers compiler.cfg.utilities compiler.test
+cpu.architecture namespaces tools.test ;
 IN: compiler.cfg.copy-prop.tests
 
 : test-copy-propagation ( -- )

diff --git a/basis/compiler/cfg/debugger/debugger.factor b/basis/compiler/cfg/debugger/debugger.factor
index b396e2039776c869ce2a38cdff3e1dc8bb1e2368..f59860f213a5a592b24f68036473cabb6b4f51dd 100644 (file)
--- a/basis/compiler/cfg/debugger/debugger.factor
+++ b/basis/compiler/cfg/debugger/debugger.factor
@@ -1,17 +1,14 @@
 ! Copyright (C) 2008, 2011 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs classes.tuple compiler.cfg
-compiler.cfg.builder compiler.cfg.def-use
-compiler.cfg.finalization compiler.cfg.gc-checks
+compiler.cfg.builder compiler.cfg.finalization compiler.cfg.gc-checks
 compiler.cfg.instructions compiler.cfg.linearization
 compiler.cfg.optimizer compiler.cfg.registers
-compiler.cfg.representations
-compiler.cfg.representations.preferred compiler.cfg.rpo
-compiler.cfg.save-contexts
-compiler.cfg.utilities compiler.tree.builder
-compiler.tree.optimizer compiler.units fry hashtables io kernel math
-namespaces prettyprint prettyprint.backend prettyprint.custom
-prettyprint.sections quotations random sequences vectors words strings ;
+compiler.cfg.representations compiler.cfg.save-contexts
+compiler.cfg.utilities compiler.tree.builder compiler.tree.optimizer
+fry io kernel namespaces prettyprint prettyprint.backend
+prettyprint.custom prettyprint.sections quotations sequences strings
+words ;
 FROM: compiler.cfg.linearization => number-blocks ;
 IN: compiler.cfg.debugger
 
@@ -91,38 +88,3 @@ M: insn insn. tuple>array but-last [
 M: ds-loc pprint* \ D: pprint-loc ;
 
 M: rs-loc pprint* \ R: pprint-loc ;
-
-: resolve-phis ( bb -- )
-    [
-        [ [ [ get ] dip ] assoc-map ] change-inputs drop
-    ] each-phi ;
-
-: test-bb ( insns n -- )
-    [ insns>block dup ] keep set resolve-phis ;
-
-: edge ( from to -- )
-    [ get ] bi@ 1vector >>successors drop ;
-
-: edges ( from tos -- )
-    [ get ] [ [ get ] V{ } map-as ] bi* >>successors drop ;
-
-: test-diamond ( -- )
-    0 1 edge
-    1 { 2 3 } edges
-    2 4 edge
-    3 4 edge ;
-
-: fake-representations ( cfg -- )
-    post-order [
-        instructions>> [
-            [ [ temp-vregs ] [ temp-vreg-reps ] bi zip ]
-            [ [ defs-vregs ] [ defs-vreg-reps ] bi zip ]
-            bi append
-        ] map concat
-    ] map concat >hashtable representations set ;
-
-: count-insns ( quot insn-check -- ? )
-    [ test-regs [ cfg>insns ] map concat ] dip count ; inline
-
-: contains-insn? ( quot insn-check -- ? )
-    count-insns 0 > ; inline

diff --git a/basis/compiler/cfg/def-use/def-use-tests.factor b/basis/compiler/cfg/def-use/def-use-tests.factor
index 4db5676289ff2e880e81138bd6a974e11d170587..71127c40cf5913a496f9cfa580925ed55c174598 100644 (file)
--- a/basis/compiler/cfg/def-use/def-use-tests.factor
+++ b/basis/compiler/cfg/def-use/def-use-tests.factor
@@ -1,9 +1,8 @@
 ! Copyright (C) 2009 Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel tools.test accessors vectors sequences namespaces
-arrays compiler.cfg.def-use compiler.cfg compiler.cfg.debugger
-compiler.cfg.instructions compiler.cfg.registers compiler.cfg.utilities
-cpu.architecture ;
+USING: compiler.cfg.def-use compiler.cfg.instructions
+compiler.cfg.registers compiler.cfg.utilities compiler.test namespaces
+tools.test ;
 IN: compiler.cfg.def-use.tests
 
 ! compute-insns

diff --git a/basis/compiler/cfg/dominance/dominance-tests.factor b/basis/compiler/cfg/dominance/dominance-tests.factor
index 01d1d347527e80d6f96c47d86ee09a3935498d74..bd9e195cae04e1f1d58418d0bfbd93f4bef42e50 100644 (file)
--- a/basis/compiler/cfg/dominance/dominance-tests.factor
+++ b/basis/compiler/cfg/dominance/dominance-tests.factor
@@ -1,7 +1,6 @@
-USING:  accessors arrays assocs compiler.cfg compiler.cfg.dominance
-compiler.cfg.dominance.private compiler.cfg.debugger compiler.cfg.predecessors
-compiler.cfg.utilities grouping kernel math.ranges namespaces sequences sets
-tools.test vectors ;
+USING: accessors arrays assocs compiler.cfg.dominance
+compiler.cfg.dominance.private compiler.cfg.utilities compiler.test
+grouping kernel math.ranges namespaces sequences sets tools.test ;
 IN: compiler.cfg.dominance.tests
 
 : test-dominance ( -- )

diff --git a/basis/compiler/cfg/gc-checks/gc-checks-tests.factor b/basis/compiler/cfg/gc-checks/gc-checks-tests.factor
index 4d5f131194505456e879091b879fc555b6da758d..d5c1203bd4e56c07718d8f7f129900ee0a0eb84b 100644 (file)
--- a/basis/compiler/cfg/gc-checks/gc-checks-tests.factor
+++ b/basis/compiler/cfg/gc-checks/gc-checks-tests.factor
@@ -1,9 +1,9 @@
 USING: accessors alien arrays byte-arrays combinators.short-circuit
-compiler.cfg compiler.cfg.comparisons compiler.cfg.debugger
-compiler.cfg.gc-checks compiler.cfg.gc-checks.private
-compiler.cfg.instructions compiler.cfg.registers compiler.cfg.rpo
-compiler.cfg.utilities compiler.test cpu.architecture kernel layouts
-math memory namespaces sequences tools.test ;
+compiler.cfg compiler.cfg.comparisons compiler.cfg.gc-checks
+compiler.cfg.gc-checks.private compiler.cfg.instructions
+compiler.cfg.registers compiler.cfg.rpo compiler.cfg.utilities
+compiler.test cpu.architecture kernel layouts math memory namespaces
+sequences tools.test ;
 IN: compiler.cfg.gc-checks.tests
 
 ! insert-gc-check?

diff --git a/basis/compiler/cfg/linearization/linearization-tests.factor b/basis/compiler/cfg/linearization/linearization-tests.factor
index fb77d831cf7af5247d53b95d7a47cd5130b0db7e..9c3e9c4aa603c948b77b9ae84cc9c82398d49727 100644 (file)
--- a/basis/compiler/cfg/linearization/linearization-tests.factor
+++ b/basis/compiler/cfg/linearization/linearization-tests.factor
@@ -1,6 +1,6 @@
-USING: accessors assocs compiler.cfg.debugger compiler.cfg
-compiler.cfg.linearization compiler.cfg.linearization.private
-compiler.cfg.utilities dlists kernel make namespaces sequences tools.test ;
+USING: accessors assocs compiler.cfg.linearization
+compiler.cfg.linearization.private compiler.cfg.utilities
+compiler.test kernel make namespaces sequences tools.test ;
 IN: compiler.cfg.linearization.tests
 
 ! linearization-order

diff --git a/basis/compiler/cfg/liveness/liveness-tests.factor b/basis/compiler/cfg/liveness/liveness-tests.factor
index 70bd19d8a7c5ad601a11aeef72d754c52a8950f7..fbd375c02717502fb058be474a5a255904245335 100644 (file)
--- a/basis/compiler/cfg/liveness/liveness-tests.factor
+++ b/basis/compiler/cfg/liveness/liveness-tests.factor
@@ -1,9 +1,9 @@
 USING: accessors alien assocs compiler.cfg compiler.cfg.comparisons
-compiler.cfg.debugger compiler.cfg.def-use compiler.cfg.instructions
-compiler.cfg.liveness compiler.cfg.registers
-compiler.cfg.ssa.destruction.leaders compiler.cfg.utilities
-cpu.architecture cpu.x86.assembler.operands kernel math namespaces
-sequences system tools.test ;
+compiler.cfg.def-use compiler.cfg.instructions compiler.cfg.liveness
+compiler.cfg.registers compiler.cfg.ssa.destruction.leaders
+compiler.cfg.utilities compiler.test cpu.architecture
+cpu.x86.assembler.operands kernel math namespaces sequences system
+tools.test ;
 IN: compiler.cfg.liveness.tests
 QUALIFIED: sets
 

diff --git a/basis/compiler/cfg/loop-detection/loop-detection-tests.factor b/basis/compiler/cfg/loop-detection/loop-detection-tests.factor
index af0d933de03383c3a096a5b3d49039f191e03622..3b8e916ecc9e77ad6287b0f7bb5caad7d7b84278 100644 (file)
--- a/basis/compiler/cfg/loop-detection/loop-detection-tests.factor
+++ b/basis/compiler/cfg/loop-detection/loop-detection-tests.factor
@@ -1,7 +1,6 @@
-USING: accessors compiler.cfg.debugger
-compiler.cfg.loop-detection compiler.cfg.loop-detection.private
-compiler.cfg.utilities kernel namespaces sequences sets
-tools.test ;
+USING: accessors compiler.cfg.loop-detection
+compiler.cfg.loop-detection.private compiler.cfg.utilities
+compiler.test kernel namespaces sequences sets tools.test ;
 IN: compiler.cfg.loop-detection.tests
 
 { V{ 0 } { 1 } } [

diff --git a/basis/compiler/cfg/representations/coalescing/coalescing-tests.factor b/basis/compiler/cfg/representations/coalescing/coalescing-tests.factor
index febf08060aae273d8f038234f33e58f11d733dc8..a399bc6c36625cb02b51612c270bd1d08a8e4ca3 100644 (file)
--- a/basis/compiler/cfg/representations/coalescing/coalescing-tests.factor
+++ b/basis/compiler/cfg/representations/coalescing/coalescing-tests.factor
@@ -1,10 +1,6 @@
-USING: arrays sequences kernel namespaces accessors compiler.cfg
-compiler.cfg.instructions
-compiler.cfg.registers
-compiler.cfg.debugger
-compiler.cfg.representations.coalescing
-compiler.cfg.utilities
-tools.test ;
+USING: compiler.cfg.instructions compiler.cfg.registers
+compiler.cfg.representations.coalescing compiler.cfg.utilities
+compiler.test kernel namespaces tools.test ;
 IN: compiler.cfg.representations.coalescing.tests
 
 : test-scc ( -- )

diff --git a/basis/compiler/cfg/representations/representations-tests.factor b/basis/compiler/cfg/representations/representations-tests.factor
index a71f255afd521471fc0bcabbe527140a753b62d2..c5cdc5d2c4c5181904e0c0db1d95b4692e959730 100644 (file)
--- a/basis/compiler/cfg/representations/representations-tests.factor
+++ b/basis/compiler/cfg/representations/representations-tests.factor
@@ -1,11 +1,9 @@
-USING: accessors compiler.cfg compiler.cfg.debugger
+USING: accessors compiler.cfg compiler.cfg.comparisons
 compiler.cfg.instructions compiler.cfg.registers
-compiler.cfg.representations.preferred cpu.architecture kernel
-namespaces tools.test sequences arrays system literals layouts
-math compiler.constants compiler.cfg.representations.conversion
-compiler.cfg.representations.rewrite
-compiler.cfg.comparisons compiler.cfg.utilities
-make ;
+compiler.cfg.representations.conversion
+compiler.cfg.representations.preferred compiler.cfg.utilities
+compiler.constants compiler.test cpu.architecture kernel layouts
+literals make math namespaces sequences system tools.test ;
 FROM: alien.c-types => char ;
 IN: compiler.cfg.representations
 

diff --git a/basis/compiler/cfg/save-contexts/save-contexts-tests.factor b/basis/compiler/cfg/save-contexts/save-contexts-tests.factor
index b54bda733498de1e02364b581e717add73ad140c..91efe3da9872784f328429d4ffdee8f71b7aa20b 100644 (file)
--- a/basis/compiler/cfg/save-contexts/save-contexts-tests.factor
+++ b/basis/compiler/cfg/save-contexts/save-contexts-tests.factor
@@ -1,7 +1,6 @@
-USING: accessors compiler.cfg.debugger
-compiler.cfg.instructions compiler.cfg.registers
-compiler.cfg.save-contexts kernel namespaces tools.test
-cpu.x86.assembler.operands cpu.architecture ;
+USING: accessors compiler.cfg.instructions compiler.cfg.registers
+compiler.cfg.save-contexts compiler.test cpu.architecture kernel
+namespaces tools.test ;
 IN: compiler.cfg.save-contexts.tests
 
 ! insns-needs-save-context?

diff --git a/basis/compiler/cfg/ssa/construction/construction-tests.factor b/basis/compiler/cfg/ssa/construction/construction-tests.factor
index d31969872e52c7db79697929113e8c9a2af89994..1332845f181a73a5454919de8ab695b2522be2b7 100644 (file)
--- a/basis/compiler/cfg/ssa/construction/construction-tests.factor
+++ b/basis/compiler/cfg/ssa/construction/construction-tests.factor
@@ -1,9 +1,7 @@
-USING: accessors compiler.cfg compiler.cfg.debugger
-compiler.cfg.dominance compiler.cfg.instructions
-compiler.cfg.predecessors compiler.cfg.ssa.construction assocs
-compiler.cfg.registers compiler.cfg.ssa.construction.private
-compiler.cfg.utilities cpu.architecture kernel namespaces sequences tools.test
-vectors ;
+USING: accessors assocs compiler.cfg compiler.cfg.instructions
+compiler.cfg.registers compiler.cfg.ssa.construction
+compiler.cfg.ssa.construction.private compiler.cfg.utilities
+compiler.test kernel namespaces sequences tools.test ;
 IN: compiler.cfg.ssa.construction.tests
 
 ! insert-phi-later

diff --git a/basis/compiler/cfg/ssa/construction/tdmsc/tdmsc-tests.factor b/basis/compiler/cfg/ssa/construction/tdmsc/tdmsc-tests.factor
index fbfaa50289ff6a1582bf4ac4cdf0bb18549d15a4..bc8483313bbb3d8a932303ade5f68532612131f4 100644 (file)
--- a/basis/compiler/cfg/ssa/construction/tdmsc/tdmsc-tests.factor
+++ b/basis/compiler/cfg/ssa/construction/tdmsc/tdmsc-tests.factor
@@ -1,6 +1,6 @@
-USING: accessors arrays compiler.cfg compiler.cfg.debugger
+USING: accessors arrays compiler.cfg
 compiler.cfg.ssa.construction.tdmsc compiler.cfg.utilities
-kernel namespaces sequences tools.test ;
+compiler.test kernel namespaces sequences tools.test ;
 QUALIFIED: sets
 IN: compiler.cfg.ssa.construction.tdmsc.tests
 

diff --git a/basis/compiler/cfg/ssa/interference/interference-tests.factor b/basis/compiler/cfg/ssa/interference/interference-tests.factor
index 7daf6b5d2c61018173358372311344cddc51083b..334f5049f1920551ac44159888279d4d1d2ccb20 100644 (file)
--- a/basis/compiler/cfg/ssa/interference/interference-tests.factor
+++ b/basis/compiler/cfg/ssa/interference/interference-tests.factor
@@ -1,13 +1,10 @@
-USING: accessors compiler.cfg compiler.cfg.debugger
-compiler.cfg.def-use compiler.cfg.dominance
-compiler.cfg.instructions compiler.cfg.liveness
-compiler.cfg.registers compiler.cfg.predecessors
-compiler.cfg.comparisons compiler.cfg.ssa.interference
-compiler.cfg.ssa.interference.private
+USING: accessors alien.c-types compiler.cfg.comparisons
+compiler.cfg.def-use compiler.cfg.instructions compiler.cfg.liveness
+compiler.cfg.registers compiler.cfg.ssa.interference
 compiler.cfg.ssa.interference.live-ranges
-compiler.cfg.utilities
-cpu.architecture kernel namespaces tools.test alien.c-types
-arrays sequences slots ;
+compiler.cfg.ssa.interference.private compiler.cfg.utilities
+compiler.test cpu.architecture kernel namespaces sequences slots
+tools.test ;
 IN: compiler.cfg.ssa.interference.tests
 
 : test-interference ( -- )

diff --git a/basis/compiler/cfg/stacks/padding/padding-tests.factor b/basis/compiler/cfg/stacks/padding/padding-tests.factor
index 045623fa0904f929b6883aeec31be4de08e4b450..49c34313b19af62ac0ef93d3f3ec49922c40d8e8 100644 (file)
--- a/basis/compiler/cfg/stacks/padding/padding-tests.factor
+++ b/basis/compiler/cfg/stacks/padding/padding-tests.factor
@@ -1,6 +1,6 @@
 USING: accessors arrays assocs compiler.cfg.instructions compiler.cfg.registers
-compiler.cfg.stacks.padding compiler.cfg.utilities kernel sequences sorting
-vectors tools.test ;
+compiler.cfg.stacks.padding compiler.cfg.utilities compiler.test kernel
+sequences sorting vectors tools.test ;
 IN: compiler.cfg.stacks.padding.tests
 
 ! classify-read: initialized locations

diff --git a/basis/compiler/cfg/utilities/utilities.factor b/basis/compiler/cfg/utilities/utilities.factor
index 9cbc663dac1d501c271bf1b5828f2a01e0f60837..e09ad88735f2b188d2a5f0a9fb6818ca3337ca8d 100644 (file)
--- a/basis/compiler/cfg/utilities/utilities.factor
+++ b/basis/compiler/cfg/utilities/utilities.factor
@@ -83,9 +83,6 @@ IN: compiler.cfg.utilities
 : connect-Nto1-bbs ( froms to -- )
     '[ _ connect-bbs ] each ;
 
-: make-edges ( block-map edgelist -- )
-    [ [ of ] with map first2 connect-bbs ] with each ;
-
 ! Abstract generic stuff
 MACRO: apply-passes ( passes -- quot: ( obj -- ) )
     unclip-last [ [ 1array \ dup prefix ] map [ ] concat-as ] dip suffix ;

diff --git a/basis/compiler/cfg/value-numbering/value-numbering-tests.factor b/basis/compiler/cfg/value-numbering/value-numbering-tests.factor
index 4a2cf7d51df921fe26d48ec0333777a1a316acc9..5ddc4b40839bdc1b3fea0f2e476596819ee5fc00 100644 (file)
--- a/basis/compiler/cfg/value-numbering/value-numbering-tests.factor
+++ b/basis/compiler/cfg/value-numbering/value-numbering-tests.factor
@@ -1,10 +1,9 @@
-USING: accessors alien assocs combinators.short-circuit
-compiler.cfg compiler.cfg.comparisons compiler.cfg.dce
-compiler.cfg.debugger compiler.cfg.instructions
+USING: accessors alien assocs combinators.short-circuit compiler.cfg
+compiler.cfg.comparisons compiler.cfg.dce compiler.cfg.instructions
 compiler.cfg.registers compiler.cfg.representations
 compiler.cfg.ssa.destruction compiler.cfg.utilities
-compiler.cfg.value-numbering cpu.architecture kernel layouts
-literals math namespaces sequences system tools.test ;
+compiler.cfg.value-numbering compiler.test cpu.architecture kernel
+layouts literals math namespaces sequences system tools.test ;
 ! need cfg simd loaded for some tests
 USE: compiler.cfg.value-numbering.simd
 QUALIFIED-WITH: alien.c-types c

diff --git a/basis/compiler/test/test.factor b/basis/compiler/test/test.factor
index 2f0386c238e4cfa7a0c37ba75a32b11fb1b7106f..926665eac9b394f0bf578370418bb38cd8dc4cba 100644 (file)
--- a/basis/compiler/test/test.factor
+++ b/basis/compiler/test/test.factor
@@ -1,7 +1,14 @@
 ! Copyright (C) 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays compiler.cfg compiler.units kernel sequences
-stack-checker tools.test vocabs words ;
+USING: accessors arrays assocs compiler.cfg compiler.cfg.debugger
+compiler.cfg.def-use compiler.cfg.linearization compiler.cfg.registers
+compiler.cfg.representations.preferred compiler.cfg.rpo
+compiler.cfg.stacks compiler.cfg.stacks.local compiler.cfg.utilities
+compiler.tree.builder compiler.tree.checker compiler.tree.def-use
+compiler.tree.normalization compiler.tree.propagation
+compiler.tree.propagation.info compiler.tree.recursive compiler.units
+fry hashtables kernel math namespaces sequences stack-checker
+tools.test vectors vocabs words ;
 IN: compiler.test
 
 : decompile ( word -- )
@@ -18,9 +25,6 @@ IN: compiler.test
 : compiler-test ( name -- )
     "resource:basis/compiler/tests/" ".factor" surround run-test-file ;
 
-USING: compiler.cfg.registers compiler.cfg.stacks compiler.cfg.stacks.local
-fry namespaces ;
-
 : init-cfg-test ( -- )
     reset-vreg-counter begin-stack-analysis
     <basic-block> dup basic-block set begin-local-analysis
@@ -29,3 +33,56 @@ fry namespaces ;
 
 : cfg-unit-test ( result quot -- )
     '[ init-cfg-test @ ] unit-test ; inline
+
+: edge ( from to -- )
+    [ get ] bi@ 1vector >>successors drop ;
+
+: edges ( from tos -- )
+    [ get ] [ [ get ] V{ } map-as ] bi* >>successors drop ;
+
+: test-diamond ( -- )
+    0 1 edge
+    1 { 2 3 } edges
+    2 4 edge
+    3 4 edge ;
+
+: resolve-phis ( bb -- )
+    [
+        [ [ [ get ] dip ] assoc-map ] change-inputs drop
+    ] each-phi ;
+
+: test-bb ( insns n -- )
+    [ insns>block dup ] keep set resolve-phis ;
+
+: fake-representations ( cfg -- )
+    post-order [
+        instructions>> [
+            [ [ temp-vregs ] [ temp-vreg-reps ] bi zip ]
+            [ [ defs-vregs ] [ defs-vreg-reps ] bi zip ]
+            bi append
+        ] map concat
+    ] map concat >hashtable representations set ;
+
+: count-insns ( quot insn-check -- ? )
+    [ test-regs [ cfg>insns ] map concat ] dip count ; inline
+
+: contains-insn? ( quot insn-check -- ? )
+    count-insns 0 > ; inline
+
+: make-edges ( block-map edgelist -- )
+    [ [ of ] with map first2 connect-bbs ] with each ;
+
+: final-info ( quot -- seq )
+    build-tree
+    analyze-recursive
+    normalize
+    propagate
+    compute-def-use
+    dup check-nodes
+    last node-input-infos ;
+
+: final-classes ( quot -- seq )
+    final-info [ class>> ] map ;
+
+: final-literals ( quot -- seq )
+    final-info [ literal>> ] map ;

diff --git a/basis/compiler/tests/low-level-ir.factor b/basis/compiler/tests/low-level-ir.factor
index 4f99bf8f27347383a44f9c1b5e857d234f4e0910..15c01f9d7d7fc6d779f8258d32f2969690d7f03a 100644 (file)
--- a/basis/compiler/tests/low-level-ir.factor
+++ b/basis/compiler/tests/low-level-ir.factor
@@ -1,10 +1,9 @@
-USING: accessors assocs combinators compiler compiler.cfg
-compiler.cfg.debugger compiler.cfg.instructions
-compiler.cfg.registers compiler.cfg.linear-scan
-compiler.cfg.ssa.destruction compiler.cfg.build-stack-frame
-compiler.cfg.utilities compiler.codegen compiler.units cpu.architecture
-hashtables kernel namespaces sequences tools.test vectors words layouts
-literals math arrays alien.c-types alien.syntax math.private ;
+USING: alien.c-types arrays assocs combinators compiler.cfg
+compiler.cfg.build-stack-frame compiler.cfg.instructions
+compiler.cfg.linear-scan compiler.cfg.registers
+compiler.cfg.ssa.destruction compiler.cfg.utilities compiler.codegen
+compiler.test compiler.units cpu.architecture hashtables kernel
+layouts literals math namespaces sequences tools.test words ;
 IN: compiler.tests.low-level-ir
 
 : compile-cfg ( cfg -- word )

diff --git a/basis/compiler/tree/debugger/debugger.factor b/basis/compiler/tree/debugger/debugger.factor
index 5ea6f03d4f66f81194113e3f33dcd1b33b18bfdb..2c5e4397dc76d6bcf180b71fc5127bfb168be319 100644 (file)
--- a/basis/compiler/tree/debugger/debugger.factor
+++ b/basis/compiler/tree/debugger/debugger.factor
@@ -184,22 +184,6 @@ SYMBOL: node-count
     make-report report. ;
 
 ! More utilities
-
-: final-info ( quot -- seq )
-    build-tree
-    analyze-recursive
-    normalize
-    propagate
-    compute-def-use
-    dup check-nodes
-    last node-input-infos ;
-
-: final-classes ( quot -- seq )
-    final-info [ class>> ] map ;
-
-: final-literals ( quot -- seq )
-    final-info [ literal>> ] map ;
-
 : cleaned-up-tree ( quot -- nodes )
     [
         build-tree

diff --git a/basis/compiler/tree/propagation/call-effect/call-effect-tests.factor b/basis/compiler/tree/propagation/call-effect/call-effect-tests.factor
index 26f68dc6c983fda414d919cc4824715f45851e3b..0511fbc8f7a17de2ea35c3ea187f2eb5446a4830 100644 (file)
--- a/basis/compiler/tree/propagation/call-effect/call-effect-tests.factor
+++ b/basis/compiler/tree/propagation/call-effect/call-effect-tests.factor
@@ -1,9 +1,10 @@
 ! Copyright (C) 2009 Slava Pestov, Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors combinators combinators.private compiler.tree
-compiler.tree.propagation.call-effect compiler.units math effects kernel
-compiler.tree.builder compiler.tree.optimizer compiler.tree.debugger sequences
-eval fry kernel.private tools.test ;
+USING: accessors combinators combinators.private compiler.test
+compiler.tree compiler.tree.builder compiler.tree.debugger
+compiler.tree.optimizer compiler.tree.propagation.call-effect
+compiler.units effects eval fry kernel kernel.private math sequences
+tools.test ;
 IN: compiler.tree.propagation.call-effect.tests
 
 ! cached-effect

diff --git a/basis/compiler/tree/propagation/propagation-tests.factor b/basis/compiler/tree/propagation/propagation-tests.factor
index ed20f1c6987650e287df2a440f5a8a7711258e31..a63364f10eb2aadb0f896d7a0fef77c7d90cb862 100644 (file)
--- a/basis/compiler/tree/propagation/propagation-tests.factor
+++ b/basis/compiler/tree/propagation/propagation-tests.factor
@@ -1,13 +1,13 @@
 USING: accessors alien alien.accessors alien.c-types alien.data arrays
 assocs byte-arrays classes classes.algebra classes.struct
-classes.tuple.private combinators.short-circuit compiler.tree
-compiler.tree.builder compiler.tree.debugger compiler.tree.optimizer
-compiler.tree.propagation.info effects fry generic.single hashtables
-kernel kernel.private layouts literals locals math math.floats.private
-math.functions math.integers.private math.intervals math.libm
-math.order math.private quotations sequences sequences.private sets
-slots.private sorting specialized-arrays strings strings.private
-system tools.test vectors vocabs words ;
+classes.tuple.private combinators.short-circuit compiler.test
+compiler.tree compiler.tree.builder compiler.tree.debugger
+compiler.tree.optimizer compiler.tree.propagation.info effects fry
+generic.single hashtables kernel kernel.private layouts literals
+locals math math.floats.private math.functions math.integers.private
+math.intervals math.libm math.order math.private quotations sequences
+sequences.private sets slots.private sorting specialized-arrays
+strings strings.private system tools.test vectors vocabs words ;
 FROM: math => float ;
 SPECIALIZED-ARRAY: double
 SPECIALIZED-ARRAY: void*

diff --git a/basis/cpu/x86/x86-tests.factor b/basis/cpu/x86/x86-tests.factor
index 7b5175d19fc45328536c423182cd037ec8b1d13c..5c3efd11c5ab5b04da6bd1f1167a37c11e61356d 100644 (file)
--- a/basis/cpu/x86/x86-tests.factor
+++ b/basis/cpu/x86/x86-tests.factor
@@ -1,9 +1,8 @@
-USING: compiler.cfg.debugger compiler.cfg.instructions
-compiler.cfg.registers compiler.codegen.gc-maps
-compiler.codegen.relocation cpu.architecture cpu.x86 cpu.x86.assembler
-cpu.x86.assembler.operands cpu.x86.features kernel kernel.private
-layouts literals make math math.libm namespaces sequences system
-tools.test ;
+USING: compiler.cfg.instructions compiler.cfg.registers
+compiler.codegen.gc-maps compiler.codegen.relocation compiler.test
+cpu.architecture cpu.x86 cpu.x86.assembler cpu.x86.assembler.operands
+cpu.x86.features kernel kernel.private layouts literals make math
+math.libm namespaces sequences system tools.test ;
 IN: cpu.x86.tests
 
 { } [

diff --git a/extra/compiler/cfg/gvn/testing/testing.factor b/extra/compiler/cfg/gvn/testing/testing.factor
index 9592499d4bcc2ddfd2264b41a62e679c9d37edc9..73e7fe060a9fca9737b332373b2e7fd4c0e55666 100644 (file)
--- a/extra/compiler/cfg/gvn/testing/testing.factor
+++ b/extra/compiler/cfg/gvn/testing/testing.factor
@@ -1,12 +1,11 @@
 ! Copyright (C) 2011 Alex Vondrak.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs compiler.cfg compiler.cfg.debugger
-compiler.cfg.graphviz compiler.cfg.gvn
-compiler.cfg.gvn.expressions compiler.cfg.gvn.graph
-compiler.cfg.optimizer compiler.cfg.utilities continuations formatting graphviz
-graphviz.notation graphviz.render io.directories kernel
-math.parser namespaces prettyprint sequences sorting splitting
-tools.annotations ;
+USING: accessors assocs compiler.cfg compiler.cfg.graphviz
+compiler.cfg.gvn compiler.cfg.gvn.expressions compiler.cfg.gvn.graph
+compiler.cfg.optimizer compiler.cfg.utilities compiler.test
+continuations formatting graphviz.notation graphviz.render
+io.directories kernel math.parser namespaces prettyprint sequences
+sorting splitting tools.annotations ;
 IN: compiler.cfg.gvn.testing
 
 GENERIC: expr>str ( expr -- str )