feat(hpsvm-fixture): add version export for Agave runtime in fixture report

Author: Akagi201

Justfile

@@ -86,9 +86,9 @@ bench-baseline-compare:
 check:
   cargo check --all-targets --all-features
 
-# Publish all crates to crates.io (dry run)
+# Verify all workspace crates package and compile from their published layout
 publish-check:
-  cargo publish --workspace --dry-run --allow-dirty
+  cargo package --workspace --allow-dirty
 
 # Publish all crates to crates.io
 publish:

crates/hpsvm-fixture/Cargo.toml

@@ -28,6 +28,7 @@ solana-transaction-error.workspace = true
 thiserror.workspace = true
 
 [dev-dependencies]
+agave-feature-set.workspace = true
 solana-account.workspace = true
 solana-keypair.workspace = true
 solana-message.workspace = true

crates/hpsvm-fixture/build.rs

@@ -0,0 +1,54 @@
+//! Exports the packaged Agave runtime version for fixture report metadata.
+
+use std::{
+    env, fs,
+    path::{Path, PathBuf},
+};
+
+const AGAVE_FEATURE_SET_DEPENDENCY: &str = "agave-feature-set";
+const VERSION_ENV: &str = "HPSVM_AGAVE_FEATURE_SET_VERSION";
+
+fn main() {
+    let manifest_dir =
+        PathBuf::from(env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR must be set"));
+    let crate_manifest = manifest_dir.join("Cargo.toml");
+    let workspace_manifest = manifest_dir.join("..").join("..").join("Cargo.toml");
+
+    println!("cargo:rerun-if-changed={}", crate_manifest.display());
+    if workspace_manifest.exists() {
+        println!("cargo:rerun-if-changed={}", workspace_manifest.display());
+    }
+
+    let version = read_dependency_version(&crate_manifest)
+        .or_else(|| read_dependency_version(&workspace_manifest))
+        .unwrap_or_else(|| String::from("unknown"));
+
+    println!("cargo:rustc-env={VERSION_ENV}={version}");
+}
+
+fn read_dependency_version(manifest_path: &Path) -> Option<String> {
+    fs::read_to_string(manifest_path)
+        .ok()
+        .and_then(|manifest| extract_dependency_version(&manifest, AGAVE_FEATURE_SET_DEPENDENCY))
+}
+
+fn extract_dependency_version(manifest: &str, dependency_name: &str) -> Option<String> {
+    let quoted_prefix = format!("{dependency_name} = \"");
+    let inline_table_prefix = format!("{dependency_name} = {{");
+
+    manifest
+        .lines()
+        .map(str::trim)
+        .filter(|line| !line.is_empty() && !line.starts_with('#'))
+        .find_map(|line| {
+            line.strip_prefix(&quoted_prefix)
+                .and_then(|value| value.split('"').next())
+                .map(str::to_owned)
+                .or_else(|| {
+                    line.strip_prefix(&inline_table_prefix)
+                        .and_then(|_| line.split("version = \"").nth(1))
+                        .and_then(|value| value.split('"').next())
+                        .map(str::to_owned)
+                })
+        })
+}

crates/hpsvm-fixture/src/lib.rs

@@ -42,8 +42,6 @@ pub use crate::{
 
 pub type FixtureBenchCase<'a> = (&'a str, &'a Fixture);
 
-const WORKSPACE_MANIFEST: &str = include_str!("../../../Cargo.toml");
-
 pub(crate) const BUILTIN_VARIANT_NAME: &str = "builtin";
 
 pub(crate) fn generated_at_string() -> String {
@@ -53,15 +51,7 @@ pub(crate) fn generated_at_string() -> String {
 }
 
 pub(crate) fn solana_runtime_version_string() -> String {
-    WORKSPACE_MANIFEST
-        .lines()
-        .map(str::trim)
-        .find_map(|line| {
-            line.strip_prefix("agave-feature-set = \"")
-                .and_then(|value| value.strip_suffix('"'))
-                .map(String::from)
-        })
-        .unwrap_or_else(|| String::from("unknown"))
+    option_env!("HPSVM_AGAVE_FEATURE_SET_VERSION").unwrap_or("unknown").to_owned()
 }
 
 impl Fixture {
@@ -135,3 +125,13 @@ fn fixture_format_for_path(path: &std::path::Path) -> Result<FixtureFormat, Fixt
         _ => Err(FixtureError::UnsupportedFormat { path: path.display().to_string() }),
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::solana_runtime_version_string;
+
+    #[test]
+    fn solana_runtime_version_string_is_known() {
+        assert_ne!(solana_runtime_version_string(), "unknown");
+    }
+}