Skip to content

Commit 0e6e35f

Browse files
cincuranetcincuranet
authored
Proper ordering of run configs (matches dotnet/performance side). (dotnet#94661)
1 parent b1d6cd8 commit 0e6e35f

4 files changed

Lines changed: 30 additions & 30 deletions

File tree

‎eng/pipelines/coreclr/templates/perf-job.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ parameters:
1717
additionalSetupParameters: ''
1818
logicalMachine: ''
1919
pgoRunType: ''
20-
r2rRunType: ''
2120
physicalPromotionRunType: ''
21+
r2rRunType: ''
2222
javascriptEngine: 'NoJS'
2323
iOSLlvmBuild: 'False'
2424
iOSStripSymbols: 'False'
@@ -41,8 +41,8 @@ jobs:
4141
- template: ${{ parameters.runJobTemplate }}
4242
parameters:
4343
# Compute job name from template parameters
44-
jobName: ${{ format('perfbuild_{0}{1}_{2}_{3}_{4}_{5}_{6}_{7}_{8}_{9}_{10}_{11}_{12}_{13}_{14}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig, parameters.runtimeType, parameters.codeGenType, parameters.runKind, parameters.logicalMachine, parameters.javascriptEngine, parameters.pgoRunType, parameters.r2rRunType, parameters.physicalPromotionRunType, parameters.iosLlvmBuild, parameters.iosStripSymbols, parameters.hybridGlobalization) }}
45-
displayName: ${{ format('Performance {0}{1} {2} {3} {4} {5} {6} {7} {8} {9} {10} {11} {12} {13} {14}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig, parameters.runtimeType, parameters.codeGenType, parameters.runKind, parameters.logicalMachine, parameters.javascriptEngine, parameters.pgoRunType, parameters.r2rRunType, parameters.physicalPromotionRunType, parameters.iosLlvmBuild, parameters.iosStripSymbols, parameters.hybridGlobalization) }}
44+
jobName: ${{ format('perfbuild_{0}{1}_{2}_{3}_{4}_{5}_{6}_{7}_{8}_{9}_{10}_{11}_{12}_{13}_{14}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig, parameters.runtimeType, parameters.codeGenType, parameters.runKind, parameters.logicalMachine, parameters.javascriptEngine, parameters.pgoRunType, parameters.physicalPromotionRunType, parameters.r2rRunType, parameters.iosLlvmBuild, parameters.iosStripSymbols, parameters.hybridGlobalization) }}
45+
displayName: ${{ format('Performance {0}{1} {2} {3} {4} {5} {6} {7} {8} {9} {10} {11} {12} {13} {14}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig, parameters.runtimeType, parameters.codeGenType, parameters.runKind, parameters.logicalMachine, parameters.javascriptEngine, parameters.pgoRunType, parameters.physicalPromotionRunType, parameters.r2rRunType, parameters.iosLlvmBuild, parameters.iosStripSymbols, parameters.hybridGlobalization) }}
4646
pool: ${{ parameters.pool }}
4747
buildConfig: ${{ parameters.buildConfig }}
4848
archType: ${{ parameters.archType }}
@@ -58,8 +58,8 @@ jobs:
5858
container: ${{ parameters.container }}
5959
logicalmachine: ${{ parameters.logicalmachine }}
6060
pgoRunType: ${{ parameters.pgoRunType }}
61-
r2rRunType: ${{ parameters.r2rRunType }}
6261
physicalPromotionRunType: ${{ parameters.physicalPromotionRunType }}
62+
r2rRunType: ${{ parameters.r2rRunType }}
6363
javascriptEngine: ${{ parameters.javascriptEngine }}
6464
iosLlvmBuild: ${{ parameters.iosLlvmBuild }}
6565
iosStripSymbols: ${{ parameters.iosStripSymbols }}

‎eng/pipelines/coreclr/templates/run-performance-job.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ parameters:
1717
enableTelemetry: false # optional -- enable for telemetry
1818
liveLibrariesBuildConfig: '' # optional -- live-live libraries configuration to use for the run
1919
pgoRunType: '' # optional -- different PGO configurations
20-
r2rRunType: '' # optional -- different R2R configurations
2120
physicalPromotionRunType: '' # optional -- different physical promotion configurations
21+
r2rRunType: '' # optional -- different R2R configurations
2222
runtimeType: 'coreclr' # optional -- Sets the runtime as coreclr or mono
2323
codeGenType: 'JIT' # optional -- Decides on the codegen technology if running on mono
2424
projectFile: 'microbenchmarks.proj' # optional -- project file to build helix workitems
@@ -165,11 +165,11 @@ jobs:
165165
_Framework: ${{ framework }}
166166
steps:
167167
- ${{ parameters.steps }}
168-
- powershell: $(Build.SourcesDirectory)\eng\testing\performance\performance-setup.ps1 $(IsInternal)$(Interpreter) -Framework $(_Framework) -Kind ${{ parameters.runKind }} -LogicalMachine ${{ parameters.logicalMachine }} ${{ parameters.pgoRunType }} ${{ parameters.r2rRunType }} ${{ parameters.physicalPromotionRunType }} -UseLocalCommitTime ${{ parameters.extraSetupParameters }}
168+
- powershell: $(Build.SourcesDirectory)\eng\testing\performance\performance-setup.ps1 $(IsInternal)$(Interpreter) -Framework $(_Framework) -Kind ${{ parameters.runKind }} -LogicalMachine ${{ parameters.logicalMachine }} ${{ parameters.pgoRunType }} ${{ parameters.physicalPromotionRunType }} ${{ parameters.r2rRunType }} -UseLocalCommitTime ${{ parameters.extraSetupParameters }}
169169
displayName: Performance Setup (Windows)
170170
condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'))
171171
continueOnError: ${{ parameters.continueOnError }}
172-
- script: $(Build.SourcesDirectory)/eng/testing/performance/performance-setup.sh $(IsInternal)$(Interpreter) --framework $(_Framework) --kind ${{ parameters.runKind }} --logicalmachine ${{ parameters.logicalMachine }} ${{ parameters.pgoRunType }} ${{ parameters.r2rRunType }} ${{ parameters.physicalPromotionRunType }} --uselocalcommittime ${{ parameters.extraSetupParameters }}
172+
- script: $(Build.SourcesDirectory)/eng/testing/performance/performance-setup.sh $(IsInternal)$(Interpreter) --framework $(_Framework) --kind ${{ parameters.runKind }} --logicalmachine ${{ parameters.logicalMachine }} ${{ parameters.pgoRunType }} ${{ parameters.physicalPromotionRunType }} ${{ parameters.r2rRunType }} --uselocalcommittime ${{ parameters.extraSetupParameters }}
173173
displayName: Performance Setup (Unix)
174174
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
175175
continueOnError: ${{ parameters.continueOnError }}
@@ -194,6 +194,6 @@ jobs:
194194
displayName: Publish Logs
195195
inputs:
196196
targetPath: $(Build.SourcesDirectory)/artifacts/log
197-
artifactName: 'Performance_Run_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_${{ parameters.runtimeType }}_${{ parameters.codeGenType }}_${{ parameters.runKind }}_${{ parameters.logicalMachine }}_${{ parameters.javascriptEngine }}_${{ parameters.pgoRunType }}_${{ parameters.r2rRunType }}_${{ parameters.physicalPromotionRunType }}'
197+
artifactName: 'Performance_Run_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_${{ parameters.runtimeType }}_${{ parameters.codeGenType }}_${{ parameters.runKind }}_${{ parameters.logicalMachine }}_${{ parameters.javascriptEngine }}_${{ parameters.pgoRunType }}_${{ parameters.physicalPromotionRunType }}_${{ parameters.r2rRunType }}'
198198
continueOnError: true
199199
condition: always()

‎eng/testing/performance/performance-setup.ps1‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ Param(
2424
[switch] $iOSMono,
2525
[switch] $iOSNativeAOT,
2626
[switch] $NoDynamicPGO,
27-
[switch] $NoR2R,
2827
[switch] $PhysicalPromotion,
28+
[switch] $NoR2R,
2929
[switch] $iOSLlvmBuild,
3030
[switch] $iOSStripSymbols,
3131
[switch] $HybridGlobalization,
@@ -89,14 +89,14 @@ if ($NoDynamicPGO) {
8989
$Configurations += " PGOType=nodynamicpgo"
9090
}
9191

92-
if ($NoR2R) {
93-
$Configurations += " R2RType=nor2r"
94-
}
95-
9692
if ($PhysicalPromotion) {
9793
$Configurations += " PhysicalPromotionType=physicalpromotion"
9894
}
9995

96+
if ($NoR2R) {
97+
$Configurations += " R2RType=nor2r"
98+
}
99+
100100
if ($iOSMono) {
101101
$Configurations += " iOSLlvmBuild=$iOSLlvmBuild"
102102
$Configurations += " iOSStripSymbols=$iOSStripSymbols"
@@ -123,14 +123,14 @@ if ($NoDynamicPGO) {
123123
$SetupArguments = "$SetupArguments --no-dynamic-pgo"
124124
}
125125

126-
if ($NoR2R) {
127-
$SetupArguments = "$SetupArguments --no-r2r"
128-
}
129-
130126
if ($PhysicalPromotion) {
131127
$SetupArguments = "$SetupArguments --physical-promotion"
132128
}
133129

130+
if ($NoR2R) {
131+
$SetupArguments = "$SetupArguments --no-r2r"
132+
}
133+
134134
if ($UseLocalCommitTime) {
135135
$LocalCommitTime = (git show -s --format=%ci $CommitSha)
136136
$SetupArguments = "$SetupArguments --commit-time `"$LocalCommitTime`""

‎eng/testing/performance/performance-setup.sh‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -153,14 +153,14 @@ while (($# > 0)); do
153153
nodynamicpgo=true
154154
shift 1
155155
;;
156-
--nor2r)
157-
nor2r=true
158-
shift 1
159-
;;
160156
--physicalpromotion)
161157
physicalpromotion=true
162158
shift 1
163159
;;
160+
--nor2r)
161+
nor2r=true
162+
shift 1
163+
;;
164164
--compare)
165165
compare=true
166166
shift 1
@@ -252,8 +252,8 @@ while (($# > 0)); do
252252
echo " --mauiversion Set the maui version for Mono/Maui runs"
253253
echo " --uselocalcommittime Pass local runtime commit time to the setup script"
254254
echo " --nodynamicpgo Set for No dynamic PGO runs"
255-
echo " --nor2r Set for No R2R runs"
256255
echo " --physicalpromotion Set for runs with physical promotion"
256+
echo " --nor2r Set for No R2R runs"
257257
echo ""
258258
exit 1
259259
;;
@@ -372,14 +372,14 @@ if [[ "$nodynamicpgo" == "true" ]]; then
372372
configurations="$configurations PGOType=nodynamicpgo"
373373
fi
374374

375-
if [[ "$nor2r" == "true" ]]; then
376-
configurations="$configurations R2RType=nor2r"
377-
fi
378-
379375
if [[ "$physicalpromotion" == "true" ]]; then
380376
configurations="$configurations PhysicalPromotionType=physicalpromotion"
381377
fi
382378

379+
if [[ "$nor2r" == "true" ]]; then
380+
configurations="$configurations R2RType=nor2r"
381+
fi
382+
383383
if [[ "$(echo "$hybridglobalization" | tr '[:upper:]' '[:lower:]')" == "true" ]]; then # convert to lowercase to test
384384
configurations="$configurations HybridGlobalization=True" # Force True for consistency
385385
fi
@@ -471,14 +471,14 @@ if [[ "$nodynamicpgo" == "true" ]]; then
471471
setup_arguments="$setup_arguments --no-dynamic-pgo"
472472
fi
473473

474-
if [[ "$nor2r" == "true" ]]; then
475-
setup_arguments="$setup_arguments --no-r2r"
476-
fi
477-
478474
if [[ "$physicalpromotion" == "true" ]]; then
479475
setup_arguments="$setup_arguments --physical-promotion"
480476
fi
481477

478+
if [[ "$nor2r" == "true" ]]; then
479+
setup_arguments="$setup_arguments --no-r2r"
480+
fi
481+
482482
if [[ "$monoaot" == "true" ]]; then
483483
monoaot_dotnet_path=$payload_directory/monoaot
484484
mv $monoaot_path $monoaot_dotnet_path

0 commit comments

Comments
 (0)