From b8bcdc8909e65e79c3d4c7d58a844212638cc090 Mon Sep 17 00:00:00 2001
From: slava <slava@factorcode.org>
Date: Sat, 4 Mar 2006 07:53:22 +0000
Subject: [PATCH] Working on optimizer

---
 TODO.FACTOR.txt                        | 2 +-
 library/bootstrap/boot-stage1.factor   | 1 -
 library/compiler/compiler.factor       | 6 ++----
 library/compiler/generator.factor      | 5 ++---
 library/compiler/linearizer.factor     | 6 +++---
 library/inference/dataflow.factor      | 2 +-
 library/inference/kill-literals.factor | 4 ++--
 library/inference/known-words.factor   | 4 ++--
 library/inference/optimizer.factor     | 9 +++++----
 library/inference/words.factor         | 2 +-
 10 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt
index ffe9412ef4..a12232a591 100644
--- a/TODO.FACTOR.txt
+++ b/TODO.FACTOR.txt
@@ -54,7 +54,7 @@
 - code gc
 - compiled gc check slows things down
 - fix branch folding
-- remove branch splitting
+- new x86 write barrier
 
 + misc:
 
diff --git a/library/bootstrap/boot-stage1.factor b/library/bootstrap/boot-stage1.factor
index 65ce254ecf..b6dd39d917 100644
--- a/library/bootstrap/boot-stage1.factor
+++ b/library/bootstrap/boot-stage1.factor
@@ -133,7 +133,6 @@ vectors words ;
         "/library/compiler/xt.factor"
         "/library/compiler/stack.factor"
         "/library/compiler/intrinsics.factor"
-        "/library/compiler/basic-blocks.factor"
         "/library/compiler/generator.factor"
         "/library/compiler/compiler.factor"
 
diff --git a/library/compiler/compiler.factor b/library/compiler/compiler.factor
index 94942f0fe3..d03c25e0b1 100644
--- a/library/compiler/compiler.factor
+++ b/library/compiler/compiler.factor
@@ -7,7 +7,7 @@ sequences words ;
 : (compile) ( word -- )
     #! Should be called inside the with-compiler scope.
     dup word-def dataflow optimize linearize
-    [ split-blocks simplify generate ] hash-each ;
+    [ generate ] hash-each ;
 
 : inform-compile ( word -- ) "Compiling " write . flush ;
 
@@ -47,8 +47,6 @@ sequences words ;
     ] if ;
 
 \ dataflow profile
-\ optimize profile
 \ linearize profile
-\ split-blocks profile
-\ simplify profile
 \ generate profile
+\ optimize profile
diff --git a/library/compiler/generator.factor b/library/compiler/generator.factor
index 381b6d873e..620b067462 100644
--- a/library/compiler/generator.factor
+++ b/library/compiler/generator.factor
@@ -12,14 +12,13 @@ GENERIC: generate-node ( vop -- )
     #! The %prologue node contains the maximum stack reserve of
     #! all VOPs. The precise meaning of stack reserve is
     #! platform-specific.
-    0 [ 0 [ stack-reserve max ] reduce max ] reduce
-    \ stack-reserve set ;
+    0 [ stack-reserve max ] reduce \ stack-reserve set ;
 
 : generate-code ( word linear -- length )
     compiled-offset >r
     compile-aligned
     swap save-xt
-    [ [ dup [ generate-node ] with-vop ] each ] each
+    [ dup [ generate-node ] with-vop ] each
     compile-aligned
     compiled-offset r> - ;
 
diff --git a/library/compiler/linearizer.factor b/library/compiler/linearizer.factor
index 344c6acb38..37ad4a9e9e 100644
--- a/library/compiler/linearizer.factor
+++ b/library/compiler/linearizer.factor
@@ -80,15 +80,15 @@ M: #label linearize* ( node -- next )
     dup node-successor #if?
     [ node-param "if-intrinsic" word-prop ] [ drop f ] if ;
 
-: linearize-if ( node label -- next )
+: linearize-if ( node label -- )
     <label> dup >r >r >r node-children first2 linearize-child
     r> r> %jump-label , %label , linearize-child r> %label ,
     iterate-next ;
 
-M: #call linearize* ( node -- )
+M: #call linearize* ( node -- next )
     dup if-intrinsic [
         >r <label> 2dup r> call
-        >r node-successor r> linearize-if
+        >r node-successor r> linearize-if node-successor
     ] [
         dup intrinsic
         [ call iterate-next ] [ node-param linearize-call ] if*
diff --git a/library/inference/dataflow.factor b/library/inference/dataflow.factor
index e1f97bd721..fcd0abc0bd 100644
--- a/library/inference/dataflow.factor
+++ b/library/inference/dataflow.factor
@@ -63,7 +63,7 @@ C: #label make-node ;
 
 TUPLE: #entry ;
 C: #entry make-node ;
-: #entry ( -- node ) f param-node <#entry> ;
+: #entry ( -- node ) meta-d get clone in-node <#entry> ;
 
 TUPLE: #call ;
 C: #call make-node ;
diff --git a/library/inference/kill-literals.factor b/library/inference/kill-literals.factor
index 4df831e68c..6aa2fc3d9e 100644
--- a/library/inference/kill-literals.factor
+++ b/library/inference/kill-literals.factor
@@ -75,8 +75,8 @@ M: #killable live-values* ( node -- seq ) drop { } ;
 
 ! #label
 M: #label live-values* ( node -- seq )
-    dup node-child node-in-d
-    >r collect-recursion r> add purge-invariants ;
+    dup node-child [ node-in-d ] 2apply 2array
+    purge-invariants ;
 
 ! branching
 UNION: #branch #if #dispatch ;
diff --git a/library/inference/known-words.factor b/library/inference/known-words.factor
index 05ce5c2e9a..c3f01d7db5 100644
--- a/library/inference/known-words.factor
+++ b/library/inference/known-words.factor
@@ -35,8 +35,8 @@ sequences strings vectors words prettyprint ;
     dup "infer-effect" word-prop consume/produce
     [ [ t ] [ f ] if ] infer-quot ;
 
-{ fixnum<= fixnum< fixnum>= fixnum> eq? }
-[ dup [ manual-branch ] curry "infer" set-word-prop ] each
+! { fixnum<= fixnum< fixnum>= fixnum> eq? }
+! [ dup [ manual-branch ] curry "infer" set-word-prop ] each
 
 ! Primitive combinators
 \ call [ [ general-list ] [ ] ] "infer-effect" set-word-prop
diff --git a/library/inference/optimizer.factor b/library/inference/optimizer.factor
index 35b1071973..d784e17fbe 100644
--- a/library/inference/optimizer.factor
+++ b/library/inference/optimizer.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2004, 2006 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 IN: optimizer
-USING: compiler-backend generic hashtables inference kernel
+USING: compiler-backend generic hashtables inference io kernel
 lists math namespaces sequences vectors ;
 
 GENERIC: optimize-node* ( node -- node/t )
@@ -25,11 +25,12 @@ DEFER: optimize-node
         over set-node-successor r> r> r> or or
     ] [ r> ] if ;
 
-: optimize-1 ( dataflow -- dataflow ? )
-    dup kill-values dup infer-classes optimize-node ;
+: (optimize) ( dataflow n -- dataflow n ? )
+    >r dup kill-values dup infer-classes optimize-node r> swap
+    [ 1+ (optimize) ] when ;
 
 : optimize ( dataflow -- dataflow )
-    [ optimize-1 ] with-scope [ optimize ] when ;
+    1 (optimize) [ "! Optimizer passes: " % # ] "" make print ;
 
 : prune-if ( node quot -- successor/t )
     over >r call [ r> node-successor ] [ r> drop t ] if ;
diff --git a/library/inference/words.factor b/library/inference/words.factor
index b1af1156e9..8e24e8a2a2 100644
--- a/library/inference/words.factor
+++ b/library/inference/words.factor
@@ -97,7 +97,7 @@ M: #call-label collect-recursion* ( label node -- )
     dup f inline-block over recursive-label? [
         meta-d get >r
         drop join-values f inline-block apply-infer
-        r> over node-child set-node-in-d node,
+        r> over set-node-in-d node,
     ] [
         apply-infer node-child node-successor splice-node drop
     ] if ;