Skip to content

Commit

Permalink
JIT: Home float parameters before integer parameters (#96439)
Browse files Browse the repository at this point in the history
Parameters that are going into float registers can come from integer
registers in the presence of struct promotion. We need to home those
before integer parameters or the source register could have been
overridden by the integer parameter homing logic.

Ideally it seems like the homing logic should be unified to handle all
parameters simultaneously, but this seems like a simple enough fix. I do
not think we have ABIs where we have the opposite kind constraint
(integer parameters coming from float registers).

Fix #96306
  • Loading branch information
jakobbotsch authored Jan 5, 2024
1 parent 9e31c21 commit 928ff30
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/coreclr/jit/codegencommon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6243,8 +6243,14 @@ void CodeGen::genFnProlog()
};

#if defined(TARGET_AMD64) || defined(TARGET_ARM64) || defined(TARGET_ARM)
assignIncomingRegisterArgs(&intRegState);
// Handle float parameters first; in the presence of struct promotion
// we can have parameters that are homed into float registers but
// passed in integer registers. So make sure we get those out of the
// integer registers before we potentially override those as part of
// handling integer parameters.

assignIncomingRegisterArgs(&floatRegState);
assignIncomingRegisterArgs(&intRegState);
#else
assignIncomingRegisterArgs(&intRegState);
#endif
Expand Down
37 changes: 37 additions & 0 deletions src/tests/JIT/Regression/JitBlue/Runtime_96306/Runtime_96306.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

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

public class Runtime_96306
{
[Fact]
public static int TestEntryPoint()
{
return Foo(new Point2D { V = new Vector2(101, -1) }, 100);
}

// 'a' is passed in rcx but homed into xmm1 after promotion.
// 'scale' is passed in xmm1 but spilled because of the call to Bar.
// We must take care that we spill 'scale' before we home 'a'.
[MethodImpl(MethodImplOptions.NoInlining)]
private static int Foo(Point2D a, float scale)
{
Bar();
return ReturnValue(scale);
}

[MethodImpl(MethodImplOptions.NoInlining)]
private static int ReturnValue(float value) => (int)value;

[MethodImpl(MethodImplOptions.NoInlining)]
private static void Bar() { }

private struct Point2D
{
public Vector2 V;
}
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Optimize>True</Optimize>
<DebugType>None</DebugType>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildProjectName).cs" />
</ItemGroup>
</Project>

0 comments on commit 928ff30

Please sign in to comment.