Skip to content

[SYCL RTC] Make ToolchainFS static thread_local #20382

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 1 commit into from
Oct 20, 2025
Merged

[SYCL RTC] Make ToolchainFS static thread_local #20382

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 24 additions & 14 deletions sycl-jit/jit-compiler/lib/rtc/DeviceCompilation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,20 +69,30 @@ using namespace jit_compiler;
namespace {

class SYCLToolchain {
// TODO: For some reason, moving this to a data member of the single instance
// of SYCLToolchain results in some data races leading to memory corruption
// (e.g., ::free() report errors).
static auto getToolchainFS() {
llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> ToolchainFS =
llvm::makeIntrusiveRefCnt<llvm::vfs::InMemoryFileSystem>();
using namespace jit_compiler::resource;

for (size_t i = 0; i < NumToolchainFiles; ++i) {
resource_file RF = ToolchainFiles[i];
std::string_view Path{RF.Path.S, RF.Path.Size};
std::string_view Content{RF.Content.S, RF.Content.Size};
ToolchainFS->addFile(Path, 0, llvm::MemoryBuffer::getMemBuffer(Content));
}
static auto &getToolchainFS() {
// TODO: For some reason, removing `thread_local` results in data races
// leading to memory corruption (e.g., ::free() report errors). I'm not sure
// if that's a bug somewhere in clang tooling/LLVMSupport or intentional
// limitation (or maybe a bug in this file, but I can't imagine how could
// that be).
//
// For single thread compilation this gives us [almost] the same performance
// as if there was no `thread_local` so performing very time-consuming
// investigation wouldn't give a justifiable ROI at this moment.
static thread_local const auto ToolchainFS = []() {
llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> ToolchainFS =
llvm::makeIntrusiveRefCnt<llvm::vfs::InMemoryFileSystem>();
using namespace jit_compiler::resource;

for (size_t i = 0; i < NumToolchainFiles; ++i) {
resource_file RF = ToolchainFiles[i];
std::string_view Path{RF.Path.S, RF.Path.Size};
std::string_view Content{RF.Content.S, RF.Content.Size};
ToolchainFS->addFile(Path, 0,
llvm::MemoryBuffer::getMemBuffer(Content));
}
return ToolchainFS;
}();
return ToolchainFS;
}

Expand Down