switch from async to rayon

Author: Stebalien

Cargo.lock

@@ -21,8 +21,6 @@ cid = { workspace = true }
 serde = { version = "1.0", features = ["derive"] }
 lazy_static = "1.5.0"
 log = "0.4.27"
-futures = "0.3.31"
-async-std = { version = "1.13", features = ["attributes"] }
 wasmtime = { workspace = true }
 base64 = "0.22.1"
 flate2 = { version = "1.1" }
@@ -44,7 +42,8 @@ m2-native = []
 
 [dev-dependencies]
 env_logger = "0.11.8"
-criterion = { version = "0.5", features = ["async_std"] }
+criterion = { version = "0.5" }
+rayon = "1.10.0"
 
 [[bin]]
 name = "perf-conformance"

testing/conformance/Cargo.toml

@@ -99,7 +99,7 @@ pub fn bench_vector_file(
     name: &str,
     engines: &MultiEngine,
 ) -> anyhow::Result<()> {
-    let (bs, _) = async_std::task::block_on(vector.seed_blockstore()).unwrap();
+    let (bs, _) = vector.seed_blockstore().unwrap();
 
     for variant in vector.preconditions.variants.iter() {
         let name = format!("{} | {}", name, variant.id);

testing/conformance/benches/bench_drivers.rs

@@ -1,6 +1,5 @@
 // Copyright 2021-2023 Protocol Labs
 // SPDX-License-Identifier: Apache-2.0, MIT
-use std::io::Read;
 use std::sync::Mutex;
 
 use fvm_ipld_blockstore::{Blockstore, MemoryBlockstore};
@@ -20,10 +19,7 @@ fn load_bundles(bundles: &[&[u8]]) -> anyhow::Result<MemoryBlockstore> {
     for bundle in bundles {
         let mut reader = tar::Archive::new(zstd::Decoder::with_buffer(*bundle)?);
         for entry in reader.entries()? {
-            // We need to read it to a vec first as we can't send it between threads (async issues).
-            let mut car = Vec::new();
-            entry?.read_to_end(&mut car)?;
-            load_car(&bs, &*car)?;
+            load_car(&bs, entry?)?;
         }
     }
     Ok(bs)

testing/conformance/src/actors.rs

@@ -47,7 +47,7 @@ fn main() {
     )
     .expect("failed to construct engine");
 
-    let (bs, _) = async_std::task::block_on(vector.seed_blockstore()).unwrap();
+    let (bs, _) = vector.seed_blockstore().unwrap();
     for variant in vector.preconditions.variants.iter() {
         run_variant_for_perf(bs.clone(), &vector, variant, &engine, itt_info)
     }

testing/conformance/src/bin/perf-conformance.rs

@@ -18,4 +18,10 @@ macro_rules! report {
     ($status:expr, $path:expr, $id:expr) => {
         println!("[{}] vector: {} | variant: {}", $status, $path, $id);
     };
+    ($status:expr, $path:expr, $id:expr, $reason:expr) => {
+        println!(
+            "[{}] vector: {} | variant: {}\n\t|> reason: {:#}",
+            $status, $path, $id, $reason
+        );
+    };
 }

testing/conformance/src/lib.rs

@@ -181,7 +181,7 @@ impl MessageVector {
 impl MessageVector {
     /// Seeds a new blockstore with the CAR encoded in the test vector and all available bundled
     /// actors. Returns the blockstore and the root CID.
-    pub async fn seed_blockstore(&self) -> anyhow::Result<(MemoryBlockstore, Vec<Cid>)> {
+    pub fn seed_blockstore(&self) -> anyhow::Result<(MemoryBlockstore, Vec<Cid>)> {
         let blockstore = MemoryBlockstore::new();
         load_actors(&blockstore)?;