Skip to content

Fix the multicore performance of mapping from an instruction pointer to a MethodDesc #79021

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 36 commits into from
Mar 4, 2023
Merged

Fix the multicore performance of mapping from an instruction pointer to a MethodDesc #79021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
982daf3
Experimental
davidwrighton Oct 21, 2022
f443bfa
Experiment
davidwrighton Oct 21, 2022
2fa62aa
More progress
davidwrighton Oct 28, 2022
55a5bb6
Increase accuracy of comments around range section locking
davidwrighton Nov 14, 2022
f5357bb
Changes to RangeListMap to make it work
davidwrighton Nov 29, 2022
1abc9c6
Add low bit check indirection
davidwrighton Nov 29, 2022
5eee830
Rework to passing down the current locking status
davidwrighton Nov 29, 2022
e4fb4db
Allocation of RangeSection and freeing added, as well as testing for …
davidwrighton Nov 29, 2022
6505eb5
Fix some naming
davidwrighton Nov 29, 2022
62b0376
Miraculously it builds!
davidwrighton Nov 30, 2022
ebadf2a
May actually work. DAC access known to be broken.
davidwrighton Nov 30, 2022
c6fb27c
Merge branch 'main' of https://github.com/dotnet/runtime into rangeli…
davidwrighton Nov 30, 2022
3ecfff8
Fix handling of unwind table
davidwrighton Dec 1, 2022
209877b
Seems to work well on WinX64
davidwrighton Dec 2, 2022
50712b7
Fix performance of the DelegateConstruct method
davidwrighton Dec 2, 2022
38acd5c
It should build everywhere now
davidwrighton Dec 2, 2022
9148e31
Delete temporary bits
davidwrighton Dec 2, 2022
dce4bb1
Fix Windows builds
davidwrighton Dec 6, 2022
518011c
Fix contract issues
davidwrighton Dec 6, 2022
6db0e70
Fix CodeRangeMapRangeList to handle interval correctly
davidwrighton Dec 6, 2022
c8a74e2
It builds on Linux!
davidwrighton Dec 6, 2022
2a012b2
Make it even more lock free
davidwrighton Dec 6, 2022
de97c17
Remove confusion around Range interval specification Some uses were r…
davidwrighton Dec 8, 2022
a493cde
Attempt to appease the GCC build
davidwrighton Dec 8, 2022
1507207
Fix the math around fragment handling and index calculations
davidwrighton Dec 9, 2022
493225b
Make the RangeSectionMap available to the DAC
davidwrighton Dec 12, 2022
a24184d
Move to 5 levels for 64bit RangeSectionMap. 8KB chunks are a waste of…
davidwrighton Dec 12, 2022
af74f62
Remove unnecessary memory dereferences
davidwrighton Dec 12, 2022
4b4b15d
Tweak algorithm to allow for R2R checks to be entirely lock-free
davidwrighton Dec 13, 2022
c01de3f
Update comment
davidwrighton Dec 13, 2022
8563905
Enable support for freeing portion of the CodeRangeMap which are no l…
davidwrighton Dec 13, 2022
eefa191
Fix GCC noticed signed/unsigned mismatch
davidwrighton Dec 13, 2022
67cefc5
Fix next GCC noticed signed/unsigned mismatch
davidwrighton Dec 16, 2022
05a35a9
Merge branch 'main' of https://github.com/dotnet/runtime into rangeli…
davidwrighton Feb 21, 2023
48ead1f
Adjust to feedback
davidwrighton Feb 22, 2023
ea79cb2
Merge branch 'main' of https://github.com/dotnet/runtime into rangeli…
davidwrighton Mar 4, 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
4 changes: 2 additions & 2 deletions src/coreclr/inc/daccess.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
// pRS=pRS->pright;
// else
// {
// return pRS->pjit;
// return pRS->_pjit;
// }
// }
//
Expand All @@ -108,7 +108,7 @@
// In the assignment statement the compiler will automatically use
// the implicit conversion from PTR_RangeSection to RangeSection*,
// causing a host instance to be created. Finally, if an appropriate
// section is found the use of pRS->pjit will cause an implicit
// section is found the use of pRS->_pjit will cause an implicit
// conversion from PTR_IJitManager to IJitManager. The VPTR code
// will look at target memory to determine the actual derived class
// for the JitManager and instantiate the right class in the host so
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/inc/dacvars.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@

#define UNKNOWN_POINTER_TYPE SIZE_T

DEFINE_DACVAR_VOLATILE(PTR_RangeSection, ExecutionManager__m_CodeRangeList, ExecutionManager::m_CodeRangeList)
DEFINE_DACVAR(PTR_RangeSectionMap, ExecutionManager__g_codeRangeMap, ExecutionManager::g_codeRangeMap)
DEFINE_DACVAR(PTR_EECodeManager, ExecutionManager__m_pDefaultCodeMan, ExecutionManager::m_pDefaultCodeMan)
DEFINE_DACVAR_VOLATILE(LONG, ExecutionManager__m_dwReaderCount, ExecutionManager::m_dwReaderCount)
DEFINE_DACVAR_VOLATILE(LONG, ExecutionManager__m_dwWriterLock, ExecutionManager::m_dwWriterLock)
Expand Down
1 change: 1 addition & 0 deletions src/coreclr/inc/vptr_list.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ VPTR_CLASS(EECodeManager)

VPTR_CLASS(RangeList)
VPTR_CLASS(LockedRangeList)
VPTR_CLASS(CodeRangeMapRangeList)

#ifdef EnC_SUPPORTED
VPTR_CLASS(EditAndContinueModule)
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/nativeaot/Runtime/inc/daccess.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
// pRS=pRS->pright;
// else
// {
// return pRS->pjit;
// return pRS->_pjit;
// }
// }
//
Expand All @@ -106,7 +106,7 @@
// In the assignment statement the compiler will automatically use
// the implicit conversion from PTR_RangeSection to RangeSection*,
// causing a host instance to be created. Finally, if an appropriate
// section is found the use of pRS->pjit will cause an implicit
// section is found the use of pRS->_pjit will cause an implicit
// conversion from PTR_IJitManager to IJitManager. The VPTR code
// will look at target memory to determine the actual derived class
// for the JitManager and instantiate the right class in the host so
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/vm/assembly.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,6 @@ Assembly *Assembly::CreateDynamic(AssemblyBinder* pBinder, NativeAssemblyNamePar
if ((access & ASSEMBLY_ACCESS_COLLECT) != 0)
{
AssemblyLoaderAllocator *pCollectibleLoaderAllocator = new AssemblyLoaderAllocator();
pCollectibleLoaderAllocator->SetCollectible();
pLoaderAllocator = pCollectibleLoaderAllocator;

// Some of the initialization functions are not virtual. Call through the derived class
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/vm/assemblynative.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1135,7 +1135,6 @@ extern "C" INT_PTR QCALLTYPE AssemblyNative_InitializeAssemblyLoadContext(INT_PT
{
// Create a new AssemblyLoaderAllocator for an AssemblyLoadContext
loaderAllocator = new AssemblyLoaderAllocator();
loaderAllocator->SetCollectible();

GCX_COOP();
LOADERALLOCATORREF pManagedLoaderAllocator = NULL;
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/vm/ceeload.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4355,7 +4355,7 @@ void Module::RunEagerFixupsUnlocked()
ExecutionManager::AddCodeRange(
base, base + (TADDR)pNativeImage->GetVirtualSize(),
ExecutionManager::GetReadyToRunJitManager(),
RangeSection::RANGE_SECTION_READYTORUN,
RangeSection::RANGE_SECTION_NONE,
this /* pHeapListOrZapModule */);
}
#endif // !DACCESS_COMPILE
Expand Down
Loading