Unify benchmark types in rtx-bench crate

Move CatmullRomSpline, CameraPath, CameraFrame, GpuInfo, BenchmarkMetadata,
and FrameRecord to rtx-bench. All types now use owned values with both
Serialize and Deserialize. The host crate imports these types instead of
defining its own.

Author: llGaetanll

Cargo.lock

@@ -9,8 +9,11 @@ use chrono::DateTime;
 use chrono::Utc;
 use futures::executor::block_on;
 use glam::Vec3;
+use rtx_bench::BenchmarkMetadata;
+use rtx_bench::CameraPath;
+use rtx_bench::FrameRecord;
+use rtx_bench::GpuInfo;
 use serde::Deserialize;
-use serde::Serialize;
 use winit::application::ApplicationHandler;
 use winit::dpi::LogicalSize;
 use winit::event::ElementState;
@@ -23,7 +26,6 @@ use winit::keyboard::NamedKey;
 use winit::window::WindowAttributes;
 use winit::window::WindowId;
 
-use crate::camera_path::CameraPath;
 use crate::gpu::GpuContext;
 use crate::window_surface::WindowSurface;
 use crate::window_surface::WindowSurfaceBuilder;
@@ -80,47 +82,10 @@ impl BenchmarkFile {
     }
 }
 
-/// GPU information captured from the wgpu adapter.
-#[derive(Serialize)]
-pub struct GpuInfo {
-    pub name: String,
-    pub driver: String,
-    pub backend: String,
-}
-
-/// Per-frame timing and camera data.
-#[derive(Serialize)]
-pub struct FrameRecord {
-    pub frame: u32,
-    pub t: f32,
-    pub time_us: u64,
-    pub cam_pos: [f32; 3],
-    pub cam_dir: [f32; 3],
-    pub cam_vup: [f32; 3],
-}
-
-/// Benchmark metadata written as the first line of the JSONL output.
-#[derive(Serialize)]
-pub struct BenchmarkMetadata<'a> {
-    pub version: u32,
-    pub timestamp: String,
-    pub git_sha: &'a str,
-    pub scene: &'a str,
-    pub resolution: [u32; 2],
-    pub gpu: &'a GpuInfo,
-    pub camera_path: &'a CameraPath,
-}
-
-impl GpuInfo {
-    /// Extract GPU info from a wgpu adapter.
-    pub fn from_adapter(adapter: &wgpu::Adapter) -> Self {
-        let info = adapter.get_info();
-        Self {
-            name: info.name,
-            driver: info.driver,
-            backend: format!("{:?}", info.backend),
-        }
-    }
+/// Extract GPU info from a wgpu adapter.
+fn gpu_info_from_adapter(adapter: &wgpu::Adapter) -> GpuInfo {
+    let info = adapter.get_info();
+    GpuInfo::new(info.name, info.driver, format!("{:?}", info.backend))
 }
 
 /// Git SHA baked in at build time via build.rs.
@@ -241,7 +206,7 @@ impl BenchApp {
         let surface = window_surface.borrow_surface();
 
         let gpu = GpuContext::new(instance, Some(surface)).await?;
-        let gpu_info = GpuInfo::from_adapter(&gpu.adapter);
+        let gpu_info = gpu_info_from_adapter(&gpu.adapter);
 
         let swapchain_format = surface.get_capabilities(&gpu.adapter).formats[0];
 
@@ -392,11 +357,11 @@ impl BenchApp {
         let metadata = BenchmarkMetadata {
             version: 1,
             timestamp: self.timestamp.format("%Y-%m-%dT%H:%M:%SZ").to_string(),
-            git_sha: GIT_SHA,
-            scene: &self.scene,
+            git_sha: GIT_SHA.to_string(),
+            scene: self.scene.clone(),
             resolution: [config.width, config.height],
-            gpu: gpu_info,
-            camera_path: &self.camera_path,
+            gpu: gpu_info.clone(),
+            camera_path: self.camera_path.clone(),
         };
         serde_json::to_writer(&mut writer, &metadata)?;
         writeln!(writer)?;

crates/host/src/bench_app.rs

@@ -7,11 +7,9 @@ use clap::Parser;
 use futures::executor::block_on;
 
 mod bench_app;
-mod camera_path;
 mod cli;
 mod gpu;
 mod live_app;
-mod spline;
 mod window_surface;
 
 use cli::Cli;

crates/host/src/main.rs

@@ -5,6 +5,7 @@ edition = "2024"
 
 [dependencies]
 anyhow = "1"
+glam = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 svg = "0.18"

crates/rtx-bench/Cargo.toml

@@ -1,4 +1,5 @@
 use glam::Vec3;
+use serde::Deserialize;
 use serde::Serialize;
 
 use crate::spline::CatmullRomSpline;
@@ -7,7 +8,7 @@ use crate::spline::CatmullRomSpline;
 ///
 /// Interpolates camera position and look-at target along Catmull-Rom splines,
 /// allowing smooth camera motion through a scene.
-#[derive(Serialize)]
+#[derive(Serialize, Deserialize, Clone)]
 pub struct CameraPath {
     position: CatmullRomSpline,
     look_at: CatmullRomSpline,

crates/host/src/camera_path.rs crates/rtx-bench/src/camera_path.rscrates/host/src/camera_path.rs renamed to crates/rtx-bench/src/camera_path.rs

@@ -1,4 +1,7 @@
+mod camera_path;
 mod chart;
+mod spline;
+mod types;
 
 use std::collections::HashMap;
 use std::fs;
@@ -8,26 +11,13 @@ use std::path::Path;
 
 use anyhow::Context;
 use anyhow::Result;
+pub use camera_path::CameraFrame;
+pub use camera_path::CameraPath;
 pub use chart::generate_svg;
-use serde::Deserialize;
-
-/// Metadata from the first line of a benchmark JSONL file.
-#[derive(Deserialize)]
-pub struct BenchmarkMetadata {
-    pub version: u32,
-    pub timestamp: String,
-    pub git_sha: String,
-    pub scene: String,
-    pub resolution: [u32; 2],
-}
-
-/// Per-frame timing data from benchmark JSONL files.
-#[derive(Deserialize)]
-pub struct FrameRecord {
-    pub frame: u32,
-    pub t: f32,
-    pub time_us: u64,
-}
+pub use spline::CatmullRomSpline;
+pub use types::BenchmarkMetadata;
+pub use types::FrameRecord;
+pub use types::GpuInfo;
 
 /// A single frame's data: frame number and render time.
 #[derive(Clone)]

crates/rtx-bench/src/lib.rs

@@ -1,12 +1,13 @@
 use glam::Vec3;
+use serde::Deserialize;
 use serde::Serialize;
 
 /// A Catmull-Rom spline that interpolates through a series of control points.
 ///
 /// Catmull-Rom splines pass through all control points (except the first and last,
 /// which only influence the curve's tangents at the endpoints). The curve is C1
 /// continuous (smooth first derivative) at all interior points.
-#[derive(Serialize)]
+#[derive(Serialize, Deserialize, Clone)]
 pub struct CatmullRomSpline {
     points: Vec<Vec3>,
 }

crates/host/src/spline.rs crates/rtx-bench/src/spline.rscrates/host/src/spline.rs renamed to crates/rtx-bench/src/spline.rs

@@ -0,0 +1,46 @@
+use serde::Deserialize;
+use serde::Serialize;
+
+use crate::CameraPath;
+
+/// GPU information captured from the wgpu adapter.
+#[derive(Serialize, Deserialize, Clone)]
+pub struct GpuInfo {
+    pub name: String,
+    pub driver: String,
+    pub backend: String,
+}
+
+impl GpuInfo {
+    /// Create a new GpuInfo with the given values.
+    pub fn new(name: String, driver: String, backend: String) -> Self {
+        Self {
+            name,
+            driver,
+            backend,
+        }
+    }
+}
+
+/// Benchmark metadata written as the first line of the JSONL output.
+#[derive(Serialize, Deserialize)]
+pub struct BenchmarkMetadata {
+    pub version: u32,
+    pub timestamp: String,
+    pub git_sha: String,
+    pub scene: String,
+    pub resolution: [u32; 2],
+    pub gpu: GpuInfo,
+    pub camera_path: CameraPath,
+}
+
+/// Per-frame timing and camera data.
+#[derive(Serialize, Deserialize)]
+pub struct FrameRecord {
+    pub frame: u32,
+    pub t: f32,
+    pub time_us: u64,
+    pub cam_pos: [f32; 3],
+    pub cam_dir: [f32; 3],
+    pub cam_vup: [f32; 3],
+}

crates/rtx-bench/src/types.rs

@@ -70,7 +70,7 @@ Create a new crate `rtx-bench` (`crates/rtx-bench/`) for all charting logic. The
 
 - [x] Axis labels and tick marks
 - [x] **Consolidate benchmark directories**: Reorganized `benchmarks/`, `bench-results/`, and `bench-charts/` into a single `bench/` directory with subdirectories (`bench/configs/`, `bench/results/`, `bench/charts/`).
-- [ ] **Unify benchmark types**: `BenchmarkMetadata`, `FrameRecord`, `GpuInfo` are defined in `host/bench_app.rs` (Serialize, with lifetimes) and `rtx-bench` (Deserialize, owned). Consolidate into one set of owned types with `Serialize + Deserialize` in `rtx-bench`, and have `host` import them.
+- [x] **Unify benchmark types**: `BenchmarkMetadata`, `FrameRecord`, `GpuInfo`, `CameraPath`, and `CatmullRomSpline` are now defined in `rtx-bench` with owned types and `Serialize + Deserialize`. The `host` crate imports these types.
 - [x] **Interactive SVG with JavaScript**: Embed JS in the SVG for browser-based interactivity:
   - [x] Toggle commits on/off by clicking legend items (simpler - add IDs to polylines, toggle visibility)
   - [x] Rectangular selection to zoom into a region (mouse tracking, selection box, viewBox transform, reset button)

docs/tasks/benchmark-charts.md

@@ -4,8 +4,9 @@ Track rendering performance across commits to detect regressions.
 
 ## Relevant Files
 
-- `crates/host/src/spline.rs` - `CatmullRomSpline` implementation
-- `crates/host/src/camera_path.rs` - `CameraPath` and `CameraFrame` types (frame = position + look-at target)
+- `crates/rtx-bench/src/spline.rs` - `CatmullRomSpline` implementation
+- `crates/rtx-bench/src/camera_path.rs` - `CameraPath` and `CameraFrame` types (frame = position + look-at target)
+- `crates/rtx-bench/src/types.rs` - `BenchmarkMetadata`, `FrameRecord`, `GpuInfo` types
 - `crates/host/src/bench_app.rs` - Benchmark application with render loop
 - `crates/host/src/cli.rs` - CLI definitions including `bench` subcommand
 - `bench/configs/*.toml` - Benchmark definition files