Omit phi simplification pass in the first round

It is expensive and does not bring much

Author: vouillon

compiler/lib/driver.ml

@@ -147,7 +147,7 @@ let stats = Debug.find "stats"
 let rec loop max name round i (p : 'a) : 'a =
   let debug = times () || stats () in
   if debug then Format.eprintf "%s#%d...@." name i;
-  let p' = round p in
+  let p' = round ~first:(i = 1) p in
   if i >= max
   then (
     if debug then Format.eprintf "%s#%d: couldn't reach fix point.@." name i;
@@ -158,8 +158,15 @@ let rec loop max name round i (p : 'a) : 'a =
     p')
   else loop max name round (i + 1) p'
 
-let round : 'a -> 'a =
-  print +> tailcall +> phi +> flow +> specialize +> eval +> inline +> deadcode
+let round ~first : 'a -> 'a =
+  print
+  +> tailcall
+  +> (if first then Fun.id else phi)
+  +> flow
+  +> specialize
+  +> eval
+  +> inline
+  +> deadcode
 
 (* o1 *)
 

compiler/tests-compiler/double-translation/effects_continuations.ml

@@ -103,8 +103,8 @@ let%expect_test "test-compiler/lib-effects/test1.ml" =
     function exceptions$0(s){
      try{var _C_ = caml_int_of_string(s), n = _C_;}
      catch(exn$0){
-      var exn = caml_wrap_exception(exn$0), tag = exn[1];
-      if(tag !== Stdlib[7]) throw caml_maybe_attach_backtrace(exn, 0);
+      var exn = caml_wrap_exception(exn$0);
+      if(exn[1] !== Stdlib[7]) throw caml_maybe_attach_backtrace(exn, 0);
       var n = 0;
      }
      try{
@@ -133,8 +133,8 @@ let%expect_test "test-compiler/lib-effects/test1.ml" =
     function exceptions$1(s, cont){
      try{var _y_ = caml_int_of_string(s), n = _y_;}
      catch(exn){
-      var exn$2 = caml_wrap_exception(exn), tag = exn$2[1];
-      if(tag !== Stdlib[7]){
+      var exn$2 = caml_wrap_exception(exn);
+      if(exn$2[1] !== Stdlib[7]){
        var
         raise$1 = caml_pop_trap(),
         exn$0 = caml_maybe_attach_backtrace(exn$2, 0);

compiler/tests-compiler/double-translation/effects_exceptions.ml

@@ -58,8 +58,8 @@ let%expect_test "test-compiler/lib-effects/test1.ml" =
     function exceptions$0(s){
      try{var _p_ = caml_int_of_string(s), n = _p_;}
      catch(exn$0){
-      var exn = caml_wrap_exception(exn$0), tag = exn[1];
-      if(tag !== Stdlib[7]) throw caml_maybe_attach_backtrace(exn, 0);
+      var exn = caml_wrap_exception(exn$0);
+      if(exn[1] !== Stdlib[7]) throw caml_maybe_attach_backtrace(exn, 0);
       var n = 0;
      }
      try{
@@ -88,8 +88,8 @@ let%expect_test "test-compiler/lib-effects/test1.ml" =
     function exceptions$1(s, cont){
      try{var _l_ = caml_int_of_string(s), n = _l_;}
      catch(exn){
-      var exn$2 = caml_wrap_exception(exn), tag = exn$2[1];
-      if(tag !== Stdlib[7]){
+      var exn$2 = caml_wrap_exception(exn);
+      if(exn$2[1] !== Stdlib[7]){
        var
         raise$1 = caml_pop_trap(),
         exn$0 = caml_maybe_attach_backtrace(exn$2, 0);
@@ -136,8 +136,8 @@ let%expect_test "test-compiler/lib-effects/test1.ml" =
      catch(exn$0){
       var l$0 = l;
       for(;;){
-       var match = caml_call1(g, l$0), variant = match[1];
-       if(72330306 > variant){
+       var match = caml_call1(g, l$0);
+       if(72330306 > match[1]){
         var exn = match[2];
         throw caml_maybe_attach_backtrace(exn, 1);
        }
@@ -155,8 +155,7 @@ let%expect_test "test-compiler/lib-effects/test1.ml" =
                  (g,
                   l,
                   function(match){
-                   var variant = match[1];
-                   if(72330306 <= variant){
+                   if(72330306 <= match[1]){
                     var l = match[2];
                     return caml_exact_trampoline_call1(_h_, l);
                    }

compiler/tests-compiler/effects_continuations.ml

@@ -104,8 +104,8 @@ let%expect_test "test-compiler/lib-effects/test1.ml" =
     function exceptions(s, cont){
      try{var _y_ = runtime.caml_int_of_string(s), n = _y_;}
      catch(exn$0){
-      var exn = caml_wrap_exception(exn$0), tag = exn[1];
-      if(tag !== Stdlib[7]){
+      var exn = caml_wrap_exception(exn$0);
+      if(exn[1] !== Stdlib[7]){
        var raise$1 = caml_pop_trap(), exn$2 = caml_maybe_attach_backtrace(exn, 0);
        return raise$1(exn$2);
       }

compiler/tests-compiler/effects_exceptions.ml

@@ -58,8 +58,8 @@ let%expect_test "test-compiler/lib-effects/test1.ml" =
     function exceptions(s, cont){
      try{var _j_ = runtime.caml_int_of_string(s), n = _j_;}
      catch(exn$0){
-      var exn = caml_wrap_exception(exn$0), tag = exn[1];
-      if(tag !== Stdlib[7]){
+      var exn = caml_wrap_exception(exn$0);
+      if(exn[1] !== Stdlib[7]){
        var raise$1 = caml_pop_trap(), exn$2 = caml_maybe_attach_backtrace(exn, 0);
        return raise$1(exn$2);
       }
@@ -107,8 +107,7 @@ let%expect_test "test-compiler/lib-effects/test1.ml" =
                  (g,
                   l,
                   function(match){
-                   var variant = match[1];
-                   if(72330306 <= variant){
+                   if(72330306 <= match[1]){
                     var l = match[2];
                     return caml_exact_trampoline_call1(_g_, l);
                    }

compiler/tests-compiler/es6.ml

@@ -61,7 +61,7 @@ let rec odd n' = function
            for(;;){
             if(0 === c) return [0, d, 0];
             if(1 === c) return [0, d, 1];
-            [d, c] = [(c - 1 | 0) - 1 | 0, (d - 1 | 0) - 1 | 0];
+            [c, d] = [(d - 1 | 0) - 1 | 0, (c - 1 | 0) - 1 | 0];
            }}],
          "Test");
        return;})

compiler/tests-compiler/gh1007.ml

@@ -633,8 +633,7 @@ let ()  = M.run ()
       let odd$0 = odd, even$0 = even;
       var param$0 = even(i);
       for(;;){
-       var variant = param$0[1];
-       if(759635106 <= variant) break;
+       if(759635106 <= param$0[1]) break;
        var f = param$0[2];
        param$0 = f(0);
       }

compiler/tests-compiler/gh1868.ml

@@ -43,8 +43,7 @@ let wrap f =
      catch(exn$1){
       var exn = caml_wrap_exception(exn$1);
       for(;;){
-       var tag = exn[1];
-       if(tag !== Nested) throw caml_maybe_attach_backtrace(exn, 1);
+       if(exn[1] !== Nested) throw caml_maybe_attach_backtrace(exn, 1);
        var exn$0 = exn[2];
        exn = exn$0;
       }
@@ -53,8 +52,7 @@ let wrap f =
     //end
     function wrap$1(f, cont){
      function _b_(exn$1){
-      var tag = exn$1[1];
-      if(tag === Nested){
+      if(exn$1[1] === Nested){
        var exn$0 = exn$1[2];
        return caml_exact_trampoline_call1(_b_, exn$0);
       }

compiler/tests-compiler/inlining.ml

@@ -50,10 +50,9 @@ let%expect_test "inline small function exposing more tc" =
   [%expect
     {|
     function f(g, x){
-     var variant$0 = x[1];
-     if(106380200 <= variant$0) return x;
-     var v$0 = x[2], x$0 = caml_call1(g, v$0), variant = x$0[1];
-     if(106380200 <= variant) return x$0;
+     if(106380200 <= x[1]) return x;
+     var v$0 = x[2], x$0 = caml_call1(g, v$0);
+     if(106380200 <= x$0[1]) return x$0;
      var v = x$0[2];
      return v;
     }

compiler/tests-compiler/loops.ml

@@ -85,15 +85,7 @@ let rec fun_with_loop acc = function
        return caml_call1
                (list_rev, caml_call1(list_rev, caml_call1(list_rev, acc)));
       var x = param[1];
-      if(1 === x && ! param[2]){
-       var a$0 = [0, acc], i$0 = 0;
-       for(;;){
-        a$0[1] = [0, 1, a$0[1]];
-        var _b_ = i$0 + 1 | 0;
-        if(10 === i$0) return a$0[1];
-        i$0 = _b_;
-       }
-      }
+      if(1 === x && ! param[2]) break;
       var xs = param[2], a = [0, acc], i = 0;
       for(;;){
        a[1] = [0, 1, a[1]];
@@ -105,6 +97,13 @@ let rec fun_with_loop acc = function
       acc = acc$0;
       param = xs;
      }
+     var a$0 = [0, acc], i$0 = 0;
+     for(;;){
+      a$0[1] = [0, 1, a$0[1]];
+      var _b_ = i$0 + 1 | 0;
+      if(10 === i$0) return a$0[1];
+      i$0 = _b_;
+     }
     }
     //end
     |}]
@@ -131,12 +130,14 @@ let for_for_while () =
      var k = 1;
      for(;;){
       var j = 1;
-      for(;;){
-       for(;;){if(10 <= runtime.caml_mul(k, j)) break; id[1]++;}
-       var _b_ = j + 1 | 0;
-       if(10 === j) break;
-       j = _b_;
-      }
+      for(;;)
+       if(10 <= runtime.caml_mul(k, j)){
+        var _b_ = j + 1 | 0;
+        if(10 === j) break;
+        j = _b_;
+       }
+       else
+        id[1]++;
       var _a_ = k + 1 | 0;
       if(10 === k) return 0;
       k = _a_;
@@ -168,17 +169,17 @@ let for_for_while () =
      var k = 1;
      for(;;){
       var j = 1;
-      for(;;){
-       for(;;){
-        if(10 <= caml_div(k, j)) break;
+      for(;;)
+       if(10 <= caml_div(k, j)){
+        var _b_ = j + 1 | 0;
+        if(10 === j) break;
+        j = _b_;
+       }
+       else{
         try{caml_div(k, j);}
         catch(exn){throw caml_maybe_attach_backtrace(Stdlib[8], 1);}
         id[1]++;
        }
-       var _b_ = j + 1 | 0;
-       if(10 === j) break;
-       j = _b_;
-      }
       var _a_ = k + 1 | 0;
       if(10 === k) return 0;
       k = _a_;

compiler/tests-compiler/match_with_exn.ml

@@ -77,8 +77,8 @@ let fun2 () =
      {
       try{var i$1 = caml_call1(Stdlib_Random[5], 2);}
       catch(exn$0){
-       var exn = caml_wrap_exception(exn$0), tag = exn[1];
-       if(tag !== A) throw caml_maybe_attach_backtrace(exn, 0);
+       var exn = caml_wrap_exception(exn$0);
+       if(exn[1] !== A) throw caml_maybe_attach_backtrace(exn, 0);
        var i = exn[2];
        if(2 !== i) return i + 2 | 0;
        var i$0 = i;