Allow RyuJIT to refer to frozen RuntimeType instances #94342
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
With dotnet#93440 it became possible to place `RuntimeType` instances in the frozen region. This adds support for generating frozen `RuntimeType` instances within the compiler. We give these to RyuJIT whenever it asks for them. * New `FrozenObjectNode` descendant that represents a `RuntimeType` instance. We have two flavors - one wraps constructed and the other wraps necessary `MethodTable`s (we have a need for freezing both kinds to keep our ability to optimize `RuntimeTypes` used in comparisons only). * We hand out references to these whenever RyuJIT needs them. * At `MethodTable` emission time, we check whether a frozen `RuntimeType` for this `MethodTable` was generated. If so, we pre-populate `MethodTable`’s `WritableData` section with a reloc to the `RuntimeType`. Otherwise we use null as usual. * At runtime for `GetTypeFromEEType`, if `WritableData` is non-null, we just return that. Otherwise we create a pinned `RuntimeType` instance and write it into `WritableData`. In the future, we should allocate this on a frozen heap. Old codegen for `Console.WriteLine(typeof(Program))`: ```asm sub rsp,28h lea rcx,[repro_Program::`vftable' (07FF7D03154E0h)] call S_P_CoreLib_Internal_Runtime_CompilerHelpers_LdTokenHelpers__GetRuntimeType (07FF7D0253290h) mov rcx,rax call System_Console_System_Console__WriteLine_11 (07FF7D0262AC0h) nop add rsp,28h ret ``` New codegen: ```asm sub rsp,28h lea rcx,[__RuntimeType_repro_Program (07FF7A218EC50h)] call System_Console_System_Console__WriteLine_11 (07FF7A20F2680h) nop add rsp,28h ret ``` I’ll do cctor preinitialization in a subsequent PR to keep things short. Contributes to dotnet#91704.
|
Tagging subscribers to this area: @agocke, @MichalStrehovsky, @jkotas Issue DetailsWith #93440 it became possible to place
Old codegen for sub rsp,28h
lea rcx,[repro_Program::`vftable' (07FF7D03154E0h)]
call S_P_CoreLib_Internal_Runtime_CompilerHelpers_LdTokenHelpers__GetRuntimeType (07FF7D0253290h)
mov rcx,rax
call System_Console_System_Console__WriteLine_11 (07FF7D0262AC0h)
nop
add rsp,28h
retNew codegen: sub rsp,28h
lea rcx,[__RuntimeType_repro_Program (07FF7A218EC50h)]
call System_Console_System_Console__WriteLine_11 (07FF7A20F2680h)
nop
add rsp,28h
retI’ll do cctor preinitialization in a subsequent PR to keep things short. Contributes to #91704. Cc @dotnet/ilc-contrib
|
jkotas
reviewed
Nov 3, 2023
Comment on lines
34
to
35
| ref RuntimeType? type = ref Unsafe.AsRef<RuntimeType?>(pMT->WritableData); | ||
| return type ?? GetTypeFromMethodTableSlow(pMT, ref type); |
There was a problem hiding this comment.
Suggested change
| ref RuntimeType? type = ref Unsafe.AsRef<RuntimeType?>(pMT->WritableData); | |
| return type ?? GetTypeFromMethodTableSlow(pMT, ref type); | |
| return Unsafe.AsRef<RuntimeType?>(pMT->WritableData) ?? GetTypeFromMethodTableSlow(pMT); |
We should fetch the writetable data again in the slow method to minimize size of the aggressively inlined code.
jkotas
reviewed
Nov 3, 2023
| { | ||
| UnsafeGCHandle tempHandle = UnsafeGCHandle.Alloc(new RuntimeType(pMT)); | ||
| // TODO: instead of fragmenting the frozen object heap, we should have our own allocator |
There was a problem hiding this comment.
I have added check-box for this to #91704
jkotas
reviewed
Nov 3, 2023
...lr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/NecessaryCanonicalEETypeNode.cs
Show resolved
Hide resolved
This was referenced Nov 3, 2023
|
Nice! is this expected to be pre-initializeable now? (I checked your branch and it is not) public class MyClass
{
public static readonly Type type = typeof(int);
} |
"I’ll do cctor preinitialization in a subsequent PR to keep things short." at the bottom of top-post. |
|
/azp run runtime-nativeaot-outerloop |
|
Azure Pipelines successfully started running 1 pipeline(s). |
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
With #93440 it became possible to place
RuntimeTypeinstances in the frozen region. This adds support for generating frozenRuntimeTypeinstances within the compiler. We give these to RyuJIT whenever it asks for them.FrozenObjectNodedescendant that represents aRuntimeTypeinstance. We have two flavors - one wraps constructed and the other wraps necessaryMethodTables (we have a need for freezing both kinds to keep our ability to optimizeRuntimeTypesused in comparisons only).MethodTableemission time, we check whether a frozenRuntimeTypefor thisMethodTablewas generated. If so, we pre-populateMethodTable’sWritableDatasection with a reloc to theRuntimeType. Otherwise we use null as usual.GetTypeFromEEType, ifWritableDatais non-null, we just return that. Otherwise we create a pinnedRuntimeTypeinstance and write it intoWritableData. In the future, we should allocate this on a frozen heap.Old codegen for
Console.WriteLine(typeof(Program)):New codegen:
I’ll do cctor preinitialization in a subsequent PR to keep things short. Contributes to #91704.
Cc @dotnet/ilc-contrib