Skip to content

JIT: Fix EvalHWIntrinsicFunBinary for ARM MultiplyByScalar #94413

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
jakobbotsch merged 6 commits into from
Nov 7, 2023
Merged

JIT: Fix EvalHWIntrinsicFunBinary for ARM MultiplyByScalar #94413

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
63fdc8c
JIT: Fix EvalHWIntrinsicFunBinary for ARM MultiplyByScalar
jakobbotsch Nov 6, 2023
2170ec2
Add RequiresProcessIsolation
jakobbotsch Nov 6, 2023
134204d
Further fix, remove stress variables
jakobbotsch Nov 6, 2023
2483e6e
Fix preprocessor mishap
jakobbotsch Nov 6, 2023
74b2688
Make use of IR invariants around MultiplyByScalar
jakobbotsch Nov 6, 2023
2d2d2a9
Handle more cases
jakobbotsch Nov 6, 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
4 changes: 2 additions & 2 deletions src/coreclr/jit/valuenum.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7819,7 +7819,7 @@ ValueNum ValueNumStore::EvalHWIntrinsicFunBinary(var_types type,

if (cnsVN == zeroVN)
{
return zeroVN;
return VNZeroForType(type);
}
}

Expand All @@ -7836,7 +7836,7 @@ ValueNum ValueNumStore::EvalHWIntrinsicFunBinary(var_types type,
oneVN = VNOneForType(baseType);
}

if (cnsVN == oneVN)
if ((cnsVN == oneVN) && (TypeOfVN(argVN) == type))
{
return argVN;
}
Expand Down
19 changes: 19 additions & 0 deletions src/tests/JIT/Regression/JitBlue/Runtime_93876/Runtime_93876.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Runtime.CompilerServices;
using System.Numerics;
using Xunit;

public static class Runtime_93876
{
[Fact]
public static void Problem()
{
Vector4 v = Mul(0, 1);
Assert.Equal(Vector4.One, v);
}

[MethodImpl(MethodImplOptions.NoInlining)]
private static Vector4 Mul(float a, float b) => Vector4.Multiply(a + b, Vector4.One);
Copy link
Member

@tannergooding tannergooding Nov 6, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the type of a + b here that causes the issue? Does it become TYP_DOUBLE or something or is the issue that it's TYP_FLOAT and the other operand is TYP_SIMD16?

Copy link
Member Author

@jakobbotsch jakobbotsch Nov 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gtNewSimdBinOpNode creates the following IR on ARM64:

               [000005] -----------                         ▌  HWINTRINSIC simd16 float MultiplyByScalar
               [000003] -----------                         ├──▌  CNS_VEC   simd16<0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000>
               [000004] -----------                         └──▌  HWINTRINSIC simd8  float CreateScalarUnsafe
               [000002] -----------                            └──▌  ADD       float 
               [000000] -----------                               ├──▌  LCL_VAR   float  V00 arg0         
               [000001] -----------                               └──▌  LCL_VAR   float  V01 arg1

Copy link
Member Author

@jakobbotsch jakobbotsch Nov 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I think MultiplyByScalar shouldn't be handled by this path. E.g. Vector64.Multiply(Vector64<float>.One, x) will produce <x, 0> instead of <x, x> because of that. So this needs a bit more work.

Copy link
Member Author

@jakobbotsch jakobbotsch Nov 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I pushed a change that handles MultiplyByScalar separately, can you take another look?

}
9 changes: 9 additions & 0 deletions src/tests/JIT/Regression/JitBlue/Runtime_93876/Runtime_93876.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Optimize>True</Optimize>
</PropertyGroup>
<ItemGroup>
<CLRTestEnvironmentVariable Include="DOTNET_JitStressModeNames" Value="STRESS_MAKE_CSE STRESS_SPLIT_TREES_REMOVE_COMMAS" />
Copy link
Contributor

@SingleAccretion SingleAccretion Nov 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In other tests there are comments that you need process isolation to use CLRTestEnvironmentVariable, is that no longer true?

Copy link
Member Author

@jakobbotsch jakobbotsch Nov 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that's still true, thanks for noticing. Fixed this and another test.

<Compile Include="$(MSBuildProjectName).cs" />
</ItemGroup>
</Project>