From 7ff339fd6eafd8f7c2787b1dd679674fed6e08e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Cincura=20=E2=86=B9?= Date: Mon, 7 Aug 2023 19:11:59 +0200 Subject: [PATCH 1/2] Put crossgen perf into "Ubuntu.1804.Amd64.Tiger.Perf". (#90091) * Because crossgen need LTTng and 22.04 is not compatible. * Windows using same queue. --- eng/pipelines/coreclr/perf.yml | 2 +- eng/testing/performance/performance-setup.ps1 | 7 ++++--- eng/testing/performance/performance-setup.sh | 2 ++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/coreclr/perf.yml b/eng/pipelines/coreclr/perf.yml index e073ca745eda08..68fc96f693e7c0 100644 --- a/eng/pipelines/coreclr/perf.yml +++ b/eng/pipelines/coreclr/perf.yml @@ -464,7 +464,7 @@ jobs: projectFile: crossgen_perf.proj runKind: crossgen_scenarios runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml - logicalmachine: 'perftiger' + logicalmachine: 'perftiger_crossgen' # run mono wasm blazor perf job - template: /eng/pipelines/common/platform-matrix.yml diff --git a/eng/testing/performance/performance-setup.ps1 b/eng/testing/performance/performance-setup.ps1 index ff6faa42e7ca1a..70464206302d09 100644 --- a/eng/testing/performance/performance-setup.ps1 +++ b/eng/testing/performance/performance-setup.ps1 @@ -44,9 +44,10 @@ $Queue = "" if ($Internal) { switch ($LogicalMachine) { - "perftiger" { $Queue = "Windows.10.Amd64.19H1.Tiger.Perf" } - "perfowl" { $Queue = "Windows.10.Amd64.20H2.Owl.Perf" } - "perfsurf" { $Queue = "Windows.10.Arm64.Perf.Surf" } + "perftiger" { $Queue = "Windows.10.Amd64.19H1.Tiger.Perf" } + "perftiger_crossgen" { $Queue = "Windows.10.Amd64.19H1.Tiger.Perf" } + "perfowl" { $Queue = "Windows.10.Amd64.20H2.Owl.Perf" } + "perfsurf" { $Queue = "Windows.10.Arm64.Perf.Surf" } "perfpixel4a" { $Queue = "Windows.10.Amd64.Pixel.Perf" } Default { $Queue = "Windows.10.Amd64.19H1.Tiger.Perf" } } diff --git a/eng/testing/performance/performance-setup.sh b/eng/testing/performance/performance-setup.sh index 3b0d50292cd828..08382a4953e84c 100755 --- a/eng/testing/performance/performance-setup.sh +++ b/eng/testing/performance/performance-setup.sh @@ -208,6 +208,8 @@ if [[ "$internal" == true ]]; then else if [[ "$logical_machine" = "perfowl" ]]; then queue=Ubuntu.1804.Amd64.Owl.Perf + elif [[ "$logical_machine" == "perftiger_crossgen" ]]; then + queue=Ubuntu.1804.Amd64.Tiger.Perf else queue=Ubuntu.1804.Amd64.Tiger.Perf fi From 99a93815f8d958cf39e081d585180602d331fe09 Mon Sep 17 00:00:00 2001 From: Drew Scoggins Date: Fri, 4 Aug 2023 02:35:11 -0700 Subject: [PATCH 2/2] Roll Ubuntu 18.04 queue to 22.04 (#89995) --- eng/testing/performance/performance-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/testing/performance/performance-setup.sh b/eng/testing/performance/performance-setup.sh index 08382a4953e84c..781b3f50d3bca3 100755 --- a/eng/testing/performance/performance-setup.sh +++ b/eng/testing/performance/performance-setup.sh @@ -211,7 +211,7 @@ if [[ "$internal" == true ]]; then elif [[ "$logical_machine" == "perftiger_crossgen" ]]; then queue=Ubuntu.1804.Amd64.Tiger.Perf else - queue=Ubuntu.1804.Amd64.Tiger.Perf + queue=Ubuntu.2204.Amd64.Tiger.Perf fi fi