Skip to content

Commit 9bb997b

Browse files
author
Sergey Andreenko
authored
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.
1 parent 464508b commit 9bb997b

File tree

2 files changed

+20
-99
lines changed

2 files changed

+20
-99
lines changed

‎src/coreclr/tests/issues.targets

Lines changed: 0 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -302,15 +302,9 @@
302302
<ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/DevDiv_590771/DevDiv_590771/*">
303303
<Issue>needs triage</Issue>
304304
</ExcludeList>
305-
<ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/GitHub_35821/GitHub_35821/*">
306-
<Issue>https://github.com/dotnet/runtime/issues/36418</Issue>
307-
</ExcludeList>
308305
<ExcludeList Include="$(XunitTestBinBase)/tracing/tracevalidation/inducedgc/inducedgc/*">
309306
<Issue>https://github.com/dotnet/runtime/issues/12216</Issue>
310307
</ExcludeList>
311-
<ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/GitHub_26491/**/*">
312-
<Issue>https://github.com/dotnet/runtime/issues/13355</Issue>
313-
</ExcludeList>
314308
</ItemGroup>
315309

316310
<!-- Windows x64 specific excludes -->
@@ -978,73 +972,6 @@
978972
</ExcludeList>
979973
</ItemGroup>
980974

981-
<!-- Crossgen2 arm64-specific -->
982-
<ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(TestBuildMode)' == 'crossgen2' and ('$(TargetArchitecture)' == 'arm64' or '$(AltJitArch)' == 'arm64') and '$(RuntimeFlavor)' == 'coreclr'">
983-
<ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/VectorABI/VectorMgdMgd_r/*">
984-
<Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
985-
</ExcludeList>
986-
<ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/VectorABI/VectorMgdMgdArray_r/*">
987-
<Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
988-
</ExcludeList>
989-
<ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/VectorABI/VectorMgdMgdStatic_r/*">
990-
<Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
991-
</ExcludeList>
992-
<ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd/AdvSimd_Part0_r/*">
993-
<Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
994-
</ExcludeList>
995-
<ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd/AdvSimd_Part0_ro/*">
996-
<Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
997-
</ExcludeList>
998-
<ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd/AdvSimd_Part1_r/*">
999-
<Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
1000-
</ExcludeList>
1001-
<ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd/AdvSimd_Part1_ro/*">
1002-
<Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
1003-
</ExcludeList>
1004-
<ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd/AdvSimd_Part2_r/*">
1005-
<Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
1006-
</ExcludeList>
1007-
<ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd/AdvSimd_Part2_ro/*">
1008-
<Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
1009-
</ExcludeList>
1010-
<ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd/AdvSimd_Part3_r/*">
1011-
<Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
1012-
</ExcludeList>
1013-
<ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd/AdvSimd_Part3_ro/*">
1014-
<Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
1015-
</ExcludeList>
1016-
<ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd/AdvSimd_Part4_r/*">
1017-
<Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
1018-
</ExcludeList>
1019-
<ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd/AdvSimd_Part4_ro/*">
1020-
<Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
1021-
</ExcludeList>
1022-
<ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd/AdvSimd_Part5_r/*">
1023-
<Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
1024-
</ExcludeList>
1025-
<ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd/AdvSimd_Part5_ro/*">
1026-
<Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
1027-
</ExcludeList>
1028-
<ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd.Arm64/AdvSimd.Arm64_Part0_r/*">
1029-
<Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
1030-
</ExcludeList>
1031-
<ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd.Arm64/AdvSimd.Arm64_Part0_ro/*">
1032-
<Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
1033-
</ExcludeList>
1034-
<ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd.Arm64/AdvSimd.Arm64_Part1_r/*">
1035-
<Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
1036-
</ExcludeList>
1037-
<ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd.Arm64/AdvSimd.Arm64_Part1_ro/*">
1038-
<Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
1039-
</ExcludeList>
1040-
<ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/Sha1/Sha1_r/*">
1041-
<Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
1042-
</ExcludeList>
1043-
<ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/Sha1/Sha1_ro/*">
1044-
<Issue>https://github.com/dotnet/runtime/issues/37883</Issue>
1045-
</ExcludeList>
1046-
</ItemGroup>
1047-
1048975
<!-- runtest.proj finds all the *.cmd/*.sh scripts in a test folder and creates corresponding test methods.
1049976
Exclude these scripts to avoid creating such methods for the superpmicollect dependent test projects
1050977
and running them separately from superpmicollect test. These should be excluded regardless of RuntimeFlavor/os/arch-->

‎src/coreclr/tests/src/JIT/Directed/StructABI/structreturn.cs

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1219,27 +1219,26 @@ static Vector<T> ReturnVectorT<T>() where T : struct
12191219
[MethodImpl(MethodImplOptions.NoInlining)]
12201220
static Vector<T> ReturnVectorTWithMerge<T>(int v, T init1, T init2, T init3, T init4) where T : struct
12211221
{
1222-
// issue https://github.com/dotnet/runtime/issues/37341
1223-
// if (v == 0)
1224-
// {
1225-
// return new Vector<T>();
1226-
// }
1227-
// else if (v == 1)
1228-
// {
1229-
// return new Vector<T>(init1);
1230-
// }
1231-
// else if (v == 2)
1232-
// {
1233-
// return new Vector<T>(init2);
1234-
// }
1235-
// else if (v == 3)
1236-
// {
1237-
// return new Vector<T>(init3);
1238-
// }
1239-
// else
1240-
// {
1241-
// return new Vector<T>(init4);
1242-
// }
1222+
if (v == 0)
1223+
{
1224+
return new Vector<T>();
1225+
}
1226+
else if (v == 1)
1227+
{
1228+
return new Vector<T>(init1);
1229+
}
1230+
else if (v == 2)
1231+
{
1232+
return new Vector<T>(init2);
1233+
}
1234+
else if (v == 3)
1235+
{
1236+
return new Vector<T>(init3);
1237+
}
1238+
else
1239+
{
1240+
return new Vector<T>(init4);
1241+
}
12431242
return new Vector<T>();
12441243
}
12451244

@@ -1374,8 +1373,6 @@ static void TestReturnVectorT()
13741373
try
13751374
{
13761375
var a = ReturnVectorT2<Vector4>(new Vector4(1));
1377-
// Delete WriteLine when https://github.com/dotnet/runtime/issues/37506 is fixed.
1378-
Console.WriteLine(a.ToString());
13791376
Debug.Assert(false, "unreachable");
13801377
}
13811378
catch (System.NotSupportedException)
@@ -1384,8 +1381,6 @@ static void TestReturnVectorT()
13841381
try
13851382
{
13861383
var a = ReturnVectorT2<VectorTWrapperWrapper<int>>(new VectorTWrapperWrapper<int>());
1387-
// Delete WriteLine when https://github.com/dotnet/runtime/issues/37506 is fixed.
1388-
Console.WriteLine(a.ToString());
13891384
Debug.Assert(false, "unreachable");
13901385
}
13911386
catch (System.NotSupportedException)
@@ -1398,7 +1393,6 @@ static void TestReturnVectorT()
13981393
ReturnVectorTWithMerge(1, 0.0, 0.0, 0.0, 0.0);
13991394
ReturnVectorTWithMerge<short>(2, 0, 0, 0, 0);
14001395
ReturnVectorTWithMerge<long>(3, 0, 0, 0, 0);
1401-
ReturnVectorTWithMerge<Vector<Single>>(3, new Vector<Single>(0), new Vector<Single>(0), new Vector<Single>(0), new Vector<Single>(0));
14021396

14031397
ReturnVectorShortWrapper();
14041398
ReturnVectorShortWrapperPromoted();

0 commit comments

Comments
 (0)