Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions eng/testing/performance/performance-setup.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Param(
[string] $Kind="micro",
[switch] $LLVM,
[switch] $MonoInterpreter,
[switch] $MonoAOT,
[switch] $MonoAOT,
[switch] $Internal,
[switch] $Compare,
[string] $MonoDotnet="",
Expand Down Expand Up @@ -47,14 +47,14 @@ $Queue = ""

if ($Internal) {
switch ($LogicalMachine) {
"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" }
"perftiger" { $Queue = "Windows.11.Amd64.Tiger.Perf" }
"perftiger_crossgen" { $Queue = "Windows.11.Amd64.Tiger.Perf" }
"perfowl" { $Queue = "Windows.11.Amd64.Owl.Perf" }
"perfsurf" { $Queue = "Windows.11.Arm64.Surf.Perf" }
"perfpixel4a" { $Queue = "Windows.11.Amd64.Pixel.Perf" }
"perfampere" { $Queue = "Windows.Server.Arm64.Perf" }
"cloudvm" { $Queue = "Windows.10.Amd64" }
Default { $Queue = "Windows.10.Amd64.19H1.Tiger.Perf" }
Default { $Queue = "Windows.11.Amd64.Tiger.Perf" }
}
$PerfLabArguments = "--upload-to-perflab-container"
$ExtraBenchmarkDotNetArguments = ""
Expand Down Expand Up @@ -124,7 +124,7 @@ if ($UseLocalCommitTime) {

if ($RunFromPerformanceRepo) {
$SetupArguments = "--perf-hash $CommitSha $CommonSetupArguments"

robocopy $SourceDirectory $PerformanceDirectory /E /XD $PayloadDirectory $SourceDirectory\artifacts $SourceDirectory\.git
}
else {
Expand Down
12 changes: 7 additions & 5 deletions eng/testing/performance/performance-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ benchmark_directory=$payload_directory/BenchmarkDotNet
workitem_directory=$source_directory/workitem
extra_benchmark_dotnet_arguments="--iterationCount 1 --warmupCount 0 --invocationCount 1 --unrollFactor 1 --strategy ColdStart --stopOnFirstError true"
perflab_arguments=
queue=Ubuntu.1804.Amd64.Open
queue=Ubuntu.2204.Amd64.Open
creator=$BUILD_DEFINITIONNAME
helix_source_prefix="pr"

Expand All @@ -277,14 +277,16 @@ if [[ "$internal" == true ]]; then
if [[ "$logical_machine" == "perfiphone12mini" ]]; then
queue=OSX.13.Amd64.Iphone.Perf
elif [[ "$logical_machine" == "perfampere" ]]; then
queue=Ubuntu.2004.Arm64.Perf
queue=Ubuntu.2204.Arm64.Perf
elif [[ "$logical_machine" == "perfviper" ]]; then
queue=Ubuntu.2204.Amd64.Viper.Perf
elif [[ "$logical_machine" == "cloudvm" ]]; then
queue=Ubuntu.1804.Amd64
queue=Ubuntu.2204.Amd64
elif [[ "$architecture" == "arm64" ]]; then
queue=Ubuntu.1804.Arm64.Perf
else
if [[ "$logical_machine" == "perfowl" ]]; then
queue=Ubuntu.1804.Amd64.Owl.Perf
queue=Ubuntu.2204.Amd64.Owl.Perf
elif [[ "$logical_machine" == "perftiger_crossgen" ]]; then
queue=Ubuntu.1804.Amd64.Tiger.Perf
else
Expand All @@ -299,7 +301,7 @@ else
if [[ "$architecture" == "arm64" ]]; then
queue=ubuntu.1804.armarch.open
else
queue=Ubuntu.1804.Amd64.Open
queue=Ubuntu.2204.Amd64.Open
fi

if [[ "$alpine" == "true" ]]; then
Expand Down