Reenable superpmi test for x86

Replace Roslyn CscBench with Bytemark, since CscBench fails with
an inlining assert (opened as issue dotnet/coreclr#6844) on x86.

Commit migrated from https://github.com/dotnet/coreclr/commit/ced16dbc4b37370ede18b0bad1b5e8d6cc939320

diff --git a/src/coreclr/tests/issues.targets b/src/coreclr/tests/issues.targets
index 0330d5d..7b31fae 100644 (file)
--- a/src/coreclr/tests/issues.targets
+++ b/src/coreclr/tests/issues.targets
@@ -247,7 +247,7 @@
              <Issue>needs triage</Issue>
         </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)\JIT\Performance\CodeQuality\Roslyn\CscBench\CscBench.cmd">
-             <Issue>needs triage</Issue>
+             <Issue>6844</Issue>
         </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b103058\b103058\b103058.cmd">
              <Issue>needs triage</Issue>
@@ -398,9 +398,6 @@
         <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\int64\superlong\_il_relsuperlong\_il_relsuperlong.cmd">
              <Issue>6778</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\superpmi\superpmicollect\superpmicollect.cmd">
-             <Issue>6830</Issue>
-        </ExcludeList>
     </ItemGroup>
     
     <!-- Tests that need to be triaged for vararg usage as that is not supported -->

diff --git a/src/coreclr/tests/src/JIT/superpmi/superpmicollect.cs b/src/coreclr/tests/src/JIT/superpmi/superpmicollect.cs
index 02f15bb..4faa5e6 100644 (file)
--- a/src/coreclr/tests/src/JIT/superpmi/superpmicollect.cs
+++ b/src/coreclr/tests/src/JIT/superpmi/superpmicollect.cs
@@ -259,9 +259,13 @@ namespace SuperPMICollection
             // is changed.
             //
             // TODO: this should probably be loaded dynamically from a .json/.xml file.
+            //
+            // Note: We previously used
+            //      JIT\Performance\CodeQuality\Roslyn\CscBench\CscBench.cmd
+            // but it doesn't currently run on x86 due to this issue: https://github.com/dotnet/coreclr/issues/6844.
             string[] SuperPMICollectionTestProgramsList =
             {
-                @"JIT\Performance\CodeQuality\Roslyn\CscBench\CscBench.cmd",
+                @"JIT\Performance\CodeQuality\Bytemark\Bytemark\Bytemark.cmd",
                 @"JIT\Methodical\fp\exgen\10w5d_cs_do\10w5d_cs_do.cmd",
                 @"JIT\Generics\Coverage\chaos65204782cs\chaos65204782cs.cmd"
             };

diff --git a/src/coreclr/tests/x86_legacy_backend_issues.targets b/src/coreclr/tests/x86_legacy_backend_issues.targets
index 6f036c2..6098e0b 100644 (file)
--- a/src/coreclr/tests/x86_legacy_backend_issues.targets
+++ b/src/coreclr/tests/x86_legacy_backend_issues.targets
@@ -284,7 +284,7 @@
       <Issue>needs triage</Issue>
     </ExcludeList>
     <ExcludeList Include="$(XunitTestBinBase)\JIT\Performance\CodeQuality\Roslyn\CscBench\CscBench.cmd">
-      <Issue>needs triage</Issue>
+      <Issue>6844</Issue>
     </ExcludeList>
     <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\delegate\_simpleoddpower_il_r\_simpleoddpower_il_r.cmd">
       <Issue>needs triage</Issue>
@@ -370,9 +370,6 @@
     <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\waithandle\waitall\waitallex8a\*">
       <Issue>3832</Issue>
     </ExcludeList>
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\superpmi\superpmicollect\superpmicollect.cmd">
-         <Issue>6830</Issue>
-    </ExcludeList>
     <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\tailcall_v4\smallFrame\smallFrame.cmd">
       <Issue>tail. call pop ret is only supported on amd64</Issue>
     </ExcludeList>