improve build

Author: Sherry Fan

Makefile.toml

@@ -11,6 +11,9 @@ CARGO_MAKE_RUST_TARGET_ARCH = { value = "x86_64", condition = { env_not_set = ["
 PACKAGE_NAME = { value = "services_benchmark_test", condition = { env_not_set = ["PACKAGE_NAME"] } }
 BUILD_MODE = { value = "release", condition = { env_not_set = ["BUILD_MODE"] } }
 
+# no_std build flags for UEFI
+NO_STD_FLAGS = "-Zbuild-std=core,compiler_builtins,alloc -Zbuild-std-features=compiler-builtins-mem -Zunstable-options"
+
 # Target configuration based on architecture  
 UEFI_TARGET_X64 = "x86_64-unknown-uefi"
 UEFI_TARGET_ARM64 = "aarch64-unknown-uefi"
@@ -42,28 +45,28 @@ script = [
 [tasks.build-lib]
 description = "Build the library for UEFI target"
 command = "cargo"
-args = ["build", "--lib", "-p", "${PACKAGE_NAME}", "--target", "${UEFI_TARGET}"]
+args = ["build", "--lib", "-p", "${PACKAGE_NAME}", "--target", "${UEFI_TARGET}", "@@split(NO_STD_FLAGS, )"]
 dependencies = ["setup"]
 
 # Build library in release mode
 [tasks.build-lib-release]
 description = "Build the library for UEFI target in release mode"
 command = "cargo"
-args = ["build", "--lib", "-p", "${PACKAGE_NAME}", "--target", "${UEFI_TARGET}", "--release"]
+args = ["build", "--lib", "-p", "${PACKAGE_NAME}", "--target", "${UEFI_TARGET}", "--release", "@@split(NO_STD_FLAGS, )"]
 dependencies = ["setup"]
 
 # Build binary
 [tasks.build-bin]
 description = "Build the binary for UEFI target"
 command = "cargo"
-args = ["build", "--bin", "${PACKAGE_NAME}", "-p", "${PACKAGE_NAME}", "--target", "${UEFI_TARGET}"]
+args = ["build", "--bin", "${PACKAGE_NAME}", "-p", "${PACKAGE_NAME}", "--target", "${UEFI_TARGET}", "@@split(NO_STD_FLAGS, )"]
 dependencies = ["setup"]
 
 # Build binary in release mode
 [tasks.build-bin-release]
 description = "Build the binary for UEFI target in release mode"
 command = "cargo"
-args = ["build", "--bin", "${PACKAGE_NAME}", "-p", "${PACKAGE_NAME}", "--target", "${UEFI_TARGET}", "--release"]
+args = ["build", "--bin", "${PACKAGE_NAME}", "-p", "${PACKAGE_NAME}", "--target", "${UEFI_TARGET}", "--release", "@@split(NO_STD_FLAGS, )"]
 dependencies = ["setup"]
 
 # Build EFI application
@@ -149,7 +152,7 @@ args = ["llvm-cov", "--no-report"]
 [tasks.clippy]
 description = "Run clippy for the package"
 command = "cargo"
-args = ["clippy", "-p", "${PACKAGE_NAME}", "--target", "${UEFI_TARGET}", "--", "-D", "warnings"]
+args = ["clippy", "-p", "${PACKAGE_NAME}", "--target", "${UEFI_TARGET}", "@@split(NO_STD_FLAGS, )", "--", "-D", "warnings"]
 dependencies = ["setup"]
 
 # Format code
@@ -162,7 +165,7 @@ args = ["fmt", "-p", "${PACKAGE_NAME}"]
 [tasks.check]
 description = "Check code for the package"
 command = "cargo"
-args = ["check", "-p", "${PACKAGE_NAME}", "--target", "${UEFI_TARGET}"]
+args = ["check", "-p", "${PACKAGE_NAME}", "--target", "${UEFI_TARGET}", "@@split(NO_STD_FLAGS, )"]
 dependencies = ["setup"]
 
 # Full CI pipeline
@@ -197,4 +200,4 @@ script = "cspell --quiet  --no-progress --no-summary  --dot --gitignore -e \"{.g
 
 [tasks.all]
 description = "Run all tasks for PR readiness."
-dependencies = ["deny", "clippy", "cspell", "build", "test", "coverage", "fmt", "doc"]
+dependencies = ["deny", "clippy", "cspell", "build", "test", "coverage", "fmt", "doc"]

services_benchmark_test/src/bench/event.rs

@@ -1,9 +1,5 @@
-#[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,8 @@ 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,

services_benchmark_test/src/lib.rs

@@ -28,11 +28,10 @@ pub static BOOT_SERVICES: StandardBootServices = StandardBootServices::new_unini
 #[cfg(target_os = "uefi")]
 extern crate alloc;
 
-#[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 alloc::{
+    string::{String, ToString},
+    vec::Vec,
+};
 
 use core::fmt::Write;
 use mu_rust_helpers::perf_timer::{Arch, ArchFunctionality as _};