Faster day 6

Author: prevostc

.cargo/config.toml

@@ -3,6 +3,7 @@ today = "run --quiet --release --features today -- today"
 scaffold = "run --quiet --release -- scaffold"
 download = "run --quiet --release -- download"
 read = "run --quiet --release -- read"
+flame = "run --quiet --release --features dhat-heap -- flame"
 
 solve = "run --quiet --release -- solve"
 all = "run --quiet --release -- all"

.gitignore

@@ -28,3 +28,5 @@ dhat-heap.json
 # Benchmarks
 
 data/timings.json
+
+flamegraph.svg

README.md

@@ -11,15 +11,15 @@ Solutions for [Advent of Code](https://adventofcode.com/) in [Rust](https://www.
 
 | Day | Part 1 | Part 2 |
 | :---: | :---: | :---:  |
-| [Day 1](./src/bin/01.rs) | `66.9µs` | `82.5µs` |
-| [Day 2](./src/bin/02.rs) | `128.2µs` | `224.5µs` |
-| [Day 3](./src/bin/03.rs) | `717.8µs` | `830.1µs` |
-| [Day 4](./src/bin/04.rs) | `810.2µs` | `298.7µs` |
-| [Day 5](./src/bin/05.rs) | `67.7µs` | `184.5µs` |
-| [Day 6](./src/bin/06.rs) | `71.1µs` | `24.8ms` |
-| [Day 7](./src/bin/07.rs) | `566.4µs` | `7.3ms` |
-
-**Total: 36.15ms**
+| [Day 1](./src/bin/01.rs) | `31.7µs` | `39.7µs` |
+| [Day 2](./src/bin/02.rs) | `46.5µs` | `67.4µs` |
+| [Day 3](./src/bin/03.rs) | `213.3µs` | `238.4µs` |
+| [Day 4](./src/bin/04.rs) | `148.6µs` | `33.1µs` |
+| [Day 5](./src/bin/05.rs) | `65.6µs` | `181.1µs` |
+| [Day 6](./src/bin/06.rs) | `44.6µs` | `12.3ms` |
+| [Day 7](./src/bin/07.rs) | `554.7µs` | `7.1ms` |
+
+**Total: 21.06ms**
 <!--- benchmarking table --->
 
 ---

src/bin/06.rs

@@ -5,7 +5,7 @@ use mygrid::point::Point;
 use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
 use rustc_hash::FxHashSet;
 
-#[derive(Default, Clone, PartialEq, Eq, Hash)]
+#[derive(Default, Clone, PartialEq, Eq, Hash, Debug)]
 struct Guard {
     position: Point,
     direction: Direction,
@@ -51,7 +51,7 @@ fn get_guard_path_positions_assuming_no_loops(
         position: start_pos,
         direction: UP,
     };
-    let mut visited = FxHashSet::default();
+    let mut visited = FxHashSet::with_capacity_and_hasher(10_000, Default::default());
     visited.insert(guard.position);
 
     while let Some(new_guard) = guard.turn(grid) {
@@ -61,12 +61,14 @@ fn get_guard_path_positions_assuming_no_loops(
     visited
 }
 
+#[inline]
 fn does_start_pos_loop(grid: &Grid<char>, start_pos: Point) -> bool {
     let mut guard = Guard {
         position: start_pos,
         direction: UP,
     };
-    let mut visited = FxHashSet::default();
+    let mut visited = FxHashSet::with_capacity_and_hasher(10_000, Default::default());
+    //let mut visited = FnvIndexSet::<Guard, 10_000>::new();
     visited.insert(guard.clone());
 
     while let Some(new_guard) = guard.turn(grid) {

src/main.rs

@@ -1,4 +1,4 @@
-use advent_of_code::template::commands::{all, download, read, scaffold, solve, time};
+use advent_of_code::template::commands::{all, download, flame, read, scaffold, solve, time};
 use args::{parse, AppArguments};
 
 #[cfg(feature = "today")]
@@ -28,6 +28,11 @@ mod args {
             dhat: bool,
             submit: Option<u8>,
         },
+        Flame {
+            day: Day,
+            release: bool,
+            dhat: bool,
+        },
         All {
             release: bool,
         },
@@ -68,6 +73,11 @@ mod args {
                 download: args.contains("--download"),
                 overwrite: args.contains("--overwrite"),
             },
+            Some("flame") => AppArguments::Flame {
+                day: args.free_from_str()?,
+                release: args.contains("--release"),
+                dhat: args.contains("--dhat"),
+            },
             Some("solve") => AppArguments::Solve {
                 day: args.free_from_str()?,
                 release: args.contains("--release"),
@@ -122,6 +132,7 @@ fn main() {
                 dhat,
                 submit,
             } => solve::handle(day, release, dhat, submit),
+            AppArguments::Flame { day, release, dhat } => flame::handle(day, release, dhat),
             #[cfg(feature = "today")]
             AppArguments::Today => {
                 match Day::today() {

src/template/commands/flame.rs

@@ -0,0 +1,34 @@
+use std::process::{Command, Stdio};
+
+use crate::template::Day;
+
+pub fn handle(day: Day, release: bool, dhat: bool) {
+    let mut cmd_args = vec![
+        "flamegraph".to_string(),
+        "--bin".to_string(),
+        day.to_string(),
+    ];
+
+    if dhat {
+        cmd_args.extend([
+            "--profile".to_string(),
+            "dhat".to_string(),
+            "--features".to_string(),
+            "dhat-heap".to_string(),
+        ]);
+    } else if release {
+        cmd_args.push("--release".to_string());
+    }
+
+    cmd_args.push("--".to_string());
+
+    let mut cmd = Command::new("cargo")
+        .args(&cmd_args)
+        .env("CARGO_PROFILE_RELEASE_DEBUG", "true")
+        .stdout(Stdio::inherit())
+        .stderr(Stdio::inherit())
+        .spawn()
+        .unwrap();
+
+    cmd.wait().unwrap();
+}

src/template/commands/mod.rs

@@ -1,5 +1,6 @@
 pub mod all;
 pub mod download;
+pub mod flame;
 pub mod read;
 pub mod scaffold;
 pub mod solve;