flambda-backend: Merge ocaml-jst

Author: mshinwell

.github/workflows/build.yml

@@ -21,6 +21,13 @@ jobs:
             use_runtime: d
             ocamlrunparam: "v=0,V=1"
 
+          - name: i386
+            config: --enable-stack-allocation=no CC='cc32' AS='as --32' ASPP='gcc -m32 -c' -host i386-linux PARTIALLD='ld -r -melf_i386'
+            os: ubuntu-20.04
+            ocamlparam: ''
+            boot_config: CC='cc32' AS='as --32' ASPP='gcc -m32 -c' -host i386-linux PARTIALLD='ld -r -melf_i386'
+            boot_cachekey: 32bit
+
     env:
       J: "3"
 
@@ -29,6 +36,11 @@ jobs:
       if: matrix.os == 'macos-latest'
       run: HOMEBREW_NO_INSTALL_CLEANUP=TRUE brew install parallel
 
+    - name: Install GCC 32-bit libraries
+      if: matrix.name == 'i386'
+      run: |
+        sudo apt-get install gcc-multilib gfortran-multilib
+
     - name: Checkout the ocaml-jst repo
       uses: actions/checkout@master
       with:
@@ -49,6 +61,13 @@ jobs:
         path: 'ocaml-414'
         ref: '4.14'
 
+    - name: Setup 32-bit C compiler
+      if: matrix.name == 'i386' && steps.cache.outputs.cache-hit != 'true'
+      run: |
+        mkdir -p ocaml-414/_install/bin
+        { echo '#!/bin/sh'; echo 'exec gcc -m32 "$@"'; } > ocaml-414/_install/bin/cc32
+        chmod +x ocaml-414/_install/bin/cc32
+
     - name: Build OCaml 4.14
       if: steps.cache.outputs.cache-hit != 'true'
       working-directory: ocaml-414

asmcomp/afl_instrument.ml

@@ -88,7 +88,7 @@ and instrument = function
      Ccatch (isrec, cases, instrument body, kind)
   | Cexit (ex, args) -> Cexit (ex, List.map instrument args)
   | Cregion e -> Cregion (instrument e)
-  | Cexclave e -> Cexclave (instrument e)
+  | Ctail e -> Ctail (instrument e)
 
   (* these are base cases and have no logging *)
   | Cconst_int _ | Cconst_natint _ | Cconst_float _

asmcomp/cmm.ml

@@ -206,7 +206,7 @@ type expression =
   | Ctrywith of expression * Backend_var.With_provenance.t * expression
       * Debuginfo.t * kind_for_unboxing
   | Cregion of expression
-  | Cexclave of expression
+  | Ctail of expression
 
 type codegen_option =
   | Reduce_code_size
@@ -270,7 +270,7 @@ let iter_shallow_tail f = function
   | Cexit _ | Cop (Craise _, _, _) ->
       true
   | Cregion _
-  | Cexclave _
+  | Ctail _
   | Cconst_int _
   | Cconst_natint _
   | Cconst_float _
@@ -312,7 +312,7 @@ let map_shallow_tail ?kind f = function
   | Cexit _ | Cop (Craise _, _, _) as cmm ->
       cmm
   | Cregion _
-  | Cexclave _
+  | Ctail _
   | Cconst_int _
   | Cconst_natint _
   | Cconst_float _
@@ -325,7 +325,7 @@ let map_shallow_tail ?kind f = function
 let map_tail ?kind f =
   let rec loop = function
     | Cregion _
-    | Cexclave _
+    | Ctail _
     | Cconst_int _
     | Cconst_natint _
     | Cconst_float _
@@ -367,7 +367,7 @@ let iter_shallow f = function
       f e1; f e2
   | Cregion e ->
       f e
-  | Cexclave e ->
+  | Ctail e ->
       f e
   | Cconst_int _
   | Cconst_natint _
@@ -404,8 +404,8 @@ let map_shallow f = function
       Ctrywith (f e1, id, f e2, dbg, value_kind)
   | Cregion e ->
       Cregion (f e)
-  | Cexclave e ->
-      Cexclave (f e)
+  | Ctail e ->
+      Ctail (f e)
   | Cconst_int _
   | Cconst_natint _
   | Cconst_float _

asmcomp/cmm.mli

@@ -210,7 +210,7 @@ type expression =
   | Ctrywith of expression * Backend_var.With_provenance.t * expression
       * Debuginfo.t * kind_for_unboxing
   | Cregion of expression
-  | Cexclave of expression
+  | Ctail of expression
 
 type codegen_option =
   | Reduce_code_size

asmcomp/cmm_helpers.ml

@@ -619,11 +619,13 @@ let rec unbox_float dbg =
           map_tail ~kind:Any
             (function
               | Cop (Capply (_, Rc_close_at_apply), _, _) -> raise Exit
+              | Ctail e -> Ctail (unbox_float dbg e)
               | e -> unbox_float dbg e)
             e
         with
         | e -> Cregion e
         | exception Exit -> Cop (Cload (Double, Immutable), [cmm], dbg))
+      | Ctail e -> Ctail (unbox_float dbg e)
       | cmm -> Cop(Cload (Double, Immutable), [cmm], dbg)
     )
 
@@ -1307,11 +1309,13 @@ let rec unbox_int dbg bi =
           map_tail ~kind:Any
             (function
               | Cop (Capply (_, Rc_close_at_apply), _, _) -> raise Exit
+              | Ctail e -> Ctail (unbox_int dbg bi e)
               | e -> unbox_int dbg bi e)
             e
         with
         | e -> Cregion e
         | exception Exit -> default cmm)
+      | Ctail e -> Ctail (unbox_int dbg bi e)
       | cmm ->
           default cmm
     )
@@ -2014,15 +2018,15 @@ let has_local_allocs e =
   let rec loop = function
     | Cregion e ->
         (* Local allocations within a nested region do not affect this region,
-           except inside a Cexclave block *)
+           except inside a Ctail block *)
         loop_until_tail e
     | Cop (Calloc Alloc_local, _, _)
     | Cop ((Cextcall _ | Capply _), _, _) ->
         raise Exit
     | e ->
         iter_shallow loop e
   and loop_until_tail = function
-    | Cexclave e -> loop e
+    | Ctail e -> loop e
     | Cregion _ -> ()
     | e -> ignore (iter_shallow_tail loop_until_tail e)
   in
@@ -2032,13 +2036,13 @@ let has_local_allocs e =
 
 let remove_region_tail e =
   let rec has_tail = function
-    | Cexclave _
+    | Ctail _
     | Cop(Capply(_, Rc_close_at_apply), _, _) -> raise Exit
     | Cregion _ -> ()
     | e -> ignore (iter_shallow_tail has_tail e)
   in
   let rec remove_tail = function
-    | Cexclave e -> e
+    | Ctail e -> e
     | Cop(Capply(mach, Rc_close_at_apply), args, dbg) ->
        Cop(Capply(mach, Rc_normal), args, dbg)
     | Cregion _ as e -> e

asmcomp/cmm_invariants.ml

@@ -174,7 +174,7 @@ let rec check env (expr : Cmm.expression) =
     check env body;
     check env handler
   | Cregion e -> check env e
-  | Cexclave e -> check env e
+  | Ctail e -> check env e
 
 let run ppf (fundecl : Cmm.fundecl) =
   let env = Env.init () in

asmcomp/cmmgen.ml

@@ -190,7 +190,7 @@ let rec expr_size env = function
       | _ -> assert false)
   | Uregion exp ->
       expr_size env exp
-  | Uexclave exp ->
+  | Utail exp ->
       expr_size env exp
   | _ -> RHS_nonrec
 
@@ -368,7 +368,7 @@ let is_unboxed_number_cmm ~strict cmm =
         | _ ->
             notify No_unboxing
         end
-    | Cregion e ->
+    | Cregion e | Ctail e ->
         aux e
     | l ->
         if not (Cmm.iter_shallow_tail aux l) then
@@ -748,8 +748,8 @@ let rec transl env e =
       Cop(Cload (Word_int, Mutable), [Cconst_int (0, dbg)], dbg)
   | Uregion e ->
       region (transl env e)
-  | Uexclave e ->
-      Cexclave (transl env e)
+  | Utail e ->
+      Ctail (transl env e)
 
 and transl_catch (kind : Cmm.kind_for_unboxing) env nfail ids body handler dbg =
   let ids = List.map (fun (id, kind) -> (id, kind, ref No_result)) ids in

asmcomp/printcmm.ml

@@ -272,8 +272,8 @@ let rec expr ppf = function
              sequence e1 VP.print id sequence e2
   | Cregion e ->
       fprintf ppf "@[<2>(region@ %a)@]" sequence e
-  | Cexclave e ->
-      fprintf ppf "@[<2>(exclave@ %a)@]" sequence e
+  | Ctail e ->
+      fprintf ppf "@[<2>(tail@ %a)@]" sequence e
 
 and sequence ppf = function
   | Csequence(e1, e2) -> fprintf ppf "%a@ %a" sequence e1 sequence e2

asmcomp/selectgen.ml

@@ -388,7 +388,7 @@ method is_simple_expr = function
       | Ccmpf _ -> List.for_all self#is_simple_expr args
       end
   | Cassign _ | Cifthenelse _ | Cswitch _ | Ccatch _ | Cexit _
-  | Ctrywith _ | Cregion _ | Cexclave _ -> false
+  | Ctrywith _ | Cregion _ | Ctail _ -> false
 
 (* Analyses the effects and coeffects of an expression.  This is used across
    a whole list of expressions with a view to determining which expressions
@@ -435,7 +435,7 @@ method effects_of exp =
     in
     EC.join from_op (EC.join_list_map args self#effects_of)
   | Cassign _ | Cswitch _ | Ccatch _ | Cexit _ | Ctrywith _
-  | Cregion _ | Cexclave _ ->
+  | Cregion _ | Ctail _ ->
     EC.arbitrary
 
 (* Says whether an integer constant is a suitable immediate argument for
@@ -974,9 +974,9 @@ method emit_expr_aux (env:environment) exp :
         assert (List.length unclosed <= List.length old_regions);
         Some (rd, unclosed)
      end
-  | Cexclave e ->
+  | Ctail e ->
      begin match env.regions with
-     | [] -> Misc.fatal_error "Selectgen.emit_expr: Cexclave but not in tail of a region"
+     | [] -> Misc.fatal_error "Selectgen.emit_expr: Ctail but not in tail of a region"
      | cl :: rest ->
        self#insert_endregions env [cl];
        self#emit_expr_aux { env with regions = rest } e
@@ -1320,9 +1320,9 @@ method emit_tail (env:environment) exp =
       let reg = self#regs_for typ_int in
       self#insert env (Iop Ibeginregion) [| |] reg;
       self#emit_tail {env with regions = reg::env.regions} e
-  | Cexclave e ->
+  | Ctail e ->
       begin match env.regions with
-      | [] -> Misc.fatal_error "Selectgen.emit_tail: Cexclave not inside Cregion"
+      | [] -> Misc.fatal_error "Selectgen.emit_tail: Ctail not inside Cregion"
       | reg :: regions ->
          self#insert_endregions env [reg];
          self#emit_tail { env with regions } e

bytecomp/bytegen.ml

@@ -1029,8 +1029,6 @@ let rec comp_expr env exp sz cont =
       comp_expr env exp sz cont
   | Lregion (exp, _) ->
       comp_expr env exp sz cont
-  | Lexclave exp ->
-      comp_expr env exp sz cont
 
 (* Compile a list of arguments [e1; ...; eN] to a primitive operation.
    The values of eN ... e2 are pushed on the stack, e2 at top of stack,

dune

@@ -25,7 +25,7 @@
    ;; CR gyorsh: it is not clear what the ":standard" flags are, and they
    ;; may change depending on the version of dune.
    ;; Consider hard-coded flags, such as -O3.
-   (:standard -zero-alloc-check)))
+   (:standard -zero-alloc-check -caml-apply-inline-fast-path)))
  (boot
   (flags
    (:standard -warn-error +A))))
@@ -150,7 +150,7 @@
  (action
  (no-infer
   (progn
-   (chdir yacc (run make -s OCAMLYACC_INCLUDE_PATH=%{ocaml_where}))
+   (chdir yacc (run make -sj8 OCAMLYACC_INCLUDE_PATH=%{ocaml_where}))
    (copy yacc/ocamlyacc ocamlyacc)))))
 
 (install