move benchmarks to iai-callgrind

Cargo.lock

@@ -32,18 +32,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "anes"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
-
-[[package]]
-name = "anstyle"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
-
 [[package]]
 name = "autocfg"
 version = "1.3.0"
@@ -75,6 +63,15 @@ dependencies = [
  "console",
 ]
 
+[[package]]
+name = "bincode"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "bitbuffer"
 version = "0.11.0"
@@ -108,18 +105,6 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
-[[package]]
-name = "bumpalo"
-version = "3.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
-
-[[package]]
-name = "cast"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
-
 [[package]]
 name = "cc"
 version = "1.2.20"
@@ -135,58 +120,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
-[[package]]
-name = "ciborium"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
-dependencies = [
- "ciborium-io",
- "ciborium-ll",
- "serde",
-]
-
-[[package]]
-name = "ciborium-io"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
-
-[[package]]
-name = "ciborium-ll"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
-dependencies = [
- "ciborium-io",
- "half",
-]
-
-[[package]]
-name = "clap"
-version = "4.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f"
-dependencies = [
- "clap_builder",
-]
-
-[[package]]
-name = "clap_builder"
-version = "4.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f"
-dependencies = [
- "anstyle",
- "clap_lex",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
-
 [[package]]
 name = "console"
 version = "0.15.8"
@@ -200,72 +133,25 @@ dependencies = [
 ]
 
 [[package]]
-name = "criterion"
+name = "derive_more"
-version = "0.5.1"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
+checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
 dependencies = [
- "anes",
+ "derive_more-impl",
- "cast",
- "ciborium",
- "clap",
- "criterion-plot",
- "is-terminal",
- "itertools 0.10.5",
- "num-traits 0.2.19",
- "once_cell",
- "oorandom",
- "plotters",
- "rayon",
- "regex",
- "serde",
- "serde_derive",
- "serde_json",
- "tinytemplate",
- "walkdir",
 ]
 
 [[package]]
-name = "criterion-plot"
+name = "derive_more-impl"
-version = "0.5.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
+checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
 dependencies = [
- "cast",
+ "proc-macro2",
- "itertools 0.10.5",
+ "quote",
+ "syn 2.0.90",
 ]
 
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
-dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.18"
-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"
-
-[[package]]
-name = "crunchy"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
-
 [[package]]
 name = "diff"
 version = "0.1.13"
@@ -354,16 +240,6 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
 
-[[package]]
-name = "half"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
-dependencies = [
- "cfg-if",
- "crunchy",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.14.5"
@@ -371,16 +247,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 
 [[package]]
-name = "hermit-abi"
+name = "iai-callgrind"
-version = "0.3.9"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+checksum = "cd56318753b26f1f33ccf7385041fd31fdb3f8966aa1c62d46cf2efba9835504"
+dependencies = [
+ "bincode",
+ "derive_more",
+ "iai-callgrind-macros",
+ "iai-callgrind-runner",
+]
 
 [[package]]
-name = "iai"
+name = "iai-callgrind-macros"
-version = "0.1.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71a816c97c42258aa5834d07590b718b4c9a598944cd39a52dc25b351185d678"
+checksum = "763d0d9b10ba3177236eda380afb78bafa150556dc4536969f91f938fee1b83a"
+dependencies = [
+ "derive_more",
+ "proc-macro-error2",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_json",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "iai-callgrind-runner"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "100409442ecf8137ec5c0ad83548be9f1d22f072b646e6ed16177558e037a0dd"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "indexmap"
@@ -405,26 +305,6 @@ dependencies = [
  "similar",
 ]
 
-[[package]]
-name = "is-terminal"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
-dependencies = [
- "hermit-abi",
- "libc",
- "windows-sys",
-]
-
-[[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itertools"
 version = "0.13.0"
@@ -460,15 +340,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "js-sys"
-version = "0.3.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
-dependencies = [
- "wasm-bindgen",
-]
-
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -692,12 +563,6 @@ version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
-[[package]]
-name = "oorandom"
-version = "11.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
-
 [[package]]
 name = "overload"
 version = "0.1.1"
@@ -735,34 +600,6 @@ version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 
-[[package]]
-name = "plotters"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3"
-dependencies = [
- "num-traits 0.2.19",
- "plotters-backend",
- "plotters-svg",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "plotters-backend"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7"
-
-[[package]]
-name = "plotters-svg"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705"
-dependencies = [
- "plotters-backend",
-]
-
 [[package]]
 name = "pretty_assertions"
 version = "1.4.0"
@@ -816,6 +653,28 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "proc-macro-error-attr2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "proc-macro-error2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
+dependencies = [
+ "proc-macro-error-attr2",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.92"
@@ -834,26 +693,6 @@ dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "rayon"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
-dependencies = [
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
-dependencies = [
- "crossbeam-deque",
- "crossbeam-utils",
-]
-
 [[package]]
 name = "regex"
 version = "1.10.5"
@@ -923,15 +762,6 @@ version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
 [[package]]
 name = "schemars"
 version = "0.8.21"
@@ -989,11 +819,12 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.117"
+version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 dependencies = [
  "itoa",
+ "memchr",
  "ryu",
  "serde",
 ]
@@ -1154,12 +985,11 @@ dependencies = [
  "Inflector",
  "better-panic",
  "bitbuffer",
- "criterion",
  "enumflags2",
  "fnv",
- "iai",
+ "iai-callgrind",
  "insta",
- "itertools 0.13.0",
+ "itertools",
  "jemallocator",
  "lazy_static",
  "log",
@@ -1236,16 +1066,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "tinytemplate"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
-dependencies = [
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "toml_datetime"
 version = "0.6.6"
@@ -1342,80 +1162,6 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
-[[package]]
-name = "walkdir"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
-dependencies = [
- "same-file",
- "winapi-util",
-]
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn 2.0.90",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.90",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
-
-[[package]]
-name = "web-sys"
-version = "0.3.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -1432,15 +1178,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
-[[package]]
-name = "winapi-util"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
-dependencies = [
- "windows-sys",
-]
-
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"

Cargo.toml

@@ -87,25 +87,19 @@ codegen = ["better-panic", "quote", "syn", "Inflector", "proc-macro2", "tempfile
 [dev-dependencies]
 pretty_assertions = "1.4.0"
 test-case = "3.3.1"
-iai = "0.1.1"
+iai-callgrind = "0.15.2"
-criterion = "0.5.1"
 insta = { version = "1.39.0", features = ["json"] }
 
 [profile.release]
 lto = "thin"
 
+[profile.bench]
+debug = true
+
 [profile.dev]
 opt-level = 2
 
 [[bench]]
-name = "iai"
+name = "parse"
-harness = false
-
-[[bench]]
-name = "allmessages"
-harness = false
-
-[[bench]]
-name = "bench"
 harness = false
 

benches/allmessages.rs

@@ -1,60 +0,0 @@
-#![allow(dead_code)]
-#![allow(unused_imports)]
-#![allow(unused_variables)]
-
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use pretty_assertions::assert_eq;
-use std::fs;
-
-use std::collections::{HashMap, HashSet};
-use tf_demo_parser::demo::data::DemoTick;
-use tf_demo_parser::demo::message::Message;
-use tf_demo_parser::demo::packet::datatable::{ParseSendTable, SendTableName};
-use tf_demo_parser::demo::packet::stringtable::StringTableEntry;
-use tf_demo_parser::demo::parser::MessageHandler;
-use tf_demo_parser::demo::sendprop::RawSendPropDefinition;
-use tf_demo_parser::{Demo, DemoParser, MatchState, MessageType, MessageTypeAnalyser, ParserState};
-
-struct AllMessages;
-
-impl MessageHandler for AllMessages {
-    type Output = bool;
-
-    fn does_handle(message_type: MessageType) -> bool {
-        true
-    }
-
-    fn handle_message(&mut self, message: &Message, tick: DemoTick, _parser_state: &ParserState) {
-        black_box(message);
-    }
-
-    fn into_output(self, state: &ParserState) -> Self::Output {
-        black_box(true)
-    }
-}
-
-fn bench_all(input_file: &str, b: &mut Criterion) {
-    let file = fs::read(input_file).expect("Unable to read file");
-    let demo = Demo::new(&file);
-    let stream = demo.get_stream();
-    b.bench_function("bench_all", |b| {
-        b.iter(|| {
-            let _ = black_box(
-                DemoParser::new_with_analyser(stream.clone(), AllMessages)
-                    .parse()
-                    .unwrap(),
-            );
-        })
-    });
-}
-
-fn all_test_gully(b: &mut Criterion) {
-    bench_all("test_data/gully.dem", b);
-}
-
-criterion_group! {
-    name = benches;
-    config = Criterion::default().sample_size(10);
-    targets = all_test_gully
-}
-criterion_main!(benches);

benches/bench.rs

@@ -1,56 +0,0 @@
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use std::fs;
-use tf_demo_parser::demo::parser::gamestateanalyser::GameStateAnalyser;
-use tf_demo_parser::{Demo, DemoParser, Stream};
-
-fn bench_file(input_file: &str, b: &mut Criterion) {
-    let file = fs::read(input_file).expect("Unable to read file");
-    let demo = Demo::new(&file);
-    let stream: Stream = demo.get_stream();
-
-    b.bench_function(&format!("bench file {}", input_file), |b| {
-        b.iter(|| {
-            let (_, state) = DemoParser::new(stream.clone()).parse().unwrap();
-            black_box(state);
-        })
-    });
-}
-
-fn bench_gamestate(input_file: &str, b: &mut Criterion) {
-    let file = fs::read(input_file).expect("Unable to read file");
-    let demo = Demo::new(&file);
-    let stream: Stream = demo.get_stream();
-
-    b.bench_function(&format!("bench gamestate {}", input_file), |b| {
-        b.iter(|| {
-            let (_, state) =
-                DemoParser::new_with_analyser(stream.clone(), GameStateAnalyser::default())
-                    .parse()
-                    .unwrap();
-            black_box(state);
-        })
-    });
-}
-
-fn bench_gully(b: &mut Criterion) {
-    bench_file("test_data/gully.dem", b);
-}
-fn bench_comp(b: &mut Criterion) {
-    bench_file("test_data/comp.dem", b);
-}
-
-fn bench_gamestate_gully(b: &mut Criterion) {
-    bench_gamestate("test_data/gully.dem", b);
-}
-fn bench_gamestate_comp(b: &mut Criterion) {
-    bench_gamestate("test_data/comp.dem", b);
-}
-
-criterion_group!(
-    benches,
-    bench_comp,
-    bench_gully,
-    bench_gamestate_comp,
-    bench_gamestate_gully
-);
-criterion_main!(benches);

benches/iai.rs

@@ -1,37 +0,0 @@
-use iai::black_box;
-use tf_demo_parser::demo::data::DemoTick;
-use tf_demo_parser::demo::message::Message;
-use tf_demo_parser::demo::parser::MessageHandler;
-use tf_demo_parser::{Demo, DemoParser, MessageType, ParserState};
-
-struct AllMessages;
-
-impl MessageHandler for AllMessages {
-    type Output = bool;
-
-    fn does_handle(_message_type: MessageType) -> bool {
-        true
-    }
-
-    fn handle_message(&mut self, message: &Message, _tick: DemoTick, _parser_state: &ParserState) {
-        black_box(message);
-    }
-
-    fn into_output(self, _state: &ParserState) -> Self::Output {
-        black_box(true)
-    }
-}
-
-const INPUT: &[u8] = include_bytes!("../test_data/gully.dem");
-
-fn bench_all() {
-    let demo = Demo::new(INPUT);
-    let stream = demo.get_stream();
-    black_box(
-        DemoParser::new_with_analyser(stream.clone(), AllMessages)
-            .parse()
-            .unwrap(),
-    );
-}
-
-iai::main!(bench_all);

benches/parse.rs

@@ -0,0 +1,57 @@
+use iai_callgrind::{library_benchmark, library_benchmark_group, main};
+use std::fs::read;
+use std::hint::black_box;
+use std::path::Path;
+use tf_demo_parser::demo::data::DemoTick;
+use tf_demo_parser::demo::message::Message;
+use tf_demo_parser::demo::parser::analyser::Analyser;
+use tf_demo_parser::demo::parser::gamestateanalyser::GameStateAnalyser;
+use tf_demo_parser::demo::parser::MessageHandler;
+use tf_demo_parser::{Demo, DemoParser, MessageType, ParserState};
+
+struct AllMessages;
+
+impl MessageHandler for AllMessages {
+    type Output = bool;
+
+    fn does_handle(_message_type: MessageType) -> bool {
+        true
+    }
+
+    fn handle_message(&mut self, message: &Message, _tick: DemoTick, _parser_state: &ParserState) {
+        black_box(message);
+    }
+
+    fn into_output(self, _state: &ParserState) -> Self::Output {
+        black_box(true)
+    }
+}
+
+fn read_file<P: AsRef<Path>>(path: P) -> Demo<'static> {
+    let data = read(path).unwrap();
+    Demo::owned(data)
+}
+
+fn get_parser<P: AsRef<Path>, A: MessageHandler>(path: P, analyser: A) -> DemoParser<'static, A> {
+    let demo = read_file(path);
+    let stream = demo.get_stream();
+    DemoParser::new_with_analyser(stream.clone(), analyser)
+}
+
+#[library_benchmark(setup = get_parser)]
+#[bench::basic_small("test_data/small.dem", Analyser::new())]
+#[bench::basic_gully("test_data/gully.dem", Analyser::new())]
+#[bench::game_state_small("test_data/small.dem", GameStateAnalyser::new())]
+#[bench::game_state_gully("test_data/gully.dem", GameStateAnalyser::new())]
+#[bench::all_small("test_data/small.dem", AllMessages)]
+#[bench::all_gully("test_data/gully.dem", AllMessages)]
+fn parse<A: MessageHandler>(parser: DemoParser<A>) {
+    black_box(parser.parse().unwrap());
+}
+
+library_benchmark_group!(
+    name = bench_parse;
+    benchmarks = parse
+);
+
+main!(library_benchmark_groups = bench_parse);

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "crane": {
       "locked": {
-        "lastModified": 1742394900,
+        "lastModified": 1751562746,
-        "narHash": "sha256-vVOAp9ahvnU+fQoKd4SEXB2JG2wbENkpqcwlkIXgUC0=",
+        "narHash": "sha256-smpugNIkmDeicNz301Ll1bD7nFOty97T79m4GUMUczA=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "70947c1908108c0c551ddfd73d4f750ff2ea67cd",
+        "rev": "aed2020fd3dc26e1e857d4107a5a67a33ab6c1fd",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739796086,
+        "lastModified": 1752106289,
-        "narHash": "sha256-jxpUiVJ6O+V1YsXsvWdMgqnv8zk9TFiqF86CRdGGGH4=",
+        "narHash": "sha256-BC4hWjDDNVmRLvBFCHz7oKiapf1ndBRXPDNle/H+6e8=",
         "owner": "nix-community",
         "repo": "flakelight",
-        "rev": "540efca2f9015aff7dc574c7a03404e5fa72d42f",
+        "rev": "0c7170f19b170882f167a71cad1124714ffc192e",
         "type": "github"
       },
       "original": {
@@ -44,11 +44,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1748205441,
+        "lastModified": 1752438127,
-        "narHash": "sha256-W+UUBT/l1DSTZo5G43494mRNNspJ2i9jW2QELC9JuMQ=",
+        "narHash": "sha256-1NKLbztqg0/sYUhZgxus+WJU+jZThkV+pga/kqjB3/A=",
         "ref": "refs/heads/main",
-        "rev": "dac3b74a89cebbeb21cc6602e4a346604adbee8b",
+        "rev": "31877680aa6d391e59a598d35081e24b4316ab9a",
-        "revCount": 49,
+        "revCount": 60,
         "type": "git",
         "url": "https://codeberg.org/icewind/mill-scale.git"
       },
@@ -59,11 +59,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1748302896,
+        "lastModified": 1752308619,
-        "narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=",
+        "narHash": "sha256-pzrVLKRQNPrii06Rm09Q0i0dq3wt2t2pciT/GNq5EZQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7848cd8c982f7740edf76ddb3b43d234cb80fc4d",
+        "rev": "650e572363c091045cdbc5b36b0f4c1f614d3058",
         "type": "github"
       },
       "original": {
@@ -88,11 +88,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742697269,
+        "lastModified": 1752374969,
-        "narHash": "sha256-Lpp0XyAtIl1oGJzNmTiTGLhTkcUjwSkEb0gOiNzYFGM=",
+        "narHash": "sha256-Ky3ynEkJXih7mvWyt9DWoiSiZGqPeHLU1tlBU4b0mcc=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "01973c84732f9275c50c5f075dd1f54cc04b3316",
+        "rev": "75fb000638e6d0f57cb1e8b7a4550cbdd8c76f1d",
         "type": "github"
       },
       "original": {