Upgrade dependencies, modernize

- `rustup update` to get it building with nightly again (old proc_macro was causing problems). Thanks @AOx0 for spotting this. - Upgrade criterion to remove `atty` which is abandoned and flagged by github's Dependabot as a security risk. - Remove `feature(bench_black_box)` which is stable now.
grahamking · Jul 24, 2023 · a8791f9 · a8791f9
1 parent c47e09e
commit a8791f9
Show file tree

Hide file tree

Showing 34 changed files with 313 additions and 212 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,6 +7,7 @@ debug = true
 debug = true
 
 [workspace]
+resolver = "2"
 members = [
   "labs/misc/warmup",
   "labs/misc/io_opt1",
@@ -27,3 +28,6 @@ members = [
   "labs/bad_speculation/lookup_tables_1",
   "labs/bad_speculation/virtual_call_mispredict",
 ]
+
+[workspace.package]
+edition = "2021"
diff --git a/labs/bad_speculation/conditional_store_1/Cargo.toml b/labs/bad_speculation/conditional_store_1/Cargo.toml
@@ -8,7 +8,7 @@ name = "lab"
 harness = false
 
 [dependencies]
-rand = "0.8.5"
+rand = "0.8"
 
 [dev-dependencies]
-criterion = "0.3.6"
+criterion = "0.5"
diff --git a/labs/bad_speculation/conditional_store_1/benches/lab.rs b/labs/bad_speculation/conditional_store_1/benches/lab.rs
@@ -1,5 +1,3 @@
-#![feature(bench_black_box)]
-
 use criterion::{criterion_group, criterion_main, Criterion};
 
 use conditional_store_1::{init, select, N};

diff --git a/labs/bad_speculation/lookup_tables_1/Cargo.toml b/labs/bad_speculation/lookup_tables_1/Cargo.toml
@@ -8,7 +8,7 @@ name = "lab"
 harness = false
 
 [dependencies]
-rand = "0.8.5"
+rand = "0.8"
 
 [dev-dependencies]
-criterion = "0.3.6"
+criterion = "0.5"
diff --git a/labs/bad_speculation/lookup_tables_1/benches/lab.rs b/labs/bad_speculation/lookup_tables_1/benches/lab.rs
@@ -1,5 +1,3 @@
-#![feature(bench_black_box)]
-
 use criterion::{criterion_group, criterion_main, Criterion};
 
 use lookup_tables_1::{histogram, init};

diff --git a/labs/bad_speculation/virtual_call_mispredict/Cargo.toml b/labs/bad_speculation/virtual_call_mispredict/Cargo.toml
@@ -8,7 +8,7 @@ name = "lab"
 harness= false
 
 [dependencies]
-rand = "0.8.5"
+rand = "0.8"
 
 [dev-dependencies]
-criterion = "0.3.6"
+criterion = "0.5"
diff --git a/labs/bad_speculation/virtual_call_mispredict/benches/lab.rs b/labs/bad_speculation/virtual_call_mispredict/benches/lab.rs
@@ -1,5 +1,3 @@
-#![feature(bench_black_box)]
-
 use criterion::{criterion_group, criterion_main, Criterion};
 
 use virtual_call_mispredict::{generate_objects, invoke};

diff --git a/labs/core_bound/compiler_intrinsics_1/Cargo.toml b/labs/core_bound/compiler_intrinsics_1/Cargo.toml
@@ -8,7 +8,7 @@ name = "bench_compiler_intrinsics_1"
 harness = false
 
 [dependencies]
-rand = "0.8.5"
+rand = "0.8"
 
 [dev-dependencies]
-criterion = { version = "0.3.6", features = ["html_reports", "real_blackbox", "cargo_bench_support"] }
+criterion = { version = "0.5", features = ["html_reports", "real_blackbox", "cargo_bench_support"] }
diff --git a/labs/core_bound/compiler_intrinsics_1/benches/bench_compiler_intrinsics_1.rs b/labs/core_bound/compiler_intrinsics_1/benches/bench_compiler_intrinsics_1.rs
@@ -1,5 +1,3 @@
-#![feature(bench_black_box)]
-
 use criterion::{criterion_group, criterion_main, Criterion};
 
 use compiler_intrinsics_1::{image_smoothing, init, OutputVector, RADIUS};

diff --git a/labs/core_bound/compiler_intrinsics_2/Cargo.toml b/labs/core_bound/compiler_intrinsics_2/Cargo.toml
@@ -10,4 +10,4 @@ harness = false
 [dependencies]
 
 [dev-dependencies]
-criterion = { version = "0.3.6", features = ["html_reports", "real_blackbox", "cargo_bench_support"] }
+criterion = { version = "0.5", features = ["html_reports", "real_blackbox", "cargo_bench_support"] }
diff --git a/labs/core_bound/compiler_intrinsics_2/benches/bench_compiler_intrinsics_2.rs b/labs/core_bound/compiler_intrinsics_2/benches/bench_compiler_intrinsics_2.rs
@@ -1,5 +1,3 @@
-#![feature(bench_black_box)]
-
 use criterion::{criterion_group, criterion_main, Criterion};
 use std::fs::read_to_string;
 

diff --git a/labs/core_bound/dep_chains_1/Cargo.toml b/labs/core_bound/dep_chains_1/Cargo.toml
@@ -8,7 +8,7 @@ name = "bench_dep_chains_1"
 harness = false
 
 [dependencies]
-rand = "0.8.5"
+rand = "0.8"
 
 [dev-dependencies]
-criterion = { version = "0.3.6", features = ["html_reports", "real_blackbox", "cargo_bench_support"] }
+criterion = { version = "0.5", features = ["html_reports", "real_blackbox", "cargo_bench_support"] }
diff --git a/labs/core_bound/dep_chains_1/benches/bench_dep_chains_1.rs b/labs/core_bound/dep_chains_1/benches/bench_dep_chains_1.rs
@@ -1,5 +1,3 @@
-#![feature(bench_black_box)]
-
 use criterion::{criterion_group, criterion_main, Criterion};
 
 use dep_chains_1::{get_random_list, solution, Arena};

diff --git a/labs/core_bound/function_inlining_1/Cargo.toml b/labs/core_bound/function_inlining_1/Cargo.toml
@@ -8,8 +8,8 @@ name = "bench_function_inlining_1"
 harness = false
 
 [dependencies]
-libc = "0.2.131"
-rand = "0.8.5"
+libc = "0.2"
+rand = "0.8"
 
 [dev-dependencies]
-criterion = { version = "0.3.6", features = ["html_reports", "real_blackbox", "cargo_bench_support"] }
+criterion = { version = "0.5", features = ["html_reports", "real_blackbox", "cargo_bench_support"] }
diff --git a/labs/core_bound/function_inlining_1/benches/bench_function_inlining_1.rs b/labs/core_bound/function_inlining_1/benches/bench_function_inlining_1.rs
@@ -1,5 +1,3 @@
-#![feature(bench_black_box)]
-
 use criterion::{criterion_group, criterion_main, Criterion};
 
 use function_inlining_1::{init, solution};

diff --git a/labs/core_bound/vectorization_1/Cargo.toml b/labs/core_bound/vectorization_1/Cargo.toml
@@ -8,7 +8,7 @@ name = "bench_vectorization_1"
 harness = false
 
 [dependencies]
-rand = "0.8.5"
+rand = "0.8"
 
 [dev-dependencies]
-criterion = { version = "0.3.6", features = ["html_reports", "real_blackbox", "cargo_bench_support"] }
+criterion = { version = "0.5", features = ["html_reports", "real_blackbox", "cargo_bench_support"] }
diff --git a/labs/core_bound/vectorization_1/benches/bench_vectorization_1.rs b/labs/core_bound/vectorization_1/benches/bench_vectorization_1.rs
@@ -1,5 +1,3 @@
-#![feature(bench_black_box)]
-
 use criterion::{criterion_group, criterion_main, Criterion};
 
 use vectorization_1::{compute_alignment, init};

diff --git a/labs/core_bound/vectorization_2/Cargo.toml b/labs/core_bound/vectorization_2/Cargo.toml
@@ -8,7 +8,7 @@ name = "bench_vectorization_2"
 harness = false
 
 [dependencies]
-rand = "0.8.5"
+rand = "0.8"
 
 [dev-dependencies]
-criterion = { version = "0.3.6", features = ["html_reports", "real_blackbox", "cargo_bench_support"] }
+criterion = { version = "0.5", features = ["html_reports", "real_blackbox", "cargo_bench_support"] }
diff --git a/labs/core_bound/vectorization_2/benches/bench_vectorization_2.rs b/labs/core_bound/vectorization_2/benches/bench_vectorization_2.rs
@@ -1,5 +1,3 @@
-#![feature(bench_black_box)]
-
 use criterion::{criterion_group, criterion_main, Criterion};
 
 use vectorization_2::{checksum, init, Blob, N};

diff --git a/labs/memory_bound/data_packing/Cargo.toml b/labs/memory_bound/data_packing/Cargo.toml
@@ -8,7 +8,7 @@ name = "bench_data_packing"
 harness = false
 
 [dependencies]
-rand = "0.8.5"
+rand = "0.8"
 
 [dev-dependencies]
-criterion = { version = "0.3.6", features = ["html_reports", "real_blackbox", "cargo_bench_support"] }
+criterion = { version = "0.5", features = ["html_reports", "real_blackbox", "cargo_bench_support"] }
diff --git a/labs/memory_bound/data_packing/benches/bench_data_packing.rs b/labs/memory_bound/data_packing/benches/bench_data_packing.rs
@@ -1,5 +1,3 @@
-#![feature(bench_black_box)]
-
 use criterion::{criterion_group, criterion_main, Criterion};
 
 use data_packing::{init, solution};

diff --git a/labs/memory_bound/false_sharing_1/Cargo.toml b/labs/memory_bound/false_sharing_1/Cargo.toml
@@ -10,4 +10,4 @@ harness = false
 [dependencies]
 
 [dev-dependencies]
-criterion = { version = "0.3.6", features = ["html_reports", "real_blackbox", "cargo_bench_support"] }
+criterion = { version = "0.5", features = ["html_reports", "real_blackbox", "cargo_bench_support"] }
diff --git a/labs/memory_bound/false_sharing_1/benches/bench_false_sharing_1.rs b/labs/memory_bound/false_sharing_1/benches/bench_false_sharing_1.rs
@@ -1,5 +1,3 @@
-#![feature(bench_black_box)]
-
 use criterion::{criterion_group, criterion_main, Criterion};
 
 use false_sharing_1::solution;

diff --git a/labs/memory_bound/huge_pages_1/Cargo.toml b/labs/memory_bound/huge_pages_1/Cargo.toml
@@ -8,7 +8,7 @@ name = "bench_huge_pages_1"
 harness = false
 
 [dependencies]
-rand = "0.8.5"
+rand = "0.8"
 
 [dev-dependencies]
-criterion = { version = "0.3.6", features = ["html_reports", "real_blackbox", "cargo_bench_support"] }
+criterion = { version = "0.5", features = ["html_reports", "real_blackbox", "cargo_bench_support"] }
diff --git a/labs/memory_bound/loop_interchange_1/Cargo.toml b/labs/memory_bound/loop_interchange_1/Cargo.toml
@@ -8,7 +8,7 @@ name = "bench_loop_interchange_1"
 harness = false
 
 [dependencies]
-rand = "0.8.5"
+rand = "0.8"
 
 [dev-dependencies]
-criterion = { version = "0.3.6", features = ["html_reports", "real_blackbox", "cargo_bench_support"] }
+criterion = { version = "0.5", features = ["html_reports", "real_blackbox", "cargo_bench_support"] }
diff --git a/labs/memory_bound/loop_interchange_2/Cargo.toml b/labs/memory_bound/loop_interchange_2/Cargo.toml
@@ -10,4 +10,4 @@ harness = false
 [dependencies]
 
 [dev-dependencies]
-criterion = { version = "0.3.6", features = ["html_reports", "real_blackbox", "cargo_bench_support"] }
+criterion = { version = "0.5", features = ["html_reports", "real_blackbox", "cargo_bench_support"] }
diff --git a/labs/memory_bound/loop_interchange_2/benches/bench_loop_interchange_2.rs b/labs/memory_bound/loop_interchange_2/benches/bench_loop_interchange_2.rs
@@ -1,5 +1,3 @@
-#![feature(bench_black_box)]
-
 use criterion::{criterion_group, criterion_main, Criterion};
 
 use loop_interchange_2::{blur, Grayscale, K_MAX_IMAGE_DIMENSION};

diff --git a/labs/memory_bound/loop_tiling_1/Cargo.toml b/labs/memory_bound/loop_tiling_1/Cargo.toml
@@ -8,4 +8,4 @@ name = "bench_loop_tiling_1"
 harness = false
 
 [dev-dependencies]
-criterion = { version = "0.3.6", features = ["html_reports", "real_blackbox", "cargo_bench_support"] }
+criterion = { version = "0.5", features = ["html_reports", "real_blackbox", "cargo_bench_support"] }
diff --git a/labs/memory_bound/swmem_prefetch_1/Cargo.toml b/labs/memory_bound/swmem_prefetch_1/Cargo.toml
@@ -8,7 +8,7 @@ name = "bench_swmem_prefetch_1"
 harness = false
 
 [dependencies]
-rand = "0.8.5"
+rand = "0.8"
 
 [dev-dependencies]
-criterion = { version = "0.3.6", features = ["html_reports", "real_blackbox", "cargo_bench_support"] }
+criterion = { version = "0.5", features = ["html_reports", "real_blackbox", "cargo_bench_support"] }
diff --git a/labs/memory_bound/swmem_prefetch_1/benches/bench_swmem_prefetch_1.rs b/labs/memory_bound/swmem_prefetch_1/benches/bench_swmem_prefetch_1.rs
@@ -1,5 +1,3 @@
-#![feature(bench_black_box)]
-
 use criterion::{criterion_group, criterion_main, Criterion};
 
 use swmem_prefetch_1::{init, solution, HashMapT, HASH_MAP_SIZE};

diff --git a/labs/misc/io_opt1/Cargo.toml b/labs/misc/io_opt1/Cargo.toml
@@ -9,8 +9,9 @@ harness = false
 
 [dependencies]
 
+[build-dependencies]
+rand = "0.8"
+
 [dev-dependencies]
-criterion = { version = "0.3.6", features = ["html_reports", "real_blackbox", "cargo_bench_support"] }
+criterion = { version = "0.5", features = ["html_reports", "real_blackbox", "cargo_bench_support"] }
 
-[build-dependencies]
-rand = "0.8.5"
diff --git a/labs/misc/io_opt1/benches/bench_io_opt1.rs b/labs/misc/io_opt1/benches/bench_io_opt1.rs
@@ -1,5 +1,3 @@
-#![feature(bench_black_box)]
-
 use criterion::{criterion_group, criterion_main, Criterion};
 
 use io_opt1::{solution, /*LARGE_DATA_PATH, MEDIUM_DATA_PATH,*/ SMALL_DATA_PATH};

diff --git a/labs/misc/warmup/Cargo.toml b/labs/misc/warmup/Cargo.toml
@@ -8,4 +8,4 @@ name = "bench_warmup"
 harness = false
 
 [dev-dependencies]
-criterion = { version = "0.3.6", features = ["html_reports", "real_blackbox", "cargo_bench_support"] }
+criterion = { version = "0.5", features = ["html_reports", "real_blackbox", "cargo_bench_support"] }