From dc4fca68e93fd58220630cee8c68ff314299e1fb Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Mon, 1 Jul 2024 14:37:58 -0700 Subject: [PATCH 1/2] Don't contain the address for Vector_GetElement on Arm64 --- src/coreclr/jit/lowerarmarch.cpp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/coreclr/jit/lowerarmarch.cpp b/src/coreclr/jit/lowerarmarch.cpp index d1239dc8370072..b98eb4d68d0595 100644 --- a/src/coreclr/jit/lowerarmarch.cpp +++ b/src/coreclr/jit/lowerarmarch.cpp @@ -3317,15 +3317,17 @@ void Lowering::ContainCheckHWIntrinsic(GenTreeHWIntrinsic* node) MakeSrcContained(node, intrin.op2); } - if (IsContainableMemoryOp(intrin.op1) && IsSafeToContainMem(node, intrin.op1)) - { - MakeSrcContained(node, intrin.op1); - - if (intrin.op1->OperIs(GT_IND)) - { - intrin.op1->AsIndir()->Addr()->ClearContained(); - } - } + // TODO: Codegen isn't currently handling this correctly + // + // if (IsContainableMemoryOp(intrin.op1) && IsSafeToContainMem(node, intrin.op1)) + // { + // MakeSrcContained(node, intrin.op1); + // + // if (intrin.op1->OperIs(GT_IND)) + // { + // intrin.op1->AsIndir()->Addr()->ClearContained(); + // } + // } break; } From 562d93a00405cf07aec87911475f56c2fec18662 Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Mon, 1 Jul 2024 14:38:58 -0700 Subject: [PATCH 2/2] Revert "Block failing Matrix4x4 tests on activeissue (#104235)" This reverts commit 241bbe13df425abf67d6839a50c0add70aed6951. --- src/libraries/System.Numerics.Vectors/tests/Matrix4x4Tests.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/libraries/System.Numerics.Vectors/tests/Matrix4x4Tests.cs b/src/libraries/System.Numerics.Vectors/tests/Matrix4x4Tests.cs index fe52b64ec6c5d1..80877852d6378d 100644 --- a/src/libraries/System.Numerics.Vectors/tests/Matrix4x4Tests.cs +++ b/src/libraries/System.Numerics.Vectors/tests/Matrix4x4Tests.cs @@ -46,7 +46,6 @@ static Matrix4x4 GenerateTestMatrix() [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)] [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)] [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)] - [ActiveIssue("https://github.com/dotnet/runtime/issues/104232", typeof(PlatformDetection), nameof(PlatformDetection.IsNativeAot))] 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) { 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, [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)] [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)] [ActiveIssue("https://github.com/dotnet/runtime/issues/80876", TestPlatforms.iOS | TestPlatforms.tvOS)] - [ActiveIssue("https://github.com/dotnet/runtime/issues/104232", typeof(PlatformDetection), nameof(PlatformDetection.IsNativeAot))] 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) { 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);