Skip to content

Disable TLS field access for Arm #84954

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
kunalspathak merged 5 commits into from
Apr 18, 2023
Merged

Disable TLS field access for Arm #84954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3e42be3
Disable TLS field access for Arm
kunalspathak Apr 17, 2023
0316ac4
Update src/coreclr/jit/helperexpansion.cpp
kunalspathak Apr 18, 2023
b6f842a
Merge remote-tracking branch 'origin/main' into tls-arm
kunalspathak Apr 18, 2023
72de82e
Revert "Add issues.targets entries for four tests failing on Windows …
kunalspathak Apr 18, 2023
be809ec
Merge remote-tracking branch 'kp/tls-arm' into tls-arm
kunalspathak Apr 18, 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
7 changes: 7 additions & 0 deletions src/coreclr/jit/helperexpansion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,13 @@ bool Compiler::fgExpandThreadLocalAccessForCall(BasicBlock* block, Statement* st
return false;
}

#ifdef TARGET_ARM
// On Arm, Thread execution blocks are accessed using co-processor registers and instructions such
// as MRC and MCR are used to access them. We do not support them and so should never optimize the
// field access using TLS.
assert(!"Unsupported scenario of optimizing TLS access on Arm32");
#endif

CORINFO_THREAD_STATIC_BLOCKS_INFO threadStaticBlocksInfo;
info.compCompHnd->getThreadLocalStaticBlocksInfo(&threadStaticBlocksInfo);
JITDUMP("getThreadLocalStaticBlocksInfo\n:");
Expand Down
2 changes: 2 additions & 0 deletions src/coreclr/vm/jitinterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1561,6 +1561,7 @@ void CEEInfo::getFieldInfo (CORINFO_RESOLVED_TOKEN * pResolvedToken,
pResult->helper = getSharedStaticsHelper(pField, pFieldMT);

#ifdef HOST_WINDOWS
#ifndef TARGET_ARM
bool canOptimizeHelper = (pResult->helper == CORINFO_HELP_GETSHARED_NONGCTHREADSTATIC_BASE_NOCTOR) ||
(pResult->helper == CORINFO_HELP_GETSHARED_NONGCTHREADSTATIC_BASE);
// For windows, we convert the TLS access to the optimized helper where we will store
Expand All @@ -1571,6 +1572,7 @@ void CEEInfo::getFieldInfo (CORINFO_RESOLVED_TOKEN * pResolvedToken,

pResult->helper = CORINFO_HELP_GETSHARED_NONGCTHREADSTATIC_BASE_NOCTOR_OPTIMIZED;
}
#endif // !TARGET_ARM
#endif // HOST_WINDOWS
}
else
Expand Down
12 changes: 0 additions & 12 deletions src/tests/issues.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,9 +293,6 @@

<!-- Windows arm32 specific excludes -->
<ItemGroup Condition="'$(XunitTestBinBase)' != '' and ('$(TargetArchitecture)' == 'arm' or '$(AltJitArch)' == 'arm') and '$(TargetsWindows)' == 'true' and '$(RuntimeFlavor)' == 'coreclr'">
<ExcludeList Include="$(XunitTestBinBase)/baseservices/TieredCompilation/BasicTestWithMcj/*">
<Issue>https://github.com/dotnet/runtime/issues/84818</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/Convert/out_of_range_fp_to_int_conversions/*">
<Issue>https://github.com/dotnet/runtime/issues/49184</Issue>
</ExcludeList>
Expand Down Expand Up @@ -512,21 +509,12 @@
<ExcludeList Include="$(XunitTestBinBase)/JIT/Stress/ABI/pinvokes_do/**">
<Issue>https://github.com/dotnet/runtime/issues/66745</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/Loader/binding/tracing/BinderTracingTest.ResolutionFlow/*">
<Issue>https://github.com/dotnet/runtime/issues/84818</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/profiler/elt/slowpatheltenter/**">
<Issue>https://github.com/dotnet/runtime/issues/84750</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/profiler/elt/slowpatheltleave/**">
<Issue>https://github.com/dotnet/runtime/issues/84750</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/readytorun/coreroot_determinism/coreroot_determinism/*">
<Issue>https://github.com/dotnet/runtime/issues/84818</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/readytorun/determinism/crossgen2determinism/*">
<Issue>https://github.com/dotnet/runtime/issues/84818</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/tracing/eventpipe/eventsourceerror/eventsourceerror/*">
<Issue>https://github.com/dotnet/runtime/issues/81241</Issue>
</ExcludeList>
Expand Down