Use 4.14.0 opam switch for building (includes upgrading ocamlformat to 0.24.1) (#1030)

mshinwell · web-flow · commit e00063eed285 · 2022-12-19T13:05:18.000Z
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -86,45 +86,45 @@ jobs:
       with:
         path: 'flambda_backend'
 
-    - name: Cache OCaml 4.12 and dune
+    - name: Cache OCaml 4.14 and dune
       uses: actions/cache@v1
       id: cache
       with:
-        path: ${{ github.workspace }}/ocaml-412/_install
-        key: ${{ matrix.os }}-cache-ocaml-412-dune-341
+        path: ${{ github.workspace }}/ocaml-414/_install
+        key: ${{ matrix.os }}-cache-ocaml-414-dune-361
 
-    - name: Checkout OCaml 4.12
+    - name: Checkout OCaml 4.14
       uses: actions/checkout@master
       if: steps.cache.outputs.cache-hit != 'true'
       with:
         repository: 'ocaml/ocaml'
-        path: 'ocaml-412'
-        ref: '4.12'
+        path: 'ocaml-414'
+        ref: '4.14'
 
-    - name: Build OCaml 4.12
+    - name: Build OCaml 4.14
       if: steps.cache.outputs.cache-hit != 'true'
-      working-directory: ocaml-412
+      working-directory: ocaml-414
       run: |
-        ./configure --prefix=$GITHUB_WORKSPACE/ocaml-412/_install
+        ./configure --prefix=$GITHUB_WORKSPACE/ocaml-414/_install
         make -j $J world.opt
         make install
         # Remove unneeded parts to shrink cache file
-        rm -rf $GITHUB_WORKSPACE/ocaml-412/_install/{lib/ocaml/compiler-libs,lib/ocaml/expunge,bin/*.byte}
+        rm -rf $GITHUB_WORKSPACE/ocaml-414/_install/{lib/ocaml/compiler-libs,lib/ocaml/expunge,bin/*.byte}
 
     - name: Checkout dune github repo
       uses: actions/checkout@master
       if: steps.cache.outputs.cache-hit != 'true'
       with:
         repository: 'ocaml/dune'
-        ref: '3.4.1'
+        ref: '3.6.1'
         path: 'dune'
 
     - name: Build dune
       working-directory: dune
       if: steps.cache.outputs.cache-hit != 'true'
       run: |
-        PATH=$GITHUB_WORKSPACE/ocaml-412/_install/bin:$PATH make release
-        cp dune.exe $GITHUB_WORKSPACE/ocaml-412/_install/bin/dune
+        PATH=$GITHUB_WORKSPACE/ocaml-414/_install/bin:$PATH make release
+        cp _boot/dune.exe $GITHUB_WORKSPACE/ocaml-414/_install/bin/dune
 
     - name: Install GNU parallel
       if: matrix.os == 'macos-latest'
@@ -140,14 +140,14 @@ jobs:
         autoconf
         ./configure \
           --prefix=$GITHUB_WORKSPACE/_install \
-          --with-dune=$GITHUB_WORKSPACE/ocaml-412/_install/bin/dune \
+          --with-dune=$GITHUB_WORKSPACE/ocaml-414/_install/bin/dune \
           ${{ matrix.config }}
 
     - name: Build, install and test Flambda backend
       working-directory: flambda_backend
       run: |
         if [ $run_testsuite = true ]; then target=ci; else target=compiler; fi
-        export PATH=$GITHUB_WORKSPACE/ocaml-412/_install/bin:$PATH
+        export PATH=$GITHUB_WORKSPACE/ocaml-414/_install/bin:$PATH
         if [ $build_upstream = true ]; then make -j$J build_and_test_upstream; else make $target; fi
       env:
         BUILD_OCAMLPARAM: ${{ matrix.ocamlparam }}
@@ -158,4 +158,4 @@ jobs:
       working-directory: flambda_backend
       if: matrix.check_arch == true
       run: |
-        PATH=$GITHUB_WORKSPACE/ocaml-412/_install/bin:$PATH make check_all_arches
+        PATH=$GITHUB_WORKSPACE/ocaml-414/_install/bin:$PATH make check_all_arches
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -23,10 +23,10 @@ jobs:
         path: 'flambda_backend'
 
     # This adds a switch at $GITHUB_WORKSPACE/_opam
-    - name: Set up OCaml 4.12
+    - name: Set up OCaml 4.14
       uses: ocaml/setup-ocaml@v2
       with:
-        ocaml-compiler: 4.12
+        ocaml-compiler: 4.14
         opam-pin: false
         opam-depext: false
 
@@ -35,19 +35,12 @@ jobs:
       id: cache
       with:
         path: ${{ github.workspace }}/_opam
-        key: ${{ matrix.os }}-cache-ocaml-412-dune-2.9.1-g7606d586
-
-    - name: Build Dune
-      if: steps.cache.outputs.cache-hit != 'true'
-      run: |
-        opam pin dune --yes \
-          git+https://github.com/ocaml-flambda/dune#special_dune
+        key: ${{ matrix.os }}-cache-ocaml-414-dune-2.9.1-g7606d586
 
     - name: Build bisect_ppx
       if: steps.cache.outputs.cache-hit != 'true'
       run: |
-        # bisect_ppx fails to build with current ppxlib
-        opam pin ppxlib 0.23.0 --yes
+        opam pin ppxlib 0.25.1
         opam pin bisect_ppx --yes \
           git+https://github.com/lukemaurer/bisect_ppx#html-report-collate-fix
 
diff --git a/.github/workflows/ocamlformat.yml b/.github/workflows/ocamlformat.yml
@@ -10,7 +10,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         ocaml-compiler:
-          - "4.12.0"
+          - "4.14.0"
 
     steps:
     - name: Checkout the Flambda backend repo
@@ -26,8 +26,8 @@ jobs:
     - name: Install a recent version of re
       run: opam install 're>=1.10.0'
 
-    - name: Install ocamlformat 0.19.0
-      run: opam pin -y ocamlformat 0.19.0
+    - name: Install ocamlformat 0.24.1
+      run: opam pin -y ocamlformat 0.24.1
 
     - name: autoconf
       working-directory: flambda_backend
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,6 +1,6 @@
 {
         "ocaml.sandbox": {
                 "kind": "opam",
-                "switch": "4.12.0"
+                "switch": "4.14.0"
         }
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -4,7 +4,7 @@
 		{
 			"label": "Build & install Flambda backend",
 			"type": "shell",
-			"command": "opam exec --switch=4.11.1 make install",
+			"command": "opam exec --switch=4.14.0 make install",
 			"group": "build",
 			"problemMatcher": [
 				"$ocamlc"
diff --git a/HACKING.md b/HACKING.md
@@ -89,7 +89,7 @@ Depending on the initial changes, it might be necessary to do this multiple time
 ## Rebuilding during dev work
 
 To rebuild after making changes, you can just type `make`. You need to
-have a working OCaml 4.12 compiler on your PATH before doing so,
+have a working OCaml 4.14 compiler on your PATH before doing so,
 e.g. installed via OPAM.
 
 There is a special target `make hacking` which starts Dune in polling mode.  The rebuild
@@ -206,7 +206,7 @@ thoroughly (e.g. `git clean -dfX`) before reconfiguring with a different prefix.
 
 Then build the compiler with the command `make _install` (this is the default
 target plus some setup in preparation for installation). As usual when building,
-a 4.12 compiler (and dune) need to be in the path.
+a 4.14 compiler (and dune) need to be in the path.
 
 Now the build part is done, we don't need to stay in the build environment
 anymore; the switch creation will likely replace it if your terminal is setup
@@ -225,12 +225,12 @@ opam switch create flambda-backend --empty --repositories=flambda2=git+https://g
 Then we can install the compiler. The recommended way is to use the `opam-custom-install`
 plugin. See [here](https://gitlab.ocamlpro.com/louis/opam-custom-install)
 for instructions. The plugin can be installed in any existing OPAM switch,
-for example a 4.12 switch used for building. Once installed, the plugin will be
+for example a 4.14 switch used for building. Once installed, the plugin will be
 available whatever the current active switch is.
 Once the plugin is installed, we can use it to install the compiler:
 
 ```shell
-opam custom-install ocaml-variants.4.12.0+flambda2 -- make -C ${flambda-backend-root-dir} install_for_opam
+opam custom-install ocaml-variants.4.14.0+flambda2 -- make -C ${flambda-backend-root-dir} install_for_opam
 ```
 The `-C ${flambda-backend-dir}` part can be omitted if we're still in the build directory.
 
@@ -239,7 +239,7 @@ it is recommended to run the command `opam reinstall --forget-pending` after
 every use of `opam custom-install`, otherwise any subsequent `opam` command
 tries to rebuild the compiler from scratch.
 
-To finish the installation, `opam install ocaml.4.12.0` will install the remaining
+To finish the installation, `opam install ocaml.4.14.0` will install the remaining
 auxiliary packages necessary for a regular switch. After that, normal opam
 packages can be installed the usual way.
 
@@ -252,7 +252,7 @@ As `opam-custom-install` is still experimental, it can sometimes be hard to inst
 In this case, it is possible to use the more fragile `opam install --fake` command:
 
 ```shell
-opam install --fake ocaml-variants.4.12.0+flambda2
+opam install --fake ocaml-variants.4.14.0+flambda2
 make -C ${flambda-backend-root-dir} install_for_opam
 ```
 
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ This repository is for more experimental work, of production quality, on the mid
 and backend of the OCaml compiler.
 This is also the home of the Flambda 2 optimiser.
 
-The Flambda backend is currently based on OCaml 4.12.0.
+The Flambda backend is currently based on OCaml 4.14.0.
 
 The following gives basic instructions for getting set up.  Please see
 [`HACKING.md`](HACKING.md) for more detailed instructions if you want to develop in this repo.
@@ -18,7 +18,7 @@ Only currently tested on Linux/x86-64 and macOS/x86-64.
 
 One-time setup:
 ```
-$ opam switch 4.12.0  # or "opam switch create 4.12.0" if you haven't got that switch already
+$ opam switch 4.14.0  # or "opam switch create 4.14.0" if you haven't got that switch already
 $ eval $(opam env)
 $ opam install dune
 ```
@@ -38,7 +38,7 @@ The Flambda backend tree has to be configured before building.  The configure sc
 in; you have to run `autoconf`.  For example:
 ```
 $ autoconf
-$ ./configure --prefix=/path/to/install/dir --enable-middle-end=closure --with-dune=$DUNE_DIR/dune.exe
+$ ./configure --prefix=/path/to/install/dir --enable-middle-end=closure
 ```
 You can also specify `--enable-middle-end=flambda` or `--enable-middle-end=flambda2`.  (The Flambda 2
 compiler is not yet ready for production use.)
diff --git a/backend/.ocamlformat b/backend/.ocamlformat
@@ -7,10 +7,11 @@ cases-exp-indent=2
 doc-comments=before
 dock-collection-brackets=false
 if-then-else=keyword-first
+module-item-spacing=sparse
 parens-tuple=multi-line-only
 sequence-blank-line=compact
 space-around-lists=false
 space-around-variants=false
 type-decl=sparse
 wrap-comments=true
-version=0.19.0
+version=0.24.1
diff --git a/configure.ac b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.69])
 AC_INIT([The Flambda backend for OCaml],
-        4.11.1+dev0-2020-08-18,
+        4.14.0+dev0-2022-12-19,
         [mshinwell@janestreet.com],
         [flambda_backend],
         [http://github.com/ocaml-flambda/flambda_backend])
diff --git a/middle_end/.ocamlformat b/middle_end/.ocamlformat
@@ -7,10 +7,11 @@ cases-exp-indent=2
 doc-comments=before
 dock-collection-brackets=false
 if-then-else=keyword-first
+module-item-spacing=sparse
 parens-tuple=multi-line-only
 sequence-blank-line=compact
 space-around-lists=false
 space-around-variants=false
 type-decl=sparse
 wrap-comments=true
-version=0.19.0
+version=0.24.1
diff --git a/middle_end/flambda2/.ocamlformat b/middle_end/flambda2/.ocamlformat
@@ -5,10 +5,11 @@ cases-exp-indent=2
 doc-comments=before
 dock-collection-brackets=false
 if-then-else=keyword-first
+module-item-spacing=sparse
 parens-tuple=multi-line-only
 sequence-blank-line=compact
 space-around-lists=false
 space-around-variants=false
 type-decl=sparse
 wrap-comments=true
-version=0.19.0
+version=0.24.1
diff --git a/middle_end/flambda2/from_lambda/closure_conversion.ml b/middle_end/flambda2/from_lambda/closure_conversion.ml
@@ -446,7 +446,8 @@ let close_c_call acc env ~loc ~let_bound_var
             let prim = P.Unary (Reinterpret_int64_as_float, arg) in
             let acc, return_result =
               Apply_cont_with_acc.create acc return_continuation
-                ~args:[Simple.var result] ~dbg
+                ~args:[Simple.var result]
+                ~dbg
             in
             let acc, return_result_expr =
               Expr_with_acc.create_apply_cont acc return_result
diff --git a/middle_end/flambda2/from_lambda/lambda_to_flambda_primitives_helpers.ml b/middle_end/flambda2/from_lambda/lambda_to_flambda_primitives_helpers.ml
@@ -334,7 +334,8 @@ let rec bind_rec acc env exn_cont ~register_const_string (prim : expr_primitive)
       @@ fun acc _env ifso ->
       let acc, apply_cont =
         Apply_cont_with_acc.create acc join_point_cont
-          ~args:[Simple.var ifso_result] ~dbg
+          ~args:[Simple.var ifso_result]
+          ~dbg
       in
       let acc, body = Expr_with_acc.create_apply_cont acc apply_cont in
       Let_with_acc.create acc
@@ -346,7 +347,8 @@ let rec bind_rec acc env exn_cont ~register_const_string (prim : expr_primitive)
       @@ fun acc _env ifnot ->
       let acc, apply_cont =
         Apply_cont_with_acc.create acc join_point_cont
-          ~args:[Simple.var ifnot_result] ~dbg
+          ~args:[Simple.var ifnot_result]
+          ~dbg
       in
       let acc, body = Expr_with_acc.create_apply_cont acc apply_cont in
       Let_with_acc.create acc
diff --git a/middle_end/flambda2/parser/fexpr_to_flambda.ml b/middle_end/flambda2/parser/fexpr_to_flambda.ml
@@ -785,8 +785,8 @@ let rec expr env (e : Fexpr.expr) : Flambda.Expr.t =
             ~newer_version_of ~params_arity ~num_trailing_local_params:0
             ~result_arity ~result_types:Unknown
             ~contains_no_escaping_local_allocs:false ~stub:false ~inline
-            ~check:
-              Default_check (* CR gyorsh: should [check] be set properly? *)
+            ~check:Default_check
+              (* CR gyorsh: should [check] be set properly? *)
             ~is_a_functor:false ~recursive
             ~cost_metrics (* CR poechsel: grab inlining arguments from fexpr. *)
             ~inlining_arguments:(Inlining_arguments.create ~round:0)
diff --git a/middle_end/flambda2/simplify/expr_builder.ml b/middle_end/flambda2/simplify/expr_builder.ml
@@ -368,8 +368,7 @@ let create_raw_let_symbol uacc bound_static static_consts ~body =
     UA.with_name_occurrences uacc ~name_occurrences:free_names_of_let
     |> UA.add_cost_metrics
          (Cost_metrics.increase_due_to_let_expr
-            ~is_phantom:
-              false
+            ~is_phantom:false
               (* Static consts always have zero cost metrics at present. *)
             ~cost_metrics_of_defining_expr:Cost_metrics.zero)
   in
diff --git a/middle_end/flambda2/simplify/lifting/lifted_constant_state.ml b/middle_end/flambda2/simplify/lifting/lifted_constant_state.ml
@@ -111,7 +111,8 @@ let add_to_denv ?maybe_already_defined denv lifted =
                    be combined into one *)
                 T.make_suitable_for_environment
                   (DE.typing_env denv_at_definition)
-                  (Everything_not_in typing_env) [sym, typ]
+                  (Everything_not_in typing_env)
+                  [sym, typ]
               in
               TE.add_env_extension_with_extra_variables typing_env env_extension)
           types_of_symbols typing_env)
diff --git a/middle_end/flambda2/to_cmm/to_cmm_shared.ml b/middle_end/flambda2/to_cmm/to_cmm_shared.ml
@@ -159,7 +159,8 @@ let invalid res ~message =
   in
   let call_expr =
     extcall ~dbg ~alloc:false ~is_c_builtin:false ~returns:false ~ty_args:[XInt]
-      "caml_flambda2_invalid" Cmm.typ_void [symbol ~dbg message_sym]
+      "caml_flambda2_invalid" Cmm.typ_void
+      [symbol ~dbg message_sym]
   in
   call_expr, res
 
diff --git a/ocaml/HACKING.jst.adoc b/ocaml/HACKING.jst.adoc
@@ -2,9 +2,9 @@
 
 ocaml-jst has a dune-based build system which is different from
 upstream OCaml. To get started, you'll need a working install of OCaml
-4.12 and dune, e.g. via OPAM:
+4.14 and dune, e.g. via OPAM:
 
-    $ opam switch create 4.12.0
+    $ opam switch create 4.14.0
     $ eval $(opam env)
     $ opam install dune
 
@@ -30,7 +30,7 @@ to build without running the testsuite, or:
 to start a continuously polling build of the compiler.
 
 Note that the dune-based build system is entirely separate from the main
-Makefile, and so you will need to use `make -f Makefile.jst install` 
+Makefile, and so you will need to use `make -f Makefile.jst install`
 to install after building.
 
 ## Testing
diff --git a/tools/.ocamlformat b/tools/.ocamlformat
@@ -6,10 +6,11 @@ doc-comments=before
 dock-collection-brackets=false
 exp-grouping=preserve
 if-then-else=keyword-first
+module-item-spacing=sparse
 parens-tuple=multi-line-only
 sequence-blank-line=compact
 space-around-lists=false
 space-around-variants=false
 type-decl=sparse
 wrap-comments=true
-version=0.19.0
+version=0.24.1
diff --git a/utils/.ocamlformat b/utils/.ocamlformat
@@ -5,10 +5,11 @@ cases-exp-indent=2
 doc-comments=before
 dock-collection-brackets=false
 if-then-else=keyword-first
+module-item-spacing=sparse
 parens-tuple=multi-line-only
 sequence-blank-line=compact
 space-around-lists=false
 space-around-variants=false
 type-decl=sparse
 wrap-comments=true
-version=0.19.0
+version=0.24.1

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"ocaml.sandbox": {`
`3`	`3`	`"kind": "opam",`
`4`		`- "switch": "4.12.0"`
	`4`	`+ "switch": "4.14.0"`
`5`	`5`	`}`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`{`
`5`	`5`	`"label": "Build & install Flambda backend",`
`6`	`6`	`"type": "shell",`
`7`		`- "command": "opam exec --switch=4.11.1 make install",`
	`7`	`+ "command": "opam exec --switch=4.14.0 make install",`
`8`	`8`	`"group": "build",`
`9`	`9`	`"problemMatcher": [`
`10`	`10`	`"$ocamlc"`