Proper ordering of run configs (matches dotnet/performance side). (do…

…tnet#94661)
eiriktsarpalis · Nov 13, 2023 · 0e6e35f · 0e6e35f
1 parent b1d6cd8
commit 0e6e35f
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 30 deletions.
diff --git a/eng/pipelines/coreclr/templates/perf-job.yml b/eng/pipelines/coreclr/templates/perf-job.yml
@@ -17,8 +17,8 @@ parameters:
   additionalSetupParameters: ''
   logicalMachine: ''
   pgoRunType: ''
-  r2rRunType: ''
   physicalPromotionRunType: ''
+  r2rRunType: ''
   javascriptEngine: 'NoJS'
   iOSLlvmBuild: 'False'
   iOSStripSymbols: 'False'
@@ -41,8 +41,8 @@ jobs:
 - template: ${{ parameters.runJobTemplate }}
   parameters:
     # Compute job name from template parameters
-    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) }}
-    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) }}
+    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) }}
+    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) }}
     pool: ${{ parameters.pool }}
     buildConfig: ${{ parameters.buildConfig }}
     archType: ${{ parameters.archType }}
@@ -58,8 +58,8 @@ jobs:
     container: ${{ parameters.container }}
     logicalmachine: ${{ parameters.logicalmachine }}
     pgoRunType: ${{ parameters.pgoRunType }}
-    r2rRunType: ${{ parameters.r2rRunType }}
     physicalPromotionRunType: ${{ parameters.physicalPromotionRunType }}
+    r2rRunType: ${{ parameters.r2rRunType }}
     javascriptEngine: ${{ parameters.javascriptEngine }}
     iosLlvmBuild: ${{ parameters.iosLlvmBuild }}
     iosStripSymbols: ${{ parameters.iosStripSymbols }}

diff --git a/eng/pipelines/coreclr/templates/run-performance-job.yml b/eng/pipelines/coreclr/templates/run-performance-job.yml
@@ -17,8 +17,8 @@ parameters:
   enableTelemetry: false          # optional -- enable for telemetry
   liveLibrariesBuildConfig: ''    # optional -- live-live libraries configuration to use for the run
   pgoRunType: ''                  # optional -- different PGO configurations
-  r2rRunType: ''                  # optional -- different R2R configurations
   physicalPromotionRunType: ''    # optional -- different physical promotion configurations
+  r2rRunType: ''                  # optional -- different R2R configurations
   runtimeType: 'coreclr'          # optional -- Sets the runtime as coreclr or mono
   codeGenType: 'JIT'              # optional -- Decides on the codegen technology if running on mono
   projectFile: 'microbenchmarks.proj'   # optional -- project file to build helix workitems
@@ -165,11 +165,11 @@ jobs:
             _Framework: ${{ framework }}
     steps:
     - ${{ parameters.steps }}
-    - 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 }}
+    - 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 }}
       displayName: Performance Setup (Windows)
       condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'))
       continueOnError: ${{ parameters.continueOnError }}
-    - 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 }}
+    - 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 }}
       displayName: Performance Setup (Unix)
       condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
       continueOnError: ${{ parameters.continueOnError }}
@@ -194,6 +194,6 @@ jobs:
       displayName: Publish Logs
       inputs:
         targetPath: $(Build.SourcesDirectory)/artifacts/log
-        artifactName: 'Performance_Run_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_${{ parameters.runtimeType }}_${{ parameters.codeGenType }}_${{ parameters.runKind }}_${{ parameters.logicalMachine }}_${{ parameters.javascriptEngine }}_${{ parameters.pgoRunType }}_${{ parameters.r2rRunType }}_${{ parameters.physicalPromotionRunType }}'
+        artifactName: 'Performance_Run_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_${{ parameters.runtimeType }}_${{ parameters.codeGenType }}_${{ parameters.runKind }}_${{ parameters.logicalMachine }}_${{ parameters.javascriptEngine }}_${{ parameters.pgoRunType }}_${{ parameters.physicalPromotionRunType }}_${{ parameters.r2rRunType }}'
       continueOnError: true
       condition: always()
diff --git a/eng/testing/performance/performance-setup.ps1 b/eng/testing/performance/performance-setup.ps1
@@ -24,8 +24,8 @@ Param(
     [switch] $iOSMono,
     [switch] $iOSNativeAOT,
     [switch] $NoDynamicPGO,
-    [switch] $NoR2R,
     [switch] $PhysicalPromotion,
+    [switch] $NoR2R,
     [switch] $iOSLlvmBuild,
     [switch] $iOSStripSymbols,
     [switch] $HybridGlobalization,
@@ -89,14 +89,14 @@ if ($NoDynamicPGO) {
     $Configurations += " PGOType=nodynamicpgo"
 }
 
-if ($NoR2R) {
-    $Configurations += " R2RType=nor2r"
-}
-
 if ($PhysicalPromotion) {
     $Configurations += " PhysicalPromotionType=physicalpromotion"
 }
 
+if ($NoR2R) {
+    $Configurations += " R2RType=nor2r"
+}
+
 if ($iOSMono) {
     $Configurations += " iOSLlvmBuild=$iOSLlvmBuild"
     $Configurations += " iOSStripSymbols=$iOSStripSymbols"
@@ -123,14 +123,14 @@ if ($NoDynamicPGO) {
     $SetupArguments = "$SetupArguments --no-dynamic-pgo"
 }
 
-if ($NoR2R) {
-    $SetupArguments = "$SetupArguments --no-r2r"
-}
-
 if ($PhysicalPromotion) {
     $SetupArguments = "$SetupArguments --physical-promotion"
 }
 
+if ($NoR2R) {
+    $SetupArguments = "$SetupArguments --no-r2r"
+}
+
 if ($UseLocalCommitTime) {
     $LocalCommitTime = (git show -s --format=%ci $CommitSha)
     $SetupArguments = "$SetupArguments --commit-time `"$LocalCommitTime`""

diff --git a/eng/testing/performance/performance-setup.sh b/eng/testing/performance/performance-setup.sh
@@ -153,14 +153,14 @@ while (($# > 0)); do
       nodynamicpgo=true
       shift 1
       ;;
-    --nor2r)
-      nor2r=true
-      shift 1
-      ;;
     --physicalpromotion)
       physicalpromotion=true
       shift 1
       ;;
+    --nor2r)
+      nor2r=true
+      shift 1
+      ;;
     --compare)
       compare=true
       shift 1
@@ -252,8 +252,8 @@ while (($# > 0)); do
       echo "  --mauiversion                  Set the maui version for Mono/Maui runs"
       echo "  --uselocalcommittime           Pass local runtime commit time to the setup script"
       echo "  --nodynamicpgo                 Set for No dynamic PGO runs"
-      echo "  --nor2r                        Set for No R2R runs"
       echo "  --physicalpromotion            Set for runs with physical promotion"
+      echo "  --nor2r                        Set for No R2R runs"
       echo ""
       exit 1
       ;;
@@ -372,14 +372,14 @@ if [[ "$nodynamicpgo" == "true" ]]; then
     configurations="$configurations PGOType=nodynamicpgo"
 fi
 
-if [[ "$nor2r" == "true" ]]; then
-    configurations="$configurations R2RType=nor2r"
-fi
-
 if [[ "$physicalpromotion" == "true" ]]; then
     configurations="$configurations PhysicalPromotionType=physicalpromotion"
 fi
 
+if [[ "$nor2r" == "true" ]]; then
+    configurations="$configurations R2RType=nor2r"
+fi
+
 if [[ "$(echo "$hybridglobalization" | tr '[:upper:]' '[:lower:]')" == "true" ]]; then # convert to lowercase to test
     configurations="$configurations HybridGlobalization=True" # Force True for consistency
 fi
@@ -471,14 +471,14 @@ if [[ "$nodynamicpgo" == "true" ]]; then
     setup_arguments="$setup_arguments --no-dynamic-pgo"
 fi
 
-if [[ "$nor2r" == "true" ]]; then
-    setup_arguments="$setup_arguments --no-r2r"
-fi
-
 if [[ "$physicalpromotion" == "true" ]]; then
     setup_arguments="$setup_arguments --physical-promotion"
 fi
 
+if [[ "$nor2r" == "true" ]]; then
+    setup_arguments="$setup_arguments --no-r2r"
+fi
+
 if [[ "$monoaot" == "true" ]]; then
     monoaot_dotnet_path=$payload_directory/monoaot
     mv $monoaot_path $monoaot_dotnet_path