Skip to content

Fix arm64 scalar intrinsic use with small arguments #73876

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
merged 1 commit into from
Aug 13, 2022
Merged

Fix arm64 scalar intrinsic use with small arguments #73876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 0 deletions src/coreclr/jit/compiler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX

#include "emit.h"

// Forward declaration
template <class T>
inline var_types genActualType(T value);

#include "hwintrinsic.h"
#include "simd.h"
#include "simdashwintrinsic.h"
Expand Down
5 changes: 5 additions & 0 deletions src/coreclr/jit/hwintrinsic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -866,6 +866,11 @@ struct HWIntrinsic final
{
baseType = node->TypeGet();
}

if (category == HW_Category_Scalar)
Copy link
Member

Choose a reason for hiding this comment

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

What about the HW_Category_Special category? Likely the above three cases that get a type via GenTree::TypeGet should be changed to use genActualType(tree) instead.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I was trying to make a targeted change, and hadn't fully investigated all the processing that "Special" nodes have. It turns out that this class is only used on arm64, and the only "special" instruction is "Yield", which has no arguments, and for which the "baseType" is ignored. So I could just make the genActualType unconditional as you suggest.

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

using System;
using System.Runtime.CompilerServices;

public unsafe class Runtime_73804
{
public static int Main()
{
short value = 0x1000;
int r = Problem(&value);

return 100 + r - System.Numerics.BitOperations.LeadingZeroCount((uint)value);
}

[MethodImpl(MethodImplOptions.NoInlining)]
private static int Problem(short* s)
{
if (System.Runtime.Intrinsics.Arm.ArmBase.IsSupported)
{
return System.Runtime.Intrinsics.Arm.ArmBase.LeadingZeroCount(*s);
}
else
{
return System.Numerics.BitOperations.LeadingZeroCount((uint)*s);
}
}
}
10 changes: 10 additions & 0 deletions src/tests/JIT/Regression/JitBlue/Runtime_73804/Runtime_73804.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<Optimize>True</Optimize>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildProjectName).cs" />
</ItemGroup>
</Project>