Add arm64EC pipeline (#5492)

cpplearner · StephanTLavavej · web-flow · commit c86725a03281 · 2025-05-16T20:18:12.000-07:00
Co-authored-by: Stephan T. Lavavej &lt;stl@microsoft.com&gt;
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,7 +27,7 @@ endif()
 
 string(TOLOWER "${VCLIBS_TARGET_ARCHITECTURE}" VCLIBS_TARGET_ARCHITECTURE)
 
-if(VCLIBS_TARGET_ARCHITECTURE MATCHES "^x64$|^x86$")
+if(VCLIBS_TARGET_ARCHITECTURE MATCHES "^(x86|x64)$")
     enable_language(ASM_MASM)
 endif()
 
@@ -67,7 +67,7 @@ elseif(VCLIBS_TARGET_ARCHITECTURE STREQUAL "x64")
     set(VCLIBS_I386_OR_AMD64 "amd64")
     set(VCLIBS_X86_OR_X64 "x64")
     add_compile_definitions(_AMD64_ _VCRT_WIN32_WINNT=0x0501 _STL_WIN32_WINNT=0x0501)
-elseif(VCLIBS_TARGET_ARCHITECTURE STREQUAL "armv7")
+elseif(VCLIBS_TARGET_ARCHITECTURE MATCHES "^(arm|armv7)$")
     set(VCLIBS_TARGET_ARCHITECTURE "arm")
     set(VCLIBS_I386_OR_AMD64 "arm")
     set(VCLIBS_X86_OR_X64 "arm")
@@ -108,6 +108,12 @@ if(STL_USE_ANALYZE)
     # LPARAM is a LONG_PTR (intptr_t), and it's invalid to apply _In_opt_ to a non-pointer.
     # As of the Windows 11 SDK (10.0.22621.0), there are 5 total occurrences of warning C6553 affecting the STL's build.
     add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:/analyze:autolog-;/wd6553>")
+
+    if(VCLIBS_TARGET_ARCHITECTURE STREQUAL "arm64ec")
+        # TRANSITION, the Windows SDK emits "warning C28301: No annotations for first declaration of 'meow'"
+        # for various intrinsics when building for ARM64EC.
+        add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:/wd28301>")
+    endif()
 endif()
 
 set(VCLIBS_DEBUG_OPTIONS "$<$<COMPILE_LANGUAGE:CXX>:/Od>")
diff --git a/azure-devops/asan-pipeline.yml b/azure-devops/asan-pipeline.yml
@@ -26,6 +26,7 @@ stages:
         parameters:
           hostArch: x64
           targetArch: x64
+          targetPlatform: x64
           asanBuild: true
           testTargets: STL-ASan-CI
 
@@ -40,6 +41,7 @@ stages:
         parameters:
           hostArch: x86
           targetArch: x86
+          targetPlatform: x86
           asanBuild: true
           testTargets: STL-ASan-CI
 
diff --git a/azure-devops/build-and-test.yml b/azure-devops/build-and-test.yml
@@ -6,6 +6,8 @@ parameters:
   type: string
 - name: targetArch
   type: string
+- name: targetPlatform
+  type: string
 - name: analyzeBuild
   type: boolean
   default: false
@@ -28,7 +30,7 @@ parameters:
   type: boolean
   default: false
 jobs:
-- job: '${{ parameters.targetArch }}'
+- job: '${{ parameters.targetPlatform }}'
   strategy:
     parallel: ${{ parameters.numShards }}
   timeoutInMinutes: 30
@@ -53,6 +55,7 @@ jobs:
     parameters:
       hostArch: ${{ parameters.hostArch }}
       targetArch: ${{ parameters.targetArch }}
+      targetPlatform: ${{ parameters.targetPlatform }}
       analyzeBuild: ${{ parameters.analyzeBuild }}
       asanBuild: ${{ parameters.asanBuild }}
       buildBenchmarks: ${{ parameters.buildBenchmarks }}
@@ -61,5 +64,6 @@ jobs:
     parameters:
       hostArch: ${{ parameters.hostArch }}
       targetArch: ${{ parameters.targetArch }}
+      targetPlatform: ${{ parameters.targetPlatform }}
       testTargets: ${{ parameters.testTargets }}
       skipTesting: ${{ parameters.skipTesting }}
diff --git a/azure-devops/cmake-configure-build.yml b/azure-devops/cmake-configure-build.yml
@@ -6,6 +6,8 @@ parameters:
   type: string
 - name: targetArch
   type: string
+- name: targetPlatform
+  type: string
 - name: analyzeBuild
   type: boolean
 - name: asanBuild
@@ -36,6 +38,7 @@ steps:
     -DSTL_USE_ANALYZE=${{ parameters.analyzeBuild }} ^
     -DSTL_ASAN_BUILD=${{ parameters.asanBuild }} ^
     -DTESTS_BUILD_ONLY=${{ parameters.testsBuildOnly }} ^
+    -DVCLIBS_TARGET_ARCHITECTURE=${{ parameters.targetPlatform }} ^
     -S $(Build.SourcesDirectory) -B "$(buildOutputLocation)"
   displayName: 'Configure the STL'
   timeoutInMinutes: 2
@@ -57,6 +60,7 @@ steps:
     -DCMAKE_CXX_COMPILER=cl ^
     -DCMAKE_BUILD_TYPE=Release ^
     -DSTL_BINARY_DIR="$(buildOutputLocation)" ^
+    -DVCLIBS_TARGET_ARCHITECTURE=${{ parameters.targetPlatform }} ^
     -S $(Build.SourcesDirectory)/benchmarks -B "$(benchmarkBuildOutputLocation)"
   displayName: 'Configure the benchmarks'
   timeoutInMinutes: 2
diff --git a/azure-devops/run-tests.yml b/azure-devops/run-tests.yml
@@ -6,6 +6,8 @@ parameters:
   type: string
 - name: targetArch
   type: string
+- name: targetPlatform
+  type: string
 - name: testTargets
   type: string
 - name: skipTesting
@@ -28,8 +30,8 @@ steps:
     searchFolder: $(buildOutputLocation)
     testResultsFormat: JUnit
     testResultsFiles: '**/test-results.xml'
-    testRunTitle: 'test-${{ parameters.targetArch }}-$(System.JobPositionInPhase)'
+    testRunTitle: 'test-${{ parameters.targetPlatform }}-$(System.JobPositionInPhase)'
 - publish: $(buildOutputLocation)/test-results.xml
-  artifact: '${{ parameters.targetArch }}-$(System.JobPositionInPhase)-xml-$(System.JobId)'
+  artifact: '${{ parameters.targetPlatform }}-$(System.JobPositionInPhase)-xml-$(System.JobId)'
   condition: and(failed(), not(${{ parameters.skipTesting }}))
   displayName: 'Publish XML Artifact'
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-# Build STL targeting x86, x64, arm, arm64
+# Build STL targeting x86, x64, arm, arm64, arm64ec
 
 variables:
   - template: azure-devops/config.yml
@@ -29,6 +29,7 @@ stages:
         parameters:
           hostArch: x64
           targetArch: x64
+          targetPlatform: x64
           analyzeBuild: true
           buildBenchmarks: true
           numShards: 1
@@ -45,6 +46,7 @@ stages:
         parameters:
           hostArch: x86
           targetArch: x86
+          targetPlatform: x86
           analyzeBuild: true
           buildBenchmarks: true
           numShards: 1
@@ -61,6 +63,7 @@ stages:
         parameters:
           hostArch: x64
           targetArch: arm
+          targetPlatform: arm
           analyzeBuild: true
           numShards: 1
           skipTesting: true
@@ -76,18 +79,36 @@ stages:
         parameters:
           hostArch: x64
           targetArch: arm64
+          targetPlatform: arm64
           analyzeBuild: true
           buildBenchmarks: true
           numShards: 1
           skipTesting: true
 
+  - stage: Early_Build_ARM64EC
+    dependsOn: []
+    displayName: 'Early Build ARM64EC'
+    pool:
+      name: ${{ variables.poolName }}
+      demands: ${{ variables.poolDemands }}
+    jobs:
+      - template: azure-devops/build-and-test.yml
+        parameters:
+          hostArch: x64
+          targetArch: arm64
+          targetPlatform: arm64ec
+          analyzeBuild: true
+          numShards: 1
+          skipTesting: true
+
   - stage: Build_And_Test_x64
     dependsOn:
       - Code_Format
       - Early_Build_x64
       - Early_Build_x86
       - Early_Build_ARM
       - Early_Build_ARM64
+      - Early_Build_ARM64EC
     displayName: 'Build and Test x64'
     pool:
       name: ${{ variables.poolName }}
@@ -97,6 +118,7 @@ stages:
         parameters:
           hostArch: x64
           targetArch: x64
+          targetPlatform: x64
 
   - stage: Build_And_Test_x86
     dependsOn: Build_And_Test_x64
@@ -109,6 +131,7 @@ stages:
         parameters:
           hostArch: x86
           targetArch: x86
+          targetPlatform: x86
 
   - stage: Build_And_Test_ARM
     dependsOn: Build_And_Test_x64
@@ -121,6 +144,7 @@ stages:
         parameters:
           hostArch: x64
           targetArch: arm
+          targetPlatform: arm
           testsBuildOnly: true
 
   - stage: Build_And_Test_ARM64
@@ -134,4 +158,5 @@ stages:
         parameters:
           hostArch: x64
           targetArch: arm64
+          targetPlatform: arm64
           testsBuildOnly: true
diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt
@@ -23,7 +23,7 @@ if(DEFINED STL_BINARY_DIR)
         set(VCLIBS_I386_OR_AMD64 "i386")
     elseif(VCLIBS_TARGET_ARCHITECTURE STREQUAL "x64")
         set(VCLIBS_I386_OR_AMD64 "amd64")
-    elseif(VCLIBS_TARGET_ARCHITECTURE STREQUAL "armv7")
+    elseif(VCLIBS_TARGET_ARCHITECTURE MATCHES "^(arm|armv7)$")
         set(VCLIBS_I386_OR_AMD64 "arm")
     elseif(VCLIBS_TARGET_ARCHITECTURE STREQUAL "arm64")
         set(VCLIBS_I386_OR_AMD64 "arm64")
diff --git a/stl/CMakeLists.txt b/stl/CMakeLists.txt
@@ -507,6 +507,9 @@ function(add_stl_dlls D_SUFFIX REL_OR_DBG)
 
     add_library(msvcp${D_SUFFIX} SHARED)
     target_link_libraries(msvcp${D_SUFFIX} PRIVATE msvcp${D_SUFFIX}_eha_objects msvcp${D_SUFFIX}_objects msvcp${D_SUFFIX}_init_objects "${TOOLSET_LIB}/vcruntime${D_SUFFIX}.lib" "${TOOLSET_LIB}/msvcrt${D_SUFFIX}.lib" "ucrt${D_SUFFIX}.lib")
+    if(VCLIBS_TARGET_ARCHITECTURE MATCHES "^(arm64|arm64ec)$")
+        target_link_libraries(msvcp${D_SUFFIX} PRIVATE "softintrin.lib")
+    endif()
     set_target_properties(msvcp${D_SUFFIX} PROPERTIES ARCHIVE_OUTPUT_NAME "msvcp140_base${D_SUFFIX}${VCLIBS_SUFFIX}")
     set_target_properties(msvcp${D_SUFFIX} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
     set_target_properties(msvcp${D_SUFFIX} PROPERTIES OUTPUT_NAME "msvcp140${D_SUFFIX}${VCLIBS_SUFFIX}")
