Add benchmarks.run_pgo_optrepeat collection (#112750)

Author: EgorBo

eng/pipelines/coreclr/superpmi-collect-test.yml

@@ -241,7 +241,7 @@ extends:
           jobParameters:
             testGroup: outerloop
             liveLibrariesBuildConfig: Release
-            collectionType: run_tiered
+            collectionType: run_pgo
             collectionName: benchmarks
             collectionUpload: false
 
@@ -262,7 +262,7 @@ extends:
           jobParameters:
             testGroup: outerloop
             liveLibrariesBuildConfig: Release
-            collectionType: run_pgo
+            collectionType: run_pgo_optrepeat
             collectionName: benchmarks
             collectionUpload: false
 

eng/pipelines/coreclr/superpmi-collect.yml

@@ -258,7 +258,7 @@ extends:
           jobParameters:
             testGroup: outerloop
             liveLibrariesBuildConfig: Release
-            collectionType: run_tiered
+            collectionType: run_pgo
             collectionName: benchmarks
 
       - template: /eng/pipelines/common/platform-matrix.yml
@@ -278,7 +278,7 @@ extends:
           jobParameters:
             testGroup: outerloop
             liveLibrariesBuildConfig: Release
-            collectionType: run_pgo
+            collectionType: run_pgo_optrepeat
             collectionName: benchmarks
 
       #

src/coreclr/scripts/superpmi-collect.proj

@@ -120,6 +120,9 @@
   <PropertyGroup Condition=" '$(CollectionType)' == 'run_pgo' ">
     <RunArguments>--tiered_pgo</RunArguments>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(CollectionType)' == 'run_pgo_optrepeat' ">
+    <RunArguments>--tiered_pgo --jitoptrepeat_all</RunArguments>
+  </PropertyGroup>
   <PropertyGroup Condition=" '$(CollectionType)' != 'run_tiered' and '$(CollectionType)' != 'run_pgo' ">
     <RunArguments></RunArguments>
   </PropertyGroup>

src/coreclr/scripts/superpmi.py

@@ -314,6 +314,7 @@ def add_core_root_arguments(parser, build_type_default, build_type_help):
 collect_parser.add_argument("--disable_r2r", action="store_true", help="Sets DOTNET_ReadyToRun=0 when doing collection to cause ReadyToRun images to not be used, and thus causes JIT compilation and SuperPMI collection of these methods.")
 collect_parser.add_argument("--tiered_compilation", action="store_true", help="Sets DOTNET_TieredCompilation=1 when doing collections.")
 collect_parser.add_argument("--tiered_pgo", action="store_true", help="Sets DOTNET_TieredCompilation=1 and DOTNET_TieredPGO=1 when doing collections.")
+collect_parser.add_argument("--jitoptrepeat_all", action="store_true", help="Sets DOTNET_JitOptRepeat=* when doing collections.")
 collect_parser.add_argument("--ci", action="store_true", help="Special collection mode for handling zero-sized files in Azure DevOps + Helix pipelines collections.")
 
 # Allow for continuing a collection in progress
@@ -864,6 +865,9 @@ def __collect_mc_files__(self):
             else:
                 dotnet_env["TieredCompilation"] = "0"
 
+            if self.coreclr_args.jitoptrepeat_all:
+                dotnet_env["JitOptRepeat"] = "*"
+
             if self.coreclr_args.disable_r2r:
                 dotnet_env["ReadyToRun"] = "0"
 
@@ -4911,6 +4915,11 @@ def verify_base_diff_args():
                             lambda unused: True,
                             "Unable to set tiered_pgo")
 
+        coreclr_args.verify(args,
+                            "jitoptrepeat_all",
+                            lambda unused: True,
+                            "Unable to set jitoptrepeat_all")
+
         coreclr_args.verify(args,
                             "pmi_path",
                             lambda unused: True,

src/coreclr/scripts/superpmi_benchmarks.py

@@ -39,6 +39,7 @@
 parser.add_argument("-benchmark_binary", help="Benchmark binary to execute")
 parser.add_argument("--tiered_compilation", action="store_true", help="Sets DOTNET_TieredCompilation=1 when doing collections.")
 parser.add_argument("--tiered_pgo", action="store_true", help="Sets DOTNET_TieredCompilation=1 and DOTNET_TieredPGO=1 when doing collections.")
+parser.add_argument("--jitoptrepeat_all", action="store_true", help="Sets DOTNET_JitOptRepeat=*.")
 
 def setup_args(args):
     """ Setup the args for SuperPMI to use.
@@ -113,6 +114,11 @@ def setup_args(args):
                         lambda unused: True,
                         "Unable to set tiered_pgo")
 
+    coreclr_args.verify(args,
+                        "jitoptrepeat_all",
+                        lambda unused: True,
+                        "Unable to set jitoptrepeat_all")
+
     return coreclr_args
 
 
@@ -288,6 +294,9 @@ def build_and_run(coreclr_args, output_mch_name):
     else:
         collection_command += "DOTNET_TieredCompilation:0"
 
+    if coreclr_args.jitoptrepeat_all:
+        collection_command += " DOTNET_JitOptRepeat:\"*\""
+
     # Generate the execution script in Temp location
     with TempDir() as temp_location:
         script_name = os.path.join(temp_location, script_name)

src/coreclr/scripts/superpmi_collect_setup.py

@@ -43,7 +43,7 @@
 
 parser = argparse.ArgumentParser(description="description")
 
-parser.add_argument("-collection_type", required=True, help="Type of the SPMI collection to be done (nativeaot, crossgen2, pmi, run, run_tiered, run_pgo)")
+parser.add_argument("-collection_type", required=True, help="Type of the SPMI collection to be done (nativeaot, crossgen2, pmi, run, run_tiered, run_pgo, run_pgo_optrepeat)")
 parser.add_argument("-collection_name", required=True, help="Name of the SPMI collection to be done (e.g., libraries, libraries_tests, coreclr_tests, benchmarks)")
 parser.add_argument("-payload_directory", required=True, help="Path to payload directory to create: subdirectories are created for the correlation payload as well as the per-partition work items")
 parser.add_argument("-source_directory", required=True, help="Path to source directory")
@@ -57,7 +57,7 @@
 
 is_windows = platform.system() == "Windows"
 
-legal_collection_types = [ "nativeaot", "crossgen2", "pmi", "run", "run_tiered", "run_pgo" ]
+legal_collection_types = [ "nativeaot", "crossgen2", "pmi", "run", "run_tiered", "run_pgo", "run_pgo_optrepeat" ]
 
 directories_to_ignore = [
     "runtimes", # This appears to be the result of a nuget package that includes a bunch of native code