From c59273943aac946c8a5519b1e7d1959dee2c67a2 Mon Sep 17 00:00:00 2001 From: cpplearner Date: Sat, 17 May 2025 21:40:32 +0800 Subject: [PATCH 1/2] Build benchmarks for ARM64EC pipeline --- azure-pipelines.yml | 1 + benchmarks/CMakeLists.txt | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1f8c6505343..d31679c7b80 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -98,6 +98,7 @@ stages: targetArch: arm64 targetPlatform: arm64ec analyzeBuild: true + buildBenchmarks: true numShards: 1 skipTesting: true diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt index 338f9c6a239..994c4fbd6a4 100644 --- a/benchmarks/CMakeLists.txt +++ b/benchmarks/CMakeLists.txt @@ -27,6 +27,11 @@ if(DEFINED STL_BINARY_DIR) set(VCLIBS_I386_OR_AMD64 "arm") elseif(VCLIBS_TARGET_ARCHITECTURE STREQUAL "arm64") set(VCLIBS_I386_OR_AMD64 "arm64") + elseif(VCLIBS_TARGET_ARCHITECTURE STREQUAL "arm64ec") + set(VCLIBS_I386_OR_AMD64 "arm64ec") + add_compile_options("/arm64EC") + add_link_options("/machine:arm64ec") + set(CMAKE_STATIC_LINKER_FLAGS "/machine:arm64ec") else() message(FATAL_ERROR "Could not determine target architecture: VCLIBS_TARGET_ARCHITECTURE: ${VCLIBS_TARGET_ARCHITECTURE}") endif() From 82b21b5d929dd12799b7589fa12a7dd830415431 Mon Sep 17 00:00:00 2001 From: "Stephan T. Lavavej" Date: Mon, 19 May 2025 01:14:54 -0700 Subject: [PATCH 2/2] Restrict `/arm64EC` to `COMPILE_LANGUAGE:CXX`. --- benchmarks/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt index 994c4fbd6a4..719d7deec21 100644 --- a/benchmarks/CMakeLists.txt +++ b/benchmarks/CMakeLists.txt @@ -29,7 +29,7 @@ if(DEFINED STL_BINARY_DIR) set(VCLIBS_I386_OR_AMD64 "arm64") elseif(VCLIBS_TARGET_ARCHITECTURE STREQUAL "arm64ec") set(VCLIBS_I386_OR_AMD64 "arm64ec") - add_compile_options("/arm64EC") + add_compile_options($<$:/arm64EC>) add_link_options("/machine:arm64ec") set(CMAKE_STATIC_LINKER_FLAGS "/machine:arm64ec") else()