compiler.cfg.gvn: try to clean up availability issues (untested)

diff --git a/extra/compiler/cfg/gvn/alien/alien.factor b/extra/compiler/cfg/gvn/alien/alien.factor
index e197bd537223906133d461a6c62456afb67d0e2b..4f57e0f51040b2d319f6c0515a7671bcff68b155 100644 (file)
--- a/extra/compiler/cfg/gvn/alien/alien.factor
+++ b/extra/compiler/cfg/gvn/alien/alien.factor
@@ -9,6 +9,7 @@ compiler.cfg.registers
 compiler.cfg.instructions
 compiler.cfg.gvn.math
 compiler.cfg.gvn.graph
+compiler.cfg.gvn.avail
 compiler.cfg.gvn.rewrite ;
 IN: compiler.cfg.gvn.alien
 
@@ -34,12 +35,17 @@ M: ##box-displaced-alien rewrite
         ##add
     ] { } make ;
 
-! XXX the vregs that src>> vreg>insn uses are not necessarily available
 : rewrite-unbox-any-c-ptr ( insn -- insn/f )
     dup src>> vreg>insn
     {
-        { [ dup ##box-alien? ] [ rewrite-unbox-alien ] }
-        { [ dup ##box-displaced-alien? ] [ rewrite-unbox-displaced-alien ] }
+        {
+            [ dup [ ##box-alien? ] with-available-uses? ]
+            [ rewrite-unbox-alien ]
+        }
+        {
+            [ dup [ ##box-displaced-alien? ] with-available-uses? ]
+            [ rewrite-unbox-displaced-alien ]
+        }
         [ 2drop f ]
     } cond ;
 
@@ -50,9 +56,8 @@ M: ##unbox-alien rewrite rewrite-unbox-any-c-ptr ;
 ! Fuse ##add-imm into ##load-memory(-imm) and ##store-memory(-imm)
 ! just update the offset in the instruction
 : fuse-base-offset? ( insn -- ? )
-    base>> vreg>insn ##add-imm? ;
+    base>> vreg>insn [ ##add-imm? ] with-available-uses? ;
 
-! XXX base>> vreg>insn src1>> not necessarily available
 : fuse-base-offset ( insn -- insn' )
     clone dup base>> vreg>insn
     [ src1>> ] [ src2>> ] bi
@@ -61,9 +66,11 @@ M: ##unbox-alien rewrite rewrite-unbox-any-c-ptr ;
 ! Fuse ##add-imm into ##load-memory and ##store-memory
 ! just update the offset in the instruction
 : fuse-displacement-offset? ( insn -- ? )
-    { [ scale>> 0 = ] [ displacement>> vreg>insn ##add-imm? ] } 1&& ;
+    {
+        [ scale>> 0 = ]
+        [ displacement>> vreg>insn [ ##add-imm? ] with-available-uses? ]
+    } 1&& ;
 
-! XXX displacement>> vreg>insn src1>> not necessarily available
 : fuse-displacement-offset ( insn -- insn' )
     clone dup displacement>> vreg>insn
     [ src1>> ] [ src2>> ] bi
@@ -75,7 +82,7 @@ M: ##unbox-alien rewrite rewrite-unbox-any-c-ptr ;
 : fuse-displacement? ( insn -- ? )
     {
         [ offset>> 0 = complex-addressing? or ]
-        [ base>> vreg>insn ##add? ]
+        [ base>> vreg>insn [ ##add? ] with-available-uses? ]
     } 1&& ;
 
 GENERIC: alien-insn-value ( insn -- value )
@@ -88,8 +95,6 @@ GENERIC: new-alien-insn ( value base displacement scale offset rep c-type insn -
 M: ##load-memory-imm new-alien-insn drop \ ##load-memory new-insn ;
 M: ##store-memory-imm new-alien-insn drop \ ##store-memory new-insn ;
 
-! XXX base>> vreg>insn src1>> & src2>> not necessarily
-!     available
 : fuse-displacement ( insn -- insn' )
     {
         [ alien-insn-value ]
@@ -106,9 +111,11 @@ M: ##store-memory-imm new-alien-insn drop \ ##store-memory new-insn ;
     { [ ##shl-imm? ] [ src2>> { 1 2 3 } member? ] } 1&& ;
 
 : fuse-scale? ( insn -- ? )
-    { [ scale>> 0 = ] [ displacement>> vreg>insn scale-insn? ] } 1&& ;
+    {
+        [ scale>> 0 = ]
+        [ displacement>> vreg>insn [ scale-insn? ] with-available-uses? ]
+    } 1&& ;
 
-! XXX displacement>> vreg>insn src1>> not necessarily available
 : fuse-scale ( insn -- insn' )
     clone dup displacement>> vreg>insn
     [ src1>> ] [ src2>> ] bi

diff --git a/extra/compiler/cfg/gvn/avail/avail.factor b/extra/compiler/cfg/gvn/avail/avail.factor
index e0f7926c4dfb3aff86abd97dc1cfd564c9259609..0bae5cd26803f5df06af739cdb28895f90746082 100644 (file)
--- a/extra/compiler/cfg/gvn/avail/avail.factor
+++ b/extra/compiler/cfg/gvn/avail/avail.factor
@@ -1,10 +1,13 @@
 ! Copyright (C) 2011 Alex Vondrak.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs compiler.cfg
+USING: accessors assocs hashtables kernel namespaces sequences
+sets
+compiler.cfg
 compiler.cfg.dataflow-analysis
 compiler.cfg.def-use
-compiler.cfg.predecessors compiler.cfg.rpo deques dlists
-hashtables kernel locals namespaces sequences sets ;
+compiler.cfg.gvn.graph
+compiler.cfg.predecessors
+compiler.cfg.rpo ;
 FROM: namespaces => set ;
 IN: compiler.cfg.gvn.avail
 
@@ -18,8 +21,20 @@ FORWARD-ANALYSIS: avail
 
 M: avail-analysis transfer-set drop defined assoc-union ;
 
+! Strict idea of availability, for now.  Would like to see if
+! searching the VN congruence classes for the smallest
+! available vn would work at all / better.
+
 : available? ( vn -- ? )
-    basic-block get avail-ins get at key? ;
+    final-iteration? get [
+        basic-block get avail-ins get at key?
+    ] [ drop t ] if ;
+
+: available-uses? ( insn -- ? )
+    uses-vregs [ available? ] all? ;
+
+: with-available-uses? ( quot -- ? )
+    [ available-uses? ] bi and ; inline
 
 : make-available ( insn -- insn )
     dup dst>>

diff --git a/extra/compiler/cfg/gvn/comparisons/comparisons.factor b/extra/compiler/cfg/gvn/comparisons/comparisons.factor
index a7b232e89171763d1b4b93b6efc4bf755897f2df..b84126419c4858395fe5de1777be8612f1539f90 100644 (file)
--- a/extra/compiler/cfg/gvn/comparisons/comparisons.factor
+++ b/extra/compiler/cfg/gvn/comparisons/comparisons.factor
@@ -9,6 +9,7 @@ compiler.cfg.instructions
 compiler.cfg.registers
 compiler.cfg.gvn.math
 compiler.cfg.gvn.graph
+compiler.cfg.gvn.avail
 compiler.cfg.gvn.rewrite ;
 IN: compiler.cfg.gvn.comparisons
 
@@ -212,12 +213,11 @@ M: ##compare-integer rewrite
 
 : rewrite-redundant-comparison? ( insn -- ? )
     {
-        [ src1>> vreg>insn scalar-compare-insn? ]
+        [ src1>> vreg>insn [ scalar-compare-insn? ] with-available-uses? ]
         [ src2>> not ]
         [ cc>> { cc= cc/= } member? ]
     } 1&& ; inline
 
-! XXX the vregs that src1>> vreg>insn uses are not necessarily available
 : rewrite-redundant-comparison ( insn -- insn' )
     [ cc>> ] [ dst>> ] [ src1>> vreg>insn ] tri {
         { [ dup ##compare? ] [ >compare< next-vreg \ ##compare new-insn ] }
@@ -255,8 +255,9 @@ M: ##compare-integer-imm rewrite
         [ drop f ]
     } cond ;
 
-! XXX the vregs (src1>> and src2>>) that src1>> vreg>insn uses
-!     are not necessarily available
+: simplify-test? ( insn -- ? )
+    src1>> vreg>insn [ ##and? ] with-available-uses? ;
+
 : (simplify-test) ( insn -- src1 src2 cc )
     [ src1>> vreg>insn [ src1>> ] [ src2>> ] bi ] [ cc>> ] bi ; inline
 
@@ -266,8 +267,9 @@ M: ##compare-integer-imm rewrite
 : simplify-test-branch ( insn -- insn )
     (simplify-test) \ ##test-branch new-insn ; inline
 
-! XXX the vregs (src1>> and src2>>) that src1>> vreg>insn uses
-!     are not necessarily available
+: simplify-test-imm? ( insn -- ? )
+    src1>> vreg>insn [ ##and-imm? ] with-available-uses? ;
+
 : (simplify-test-imm) ( insn -- src1 src2 cc )
     [ src1>> vreg>insn [ src1>> ] [ src2>> ] bi ] [ cc>> ] bi ; inline
 
@@ -291,8 +293,8 @@ M: ##test rewrite
         { [ dup src2>> vreg-immediate-comparand? ] [ f >test-imm ] }
         { [ dup diagonal? ] [
             {
-                { [ dup src1>> vreg>insn ##and? ] [ simplify-test ] }
-                { [ dup src1>> vreg>insn ##and-imm? ] [ simplify-test-imm ] }
+                { [ dup simplify-test? ] [ simplify-test ] }
+                { [ dup simplify-test-imm? ] [ simplify-test-imm ] }
                 [ drop f ]
             } cond
         ] }
@@ -305,8 +307,8 @@ M: ##test-branch rewrite
         { [ dup src2>> vreg-immediate-comparand? ] [ f >test-imm-branch ] }
         { [ dup diagonal? ] [
             {
-                { [ dup src1>> vreg>insn ##and? ] [ simplify-test-branch ] }
-                { [ dup src1>> vreg>insn ##and-imm? ] [ simplify-test-imm-branch ] }
+                { [ dup simplify-test? ] [ simplify-test-branch ] }
+                { [ dup simplify-test-imm? ] [ simplify-test-imm-branch ] }
                 [ drop f ]
             } cond
         ] }

diff --git a/extra/compiler/cfg/gvn/math/math.factor b/extra/compiler/cfg/gvn/math/math.factor
index 65376d80bb3dc80eb5f5830e2a25722052b47c41..50f62cadf9898da4eb54b3d470ccff8450f5664d 100644 (file)
--- a/extra/compiler/cfg/gvn/math/math.factor
+++ b/extra/compiler/cfg/gvn/math/math.factor
@@ -7,6 +7,7 @@ compiler.cfg.registers
 compiler.cfg.utilities
 compiler.cfg.gvn.folding
 compiler.cfg.gvn.graph
+compiler.cfg.gvn.avail
 compiler.cfg.gvn.rewrite ;
 IN: compiler.cfg.gvn.math
 
@@ -23,7 +24,9 @@ M: ##tagged>integer rewrite
         [ 2drop f ]
     } cond ;
 
-! XXX src>> vreg>insn src>> not necessarily available
+: self-inverse? ( insn quot -- ? )
+    [ src>> vreg>insn ] dip with-available-uses? ; inline
+
 : self-inverse ( insn -- insn' )
     [ dst>> ] [ src>> vreg>insn src>> ] bi <copy> ;
 
@@ -32,14 +35,14 @@ M: ##tagged>integer rewrite
 
 M: ##neg rewrite
     {
-        { [ dup src>> vreg>insn ##neg? ] [ self-inverse ] }
+        { [ dup [ ##neg? ] self-inverse? ] [ self-inverse ] }
         { [ dup unary-constant-fold? ] [ unary-constant-fold ] }
         [ drop f ]
     } cond ;
 
 M: ##not rewrite
     {
-        { [ dup src>> vreg>insn ##not? ] [ self-inverse ] }
+        { [ dup [ ##not? ] self-inverse? ] [ self-inverse ] }
         { [ dup unary-constant-fold? ] [ unary-constant-fold ] }
         [ drop f ]
     } cond ;
@@ -102,7 +105,6 @@ M: ##sub-imm rewrite sub-imm>add-imm ;
 : mul-to-shl ( insn -- insn' )
     [ [ dst>> ] [ src1>> ] bi ] [ src2>> log2 ] bi \ ##shl-imm new-insn ;
 
-! XXX not sure if availability is an issue
 ! Distribution converts
 ! ##+-imm 2 1 X
 ! ##*-imm 3 2 Y
@@ -120,10 +122,10 @@ M: ##sub-imm rewrite sub-imm>add-imm ;
     ] [ f ] if ; inline
 
 : distribute-over-add? ( insn -- ? )
-    src1>> vreg>insn ##add-imm? ;
+    src1>> vreg>insn [ ##add-imm? ] with-available-uses? ;
 
 : distribute-over-sub? ( insn -- ? )
-    src1>> vreg>insn ##sub-imm? ;
+    src1>> vreg>insn [ ##sub-imm? ] with-available-uses? ;
 
 : distribute ( insn add-op mul-op -- new-insns/f )
     [

diff --git a/extra/compiler/cfg/gvn/simd/simd.factor b/extra/compiler/cfg/gvn/simd/simd.factor
index ee64b2fbfbf726f38a96c840dcb21255a6ab0c54..ce7eb0779dfde0a686fa814a8be431fb1a413529 100644 (file)
--- a/extra/compiler/cfg/gvn/simd/simd.factor
+++ b/extra/compiler/cfg/gvn/simd/simd.factor
@@ -12,15 +12,13 @@ compiler.cfg.comparisons
 compiler.cfg.instructions
 compiler.cfg.gvn.math
 compiler.cfg.gvn.graph
+compiler.cfg.gvn.avail
 compiler.cfg.gvn.rewrite ;
 IN: compiler.cfg.gvn.simd
 
 ! Some lame constant folding for SIMD intrinsics. Eventually this
 ! should be redone completely.
 
-! XXX pretty much all of these rely on the vregs used by some
-! vreg>insn, but they aren't necessarily available
-
 : useless-shuffle-vector-imm? ( insn -- ? )
     [ shuffle>> ] [ rep>> rep-length iota ] bi sequence= ;
 
@@ -42,7 +40,7 @@ IN: compiler.cfg.gvn.simd
 M: ##shuffle-vector-imm rewrite
     dup src>> vreg>insn {
         { [ over useless-shuffle-vector-imm? ] [ drop [ dst>> ] [ src>> ] bi <copy> ] }
-        { [ dup ##shuffle-vector-imm? ] [ compose-shuffle-vector-imm ] }
+        { [ dup [ ##shuffle-vector-imm? ] with-available-uses? ] [ compose-shuffle-vector-imm ] }
         { [ dup ##load-reference? ] [ fold-shuffle-vector-imm ] }
         [ 2drop f ]
     } cond ;
@@ -64,7 +62,7 @@ M: ##shuffle-vector-imm rewrite
 M: ##scalar>vector rewrite
     dup src>> vreg>insn {
         { [ dup literal-insn? ] [ fold-scalar>vector ] }
-        { [ dup ##vector>scalar? ] [ [ dst>> ] [ src>> ] bi* <copy> ] }
+        { [ dup [ ##vector>scalar? ] with-available-uses? ] [ [ dst>> ] [ src>> ] bi* <copy> ] }
         [ 2drop f ]
     } cond ;
 
@@ -119,9 +117,9 @@ M: ##xor-vector rewrite
 
 : vector-not? ( insn -- ? )
     {
-        [ ##not-vector? ]
+        [ [ ##not-vector? ] with-available-uses? ]
         [ {
-            [ ##xor-vector? ]
+            [ [ ##xor-vector? ] with-available-uses? ]
             [ [ src1>> ] [ src2>> ] bi [ vreg>insn ##fill-vector? ] either? ]
         } 1&& ]
     } 1|| ;

diff --git a/extra/compiler/cfg/gvn/slots/slots.factor b/extra/compiler/cfg/gvn/slots/slots.factor
index fae7459db3fe547151b58cb04182411fb5be110e..d4ae555c04d930c2bc16251eadddbb9dcd7826f6 100644 (file)
--- a/extra/compiler/cfg/gvn/slots/slots.factor
+++ b/extra/compiler/cfg/gvn/slots/slots.factor
@@ -4,14 +4,15 @@ USING: accessors combinators.short-circuit cpu.architecture fry
 kernel math
 compiler.cfg.instructions
 compiler.cfg.gvn.graph
+compiler.cfg.gvn.avail
 compiler.cfg.gvn.rewrite ;
 IN: compiler.cfg.gvn.slots
 
 : simplify-slot-addressing? ( insn -- ? )
-    complex-addressing?
-    [ slot>> vreg>insn ##add-imm? ] [ drop f ] if ;
+    complex-addressing? [
+        slot>> vreg>insn [ ##add-imm? ] with-available-uses?
+    ] [ drop f ] if ;
 
-! XXX the vregs that slot>> vreg>insn uses are not necessarily available
 : simplify-slot-addressing ( insn -- insn/f )
     dup simplify-slot-addressing? [
         clone dup slot>> vreg>insn