Enable "Allocate on stack" for NAOT/R2R#104411

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
EgorBo merged 21 commits into from
Jul 14, 2024
Merged

Enable "Allocate on stack" for NAOT/R2R #104411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
000b528
Enable "Allocate on stack" for NAOT/R2R
EgorBo Jul 4, 2024
67b495d
Fix getClassGClayout on NAOT
EgorBo Jul 4, 2024
8e0e9eb
Handle CORINFO_HELP_UNBOX_TYPETEST on NAOT/R2R
EgorBo Jul 4, 2024
2a62eeb
fix build
EgorBo Jul 4, 2024
741e4fa
implement RhUnboxTypeTest
EgorBo Jul 5, 2024
396677b
Update ILCompiler.RyuJit.csproj
EgorBo Jul 5, 2024
19936e7
Update StackAllocatedBox.cs
EgorBo Jul 5, 2024
b07c1a0
clean up
EgorBo Jul 5, 2024
ea65a01
Update src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs
EgorBo Jul 10, 2024
62b67d1
Merge branch 'main' of github.com:dotnet/runtime into alloc-stack-naot
EgorBo Jul 10, 2024
ebd8f9a
Add tests
EgorBo Jul 10, 2024
b5985a5
Address feedback
EgorBo Jul 10, 2024
1ef6ccf
Merge branch 'main' of github.com:dotnet/runtime into alloc-stack-naot
EgorBo Jul 11, 2024
4f9ff46
Update ObjectStackAllocationTests.cs
EgorBo Jul 12, 2024
ac65ff6
Update ObjectStackAllocationTests.cs
EgorBo Jul 12, 2024
203593c
Merge branch 'main' into alloc-stack-naot
EgorBo Jul 12, 2024
001b01c
Merge branch 'alloc-stack-naot' of github.com:EgorBo/runtime-1 into a…
EgorBo Jul 13, 2024
ac0e6e8
Merge branch 'main' of github.com:dotnet/runtime into alloc-stack-naot
EgorBo Jul 13, 2024
ed2568c
Clean up in the test
EgorBo Jul 13, 2024
d6a32b3
Update ObjectStackAllocationTests.csproj
EgorBo Jul 14, 2024
85340ae
Update ObjectStackAllocationTests.cs
EgorBo Jul 14, 2024
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
1 change: 0 additions & 1 deletion src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -197,7 +197,6 @@
<Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\CastHelpers.cs" />
<Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\ICastableHelpers.cs" />
<Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\RuntimeHelpers.CoreCLR.cs" />
<Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\StackAllocatedBox.cs" />
<Compile Include="$(BclSourcesRoot)\System\Runtime\ControlledExecution.CoreCLR.cs" />
<Compile Include="$(BclSourcesRoot)\System\Runtime\DependentHandle.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\nativeaot\Common\src\System\Runtime\RhFailFastReason.cs" />
Expand Down
24 changes: 12 additions & 12 deletions src/coreclr/inc/corinfoinstructionset.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -608,18 +608,18 @@ inline CORINFO_InstructionSetFlags EnsureInstructionSetFlagsAreValid(CORINFO_Ins
resultflags.RemoveInstructionSet(InstructionSet_AVX512F);
if (resultflags.HasInstructionSet(InstructionSet_AVX512F_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
resultflags.RemoveInstructionSet(InstructionSet_AVX512F_VL);
if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
if (resultflags.HasInstructionSet(InstructionSet_AVX512BW) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
resultflags.RemoveInstructionSet(InstructionSet_AVX512BW);
if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512BW))
resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
resultflags.RemoveInstructionSet(InstructionSet_AVX512DQ);
if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512DQ))
Expand DownExpand Up@@ -714,18 +714,18 @@ inline CORINFO_InstructionSetFlags EnsureInstructionSetFlagsAreValid(CORINFO_Ins
resultflags.RemoveInstructionSet(InstructionSet_AVX512F);
if (resultflags.HasInstructionSet(InstructionSet_AVX512F_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
resultflags.RemoveInstructionSet(InstructionSet_AVX512F_VL);
if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
if (resultflags.HasInstructionSet(InstructionSet_AVX512BW) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
resultflags.RemoveInstructionSet(InstructionSet_AVX512BW);
if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512BW))
resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
Comment thread
EgorBo marked this conversation as resolved.
if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
resultflags.RemoveInstructionSet(InstructionSet_AVX512DQ);
if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512DQ))
Expand Down
4 changes: 3 additions & 1 deletion src/coreclr/inc/readytorun.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@
// If you update this, ensure you run `git grep MINIMUM_READYTORUN_MAJOR_VERSION`
// and handle pending work.
#define READYTORUN_MAJOR_VERSION 10
#define READYTORUN_MINOR_VERSION 0x0000
#define READYTORUN_MINOR_VERSION 0x0001

#define MINIMUM_READYTORUN_MAJOR_VERSION 10

Expand All@@ -37,6 +37,7 @@
// R2R Version 9.3 adds BulkWriteBarrier helper
// uses GCInfo v3, which makes safe points in partially interruptible code interruptible.
// R2R Version 10.0 adds support for the statics being allocated on a per type basis instead of on a per module basis
// R2R Version 10.1 adds Unbox_TypeTest helper

struct READYTORUN_CORE_HEADER
{
Expand DownExpand Up@@ -357,6 +358,7 @@ enum ReadyToRunHelper
READYTORUN_HELPER_Unbox = 0x5A,
READYTORUN_HELPER_Unbox_Nullable = 0x5B,
READYTORUN_HELPER_NewMultiDimArr = 0x5C,
READYTORUN_HELPER_Unbox_TypeTest = 0x5D,

// Helpers used with generic handle lookup cases
READYTORUN_HELPER_NewObject = 0x60,
Expand Down
1 change: 1 addition & 0 deletions src/coreclr/inc/readytorunhelpers.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ HELPER(READYTORUN_HELPER_Box_Nullable, CORINFO_HELP_BOX_NULLABLE,
HELPER(READYTORUN_HELPER_Unbox, CORINFO_HELP_UNBOX, )
HELPER(READYTORUN_HELPER_Unbox_Nullable, CORINFO_HELP_UNBOX_NULLABLE, )
HELPER(READYTORUN_HELPER_NewMultiDimArr, CORINFO_HELP_NEW_MDARR, )
HELPER(READYTORUN_HELPER_Unbox_TypeTest, CORINFO_HELP_UNBOX_TYPETEST, )

HELPER(READYTORUN_HELPER_NewObject, CORINFO_HELP_NEWFAST, )
HELPER(READYTORUN_HELPER_NewArray, CORINFO_HELP_NEWARR_1_DIRECT, )
Expand Down
9 changes: 0 additions & 9 deletions src/coreclr/jit/objectalloc.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,15 +164,6 @@ inline bool ObjectAllocator::CanAllocateLclVarOnStack(unsigned int lclNu
return false;
}

#ifdef FEATURE_READYTORUN
if (comp->opts.IsReadyToRun())
{
// Need to fix getClassGClayout and maybe more
*reason = "[R2R/NAOT support NYI]";
return false;
}
#endif

classSize = comp->info.compCompHnd->getHeapClassSize(clsHnd);
}

Expand Down
11 changes: 11 additions & 0 deletions src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/RuntimeExports.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -227,6 +227,17 @@ public static unsafe void RhUnboxNullable(ref byte data, MethodTable* pUnboxToEE
RhUnbox(obj, ref data, pUnboxToEEType);
}

[RuntimeExport("RhUnboxTypeTest")]
public static unsafe void RhUnboxTypeTest(MethodTable* pType, MethodTable* pBoxType)
{
Debug.Assert(pType->IsValueType);

if (!UnboxAnyTypeCompare(pType, pBoxType))
{
throw pType->GetClasslibException(ExceptionIDs.InvalidCast);
}
}

[RuntimeExport("RhUnbox")]
public static unsafe void RhUnbox(object? obj, ref byte data, MethodTable* pUnboxToEEType)
{
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/nativeaot/Runtime/inc/ModuleHeaders.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ struct ReadyToRunHeaderConstants
static const uint32_t Signature = 0x00525452; // 'RTR'

static const uint32_t CurrentMajorVersion = 10;
static const uint32_t CurrentMinorVersion = 0;
static const uint32_t CurrentMinorVersion = 1;
};

struct ReadyToRunHeader
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/tools/Common/Internal/Runtime/ModuleHeaders.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ internal struct ReadyToRunHeaderConstants
public const uint Signature = 0x00525452; // 'RTR'

public const ushort CurrentMajorVersion = 10;
public const ushort CurrentMinorVersion = 0;
public const ushort CurrentMinorVersion = 1;
}
#if READYTORUN
#pragma warning disable 0169
Expand Down
1 change: 1 addition & 0 deletions src/coreclr/tools/Common/Internal/Runtime/ReadyToRunConstants.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -267,6 +267,7 @@ public enum ReadyToRunHelper
Unbox = 0x5A,
Unbox_Nullable = 0x5B,
NewMultiDimArr = 0x5C,
Unbox_TypeTest = 0x5D,

// Helpers used with generic handle lookup cases
NewObject = 0x60,
Expand Down
33 changes: 22 additions & 11 deletions src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2352,14 +2352,8 @@ private uint getClassGClayout(CORINFO_CLASS_STRUCT_* cls, byte* gcPtrs)
uint result = 0;

MetadataType type = (MetadataType)HandleToObject(cls);

int pointerSize = PointerSize;

int ptrsCount = AlignmentHelper.AlignUp(type.InstanceFieldSize.AsInt, pointerSize) / pointerSize;

// Assume no GC pointers at first
for (int i = 0; i < ptrsCount; i++)
gcPtrs[i] = (byte)CorInfoGCType.TYPE_GC_NONE;
uint size = type.IsValueType ? getClassSize(cls) : getHeapClassSize(cls);

@jkotasjkotasJul 6, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

getHeapClassSize has Debug.Assert(_compilation.IsInheritanceChainLayoutFixedInCurrentVersionBubble(type)); assert. What guarantees that this assert is satisfied?

The stack allocation should be disabled for non-valuetype types that are not fixed in the current version bubble. How is it achieved?

@EgorBoEgorBoJul 10, 2024

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

@jkotas it's checked via a separate JIT-EE API: canAllocateOnStack so JIT will never call this function if canAllocateOnStack returned false.

new Span<byte>(gcPtrs, (int)((size + PointerSize - 1) / PointerSize)).Clear();

@EgorBoEgorBoJul 5, 2024•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This was copied from CoreCLR impl, it does a similar memset (see this)

Previously, getClassGClayout used InstanceFieldSize.AsInt which for ref types always return just pointer-size while we need the real size. Since it has never been used for ref-types before, it wasn't an issue.


if (type.ContainsGCPointers || type.IsByRefLike)
{
Expand DownExpand Up@@ -2606,9 +2600,26 @@ private CorInfoHelpFunc getSharedCCtorHelper(CORINFO_CLASS_STRUCT_* clsHnd)

private CORINFO_CLASS_STRUCT_* getTypeForBoxOnStack(CORINFO_CLASS_STRUCT_* cls)
{
// Todo: implement...
_ = HandleToObject(cls);
return null;
TypeDesc clsTypeDesc = HandleToObject(cls);
if (clsTypeDesc.IsNullable)
{
clsTypeDesc = clsTypeDesc.Instantiation[0];
}

if (clsTypeDesc.RequiresAlign8())
{
// Conservatively give up on such types (32bit)
return null;
}

// Instantiate StackAllocatedBox<T> helper type with the type we're boxing
MetadataType placeholderType = _compilation.TypeSystemContext.SystemModule.GetType("System.Runtime.CompilerServices", "StackAllocatedBox`1", throwIfNotFound: false);
if (placeholderType == null)
{
// Give up if corelib does not have support for stackallocation
return null;
}
return ObjectToHandle(placeholderType.MakeInstantiatedType(clsTypeDesc));
}

private CorInfoHelpFunc getBoxHelper(CORINFO_CLASS_STRUCT_* cls)
Expand Down
48 changes: 24 additions & 24 deletions src/coreclr/tools/Common/JitInterface/CorInfoInstructionSet.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -746,18 +746,18 @@ public static InstructionSetFlags ExpandInstructionSetByImplicationHelper(Target
resultflags.AddInstructionSet(InstructionSet.X64_EVEX);
if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW))
resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW_VL))
resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW);
if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW_VL))
resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512DQ))
resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512DQ_VL))
Expand DownExpand Up@@ -853,18 +853,18 @@ public static InstructionSetFlags ExpandInstructionSetByImplicationHelper(Target
resultflags.AddInstructionSet(InstructionSet.X86_EVEX);
if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW))
resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW_VL))
resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW);
if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW_VL))
resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512DQ))
resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512DQ_VL))
Expand DownExpand Up@@ -1087,18 +1087,18 @@ private static InstructionSetFlags ExpandInstructionSetByReverseImplicationHelpe
resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW);
if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW))
resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW_VL);
if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW_VL);
if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
resultflags.AddInstructionSet(InstructionSet.X64_AVX512DQ);
if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512DQ))
Expand DownExpand Up@@ -1194,18 +1194,18 @@ private static InstructionSetFlags ExpandInstructionSetByReverseImplicationHelpe
resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW);
if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW))
resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW_VL);
if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW_VL);
if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
resultflags.AddInstructionSet(InstructionSet.X86_AVX512DQ);
if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512DQ))
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Enable "Allocate on stack" for NAOT/R2R#104411

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

EgorBo
merged 21 commits into

from

Jul 14, 2024
 Merged


Enable "Allocate on stack" for NAOT/R2R
#104411
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
000b528

Enable "Allocate on stack" for NAOT/R2R


EgorBo Jul 4, 2024
67b495d

Fix getClassGClayout on NAOT


EgorBo Jul 4, 2024
8e0e9eb

Handle CORINFO_HELP_UNBOX_TYPETEST on NAOT/R2R


EgorBo Jul 4, 2024
2a62eeb

fix build


EgorBo Jul 4, 2024
741e4fa

implement RhUnboxTypeTest


EgorBo Jul 5, 2024
396677b

Update ILCompiler.RyuJit.csproj


EgorBo Jul 5, 2024
19936e7

Update StackAllocatedBox.cs


EgorBo Jul 5, 2024
b07c1a0

clean up


EgorBo Jul 5, 2024
ea65a01

Update src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs


EgorBo Jul 10, 2024
62b67d1

Merge branch 'main' of github.com:dotnet/runtime into alloc-stack-naot


EgorBo Jul 10, 2024
ebd8f9a

Add tests


EgorBo Jul 10, 2024
b5985a5

Address feedback


EgorBo Jul 10, 2024
1ef6ccf

Merge branch 'main' of github.com:dotnet/runtime into alloc-stack-naot


EgorBo Jul 11, 2024
4f9ff46

Update ObjectStackAllocationTests.cs


EgorBo Jul 12, 2024
ac65ff6

Update ObjectStackAllocationTests.cs


EgorBo Jul 12, 2024
203593c

Merge branch 'main' into alloc-stack-naot


EgorBo Jul 12, 2024
001b01c

Merge branch 'alloc-stack-naot' of github.com:EgorBo/runtime-1 into a…


EgorBo Jul 13, 2024
ac0e6e8

Merge branch 'main' of github.com:dotnet/runtime into alloc-stack-naot


EgorBo Jul 13, 2024
ed2568c

Clean up in the test


EgorBo Jul 13, 2024
d6a32b3

Update ObjectStackAllocationTests.csproj


EgorBo Jul 14, 2024
85340ae

Update ObjectStackAllocationTests.cs


EgorBo Jul 14, 2024

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


1 change: 0 additions & 1 deletion
src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -197,7 +197,6 @@
 <Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\CastHelpers.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\ICastableHelpers.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\RuntimeHelpers.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\StackAllocatedBox.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\ControlledExecution.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\DependentHandle.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)..\nativeaot\Common\src\System\Runtime\RhFailFastReason.cs" />
Expand Down

24 changes: 12 additions & 12 deletions
src/coreclr/inc/corinfoinstructionset.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -608,18 +608,18 @@ inline CORINFO_InstructionSetFlags EnsureInstructionSetFlagsAreValid(CORINFO_Ins
 resultflags.RemoveInstructionSet(InstructionSet_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512F_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512BW))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512DQ);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512DQ))
Expand DownExpand Up@@ -714,18 +714,18 @@ inline CORINFO_InstructionSetFlags EnsureInstructionSetFlagsAreValid(CORINFO_Ins
 resultflags.RemoveInstructionSet(InstructionSet_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512F_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512BW))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
Comment thread
EgorBo marked this conversation as resolved.

 if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512DQ);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512DQ))
Expand Down

4 changes: 3 additions & 1 deletion
src/coreclr/inc/readytorun.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@
// If you update this, ensure you run `git grep MINIMUM_READYTORUN_MAJOR_VERSION`
// and handle pending work.
#define READYTORUN_MAJOR_VERSION 10
#define READYTORUN_MINOR_VERSION 0x0000
#define READYTORUN_MINOR_VERSION 0x0001

#define MINIMUM_READYTORUN_MAJOR_VERSION 10

Expand All@@ -37,6 +37,7 @@
// R2R Version 9.3 adds BulkWriteBarrier helper
// uses GCInfo v3, which makes safe points in partially interruptible code interruptible.
// R2R Version 10.0 adds support for the statics being allocated on a per type basis instead of on a per module basis
// R2R Version 10.1 adds Unbox_TypeTest helper

struct READYTORUN_CORE_HEADER
{
Expand DownExpand Up@@ -357,6 +358,7 @@ enum ReadyToRunHelper
 READYTORUN_HELPER_Unbox = 0x5A,
 READYTORUN_HELPER_Unbox_Nullable = 0x5B,
 READYTORUN_HELPER_NewMultiDimArr = 0x5C,
 READYTORUN_HELPER_Unbox_TypeTest = 0x5D,

 // Helpers used with generic handle lookup cases
 READYTORUN_HELPER_NewObject = 0x60,
Expand Down

1 change: 1 addition & 0 deletions
src/coreclr/inc/readytorunhelpers.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ HELPER(READYTORUN_HELPER_Box_Nullable, CORINFO_HELP_BOX_NULLABLE,
HELPER(READYTORUN_HELPER_Unbox, CORINFO_HELP_UNBOX, )
HELPER(READYTORUN_HELPER_Unbox_Nullable, CORINFO_HELP_UNBOX_NULLABLE, )
HELPER(READYTORUN_HELPER_NewMultiDimArr, CORINFO_HELP_NEW_MDARR, )
HELPER(READYTORUN_HELPER_Unbox_TypeTest, CORINFO_HELP_UNBOX_TYPETEST, )

HELPER(READYTORUN_HELPER_NewObject, CORINFO_HELP_NEWFAST, )
HELPER(READYTORUN_HELPER_NewArray, CORINFO_HELP_NEWARR_1_DIRECT, )
Expand Down

9 changes: 0 additions & 9 deletions
src/coreclr/jit/objectalloc.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,15 +164,6 @@ inline bool ObjectAllocator::CanAllocateLclVarOnStack(unsigned int lclNu
 return false;
 }

#ifdef FEATURE_READYTORUN
 if (comp->opts.IsReadyToRun())
 {
 // Need to fix getClassGClayout and maybe more
 *reason = "[R2R/NAOT support NYI]";
 return false;
 }
#endif

 classSize = comp->info.compCompHnd->getHeapClassSize(clsHnd);
 }

Expand Down

11 changes: 11 additions & 0 deletions
src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/RuntimeExports.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -227,6 +227,17 @@ public static unsafe void RhUnboxNullable(ref byte data, MethodTable* pUnboxToEE
 RhUnbox(obj, ref data, pUnboxToEEType);
 }

 [RuntimeExport("RhUnboxTypeTest")]
 public static unsafe void RhUnboxTypeTest(MethodTable* pType, MethodTable* pBoxType)
 {
 Debug.Assert(pType->IsValueType);

 if (!UnboxAnyTypeCompare(pType, pBoxType))
 {
 throw pType->GetClasslibException(ExceptionIDs.InvalidCast);
 }
 }

 [RuntimeExport("RhUnbox")]
 public static unsafe void RhUnbox(object? obj, ref byte data, MethodTable* pUnboxToEEType)
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/nativeaot/Runtime/inc/ModuleHeaders.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ struct ReadyToRunHeaderConstants
 static const uint32_t Signature = 0x00525452; // 'RTR'

 static const uint32_t CurrentMajorVersion = 10;
 static const uint32_t CurrentMinorVersion = 0;
 static const uint32_t CurrentMinorVersion = 1;
};

struct ReadyToRunHeader
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/tools/Common/Internal/Runtime/ModuleHeaders.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ internal struct ReadyToRunHeaderConstants
 public const uint Signature = 0x00525452; // 'RTR'

 public const ushort CurrentMajorVersion = 10;
 public const ushort CurrentMinorVersion = 0;
 public const ushort CurrentMinorVersion = 1;
 }
#if READYTORUN
#pragma warning disable 0169
Expand Down

1 change: 1 addition & 0 deletions
src/coreclr/tools/Common/Internal/Runtime/ReadyToRunConstants.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -267,6 +267,7 @@ public enum ReadyToRunHelper
 Unbox = 0x5A,
 Unbox_Nullable = 0x5B,
 NewMultiDimArr = 0x5C,
 Unbox_TypeTest = 0x5D,

 // Helpers used with generic handle lookup cases
 NewObject = 0x60,
Expand Down

33 changes: 22 additions & 11 deletions
src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2352,14 +2352,8 @@ private uint getClassGClayout(CORINFO_CLASS_STRUCT_* cls, byte* gcPtrs)
 uint result = 0;

 MetadataType type = (MetadataType)HandleToObject(cls);

 int pointerSize = PointerSize;

 int ptrsCount = AlignmentHelper.AlignUp(type.InstanceFieldSize.AsInt, pointerSize) / pointerSize;

 // Assume no GC pointers at first
 for (int i = 0; i < ptrsCount; i++)
 gcPtrs[i] = (byte)CorInfoGCType.TYPE_GC_NONE;
 uint size = type.IsValueType ? getClassSize(cls) : getHeapClassSize(cls);
@jkotasjkotasJul 6, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

getHeapClassSize has Debug.Assert(_compilation.IsInheritanceChainLayoutFixedInCurrentVersionBubble(type)); assert. What guarantees that this assert is satisfied?
The stack allocation should be disabled for non-valuetype types that are not fixed in the current version bubble. How is it achieved?
@EgorBoEgorBoJul 10, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

@jkotas it's checked via a separate JIT-EE API: canAllocateOnStack so JIT will never call this function if canAllocateOnStack returned false.
 new Span<byte>(gcPtrs, (int)((size + PointerSize - 1) / PointerSize)).Clear();
@EgorBoEgorBoJul 5, 2024•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

This was copied from CoreCLR impl, it does a similar memset (see this)
Previously, getClassGClayout used InstanceFieldSize.AsInt which for ref types always return just pointer-size while we need the real size. Since it has never been used for ref-types before, it wasn't an issue.

 if (type.ContainsGCPointers || type.IsByRefLike)
 {
Expand DownExpand Up@@ -2606,9 +2600,26 @@ private CorInfoHelpFunc getSharedCCtorHelper(CORINFO_CLASS_STRUCT_* clsHnd)

 private CORINFO_CLASS_STRUCT_* getTypeForBoxOnStack(CORINFO_CLASS_STRUCT_* cls)
 {
 // Todo: implement...
 _ = HandleToObject(cls);
 return null;
 TypeDesc clsTypeDesc = HandleToObject(cls);
 if (clsTypeDesc.IsNullable)
 {
 clsTypeDesc = clsTypeDesc.Instantiation[0];
 }

 if (clsTypeDesc.RequiresAlign8())
 {
 // Conservatively give up on such types (32bit)
 return null;
 }

 // Instantiate StackAllocatedBox<T> helper type with the type we're boxing
 MetadataType placeholderType = _compilation.TypeSystemContext.SystemModule.GetType("System.Runtime.CompilerServices", "StackAllocatedBox`1", throwIfNotFound: false);
 if (placeholderType == null)
 {
 // Give up if corelib does not have support for stackallocation
 return null;
 }
 return ObjectToHandle(placeholderType.MakeInstantiatedType(clsTypeDesc));
 }

 private CorInfoHelpFunc getBoxHelper(CORINFO_CLASS_STRUCT_* cls)
Expand Down

48 changes: 24 additions & 24 deletions
src/coreclr/tools/Common/JitInterface/CorInfoInstructionSet.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -746,18 +746,18 @@ public static InstructionSetFlags ExpandInstructionSetByImplicationHelper(Target
 resultflags.AddInstructionSet(InstructionSet.X64_EVEX);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512DQ))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512DQ_VL))
Expand DownExpand Up@@ -853,18 +853,18 @@ public static InstructionSetFlags ExpandInstructionSetByImplicationHelper(Target
 resultflags.AddInstructionSet(InstructionSet.X86_EVEX);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512DQ))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512DQ_VL))
Expand DownExpand Up@@ -1087,18 +1087,18 @@ private static InstructionSetFlags ExpandInstructionSetByReverseImplicationHelpe
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512DQ);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512DQ))
Expand DownExpand Up@@ -1194,18 +1194,18 @@ private static InstructionSetFlags ExpandInstructionSetByReverseImplicationHelpe
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512DQ);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512DQ))
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Enable "Allocate on stack" for NAOT/R2R#104411

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

EgorBo
merged 21 commits into

from

Jul 14, 2024
 Merged


Enable "Allocate on stack" for NAOT/R2R
#104411
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
000b528

Enable "Allocate on stack" for NAOT/R2R


EgorBo Jul 4, 2024
67b495d

Fix getClassGClayout on NAOT


EgorBo Jul 4, 2024
8e0e9eb

Handle CORINFO_HELP_UNBOX_TYPETEST on NAOT/R2R


EgorBo Jul 4, 2024
2a62eeb

fix build


EgorBo Jul 4, 2024
741e4fa

implement RhUnboxTypeTest


EgorBo Jul 5, 2024
396677b

Update ILCompiler.RyuJit.csproj


EgorBo Jul 5, 2024
19936e7

Update StackAllocatedBox.cs


EgorBo Jul 5, 2024
b07c1a0

clean up


EgorBo Jul 5, 2024
ea65a01

Update src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs


EgorBo Jul 10, 2024
62b67d1

Merge branch 'main' of github.com:dotnet/runtime into alloc-stack-naot


EgorBo Jul 10, 2024
ebd8f9a

Add tests


EgorBo Jul 10, 2024
b5985a5

Address feedback


EgorBo Jul 10, 2024
1ef6ccf

Merge branch 'main' of github.com:dotnet/runtime into alloc-stack-naot


EgorBo Jul 11, 2024
4f9ff46

Update ObjectStackAllocationTests.cs


EgorBo Jul 12, 2024
ac65ff6

Update ObjectStackAllocationTests.cs


EgorBo Jul 12, 2024
203593c

Merge branch 'main' into alloc-stack-naot


EgorBo Jul 12, 2024
001b01c

Merge branch 'alloc-stack-naot' of github.com:EgorBo/runtime-1 into a…


EgorBo Jul 13, 2024
ac0e6e8

Merge branch 'main' of github.com:dotnet/runtime into alloc-stack-naot


EgorBo Jul 13, 2024
ed2568c

Clean up in the test


EgorBo Jul 13, 2024
d6a32b3

Update ObjectStackAllocationTests.csproj


EgorBo Jul 14, 2024
85340ae

Update ObjectStackAllocationTests.cs


EgorBo Jul 14, 2024

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


1 change: 0 additions & 1 deletion
src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -197,7 +197,6 @@
 <Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\CastHelpers.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\ICastableHelpers.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\RuntimeHelpers.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\StackAllocatedBox.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\ControlledExecution.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\DependentHandle.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)..\nativeaot\Common\src\System\Runtime\RhFailFastReason.cs" />
Expand Down

24 changes: 12 additions & 12 deletions
src/coreclr/inc/corinfoinstructionset.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -608,18 +608,18 @@ inline CORINFO_InstructionSetFlags EnsureInstructionSetFlagsAreValid(CORINFO_Ins
 resultflags.RemoveInstructionSet(InstructionSet_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512F_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512BW))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512DQ);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512DQ))
Expand DownExpand Up@@ -714,18 +714,18 @@ inline CORINFO_InstructionSetFlags EnsureInstructionSetFlagsAreValid(CORINFO_Ins
 resultflags.RemoveInstructionSet(InstructionSet_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512F_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512BW))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
Comment thread
EgorBo marked this conversation as resolved.

 if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512DQ);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512DQ))
Expand Down

4 changes: 3 additions & 1 deletion
src/coreclr/inc/readytorun.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@
// If you update this, ensure you run `git grep MINIMUM_READYTORUN_MAJOR_VERSION`
// and handle pending work.
#define READYTORUN_MAJOR_VERSION 10
#define READYTORUN_MINOR_VERSION 0x0000
#define READYTORUN_MINOR_VERSION 0x0001

#define MINIMUM_READYTORUN_MAJOR_VERSION 10

Expand All@@ -37,6 +37,7 @@
// R2R Version 9.3 adds BulkWriteBarrier helper
// uses GCInfo v3, which makes safe points in partially interruptible code interruptible.
// R2R Version 10.0 adds support for the statics being allocated on a per type basis instead of on a per module basis
// R2R Version 10.1 adds Unbox_TypeTest helper

struct READYTORUN_CORE_HEADER
{
Expand DownExpand Up@@ -357,6 +358,7 @@ enum ReadyToRunHelper
 READYTORUN_HELPER_Unbox = 0x5A,
 READYTORUN_HELPER_Unbox_Nullable = 0x5B,
 READYTORUN_HELPER_NewMultiDimArr = 0x5C,
 READYTORUN_HELPER_Unbox_TypeTest = 0x5D,

 // Helpers used with generic handle lookup cases
 READYTORUN_HELPER_NewObject = 0x60,
Expand Down

1 change: 1 addition & 0 deletions
src/coreclr/inc/readytorunhelpers.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ HELPER(READYTORUN_HELPER_Box_Nullable, CORINFO_HELP_BOX_NULLABLE,
HELPER(READYTORUN_HELPER_Unbox, CORINFO_HELP_UNBOX, )
HELPER(READYTORUN_HELPER_Unbox_Nullable, CORINFO_HELP_UNBOX_NULLABLE, )
HELPER(READYTORUN_HELPER_NewMultiDimArr, CORINFO_HELP_NEW_MDARR, )
HELPER(READYTORUN_HELPER_Unbox_TypeTest, CORINFO_HELP_UNBOX_TYPETEST, )

HELPER(READYTORUN_HELPER_NewObject, CORINFO_HELP_NEWFAST, )
HELPER(READYTORUN_HELPER_NewArray, CORINFO_HELP_NEWARR_1_DIRECT, )
Expand Down

9 changes: 0 additions & 9 deletions
src/coreclr/jit/objectalloc.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,15 +164,6 @@ inline bool ObjectAllocator::CanAllocateLclVarOnStack(unsigned int lclNu
 return false;
 }

#ifdef FEATURE_READYTORUN
 if (comp->opts.IsReadyToRun())
 {
 // Need to fix getClassGClayout and maybe more
 *reason = "[R2R/NAOT support NYI]";
 return false;
 }
#endif

 classSize = comp->info.compCompHnd->getHeapClassSize(clsHnd);
 }

Expand Down

11 changes: 11 additions & 0 deletions
src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/RuntimeExports.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -227,6 +227,17 @@ public static unsafe void RhUnboxNullable(ref byte data, MethodTable* pUnboxToEE
 RhUnbox(obj, ref data, pUnboxToEEType);
 }

 [RuntimeExport("RhUnboxTypeTest")]
 public static unsafe void RhUnboxTypeTest(MethodTable* pType, MethodTable* pBoxType)
 {
 Debug.Assert(pType->IsValueType);

 if (!UnboxAnyTypeCompare(pType, pBoxType))
 {
 throw pType->GetClasslibException(ExceptionIDs.InvalidCast);
 }
 }

 [RuntimeExport("RhUnbox")]
 public static unsafe void RhUnbox(object? obj, ref byte data, MethodTable* pUnboxToEEType)
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/nativeaot/Runtime/inc/ModuleHeaders.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ struct ReadyToRunHeaderConstants
 static const uint32_t Signature = 0x00525452; // 'RTR'

 static const uint32_t CurrentMajorVersion = 10;
 static const uint32_t CurrentMinorVersion = 0;
 static const uint32_t CurrentMinorVersion = 1;
};

struct ReadyToRunHeader
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/tools/Common/Internal/Runtime/ModuleHeaders.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ internal struct ReadyToRunHeaderConstants
 public const uint Signature = 0x00525452; // 'RTR'

 public const ushort CurrentMajorVersion = 10;
 public const ushort CurrentMinorVersion = 0;
 public const ushort CurrentMinorVersion = 1;
 }
#if READYTORUN
#pragma warning disable 0169
Expand Down

1 change: 1 addition & 0 deletions
src/coreclr/tools/Common/Internal/Runtime/ReadyToRunConstants.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -267,6 +267,7 @@ public enum ReadyToRunHelper
 Unbox = 0x5A,
 Unbox_Nullable = 0x5B,
 NewMultiDimArr = 0x5C,
 Unbox_TypeTest = 0x5D,

 // Helpers used with generic handle lookup cases
 NewObject = 0x60,
Expand Down

33 changes: 22 additions & 11 deletions
src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2352,14 +2352,8 @@ private uint getClassGClayout(CORINFO_CLASS_STRUCT_* cls, byte* gcPtrs)
 uint result = 0;

 MetadataType type = (MetadataType)HandleToObject(cls);

 int pointerSize = PointerSize;

 int ptrsCount = AlignmentHelper.AlignUp(type.InstanceFieldSize.AsInt, pointerSize) / pointerSize;

 // Assume no GC pointers at first
 for (int i = 0; i < ptrsCount; i++)
 gcPtrs[i] = (byte)CorInfoGCType.TYPE_GC_NONE;
 uint size = type.IsValueType ? getClassSize(cls) : getHeapClassSize(cls);
@jkotasjkotasJul 6, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

getHeapClassSize has Debug.Assert(_compilation.IsInheritanceChainLayoutFixedInCurrentVersionBubble(type)); assert. What guarantees that this assert is satisfied?
The stack allocation should be disabled for non-valuetype types that are not fixed in the current version bubble. How is it achieved?
@EgorBoEgorBoJul 10, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

@jkotas it's checked via a separate JIT-EE API: canAllocateOnStack so JIT will never call this function if canAllocateOnStack returned false.
 new Span<byte>(gcPtrs, (int)((size + PointerSize - 1) / PointerSize)).Clear();
@EgorBoEgorBoJul 5, 2024•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

This was copied from CoreCLR impl, it does a similar memset (see this)
Previously, getClassGClayout used InstanceFieldSize.AsInt which for ref types always return just pointer-size while we need the real size. Since it has never been used for ref-types before, it wasn't an issue.

 if (type.ContainsGCPointers || type.IsByRefLike)
 {
Expand DownExpand Up@@ -2606,9 +2600,26 @@ private CorInfoHelpFunc getSharedCCtorHelper(CORINFO_CLASS_STRUCT_* clsHnd)

 private CORINFO_CLASS_STRUCT_* getTypeForBoxOnStack(CORINFO_CLASS_STRUCT_* cls)
 {
 // Todo: implement...
 _ = HandleToObject(cls);
 return null;
 TypeDesc clsTypeDesc = HandleToObject(cls);
 if (clsTypeDesc.IsNullable)
 {
 clsTypeDesc = clsTypeDesc.Instantiation[0];
 }

 if (clsTypeDesc.RequiresAlign8())
 {
 // Conservatively give up on such types (32bit)
 return null;
 }

 // Instantiate StackAllocatedBox<T> helper type with the type we're boxing
 MetadataType placeholderType = _compilation.TypeSystemContext.SystemModule.GetType("System.Runtime.CompilerServices", "StackAllocatedBox`1", throwIfNotFound: false);
 if (placeholderType == null)
 {
 // Give up if corelib does not have support for stackallocation
 return null;
 }
 return ObjectToHandle(placeholderType.MakeInstantiatedType(clsTypeDesc));
 }

 private CorInfoHelpFunc getBoxHelper(CORINFO_CLASS_STRUCT_* cls)
Expand Down

48 changes: 24 additions & 24 deletions
src/coreclr/tools/Common/JitInterface/CorInfoInstructionSet.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -746,18 +746,18 @@ public static InstructionSetFlags ExpandInstructionSetByImplicationHelper(Target
 resultflags.AddInstructionSet(InstructionSet.X64_EVEX);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512DQ))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512DQ_VL))
Expand DownExpand Up@@ -853,18 +853,18 @@ public static InstructionSetFlags ExpandInstructionSetByImplicationHelper(Target
 resultflags.AddInstructionSet(InstructionSet.X86_EVEX);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512DQ))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512DQ_VL))
Expand DownExpand Up@@ -1087,18 +1087,18 @@ private static InstructionSetFlags ExpandInstructionSetByReverseImplicationHelpe
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512DQ);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512DQ))
Expand DownExpand Up@@ -1194,18 +1194,18 @@ private static InstructionSetFlags ExpandInstructionSetByReverseImplicationHelpe
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512DQ);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512DQ))
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Enable "Allocate on stack" for NAOT/R2R#104411

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

EgorBo
merged 21 commits into

from

Jul 14, 2024
 Merged


Enable "Allocate on stack" for NAOT/R2R
#104411
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
000b528

Enable "Allocate on stack" for NAOT/R2R


EgorBo Jul 4, 2024
67b495d

Fix getClassGClayout on NAOT


EgorBo Jul 4, 2024
8e0e9eb

Handle CORINFO_HELP_UNBOX_TYPETEST on NAOT/R2R


EgorBo Jul 4, 2024
2a62eeb

fix build


EgorBo Jul 4, 2024
741e4fa

implement RhUnboxTypeTest


EgorBo Jul 5, 2024
396677b

Update ILCompiler.RyuJit.csproj


EgorBo Jul 5, 2024
19936e7

Update StackAllocatedBox.cs


EgorBo Jul 5, 2024
b07c1a0

clean up


EgorBo Jul 5, 2024
ea65a01

Update src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs


EgorBo Jul 10, 2024
62b67d1

Merge branch 'main' of github.com:dotnet/runtime into alloc-stack-naot


EgorBo Jul 10, 2024
ebd8f9a

Add tests


EgorBo Jul 10, 2024
b5985a5

Address feedback


EgorBo Jul 10, 2024
1ef6ccf

Merge branch 'main' of github.com:dotnet/runtime into alloc-stack-naot


EgorBo Jul 11, 2024
4f9ff46

Update ObjectStackAllocationTests.cs


EgorBo Jul 12, 2024
ac65ff6

Update ObjectStackAllocationTests.cs


EgorBo Jul 12, 2024
203593c

Merge branch 'main' into alloc-stack-naot


EgorBo Jul 12, 2024
001b01c

Merge branch 'alloc-stack-naot' of github.com:EgorBo/runtime-1 into a…


EgorBo Jul 13, 2024
ac0e6e8

Merge branch 'main' of github.com:dotnet/runtime into alloc-stack-naot


EgorBo Jul 13, 2024
ed2568c

Clean up in the test


EgorBo Jul 13, 2024
d6a32b3

Update ObjectStackAllocationTests.csproj


EgorBo Jul 14, 2024
85340ae

Update ObjectStackAllocationTests.cs


EgorBo Jul 14, 2024

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


1 change: 0 additions & 1 deletion
src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -197,7 +197,6 @@
 <Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\CastHelpers.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\ICastableHelpers.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\RuntimeHelpers.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\StackAllocatedBox.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\ControlledExecution.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\DependentHandle.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)..\nativeaot\Common\src\System\Runtime\RhFailFastReason.cs" />
Expand Down

24 changes: 12 additions & 12 deletions
src/coreclr/inc/corinfoinstructionset.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -608,18 +608,18 @@ inline CORINFO_InstructionSetFlags EnsureInstructionSetFlagsAreValid(CORINFO_Ins
 resultflags.RemoveInstructionSet(InstructionSet_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512F_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512BW))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512DQ);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512DQ))
Expand DownExpand Up@@ -714,18 +714,18 @@ inline CORINFO_InstructionSetFlags EnsureInstructionSetFlagsAreValid(CORINFO_Ins
 resultflags.RemoveInstructionSet(InstructionSet_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512F_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512BW))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
Comment thread
EgorBo marked this conversation as resolved.

 if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512DQ);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512DQ))
Expand Down

4 changes: 3 additions & 1 deletion
src/coreclr/inc/readytorun.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@
// If you update this, ensure you run `git grep MINIMUM_READYTORUN_MAJOR_VERSION`
// and handle pending work.
#define READYTORUN_MAJOR_VERSION 10
#define READYTORUN_MINOR_VERSION 0x0000
#define READYTORUN_MINOR_VERSION 0x0001

#define MINIMUM_READYTORUN_MAJOR_VERSION 10

Expand All@@ -37,6 +37,7 @@
// R2R Version 9.3 adds BulkWriteBarrier helper
// uses GCInfo v3, which makes safe points in partially interruptible code interruptible.
// R2R Version 10.0 adds support for the statics being allocated on a per type basis instead of on a per module basis
// R2R Version 10.1 adds Unbox_TypeTest helper

struct READYTORUN_CORE_HEADER
{
Expand DownExpand Up@@ -357,6 +358,7 @@ enum ReadyToRunHelper
 READYTORUN_HELPER_Unbox = 0x5A,
 READYTORUN_HELPER_Unbox_Nullable = 0x5B,
 READYTORUN_HELPER_NewMultiDimArr = 0x5C,
 READYTORUN_HELPER_Unbox_TypeTest = 0x5D,

 // Helpers used with generic handle lookup cases
 READYTORUN_HELPER_NewObject = 0x60,
Expand Down

1 change: 1 addition & 0 deletions
src/coreclr/inc/readytorunhelpers.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ HELPER(READYTORUN_HELPER_Box_Nullable, CORINFO_HELP_BOX_NULLABLE,
HELPER(READYTORUN_HELPER_Unbox, CORINFO_HELP_UNBOX, )
HELPER(READYTORUN_HELPER_Unbox_Nullable, CORINFO_HELP_UNBOX_NULLABLE, )
HELPER(READYTORUN_HELPER_NewMultiDimArr, CORINFO_HELP_NEW_MDARR, )
HELPER(READYTORUN_HELPER_Unbox_TypeTest, CORINFO_HELP_UNBOX_TYPETEST, )

HELPER(READYTORUN_HELPER_NewObject, CORINFO_HELP_NEWFAST, )
HELPER(READYTORUN_HELPER_NewArray, CORINFO_HELP_NEWARR_1_DIRECT, )
Expand Down

9 changes: 0 additions & 9 deletions
src/coreclr/jit/objectalloc.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,15 +164,6 @@ inline bool ObjectAllocator::CanAllocateLclVarOnStack(unsigned int lclNu
 return false;
 }

#ifdef FEATURE_READYTORUN
 if (comp->opts.IsReadyToRun())
 {
 // Need to fix getClassGClayout and maybe more
 *reason = "[R2R/NAOT support NYI]";
 return false;
 }
#endif

 classSize = comp->info.compCompHnd->getHeapClassSize(clsHnd);
 }

Expand Down

11 changes: 11 additions & 0 deletions
src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/RuntimeExports.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -227,6 +227,17 @@ public static unsafe void RhUnboxNullable(ref byte data, MethodTable* pUnboxToEE
 RhUnbox(obj, ref data, pUnboxToEEType);
 }

 [RuntimeExport("RhUnboxTypeTest")]
 public static unsafe void RhUnboxTypeTest(MethodTable* pType, MethodTable* pBoxType)
 {
 Debug.Assert(pType->IsValueType);

 if (!UnboxAnyTypeCompare(pType, pBoxType))
 {
 throw pType->GetClasslibException(ExceptionIDs.InvalidCast);
 }
 }

 [RuntimeExport("RhUnbox")]
 public static unsafe void RhUnbox(object? obj, ref byte data, MethodTable* pUnboxToEEType)
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/nativeaot/Runtime/inc/ModuleHeaders.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ struct ReadyToRunHeaderConstants
 static const uint32_t Signature = 0x00525452; // 'RTR'

 static const uint32_t CurrentMajorVersion = 10;
 static const uint32_t CurrentMinorVersion = 0;
 static const uint32_t CurrentMinorVersion = 1;
};

struct ReadyToRunHeader
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/tools/Common/Internal/Runtime/ModuleHeaders.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ internal struct ReadyToRunHeaderConstants
 public const uint Signature = 0x00525452; // 'RTR'

 public const ushort CurrentMajorVersion = 10;
 public const ushort CurrentMinorVersion = 0;
 public const ushort CurrentMinorVersion = 1;
 }
#if READYTORUN
#pragma warning disable 0169
Expand Down

1 change: 1 addition & 0 deletions
src/coreclr/tools/Common/Internal/Runtime/ReadyToRunConstants.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -267,6 +267,7 @@ public enum ReadyToRunHelper
 Unbox = 0x5A,
 Unbox_Nullable = 0x5B,
 NewMultiDimArr = 0x5C,
 Unbox_TypeTest = 0x5D,

 // Helpers used with generic handle lookup cases
 NewObject = 0x60,
Expand Down

33 changes: 22 additions & 11 deletions
src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2352,14 +2352,8 @@ private uint getClassGClayout(CORINFO_CLASS_STRUCT_* cls, byte* gcPtrs)
 uint result = 0;

 MetadataType type = (MetadataType)HandleToObject(cls);

 int pointerSize = PointerSize;

 int ptrsCount = AlignmentHelper.AlignUp(type.InstanceFieldSize.AsInt, pointerSize) / pointerSize;

 // Assume no GC pointers at first
 for (int i = 0; i < ptrsCount; i++)
 gcPtrs[i] = (byte)CorInfoGCType.TYPE_GC_NONE;
 uint size = type.IsValueType ? getClassSize(cls) : getHeapClassSize(cls);
@jkotasjkotasJul 6, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

getHeapClassSize has Debug.Assert(_compilation.IsInheritanceChainLayoutFixedInCurrentVersionBubble(type)); assert. What guarantees that this assert is satisfied?
The stack allocation should be disabled for non-valuetype types that are not fixed in the current version bubble. How is it achieved?
@EgorBoEgorBoJul 10, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

@jkotas it's checked via a separate JIT-EE API: canAllocateOnStack so JIT will never call this function if canAllocateOnStack returned false.
 new Span<byte>(gcPtrs, (int)((size + PointerSize - 1) / PointerSize)).Clear();
@EgorBoEgorBoJul 5, 2024•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

This was copied from CoreCLR impl, it does a similar memset (see this)
Previously, getClassGClayout used InstanceFieldSize.AsInt which for ref types always return just pointer-size while we need the real size. Since it has never been used for ref-types before, it wasn't an issue.

 if (type.ContainsGCPointers || type.IsByRefLike)
 {
Expand DownExpand Up@@ -2606,9 +2600,26 @@ private CorInfoHelpFunc getSharedCCtorHelper(CORINFO_CLASS_STRUCT_* clsHnd)

 private CORINFO_CLASS_STRUCT_* getTypeForBoxOnStack(CORINFO_CLASS_STRUCT_* cls)
 {
 // Todo: implement...
 _ = HandleToObject(cls);
 return null;
 TypeDesc clsTypeDesc = HandleToObject(cls);
 if (clsTypeDesc.IsNullable)
 {
 clsTypeDesc = clsTypeDesc.Instantiation[0];
 }

 if (clsTypeDesc.RequiresAlign8())
 {
 // Conservatively give up on such types (32bit)
 return null;
 }

 // Instantiate StackAllocatedBox<T> helper type with the type we're boxing
 MetadataType placeholderType = _compilation.TypeSystemContext.SystemModule.GetType("System.Runtime.CompilerServices", "StackAllocatedBox`1", throwIfNotFound: false);
 if (placeholderType == null)
 {
 // Give up if corelib does not have support for stackallocation
 return null;
 }
 return ObjectToHandle(placeholderType.MakeInstantiatedType(clsTypeDesc));
 }

 private CorInfoHelpFunc getBoxHelper(CORINFO_CLASS_STRUCT_* cls)
Expand Down

48 changes: 24 additions & 24 deletions
src/coreclr/tools/Common/JitInterface/CorInfoInstructionSet.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -746,18 +746,18 @@ public static InstructionSetFlags ExpandInstructionSetByImplicationHelper(Target
 resultflags.AddInstructionSet(InstructionSet.X64_EVEX);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512DQ))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512DQ_VL))
Expand DownExpand Up@@ -853,18 +853,18 @@ public static InstructionSetFlags ExpandInstructionSetByImplicationHelper(Target
 resultflags.AddInstructionSet(InstructionSet.X86_EVEX);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512DQ))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512DQ_VL))
Expand DownExpand Up@@ -1087,18 +1087,18 @@ private static InstructionSetFlags ExpandInstructionSetByReverseImplicationHelpe
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512DQ);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512DQ))
Expand DownExpand Up@@ -1194,18 +1194,18 @@ private static InstructionSetFlags ExpandInstructionSetByReverseImplicationHelpe
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512DQ);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512DQ))
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Enable "Allocate on stack" for NAOT/R2R#104411

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

EgorBo
merged 21 commits into

from

Jul 14, 2024
 Merged


Enable "Allocate on stack" for NAOT/R2R
#104411
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
000b528

Enable "Allocate on stack" for NAOT/R2R


EgorBo Jul 4, 2024
67b495d

Fix getClassGClayout on NAOT


EgorBo Jul 4, 2024
8e0e9eb

Handle CORINFO_HELP_UNBOX_TYPETEST on NAOT/R2R


EgorBo Jul 4, 2024
2a62eeb

fix build


EgorBo Jul 4, 2024
741e4fa

implement RhUnboxTypeTest


EgorBo Jul 5, 2024
396677b

Update ILCompiler.RyuJit.csproj


EgorBo Jul 5, 2024
19936e7

Update StackAllocatedBox.cs


EgorBo Jul 5, 2024
b07c1a0

clean up


EgorBo Jul 5, 2024
ea65a01

Update src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs


EgorBo Jul 10, 2024
62b67d1

Merge branch 'main' of github.com:dotnet/runtime into alloc-stack-naot


EgorBo Jul 10, 2024
ebd8f9a

Add tests


EgorBo Jul 10, 2024
b5985a5

Address feedback


EgorBo Jul 10, 2024
1ef6ccf

Merge branch 'main' of github.com:dotnet/runtime into alloc-stack-naot


EgorBo Jul 11, 2024
4f9ff46

Update ObjectStackAllocationTests.cs


EgorBo Jul 12, 2024
ac65ff6

Update ObjectStackAllocationTests.cs


EgorBo Jul 12, 2024
203593c

Merge branch 'main' into alloc-stack-naot


EgorBo Jul 12, 2024
001b01c

Merge branch 'alloc-stack-naot' of github.com:EgorBo/runtime-1 into a…


EgorBo Jul 13, 2024
ac0e6e8

Merge branch 'main' of github.com:dotnet/runtime into alloc-stack-naot


EgorBo Jul 13, 2024
ed2568c

Clean up in the test


EgorBo Jul 13, 2024
d6a32b3

Update ObjectStackAllocationTests.csproj


EgorBo Jul 14, 2024
85340ae

Update ObjectStackAllocationTests.cs


EgorBo Jul 14, 2024

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


1 change: 0 additions & 1 deletion
src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -197,7 +197,6 @@
 <Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\CastHelpers.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\ICastableHelpers.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\RuntimeHelpers.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\StackAllocatedBox.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\ControlledExecution.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\DependentHandle.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)..\nativeaot\Common\src\System\Runtime\RhFailFastReason.cs" />
Expand Down

24 changes: 12 additions & 12 deletions
src/coreclr/inc/corinfoinstructionset.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -608,18 +608,18 @@ inline CORINFO_InstructionSetFlags EnsureInstructionSetFlagsAreValid(CORINFO_Ins
 resultflags.RemoveInstructionSet(InstructionSet_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512F_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512BW))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512DQ);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512DQ))
Expand DownExpand Up@@ -714,18 +714,18 @@ inline CORINFO_InstructionSetFlags EnsureInstructionSetFlagsAreValid(CORINFO_Ins
 resultflags.RemoveInstructionSet(InstructionSet_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512F_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512BW))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
Comment thread
EgorBo marked this conversation as resolved.

 if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512DQ);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512DQ))
Expand Down

4 changes: 3 additions & 1 deletion
src/coreclr/inc/readytorun.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@
// If you update this, ensure you run `git grep MINIMUM_READYTORUN_MAJOR_VERSION`
// and handle pending work.
#define READYTORUN_MAJOR_VERSION 10
#define READYTORUN_MINOR_VERSION 0x0000
#define READYTORUN_MINOR_VERSION 0x0001

#define MINIMUM_READYTORUN_MAJOR_VERSION 10

Expand All@@ -37,6 +37,7 @@
// R2R Version 9.3 adds BulkWriteBarrier helper
// uses GCInfo v3, which makes safe points in partially interruptible code interruptible.
// R2R Version 10.0 adds support for the statics being allocated on a per type basis instead of on a per module basis
// R2R Version 10.1 adds Unbox_TypeTest helper

struct READYTORUN_CORE_HEADER
{
Expand DownExpand Up@@ -357,6 +358,7 @@ enum ReadyToRunHelper
 READYTORUN_HELPER_Unbox = 0x5A,
 READYTORUN_HELPER_Unbox_Nullable = 0x5B,
 READYTORUN_HELPER_NewMultiDimArr = 0x5C,
 READYTORUN_HELPER_Unbox_TypeTest = 0x5D,

 // Helpers used with generic handle lookup cases
 READYTORUN_HELPER_NewObject = 0x60,
Expand Down

1 change: 1 addition & 0 deletions
src/coreclr/inc/readytorunhelpers.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ HELPER(READYTORUN_HELPER_Box_Nullable, CORINFO_HELP_BOX_NULLABLE,
HELPER(READYTORUN_HELPER_Unbox, CORINFO_HELP_UNBOX, )
HELPER(READYTORUN_HELPER_Unbox_Nullable, CORINFO_HELP_UNBOX_NULLABLE, )
HELPER(READYTORUN_HELPER_NewMultiDimArr, CORINFO_HELP_NEW_MDARR, )
HELPER(READYTORUN_HELPER_Unbox_TypeTest, CORINFO_HELP_UNBOX_TYPETEST, )

HELPER(READYTORUN_HELPER_NewObject, CORINFO_HELP_NEWFAST, )
HELPER(READYTORUN_HELPER_NewArray, CORINFO_HELP_NEWARR_1_DIRECT, )
Expand Down

9 changes: 0 additions & 9 deletions
src/coreclr/jit/objectalloc.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,15 +164,6 @@ inline bool ObjectAllocator::CanAllocateLclVarOnStack(unsigned int lclNu
 return false;
 }

#ifdef FEATURE_READYTORUN
 if (comp->opts.IsReadyToRun())
 {
 // Need to fix getClassGClayout and maybe more
 *reason = "[R2R/NAOT support NYI]";
 return false;
 }
#endif

 classSize = comp->info.compCompHnd->getHeapClassSize(clsHnd);
 }

Expand Down

11 changes: 11 additions & 0 deletions
src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/RuntimeExports.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -227,6 +227,17 @@ public static unsafe void RhUnboxNullable(ref byte data, MethodTable* pUnboxToEE
 RhUnbox(obj, ref data, pUnboxToEEType);
 }

 [RuntimeExport("RhUnboxTypeTest")]
 public static unsafe void RhUnboxTypeTest(MethodTable* pType, MethodTable* pBoxType)
 {
 Debug.Assert(pType->IsValueType);

 if (!UnboxAnyTypeCompare(pType, pBoxType))
 {
 throw pType->GetClasslibException(ExceptionIDs.InvalidCast);
 }
 }

 [RuntimeExport("RhUnbox")]
 public static unsafe void RhUnbox(object? obj, ref byte data, MethodTable* pUnboxToEEType)
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/nativeaot/Runtime/inc/ModuleHeaders.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ struct ReadyToRunHeaderConstants
 static const uint32_t Signature = 0x00525452; // 'RTR'

 static const uint32_t CurrentMajorVersion = 10;
 static const uint32_t CurrentMinorVersion = 0;
 static const uint32_t CurrentMinorVersion = 1;
};

struct ReadyToRunHeader
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/tools/Common/Internal/Runtime/ModuleHeaders.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ internal struct ReadyToRunHeaderConstants
 public const uint Signature = 0x00525452; // 'RTR'

 public const ushort CurrentMajorVersion = 10;
 public const ushort CurrentMinorVersion = 0;
 public const ushort CurrentMinorVersion = 1;
 }
#if READYTORUN
#pragma warning disable 0169
Expand Down

1 change: 1 addition & 0 deletions
src/coreclr/tools/Common/Internal/Runtime/ReadyToRunConstants.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -267,6 +267,7 @@ public enum ReadyToRunHelper
 Unbox = 0x5A,
 Unbox_Nullable = 0x5B,
 NewMultiDimArr = 0x5C,
 Unbox_TypeTest = 0x5D,

 // Helpers used with generic handle lookup cases
 NewObject = 0x60,
Expand Down

33 changes: 22 additions & 11 deletions
src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2352,14 +2352,8 @@ private uint getClassGClayout(CORINFO_CLASS_STRUCT_* cls, byte* gcPtrs)
 uint result = 0;

 MetadataType type = (MetadataType)HandleToObject(cls);

 int pointerSize = PointerSize;

 int ptrsCount = AlignmentHelper.AlignUp(type.InstanceFieldSize.AsInt, pointerSize) / pointerSize;

 // Assume no GC pointers at first
 for (int i = 0; i < ptrsCount; i++)
 gcPtrs[i] = (byte)CorInfoGCType.TYPE_GC_NONE;
 uint size = type.IsValueType ? getClassSize(cls) : getHeapClassSize(cls);
@jkotasjkotasJul 6, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

getHeapClassSize has Debug.Assert(_compilation.IsInheritanceChainLayoutFixedInCurrentVersionBubble(type)); assert. What guarantees that this assert is satisfied?
The stack allocation should be disabled for non-valuetype types that are not fixed in the current version bubble. How is it achieved?
@EgorBoEgorBoJul 10, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

@jkotas it's checked via a separate JIT-EE API: canAllocateOnStack so JIT will never call this function if canAllocateOnStack returned false.
 new Span<byte>(gcPtrs, (int)((size + PointerSize - 1) / PointerSize)).Clear();
@EgorBoEgorBoJul 5, 2024•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

This was copied from CoreCLR impl, it does a similar memset (see this)
Previously, getClassGClayout used InstanceFieldSize.AsInt which for ref types always return just pointer-size while we need the real size. Since it has never been used for ref-types before, it wasn't an issue.

 if (type.ContainsGCPointers || type.IsByRefLike)
 {
Expand DownExpand Up@@ -2606,9 +2600,26 @@ private CorInfoHelpFunc getSharedCCtorHelper(CORINFO_CLASS_STRUCT_* clsHnd)

 private CORINFO_CLASS_STRUCT_* getTypeForBoxOnStack(CORINFO_CLASS_STRUCT_* cls)
 {
 // Todo: implement...
 _ = HandleToObject(cls);
 return null;
 TypeDesc clsTypeDesc = HandleToObject(cls);
 if (clsTypeDesc.IsNullable)
 {
 clsTypeDesc = clsTypeDesc.Instantiation[0];
 }

 if (clsTypeDesc.RequiresAlign8())
 {
 // Conservatively give up on such types (32bit)
 return null;
 }

 // Instantiate StackAllocatedBox<T> helper type with the type we're boxing
 MetadataType placeholderType = _compilation.TypeSystemContext.SystemModule.GetType("System.Runtime.CompilerServices", "StackAllocatedBox`1", throwIfNotFound: false);
 if (placeholderType == null)
 {
 // Give up if corelib does not have support for stackallocation
 return null;
 }
 return ObjectToHandle(placeholderType.MakeInstantiatedType(clsTypeDesc));
 }

 private CorInfoHelpFunc getBoxHelper(CORINFO_CLASS_STRUCT_* cls)
Expand Down

48 changes: 24 additions & 24 deletions
src/coreclr/tools/Common/JitInterface/CorInfoInstructionSet.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -746,18 +746,18 @@ public static InstructionSetFlags ExpandInstructionSetByImplicationHelper(Target
 resultflags.AddInstructionSet(InstructionSet.X64_EVEX);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512DQ))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512DQ_VL))
Expand DownExpand Up@@ -853,18 +853,18 @@ public static InstructionSetFlags ExpandInstructionSetByImplicationHelper(Target
 resultflags.AddInstructionSet(InstructionSet.X86_EVEX);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512DQ))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512DQ_VL))
Expand DownExpand Up@@ -1087,18 +1087,18 @@ private static InstructionSetFlags ExpandInstructionSetByReverseImplicationHelpe
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512DQ);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512DQ))
Expand DownExpand Up@@ -1194,18 +1194,18 @@ private static InstructionSetFlags ExpandInstructionSetByReverseImplicationHelpe
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512DQ);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512DQ))
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Enable "Allocate on stack" for NAOT/R2R#104411

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

EgorBo
merged 21 commits into

from

Jul 14, 2024
 Merged


Enable "Allocate on stack" for NAOT/R2R
#104411
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
000b528

Enable "Allocate on stack" for NAOT/R2R


EgorBo Jul 4, 2024
67b495d

Fix getClassGClayout on NAOT


EgorBo Jul 4, 2024
8e0e9eb

Handle CORINFO_HELP_UNBOX_TYPETEST on NAOT/R2R


EgorBo Jul 4, 2024
2a62eeb

fix build


EgorBo Jul 4, 2024
741e4fa

implement RhUnboxTypeTest


EgorBo Jul 5, 2024
396677b

Update ILCompiler.RyuJit.csproj


EgorBo Jul 5, 2024
19936e7

Update StackAllocatedBox.cs


EgorBo Jul 5, 2024
b07c1a0

clean up


EgorBo Jul 5, 2024
ea65a01

Update src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs


EgorBo Jul 10, 2024
62b67d1

Merge branch 'main' of github.com:dotnet/runtime into alloc-stack-naot


EgorBo Jul 10, 2024
ebd8f9a

Add tests


EgorBo Jul 10, 2024
b5985a5

Address feedback


EgorBo Jul 10, 2024
1ef6ccf

Merge branch 'main' of github.com:dotnet/runtime into alloc-stack-naot


EgorBo Jul 11, 2024
4f9ff46

Update ObjectStackAllocationTests.cs


EgorBo Jul 12, 2024
ac65ff6

Update ObjectStackAllocationTests.cs


EgorBo Jul 12, 2024
203593c

Merge branch 'main' into alloc-stack-naot


EgorBo Jul 12, 2024
001b01c

Merge branch 'alloc-stack-naot' of github.com:EgorBo/runtime-1 into a…


EgorBo Jul 13, 2024
ac0e6e8

Merge branch 'main' of github.com:dotnet/runtime into alloc-stack-naot


EgorBo Jul 13, 2024
ed2568c

Clean up in the test


EgorBo Jul 13, 2024
d6a32b3

Update ObjectStackAllocationTests.csproj


EgorBo Jul 14, 2024
85340ae

Update ObjectStackAllocationTests.cs


EgorBo Jul 14, 2024

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


1 change: 0 additions & 1 deletion
src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -197,7 +197,6 @@
 <Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\CastHelpers.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\ICastableHelpers.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\RuntimeHelpers.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\StackAllocatedBox.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\ControlledExecution.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\DependentHandle.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)..\nativeaot\Common\src\System\Runtime\RhFailFastReason.cs" />
Expand Down

24 changes: 12 additions & 12 deletions
src/coreclr/inc/corinfoinstructionset.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -608,18 +608,18 @@ inline CORINFO_InstructionSetFlags EnsureInstructionSetFlagsAreValid(CORINFO_Ins
 resultflags.RemoveInstructionSet(InstructionSet_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512F_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512BW))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512DQ);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512DQ))
Expand DownExpand Up@@ -714,18 +714,18 @@ inline CORINFO_InstructionSetFlags EnsureInstructionSetFlagsAreValid(CORINFO_Ins
 resultflags.RemoveInstructionSet(InstructionSet_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512F_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512BW))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
Comment thread
EgorBo marked this conversation as resolved.

 if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512DQ);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512DQ))
Expand Down

4 changes: 3 additions & 1 deletion
src/coreclr/inc/readytorun.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@
// If you update this, ensure you run `git grep MINIMUM_READYTORUN_MAJOR_VERSION`
// and handle pending work.
#define READYTORUN_MAJOR_VERSION 10
#define READYTORUN_MINOR_VERSION 0x0000
#define READYTORUN_MINOR_VERSION 0x0001

#define MINIMUM_READYTORUN_MAJOR_VERSION 10

Expand All@@ -37,6 +37,7 @@
// R2R Version 9.3 adds BulkWriteBarrier helper
// uses GCInfo v3, which makes safe points in partially interruptible code interruptible.
// R2R Version 10.0 adds support for the statics being allocated on a per type basis instead of on a per module basis
// R2R Version 10.1 adds Unbox_TypeTest helper

struct READYTORUN_CORE_HEADER
{
Expand DownExpand Up@@ -357,6 +358,7 @@ enum ReadyToRunHelper
 READYTORUN_HELPER_Unbox = 0x5A,
 READYTORUN_HELPER_Unbox_Nullable = 0x5B,
 READYTORUN_HELPER_NewMultiDimArr = 0x5C,
 READYTORUN_HELPER_Unbox_TypeTest = 0x5D,

 // Helpers used with generic handle lookup cases
 READYTORUN_HELPER_NewObject = 0x60,
Expand Down

1 change: 1 addition & 0 deletions
src/coreclr/inc/readytorunhelpers.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ HELPER(READYTORUN_HELPER_Box_Nullable, CORINFO_HELP_BOX_NULLABLE,
HELPER(READYTORUN_HELPER_Unbox, CORINFO_HELP_UNBOX, )
HELPER(READYTORUN_HELPER_Unbox_Nullable, CORINFO_HELP_UNBOX_NULLABLE, )
HELPER(READYTORUN_HELPER_NewMultiDimArr, CORINFO_HELP_NEW_MDARR, )
HELPER(READYTORUN_HELPER_Unbox_TypeTest, CORINFO_HELP_UNBOX_TYPETEST, )

HELPER(READYTORUN_HELPER_NewObject, CORINFO_HELP_NEWFAST, )
HELPER(READYTORUN_HELPER_NewArray, CORINFO_HELP_NEWARR_1_DIRECT, )
Expand Down

9 changes: 0 additions & 9 deletions
src/coreclr/jit/objectalloc.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,15 +164,6 @@ inline bool ObjectAllocator::CanAllocateLclVarOnStack(unsigned int lclNu
 return false;
 }

#ifdef FEATURE_READYTORUN
 if (comp->opts.IsReadyToRun())
 {
 // Need to fix getClassGClayout and maybe more
 *reason = "[R2R/NAOT support NYI]";
 return false;
 }
#endif

 classSize = comp->info.compCompHnd->getHeapClassSize(clsHnd);
 }

Expand Down

11 changes: 11 additions & 0 deletions
src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/RuntimeExports.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -227,6 +227,17 @@ public static unsafe void RhUnboxNullable(ref byte data, MethodTable* pUnboxToEE
 RhUnbox(obj, ref data, pUnboxToEEType);
 }

 [RuntimeExport("RhUnboxTypeTest")]
 public static unsafe void RhUnboxTypeTest(MethodTable* pType, MethodTable* pBoxType)
 {
 Debug.Assert(pType->IsValueType);

 if (!UnboxAnyTypeCompare(pType, pBoxType))
 {
 throw pType->GetClasslibException(ExceptionIDs.InvalidCast);
 }
 }

 [RuntimeExport("RhUnbox")]
 public static unsafe void RhUnbox(object? obj, ref byte data, MethodTable* pUnboxToEEType)
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/nativeaot/Runtime/inc/ModuleHeaders.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ struct ReadyToRunHeaderConstants
 static const uint32_t Signature = 0x00525452; // 'RTR'

 static const uint32_t CurrentMajorVersion = 10;
 static const uint32_t CurrentMinorVersion = 0;
 static const uint32_t CurrentMinorVersion = 1;
};

struct ReadyToRunHeader
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/tools/Common/Internal/Runtime/ModuleHeaders.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ internal struct ReadyToRunHeaderConstants
 public const uint Signature = 0x00525452; // 'RTR'

 public const ushort CurrentMajorVersion = 10;
 public const ushort CurrentMinorVersion = 0;
 public const ushort CurrentMinorVersion = 1;
 }
#if READYTORUN
#pragma warning disable 0169
Expand Down

1 change: 1 addition & 0 deletions
src/coreclr/tools/Common/Internal/Runtime/ReadyToRunConstants.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -267,6 +267,7 @@ public enum ReadyToRunHelper
 Unbox = 0x5A,
 Unbox_Nullable = 0x5B,
 NewMultiDimArr = 0x5C,
 Unbox_TypeTest = 0x5D,

 // Helpers used with generic handle lookup cases
 NewObject = 0x60,
Expand Down

33 changes: 22 additions & 11 deletions
src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2352,14 +2352,8 @@ private uint getClassGClayout(CORINFO_CLASS_STRUCT_* cls, byte* gcPtrs)
 uint result = 0;

 MetadataType type = (MetadataType)HandleToObject(cls);

 int pointerSize = PointerSize;

 int ptrsCount = AlignmentHelper.AlignUp(type.InstanceFieldSize.AsInt, pointerSize) / pointerSize;

 // Assume no GC pointers at first
 for (int i = 0; i < ptrsCount; i++)
 gcPtrs[i] = (byte)CorInfoGCType.TYPE_GC_NONE;
 uint size = type.IsValueType ? getClassSize(cls) : getHeapClassSize(cls);
@jkotasjkotasJul 6, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

getHeapClassSize has Debug.Assert(_compilation.IsInheritanceChainLayoutFixedInCurrentVersionBubble(type)); assert. What guarantees that this assert is satisfied?
The stack allocation should be disabled for non-valuetype types that are not fixed in the current version bubble. How is it achieved?
@EgorBoEgorBoJul 10, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

@jkotas it's checked via a separate JIT-EE API: canAllocateOnStack so JIT will never call this function if canAllocateOnStack returned false.
 new Span<byte>(gcPtrs, (int)((size + PointerSize - 1) / PointerSize)).Clear();
@EgorBoEgorBoJul 5, 2024•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

This was copied from CoreCLR impl, it does a similar memset (see this)
Previously, getClassGClayout used InstanceFieldSize.AsInt which for ref types always return just pointer-size while we need the real size. Since it has never been used for ref-types before, it wasn't an issue.

 if (type.ContainsGCPointers || type.IsByRefLike)
 {
Expand DownExpand Up@@ -2606,9 +2600,26 @@ private CorInfoHelpFunc getSharedCCtorHelper(CORINFO_CLASS_STRUCT_* clsHnd)

 private CORINFO_CLASS_STRUCT_* getTypeForBoxOnStack(CORINFO_CLASS_STRUCT_* cls)
 {
 // Todo: implement...
 _ = HandleToObject(cls);
 return null;
 TypeDesc clsTypeDesc = HandleToObject(cls);
 if (clsTypeDesc.IsNullable)
 {
 clsTypeDesc = clsTypeDesc.Instantiation[0];
 }

 if (clsTypeDesc.RequiresAlign8())
 {
 // Conservatively give up on such types (32bit)
 return null;
 }

 // Instantiate StackAllocatedBox<T> helper type with the type we're boxing
 MetadataType placeholderType = _compilation.TypeSystemContext.SystemModule.GetType("System.Runtime.CompilerServices", "StackAllocatedBox`1", throwIfNotFound: false);
 if (placeholderType == null)
 {
 // Give up if corelib does not have support for stackallocation
 return null;
 }
 return ObjectToHandle(placeholderType.MakeInstantiatedType(clsTypeDesc));
 }

 private CorInfoHelpFunc getBoxHelper(CORINFO_CLASS_STRUCT_* cls)
Expand Down

48 changes: 24 additions & 24 deletions
src/coreclr/tools/Common/JitInterface/CorInfoInstructionSet.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -746,18 +746,18 @@ public static InstructionSetFlags ExpandInstructionSetByImplicationHelper(Target
 resultflags.AddInstructionSet(InstructionSet.X64_EVEX);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512DQ))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512DQ_VL))
Expand DownExpand Up@@ -853,18 +853,18 @@ public static InstructionSetFlags ExpandInstructionSetByImplicationHelper(Target
 resultflags.AddInstructionSet(InstructionSet.X86_EVEX);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512DQ))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512DQ_VL))
Expand DownExpand Up@@ -1087,18 +1087,18 @@ private static InstructionSetFlags ExpandInstructionSetByReverseImplicationHelpe
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512DQ);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512DQ))
Expand DownExpand Up@@ -1194,18 +1194,18 @@ private static InstructionSetFlags ExpandInstructionSetByReverseImplicationHelpe
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512DQ);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512DQ))
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Enable "Allocate on stack" for NAOT/R2R#104411

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

EgorBo
merged 21 commits into

from

Jul 14, 2024
 Merged


Enable "Allocate on stack" for NAOT/R2R
#104411
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
000b528

Enable "Allocate on stack" for NAOT/R2R


EgorBo Jul 4, 2024
67b495d

Fix getClassGClayout on NAOT


EgorBo Jul 4, 2024
8e0e9eb

Handle CORINFO_HELP_UNBOX_TYPETEST on NAOT/R2R


EgorBo Jul 4, 2024
2a62eeb

fix build


EgorBo Jul 4, 2024
741e4fa

implement RhUnboxTypeTest


EgorBo Jul 5, 2024
396677b

Update ILCompiler.RyuJit.csproj


EgorBo Jul 5, 2024
19936e7

Update StackAllocatedBox.cs


EgorBo Jul 5, 2024
b07c1a0

clean up


EgorBo Jul 5, 2024
ea65a01

Update src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs


EgorBo Jul 10, 2024
62b67d1

Merge branch 'main' of github.com:dotnet/runtime into alloc-stack-naot


EgorBo Jul 10, 2024
ebd8f9a

Add tests


EgorBo Jul 10, 2024
b5985a5

Address feedback


EgorBo Jul 10, 2024
1ef6ccf

Merge branch 'main' of github.com:dotnet/runtime into alloc-stack-naot


EgorBo Jul 11, 2024
4f9ff46

Update ObjectStackAllocationTests.cs


EgorBo Jul 12, 2024
ac65ff6

Update ObjectStackAllocationTests.cs


EgorBo Jul 12, 2024
203593c

Merge branch 'main' into alloc-stack-naot


EgorBo Jul 12, 2024
001b01c

Merge branch 'alloc-stack-naot' of github.com:EgorBo/runtime-1 into a…


EgorBo Jul 13, 2024
ac0e6e8

Merge branch 'main' of github.com:dotnet/runtime into alloc-stack-naot


EgorBo Jul 13, 2024
ed2568c

Clean up in the test


EgorBo Jul 13, 2024
d6a32b3

Update ObjectStackAllocationTests.csproj


EgorBo Jul 14, 2024
85340ae

Update ObjectStackAllocationTests.cs


EgorBo Jul 14, 2024

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


1 change: 0 additions & 1 deletion
src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -197,7 +197,6 @@
 <Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\CastHelpers.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\ICastableHelpers.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\RuntimeHelpers.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\StackAllocatedBox.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\ControlledExecution.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\DependentHandle.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)..\nativeaot\Common\src\System\Runtime\RhFailFastReason.cs" />
Expand Down

24 changes: 12 additions & 12 deletions
src/coreclr/inc/corinfoinstructionset.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -608,18 +608,18 @@ inline CORINFO_InstructionSetFlags EnsureInstructionSetFlagsAreValid(CORINFO_Ins
 resultflags.RemoveInstructionSet(InstructionSet_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512F_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512BW))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512DQ);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512DQ))
Expand DownExpand Up@@ -714,18 +714,18 @@ inline CORINFO_InstructionSetFlags EnsureInstructionSetFlagsAreValid(CORINFO_Ins
 resultflags.RemoveInstructionSet(InstructionSet_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512F_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512BW))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
Comment thread
EgorBo marked this conversation as resolved.

 if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512DQ);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512DQ))
Expand Down

4 changes: 3 additions & 1 deletion
src/coreclr/inc/readytorun.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@
// If you update this, ensure you run `git grep MINIMUM_READYTORUN_MAJOR_VERSION`
// and handle pending work.
#define READYTORUN_MAJOR_VERSION 10
#define READYTORUN_MINOR_VERSION 0x0000
#define READYTORUN_MINOR_VERSION 0x0001

#define MINIMUM_READYTORUN_MAJOR_VERSION 10

Expand All@@ -37,6 +37,7 @@
// R2R Version 9.3 adds BulkWriteBarrier helper
// uses GCInfo v3, which makes safe points in partially interruptible code interruptible.
// R2R Version 10.0 adds support for the statics being allocated on a per type basis instead of on a per module basis
// R2R Version 10.1 adds Unbox_TypeTest helper

struct READYTORUN_CORE_HEADER
{
Expand DownExpand Up@@ -357,6 +358,7 @@ enum ReadyToRunHelper
 READYTORUN_HELPER_Unbox = 0x5A,
 READYTORUN_HELPER_Unbox_Nullable = 0x5B,
 READYTORUN_HELPER_NewMultiDimArr = 0x5C,
 READYTORUN_HELPER_Unbox_TypeTest = 0x5D,

 // Helpers used with generic handle lookup cases
 READYTORUN_HELPER_NewObject = 0x60,
Expand Down

1 change: 1 addition & 0 deletions
src/coreclr/inc/readytorunhelpers.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ HELPER(READYTORUN_HELPER_Box_Nullable, CORINFO_HELP_BOX_NULLABLE,
HELPER(READYTORUN_HELPER_Unbox, CORINFO_HELP_UNBOX, )
HELPER(READYTORUN_HELPER_Unbox_Nullable, CORINFO_HELP_UNBOX_NULLABLE, )
HELPER(READYTORUN_HELPER_NewMultiDimArr, CORINFO_HELP_NEW_MDARR, )
HELPER(READYTORUN_HELPER_Unbox_TypeTest, CORINFO_HELP_UNBOX_TYPETEST, )

HELPER(READYTORUN_HELPER_NewObject, CORINFO_HELP_NEWFAST, )
HELPER(READYTORUN_HELPER_NewArray, CORINFO_HELP_NEWARR_1_DIRECT, )
Expand Down

9 changes: 0 additions & 9 deletions
src/coreclr/jit/objectalloc.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,15 +164,6 @@ inline bool ObjectAllocator::CanAllocateLclVarOnStack(unsigned int lclNu
 return false;
 }

#ifdef FEATURE_READYTORUN
 if (comp->opts.IsReadyToRun())
 {
 // Need to fix getClassGClayout and maybe more
 *reason = "[R2R/NAOT support NYI]";
 return false;
 }
#endif

 classSize = comp->info.compCompHnd->getHeapClassSize(clsHnd);
 }

Expand Down

11 changes: 11 additions & 0 deletions
src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/RuntimeExports.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -227,6 +227,17 @@ public static unsafe void RhUnboxNullable(ref byte data, MethodTable* pUnboxToEE
 RhUnbox(obj, ref data, pUnboxToEEType);
 }

 [RuntimeExport("RhUnboxTypeTest")]
 public static unsafe void RhUnboxTypeTest(MethodTable* pType, MethodTable* pBoxType)
 {
 Debug.Assert(pType->IsValueType);

 if (!UnboxAnyTypeCompare(pType, pBoxType))
 {
 throw pType->GetClasslibException(ExceptionIDs.InvalidCast);
 }
 }

 [RuntimeExport("RhUnbox")]
 public static unsafe void RhUnbox(object? obj, ref byte data, MethodTable* pUnboxToEEType)
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/nativeaot/Runtime/inc/ModuleHeaders.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ struct ReadyToRunHeaderConstants
 static const uint32_t Signature = 0x00525452; // 'RTR'

 static const uint32_t CurrentMajorVersion = 10;
 static const uint32_t CurrentMinorVersion = 0;
 static const uint32_t CurrentMinorVersion = 1;
};

struct ReadyToRunHeader
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/tools/Common/Internal/Runtime/ModuleHeaders.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ internal struct ReadyToRunHeaderConstants
 public const uint Signature = 0x00525452; // 'RTR'

 public const ushort CurrentMajorVersion = 10;
 public const ushort CurrentMinorVersion = 0;
 public const ushort CurrentMinorVersion = 1;
 }
#if READYTORUN
#pragma warning disable 0169
Expand Down

1 change: 1 addition & 0 deletions
src/coreclr/tools/Common/Internal/Runtime/ReadyToRunConstants.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -267,6 +267,7 @@ public enum ReadyToRunHelper
 Unbox = 0x5A,
 Unbox_Nullable = 0x5B,
 NewMultiDimArr = 0x5C,
 Unbox_TypeTest = 0x5D,

 // Helpers used with generic handle lookup cases
 NewObject = 0x60,
Expand Down

33 changes: 22 additions & 11 deletions
src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2352,14 +2352,8 @@ private uint getClassGClayout(CORINFO_CLASS_STRUCT_* cls, byte* gcPtrs)
 uint result = 0;

 MetadataType type = (MetadataType)HandleToObject(cls);

 int pointerSize = PointerSize;

 int ptrsCount = AlignmentHelper.AlignUp(type.InstanceFieldSize.AsInt, pointerSize) / pointerSize;

 // Assume no GC pointers at first
 for (int i = 0; i < ptrsCount; i++)
 gcPtrs[i] = (byte)CorInfoGCType.TYPE_GC_NONE;
 uint size = type.IsValueType ? getClassSize(cls) : getHeapClassSize(cls);
@jkotasjkotasJul 6, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

getHeapClassSize has Debug.Assert(_compilation.IsInheritanceChainLayoutFixedInCurrentVersionBubble(type)); assert. What guarantees that this assert is satisfied?
The stack allocation should be disabled for non-valuetype types that are not fixed in the current version bubble. How is it achieved?
@EgorBoEgorBoJul 10, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

@jkotas it's checked via a separate JIT-EE API: canAllocateOnStack so JIT will never call this function if canAllocateOnStack returned false.
 new Span<byte>(gcPtrs, (int)((size + PointerSize - 1) / PointerSize)).Clear();
@EgorBoEgorBoJul 5, 2024•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

This was copied from CoreCLR impl, it does a similar memset (see this)
Previously, getClassGClayout used InstanceFieldSize.AsInt which for ref types always return just pointer-size while we need the real size. Since it has never been used for ref-types before, it wasn't an issue.

 if (type.ContainsGCPointers || type.IsByRefLike)
 {
Expand DownExpand Up@@ -2606,9 +2600,26 @@ private CorInfoHelpFunc getSharedCCtorHelper(CORINFO_CLASS_STRUCT_* clsHnd)

 private CORINFO_CLASS_STRUCT_* getTypeForBoxOnStack(CORINFO_CLASS_STRUCT_* cls)
 {
 // Todo: implement...
 _ = HandleToObject(cls);
 return null;
 TypeDesc clsTypeDesc = HandleToObject(cls);
 if (clsTypeDesc.IsNullable)
 {
 clsTypeDesc = clsTypeDesc.Instantiation[0];
 }

 if (clsTypeDesc.RequiresAlign8())
 {
 // Conservatively give up on such types (32bit)
 return null;
 }

 // Instantiate StackAllocatedBox<T> helper type with the type we're boxing
 MetadataType placeholderType = _compilation.TypeSystemContext.SystemModule.GetType("System.Runtime.CompilerServices", "StackAllocatedBox`1", throwIfNotFound: false);
 if (placeholderType == null)
 {
 // Give up if corelib does not have support for stackallocation
 return null;
 }
 return ObjectToHandle(placeholderType.MakeInstantiatedType(clsTypeDesc));
 }

 private CorInfoHelpFunc getBoxHelper(CORINFO_CLASS_STRUCT_* cls)
Expand Down

48 changes: 24 additions & 24 deletions
src/coreclr/tools/Common/JitInterface/CorInfoInstructionSet.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -746,18 +746,18 @@ public static InstructionSetFlags ExpandInstructionSetByImplicationHelper(Target
 resultflags.AddInstructionSet(InstructionSet.X64_EVEX);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512DQ))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512DQ_VL))
Expand DownExpand Up@@ -853,18 +853,18 @@ public static InstructionSetFlags ExpandInstructionSetByImplicationHelper(Target
 resultflags.AddInstructionSet(InstructionSet.X86_EVEX);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512DQ))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512DQ_VL))
Expand DownExpand Up@@ -1087,18 +1087,18 @@ private static InstructionSetFlags ExpandInstructionSetByReverseImplicationHelpe
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512DQ);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512DQ))
Expand DownExpand Up@@ -1194,18 +1194,18 @@ private static InstructionSetFlags ExpandInstructionSetByReverseImplicationHelpe
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512DQ);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512DQ))
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Enable "Allocate on stack" for NAOT/R2R#104411

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

EgorBo
merged 21 commits into

from

Jul 14, 2024
 Merged


Enable "Allocate on stack" for NAOT/R2R
#104411
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
000b528

Enable "Allocate on stack" for NAOT/R2R


EgorBo Jul 4, 2024
67b495d

Fix getClassGClayout on NAOT


EgorBo Jul 4, 2024
8e0e9eb

Handle CORINFO_HELP_UNBOX_TYPETEST on NAOT/R2R


EgorBo Jul 4, 2024
2a62eeb

fix build


EgorBo Jul 4, 2024
741e4fa

implement RhUnboxTypeTest


EgorBo Jul 5, 2024
396677b

Update ILCompiler.RyuJit.csproj


EgorBo Jul 5, 2024
19936e7

Update StackAllocatedBox.cs


EgorBo Jul 5, 2024
b07c1a0

clean up


EgorBo Jul 5, 2024
ea65a01

Update src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs


EgorBo Jul 10, 2024
62b67d1

Merge branch 'main' of github.com:dotnet/runtime into alloc-stack-naot


EgorBo Jul 10, 2024
ebd8f9a

Add tests


EgorBo Jul 10, 2024
b5985a5

Address feedback


EgorBo Jul 10, 2024
1ef6ccf

Merge branch 'main' of github.com:dotnet/runtime into alloc-stack-naot


EgorBo Jul 11, 2024
4f9ff46

Update ObjectStackAllocationTests.cs


EgorBo Jul 12, 2024
ac65ff6

Update ObjectStackAllocationTests.cs


EgorBo Jul 12, 2024
203593c

Merge branch 'main' into alloc-stack-naot


EgorBo Jul 12, 2024
001b01c

Merge branch 'alloc-stack-naot' of github.com:EgorBo/runtime-1 into a…


EgorBo Jul 13, 2024
ac0e6e8

Merge branch 'main' of github.com:dotnet/runtime into alloc-stack-naot


EgorBo Jul 13, 2024
ed2568c

Clean up in the test


EgorBo Jul 13, 2024
d6a32b3

Update ObjectStackAllocationTests.csproj


EgorBo Jul 14, 2024
85340ae

Update ObjectStackAllocationTests.cs


EgorBo Jul 14, 2024

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


1 change: 0 additions & 1 deletion
src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -197,7 +197,6 @@
 <Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\CastHelpers.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\ICastableHelpers.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\RuntimeHelpers.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\StackAllocatedBox.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\ControlledExecution.CoreCLR.cs" />
 <Compile Include="$(BclSourcesRoot)\System\Runtime\DependentHandle.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)..\nativeaot\Common\src\System\Runtime\RhFailFastReason.cs" />
Expand Down

24 changes: 12 additions & 12 deletions
src/coreclr/inc/corinfoinstructionset.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -608,18 +608,18 @@ inline CORINFO_InstructionSetFlags EnsureInstructionSetFlagsAreValid(CORINFO_Ins
 resultflags.RemoveInstructionSet(InstructionSet_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512F_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512BW))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512DQ);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512DQ))
Expand DownExpand Up@@ -714,18 +714,18 @@ inline CORINFO_InstructionSetFlags EnsureInstructionSetFlagsAreValid(CORINFO_Ins
 resultflags.RemoveInstructionSet(InstructionSet_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512F_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512BW))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512BW_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512CD))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512CD_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512F_VL))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512CD_VL);
Comment thread
EgorBo marked this conversation as resolved.

 if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ) && !resultflags.HasInstructionSet(InstructionSet_AVX512F))
 resultflags.RemoveInstructionSet(InstructionSet_AVX512DQ);
 if (resultflags.HasInstructionSet(InstructionSet_AVX512DQ_VL) && !resultflags.HasInstructionSet(InstructionSet_AVX512DQ))
Expand Down

4 changes: 3 additions & 1 deletion
src/coreclr/inc/readytorun.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@
// If you update this, ensure you run `git grep MINIMUM_READYTORUN_MAJOR_VERSION`
// and handle pending work.
#define READYTORUN_MAJOR_VERSION 10
#define READYTORUN_MINOR_VERSION 0x0000
#define READYTORUN_MINOR_VERSION 0x0001

#define MINIMUM_READYTORUN_MAJOR_VERSION 10

Expand All@@ -37,6 +37,7 @@
// R2R Version 9.3 adds BulkWriteBarrier helper
// uses GCInfo v3, which makes safe points in partially interruptible code interruptible.
// R2R Version 10.0 adds support for the statics being allocated on a per type basis instead of on a per module basis
// R2R Version 10.1 adds Unbox_TypeTest helper

struct READYTORUN_CORE_HEADER
{
Expand DownExpand Up@@ -357,6 +358,7 @@ enum ReadyToRunHelper
 READYTORUN_HELPER_Unbox = 0x5A,
 READYTORUN_HELPER_Unbox_Nullable = 0x5B,
 READYTORUN_HELPER_NewMultiDimArr = 0x5C,
 READYTORUN_HELPER_Unbox_TypeTest = 0x5D,

 // Helpers used with generic handle lookup cases
 READYTORUN_HELPER_NewObject = 0x60,
Expand Down

1 change: 1 addition & 0 deletions
src/coreclr/inc/readytorunhelpers.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ HELPER(READYTORUN_HELPER_Box_Nullable, CORINFO_HELP_BOX_NULLABLE,
HELPER(READYTORUN_HELPER_Unbox, CORINFO_HELP_UNBOX, )
HELPER(READYTORUN_HELPER_Unbox_Nullable, CORINFO_HELP_UNBOX_NULLABLE, )
HELPER(READYTORUN_HELPER_NewMultiDimArr, CORINFO_HELP_NEW_MDARR, )
HELPER(READYTORUN_HELPER_Unbox_TypeTest, CORINFO_HELP_UNBOX_TYPETEST, )

HELPER(READYTORUN_HELPER_NewObject, CORINFO_HELP_NEWFAST, )
HELPER(READYTORUN_HELPER_NewArray, CORINFO_HELP_NEWARR_1_DIRECT, )
Expand Down

9 changes: 0 additions & 9 deletions
src/coreclr/jit/objectalloc.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,15 +164,6 @@ inline bool ObjectAllocator::CanAllocateLclVarOnStack(unsigned int lclNu
 return false;
 }

#ifdef FEATURE_READYTORUN
 if (comp->opts.IsReadyToRun())
 {
 // Need to fix getClassGClayout and maybe more
 *reason = "[R2R/NAOT support NYI]";
 return false;
 }
#endif

 classSize = comp->info.compCompHnd->getHeapClassSize(clsHnd);
 }

Expand Down

11 changes: 11 additions & 0 deletions
src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/RuntimeExports.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -227,6 +227,17 @@ public static unsafe void RhUnboxNullable(ref byte data, MethodTable* pUnboxToEE
 RhUnbox(obj, ref data, pUnboxToEEType);
 }

 [RuntimeExport("RhUnboxTypeTest")]
 public static unsafe void RhUnboxTypeTest(MethodTable* pType, MethodTable* pBoxType)
 {
 Debug.Assert(pType->IsValueType);

 if (!UnboxAnyTypeCompare(pType, pBoxType))
 {
 throw pType->GetClasslibException(ExceptionIDs.InvalidCast);
 }
 }

 [RuntimeExport("RhUnbox")]
 public static unsafe void RhUnbox(object? obj, ref byte data, MethodTable* pUnboxToEEType)
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/nativeaot/Runtime/inc/ModuleHeaders.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ struct ReadyToRunHeaderConstants
 static const uint32_t Signature = 0x00525452; // 'RTR'

 static const uint32_t CurrentMajorVersion = 10;
 static const uint32_t CurrentMinorVersion = 0;
 static const uint32_t CurrentMinorVersion = 1;
};

struct ReadyToRunHeader
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/tools/Common/Internal/Runtime/ModuleHeaders.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ internal struct ReadyToRunHeaderConstants
 public const uint Signature = 0x00525452; // 'RTR'

 public const ushort CurrentMajorVersion = 10;
 public const ushort CurrentMinorVersion = 0;
 public const ushort CurrentMinorVersion = 1;
 }
#if READYTORUN
#pragma warning disable 0169
Expand Down

1 change: 1 addition & 0 deletions
src/coreclr/tools/Common/Internal/Runtime/ReadyToRunConstants.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -267,6 +267,7 @@ public enum ReadyToRunHelper
 Unbox = 0x5A,
 Unbox_Nullable = 0x5B,
 NewMultiDimArr = 0x5C,
 Unbox_TypeTest = 0x5D,

 // Helpers used with generic handle lookup cases
 NewObject = 0x60,
Expand Down

33 changes: 22 additions & 11 deletions
src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2352,14 +2352,8 @@ private uint getClassGClayout(CORINFO_CLASS_STRUCT_* cls, byte* gcPtrs)
 uint result = 0;

 MetadataType type = (MetadataType)HandleToObject(cls);

 int pointerSize = PointerSize;

 int ptrsCount = AlignmentHelper.AlignUp(type.InstanceFieldSize.AsInt, pointerSize) / pointerSize;

 // Assume no GC pointers at first
 for (int i = 0; i < ptrsCount; i++)
 gcPtrs[i] = (byte)CorInfoGCType.TYPE_GC_NONE;
 uint size = type.IsValueType ? getClassSize(cls) : getHeapClassSize(cls);
@jkotasjkotasJul 6, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

getHeapClassSize has Debug.Assert(_compilation.IsInheritanceChainLayoutFixedInCurrentVersionBubble(type)); assert. What guarantees that this assert is satisfied?
The stack allocation should be disabled for non-valuetype types that are not fixed in the current version bubble. How is it achieved?
@EgorBoEgorBoJul 10, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

@jkotas it's checked via a separate JIT-EE API: canAllocateOnStack so JIT will never call this function if canAllocateOnStack returned false.
 new Span<byte>(gcPtrs, (int)((size + PointerSize - 1) / PointerSize)).Clear();
@EgorBoEgorBoJul 5, 2024•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

This was copied from CoreCLR impl, it does a similar memset (see this)
Previously, getClassGClayout used InstanceFieldSize.AsInt which for ref types always return just pointer-size while we need the real size. Since it has never been used for ref-types before, it wasn't an issue.

 if (type.ContainsGCPointers || type.IsByRefLike)
 {
Expand DownExpand Up@@ -2606,9 +2600,26 @@ private CorInfoHelpFunc getSharedCCtorHelper(CORINFO_CLASS_STRUCT_* clsHnd)

 private CORINFO_CLASS_STRUCT_* getTypeForBoxOnStack(CORINFO_CLASS_STRUCT_* cls)
 {
 // Todo: implement...
 _ = HandleToObject(cls);
 return null;
 TypeDesc clsTypeDesc = HandleToObject(cls);
 if (clsTypeDesc.IsNullable)
 {
 clsTypeDesc = clsTypeDesc.Instantiation[0];
 }

 if (clsTypeDesc.RequiresAlign8())
 {
 // Conservatively give up on such types (32bit)
 return null;
 }

 // Instantiate StackAllocatedBox<T> helper type with the type we're boxing
 MetadataType placeholderType = _compilation.TypeSystemContext.SystemModule.GetType("System.Runtime.CompilerServices", "StackAllocatedBox`1", throwIfNotFound: false);
 if (placeholderType == null)
 {
 // Give up if corelib does not have support for stackallocation
 return null;
 }
 return ObjectToHandle(placeholderType.MakeInstantiatedType(clsTypeDesc));
 }

 private CorInfoHelpFunc getBoxHelper(CORINFO_CLASS_STRUCT_* cls)
Expand Down

48 changes: 24 additions & 24 deletions
src/coreclr/tools/Common/JitInterface/CorInfoInstructionSet.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -746,18 +746,18 @@ public static InstructionSetFlags ExpandInstructionSetByImplicationHelper(Target
 resultflags.AddInstructionSet(InstructionSet.X64_EVEX);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512DQ))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512DQ_VL))
Expand DownExpand Up@@ -853,18 +853,18 @@ public static InstructionSetFlags ExpandInstructionSetByImplicationHelper(Target
 resultflags.AddInstructionSet(InstructionSet.X86_EVEX);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512DQ))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512DQ_VL))
Expand DownExpand Up@@ -1087,18 +1087,18 @@ private static InstructionSetFlags ExpandInstructionSetByReverseImplicationHelpe
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512BW))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X64_AVX512DQ);
 if (resultflags.HasInstructionSet(InstructionSet.X64_AVX512DQ))
Expand DownExpand Up@@ -1194,18 +1194,18 @@ private static InstructionSetFlags ExpandInstructionSetByReverseImplicationHelpe
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512F_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512BW))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512BW_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512CD))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F_VL))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512CD_VL);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512F))
 resultflags.AddInstructionSet(InstructionSet.X86_AVX512DQ);
 if (resultflags.HasInstructionSet(InstructionSet.X86_AVX512DQ))
Expand Down
Loading