Make Type.IsEnum and Type.GetEnumUnderlyingType intrinsics by MichalPetryka · Pull Request #71685 · dotnet/runtime

MichalPetryka · 2022-07-05T22:25:42Z

Makes Type.IsEnum and Type.GetEnumUnderlyingType intrinsics.

Implements IsKnownConstant for Type.

Optimizes Type.GetTypeCode using IsKnownConstant.

Introduces a JIT helper for checking if a tree is typeof.

Introduces JIT tests checking the generated codegen.

Makes Type.GetTypeCode a JIT intrinsic for primitive types, enums and strings. Makes Type.IsEnum use intrinsics instead of IsSubclassOf Makes Enum.GetUnderlyingType use Type.GetTypeCode Moves the legacy FCall to InternalGetUnderlyingTypeImpl, so that the non-intrinsic GetTypeCode can use it. Introduces JIT tests checking the generated codegen.

ghost · 2022-07-05T22:25:58Z

Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch
See info in area-owners.md if you want to be subscribed.

Issue Details

Makes Type.GetTypeCode a JIT intrinsic for primitive types,
enums and strings.

Makes Type.IsEnum use intrinsics instead of IsSubclassOf

Makes Enum.GetUnderlyingType use Type.GetTypeCode

Moves the legacy FCall to InternalGetUnderlyingTypeImpl,
so that the non-intrinsic GetTypeCode can use it.

Introduces JIT tests checking the generated codegen.

Fixes #70483.

Author:	MichalPetryka
Assignees:	-
Labels:	`area-CodeGen-coreclr`
Milestone:	-

MichalPetryka · 2022-07-09T15:29:38Z

This PR generates the desired codegen only with #71778.

AndyAyersMS · 2022-07-09T18:14:19Z

+// Return Value:
+// Is the tree typeof()
+//
+bool Compiler::gtIsTypeof(GenTree* tree, CORINFO_CLASS_HANDLE* handle)


Seems like you should try and leverage gtGetTypeProducerKind and/or gtIsTypeHandleToRuntimeTypeHelper here.

gtGetTypeProducerKind doesn't seem particularly useful here since we don't know the exact type with .GetType() and we don't want to return null types here so I've used gtIsTypeHandleToRuntimeTypeHelper and added tests for NRE with Type.GetTypeFromHandle(default)~~(which I assume generates the _MAYBENULL helper variant)~~(actually only __reftype seems to generate it).

jkotas · 2022-11-01T00:48:49Z

Yes, I think it is okay to have that method in Type.cs.

Nit: I would call the method GetRuntimeTypeCode like what it is called in NativeAOT. It is nicer name than GetTypeCodeInternal.

AndyAyersMS

JIT/SPMI changes LGTM.

… parameters. Related: dotnet#71685.

vargaz · 2022-11-02T03:28:32Z

#77763 will fix the mono failures.

… parameters. (#77763) Related: #71685.

jkotas · 2022-11-03T00:51:45Z

@MichalPetryka Could you please merge from main and resolve the conflicts?

MichalPetryka · 2022-11-03T01:19:58Z

@jkotas~~Done.~~ Seems like ThunkGenerator fails after the merge?

jkotas · 2022-11-03T01:27:29Z

Seems like ThunkGenerator fails after the merge?

Do you have #77715 ?

MichalPetryka · 2022-11-03T01:29:09Z

Seems like ThunkGenerator fails after the merge?
Do you have #77715 ?

Yes. For context:

src\coreclr\tools\Common\JitInterface\ThunkGenerator\Program.cs(37,18): error SA1400: Element 'TypeReplacement' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\Program.cs(103,18): error SA1400: Element 'Parameter' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\Program.cs(117,18): error SA1400: Element 'FunctionDecl' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\Program.cs(167,18): error SA1400: Element 'Program' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\Program.cs(169,14): error SA1400: Element 'ParseMode' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\InstructionSetGenerator.cs(84,34): error SA1400: Element '_instructionSets' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\InstructionSetGenerator.cs(85,41): error SA1400: Element '_implications' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\InstructionSetGenerator.cs(86,35): error SA1400: Element '_instructionSetsGroups' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\InstructionSetGenerator.cs(87,45): error SA1400: Element '_64bitVariants' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\InstructionSetGenerator.cs(88,39): error SA1400: Element '_r2rNamesByName' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\InstructionSetGenerator.cs(89,39): error SA1400: Element '_r2rNamesByNumber' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\InstructionSetGenerator.cs(90,27): error SA1400: Element '_architectures' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\InstructionSetGenerator.cs(91,42): error SA1400: Element '_architectureJitNames' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\InstructionSetGenerator.cs(92,42): error SA1400: Element '_architectureVectorInstructionSetJitNames' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\InstructionSetGenerator.cs(93,25): error SA1400: Element '_64BitArchitectures' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\InstructionSetGenerator.cs(94,36): error SA1400: Element '_64BitVariantArchitectureJitNameSuffix' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\InstructionSetGenerator.cs(96,19): error SA1400: Element 'FlagsFieldCount' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\InstructionSetGenerator.cs(16,22): error SA1400: Element 'InstructionSetInfo' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\InstructionSetGenerator.cs(61,23): error SA1400: Element 'InstructionSetGroup' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\InstructionSetGenerator.cs(63,22): error SA1400: Element 'InstructionSetImplication' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\Program.cs(176,42): error SA1400: Element 'ParseInput' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\Program.cs(261,21): error SA1400: Element 'WriteAutogeneratedHeader' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\InstructionSetGenerator.cs(29,27): error SA1121: Use built-in type alias [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\InstructionSetGenerator.cs(49,26): error SA1121: Use built-in type alias [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\InstructionSetGenerator.cs(51,26): error SA1121: Use built-in type alias [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\InstructionSetGenerator.cs(53,31): error SA1121: Use built-in type alias [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\InstructionSetGenerator.cs(98,14): error SA1400: Element 'ArchitectureEncountered' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\InstructionSetGenerator.cs(109,14): error SA1400: Element 'ValidateArchitectureEncountered' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\Program.cs(138,37): error SA1121: Use built-in type alias [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\Program.cs(153,41): error SA1121: Use built-in type alias [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\Program.cs(371,21): error SA1400: Element 'WriteNativeWrapperInterface' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\Program.cs(273,21): error SA1400: Element 'WriteManagedThunkInterface' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\Program.cs(421,21): error SA1400: Element 'WriteAPI_Names' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\InstructionSetGenerator.cs(333,26): error SA1121: Use built-in type alias [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\InstructionSetGenerator.cs(240,22): error SA1121: Use built-in type alias [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\InstructionSetGenerator.cs(242,36): error SA1121: Use built-in type alias [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\Program.cs(435,21): error SA1400: Element 'API_Wrapper_Generic_Core' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\Program.cs(519,21): error SA1400: Element 'API_Wrapper_Generic' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\Program.cs(529,21): error SA1400: Element 'API_Wrapper' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\Program.cs(598,21): error SA1400: Element 'SPMI_ShimCounter_ICorJitInfo' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\Program.cs(551,21): error SA1400: Element 'SPMI_ICorJitInfoImpl' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\Program.cs(616,21): error SA1400: Element 'SPMI_ShimSimple_ICorJitInfo' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\Program.cs(634,21): error SA1400: Element 'Main' should declare an access modifier [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\InstructionSetGenerator.cs(1027,25): error SA1121: Use built-in type alias [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
src\coreclr\tools\Common\JitInterface\ThunkGenerator\InstructionSetGenerator.cs(709,57): error SA1121: Use built-in type alias [L:\dotnet\runtime\src\coreclr\tools\Common\JitInterface\ThunkGenerator\ThunkGenerator.csproj]
Fix the build errors and run again.

jkotas · 2022-11-03T01:39:38Z

#77816

MichalPetryka · 2022-11-03T01:40:20Z

For now I've worked around it by disabling TreatWarningsAsErrors in the generator.

MichalPetryka · 2022-11-04T23:30:42Z

@jkotas Is there anything left to be done here on my part?

…ion/Converters/Value/EnumConverter.cs

jkotas

LGTM once the CI is green. Thank you!

ghost added area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI community-contribution Indicates that the PR has been added by a community member labels Jul 5, 2022

MichalPetryka commented Jul 5, 2022
View reviewed changes

Comment threadsrc/libraries/System.Private.CoreLib/src/System/Type.cs Outdated

jkotas reviewed Jul 5, 2022
View reviewed changes

Comment threadsrc/coreclr/System.Private.CoreLib/src/System/Enum.CoreCLR.cs Outdated

MichalPetrykaand others added 5 commits July 6, 2022 16:29

Change IsEnum to an intrinsic
f20053b

Fix formatting
195bad6

Fix formatting 2
f60efb6

Formatting fix 3
4317f2d

Fix test
616be5d

runfoappBot mentioned this pull request Jul 6, 2022
system.text.regularexpressions.tests Failing on ARM64 linux #71722
Closed

MichalPetrykaand others added 11 commits July 6, 2022 20:17

Fallback to the FCall for nint/nuint enums
dff9f04

Fix compilation
6959e90

Add missing Intrinsic
c27672c

Fix void handling
1745d84

Fix compilation
509842b

Fix formatting
e1300f4

Add typeof support to IsKnownConstant
94f19da

Merge branch 'main' into enum-underlyingtype
b07b12f

Move the helper
c3dc12f

Add missing break
eb0bc1b

Revert some changes, simplify code
098d472

MichalPetryka changed the title ~~Make Type.GetTypeCode an intrinsic~~Make Type.GetTypeCode/IsEnum intrinsicsJul 9, 2022

MichalPetryka marked this pull request as ready for review July 9, 2022 17:07

AndyAyersMS reviewed Jul 9, 2022
View reviewed changes

MichalPetrykaand others added 3 commits July 10, 2022 16:09

Use gtIsTypeHandleToRuntimeTypeHelper
f05b1b2

Fix test
02cd252

Add __reftype tests
753dca2

Fix NativeAOT build
d57b8ae

AndyAyersMS approved these changes Nov 1, 2022
View reviewed changes

vargaz reviewed Nov 1, 2022
View reviewed changes

Comment threadsrc/libraries/System.Private.CoreLib/src/System/Type.cs

vargaz added a commit to vargaz/runtime that referenced this pull request Nov 2, 2022
[mono] Avoid returning true from RuntimeType.IsActualEnum for generic…
cc7c18c
… parameters. Related: dotnet#71685.

vargaz mentioned this pull request Nov 2, 2022
[mono] Avoid returning true from RuntimeType.IsActualEnum for generic… #77763
Merged

jkotas pushed a commit that referenced this pull request Nov 3, 2022
[mono] Avoid returning true from RuntimeType.IsActualEnum for generic…
5d0943f
… parameters. (#77763) Related: #71685.

Merge
ee8ce1d

Remove merge leftovers
d2d72df

Fix generated files
c1b3bf2

jkotas reviewed Nov 5, 2022
View reviewed changes

Comment thread...ries/System.Collections.Concurrent/src/System/Collections/Concurrent/ConcurrentDictionary.cs Outdated

jkotas reviewed Nov 5, 2022
View reviewed changes

Comment thread...ries/System.Collections.Concurrent/src/System/Collections/Concurrent/ConcurrentDictionary.cs Outdated

jkotas reviewed Nov 5, 2022
View reviewed changes

Comment thread...ries/System.Collections.Concurrent/src/System/Collections/Concurrent/ConcurrentDictionary.cs Outdated

jkotas reviewed Nov 5, 2022
View reviewed changes

Comment thread...ries/System.Collections.Concurrent/src/System/Collections/Concurrent/ConcurrentDictionary.cs Outdated

Revert changes in non CoreCLR specific code
64def53

jkotas reviewed Nov 10, 2022
View reviewed changes

Comment thread...raries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/EnumConverter.cs Outdated

Update src/libraries/System.Text.Json/src/System/Text/Json/Serializat…
28561ac
…ion/Converters/Value/EnumConverter.cs

jkotas reviewed Nov 10, 2022
View reviewed changes

Comment threadsrc/libraries/System.Private.CoreLib/src/System/Enum.cs Outdated

Update src/libraries/System.Private.CoreLib/src/System/Enum.cs
9f108e9

jkotas approved these changes Nov 10, 2022
View reviewed changes

jkotas merged commit 16b28c7 into dotnet:mainNov 11, 2022

ghost locked as resolved and limited conversation to collaborators Dec 11, 2022

Uh oh!

Conversation

MichalPetryka commented Jul 5, 2022• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ghost commented Jul 5, 2022

Uh oh!

Uh oh!

Uh oh!

MichalPetryka commented Jul 9, 2022

Uh oh!

AndyAyersMSJul 9, 2022

Choose a reason for hiding this comment

Uh oh!

MichalPetrykaJul 10, 2022• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jkotas commented Nov 1, 2022

Uh oh!

AndyAyersMS left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

vargaz commented Nov 2, 2022

Uh oh!

jkotas commented Nov 3, 2022

Uh oh!

MichalPetryka commented Nov 3, 2022• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jkotas commented Nov 3, 2022

Uh oh!

MichalPetryka commented Nov 3, 2022

Uh oh!

jkotas commented Nov 3, 2022

Uh oh!

MichalPetryka commented Nov 3, 2022

Uh oh!

MichalPetryka commented Nov 4, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jkotas left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

MichalPetryka commented Jul 5, 2022•
edited
Loading

MichalPetrykaJul 10, 2022•
edited
Loading

MichalPetryka commented Nov 3, 2022•
edited
Loading