compiler.cfg.scheduling: remove old scheduling test code, adding a better way of...

diff --git a/basis/compiler/cfg/scheduling/scheduling-tests.factor b/basis/compiler/cfg/scheduling/scheduling-tests.factor
index b50305c814fd12bf3019441cc83d41003d68b57b..1a47bbf62f8a4719be641c503373d5357eeaf8fa 100644 (file)
--- a/basis/compiler/cfg/scheduling/scheduling-tests.factor
+++ b/basis/compiler/cfg/scheduling/scheduling-tests.factor
@@ -1,16 +1,9 @@
 USING: compiler.cfg.scheduling compiler.cfg.instructions
-vocabs.loader namespaces tools.test arrays kernel ;
+vocabs.loader namespaces tools.test arrays kernel random
+words compiler.units ;
 IN: compiler.cfg.scheduling.tests
 
-! Recompile compiler.cfg.scheduling with extra tests,
-! and see if any errors come up. Back when there were
-! errors of this kind, they always surfaced this way.
-
-t check-scheduling? [
-    [ ] [ "compiler.cfg.scheduling" reload ] unit-test
-    [ ] [ "compiler.cfg.dependence" reload ] unit-test
-] with-variable
-
+! Test split-3-ways
 [
     { }
     { }

diff --git a/basis/compiler/cfg/scheduling/scheduling.factor b/basis/compiler/cfg/scheduling/scheduling.factor
index cc9905032831c260015bdfb733e23b5ec53c3cd4..68effe02f510d81783568a6e78734836f94f9db3 100644 (file)
--- a/basis/compiler/cfg/scheduling/scheduling.factor
+++ b/basis/compiler/cfg/scheduling/scheduling.factor
@@ -80,40 +80,6 @@ conditional-branch-insn
         [ (reorder) ] V{ } make reverse
     ] dip 3append ;
 
-ERROR: not-all-instructions-were-scheduled old-bb new-bb ;
-
-SYMBOL: check-scheduling?
-f check-scheduling? set-global
-
-:: check-instructions ( new-bb old-bb -- )
-    new-bb old-bb [ instructions>> ] bi@
-    [ [ length ] bi@ = ] [ [ unique ] bi@ = ] 2bi and
-    [ old-bb new-bb not-all-instructions-were-scheduled ] unless ;
-
-ERROR: definition-after-usage vregs old-bb new-bb ;
-
-:: check-usages ( new-bb old-bb -- )
-    HS{ } clone :> useds
-    new-bb instructions>> split-3-ways drop nip
-    [| insn |
-        insn uses-vregs [ useds adjoin ] each
-        insn defs-vregs :> defs-vregs
-        defs-vregs useds intersects?
-        [ defs-vregs old-bb new-bb definition-after-usage ] when
-    ] each ;
-
-: check-scheduling ( new-bb old-bb -- )
-    [ check-instructions ] [ check-usages ] 2bi ;
-
-: with-scheduling-check ( bb quot: ( bb -- ) -- )
-    check-scheduling? get [
-        over dup clone
-        [ call( bb -- ) ] 2dip
-        check-scheduling
-    ] [
-        call( bb -- )
-    ] if ; inline
-
 : number-insns ( insns -- )
     [ >>insn# drop ] each-index ;
 
@@ -122,12 +88,10 @@ ERROR: definition-after-usage vregs old-bb new-bb ;
 
 : schedule-block ( bb -- )
     [
-        [
-            [ number-insns ]
-            [ reorder ]
-            [ clear-numbers ] tri
-        ] change-instructions drop
-    ] with-scheduling-check ;
+        [ number-insns ]
+        [ reorder ]
+        [ clear-numbers ] tri
+    ] change-instructions drop ;
 
 : schedule-instructions ( cfg -- cfg' )
     dup [