diff --git a/eng/pipelines/runtime-perf-jobs.yml b/eng/pipelines/runtime-perf-jobs.yml index ed1a98b5ef1..e11969d2394 100644 --- a/eng/pipelines/runtime-perf-jobs.yml +++ b/eng/pipelines/runtime-perf-jobs.yml @@ -111,6 +111,25 @@ jobs: ${{ each parameter in parameters.jobParameters }}: ${{ parameter.key }}: ${{ parameter.value }} + - template: /eng/pipelines/common/platform-matrix.yml@${{ parameters.runtimeRepoAlias }} + parameters: + jobTemplate: /eng/pipelines/templates/runtime-perf-job.yml@${{ parameters.performanceRepoAlias }} + buildConfig: release + runtimeFlavor: coreclr + platforms: + - windows_x64 + jobParameters: + runtimeType: AndroidCoreCLR + codeGenType: JIT + projectFile: $(Build.SourcesDirectory)/eng/testing/performance/android_scenarios.proj + runKind: android_scenarios + isScenario: true + logicalMachine: 'perfpixel10a' + runtimeRepoAlias: ${{ parameters.runtimeRepoAlias }} + performanceRepoAlias: ${{ parameters.performanceRepoAlias }} + ${{ each parameter in parameters.jobParameters }}: + ${{ parameter.key }}: ${{ parameter.value }} + - template: /eng/pipelines/common/platform-matrix.yml@${{ parameters.runtimeRepoAlias }} parameters: jobTemplate: /eng/pipelines/templates/runtime-perf-job.yml@${{ parameters.performanceRepoAlias }} @@ -131,6 +150,26 @@ jobs: ${{ each parameter in parameters.jobParameters }}: ${{ parameter.key }}: ${{ parameter.value }} + - template: /eng/pipelines/common/platform-matrix.yml@${{ parameters.runtimeRepoAlias }} + parameters: + jobTemplate: /eng/pipelines/templates/runtime-perf-job.yml@${{ parameters.performanceRepoAlias }} + buildConfig: release + runtimeFlavor: coreclr + platforms: + - windows_x64 + jobParameters: + runtimeType: AndroidCoreCLR + codeGenType: JIT + linkingType: static + projectFile: $(Build.SourcesDirectory)/eng/testing/performance/android_scenarios.proj + runKind: android_scenarios + isScenario: true + logicalMachine: 'perfpixel10a' + runtimeRepoAlias: ${{ parameters.runtimeRepoAlias }} + performanceRepoAlias: ${{ parameters.performanceRepoAlias }} + ${{ each parameter in parameters.jobParameters }}: + ${{ parameter.key }}: ${{ parameter.value }} + # Android CoreCLR R2R — controlled by androidCoreclrR2r toggle - ${{ if eq(parameters.androidCoreclrR2r.enabled, true) }}: - template: /eng/pipelines/common/platform-matrix.yml@${{ parameters.runtimeRepoAlias }} @@ -152,6 +191,25 @@ jobs: ${{ each parameter in parameters.jobParameters }}: ${{ parameter.key }}: ${{ parameter.value }} + - template: /eng/pipelines/common/platform-matrix.yml@${{ parameters.runtimeRepoAlias }} + parameters: + jobTemplate: /eng/pipelines/templates/runtime-perf-job.yml@${{ parameters.performanceRepoAlias }} + buildConfig: release + runtimeFlavor: coreclr + platforms: + - windows_x64 + jobParameters: + runtimeType: AndroidCoreCLR + codeGenType: R2R + projectFile: $(Build.SourcesDirectory)/eng/testing/performance/android_scenarios.proj + runKind: android_scenarios + isScenario: true + logicalMachine: 'perfpixel10a' + runtimeRepoAlias: ${{ parameters.runtimeRepoAlias }} + performanceRepoAlias: ${{ parameters.performanceRepoAlias }} + ${{ each parameter in parameters.jobParameters }}: + ${{ parameter.key }}: ${{ parameter.value }} + # Mono microbenchmarks — controlled by monoMicro toggle - ${{ if eq(parameters.monoMicro.enabled, true) }}: - template: /eng/pipelines/common/platform-matrix.yml@${{ parameters.runtimeRepoAlias }} diff --git a/eng/pipelines/sdk-perf-jobs.yml b/eng/pipelines/sdk-perf-jobs.yml index d3fb0d8bb9d..8e3878517b2 100644 --- a/eng/pipelines/sdk-perf-jobs.yml +++ b/eng/pipelines/sdk-perf-jobs.yml @@ -413,6 +413,7 @@ jobs: jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml buildMachines: - win-x64-android-arm64-pixel + - win-x64-android-arm64-pixel10a - win-x64-android-arm64-galaxy isPublic: false jobParameters: @@ -433,6 +434,7 @@ jobs: jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml buildMachines: - win-x64-android-arm64-pixel + - win-x64-android-arm64-pixel10a - win-x64-android-arm64-galaxy isPublic: false jobParameters: @@ -455,6 +457,7 @@ jobs: jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml buildMachines: - win-x64-android-arm64-pixel + - win-x64-android-arm64-pixel10a - win-x64-android-arm64-galaxy isPublic: false jobParameters: @@ -475,6 +478,7 @@ jobs: jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml buildMachines: - win-x64-android-arm64-pixel + - win-x64-android-arm64-pixel10a - win-x64-android-arm64-galaxy isPublic: false jobParameters: @@ -496,6 +500,7 @@ jobs: jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml buildMachines: - win-x64-android-arm64-pixel + - win-x64-android-arm64-pixel10a - win-x64-android-arm64-galaxy isPublic: false jobParameters: @@ -595,6 +600,7 @@ jobs: jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml buildMachines: - win-x64-android-arm64-pixel + - win-x64-android-arm64-pixel10a - win-x64-android-arm64-galaxy isPublic: false jobParameters: @@ -615,6 +621,7 @@ jobs: jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml buildMachines: - win-x64-android-arm64-pixel + - win-x64-android-arm64-pixel10a - win-x64-android-arm64-galaxy isPublic: false jobParameters: diff --git a/eng/pipelines/templates/build-machine-matrix.yml b/eng/pipelines/templates/build-machine-matrix.yml index 232b94adf33..f1931c950ee 100644 --- a/eng/pipelines/templates/build-machine-matrix.yml +++ b/eng/pipelines/templates/build-machine-matrix.yml @@ -134,6 +134,18 @@ jobs: machinePool: Pixel8 ${{ insert }}: ${{ parameters.jobParameters }} +- ${{ if and(containsValue(parameters.buildMachines, 'win-x64-android-arm64-pixel10a'), not(eq(parameters.isPublic, true))) }}: # Windows ARM64 Pixel 10a only used in private builds currently + - template: ${{ parameters.jobTemplate }} + parameters: + osGroup: windows + archType: x64 + osVersion: 22H2 + pool: + vmImage: 'windows-2022' + queue: Windows.11.Amd64.Pixel.10.Perf + machinePool: Pixel10a + ${{ insert }}: ${{ parameters.jobParameters }} + - ${{ if and(containsValue(parameters.buildMachines, 'win-x64-android-arm64-galaxy'), not(eq(parameters.isPublic, true))) }}: # Windows ARM64 Galaxy only used in private builds currently - template: ${{ parameters.jobTemplate }} parameters: diff --git a/helix.yml b/helix.yml index ee663f904f1..c0c032d7a7a 100644 --- a/helix.yml +++ b/helix.yml @@ -98,6 +98,13 @@ profiles: variables: osGroup: windows queue: Windows.11.Amd64.Pixel.Perf + + win-x64-android-arm64-pixel10a: + jobs: + benchmark: + variables: + osGroup: windows + queue: Windows.11.Amd64.Pixel.10.Perf win-x64-android-arm64-galaxy: jobs: diff --git a/scripts/run_performance_job.py b/scripts/run_performance_job.py index 2f3aefc0161..3543dfc216b 100644 --- a/scripts/run_performance_job.py +++ b/scripts/run_performance_job.py @@ -438,6 +438,7 @@ def logical_machine_to_queue(logical_machine: str, internal: bool, os_group: str "perftiger": "Windows.11.Amd64.Tiger.Perf", "perftiger_crossgen": "Windows.11.Amd64.Tiger.Perf", "perfpixel4a": "Windows.11.Amd64.Pixel.Perf", + "perfpixel10a": "Windows.11.Amd64.Pixel.10.Perf", "perfampere": "Windows.Server.Arm64.Perf", "perfviper": "Windows.11.Amd64.Viper.Perf", "cloudvm": "Windows.10.Amd64" @@ -1146,6 +1147,7 @@ def run_performance_job(args: RunPerformanceJobArgs): # Set device name from machine pool for mobile queues if args.machine_pool and args.queue and args.queue in ( "Windows.11.Amd64.Pixel.Perf", + "Windows.11.Amd64.Pixel.10.Perf", "Windows.11.Amd64.Galaxy.Lowend.Perf", "Mac.iPhone.17.Perf", ):