Skip to content

[Libomptarget] Remove bitcode image map used for JIT processing #75672

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
Dec 18, 2023
Merged

[Libomptarget] Remove bitcode image map used for JIT processing #75672

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
51 changes: 19 additions & 32 deletions openmp/libomptarget/plugins-nextgen/common/src/JIT.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,19 @@ using namespace llvm::object;
using namespace omp;
using namespace omp::target;

static codegen::RegisterCodeGenFlags RCGF;

namespace {

/// A map from a bitcode image start address to its corresponding triple. If the
/// image is not in the map, it is not a bitcode image.
DenseMap<void *, Triple::ArchType> BitcodeImageMap;
std::shared_mutex BitcodeImageMapMutex;
bool isImageBitcode(const __tgt_device_image &Image) {
StringRef Binary(reinterpret_cast<const char *>(Image.ImageStart),
target::getPtrDiff(Image.ImageEnd, Image.ImageStart));

return identify_magic(Binary) == file_magic::bitcode;
}

std::once_flag InitFlag;

void init(Triple TT) {
codegen::RegisterCodeGenFlags();
#ifdef LIBOMPTARGET_JIT_NVPTX
if (TT.isNVPTX()) {
LLVMInitializeNVPTXTargetInfo();
Expand Down Expand Up @@ -323,44 +324,30 @@ JITEngine::process(const __tgt_device_image &Image,
return Device.doJITPostProcessing(std::move(MB));
};

{
std::shared_lock<std::shared_mutex> SharedLock(BitcodeImageMapMutex);
auto Itr = BitcodeImageMap.find(Image.ImageStart);
if (Itr != BitcodeImageMap.end() && Itr->second == TT.getArch())
return compile(Image, ComputeUnitKind, PostProcessing);
}
if (isImageBitcode(Image))
return compile(Image, ComputeUnitKind, PostProcessing);

return &Image;
}

bool JITEngine::checkBitcodeImage(const __tgt_device_image &Image) {
TimeTraceScope TimeScope("Check bitcode image");
std::lock_guard<std::shared_mutex> Lock(BitcodeImageMapMutex);

{
auto Itr = BitcodeImageMap.find(Image.ImageStart);
if (Itr != BitcodeImageMap.end() && Itr->second == TT.getArch())
return true;
}
if (!isImageBitcode(Image))
return false;

StringRef Data(reinterpret_cast<const char *>(Image.ImageStart),
target::getPtrDiff(Image.ImageEnd, Image.ImageStart));
std::unique_ptr<MemoryBuffer> MB = MemoryBuffer::getMemBuffer(
Data, /* BufferName */ "", /* RequiresNullTerminator */ false);
auto MB = MemoryBuffer::getMemBuffer(Data, /*BufferName=*/"",
/*RequiresNullTerminator=*/false);
if (!MB)
return false;

Expected<object::IRSymtabFile> FOrErr = object::readIRSymtab(*MB);
if (!FOrErr) {
consumeError(FOrErr.takeError());
return false;
}

auto ActualTriple = FOrErr->TheReader.getTargetTriple();
auto BitcodeTA = Triple(ActualTriple).getArch();
BitcodeImageMap[Image.ImageStart] = BitcodeTA;

DP("Is%s IR Image\n", BitcodeTA == TT.getArch() ? " " : " NOT");
LLVMContext Context;
SMDiagnostic Diagnostic;
std::unique_ptr<Module> M =
llvm::getLazyIRModule(std::move(MB), Diagnostic, Context,
/*ShouldLazyLoadMetadata=*/true);

return BitcodeTA == TT.getArch();
return M && Triple(M->getTargetTriple()).getArch() == TT.getArch();
}