Merge remote-tracking branch 'origin/master' into matthias/remove-cli…

…ppy-all

.github/workflows/integration.yml

@@ -32,13 +32,6 @@ jobs:
     timeout-minutes: 30
     runs-on: [self-hosted, Linux, X64]
 
-    strategy:
-      matrix:
-        target: [x86_64-unknown-linux-gnu, riscv32im-unknown-none-elf]
-        # Exclude the riscv32im-unknown-none-elf target
-        exclude:
-          - target: riscv32im-unknown-none-elf
-
     steps:
       - uses: actions/checkout@v2
       - name: Cargo cache
@@ -57,11 +50,11 @@ jobs:
         env:
           RAYON_NUM_THREADS: 2
           RUSTFLAGS: "-C opt-level=3"
-        run: cargo run --package ceno_zkvm --example riscv_opcodes --target ${{ matrix.target }} -- --start 10 --end 11
+        run: cargo run --package ceno_zkvm --example riscv_opcodes -- --start 10 --end 11
 
       - name: Run fibonacci
         env:
           RAYON_NUM_THREADS: 8
           RUST_LOG: debug
           RUSTFLAGS: "-C opt-level=3"
-        run: cargo run --package ceno_zkvm --bin e2e --target ${{ matrix.target }} -- --platform=sp1 ceno_zkvm/examples/fibonacci.elf
+        run: cargo run --package ceno_zkvm --bin e2e -- --platform=sp1 ceno_zkvm/examples/fibonacci.elf

.github/workflows/lints.yml

@@ -32,13 +32,6 @@ jobs:
     timeout-minutes: 30
     runs-on: [self-hosted, Linux, X64]
 
-    strategy:
-      matrix:
-        target: [x86_64-unknown-linux-gnu, riscv32im-unknown-none-elf]
-        # Exclude the riscv32im-unknown-none-elf target
-        exclude:
-          - target: riscv32im-unknown-none-elf
-
     steps:
       - uses: actions/checkout@v2
       - uses: dtolnay/rust-toolchain@master
@@ -63,11 +56,10 @@ jobs:
         run: |
           cargo make --version || cargo install cargo-make
       - name: Check code format
-        run: cargo make fmt-all-check
+        run: cargo fmt --all --check
 
       - name: Run clippy
         env:
-          TARGET: ${{ matrix.target }}
           RUSTFLAGS: "-Dwarnings"
         run: |
           cargo check --workspace --all-targets --exclude ceno_rt

.github/workflows/tests.yml

@@ -31,13 +31,6 @@ jobs:
     timeout-minutes: 30
     runs-on: [self-hosted, Linux, X64]
 
-    strategy:
-      matrix:
-        target: [x86_64-unknown-linux-gnu, riscv32im-unknown-none-elf]
-        # Exclude the riscv32im-unknown-none-elf target
-        exclude:
-          - target: riscv32im-unknown-none-elf
-
     steps:
       - uses: actions/checkout@v2
       - uses: dtolnay/rust-toolchain@master
@@ -61,6 +54,4 @@ jobs:
         run: |
           cargo make --version || cargo install cargo-make
       - name: run test
-        env:
-          TARGET: ${{ matrix.target }}
         run: cargo make tests

Makefile.toml

@@ -1,20 +1,8 @@
 [env]
 CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = true
 CORE = { script = ["nproc"] }
-CUR_TARGET = { script = ['''
-        if [ -z "${TARGET}" ]; then
-            TARGET=$(rustc -vV | grep "host" | awk '{print $2}')
-            echo "${TARGET}"
-        else
-            echo "${TARGET}"
-        fi
-        '''] }
 RAYON_NUM_THREADS = "${CORE}"
 
-[tasks.build]
-# Override the default `--all-features`, that's broken, because some of our features are mutually exclusive.
-args = ["build"]
-
 [tasks.tests]
 args = [
   "test",
@@ -24,30 +12,13 @@ args = [
   "--tests",
   "--examples",
   "--release",
-  "--target",
-  "${CUR_TARGET}",
   "--workspace",
   "--exclude",
   "ceno_rt",
 ]
 command = "cargo"
 workspace = false
 
-[tasks.fmt-all-check]
-args = ["fmt", "--all", "--", "--check"]
-command = "cargo"
-workspace = false
-
-[tasks.fmt-all]
-args = ["fmt", "--all"]
-command = "cargo"
-workspace = false
-
-[tasks.fmt]
-args = ["fmt", "-p", "ceno_zkvm", "--", "--check"]
-command = "cargo"
-workspace = false
-
 [tasks.riscv_stats]
 args = ["run", "--bin", "riscv_stats"]
 command = "cargo"
@@ -60,8 +31,6 @@ args = [
   "--all-targets",
   "--exclude",
   "ceno_rt",
-  "--target",
-  "${CUR_TARGET}",
   "--",
   "-D",
   "warnings",

ceno_emul/Cargo.toml

@@ -15,6 +15,7 @@ elf = "0.7"
 itertools.workspace = true
 num-derive.workspace = true
 num-traits.workspace = true
+rrs_lib = { package = "rrs-succinct", version = "0.1.0" }
 strum.workspace = true
 strum_macros.workspace = true
 tracing.workspace = true