wip: expiriment with stocastic sharing

Cargo.toml

@@ -8,14 +8,15 @@ repository = "https://github.com/NthTensor/Forte"
 
 [workspace]
 resolver = "2"
-members = ["ci", "rayon-compat"]
+members = ["ci"]
 
 [dependencies]
 arraydeque = "0.5.1"
 async-task = "4.7.1"
 atomic-wait = "1.1.0"
 crossbeam-queue = "0.3.12"
 crossbeam-utils = "0.8.21"
+fastrand = "2.3.0"
 shuttle = { version = "0.8.0", optional = true }
 tracing = { version = "0.1.41", features = ["release_max_level_off"] }
 tracing-subscriber = "0.3.19"
@@ -68,10 +69,6 @@ missing_docs = "warn"
 unsafe_op_in_unsafe_fn = "warn"
 unused_qualifications = "warn"
 
-[[test]]
-name = "integration"
-path = "tests/tests.rs"
-
 [[bench]]
 name = "fork_join"
 harness = false

benches/bevy_tasks.rs

@@ -50,7 +50,6 @@ mod overhead {
         for i in 0..80 {
             black_box(i);
         }
-        // std::thread::sleep(Duration::from_nanos(100));
         black_box(value);
     }
 
@@ -97,7 +96,7 @@ mod overhead {
 
         bencher.bench_local(|| {
             THREAD_POOL.with_worker(|worker| {
-                forte_chunks::<100, _, _>(worker, &mut vec, &|c| {
+                forte_chunks::<8, _, _>(worker, &mut vec, &|c| {
                     c.iter_mut().for_each(work);
                 });
             })

benches/fork_join.rs

@@ -1,7 +1,6 @@
 //! A benchmark for fork-join workloads adapted from `chili`.
 
 use chili::Scope;
-use criterion::black_box;
 use divan::Bencher;
 use forte::Worker;
 use tracing::info;
@@ -78,14 +77,8 @@ static COMPUTE: forte::ThreadPool = forte::ThreadPool::new();
 fn forte(bencher: Bencher, nodes: (usize, usize)) {
     fn sum(node: &Node, worker: &Worker) -> u64 {
         let (left, right) = worker.join(
-            |w| {
-                let sum = node.left.as_deref().map(|n| sum(n, w)).unwrap_or_default();
-                sum
-            },
-            |w| {
-                let sum = node.right.as_deref().map(|n| sum(n, w)).unwrap_or_default();
-                sum
-            },
+            |w| node.left.as_deref().map(|n| sum(n, w)).unwrap_or_default(),
+            |w| node.right.as_deref().map(|n| sum(n, w)).unwrap_or_default(),
         );
 
         node.val + left + right

ci/src/ci.rs

@@ -71,12 +71,19 @@ impl CI {
             None => {
                 // Note that we are running the subcommands directly rather than using any aliases
                 let mut cmds = vec![];
+                // Lint commands
                 cmds.append(&mut commands::FormatCommand::default().prepare(sh, flags));
                 cmds.append(&mut commands::ClippyCommand::default().prepare(sh, flags));
                 cmds.append(&mut commands::LintsCommand::default().prepare(sh, flags));
+                // Compile commands
                 cmds.append(&mut commands::CompileCheckCommand::default().prepare(sh, flags));
+                // Documentation commands
                 cmds.append(&mut commands::DocCheckCommand::default().prepare(sh, flags));
                 cmds.append(&mut commands::DocTestCommand::default().prepare(sh, flags));
+                // Shuttle commands
+                cmds.append(&mut commands::ShuttleCheckCommand::default().prepare(sh, flags));
+                cmds.append(&mut commands::ShuttleClippyCommand::default().prepare(sh, flags));
+                cmds.append(&mut commands::ShuttleTestCommand::default().prepare(sh, flags));
                 cmds
             }
         }

ci/src/commands/shuttle.rs

@@ -7,9 +7,9 @@ use crate::commands::ShuttleCheckCommand;
 use crate::commands::ShuttleClippyCommand;
 use crate::commands::ShuttleTestCommand;
 
-/// Alias for running the `loom-check`, `loom-clippy` and `loom-test` subcommands.
+/// Alias for running the `shuttle-check`, `shuttle-clippy` and `shuttle-test` subcommands.
 #[derive(FromArgs, Default)]
-#[argh(subcommand, name = "loom")]
+#[argh(subcommand, name = "shuttle")]
 pub struct ShuttleCommand {}
 
 impl Prepare for ShuttleCommand {

ci/src/commands/shuttle_clippy.rs

@@ -7,7 +7,7 @@ use crate::PreparedCommand;
 
 /// Checks for clippy warnings and errors in the loom test suite.
 #[derive(FromArgs, Default)]
-#[argh(subcommand, name = "loom-clippy")]
+#[argh(subcommand, name = "shuttle-clippy")]
 pub struct ShuttleClippyCommand {}
 
 impl Prepare for ShuttleClippyCommand {

ci/src/commands/shuttle_test.rs

@@ -7,7 +7,7 @@ use crate::PreparedCommand;
 
 /// Runs the loom concurrency test suite.
 #[derive(FromArgs, Default)]
-#[argh(subcommand, name = "loom-test")]
+#[argh(subcommand, name = "shuttle-test")]
 pub struct ShuttleTestCommand {}
 
 impl Prepare for ShuttleTestCommand {