Skip to content

[release/8.0-rc2] Ensure that embedded broadcast checks the base type of the parent node #92459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carlossanlop merged 3 commits into from
Sep 22, 2023
Merged

[release/8.0-rc2] Ensure that embedded broadcast checks the base type of the parent node #92459

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51d5028
Ensure that embedded broadcast checks the base type of the parent node
tannergooding Sep 21, 2023
5e42e55
Ensure the regression test exits if AVX2 is not supported
tannergooding Sep 21, 2023
9b54bfd
Also handle embedded broadcasts for mismatched memory sizes
tannergooding Sep 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Also handle embedded broadcasts for mismatched memory sizes
  • Loading branch information
@tannergooding
tannergooding authored and github-actions committed Sep 22, 2023
commit 9b54bfda37ca3e4c8756e75da496a77dbb0135e9
5 changes: 2 additions & 3 deletions src/coreclr/jit/lowerxarch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8205,7 +8205,7 @@ bool Lowering::IsContainableHWIntrinsicOp(GenTreeHWIntrinsic* parentNode, GenTre
var_types parentBaseType = parentNode->GetSimdBaseType();
var_types childBaseType = hwintrinsic->GetSimdBaseType();

if (varTypeIsSmall(parentBaseType) || varTypeIsSmall(childBaseType))
if (varTypeIsSmall(parentBaseType) || (genTypeSize(parentBaseType) != genTypeSize(childBaseType)))
{
// early return if either base type is not embedded broadcast compatible.
return false;
Expand Down Expand Up @@ -8251,12 +8251,11 @@ bool Lowering::IsContainableHWIntrinsicOp(GenTreeHWIntrinsic* parentNode, GenTre
var_types parentBaseType = parentNode->GetSimdBaseType();
var_types childBaseType = hwintrinsic->GetSimdBaseType();

if (varTypeIsSmall(parentBaseType))
if (varTypeIsSmall(parentBaseType) || (genTypeSize(parentBaseType) != genTypeSize(childBaseType)))
{
// early return if either base type is not embedded broadcast compatible.
return false;
}
assert(!varTypeIsSmall(childBaseType));

return parentNode->OperIsEmbBroadcastCompatible();
}
Expand Down
23 changes: 18 additions & 5 deletions src/tests/JIT/Regression/JitBlue/Runtime_92357/Runtime_92357.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,30 @@ public static void Problem()
return;
}

int y = 5;
int y1 = 5;

Vector256<short> actual = Test(Vector256.Create((short)1), ref y);
Vector256<short> expected = Vector256.Create(10, 0, 10, 0, 10, 0, 10, 0, 10, 0, 10, 0, 10, 0, 10, 0);
Vector256<short> actual1 = Test1(Vector256.Create((short)1), ref y1);
Vector256<short> expected1 = Vector256.Create(10, 0, 10, 0, 10, 0, 10, 0, 10, 0, 10, 0, 10, 0, 10, 0);

Assert.Equal(expected, actual);
Assert.Equal(expected1, actual1);

long y2 = 5;

Vector256<int> actual2 = Test2(Vector256.Create((int)1), ref y2);
Vector256<int> expected2 = Vector256.Create(10, 0, 10, 0, 10, 0, 10, 0);

Assert.Equal(expected2, actual2);
}

[MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.AggressiveOptimization)]
public static Vector256<short> Test(Vector256<short> x, ref int y)
public static Vector256<short> Test1(Vector256<short> x, ref int y)
{
return Avx2.MultiplyLow(x + x, Vector256.Create(y).AsInt16());
}

[MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.AggressiveOptimization)]
public static Vector256<int> Test2(Vector256<int> x, ref long y)
{
return Avx2.MultiplyLow(x + x, Vector256.Create(y).AsInt32());
}
}