From 215766145beae1b72a501aff7d2bc2b86c8b62c0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jiri=20Cincura=20=E2=86=B9?= Date: Tue, 6 Jun 2023 18:54:54 +0200 Subject: [PATCH] Cleanup scripts for PGO cleanup (dotnet/performance#3067). (#87163) --- eng/pipelines/coreclr/perf-non-wasm-jobs.yml | 38 +++------------------------ eng/pipelines/coreclr/perf_slow.yml | 8 +++--- eng/testing/performance/performance-setup.ps1 | 28 ++++---------------- eng/testing/performance/performance-setup.sh | 37 +++++--------------------- 4 files changed, 19 insertions(+), 92 deletions(-) diff --git a/eng/pipelines/coreclr/perf-non-wasm-jobs.yml b/eng/pipelines/coreclr/perf-non-wasm-jobs.yml index 89f2bda..3d943fc 100644 --- a/eng/pipelines/coreclr/perf-non-wasm-jobs.yml +++ b/eng/pipelines/coreclr/perf-non-wasm-jobs.yml @@ -322,7 +322,7 @@ jobs: runJobTemplate: /eng/pipelines/coreclr/templates/run-performance-job.yml logicalmachine: 'perftiger' - # run coreclr perftiger microbenchmarks pgo perf jobs + # run coreclr perftiger microbenchmarks no dynamic pgo perf jobs - template: /eng/pipelines/common/platform-matrix.yml parameters: jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml @@ -337,23 +337,7 @@ jobs: runKind: micro runJobTemplate: /eng/pipelines/coreclr/templates/run-performance-job.yml logicalmachine: 'perftiger' - pgoRunType: -NoPgo - - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml - buildConfig: release - runtimeFlavor: coreclr - platforms: - - windows_x64 - jobParameters: - testGroup: perf - liveLibrariesBuildConfig: Release - projectFile: microbenchmarks.proj - runKind: micro - runJobTemplate: /eng/pipelines/coreclr/templates/run-performance-job.yml - logicalmachine: 'perftiger' - pgoRunType: -DynamicPgo + pgoRunType: -NoDynamicPGO - template: /eng/pipelines/common/platform-matrix.yml parameters: @@ -369,23 +353,7 @@ jobs: runKind: micro runJobTemplate: /eng/pipelines/coreclr/templates/run-performance-job.yml logicalmachine: 'perftiger' - pgoRunType: --dynamicpgo - - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml - buildConfig: release - runtimeFlavor: coreclr - platforms: - - windows_x64 - jobParameters: - testGroup: perf - liveLibrariesBuildConfig: Release - projectFile: microbenchmarks.proj - runKind: micro - runJobTemplate: /eng/pipelines/coreclr/templates/run-performance-job.yml - logicalmachine: 'perftiger' - pgoRunType: -FullPgo + pgoRunType: --nodynamicpgo # run coreclr perfowl microbenchmarks perf job - template: /eng/pipelines/common/platform-matrix.yml diff --git a/eng/pipelines/coreclr/perf_slow.yml b/eng/pipelines/coreclr/perf_slow.yml index 1a12f56..ceb8496 100644 --- a/eng/pipelines/coreclr/perf_slow.yml +++ b/eng/pipelines/coreclr/perf_slow.yml @@ -189,7 +189,7 @@ extends: logicalmachine: 'perfampere' timeoutInMinutes: 780 - # run coreclr Linux arm64 ampere microbenchmarks perf job + # run coreclr Linux arm64 ampere no dynamic pgo microbenchmarks perf job - template: /eng/pipelines/common/platform-matrix.yml parameters: jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml @@ -205,7 +205,7 @@ extends: runJobTemplate: /eng/pipelines/coreclr/templates/run-performance-job.yml logicalmachine: 'perfampere' timeoutInMinutes: 780 - pgoRunType: --dynamicpgo + pgoRunType: --nodynamicpgo # run coreclr Windows arm64 microbenchmarks perf job - template: /eng/pipelines/common/platform-matrix.yml @@ -240,7 +240,7 @@ extends: logicalmachine: 'perfampere' timeoutInMinutes: 500 - # run coreclr Windows arm64 ampere dynamic Pgo microbenchmarks perf job + # run coreclr Windows arm64 ampere no dynamic pgo microbenchmarks perf job - template: /eng/pipelines/common/platform-matrix.yml parameters: jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml @@ -255,7 +255,7 @@ extends: runKind: micro runJobTemplate: /eng/pipelines/coreclr/templates/run-performance-job.yml logicalmachine: 'perfampere' - pgoRunType: -DynamicPgo + pgoRunType: -NoDynamicPGO timeoutInMinutes: 500 # run coreclr cloudvm microbenchmarks perf job diff --git a/eng/testing/performance/performance-setup.ps1 b/eng/testing/performance/performance-setup.ps1 index 86a0440..a826f39 100644 --- a/eng/testing/performance/performance-setup.ps1 +++ b/eng/testing/performance/performance-setup.ps1 @@ -23,9 +23,7 @@ Param( [switch] $AndroidMono, [switch] $iOSMono, [switch] $iOSNativeAOT, - [switch] $NoPGO, - [switch] $DynamicPGO, - [switch] $FullPGO, + [switch] $NoDynamicPGO, [switch] $iOSLlvmBuild, [switch] $iOSStripSymbols, [string] $MauiVersion, @@ -85,17 +83,9 @@ if($MonoDotnet -ne "") } } -if($NoPGO) +if($NoDynamicPGO) { - $Configurations += " PGOType=nopgo" -} -elseif($DynamicPGO) -{ - $Configurations += " PGOType=dynamicpgo" -} -elseif($FullPGO) -{ - $Configurations += " PGOType=fullpgo" + $Configurations += " PGOType=nodynamicpgo" } if ($iOSMono) { @@ -116,17 +106,9 @@ if($Branch.Contains("refs/heads/release")) $CommonSetupArguments="--channel $CleanedBranchName --queue $Queue --build-number $BuildNumber --build-configs $Configurations --architecture $Architecture" $SetupArguments = "--repository https://github.com/$Repository --branch $Branch --get-perf-hash --commit-sha $CommitSha $CommonSetupArguments" -if($NoPGO) -{ - $SetupArguments = "$SetupArguments --no-pgo" -} -elseif($DynamicPGO) -{ - $SetupArguments = "$SetupArguments --dynamic-pgo" -} -elseif($FullPGO) +if($NoDynamicPGO) { - $SetupArguments = "$SetupArguments --full-pgo" + $SetupArguments = "$SetupArguments --no-dynamic-pgo" } if($UseLocalCommitTime) diff --git a/eng/testing/performance/performance-setup.sh b/eng/testing/performance/performance-setup.sh index a075771..38fbbc1 100755 --- a/eng/testing/performance/performance-setup.sh +++ b/eng/testing/performance/performance-setup.sh @@ -142,16 +142,8 @@ while (($# > 0)); do wasmaot=true shift 1 ;; - --nopgo) - nopgo=true - shift 1 - ;; - --dynamicpgo) - dynamicpgo=true - shift 1 - ;; - --fullpgo) - fullpgo=true + --nodynamicpgo) + nodynamicpgo=true shift 1 ;; --compare) @@ -238,9 +230,7 @@ while (($# > 0)); do echo " --iosstripsymbols Set STRIP_DEBUG_SYMBOLS for iOS Mono/Maui runs" echo " --mauiversion Set the maui version for Mono/Maui runs" echo " --uselocalcommittime Pass local runtime commit time to the setup script" - echo " --nopgo Set for No PGO runs" - echo " --dynamicpgo Set for dynamic PGO runs" - echo " --fullpgo Set for Full PGO runs" + echo " --nodynamicpgo Set for No dynamic PGO runs" echo "" exit 1 ;; @@ -353,18 +343,11 @@ if [[ "$iosnativeaot" == "true" ]]; then extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments" fi -if [[ "$nopgo" == "true" ]]; then - configurations="$configurations PGOType=nopgo" +if [[ "$nodynamicpgo" == "true" ]]; then + configurations="$configurations PGOType=nodynamicpgo" fi -if [[ "$dynamicpgo" == "true" ]]; then - configurations="$configurations PGOType=dynamicpgo" -fi -if [[ "$fullpgo" == "true" ]]; then - configurations="$configurations PGOType=fullpgo" - extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoAOT" -fi cleaned_branch_name="main" if [[ $branch == *"refs/heads/release"* ]]; then @@ -428,14 +411,8 @@ if [[ -n "$dotnet_versions" ]]; then setup_arguments="$setup_arguments --dotnet-versions $dotnet_versions" fi -if [[ "$nopgo" == "true" ]]; then - setup_arguments="$setup_arguments --no-pgo" -fi -if [[ "$dynamicpgo" == "true" ]]; then - setup_arguments="$setup_arguments --dynamic-pgo" -fi -if [[ "$fullpgo" == "true" ]]; then - setup_arguments="$setup_arguments --full-pgo" +if [[ "$nodynamicpgo" == "true" ]]; then + setup_arguments="$setup_arguments --no-dynamic-pgo" fi if [[ "$monoaot" == "true" ]]; then -- 2.7.4