Skip to content

[mlir][SPIRV] Do not access erased op in SPIRV->LLVM lowering #148373

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
Jul 12, 2025
Merged

[mlir][SPIRV] Do not access erased op in SPIRV->LLVM lowering #148373

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b67efe6
[mlir][SPIRV] Do not access erased op in SPIRV->LLVM lowering
matthias-springer Jul 12, 2025
882d28c
Update mlir/lib/Conversion/SPIRVToLLVM/SPIRVToLLVM.cpp
matthias-springer Jul 12, 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
8 changes: 5 additions & 3 deletions mlir/lib/Conversion/SPIRVToLLVM/SPIRVToLLVM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,13 +779,15 @@ class GlobalVariablePattern
auto linkage = storageClass == spirv::StorageClass::Private
? LLVM::Linkage::Private
: LLVM::Linkage::External;
StringAttr locationAttrName = op.getLocationAttrName();
IntegerAttr locationAttr = op.getLocationAttr();
auto newGlobalOp = rewriter.replaceOpWithNewOp<LLVM::GlobalOp>(
op, dstType, isConstant, linkage, op.getSymName(), Attribute(),
/*alignment=*/0, storageClassToAddressSpace(clientAPI, storageClass));

// Attach location attribute if applicable
if (op.getLocationAttr())
newGlobalOp->setAttr(op.getLocationAttrName(), op.getLocationAttr());
if (locationAttr)
newGlobalOp->setAttr(locationAttrName, locationAttr);

return success();
}
Expand Down Expand Up @@ -1426,7 +1428,6 @@ class SelectionPattern : public SPIRVToLLVMConversion<spirv::SelectionOp> {
headerBlock->getOperations().front());
if (!condBrOp)
return failure();
rewriter.eraseBlock(headerBlock);

// Branch from merge block to continue block.
auto *mergeBlock = op.getMergeBlock();
Expand All @@ -1444,6 +1445,7 @@ class SelectionPattern : public SPIRVToLLVMConversion<spirv::SelectionOp> {
falseBlock,
condBrOp.getFalseTargetOperands());

rewriter.eraseBlock(headerBlock);
rewriter.inlineRegionBefore(op.getBody(), continueBlock);
rewriter.replaceOp(op, continueBlock->getArguments());
return success();
Expand Down