Change all "unmanaged" (no GC fields) sequential types to have sequential layout. by jkoritzinsky · Pull Request #61759 · dotnet/runtime

jkoritzinsky · 2021-11-18T00:53:27Z

This is a prereq for #60639

This enables us to use the managed layout as the native layout for all LayoutKind.Sequential "C# unmanaged" structs, which is required for reconciling the "unmanaged" and "blittable" concepts.

Fixes#44579
Fixes#12977

…tial layout.

…al structs in managed-sequential layout

…l changes.

…nMetadataFieldLayoutAlgorithm.cs Co-authored-by: Jan Kotas <jkotas@microsoft.com>

…all other scenarios (align-up to strictest alignment of members)

…Algorithm.cs Co-authored-by: Jan Kotas <jkotas@microsoft.com>

…equirements in Auto-layout)

jkoritzinsky · 2021-12-13T18:55:09Z

@jkotas I've updated this PR to now fix #12977. This is ready for another round of review.

jkoritzinsky · 2021-12-13T18:57:12Z

/azp run runtime-coreclr crossgen2 outerloop,runtime-coreclr crossgen2-composite

azure-pipelines · 2021-12-13T18:57:45Z

Azure Pipelines successfully started running 2 pipeline(s).

jkotas · 2021-12-13T19:09:02Z

It looks good to me (once it builds on all platforms).

Are you happy with the test coverage we have for this, or do you plan to add more tests?

It would be useful to also get a review from @trylek or @davidwrighton .

trylek

I love this change, thanks so much Jeremy for finally putting some order to all this mess!

… and the type has GC pointers.

jkoritzinsky · 2021-12-14T02:24:36Z

/azp run runtime-coreclr crossgen2 outerloop,runtime-coreclr crossgen2-composite

azure-pipelines · 2021-12-14T02:25:06Z

Azure Pipelines successfully started running 2 pipeline(s).

…layout. Update a comment so we aren't confused when looking back here in the future.

…runtime into managedseqential_unmanaged

jkoritzinsky · 2021-12-14T23:16:26Z

/azp run runtime-coreclr crossgen2 outerloop,runtime-coreclr crossgen2-composite

azure-pipelines · 2021-12-14T23:16:56Z

Azure Pipelines successfully started running 2 pipeline(s).

jkoritzinsky · 2021-12-15T18:17:06Z

It looks like the macOS ARM64 test failures are #62747 due to the following multidimensional array:

runtime/src/libraries/System.Console/src/System/ConsolePal.Unix.cs

Line 885 in fbabdb6

privatestaticreadonlystring[,]s_fgbgAndColorStrings=newstring[2,16];// 2 == fg vs bg, 16 == ConsoleColor values

jkoritzinsky · 2021-12-15T18:20:31Z

I've confirmed these failures are also in main now that #61938 has been merged long enough to have outerloop runs triggered against it.

I think the test coverage already have makes me comfortable enough to merge this PR. I'll add more test coverage when I implement #60639.

jkoritzinsky added the area-VM-coreclr label Nov 18, 2021

Change all "unmanaged" (no GC fields) sequential types to have sequen…
3c4ccbc
…tial layout.

jkoritzinsky force-pushed the managedseqential_unmanaged branch from d5e15d0 to 3c4ccbcCompare November 18, 2021 17:57

Merge branch 'main' into managedseqential_unmanaged
6b9e41d

This was referenced Nov 19, 2021
RunContinueWithStressTestsNoState timing out in CI #2271
Closed
System.Runtime.Serialization.Xml.Tests failed #59926
Closed
tracing/eventactivityidcontrol/eventactivityidcontrol/eventactivityidcontrol.sh failed on rolling build #60679
Closed

Fix inverted condition
b85447d

jkoritzinsky force-pushed the managedseqential_unmanaged branch from 0735747 to b85447dCompare November 19, 2021 20:20

jkoritzinsky added 2 commits November 22, 2021 13:25

Account for RequiresAlign8 for auto-layout nested structs in sequenti…
0ff8540
…al structs in managed-sequential layout

Clean up R2R layout algorithm's handling of the new managed-sequentia…
c6ee36d
…l changes.

jkoritzinsky marked this pull request as ready for review November 29, 2021 23:29

jkoritzinsky requested a review from MichalStrehovsky as a code owner November 29, 2021 23:29

jkoritzinsky requested review from AaronRobinsonMSFT, elinor-fung, jkotas and trylek November 29, 2021 23:29

jkotas reviewed Nov 29, 2021
View reviewed changes

Comment threadsrc/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunMetadataFieldLayoutAlgorithm.cs

jkotas reviewed Nov 30, 2021
View reviewed changes

Comment threadsrc/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunMetadataFieldLayoutAlgorithm.cs Outdated

jkoritzinskyand others added 3 commits November 29, 2021 16:21

Update src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRu…
99c0244
…nMetadataFieldLayoutAlgorithm.cs Co-authored-by: Jan Kotas <jkotas@microsoft.com>

Try to remove the explicit layout quirk by following the behavior in …
0ec572a
…all other scenarios (align-up to strictest alignment of members)

Fix missed cast.
e2589f3

jkotas reviewed Nov 30, 2021
View reviewed changes

Comment threadsrc/coreclr/tools/Common/TypeSystem/Common/MetadataFieldLayoutAlgorithm.cs Outdated

Update src/coreclr/tools/Common/TypeSystem/Common/MetadataFieldLayout…
1744d82
…Algorithm.cs Co-authored-by: Jan Kotas <jkotas@microsoft.com>

AlignUp the right variable.
bbaa220

jkotas reviewed Nov 30, 2021
View reviewed changes

Comment threadsrc/coreclr/tools/Common/TypeSystem/Common/MetadataFieldLayoutAlgorithm.cs Outdated

Remove alignUpInstanceByteSize parameter as it's always true
7afb6d2

jkoritzinsky added 4 commits December 10, 2021 11:24

Update StructPacking.cs for arm and arm64 (we now respect alignment r…
8501319
…equirements in Auto-layout)

Fix default packing size calculations
1b9eda3

Try one more change to fix the last issue
2f74ce3

Cleanup and update some corner cases of the managed-sequential case.
c98ae95

jkotas reviewed Dec 13, 2021
View reviewed changes

Comment threadsrc/coreclr/vm/classlayoutinfo.cpp Outdated

jkotas reviewed Dec 13, 2021
View reviewed changes

Comment threadsrc/coreclr/vm/class.h Outdated

Fix nites.
966af36

Fix some copy-paste issues.
ae9aa6c

trylek approved these changes Dec 13, 2021
View reviewed changes

Comment threadsrc/coreclr/vm/classlayoutinfo.cpp Outdated
Comment threadsrc/coreclr/vm/classlayoutinfo.cpp

Fix ->/. typo
842aef2

jkoritzinsky mentioned this pull request Dec 13, 2021
Constructing MD arrays in R2R code does not work on OSX/ARM64 #62747
Closed

Fix disqualifying from managed-sequential when RequiresAlign8 is true…
d269851
… and the type has GC pointers.

jkoritzinsky added 3 commits December 14, 2021 10:25

Update x86 tests that check sizeof for types that have changed size.
e423c3c

Fix Align8 candidate calculation to not account for packing for auto-…
a1bc86e
…layout. Update a comment so we aren't confused when looking back here in the future.

Merge branch 'managedseqential_unmanaged' of github.com:jkoritzinsky/…
53e5644
…runtime into managedseqential_unmanaged

jkoritzinsky merged commit 509d6c3 into dotnet:mainDec 15, 2021

jkoritzinsky deleted the managedseqential_unmanaged branch December 15, 2021 18:20

jkotas mentioned this pull request Dec 22, 2021
Have CoreCLR follow sequential layout with GC refs Unity-Technologies/runtime#18
Closed

jkoritzinsky mentioned this pull request Jan 4, 2022
Implement System.Runtime.CompilerServices.DisabledRuntimeMarshallingAttribute on CoreCLR-family of runtimes/type systems #63320
Merged

ghost locked as resolved and limited conversation to collaborators Jan 14, 2022

Uh oh!

Conversation

jkoritzinsky commented Nov 18, 2021• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jkoritzinsky commented Dec 13, 2021

Uh oh!

Uh oh!

jkoritzinsky commented Dec 13, 2021

Uh oh!

Uh oh!

azure-pipelinesBot commented Dec 13, 2021

Uh oh!

jkotas commented Dec 13, 2021

Uh oh!

trylek left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

jkoritzinsky commented Dec 14, 2021

Uh oh!

azure-pipelinesBot commented Dec 14, 2021

Uh oh!

jkoritzinsky commented Dec 14, 2021

Uh oh!

azure-pipelinesBot commented Dec 14, 2021

Uh oh!

jkoritzinsky commented Dec 15, 2021

Uh oh!

jkoritzinsky commented Dec 15, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

jkoritzinsky commented Nov 18, 2021•
edited
Loading