Skip to content

[SPIR-V] Ensure that Module resource is managed locally wrt. a unit test case and fix a memory leak #123725

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 2 commits into from
Jan 21, 2025
Merged

[SPIR-V] Ensure that Module resource is managed locally wrt. a unit test case and fix a memory leak #123725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d81ed8
Ensure that Module resource is managed locally wrt. a unit test case
VyacheslavLevytskyy Jan 21, 2025
c136663
fix a memory leak
VyacheslavLevytskyy Jan 21, 2025
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
11 changes: 5 additions & 6 deletions llvm/lib/Target/SPIRV/SPIRVAPI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,8 @@ SPIRVTranslateModule(Module *M, std::string &SpirvObj, std::string &ErrMsg,
TargetOptions Options;
std::optional<Reloc::Model> RM;
std::optional<CodeModel::Model> CM;
std::unique_ptr<TargetMachine> Target =
std::unique_ptr<TargetMachine>(TheTarget->createTargetMachine(
TargetTriple.getTriple(), "", "", Options, RM, CM, OLevel));
std::unique_ptr<TargetMachine> Target(TheTarget->createTargetMachine(
TargetTriple.getTriple(), "", "", Options, RM, CM, OLevel));
if (!Target) {
ErrMsg = "Could not allocate target machine!";
return false;
Expand All @@ -158,10 +157,10 @@ SPIRVTranslateModule(Module *M, std::string &SpirvObj, std::string &ErrMsg,
TargetLibraryInfoImpl TLII(Triple(M->getTargetTriple()));
legacy::PassManager PM;
PM.add(new TargetLibraryInfoWrapperPass(TLII));
MachineModuleInfoWrapperPass *MMIWP =
new MachineModuleInfoWrapperPass(Target.get());
std::unique_ptr<MachineModuleInfoWrapperPass> MMIWP(
new MachineModuleInfoWrapperPass(Target.get()));
const_cast<TargetLoweringObjectFile *>(Target->getObjFileLowering())
->Initialize(MMIWP->getMMI().getContext(), *Target);
->Initialize(MMIWP.get()->getMMI().getContext(), *Target);

SmallString<4096> OutBuffer;
raw_svector_ostream OutStream(OutBuffer);
Expand Down
7 changes: 3 additions & 4 deletions llvm/unittests/Target/SPIRV/SPIRVAPITest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ class SPIRVAPITest : public testing::Test {
const std::vector<std::string> &AllowExtNames,
const std::vector<std::string> &Opts) {
SMDiagnostic ParseError;
M = parseAssemblyString(Assembly, ParseError, Context);
LLVMContext Context;
std::unique_ptr<Module> M =
parseAssemblyString(Assembly, ParseError, Context);
if (!M) {
ParseError.print("IR parsing failed: ", errs());
report_fatal_error("Can't parse input assembly.");
Expand All @@ -48,9 +50,6 @@ class SPIRVAPITest : public testing::Test {
return Status;
}

LLVMContext Context;
std::unique_ptr<Module> M;

static constexpr StringRef ExtensionAssembly = R"(
define dso_local spir_func void @test1() {
entry:
Expand Down
Loading