From f796a43599a55142ba80aa47cc331aa961cded2e Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Fri, 22 Jul 2022 11:49:57 -0700 Subject: [PATCH] Add category exclusion so that NoAOT can be kept for centos AOT runs. --- azure-pipelines.yml | 1 + eng/performance/benchmark_jobs.yml | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 88cb2944953..6ef3829a50f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -250,6 +250,7 @@ jobs: container: centos_x64_build_container csproj: src/benchmarks/micro/MicroBenchmarks.csproj runCategories: 'runtime libraries' + excludedCategories: 'NoAOT' channels: - nativeaot7.0 diff --git a/eng/performance/benchmark_jobs.yml b/eng/performance/benchmark_jobs.yml index ba04a30034b..c2f0dc26c01 100644 --- a/eng/performance/benchmark_jobs.yml +++ b/eng/performance/benchmark_jobs.yml @@ -9,6 +9,7 @@ parameters: csproj: '' # required -- relative path to csproj with benchmarks channels: [] # required -- list of channels to download .NET from runCategories: '' # required -- string of space separated categories supplied to benchmark dotnet + excludedCategories: '' # optional -- string of space separated categories to supply to benchmark dotnet for exclusion machinePool: '' # required -- Name of perf machine pool (Tiger, Owl, etc) jobs: @@ -72,7 +73,7 @@ jobs: value: dotnet-performance # for public runs we want to run the benchmarks exactly once, no warmup, no pilot, no overhead - name: BenchmarkDotNetArguments - value: '--anyCategories ${{ parameters.runCategories }} --iterationCount 1 --warmupCount 0 --invocationCount 1 --unrollFactor 1 --strategy ColdStart --stopOnFirstError true' + value: '--anyCategories ${{ parameters.runCategories }} --category-exclusion-filter ${{ parameters.excludedCategories }} --iterationCount 1 --warmupCount 0 --invocationCount 1 --unrollFactor 1 --strategy ColdStart --stopOnFirstError true' - name: HelixApiAccessToken value: '' - name: HelixPreCommand @@ -85,7 +86,7 @@ jobs: value: '--upload-to-perflab-container' # for private runs we don't provide any custom BDN arguments (the ones from Program.Main are used) - name: BenchmarkDotNetArguments - value: '--anyCategories ${{ parameters.runCategories }}' + value: '--anyCategories ${{ parameters.runCategories }} --category-exclusion-filter ${{ parameters.excludedCategories }}' - name: Creator value: '' - name: HelixSourcePrefix