Skip to content

Commit

Permalink
Reenable fixed tests after noRetyping and similar changes. (#38855)
Browse files Browse the repository at this point in the history 
* 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.
  • Loading branch information
Sergey Andreenko authored Jul 8, 2020
1 parent 464508b commit 9bb997b
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 99 deletions.
73 changes: 0 additions & 73 deletions src/coreclr/tests/issues.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down Expand Up @@ -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-->
Expand Down
46 changes: 20 additions & 26 deletions src/coreclr/tests/src/JIT/Directed/StructABI/structreturn.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1219,27 +1219,26 @@ static Vector<T> ReturnVectorT<T>() where T : struct
[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>();
}

Expand Down Expand Up @@ -1374,8 +1373,6 @@ static void TestReturnVectorT()
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)
Expand All @@ -1384,8 +1381,6 @@ static void TestReturnVectorT()
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)
Expand All @@ -1398,7 +1393,6 @@ static void TestReturnVectorT()
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();
Expand Down

0 comments on commit 9bb997b

Please sign in to comment.