Reenable fixed tests after noRetyping and similar changes. (#38855)

* Reenable GitHub_26491.

Closes #13355

* Reenable crossgen2 tests failing with old retyping/

They were fixed both with and without retyping.
Closes #37883.

* Reenable HVA merge cases.

Closes #37341, closes #37880.

* Reenable GitHub_35821.

Closes #36206, closes #36418.

The issue was fixed by #37499.

* Delete extra lines that are no longer needed.

#37506 was fixed in #38241.

* delete a throwing init.

diff --git a/src/coreclr/tests/issues.targets b/src/coreclr/tests/issues.targets
index 8c45dca..4f3b248 100644 (file)
--- a/src/coreclr/tests/issues.targets
+++ b/src/coreclr/tests/issues.targets
@@ -302,15 +302,9 @@
         <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/DevDiv_590771/DevDiv_590771/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/GitHub_35821/GitHub_35821/*">
-            <Issue>https://github.com/dotnet/runtime/issues/36418</Issue>
-        </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)/tracing/tracevalidation/inducedgc/inducedgc/*">
             <Issue>https://github.com/dotnet/runtime/issues/12216</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/GitHub_26491/**/*">
-            <Issue>https://github.com/dotnet/runtime/issues/13355</Issue>
-        </ExcludeList>
     </ItemGroup>
 
     <!-- Windows x64 specific excludes -->
@@ -978,73 +972,6 @@
         </ExcludeList>
     </ItemGroup>
 
-    <!-- Crossgen2 arm64-specific -->
-    <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(TestBuildMode)' == 'crossgen2' and ('$(TargetArchitecture)' == 'arm64' or '$(AltJitArch)' == 'arm64') and '$(RuntimeFlavor)' == 'coreclr'">
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/VectorABI/VectorMgdMgd_r/*">
-            <Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/VectorABI/VectorMgdMgdArray_r/*">
-            <Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/VectorABI/VectorMgdMgdStatic_r/*">
-            <Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd/AdvSimd_Part0_r/*">
-            <Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd/AdvSimd_Part0_ro/*">
-            <Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd/AdvSimd_Part1_r/*">
-            <Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd/AdvSimd_Part1_ro/*">
-            <Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd/AdvSimd_Part2_r/*">
-            <Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd/AdvSimd_Part2_ro/*">
-            <Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd/AdvSimd_Part3_r/*">
-            <Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd/AdvSimd_Part3_ro/*">
-            <Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd/AdvSimd_Part4_r/*">
-            <Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd/AdvSimd_Part4_ro/*">
-            <Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd/AdvSimd_Part5_r/*">
-            <Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd/AdvSimd_Part5_ro/*">
-            <Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd.Arm64/AdvSimd.Arm64_Part0_r/*">
-            <Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd.Arm64/AdvSimd.Arm64_Part0_ro/*">
-            <Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd.Arm64/AdvSimd.Arm64_Part1_r/*">
-            <Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd.Arm64/AdvSimd.Arm64_Part1_ro/*">
-            <Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/Sha1/Sha1_r/*">
-            <Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/Sha1/Sha1_ro/*">
-            <Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
-        </ExcludeList>
-    </ItemGroup>
-
     <!-- runtest.proj finds all the *.cmd/*.sh scripts in a test folder and creates corresponding test methods.
          Exclude these scripts to avoid creating such methods for the superpmicollect dependent test projects
          and running them separately from superpmicollect test. These should be excluded regardless of RuntimeFlavor/os/arch-->

diff --git a/src/coreclr/tests/src/JIT/Directed/StructABI/structreturn.cs b/src/coreclr/tests/src/JIT/Directed/StructABI/structreturn.cs
index 7b8b949..0ee8b9b 100644 (file)
--- a/src/coreclr/tests/src/JIT/Directed/StructABI/structreturn.cs
+++ b/src/coreclr/tests/src/JIT/Directed/StructABI/structreturn.cs
@@ -1219,27 +1219,26 @@ class TestHFAandHVA
     [MethodImpl(MethodImplOptions.NoInlining)]
     static Vector<T> ReturnVectorTWithMerge<T>(int v, T init1, T init2, T init3, T init4) where T : struct
     {
-        // issue https://github.com/dotnet/runtime/issues/37341
-        // if (v == 0)
-        // {
-            // return new Vector<T>();
-        // }
-        // else if (v == 1)
-        // {
-            // return new Vector<T>(init1);
-        // }
-        // else if (v == 2)
-        // {
-            // return new Vector<T>(init2);
-        // }
-        // else if (v == 3)
-        // {
-            // return new Vector<T>(init3);
-        // }
-        // else
-        // {
-            // return new Vector<T>(init4);
-        // }
+        if (v == 0)
+        {
+            return new Vector<T>();
+        }
+        else if (v == 1)
+        {
+            return new Vector<T>(init1);
+        }
+        else if (v == 2)
+        {
+            return new Vector<T>(init2);
+        }
+        else if (v == 3)
+        {
+            return new Vector<T>(init3);
+        }
+        else
+        {
+            return new Vector<T>(init4);
+        }
         return new Vector<T>();
     }
 
@@ -1374,8 +1373,6 @@ class TestHFAandHVA
         try
         {
             var a = ReturnVectorT2<Vector4>(new Vector4(1));
-            // Delete WriteLine when https://github.com/dotnet/runtime/issues/37506 is fixed.
-            Console.WriteLine(a.ToString());
             Debug.Assert(false, "unreachable");
         }
         catch (System.NotSupportedException)
@@ -1384,8 +1381,6 @@ class TestHFAandHVA
         try
         {
             var a = ReturnVectorT2<VectorTWrapperWrapper<int>>(new VectorTWrapperWrapper<int>());
-            // Delete WriteLine when https://github.com/dotnet/runtime/issues/37506 is fixed.
-            Console.WriteLine(a.ToString());
             Debug.Assert(false, "unreachable");
         }
         catch (System.NotSupportedException)
@@ -1398,7 +1393,6 @@ class TestHFAandHVA
         ReturnVectorTWithMerge(1, 0.0, 0.0, 0.0, 0.0);
         ReturnVectorTWithMerge<short>(2, 0, 0, 0, 0);
         ReturnVectorTWithMerge<long>(3, 0, 0, 0, 0);
-        ReturnVectorTWithMerge<Vector<Single>>(3, new Vector<Single>(0), new Vector<Single>(0), new Vector<Single>(0), new Vector<Single>(0));
 
         ReturnVectorShortWrapper();
         ReturnVectorShortWrapperPromoted();