Use Eio for parallelizing some analysis commands

.github/workflows/ci.yml

@@ -58,12 +58,6 @@ jobs:
             node-target: win32-x64
             rust-target: x86_64-pc-windows-gnu
 
-          # Verify that the compiler still builds with the oldest OCaml version we support.
-          - os: ubuntu-24.04
-            ocaml_compiler: ocaml-variants.4.14.2+options,ocaml-option-static
-            node-target: linux-x64
-            rust-target: x86_64-unknown-linux-musl
-
     runs-on: ${{matrix.os}}
 
     env:
@@ -102,7 +96,7 @@ jobs:
         uses: awalsh128/[email protected]
         with:
           # See https://github.com/ocaml/setup-ocaml/blob/b2105f9/packages/setup-ocaml/src/unix.ts#L9
-          packages: bubblewrap darcs g++-multilib gcc-multilib mercurial musl-tools rsync
+          packages: bubblewrap darcs g++-multilib gcc-multilib mercurial musl-tools rsync linux-libc-dev dpkg-dev
           version: v3
 
       - name: Restore rewatch build cache
@@ -179,6 +173,13 @@ jobs:
             await fs.writeFile('.opam-path', opamPath, 'utf-8');
             console.log('stored path to .opam-path');
 
+      - name: Configure Linux include paths
+        if: runner.os == 'Linux'
+        run: |
+          arch=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+          echo "C_INCLUDE_PATH=/usr/include:/usr/include/$arch" >> "$GITHUB_ENV"
+          echo "CPATH=/usr/include:/usr/include/$arch" >> "$GITHUB_ENV"
+
       - name: Install OPAM dependencies
         if: steps.cache-opam-env.outputs.cache-hit != 'true'
         run: opam install . --deps-only --with-test

CHANGELOG.md

@@ -23,6 +23,7 @@
 - Add support for ArrayBuffer and typed arrays to `@unboxed`. https://github.com/rescript-lang/rescript/pull/7788
 - Experimental: Add `let?` syntax for unwrapping and propagating errors/none as early returns for option/result types. https://github.com/rescript-lang/rescript/pull/7582
 - Add support for shipping features as experimental, including configuring what experimental features are enabled in `rescript.json`. https://github.com/rescript-lang/rescript/pull/7582
+- Use multicore OCaml with Eio to speed up the `rename` and `find all references` commands. https://github.com/rescript-lang/rescript/pull/7840
 
 #### :bug: Bug fix
 

analysis.opam

@@ -7,8 +7,10 @@ license: "LGPL-3.0-or-later"
 homepage: "https://github.com/rescript-lang/rescript-compiler"
 bug-reports: "https://github.com/rescript-lang/rescript-compiler/issues"
 depends: [
-  "ocaml" {>= "4.14"}
+  "ocaml" {>= "5.3"}
   "cppo" {= "1.8.0"}
+  "eio"
+  "eio_main"
   "dune" {>= "3.17"}
   "odoc" {with-doc}
 ]

analysis/bin/dune

@@ -8,4 +8,4 @@
  (package analysis)
  (modes byte exe)
  (name main)
- (libraries analysis))
+ (libraries analysis eio eio_main))

analysis/bin/main.ml

@@ -119,7 +119,7 @@ let main () =
   | [_; "cache-delete"; rootPath] -> (
     Cfg.readProjectConfigCache := false;
     let uri = Uri.fromPath rootPath in
-    match Packages.findRoot ~uri (Hashtbl.create 0) with
+    match Packages.findRoot ~uri with
     | Some (`Bs rootPath) -> (
       match BuildSystem.getLibBs rootPath with
       | None -> print_endline "\"ERR\""
@@ -194,21 +194,23 @@ let main () =
     Sys.argv.(len - 1) <- "";
     Reanalyze.cli ()
   | [_; "references"; path; line; col] ->
-    Commands.references ~path
-      ~pos:(int_of_string line, int_of_string col)
-      ~debug
+    Eio_main.run (fun env ->
+        Commands.references ~env ~path
+          ~pos:(int_of_string line, int_of_string col)
+          ~debug)
   | [_; "rename"; path; line; col; newName] ->
-    Commands.rename ~path
-      ~pos:(int_of_string line, int_of_string col)
-      ~newName ~debug
+    Eio_main.run (fun env ->
+        Commands.rename ~env ~path
+          ~pos:(int_of_string line, int_of_string col)
+          ~newName ~debug)
   | [_; "semanticTokens"; currentFile] ->
     SemanticTokens.semanticTokens ~currentFile
   | [_; "createInterface"; path; cmiFile] ->
     Printf.printf "\"%s\""
       (Json.escape (CreateInterface.command ~path ~cmiFile))
   | [_; "format"; path] ->
     Printf.printf "\"%s\"" (Json.escape (Commands.format ~path))
-  | [_; "test"; path] -> Commands.test ~path
+  | [_; "test"; path] -> Eio_main.run (fun env -> Commands.test ~env ~path)
   | [_; "cmt"; rescript_json; cmt_path] -> CmtViewer.dump rescript_json cmt_path
   | args when List.mem "-h" args || List.mem "--help" args -> prerr_endline help
   | _ ->

analysis/src/AnalysisCache.ml

@@ -0,0 +1,7 @@
+(* Helpers for domain-local caches *)
+
+let make_hashtbl (size : int) : ('k, 'v) Hashtbl.t Domain.DLS.key =
+  Domain.DLS.new_key (fun () -> Hashtbl.create size)
+
+let get_hashtbl (key : ('k, 'v) Hashtbl.t Domain.DLS.key) : ('k, 'v) Hashtbl.t =
+  Domain.DLS.get key

analysis/src/Cmt.ml

@@ -1,5 +1,13 @@
 open SharedTypes
 
+(* Caches for the `full` type *)
+module FullCache = struct
+  let key : (string, full) Hashtbl.t Domain.DLS.key =
+    AnalysisCache.make_hashtbl 64
+
+  let get () : (string, full) Hashtbl.t = AnalysisCache.get_hashtbl key
+end
+
 let fullForCmt ~moduleName ~package ~uri cmt =
   match Shared.tryReadCmt cmt with
   | None -> None
@@ -8,45 +16,63 @@ let fullForCmt ~moduleName ~package ~uri cmt =
     let extra = ProcessExtra.getExtra ~file ~infos in
     Some {file; extra; package}
 
-let fullFromUri ~uri =
+let fullFromUriWithPackage ~package ~uri =
   let path = Uri.toPath uri in
-  match Packages.getPackage ~uri with
-  | None -> None
-  | Some package -> (
-    let moduleName =
-      BuildSystem.namespacedName package.namespace (FindFiles.getName path)
-    in
-    let incremental =
-      if !Cfg.inIncrementalTypecheckingMode then
-        let incrementalCmtPath =
-          package.rootPath ^ "/lib/bs/___incremental" ^ "/" ^ moduleName
-          ^
-          match Files.classifySourceFile path with
-          | Resi -> ".cmti"
-          | _ -> ".cmt"
-        in
-        fullForCmt ~moduleName ~package ~uri incrementalCmtPath
-      else None
+  let moduleName =
+    BuildSystem.namespacedName package.namespace (FindFiles.getName path)
+  in
+  let cached_full cmt_path =
+    let cache = FullCache.get () in
+    match Hashtbl.find_opt cache cmt_path with
+    | Some v -> Some v
+    | None -> (
+      match fullForCmt ~moduleName ~package ~uri cmt_path with
+      | Some v as res ->
+        Hashtbl.replace cache cmt_path v;
+        res
+      | None -> None)
+  in
+  if !Cfg.inIncrementalTypecheckingMode then
+    let incrementalCmtPath =
+      package.rootPath ^ "/lib/bs/___incremental" ^ "/" ^ moduleName
+      ^
+      match Files.classifySourceFile path with
+      | Resi -> ".cmti"
+      | _ -> ".cmt"
     in
-    match incremental with
-    | Some cmtInfo ->
-      if Debug.verbose () then Printf.printf "[cmt] Found incremental cmt\n";
-      Some cmtInfo
+    match cached_full incrementalCmtPath with
+    | Some x -> Some x
     | None -> (
       match Hashtbl.find_opt package.pathsForModule moduleName with
       | Some paths ->
         let cmt = getCmtPath ~uri paths in
-        fullForCmt ~moduleName ~package ~uri cmt
+        cached_full cmt
       | None ->
         prerr_endline ("can't find module " ^ moduleName);
-        None))
+        None)
+  else
+    match Hashtbl.find_opt package.pathsForModule moduleName with
+    | Some paths ->
+      let cmt = getCmtPath ~uri paths in
+      cached_full cmt
+    | None ->
+      prerr_endline ("can't find module " ^ moduleName);
+      None
+
+let fullFromUri ~uri =
+  match Packages.getPackage ~uri with
+  | None -> None
+  | Some package -> fullFromUriWithPackage ~package ~uri
 
 let fullsFromModule ~package ~moduleName =
-  if Hashtbl.mem package.pathsForModule moduleName then
-    let paths = Hashtbl.find package.pathsForModule moduleName in
+  match Hashtbl.find_opt package.pathsForModule moduleName with
+  | None -> []
+  | Some paths ->
     let uris = getUris paths in
-    uris |> List.filter_map (fun uri -> fullFromUri ~uri)
-  else []
+    uris
+    |> List.filter_map (fun uri ->
+           let cmt = getCmtPath ~uri paths in
+           fullForCmt ~moduleName ~package ~uri cmt)
 
 let loadFullCmtFromPath ~path =
   let uri = Uri.fromPath path in