From 04baa349a5205c0e3bf827c7db79d5117b70d79c Mon Sep 17 00:00:00 2001 From: Adrian Groh Date: Thu, 5 Dec 2024 15:37:03 +0100 Subject: [PATCH] Speed up day5 even more --- day5/Cargo.lock | 130 +++++++++++++++++++++++++++++++++++++---------- day5/Cargo.toml | 3 +- day5/src/main.rs | 35 +++++-------- 3 files changed, 117 insertions(+), 51 deletions(-) diff --git a/day5/Cargo.lock b/day5/Cargo.lock index b56d812..91c2401 100644 --- a/day5/Cargo.lock +++ b/day5/Cargo.lock @@ -3,35 +3,30 @@ version = 4 [[package]] -name = "crossbeam-deque" -version = "0.8.5" +name = "ahash" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy", ] [[package]] -name = "crossbeam-epoch" -version = "0.9.18" +name = "cfg-if" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "day5" version = "0.1.0" dependencies = [ - "rayon", + "ahash", + "itertools", ] [[package]] @@ -41,21 +36,100 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] -name = "rayon" -version = "1.10.0" +name = "getrandom" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ - "either", - "rayon-core", + "cfg-if", + "libc", + "wasi", ] [[package]] -name = "rayon-core" -version = "1.12.1" +name = "itertools" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ - "crossbeam-deque", - "crossbeam-utils", + "either", +] + +[[package]] +name = "libc" +version = "0.2.167" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" + +[[package]] +name = "once_cell" +version = "1.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + +[[package]] +name = "proc-macro2" +version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "syn" +version = "2.0.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "unicode-ident" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", ] diff --git a/day5/Cargo.toml b/day5/Cargo.toml index 71cc1c9..143e752 100644 --- a/day5/Cargo.toml +++ b/day5/Cargo.toml @@ -4,4 +4,5 @@ version = "0.1.0" edition = "2021" [dependencies] -rayon = "1.10.0" +ahash = "0.8.11" +itertools = "0.13.0" diff --git a/day5/src/main.rs b/day5/src/main.rs index de3f04c..74f11bd 100644 --- a/day5/src/main.rs +++ b/day5/src/main.rs @@ -1,7 +1,8 @@ -use rayon::prelude::*; +use ahash::AHashSet; +use itertools::Itertools; struct ParsedInput { - rules: Vec<(u32, u32)>, + rules: AHashSet<(u32, u32)>, pages: Vec>, } @@ -20,41 +21,31 @@ fn parse(input: &str) -> ParsedInput { } } -fn all_rules_apply(rules: &[(u32, u32)], page: &[u32]) -> bool { - rules.iter().all(|rule| { - let Some(first) = page.iter().enumerate().find(|(_, e)| e == &&rule.0) else { - return true; - }; - let Some(second) = page.iter().enumerate().find(|(_, e)| e == &&rule.1) else { - return true; - }; - first.0 < second.0 - }) +fn all_rules_apply(rules: &AHashSet<(u32, u32)>, page: &[u32]) -> bool { + page.iter() + .combinations(2) + .all(|c| rules.get(&(*c[1], *c[0])).is_none()) } fn part1(parsed_input: &ParsedInput) -> u32 { parsed_input .pages - .par_iter() + .iter() .filter(|page| all_rules_apply(&parsed_input.rules, page)) .map(|rule| rule[rule.len() / 2]) .sum() } -fn correct_page(page: &mut [u32], rules: &[(u32, u32)]) { - page.sort_by(|a, b| match all_rules_apply(rules, &[*a, *b]) { - true => std::cmp::Ordering::Less, - false => std::cmp::Ordering::Greater, - }); -} - fn part2(parsed_input: &mut ParsedInput) -> u32 { parsed_input .pages - .par_iter_mut() + .iter_mut() .filter(|page| !all_rules_apply(&parsed_input.rules, page)) .map(|page| { - correct_page(page, &parsed_input.rules); + page.sort_by(|a, b| match !parsed_input.rules.contains(&(*a, *b)) { + true => std::cmp::Ordering::Less, + false => std::cmp::Ordering::Greater, + }); page[page.len() / 2] }) .sum()