Skip to content

[ESIMD] Fix intermittent memory corruption in ESIMDOptimizeVecArgCallConv.cpp #6889

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
Sep 27, 2022
Merged

[ESIMD] Fix intermittent memory corruption in ESIMDOptimizeVecArgCallConv.cpp #6889

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
29 changes: 14 additions & 15 deletions llvm/lib/SYCLLowerIR/ESIMD/ESIMDOptimizeVecArgCallConv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ optimizeFunction(Function *OldF,
}
Instruction *At = &*(NewF->getEntryBlock().begin());

for (int I = 0; I < NewInsts.size(); ++I) {
for (unsigned I = 0; I < NewInsts.size(); ++I) {
NewInsts[I]->insertBefore(At);
}
return NewF;
Expand All @@ -394,7 +394,7 @@ void optimizeCall(CallInst *CI, Function *OptF,
int SretInd = -1;
IRBuilder<> Bld(CI); // insert before CI

for (int I = 0; I < OptimizeableParams.size(); ++I) {
for (unsigned I = 0; I < OptimizeableParams.size(); ++I) {
const auto &PI = OptimizeableParams[I];
auto ArgNo = PI.getFormalParam().getArgNo();

Expand Down Expand Up @@ -475,20 +475,14 @@ static bool processFunction(Function *F) {
}
// Optimize the function.
Function *NewF = optimizeFunction(F, OptimizeableParams, NewParamTs);
// Copy users to a separate container, to enable safe eraseFromParent.
SmallVector<User *> FUsers;
std::copy(F->users().begin(), F->users().end(), std::back_inserter(FUsers));

// Optimize calls to the function.
// Iterate over FUsers, to enable safe eraseFromParent in optimizeCall.
for (auto *U : FUsers) {
for (auto *U : F->users()) {
auto *Call = cast<CallInst>(U);
assert(Call->getCalledFunction() == F);
optimizeCall(Call, NewF, OptimizeableParams);
}
std::string Name = F->getName().str();
F->eraseFromParent();
NewF->setName(Name);
NewF->takeName(F);
return true;
}

Expand All @@ -506,13 +500,18 @@ ESIMDOptimizeVecArgCallConvPass::run(Module &M, ModuleAnalysisManager &MAM) {
}
#endif // DEBUG_OPT_VEC_ARG_CALL_CONV

SmallVector<Function *, 16> Funcs;
std::for_each(M.begin(), M.end(), [&](Function &F) { Funcs.push_back(&F); });
SmallVector<Function *, 16> ToErase;

// Iterate over Funcs, to enable safe eraseFromParent in processFunction.
for (Function *F : Funcs) {
Modified &= processFunction(F);
for (Function &F : M) {
const bool FReplaced = processFunction(&F);
Modified &= FReplaced;

if (FReplaced) {
ToErase.push_back(&F);
}
}
std::for_each(ToErase.begin(), ToErase.end(),
[](Function *F) { F->eraseFromParent(); });
#ifdef DEBUG_OPT_VEC_ARG_CALL_CONV
{
std::error_code EC;
Expand Down