Speed up Miri test

crossbeam-rs · Dec 8, 2024 · c5ac785 · c5ac785
1 parent 0f81a69
commit c5ac785
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 30 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -174,14 +174,20 @@ jobs:
 
   # Run miri.
   miri:
+    strategy:
+      fail-fast: false
+      matrix:
+        group:
+          - channel
+          - others
     runs-on: ubuntu-latest
     timeout-minutes: 120 # TODO
     steps:
       - uses: taiki-e/checkout-action@v1
       - name: Install Rust
         run: rustup toolchain install nightly --component miri && rustup default nightly
       - name: miri
-        run: ci/miri.sh
+        run: ci/miri.sh ${{ matrix.group }}
 
   # Run cargo-careful.
   careful:

diff --git a/ci/miri.sh b/ci/miri.sh
@@ -3,36 +3,46 @@ set -euxo pipefail
 IFS=$'\n\t'
 cd "$(dirname "$0")"/..
 
+group=$1
+
 # We need 'ts' for the per-line timing
 sudo apt-get -y install moreutils
 echo
 
 export RUSTFLAGS="${RUSTFLAGS:-} -Z randomize-layout"
 export RUSTDOCFLAGS="${RUSTDOCFLAGS:-} -Z randomize-layout"
+export MIRIFLAGS="${MIRIFLAGS:-} -Zmiri-strict-provenance -Zmiri-symbolic-alignment-check -Zmiri-disable-isolation"
 
-MIRIFLAGS="-Zmiri-strict-provenance -Zmiri-symbolic-alignment-check -Zmiri-disable-isolation" \
-    MIRI_LEAK_CHECK='1' \
-    cargo miri test \
-    -p crossbeam-channel \
-    -p crossbeam-queue \
-    -p crossbeam-utils 2>&1 | ts -i '%.s  '
-
-# -Zmiri-ignore-leaks is needed because we use detached threads in tests in tests/golang.rs: https://github.com/rust-lang/miri/issues/1371
-MIRIFLAGS="-Zmiri-strict-provenance -Zmiri-symbolic-alignment-check -Zmiri-disable-isolation -Zmiri-ignore-leaks" \
-    cargo miri test \
-    -p crossbeam-channel --test golang 2>&1 | ts -i '%.s  '
-
-# Use Tree Borrows instead of Stacked Borrows because epoch is not compatible with Stacked Borrows: https://github.com/crossbeam-rs/crossbeam/issues/545#issuecomment-1192785003
-MIRIFLAGS="-Zmiri-strict-provenance -Zmiri-symbolic-alignment-check -Zmiri-disable-isolation -Zmiri-tree-borrows" \
-    cargo miri test \
-    -p crossbeam-epoch \
-    -p crossbeam-skiplist \
-    -p crossbeam 2>&1 | ts -i '%.s  '
-
-# Use Tree Borrows instead of Stacked Borrows because epoch is not compatible with Stacked Borrows: https://github.com/crossbeam-rs/crossbeam/issues/545#issuecomment-1192785003
-# -Zmiri-compare-exchange-weak-failure-rate=0.0 is needed because some sequential tests (e.g.,
-# doctest of Stealer::steal) incorrectly assume that sequential weak CAS will never fail.
-# -Zmiri-preemption-rate=0 is needed because this code technically has UB and Miri catches that.
-MIRIFLAGS="-Zmiri-strict-provenance -Zmiri-symbolic-alignment-check -Zmiri-disable-isolation -Zmiri-tree-borrows -Zmiri-compare-exchange-weak-failure-rate=0.0 -Zmiri-preemption-rate=0" \
-    cargo miri test \
-    -p crossbeam-deque 2>&1 | ts -i '%.s  '
+case "${group}" in
+    channel)
+        MIRI_LEAK_CHECK='1' \
+            cargo miri test \
+            -p crossbeam-channel 2>&1 | ts -i '%.s  '
+        # -Zmiri-ignore-leaks is needed because we use detached threads in tests in tests/golang.rs: https://github.com/rust-lang/miri/issues/1371
+        MIRIFLAGS="${MIRIFLAGS} -Zmiri-ignore-leaks" \
+            cargo miri test \
+            -p crossbeam-channel --test golang 2>&1 | ts -i '%.s  '
+        ;;
+    others)
+        cargo miri test \
+            -p crossbeam-queue \
+            -p crossbeam-utils 2>&1 | ts -i '%.s  '
+        # Use Tree Borrows instead of Stacked Borrows because epoch is not compatible with Stacked Borrows: https://github.com/crossbeam-rs/crossbeam/issues/545#issuecomment-1192785003
+        MIRIFLAGS="${MIRIFLAGS} -Zmiri-tree-borrows" \
+            cargo miri test \
+            -p crossbeam-epoch \
+            -p crossbeam-skiplist \
+            -p crossbeam 2>&1 | ts -i '%.s  '
+        # Use Tree Borrows instead of Stacked Borrows because epoch is not compatible with Stacked Borrows: https://github.com/crossbeam-rs/crossbeam/issues/545#issuecomment-1192785003
+        # -Zmiri-compare-exchange-weak-failure-rate=0.0 is needed because some sequential tests (e.g.,
+        # doctest of Stealer::steal) incorrectly assume that sequential weak CAS will never fail.
+        # -Zmiri-preemption-rate=0 is needed because this code technically has UB and Miri catches that.
+        MIRIFLAGS="${MIRIFLAGS} -Zmiri-tree-borrows -Zmiri-compare-exchange-weak-failure-rate=0.0 -Zmiri-preemption-rate=0" \
+            cargo miri test \
+            -p crossbeam-deque 2>&1 | ts -i '%.s  '
+        ;;
+    *)
+        echo "unknown crate group '${group}'"
+        exit 1
+        ;;
+esac
diff --git a/crossbeam-skiplist/tests/set.rs b/crossbeam-skiplist/tests/set.rs
@@ -1,6 +1,10 @@
 use crossbeam_skiplist::SkipSet;
 use crossbeam_utils::thread;
-use std::{iter, ops::Bound, sync::Barrier};
+use std::{
+    iter,
+    ops::Bound,
+    sync::{Arc, Barrier},
+};
 
 #[test]
 fn smoke() {
@@ -696,9 +700,8 @@ fn clear() {
 // https://github.com/crossbeam-rs/crossbeam/issues/1023
 #[test]
 fn concurrent_insert_get_same_key() {
-    use std::sync::Arc;
     let set: Arc<SkipSet<u32>> = Arc::new(SkipSet::new());
-    let len = 10_0000;
+    let len = if cfg!(miri) { 100 } else { 10_000 };
     let key = 0;
     set.insert(0);