Merge pull request #5 from athenavm/rust-1.80.0

Upgrade Rust and add macOS support

Author: lrettig

.github/workflows/build_and_release.yml

@@ -40,13 +40,15 @@ jobs:
 
   build-and-release:
     needs: prepare
+    timeout-minutes: 120
     runs-on: ${{ matrix.os }}
 
     strategy:
       matrix:
         os:
+          # self-hosted ARM macOS runner
+          - self-hosted
           - ubuntu-latest
-          # - macos-latest
 
     steps:
       - name: Free Disk Space (Ubuntu)
@@ -63,16 +65,18 @@ jobs:
 
       - uses: actions/checkout@v4
 
-      - name: Install ninja
+      - name: Install ninja and riscv-tools
         if: matrix.os == 'ubuntu-latest'
         run: |
           sudo apt update
-          sudo apt-get -y install ninja-build
+          sudo apt-get -y install ninja-build gcc-riscv64-unknown-elf
 
-      - name: Install ninja
+      - name: Install ninja and riscv-tools
         if: contains(matrix.os, 'macos')
         run: |
           brew install ninja
+          brew tap riscv-software-src/riscv
+          brew install riscv-tools
 
       - name: Download source
         run: ./clone.sh

.github/workflows/ci.yml

@@ -12,10 +12,10 @@ jobs:
         include:
           - os: ubuntu-latest
             triple: x86_64-unknown-linux-gnu
-          # - os: macos-14
-          #   triple: aarch64-apple-darwin
-          # - os: macos-13
-          #   triple: x86_64-apple-darwin
+          - os: macos-14
+            triple: aarch64-apple-darwin
+          - os: macos-13
+            triple: x86_64-apple-darwin
           # - os: buildjet-32vcpu-ubuntu-2004
           #   triple: x86_64-unknown-linux-gnu
           # - os: buildjet-32vcpu-ubuntu-2204-arm

build.sh

@@ -4,6 +4,17 @@ set -euo pipefail
 
 source config.sh
 
+# Fail fast if these tools aren't properly installed and in the path
+need_cmd riscv64-unknown-elf-gcc
+need_cmd riscv64-unknown-elf-g++
+
+# Rust requires a custom target file to exist for our custom target as part of the bootstrap build,
+# but it doesn't actually look at the contents.
+touch /tmp/riscv32em-athena-zkvm-elf.json
+
 # Will create component archives (dists) ./rust/build/dist
 cd rust
-CARGO_TARGET_RISCV32EM_ATHENA_ZKVM_ELF_RUSTFLAGS="-Cpasses=loweratomic" ./x build --stage 2
+RUST_TARGET_PATH="/tmp" \
+CARGO_TARGET_RISCV32EM_ATHENA_ZKVM_ELF_RUSTFLAGS="-Cpasses=loweratomic" \
+CFLAGS_riscv32em_athena_zkvm_elf="-ffunction-sections -fdata-sections -fPIC -march=rv32em -mabi=ilp32e" \
+./x build --stage 2

config.sh

@@ -2,7 +2,7 @@
 
 param1=${1:-}
 
-export RUST_COMMIT=9b00956e56009bab2aa15d7bff10916599e3d6d6
+export RUST_COMMIT=051478957371ee0084a7c0913941d2a8c4757bb9
 
 # If -rust_commit specified then only export the rust commit variable
 if [ "$param1" == "-rust_commit" ]; then
@@ -17,3 +17,26 @@ export ARTIFACT_NAME=athena-rust-toolchain-$TOOLCHAIN_HOST_TRIPLET
 if [ "$param1" == "-artifact_name" ]; then
     echo "ARTIFACT_NAME=$ARTIFACT_NAME" >> $GITHUB_ENV
 fi
+
+need_cmd() {
+  if ! check_cmd "$1"; then
+    err "need '$1' (command not found)"
+  fi
+}
+
+check_cmd() {
+  command -v "$1" &>/dev/null
+}
+
+say() {
+  printf "rustc-rv32e-toolchain: %s\n" "$1"
+}
+
+warn() {
+  say "warning: ${1}" >&2
+}
+
+err() {
+  say "$1" >&2
+  exit 1
+}

package.sh

@@ -5,5 +5,17 @@ set -euo pipefail
 source config.sh
 
 TOOLCHAIN_DIR=rust/build/$TOOLCHAIN_HOST_TRIPLET/stage2
-cp -n rust/build/$TOOLCHAIN_HOST_TRIPLET/stage2-tools-bin/* $TOOLCHAIN_DIR/bin
+TOOLS_BIN_DIR=rust/build/$TOOLCHAIN_HOST_TRIPLET/stage2-tools-bin
+
+# Function to copy files, ignoring errors if destination exists
+copy_ignore_existing() {
+    cp "$1" "$2" 2>/dev/null || true
+}
+
+# Copy files from stage2-tools-bin to stage2/bin, ignoring if they already exist
+for file in "$TOOLS_BIN_DIR"/*; do
+    copy_ignore_existing "$file" "$TOOLCHAIN_DIR/bin/"
+done
+
+# Create tarball
 tar --exclude lib/rustlib/src --exclude lib/rustlib/rustc-src -hczvf $ARTIFACT_NAME.tar.gz -C $TOOLCHAIN_DIR .

patch.sh

@@ -5,3 +5,6 @@ set -euo pipefail
 cd rust
 patch -p1 < ../patches/rust.patch
 cp ../patches/config.toml ./
+
+cd src/llvm-project
+patch -p1 < ../../../patches/llvm.patch

patches/config.ci.toml

@@ -1,4 +1,4 @@
-change-id = 121754
+change-id = 125535
 
 [build]
 target = ["riscv32em-athena-zkvm-elf"]
@@ -7,6 +7,10 @@ tools = ["cargo", "cargo-clippy", "clippy", "rustfmt"]
 configure-args = []
 cargo-native-static = true
 
+[target.riscv32em-athena-zkvm-elf]
+cc = "riscv64-unknown-elf-gcc"
+cxx = "riscv64-unknown-elf-g++"
+
 [rust]
 lld = true
 llvm-tools = true

patches/config.toml

@@ -1,11 +1,15 @@
-change-id = 121754
+change-id = 125535
 
 [build]
 target = ["riscv32em-athena-zkvm-elf"]
 extended = true
 tools = ["cargo", "cargo-clippy", "clippy", "rustfmt"]
 configure-args = []
 
+[target.riscv32em-athena-zkvm-elf]
+cc = "riscv64-unknown-elf-gcc"
+cxx = "riscv64-unknown-elf-g++"
+
 [rust]
 lld = true
 llvm-tools = true

patches/llvm.patch

@@ -0,0 +1,17 @@
+diff --git a/compiler-rt/lib/builtins/CMakeLists.txt b/compiler-rt/lib/builtins/CMakeLists.txt
+index 28ded8766..b51ebe8ea 100644
+--- a/compiler-rt/lib/builtins/CMakeLists.txt
++++ b/compiler-rt/lib/builtins/CMakeLists.txt
+@@ -849,9 +849,9 @@ else ()
+ 
+       # For RISCV32, we must force enable int128 for compiling long
+       # double routines.
+-      if(COMPILER_RT_ENABLE_SOFTWARE_INT128 OR "${arch}" STREQUAL "riscv32")
+-        list(APPEND BUILTIN_CFLAGS_${arch} -fforce-enable-int128)
+-      endif()
++      #if(COMPILER_RT_ENABLE_SOFTWARE_INT128 OR "${arch}" STREQUAL "riscv32")
++      #  list(APPEND BUILTIN_CFLAGS_${arch} -fforce-enable-int128)
++      #endif()
+ 
+       add_compiler_rt_runtime(clang_rt.builtins
+                               STATIC

patches/rust.patch

@@ -1,36 +1,8 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 927e93f2..dfbe7db5 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -734,9 +734,8 @@ checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335"
-
- [[package]]
- name = "compiler_builtins"
--version = "0.1.108"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d68bc55329711cd719c2687bb147bc06211b0521f97ef398280108ccb23227e9"
-+version = "0.1.105"
-+source = "git+https://github.com/rust-lang/compiler-builtins?rev=0.1.105#80ed5f8c3ddbea7986c4a8243e42b963cb954b42"
- dependencies = [
-  "cc",
-  "rustc-std-workspace-core",
-diff --git a/Cargo.toml b/Cargo.toml
-index 5dd315ef2f7..680fb821c4c 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -120,6 +120,7 @@ strip = true
- rustc-std-workspace-core = { path = 'library/rustc-std-workspace-core' }
- rustc-std-workspace-alloc = { path = 'library/rustc-std-workspace-alloc' }
- rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' }
-+compiler_builtins = { git = "https://github.com/rust-lang/compiler-builtins", rev = "0.1.105" }
-
- [patch."https://github.com/rust-lang/rust-clippy"]
- clippy_lints = { path = "src/tools/clippy/clippy_lints" }
 diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
-index 941d767b..1b4004c4 100644
+index fe07d1167..07e786b6c 100644
 --- a/compiler/rustc_target/src/spec/mod.rs
 +++ b/compiler/rustc_target/src/spec/mod.rs
-@@ -1618,6 +1618,7 @@ fn $module() {
+@@ -1731,6 +1731,7 @@ fn $module() {
 
      ("x86_64-unikraft-linux-musl", x86_64_unikraft_linux_musl),
 
@@ -39,25 +11,25 @@ index 941d767b..1b4004c4 100644
      ("riscv32im-risc0-zkvm-elf", riscv32im_risc0_zkvm_elf),
      ("riscv32im-unknown-none-elf", riscv32im_unknown_none_elf),
 diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
-index 5ed6b357e20..a31645ab6e7 100644
+index cde090637..07c9c5758 100644
 --- a/src/bootstrap/src/lib.rs
 +++ b/src/bootstrap/src/lib.rs
-@@ -91,6 +91,10 @@
+@@ -95,6 +95,10 @@
      /* Extra values not defined in the built-in targets yet, but used in std */
      (Some(Mode::Std), "target_env", Some(&["libnx", "p2"])),
-     // (Some(Mode::Std), "target_os", Some(&[])),
+     (Some(Mode::Std), "target_os", Some(&["visionos"])),
 +    // #[cfg(bootstrap)] zkvm
 +    (Some(Mode::Std), "target_os", Some(&["zkvm"])),
 +    // #[cfg(bootstrap)] athena
 +    (Some(Mode::Std), "target_vendor", Some(&["athena", "succinct"])),
      (Some(Mode::Std), "target_arch", Some(&["arm64ec", "spirv", "nvptx", "xtensa"])),
+     (Some(Mode::ToolStd), "target_os", Some(&["visionos"])),
      /* Extra names used by dependencies */
-     // FIXME: Used by serde_json, but we should not be triggering on external dependencies.
 diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs
-index eab9138b..60507063 100644
+index bed76263b..121843a30 100644
 --- a/src/tools/build-manifest/src/main.rs
 +++ b/src/tools/build-manifest/src/main.rs
-@@ -123,6 +123,7 @@
+@@ -125,6 +125,7 @@
      "powerpc-unknown-linux-gnu",
      "powerpc64-unknown-linux-gnu",
      "powerpc64le-unknown-linux-gnu",
@@ -115,58 +87,3 @@ index 00000000..a84f76c2
 +    }
 +}
 +
-diff --git a/library/std/src/sys/pal/zkvm/args.rs b/library/std/src/sys/pal/zkvm/args.rs
-index 7753cf63840..583c16e3a47 100644
---- a/library/std/src/sys/pal/zkvm/args.rs
-+++ b/library/std/src/sys/pal/zkvm/args.rs
-@@ -1,6 +1,7 @@
- use super::{abi, WORD_SIZE};
- use crate::ffi::OsString;
- use crate::fmt;
-+use crate::sys::os_str;
- use crate::sys_common::FromInner;
-
- pub struct Args {
-@@ -33,7 +34,7 @@ fn argv(i: usize) -> OsString {
-         // "os_str".
-         let arg_bytes: &[u8] =
-             unsafe { crate::slice::from_raw_parts(words.cast() as *const u8, arg_len) };
--        OsString::from_inner(super::os_str::Buf { inner: arg_bytes.to_vec() })
-+        OsString::from_inner(os_str::Buf { inner: arg_bytes.to_vec() })
-     }
- }
-
-diff --git a/library/std/src/sys/pal/zkvm/mod.rs b/library/std/src/sys/pal/zkvm/mod.rs
-index 228a976dbab..c5a1843d5ff 100644
---- a/library/std/src/sys/pal/zkvm/mod.rs
-+++ b/library/std/src/sys/pal/zkvm/mod.rs
-@@ -12,8 +12,6 @@
- pub mod alloc;
- #[path = "../zkvm/args.rs"]
- pub mod args;
--#[path = "../unix/cmath.rs"]
--pub mod cmath;
- pub mod env;
- #[path = "../unsupported/fs.rs"]
- pub mod fs;
-diff --git a/library/std/src/sys/pal/zkvm/os.rs b/library/std/src/sys/pal/zkvm/os.rs
-index d8739ee3824..759beb2d306 100644
---- a/library/std/src/sys/pal/zkvm/os.rs
-+++ b/library/std/src/sys/pal/zkvm/os.rs
-@@ -5,6 +5,7 @@
- use crate::io;
- use crate::marker::PhantomData;
- use crate::path::{self, PathBuf};
-+use crate::sys::os_str;
- use crate::sys_common::FromInner;
-
- pub fn errno() -> i32 {
-@@ -111,7 +112,7 @@ pub fn getenv(varname: &OsStr) -> Option<OsString> {
-     // reimplement "os_str" instead of just using the generic unix
-     // "os_str".
-     let u8s: &[u8] = unsafe { crate::slice::from_raw_parts(words.cast() as *const u8, nbytes) };
--    Some(OsString::from_inner(super::os_str::Buf { inner: u8s.to_vec() }))
-+    Some(OsString::from_inner(os_str::Buf { inner: u8s.to_vec() }))
- }
-
- pub fn setenv(_: &OsStr, _: &OsStr) -> io::Result<()> {