Skip to content

Commit 122e701

Browse files
saucecontrolsaucecontrol
authored
JIT: Fix asserts from #112728 (#113845)
* fix cast asserts * fix containment of CreateScalar * add tests
1 parent 98b365d commit 122e701

File tree

5 files changed

+105
-8
lines changed

5 files changed

+105
-8
lines changed

‎src/coreclr/jit/lowerxarch.cpp‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4076,14 +4076,13 @@ GenTree* Lowering::LowerHWIntrinsicCreate(GenTreeHWIntrinsic* node)
40764076

40774077
var_types unsignedType = varTypeToUnsigned(simdBaseType);
40784078

4079-
if (op1->OperIs(GT_CAST) && !op1->gtOverflow())
4079+
if (op1->OperIs(GT_CAST) && !op1->gtOverflow() &&
4080+
(genTypeSize(op1->CastToType()) == genTypeSize(simdBaseType)))
40804081
{
4081-
assert(op1->TypeIs(TYP_INT) && (genTypeSize(op1->CastToType()) == genTypeSize(simdBaseType)));
40824082
op1->AsCast()->gtCastType = unsignedType;
40834083
}
4084-
else if (op1->OperIs(GT_IND, GT_LCL_FLD))
4084+
else if (op1->OperIs(GT_IND, GT_LCL_FLD) && (genTypeSize(op1) == genTypeSize(simdBaseType)))
40854085
{
4086-
assert(genTypeSize(op1) == genTypeSize(simdBaseType));
40874086
op1->gtType = unsignedType;
40884087
}
40894088
else if (!op1->OperIs(GT_CAST) || (op1->AsCast()->CastToType() != unsignedType))
@@ -9663,17 +9662,19 @@ void Lowering::ContainCheckHWIntrinsic(GenTreeHWIntrinsic* node)
96639662

96649663
if (varTypeIsIntegral(simdBaseType) && op1->OperIsHWIntrinsic())
96659664
{
9666-
GenTreeHWIntrinsic* childNode = op1->AsHWIntrinsic();
9665+
GenTreeHWIntrinsic* childNode = op1->AsHWIntrinsic();
9666+
NamedIntrinsic childIntrinsic = childNode->GetHWIntrinsicId();
96679667

9668-
if (HWIntrinsicInfo::IsVectorCreateScalarUnsafe(childNode->GetHWIntrinsicId()))
9668+
if (HWIntrinsicInfo::IsVectorCreateScalar(childIntrinsic) ||
9669+
HWIntrinsicInfo::IsVectorCreateScalarUnsafe(childIntrinsic))
96699670
{
9670-
// We have a very special case of BroadcastScalarToVector(CreateScalarUnsafe(op1))
9671+
// We have a very special case of BroadcastScalarToVector(CreateScalar/Unsafe(op1))
96719672
//
96729673
// This is one of the only instructions where it supports taking integer types from
96739674
// a SIMD register or directly as a scalar from memory. Most other instructions, in
96749675
// comparison, take such values from general-purpose registers instead.
96759676
//
9676-
// Because of this, we're going to remove the CreateScalarUnsafe and try to contain
9677+
// Because of this, we're going to remove the CreateScalar/Unsafe and try to contain
96779678
// op1 directly, we'll then special case the codegen to materialize the value into a
96789679
// SIMD register in the case it is marked optional and doesn't get spilled.
96799680

‎src/tests/JIT/Regression/JitBlue/Runtime_113829/Runtime_113829.cs‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
// Generated by Fuzzlyn v2.5 on 2025-03-23 15:10:25
5+
// Run on X64 Windows
6+
// Seed: 14181260275910254012-vectort,vector128,vector256,x86aes,x86avx,x86avx2,x86avx512bw,x86avx512bwvl,x86avx512cd,x86avx512cdvl,x86avx512dq,x86avx512dqvl,x86avx512f,x86avx512fvl,x86avx512fx64,x86bmi1,x86bmi1x64,x86bmi2,x86bmi2x64,x86fma,x86lzcnt,x86lzcntx64,x86pclmulqdq,x86popcnt,x86popcntx64,x86sse,x86ssex64,x86sse2,x86sse2x64,x86sse3,x86sse41,x86sse41x64,x86sse42,x86sse42x64,x86ssse3,x86x86base
7+
// Reduced from 68.9 KiB to 0.3 KiB in 00:01:38
8+
// Problem() Hits JIT assert in Debug:
9+
// Assertion failed 'genTypeSize(op1) == genTypeSize(simdBaseType)' in 'Program:Main(Fuzzlyn.ExecutionServer.IRuntime)' during 'Lowering nodeinfo' (IL size 20; hash 0xade6b36b; MinOpts)
10+
11+
// Generated by Fuzzlyn v2.5 on 2025-03-23 15:09:24
12+
// Run on X64 Windows
13+
// Seed: 3022985173499088836-vectort,vector128,vector256,x86aes,x86avx,x86avx2,x86avx512bw,x86avx512bwvl,x86avx512cd,x86avx512cdvl,x86avx512dq,x86avx512dqvl,x86avx512f,x86avx512fvl,x86avx512fx64,x86bmi1,x86bmi1x64,x86bmi2,x86bmi2x64,x86fma,x86lzcnt,x86lzcntx64,x86pclmulqdq,x86popcnt,x86popcntx64,x86sse,x86ssex64,x86sse2,x86sse2x64,x86sse3,x86sse41,x86sse41x64,x86sse42,x86sse42x64,x86ssse3,x86x86base
14+
// Reduced from 26.2 KiB to 0.3 KiB in 00:01:05
15+
// Problem2() Hits JIT assert in Debug:
16+
// Assertion failed 'op1->TypeIs(TYP_INT) && (genTypeSize(op1->CastToType()) == genTypeSize(simdBaseType))' in 'Program:Main(Fuzzlyn.ExecutionServer.IRuntime)' during 'Lowering nodeinfo' (IL size 31; hash 0xade6b36b; MinOpts)
17+
using System.Runtime.Intrinsics;
18+
using System.Runtime.Intrinsics.X86;
19+
using Xunit;
20+
21+
public class C0
22+
{
23+
public sbyte F4;
24+
}
25+
26+
public class Runtime_113829
27+
{
28+
[Fact]
29+
public static void Problem()
30+
{
31+
var vr4 = new C0();
32+
Vector128.CreateScalar((short)vr4.F4);
33+
}
34+
35+
[Fact]
36+
public static void Problem2()
37+
{
38+
if (Sse41.X64.IsSupported)
39+
{
40+
var vr7 = Vector128.CreateScalar(2263564149047927034UL);
41+
Vector256.CreateScalar((short)(sbyte)Sse41.X64.Extract(vr7, 0));
42+
}
43+
}
44+
}

‎src/tests/JIT/Regression/JitBlue/Runtime_113829/Runtime_113829.csproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<Optimize>False</Optimize>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<Compile Include="$(MSBuildProjectName).cs" />
7+
</ItemGroup>
8+
</Project>

‎src/tests/JIT/Regression/JitBlue/Runtime_113832/Runtime_113832.cs‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
// Generated by Fuzzlyn v2.5 on 2025-03-23 15:25:27
5+
// Run on X86 Windows
6+
// Seed: 916448399438567841-vectort,vector128,vector256,x86aes,x86avx,x86avx2,x86avx512bw,x86avx512bwvl,x86avx512cd,x86avx512cdvl,x86avx512dq,x86avx512dqvl,x86avx512f,x86avx512fvl,x86bmi1,x86bmi2,x86fma,x86lzcnt,x86pclmulqdq,x86popcnt,x86sse,x86sse2,x86sse3,x86sse41,x86sse42,x86ssse3,x86x86base
7+
// Reduced from 63.4 KiB to 0.7 KiB in 00:02:21
8+
// Hits JIT assert in Release:
9+
// Assertion failed '(consume == 0) || (ComputeAvailableSrcCount(tree) == consume)' in 'Program:Main(Fuzzlyn.ExecutionServer.IRuntime)' during 'Linear scan register alloc' (IL size 68; hash 0xade6b36b; FullOpts)
10+
using System;
11+
using System.Runtime.Intrinsics;
12+
using System.Runtime.Intrinsics.X86;
13+
using Xunit;
14+
15+
public class Runtime_113832
16+
{
17+
public static byte s_4;
18+
19+
[Fact]
20+
public static void Problem()
21+
{
22+
if (Avx512F.VL.IsSupported)
23+
{
24+
var vr9 = Vector128.Create<ulong>(0);
25+
var vr10 = (ulong)s_4;
26+
var vr11 = Vector128.CreateScalar(vr10);
27+
var vr12 = Avx2.BroadcastScalarToVector128(vr11);
28+
var vr13 = (byte)0;
29+
var vr14 = Vector256.CreateScalar(vr13);
30+
var vr15 = (ulong)Avx2.MoveMask(vr14);
31+
var vr16 = Vector128.Create<ulong>(vr15);
32+
var vr17 = Avx512F.VL.TernaryLogic(vr9, vr12, vr16, 1);
33+
Console.WriteLine(vr17);
34+
}
35+
}
36+
}

‎src/tests/JIT/Regression/JitBlue/Runtime_113832/Runtime_113832.csproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<Optimize>True</Optimize>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<Compile Include="$(MSBuildProjectName).cs" />
7+
</ItemGroup>
8+
</Project>

0 commit comments

Comments
 (0)