Skip to content

Commit b59816c

Browse files
Don't contain the address for Vector_GetElement on Arm64 (#104264)
* Don't contain the address for Vector_GetElement on Arm64 * Revert "Block failing Matrix4x4 tests on activeissue (#104235)" This reverts commit 241bbe1.
1 parent 4343ad4 commit b59816c

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

src/coreclr/jit/lowerarmarch.cpp

+11-9
Original file line numberDiff line numberDiff line change
@@ -3317,15 +3317,17 @@ void Lowering::ContainCheckHWIntrinsic(GenTreeHWIntrinsic* node)
33173317
MakeSrcContained(node, intrin.op2);
33183318
}
33193319

3320-
if (IsContainableMemoryOp(intrin.op1) && IsSafeToContainMem(node, intrin.op1))
3321-
{
3322-
MakeSrcContained(node, intrin.op1);
3323-
3324-
if (intrin.op1->OperIs(GT_IND))
3325-
{
3326-
intrin.op1->AsIndir()->Addr()->ClearContained();
3327-
}
3328-
}
3320+
// TODO: Codegen isn't currently handling this correctly
3321+
//
3322+
// if (IsContainableMemoryOp(intrin.op1) && IsSafeToContainMem(node, intrin.op1))
3323+
// {
3324+
// MakeSrcContained(node, intrin.op1);
3325+
//
3326+
// if (intrin.op1->OperIs(GT_IND))
3327+
// {
3328+
// intrin.op1->AsIndir()->Addr()->ClearContained();
3329+
// }
3330+
// }
33293331
break;
33303332
}
33313333

src/libraries/System.Numerics.Vectors/tests/Matrix4x4Tests.cs

-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ static Matrix4x4 GenerateTestMatrix()
4646
[InlineData(1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f)]
4747
[InlineData(3.1434343f, 1.1234123f, 0.1234123f, -0.1234123f, 3.1434343f, 1.1234123f, 3.1434343f, 1.1234123f, 0.1234123f, -0.1234123f, 3.1434343f, 1.1234123f, 3.1434343f, 1.1234123f, 0.1234123f, -0.1234123f)]
4848
[InlineData(1.0000001f, 0.0000001f, 2.0000001f, 0.0000002f, 1.0000001f, 0.0000001f, 1.0000001f, 0.0000001f, 2.0000001f, 0.0000002f, 1.0000001f, 0.0000001f, 1.0000001f, 0.0000001f, 2.0000001f, 0.0000002f)]
49-
[ActiveIssue("https://github.com/dotnet/runtime/issues/104232", typeof(PlatformDetection), nameof(PlatformDetection.IsNativeAot))]
5049
public void Matrix4x4IndexerGetTest(float m11, float m12, float m13, float m14, float m21, float m22, float m23, float m24, float m31, float m32, float m33, float m34, float m41, float m42, float m43, float m44)
5150
{
5251
var matrix = new Matrix4x4(m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, m41, m42, m43, m44);
@@ -78,7 +77,6 @@ public void Matrix4x4IndexerGetTest(float m11, float m12, float m13, float m14,
7877
[InlineData(3.1434343f, 1.1234123f, 0.1234123f, -0.1234123f, 3.1434343f, 1.1234123f, 3.1434343f, 1.1234123f, 0.1234123f, -0.1234123f, 3.1434343f, 1.1234123f, 3.1434343f, 1.1234123f, 0.1234123f, -0.1234123f)]
7978
[InlineData(1.0000001f, 0.0000001f, 2.0000001f, 0.0000002f, 1.0000001f, 0.0000001f, 1.0000001f, 0.0000001f, 2.0000001f, 0.0000002f, 1.0000001f, 0.0000001f, 1.0000001f, 0.0000001f, 2.0000001f, 0.0000002f)]
8079
[ActiveIssue("https://github.com/dotnet/runtime/issues/80876", TestPlatforms.iOS | TestPlatforms.tvOS)]
81-
[ActiveIssue("https://github.com/dotnet/runtime/issues/104232", typeof(PlatformDetection), nameof(PlatformDetection.IsNativeAot))]
8280
public void Matrix4x4IndexerSetTest(float m11, float m12, float m13, float m14, float m21, float m22, float m23, float m24, float m31, float m32, float m33, float m34, float m41, float m42, float m43, float m44)
8381
{
8482
var matrix = new Matrix4x4(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);

0 commit comments

Comments
 (0)