Add metric usage diff to SPMI reports

eng/pipelines/coreclr/superpmi-diffs.yml

@@ -122,3 +122,19 @@ extends:
             diffType: tpdiff
             baseJitOptions: ${{ parameters.spmi_jitoptions_base }}
             diffJitOptions: ${{ parameters.spmi_jitoptions_diff }}
+
+      - template: /eng/pipelines/common/platform-matrix.yml
+        parameters:
+          jobTemplate: /eng/pipelines/coreclr/templates/superpmi-diffs-job.yml
+          buildConfig: checked
+          platforms:
+          - windows_x64
+          - windows_x86
+          - linux_x64
+          helixQueueGroup: superpmi-diffs
+          helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
+          jobParameters:
+            condition: not(eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_jiteeversionguid.containsChange'], true))
+            diffType: metricdiff
+            baseJitOptions: ${{ parameters.spmi_jitoptions_base }}
+            diffJitOptions: ${{ parameters.spmi_jitoptions_diff }}

eng/pipelines/coreclr/templates/run-superpmi-diffs-job.yml

@@ -16,7 +16,7 @@ parameters:
   enableTelemetry: false          # optional -- enable for telemetry
   liveLibrariesBuildConfig: ''    # optional -- live-live libraries configuration to use for the run
   helixQueues: ''                 # required -- Helix queues
-  diffType: 'asmdiffs'            # required -- 'asmdiffs', 'tpdiff', or 'all'
+  diffType: 'asmdiffs'            # required -- 'asmdiffs', 'tpdiff', 'metricdiff', or 'all'
   baseJitOptions: ''              # e.g. JitStressModeNames=STRESS_PHYSICAL_PROMOTION;JitFullyInt=1
   diffJitOptions: ''
 
@@ -84,6 +84,9 @@ jobs:
     - ${{ if eq(parameters.diffType, 'tpdiff') }}:
       - name: SetupScriptDirs
         value: '-release_directory $(releaseProductRootFolderPath)'
+    - ${{ if eq(parameters.diffType, 'metricdiff') }}:
+      - name: SetupScriptDirs
+        value: '-release_directory $(releaseProductRootFolderPath)'
     - ${{ if eq(parameters.diffType, 'all') }}:
       - name: SetupScriptDirs
         value: '-checked_directory $(buildProductRootFolderPath) -release_directory $(releaseProductRootFolderPath)'

eng/pipelines/coreclr/templates/superpmi-diffs-job.yml

@@ -9,7 +9,7 @@ parameters:
   variables: {}
   helixQueues: ''
   runJobTemplate: '/eng/pipelines/coreclr/templates/run-superpmi-diffs-job.yml'
-  diffType: 'asmdiffs'            # required -- 'asmdiffs', 'tpdiff', or 'all'
+  diffType: 'asmdiffs'            # required -- 'asmdiffs', 'tpdiff', 'metricdiff', or 'all'
   baseJitOptions: ''              # e.g. JitStressModeNames=STRESS_PHYSICAL_PROMOTION;JitFullyInt=1
   diffJitOptions: ''
 
@@ -32,14 +32,14 @@ jobs:
     dependsOn:
       - ${{ if in(parameters.diffType, 'asmdiffs', 'all') }}:
         - 'build_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_checked_'
-      - ${{ if in(parameters.diffType, 'tpdiff', 'all') }}:
+      - ${{ if in(parameters.diffType, 'tpdiff', 'metricdiff', 'all') }}:
         - 'build_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_release_'
 
     variables:
     - ${{ each variable in parameters.variables }}:
       - ${{insert}}: ${{ variable }}
 
-    - ${{ if in(parameters.diffType, 'tpdiff', 'all') }}:
+    - ${{ if in(parameters.diffType, 'tpdiff', 'metricdiff', 'all') }}:
       - ${{ if eq(parameters.osGroup, 'windows') }}:
         - name: releaseProductRootFolderPath
           value: '$(Build.SourcesDirectory)\artifacts\bin\coreclr\$(osGroup).$(archType).Release'
@@ -59,7 +59,7 @@ jobs:
           displayName: 'JIT checked build'
           cleanUnpackFolder: false
 
-    - ${{ if in(parameters.diffType, 'tpdiff', 'all') }}:
+    - ${{ if in(parameters.diffType, 'tpdiff', 'metricdiff', 'all') }}:
       # Download jit release builds
       - template: /eng/pipelines/common/download-artifact-step.yml
         parameters:

src/coreclr/jit/compiler.cpp

@@ -6590,7 +6590,12 @@ void Compiler::compCompileFinish()
 #endif
         }
     }
-#endif // DEBUG
+#else  // DEBUG
+    if (JitConfig.JitReportMetrics())
+    {
+        Metrics.report(this);
+    }
+#endif // !DEBUG
 }
 
 #ifdef PSEUDORANDOM_NOP_INSERTION

src/coreclr/scripts/superpmi-diffs.proj

@@ -79,7 +79,8 @@
       <Timeout>$(WorkItemTimeout)</Timeout>
       <DownloadFilesFromResults Condition=" '$(SuperPmiDiffType)'=='asmdiffs' ">superpmi_download_%(Identity).log;superpmi_asmdiffs_%(Identity).log;superpmi_asmdiffs_summary_%(Identity).json;Asmdiffs_%(Identity).zip</DownloadFilesFromResults>
       <DownloadFilesFromResults Condition=" '$(SuperPmiDiffType)'=='tpdiff' "  >superpmi_download_%(Identity).log;superpmi_tpdiff_%(Identity).log;superpmi_tpdiff_summary_%(Identity).json</DownloadFilesFromResults>
-      <DownloadFilesFromResults Condition=" '$(SuperPmiDiffType)'=='all' "     >superpmi_download_%(Identity).log;superpmi_asmdiffs_%(Identity).log;superpmi_asmdiffs_summary_%(Identity).json;Asmdiffs_%(Identity).zip;superpmi_tpdiff_%(Identity).log;superpmi_tpdiff_summary_%(Identity).json</DownloadFilesFromResults>
+      <DownloadFilesFromResults Condition=" '$(SuperPmiDiffType)'=='metricdiff' ">superpmi_download_%(Identity).log;superpmi_metricdiff_%(Identity).log;superpmi_metricdiff_summary_%(Identity).json</DownloadFilesFromResults>
+      <DownloadFilesFromResults Condition=" '$(SuperPmiDiffType)'=='all' "     >superpmi_download_%(Identity).log;superpmi_asmdiffs_%(Identity).log;superpmi_asmdiffs_summary_%(Identity).json;Asmdiffs_%(Identity).zip;superpmi_tpdiff_%(Identity).log;superpmi_tpdiff_summary_%(Identity).json;superpmi_metricdiff_%(Identity).log;superpmi_metricdiff_summary_%(Identity).json</DownloadFilesFromResults>
     </HelixWorkItem>
   </ItemGroup>
   </Project>