Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[JIT] Add support to inline the field access of primitive types marked with TLS #82973

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
merged 93 commits into from
Apr 11, 2023
Merged

[JIT] Add support to inline the field access of primitive types marked with TLS #82973

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
327b8f6
Add CORINFO_THREAD_LOCAL_FIELD_INFO and getThreadLocalFieldInfo()
kunalspathak Feb 17, 2023
51644e2
Implementation of getThreadLocalFieldInfo()
kunalspathak Feb 17, 2023
8aef324
Change the field types from CORINFO_CONST_LOOKUP to uint32_t
kunalspathak Feb 17, 2023
916482b
Introduce CORINFO_FIELD_STATIC_TLS_MANAGED
kunalspathak Feb 17, 2023
6eaa3d9
Introduce GTF_FLD_TLS_MANAGED
kunalspathak Feb 17, 2023
efbb53d
Introduce eeGetThreadLocalFieldInfo()
kunalspathak Feb 17, 2023
f3fc3a2
Fix the offsetOfThreadStaticBlocks, hardcode threadStaticBlockIndex f…
kunalspathak Feb 22, 2023
ca4caad
Add impThreadLocalFieldAccess()
kunalspathak Feb 22, 2023
8fd9f58
Switch to GS segment register with a TODO
kunalspathak Feb 23, 2023
b0bf47f
Add reverse map `g_threadStaticBlockTypeIDMap` for type -> ID
kunalspathak Feb 23, 2023
3796c73
Fix GS segment register encoding
kunalspathak Feb 25, 2023
50c5e95
Add comment for g_threadStaticBlockTypeIDMap
kunalspathak Feb 25, 2023
8d0c3a9
Add extra parameter for typeIndex in JIT_GetSharedNonGCThreadStaticBase
kunalspathak Feb 25, 2023
45ddb20
Update JIT_GetSharedNonGCThreadStaticBase to add logic for storing ty…
kunalspathak Feb 25, 2023
8ca4999
Fix encoding of gs:[0x58]
kunalspathak Feb 28, 2023
93a70a1
fix some bugs in importer to change size from 4 to 8
kunalspathak Feb 28, 2023
a0e40f0
add some printf in jithelpers
kunalspathak Feb 28, 2023
e6bdd82
To revert
kunalspathak Mar 2, 2023
8548500
Merge remote-tracking branch 'origin/main' into tls
kunalspathak Mar 2, 2023
f3bca52
Update the helper to skip making re-entry for staticBlock
kunalspathak Mar 3, 2023
93702e3
Add impThreadLocalFieldWrite() for store
kunalspathak Mar 3, 2023
a607458
Fix a issue for helper
kunalspathak Mar 3, 2023
c331a68
Use JITDUMP
kunalspathak Mar 3, 2023
a96745f
Merge remote-tracking branch 'origin/main' into tls
kunalspathak Mar 3, 2023
b3e1038
Just enable the optimization for primitive types
kunalspathak Mar 4, 2023
3a20176
Update the JITEE guid
kunalspathak Mar 4, 2023
db09d6f
Fix an assert for volatile variables
kunalspathak Mar 5, 2023
58cdade
Mark helper block as cold block
kunalspathak Mar 5, 2023
a138959
wip
kunalspathak Mar 6, 2023
8d0d6a7
Fix the size of maxThreadStaticBlock
kunalspathak Mar 7, 2023
e372a95
fix a bug to insert the entry in cache
kunalspathak Mar 7, 2023
b273fe6
Add #ifdef for HOST_WINDOWS / TARGET_WINDOWS
kunalspathak Mar 7, 2023
9584257
Dynamic memory allocation for static block array
kunalspathak Mar 7, 2023
d0bbf56
Call InitTypeMap only if host == windows
kunalspathak Mar 7, 2023
6e10e7d
Add CORINFO_HELP_GETSHARED_NONGCTHREADSTATIC_BASE_NOCTOR_OPTIMIZED
kunalspathak Mar 8, 2023
c5266da
Merge remote-tracking branch 'origin/main' into tls
kunalspathak Mar 24, 2023
360ab8c
Expand the TLS field access in late phase
kunalspathak Mar 28, 2023
3dfb3d2
Move rarely ran block to the end
kunalspathak Mar 28, 2023
0e3daaa
wip
kunalspathak Mar 28, 2023
7f59353
Fix the bug to access the value from fastPath
kunalspathak Mar 28, 2023
e618aee
Remove code from importer
kunalspathak Mar 28, 2023
2b0629d
Cleanup the code
kunalspathak Mar 28, 2023
a4bb8dd
Moved CreateBlockFromTree to fgbasic.cpp
kunalspathak Mar 28, 2023
bad7fb3
Move fgExpandThreadLocalAccess() to flowgraph.cpp
kunalspathak Mar 28, 2023
e094f29
Add getThreadLocalStaticBlocksInfo() method
kunalspathak Mar 28, 2023
7b9de56
Consume getThreadLocalStaticBlocksInfo() method
kunalspathak Mar 28, 2023
781e25e
Updated definition of getThreadLocalFieldInfo()
kunalspathak Mar 29, 2023
f774eb5
Rename CORINFO_THREAD_LOCAL_FIELD_INFO to CORINFO_THREAD_STATIC_BLOCK…
kunalspathak Mar 29, 2023
76cbaa1
Add TARGET_WINDOWS
kunalspathak Mar 29, 2023
097a2d4
Make TARGET_WINDOWS at some definitions
kunalspathak Mar 29, 2023
d718156
Add dummy definition for unix
kunalspathak Mar 29, 2023
20f2e90
jit format
kunalspathak Mar 29, 2023
612187e
Merge remote-tracking branch 'origin/main' into tls
kunalspathak Mar 29, 2023
69f64cf
remote unnecessary code from morph
kunalspathak Mar 29, 2023
5e53c84
Fix an issue on linux, add assert for tls_index != 0
kunalspathak Mar 30, 2023
5f4b971
Convert from TARGET_WINDOWS to HOST_WINDOWS
kunalspathak Mar 30, 2023
8f61268
jit format
kunalspathak Mar 30, 2023
c3b3c83
fix the if-check
kunalspathak Mar 30, 2023
91f6a8a
fix gcc build error
kunalspathak Mar 31, 2023
25c04d5
Added MethodHaveTlsFieldAccess()
kunalspathak Mar 31, 2023
90103a1
Handle the case for '_tls_index == 0'
kunalspathak Mar 31, 2023
90af395
fix a typo
kunalspathak Mar 31, 2023
66f6401
Fix windows/arm64 issue
kunalspathak Mar 31, 2023
3cd2881
fix encoding of teb loading for arm64
kunalspathak Apr 1, 2023
055b9e0
Fix the condition in jitinterface to select correct helper
kunalspathak Apr 3, 2023
c8ed0c6
fix the condition for other helper too
kunalspathak Apr 4, 2023
ab98131
fix the windows/x86 case
kunalspathak Apr 4, 2023
6c9264f
Merge remote-tracking branch 'origin/main' into tls
kunalspathak Apr 4, 2023
d085acd
jit format
kunalspathak Apr 4, 2023
f08fbd3
Use CORINFO_CONST_LOOKUP for _tls_index
kunalspathak Apr 5, 2023
a81c4b9
Move typeIdMap to BaseDomain class
kunalspathak Apr 5, 2023
18e6b46
Introduce useFatPointerDispatch parameter for GetTypeID()
kunalspathak Apr 5, 2023
d23a0b2
jit format
kunalspathak Apr 5, 2023
1aea091
Do not pass classID and moduleID to the new helper
kunalspathak Apr 5, 2023
19bb28a
fix build for non-windows
kunalspathak Apr 5, 2023
7dc2d6e
fix superpmi methods
kunalspathak Apr 5, 2023
2d76689
review feedback
kunalspathak Apr 5, 2023
79e0351
fix linux build errors
kunalspathak Apr 6, 2023
1f2a353
review feedback
kunalspathak Apr 6, 2023
c0de86f
fix weight inherit
kunalspathak Apr 6, 2023
52f98c5
inline JIT_GetNonGCThreadStaticBase_Helper to fix the contract error
kunalspathak Apr 7, 2023
cdd79fd
Remove dead code from helper
kunalspathak Apr 7, 2023
bdc67fe
Add GTF_CALL_M_EXP_TLS_ACCESS to check if we do not revisit the alrea…
kunalspathak Apr 7, 2023
c9858d4
address feedback
kunalspathak Apr 7, 2023
a7d290f
Merge remote-tracking branch 'origin/main' into tls
kunalspathak Apr 8, 2023
4f20569
regenerate the files
kunalspathak Apr 8, 2023
746fd04
Introduce fgExpandHelper and fgExpandHelperForBlock and reuse it for …
kunalspathak Apr 8, 2023
b734406
fix the typo
kunalspathak Apr 9, 2023
c67b085
update the assert for runtimelookup
kunalspathak Apr 10, 2023
fc6bb0c
Merge remote-tracking branch 'origin/main' into tls
kunalspathak Apr 10, 2023
047a6ef
check if we should skip rarely run blocks
kunalspathak Apr 10, 2023
30d19d9
review feedback
kunalspathak Apr 11, 2023
be29dcb
Remove GTF_IND_INVARIANT from `typeIndex` access because it produces …
kunalspathak Apr 11, 2023
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
Prev Previous commit
Next Next commit
Change the field types from CORINFO_CONST_LOOKUP to uint32_t
  • Loading branch information
@kunalspathak
kunalspathak committed Feb 17, 2023
commit 8aef32445926bab1d19a3c93a4df59dab72b391e
6 changes: 3 additions & 3 deletions src/coreclr/inc/corinfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1728,10 +1728,10 @@ struct CORINFO_FIELD_INFO

struct CORINFO_THREAD_LOCAL_FIELD_INFO
{
CORINFO_CONST_LOOKUP tlsIndex;
uint32_t tlsIndex;
uint32_t offsetOfThreadLocalStoragePointer; // 0x58 on x64
CORINFO_CONST_LOOKUP offsetOfMaxThreadStaticBlocks;
CORINFO_CONST_LOOKUP offsetOfThreadStaticBlocks;
uint32_t offsetOfMaxThreadStaticBlocks;
uint32_t offsetOfThreadStaticBlocks;
uint32_t threadStaticBlockIndex;
};

Expand Down
8 changes: 4 additions & 4 deletions src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2870,11 +2870,11 @@ private nuint printFieldName(CORINFO_FIELD_STRUCT_* fld, byte* buffer, nuint buf

private void getThreadLocalFieldInfo(CORINFO_FIELD_STRUCT_* field, CORINFO_THREAD_LOCAL_FIELD_INFO* pInfo)
{
pInfo->tlsIndex = CreateConstLookupToSymbol(null);
pInfo->tlsIndex = 5; // CreateConstLookupToSymbol(null);
pInfo->threadStaticBlockIndex = 0;
pInfo->offsetOfThreadLocalStoragePointer = 0;
pInfo->offsetOfMaxThreadStaticBlocks = CreateConstLookupToSymbol(null);
pInfo->offsetOfThreadStaticBlocks = CreateConstLookupToSymbol(null);
pInfo->offsetOfThreadLocalStoragePointer = 0x58;
pInfo->offsetOfMaxThreadStaticBlocks = 23; // CreateConstLookupToSymbol(null);
pInfo->offsetOfThreadStaticBlocks = 32; // CreateConstLookupToSymbol(null);
}

private CORINFO_CLASS_STRUCT_* getFieldClass(CORINFO_FIELD_STRUCT_* field)
Expand Down
6 changes: 3 additions & 3 deletions src/coreclr/tools/Common/JitInterface/CorInfoTypes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1157,10 +1157,10 @@ public unsafe struct CORINFO_FIELD_INFO

public unsafe struct CORINFO_THREAD_LOCAL_FIELD_INFO
{
public CORINFO_CONST_LOOKUP tlsIndex;
public uint tlsIndex;
public uint offsetOfThreadLocalStoragePointer; // 0x58 on x64
public CORINFO_CONST_LOOKUP offsetOfMaxThreadStaticBlocks;
public CORINFO_CONST_LOOKUP offsetOfThreadStaticBlocks;
public uint offsetOfMaxThreadStaticBlocks;
public uint offsetOfThreadStaticBlocks;
public uint threadStaticBlockIndex;
};

Expand Down
19 changes: 12 additions & 7 deletions src/coreclr/vm/jitinterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1741,16 +1741,21 @@ void CEEInfo::getThreadLocalFieldInfo (CORINFO_FIELD_HANDLE field,
FieldDesc* fieldDesc = (FieldDesc*)field;
_ASSERTE(fieldDesc->IsThreadStatic());

pInfo->tlsIndex.accessType = IAT_VALUE;
pInfo->tlsIndex.addr = (void*)_tls_index;

pInfo->tlsIndex = _tls_index;
pInfo->offsetOfThreadLocalStoragePointer = offsetof(_TEB, ThreadLocalStoragePointer);
pInfo->offsetOfThreadStaticBlocks = CEEInfo::ThreadLocalOffset(&t_maxThreadStaticBlocks);
pInfo->offsetOfMaxThreadStaticBlocks = CEEInfo::ThreadLocalOffset(&t_maxThreadStaticBlocks);

//pInfo->tlsIndex.accessType = IAT_VALUE;
//pInfo->tlsIndex.addr = PTR_VOID(dac_cast<PTR_BYTE>(_tls_index));

//pInfo->offsetOfThreadLocalStoragePointer = offsetof(_TEB, ThreadLocalStoragePointer);

pInfo->offsetOfMaxThreadStaticBlocks.accessType = IAT_VALUE;
pInfo->offsetOfMaxThreadStaticBlocks.addr = (void*)CEEInfo::ThreadLocalOffset(&t_maxThreadStaticBlocks);
//pInfo->offsetOfMaxThreadStaticBlocks.accessType = IAT_VALUE;
//pInfo->offsetOfMaxThreadStaticBlocks.addr = PTR_VOID(dac_cast<PTR_BYTE>(CEEInfo::ThreadLocalOffset(&t_maxThreadStaticBlocks)));

pInfo->offsetOfThreadStaticBlocks.accessType = IAT_VALUE;
pInfo->offsetOfThreadStaticBlocks.addr = (void*)CEEInfo::ThreadLocalOffset(&t_threadStaticBlocks);
//pInfo->offsetOfThreadStaticBlocks.accessType = IAT_VALUE;
//pInfo->offsetOfThreadStaticBlocks.addr = PTR_VOID(dac_cast<PTR_BYTE>(CEEInfo::ThreadLocalOffset(&t_threadStaticBlocks)));

pInfo->threadStaticBlockIndex = 0;

Expand Down