Solana 0.1.160 upgrade

.github/workflows/main.yaml

@@ -94,10 +94,18 @@ jobs:
           test_verbatim: 1
         - target: i686-pc-windows-gnu
           os: windows-2025
-          channel: nightly-i686-gnu
+          channel: nightly-2025-04-29-i686-gnu
         - target: x86_64-pc-windows-gnu
           os: windows-2025
-          channel: nightly-x86_64-gnu
+          channel: nightly-2025-04-29-x86_64-gnu
+        - target: sbpf-solana-solana
+          os: ubuntu-24.04
+        - target: sbpfv1-solana-solana
+          os: ubuntu-24.04
+        - target: sbpfv2-solana-solana
+          os: ubuntu-24.04
+        - target: sbpfv3-solana-solana
+          os: ubuntu-24.04
     runs-on: ${{ matrix.os }}
     needs: [calculate_vars]
     env:
@@ -111,14 +119,22 @@ jobs:
       with:
         submodules: true
     - name: Install Rust (rustup)
+      if: ${{ !startsWith(matrix.target, 'sbpf') }}
       shell: bash
       run: |
-        channel="nightly"
+        channel="nightly-2025-04-29"
         # Account for channels that have required components (MinGW)
         [ -n "${{ matrix.channel }}" ] && channel="${{ matrix.channel }}"
         rustup update "$channel" --no-self-update
         rustup default "$channel"
         rustup target add "${{ matrix.target }}"
+    - name: Install Rust (rustup)
+      if: ${{ startsWith(matrix.target, 'sbpf') }}
+      shell: bash
+      run: |
+        channel="nightly-2025-04-29"
+        rustup update "$channel" --no-self-update
+        rustup default "$channel"
     - uses: taiki-e/install-action@nextest
     - uses: Swatinem/rust-cache@v2
       with:
@@ -188,7 +204,7 @@ jobs:
     - name: Install nightly `clippy`
       run: |
         rustup set profile minimal
-        rustup default nightly
+        rustup default nightly-2025-04-29
         rustup component add clippy
     - uses: Swatinem/rust-cache@v2
     - run: cargo clippy --workspace --all-targets
@@ -259,7 +275,7 @@ jobs:
       with:
         submodules: true
     - name: Install Rust (rustup)
-      run: rustup update nightly --no-self-update && rustup default nightly
+      run: rustup update nightly-2025-04-29 --no-self-update && rustup default nightly-2025-04-29
       shell: bash
     - run: rustup component add miri
     - run: cargo miri setup

builtins-test-intrinsics/Cargo.toml

@@ -17,3 +17,10 @@ panic = "abort"
 
 [profile.dev]
 panic = "abort"
+
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = [
+    'cfg(target_family, values("solana"))',
+    'cfg(target_feature, values("static-syscalls"))',
+    'cfg(target_os, values("solana"))'
+] }

builtins-test-intrinsics/src/main.rs

@@ -17,8 +17,12 @@
 extern crate compiler_builtins;
 extern crate panic_handler;
 
-// SAFETY: no definitions, only used for linking
-#[cfg(all(not(thumb), not(windows), not(target_arch = "wasm32")))]
+#[cfg(all(
+    not(thumb),
+    not(windows),
+    not(target_arch = "wasm32"),
+    not(target_os = "solana")
+))]
 #[link(name = "c")]
 unsafe extern "C" {}
 

builtins-test/Cargo.toml

@@ -22,9 +22,12 @@ default-features = false
 features = ["unstable-public-internals"]
 
 [dev-dependencies]
-criterion = { version = "0.5.1", default-features = false, features = ["cargo_bench_support"] }
 paste = "1.0.15"
 
+[target.'cfg(not(target_arch = "sbf"))'.dev-dependencies]
+criterion = { version = "0.5.1", default-features = false, features = ["cargo_bench_support"] }
+
+
 [target.'cfg(all(target_arch = "arm", not(any(target_env = "gnu", target_env = "musl")), target_os = "linux"))'.dev-dependencies]
 test = { git = "https://github.com/japaric/utest" }
 utest-cortex-m-qemu = { default-features = false, git = "https://github.com/japaric/utest" }
@@ -50,7 +53,7 @@ no-sys-f16 = ["no-sys-f16-f64-convert"]
 icount = ["dep:iai-callgrind"]
 
 # Enable report generation without bringing in more dependencies by default
-benchmarking-reports = ["criterion/plotters", "criterion/html_reports"]
+# benchmarking-reports = ["criterion/plotters", "criterion/html_reports"]
 
 # NOTE: benchmarks must be run with `--no-default-features` or with
 # `-p builtins-test`, otherwise the default `compiler-builtins` feature
@@ -97,3 +100,11 @@ harness = false
 name = "mem_icount"
 harness = false
 required-features = ["icount"]
+
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = [
+    'cfg(target_family, values("solana"))',
+    'cfg(target_feature, values("static-syscalls"))',
+    'cfg(target_os, values("solana"))'
+] }
+

builtins-test/tests/conv.rs

@@ -84,7 +84,9 @@ mod i_to_f {
                         if !Float::eq_repr(f0, f1) && !cfg!(any(
                             target_arch = "x86",
                             target_arch = "powerpc",
-                            target_arch = "powerpc64"
+                            target_arch = "powerpc64",
+                            // In SBF, the rounding bug exists when ALU32 is disbaled.
+                            not(target_feature = "static-syscalls"),
                         )) {
                             panic!(
                                 "{}({}): std: {:?}, builtins: {:?}",

builtins-test/tests/div_rem.rs

@@ -138,7 +138,10 @@ macro_rules! float {
     };
 }
 
-#[cfg(not(all(target_arch = "x86", not(target_feature = "sse"))))]
+#[cfg(not(any(
+    all(target_arch = "x86", not(target_feature = "sse")),
+    target_family = "solana"
+)))]
 mod float_div {
     use super::*;
 

builtins-test/tests/mem.rs

@@ -37,6 +37,7 @@ fn memcpy_10() {
     }
 }
 
+#[cfg(not(target_os = "solana"))]
 #[test]
 fn memcpy_big() {
     // Make the arrays cross 3 pages
@@ -165,6 +166,7 @@ fn memmove_forward_misaligned_nonaligned_start() {
     }
 }
 
+#[cfg(not(target_os = "solana"))]
 #[test]
 fn memmove_forward_misaligned_aligned_start() {
     let mut arr = gen_arr::<32>();

ci/docker/sbpf-solana-solana/Dockerfile

@@ -0,0 +1,25 @@
+FROM ubuntu:22.04
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+    curl \
+    gcc libc6-dev ca-certificates bzip2 \
+    libssl-dev pkg-config
+
+ENV RUSTUP_INIT_SKIP_PATH_CHECK="yes"
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -v --no-modify-path
+RUN cp ${HOME}/.cargo/bin/* /usr/local/bin/
+
+RUN cargo install --git https://github.com/anza-xyz/cargo-run-solana-tests.git \
+    --rev ccfb0a3f5f967f3cf52fef0c95e283c7cab1836e \
+    --bin cargo-run-solana-tests --root /usr/local
+
+RUN mkdir -p /tmp/.cache/solana/v1.51/platform-tools
+RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.51/platform-tools-linux-x86_64.tar.bz2
+RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.51/platform-tools
+RUN rustup toolchain link solana /tmp/.cache/solana/v1.51/platform-tools/rust
+RUN cp -R ${HOME}/.rustup /tmp/
+
+ENV CARGO_TARGET_SBPF_SOLANA_SOLANA_RUNNER="cargo-run-solana-tests --heap-size 104857600"
+ENV LLVM_HOME="/tmp/.cache/solana/v1.51/platform-tools/llvm"
+ENV CC="/tmp/.cache/solana/v1.51/platform-tools/llvm/bin/clang"
+ENV RUSTUP_TOOLCHAIN="solana"

ci/docker/sbpfv1-solana-solana/Dockerfile

@@ -0,0 +1,25 @@
+FROM ubuntu:22.04
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+    curl \
+    gcc libc6-dev ca-certificates bzip2 \
+    libssl-dev pkg-config
+
+ENV RUSTUP_INIT_SKIP_PATH_CHECK="yes"
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -v --no-modify-path
+RUN cp ${HOME}/.cargo/bin/* /usr/local/bin/
+
+RUN cargo install --git https://github.com/anza-xyz/cargo-run-solana-tests.git \
+    --rev ccfb0a3f5f967f3cf52fef0c95e283c7cab1836e \
+    --bin cargo-run-solana-tests --root /usr/local
+
+RUN mkdir -p /tmp/.cache/solana/v1.51/platform-tools
+RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.51/platform-tools-linux-x86_64.tar.bz2
+RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.51/platform-tools
+RUN rustup toolchain link solana /tmp/.cache/solana/v1.51/platform-tools/rust
+RUN cp -R ${HOME}/.rustup /tmp/
+
+ENV CARGO_TARGET_SBPFV1_SOLANA_SOLANA_RUNNER="cargo-run-solana-tests --heap-size 104857600"
+ENV LLVM_HOME="/tmp/.cache/solana/v1.51/platform-tools/llvm"
+ENV CC="/tmp/.cache/solana/v1.51/platform-tools/llvm/bin/clang"
+ENV RUSTUP_TOOLCHAIN="solana"

ci/docker/sbpfv2-solana-solana/Dockerfile

@@ -0,0 +1,25 @@
+FROM ubuntu:22.04
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+    curl \
+    gcc libc6-dev ca-certificates bzip2 \
+    libssl-dev pkg-config
+
+ENV RUSTUP_INIT_SKIP_PATH_CHECK="yes"
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -v --no-modify-path
+RUN cp ${HOME}/.cargo/bin/* /usr/local/bin/
+
+RUN cargo install --git https://github.com/anza-xyz/cargo-run-solana-tests.git \
+    --rev ccfb0a3f5f967f3cf52fef0c95e283c7cab1836e \
+    --bin cargo-run-solana-tests --root /usr/local
+
+RUN mkdir -p /tmp/.cache/solana/v1.51/platform-tools
+RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.51/platform-tools-linux-x86_64.tar.bz2
+RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.51/platform-tools
+RUN rustup toolchain link solana /tmp/.cache/solana/v1.51/platform-tools/rust
+RUN cp -R ${HOME}/.rustup /tmp/
+
+ENV CARGO_TARGET_SBPFV2_SOLANA_SOLANA_RUNNER="cargo-run-solana-tests --heap-size 104857600"
+ENV LLVM_HOME="/tmp/.cache/solana/v1.51/platform-tools/llvm"
+ENV CC="/tmp/.cache/solana/v1.51/platform-tools/llvm/bin/clang"
+ENV RUSTUP_TOOLCHAIN="solana"

ci/docker/sbpfv3-solana-solana/Dockerfile

@@ -0,0 +1,25 @@
+FROM ubuntu:22.04
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+    curl \
+    gcc libc6-dev ca-certificates bzip2 \
+    libssl-dev pkg-config
+
+ENV RUSTUP_INIT_SKIP_PATH_CHECK="yes"
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -v --no-modify-path
+RUN cp ${HOME}/.cargo/bin/* /usr/local/bin/
+
+RUN cargo install --git https://github.com/anza-xyz/cargo-run-solana-tests.git \
+    --rev ccfb0a3f5f967f3cf52fef0c95e283c7cab1836e \
+    --bin cargo-run-solana-tests --root /usr/local
+
+RUN mkdir -p /tmp/.cache/solana/v1.51/platform-tools
+RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.51/platform-tools-linux-x86_64.tar.bz2
+RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.51/platform-tools
+RUN rustup toolchain link solana /tmp/.cache/solana/v1.51/platform-tools/rust
+RUN cp -R ${HOME}/.rustup /tmp/
+
+ENV CARGO_TARGET_SBPFV3_SOLANA_SOLANA_RUNNER="cargo-run-solana-tests --heap-size 104857600"
+ENV LLVM_HOME="/tmp/.cache/solana/v1.51/platform-tools/llvm"
+ENV CC="/tmp/.cache/solana/v1.51/platform-tools/llvm/bin/clang"
+ENV RUSTUP_TOOLCHAIN="solana"

ci/run.sh

@@ -30,16 +30,27 @@ if [ "${BUILD_ONLY:-}" = "1" ]; then
     echo "no tests to run for build-only targets"
 else
     test_builtins=(cargo test --package builtins-test --no-fail-fast --target "$target")
-    "${test_builtins[@]}"
+    if [[ ! "$target" =~ ^sbf && ! "$target" =~ ^sbpf- ]]; then
+      # Not using release mode causes a stack overflow in SBPFv0
+      # There is a bug in SBPFv3 whereby we were not adding returns to -O0 code
+      "${test_builtins[@]}"
+      "${test_builtins[@]}" --features c
+      "${test_builtins[@]}" --features no-asm
+      "${test_builtins[@]}" --features no-f16-f128
+    fi
+
     "${test_builtins[@]}" --release
-    "${test_builtins[@]}" --features c
     "${test_builtins[@]}" --features c --release
-    "${test_builtins[@]}" --features no-asm
     "${test_builtins[@]}" --features no-asm --release
-    "${test_builtins[@]}" --features no-f16-f128
     "${test_builtins[@]}" --features no-f16-f128 --release
-    "${test_builtins[@]}" --benches
-    "${test_builtins[@]}" --benches --release
+
+   if [[ ! "$target" =~ ^sbf && ! "$target" =~ ^sbpf ]]; then
+      # Benches require criterion, which is not compatible with SBPF
+      "${test_builtins[@]}" --benches
+      "${test_builtins[@]}" --benches --release
+      "${test_builtins[@]}" --benches
+      "${test_builtins[@]}" --benches --release
+   fi
 
     if [ "${TEST_VERBATIM:-}" = "1" ]; then
         verb_path=$(cmd.exe //C echo \\\\?\\%cd%\\builtins-test\\target2)

compiler-builtins/Cargo.toml

@@ -61,4 +61,11 @@ unstable-public-internals = []
 
 [lints.rust]
 # The cygwin config can be dropped after our benchmark toolchain is bumped
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(bootstrap)', 'cfg(target_os, values("cygwin"))'] }
+unexpected_cfgs = { level = "warn", check-cfg = [
+    'cfg(bootstrap)',
+    'cfg(target_os, values("cygwin"))',
+    'cfg(target_family, values("solana"))',
+    'cfg(target_feature, values("static-syscalls"))',
+    'cfg(target_os, values("solana"))'
+] }
+

compiler-builtins/build.rs

@@ -52,6 +52,7 @@ fn main() {
         || target.arch.contains("x86")
         || target.arch.contains("aarch64")
         || target.arch.contains("bpf")
+        || target.arch.contains("sbf")
     {
         println!("cargo:rustc-cfg=feature=\"mem-unaligned\"");
     }
@@ -609,6 +610,10 @@ mod c {
             sources.extend(&[("__emutls_get_address", "emutls.c")]);
         }
 
+        if target.os == "solana" {
+            cfg.define("__ELF__", None);
+        }
+
         // When compiling the C code we require the user to tell us where the
         // source code is, and this is largely done so when we're compiling as
         // part of rust-lang/rust we can use the same llvm-project repository as

compiler-builtins/src/lib.rs

@@ -4,10 +4,12 @@
 #![feature(asm_experimental_arch)]
 #![feature(cfg_target_has_atomic)]
 #![feature(compiler_builtins)]
+#![cfg_attr(not(target_os = "solana"), feature(core_ffi_c))]
 #![feature(core_intrinsics)]
 #![feature(linkage)]
 #![feature(naked_functions)]
 #![feature(repr_simd)]
+#![feature(isqrt)]
 #![cfg_attr(f16_enabled, feature(f16))]
 #![cfg_attr(f128_enabled, feature(f128))]
 #![no_builtins]