feat: 64bit

Author: nhtyy

.github/workflows/ci.yml

@@ -46,12 +46,14 @@ jobs:
       - name: Check out succinctlabs/sp1
         uses: actions/checkout@v3
         with:
-          repository: succinctlabs/sp1
-          ref: dev
+          repository: succinctlabs/sp1-wip
+          token: ${{ secrets.PRIVATE_PULL_TOKEN }}
+          ref: n/fix-ci-and-toolchain-cleanup
           path: sp1
 
       - name: Build
         run: |
+          git config --global url."https://${{ secrets.PRIVATE_PULL_TOKEN }}github.com/".insteadOf "https://github.com/"
           cd sp1/crates/cli
           GITHUB_ACTIONS=false SP1_BUILD_DIR=$GITHUB_WORKSPACE cargo run --bin cargo-prove -- prove build-toolchain
 
@@ -94,17 +96,19 @@ jobs:
       - name: Check out succinctlabs/sp1
         uses: actions/checkout@v3
         with:
-          repository: succinctlabs/sp1
-          ref: dev
+          repository: succinctlabs/sp1-wip
+          token: ${{ secrets.PRIVATE_PULL_TOKEN }}
+          ref: n/fix-ci-and-toolchain-cleanup
           path: sp1
 
       - name: Build
         run: |
+          git config --global url."https://${{ secrets.PRIVATE_PULL_TOKEN }}github.com/".insteadOf "https://github.com/"
           cd sp1/crates/cli
           GITHUB_ACTIONS=false SP1_BUILD_DIR=$GITHUB_WORKSPACE cargo run --bin cargo-prove -- prove build-toolchain
 
       - name: Archive build output
         uses: actions/upload-artifact@v4
         with:
           name: rust-toolchain-aarch64-unknown-linux-gnu
-          path: sp1/crates/cli/rust-toolchain-aarch64-unknown-linux-gnu.tar.gz
+          path: sp1/crates/cli/rust-toolchain-aarch64-unknown-linux-gnu.tar.gz

.github/workflows/release.yml

@@ -6,6 +6,7 @@ on:
 jobs:
   build:
     uses: ./.github/workflows/ci.yml
+    secrets: inherit
   release:
     needs: build
     runs-on: ubuntu-latest
@@ -36,4 +37,4 @@ jobs:
           else
             echo "No files to release. Exiting."
             exit 1
-          fi
+          fi

compiler/rustc_target/src/spec/mod.rs

@@ -1974,6 +1974,7 @@ supported_targets! {
     ("riscv32gc-unknown-linux-gnu", riscv32gc_unknown_linux_gnu),
     ("riscv32gc-unknown-linux-musl", riscv32gc_unknown_linux_musl),
     ("riscv64imac-unknown-none-elf", riscv64imac_unknown_none_elf),
+    ("riscv64im-succinct-zkvm-elf", riscv64im_succinct_zkvm_elf),
     ("riscv64gc-unknown-none-elf", riscv64gc_unknown_none_elf),
     ("riscv64gc-unknown-linux-gnu", riscv64gc_unknown_linux_gnu),
     ("riscv64gc-unknown-linux-musl", riscv64gc_unknown_linux_musl),

compiler/rustc_target/src/spec/targets/riscv64im_succinct_zkvm_elf.rs

@@ -0,0 +1,39 @@
+use crate::spec::{
+    Cc, LinkerFlavor, Lld, PanicStrategy, RelocModel, Target, TargetMetadata, TargetOptions,
+};
+
+pub(crate) fn target() -> Target {
+    Target {
+        data_layout: "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128".into(),
+        llvm_target: "riscv64".into(),
+        metadata: TargetMetadata {
+            description: Some("Succinct's zero-knowledge Virtual Machine (RV64IM ISA)".into()),
+            tier: Some(3),
+            host_tools: Some(false),
+            std: None, // ?
+        },
+        pointer_width: 64,
+        arch: "riscv64".into(),
+
+        options: TargetOptions {
+            os: "zkvm".into(),
+            vendor: "succinct".into(),
+            linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
+            linker: Some("rust-lld".into()),
+            cpu: "generic-rv64".into(),
+
+            max_atomic_width: Some(64),
+            atomic_cas: true,
+
+            features: "+m".into(),
+            llvm_abiname: "lp64".into(),
+            executables: true,
+            panic_strategy: PanicStrategy::Abort,
+            relocation_model: RelocModel::Static,
+            emit_debug_gdb_scripts: false,
+            eh_frame_header: false,
+            singlethread: true,
+            ..Default::default()
+        },
+    }
+}

src/bootstrap/Cargo.lock

@@ -90,7 +90,7 @@ dependencies = [
 [[package]]
 name = "cc"
 version = "1.2.17"
-source = "git+https://github.com/leruaa/cc-rs?branch=aurelien%2Fadd-succinct-target#1cdaea42e4044e135817d49005f8b7e812e4cbfa"
+source = "git+https://github.com/succinctlabs/cc-rs?branch=add-succinct-target#a182366ce32d9bac95bfd2d65cf212262a809257"
 dependencies = [
  "shlex",
 ]

src/bootstrap/Cargo.toml

@@ -95,4 +95,4 @@ debug = 0
 bootstrap.debug = 1
 
 [patch.crates-io]
-cc = { git = "https://github.com/leruaa/cc-rs", branch = "aurelien/add-succinct-target" }
+cc = { git = "https://github.com/succinctlabs/cc-rs", branch = "add-succinct-target" }

src/bootstrap/src/core/sanity.rs

@@ -35,6 +35,7 @@ pub struct Finder {
 const STAGE0_MISSING_TARGETS: &[&str] = &[
     // just a dummy comment so the list doesn't get onelined
     "riscv32im-succinct-zkvm-elf",
+    "riscv64im-succinct-zkvm-elf",
     "x86_64-lynx-lynxos178",
 ];
 

src/tools/build-manifest/src/main.rs

@@ -145,6 +145,7 @@ static TARGETS: &[&str] = &[
     "riscv32imafc-unknown-none-elf",
     "riscv32gc-unknown-linux-gnu",
     "riscv64imac-unknown-none-elf",
+    "riscv64im-succinct-zkvm-elf",
     "riscv64gc-unknown-hermit",
     "riscv64gc-unknown-none-elf",
     "riscv64gc-unknown-linux-gnu",