diff --git a/basis/compiler/cfg/dependence/dependence-tests.factor b/basis/compiler/cfg/dependence/dependence-tests.factor index 6a2c9e6830..71052cd4da 100644 --- a/basis/compiler/cfg/dependence/dependence-tests.factor +++ b/basis/compiler/cfg/dependence/dependence-tests.factor @@ -1,6 +1,7 @@ USING: accessors arrays assocs combinators.short-circuit compiler.cfg.dependence compiler.cfg.instructions -grouping kernel math random sequences tools.test vectors ; +grouping kernel math random sequences tools.test vectors +compiler.cfg.test-words ; IN: compiler.cfg.dependence.tests FROM: sets => members set= ; @@ -77,20 +78,6 @@ ERROR: node-missing-children trees nodes ; select-parent insn>> insn#>> ] unit-test -! Shared with compiler.cfg.scheduling -: test-not-in-order ( -- nodes ) - V{ - ##load-tagged - ##allot - ##set-slot-imm - ##load-reference - ##allot - ##set-slot-imm - ##set-slot-imm - ##set-slot-imm - ##replace - } [ [ new ] [ 2 * ] bi* >>insn# ] map-index ; - ! Another { t } [ 100 [ diff --git a/basis/compiler/cfg/scheduling/scheduling-tests.factor b/basis/compiler/cfg/scheduling/scheduling-tests.factor index 4f67e1eeb7..a7d71efb02 100644 --- a/basis/compiler/cfg/scheduling/scheduling-tests.factor +++ b/basis/compiler/cfg/scheduling/scheduling-tests.factor @@ -2,7 +2,7 @@ USING: accessors arrays assocs compiler.cfg compiler.cfg.dependence compiler.cfg.dependence.tests compiler.cfg.instructions compiler.cfg.linearization compiler.cfg.registers compiler.cfg.scheduling compiler.cfg.utilities grouping kernel math namespaces tools.test random -sequences sets splitting vectors words ; +sequences sets splitting vectors words compiler.cfg.test-words ; IN: compiler.cfg.scheduling.tests ! Test split-insns diff --git a/basis/compiler/cfg/test-words/authors.txt b/basis/compiler/cfg/test-words/authors.txt new file mode 100644 index 0000000000..7c1b2f2279 --- /dev/null +++ b/basis/compiler/cfg/test-words/authors.txt @@ -0,0 +1 @@ +Doug Coleman diff --git a/basis/compiler/cfg/test-words/test-words.factor b/basis/compiler/cfg/test-words/test-words.factor new file mode 100644 index 0000000000..bbe39abbd6 --- /dev/null +++ b/basis/compiler/cfg/test-words/test-words.factor @@ -0,0 +1,17 @@ +! Copyright (C) 2014 Doug Coleman. +! See http://factorcode.org/license.txt for BSD license. +USING: accessors compiler.cfg.instructions kernel math sequences ; +IN: compiler.cfg.test-words + +: test-not-in-order ( -- nodes ) + V{ + ##load-tagged + ##allot + ##set-slot-imm + ##load-reference + ##allot + ##set-slot-imm + ##set-slot-imm + ##set-slot-imm + ##replace + } [ [ new ] [ 2 * ] bi* >>insn# ] map-index ;