Merge branch 'main' into fix-wbtest-duplicate-diag

Author: bmwangmh

.github/workflows/ci.yml

@@ -240,6 +240,12 @@ jobs:
           cargo run --bin moon test --source-dir ~/.moon/lib/core --target llvm
           cargo run --bin moon test --source-dir ~/.moon/lib/core --target llvm --release
 
+      - name: Test core compilation (Rupes Recta builder, Unix)
+        if: ${{ matrix.os != 'windows-latest' }}
+        run: |
+          cargo run --bin moon -- -C ~/.moon/lib/core clean
+          cargo run --bin moon -- -Z rupes_recta -C ~/.moon/lib/core build --target wasm-gc
+
   stable-test:
     needs: [typo-check, license-header-check]
     strategy:

Cargo.lock

@@ -17,7 +17,7 @@
 # For inquiries, you can contact us via e-mail at jichuruanjian@idea.edu.cn.
 
 [workspace]
-members = ["xtask", "./crates/*"]
+members = ["xtask", "./crates/*", "crates/moonbuild-rupes-recta"]
 resolver = "2"
 default-members = ["./crates/*"]
 
@@ -29,11 +29,12 @@ edition = "2021"
 n2 = { git = "https://github.com/moonbitlang/n2.git", rev = "dbd9c7921f8f2f388b85f375ea7a30575310b35d" }
 arcstr = { version = "1.2", features = ["serde"] }
 moonbuild = { path = "./crates/moonbuild", version = "*" }
+moonbuild-rupes-recta = { path = "./crates/moonbuild-rupes-recta", version = "*" }
 mooncake = { path = "./crates/mooncake", version = "*" }
 moonutil = { path = "./crates/moonutil", version = "*" }
 anyhow = { version = "1.0.86" }
 bincode = "1.3.3"
-clap = { version = "4.5.4", features = ["derive", "string"] }
+clap = { version = "4.5.4", features = ["derive", "string", "env"] }
 colored = "2.1.0"
 ctrlc = { version = "3.4.4", features = ["termination"] }
 dunce = "1.0.4"
@@ -101,6 +102,7 @@ once_cell = "1.20.3"
 derive_builder = "0.20.2"
 pulldown-cmark = "0.13.0"
 shlex = "1.3.0"
+relative-path = "2.0.1"
 slotmap = "1.0.7"
 
 [profile.release]

Cargo.toml

@@ -30,6 +30,7 @@ rust-version.workspace = true
 moonbuild.workspace = true
 mooncake.workspace = true
 moonutil.workspace = true
+moonbuild-rupes-recta.workspace = true
 n2.workspace = true
 semver.workspace = true
 clap.workspace = true

crates/moon/Cargo.toml

@@ -169,8 +169,12 @@ pub struct BuildFlags {
     #[clap(skip)]
     pub target_backend: Option<TargetBackend>,
 
-    /// Handle the selected targets sequentially
-    #[clap(long, requires = "target")]
+    /// [Deprecated] Handle the selected targets sequentially
+    ///
+    /// This flag is deprecated, because all targets are handled sequentially
+    /// for now, until multi-target compilation is implemented (if any).
+    #[clap(long, requires = "target", hide = true)]
+    #[deprecated]
     pub serial: bool,
 
     /// Enable coverage instrumentation

crates/moon/src/cli.rs

@@ -19,8 +19,6 @@
 use anyhow::Context;
 use moonutil::{common::lower_surface_targets, dirs::PackageDirs, mooncakes::sync::AutoSyncFlags};
 use std::path::Path;
-use std::sync::Arc;
-use std::thread;
 
 use super::{BuildFlags, UniversalFlags};
 
@@ -66,41 +64,14 @@ pub fn run_bench(cli: UniversalFlags, cmd: BenchSubcommand) -> anyhow::Result<i3
     let surface_targets = cmd.build_flags.target.clone().unwrap();
     let targets = lower_surface_targets(&surface_targets);
     let display_backend_hint = if targets.len() > 1 { Some(()) } else { None };
-    let cli = Arc::new(cli);
-    let source_dir = Arc::new(source_dir);
-    let target_dir = Arc::new(target_dir);
-    let mut handles = Vec::new();
 
     let mut ret_value = 0;
-    if cmd.build_flags.serial {
-        for t in targets {
-            let mut cmd = cmd.clone();
-            cmd.build_flags.target_backend = Some(t);
-            let x = run_bench_internal(&cli, &cmd, &source_dir, &target_dir, display_backend_hint)?;
-            ret_value = ret_value.max(x);
-        }
-    } else {
-        for t in targets {
-            let cli = Arc::clone(&cli);
-            let mut cmd = cmd.clone();
-            cmd.build_flags.target_backend = Some(t);
-            let source_dir = Arc::clone(&source_dir);
-            let target_dir = Arc::clone(&target_dir);
-
-            let handle = thread::spawn(move || {
-                run_bench_internal(&cli, &cmd, &source_dir, &target_dir, display_backend_hint)
-            });
-
-            handles.push((t, handle));
-        }
-
-        for (backend, handle) in handles {
-            let x = handle
-                .join()
-                .unwrap()
-                .context(format!("failed to run bench for target {backend:?}"))?;
-            ret_value = ret_value.max(x);
-        }
+    for t in targets {
+        let mut cmd = cmd.clone();
+        cmd.build_flags.target_backend = Some(t);
+        let x = run_bench_internal(&cli, &cmd, &source_dir, &target_dir, display_backend_hint)
+            .context(format!("failed to run bench for target {t:?}"))?;
+        ret_value = ret_value.max(x);
     }
     Ok(ret_value)
 }