is this better for std

Author: Sherry Fan

services_benchmark_test/Cargo.toml

@@ -25,10 +25,15 @@ cfg-if = { workspace = true }
 log = { workspace = true }
 r-efi = { workspace = true }
 rolling-stats =  { workspace = true }
-uefi = { version = "0.36.0", features = ["alloc", "logger", "global_allocator"] }
 uuid =  { workspace = true }
 
 patina = { workspace = true }
 
+[target.'cfg(target_os = "uefi")'.dependencies]
+uefi = { version = "0.36.0", features = ["alloc", "logger", "global_allocator"] }
+
+[target.'cfg(not(target_os = "uefi"))'.dependencies]
+uefi = { version = "0.36.0", default-features = false }
+
 [dev-dependencies]
 mockall = "0.13.0"

services_benchmark_test/src/bench/controller.rs

@@ -1,12 +1,17 @@
+#[cfg(target_os = "uefi")]
 use alloc::{boxed::Box, vec};
+
+#[cfg(not(target_os = "uefi"))]
+use std::{boxed::Box, vec};
+
 use mu_rust_helpers::perf_timer::{Arch, ArchFunctionality as _};
 use patina::boot_services::BootServices;
 use r_efi::efi;
 use rolling_stats::Stats;
 
 use crate::{
     BOOT_SERVICES,
-    bench::{TEST_GUID1, TEST_GUID2, TestProtocol1, TestProtocol2},
+    bench::{TestProtocol1, TestProtocol2},
     error::BenchError,
 };
 

services_benchmark_test/src/bench/event.rs

@@ -1,4 +1,9 @@
+#[cfg(target_os = "uefi")]
 use alloc::vec::Vec;
+
+#[cfg(not(target_os = "uefi"))]
+use std::vec::Vec;
+
 use core::{ffi::c_void, ptr};
 
 use mu_rust_helpers::perf_timer::{Arch, ArchFunctionality as _};

services_benchmark_test/src/bench/protocol.rs

@@ -11,12 +11,17 @@ use crate::{
     error::BenchError,
 };
 
+#[cfg(target_os = "uefi")]
+use alloc::boxed::Box;
+
+#[cfg(not(target_os = "uefi"))]
+use std::boxed::Box;
+
 /// Benchmarks protocol installation performance.
 pub(crate) fn bench_install_protocol_interface(
     _handle: efi::Handle,
     num_calls: usize,
 ) -> Result<Stats<f64>, BenchError> {
-    let protocol_interface = 0x1234 as *mut c_void;
     let mut stats: Stats<f64> = Stats::new();
     for _ in 0..num_calls {
         let start = Arch::cpu_count();

services_benchmark_test/src/lib.rs

@@ -28,8 +28,15 @@ const COL_WIDTHS: [usize; 8] = [32, 14, 12, 15, 15, 12, 12, 12];
 /// Global instance of UEFI Boot Services.
 pub static BOOT_SERVICES: StandardBootServices = StandardBootServices::new_uninit();
 
+#[cfg(target_os = "uefi")]
 extern crate alloc;
-use alloc::{string::ToString, vec::Vec};
+
+#[cfg(target_os = "uefi")]
+use alloc::{string::String, string::ToString, vec::Vec};
+
+#[cfg(not(target_os = "uefi"))]
+use std::{string::String, string::ToString, vec::Vec};
+
 use core::fmt::Write;
 use mu_rust_helpers::perf_timer::{Arch, ArchFunctionality as _};
 use rolling_stats::Stats;
@@ -38,7 +45,6 @@ use patina::boot_services::StandardBootServices;
 use r_efi::efi;
 
 use crate::{error::BenchError, measure::BENCH_FNS};
-use alloc::string::String;
 
 pub fn bench_start(handle: efi::Handle) -> Result<(), BenchError> {
     log::info!("Starting Services Benchmark Test...");