Skip to content

[mlir][LLVM][NFC] Avoid rollback in FuncOp --> LLVM lowering #136477

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
Apr 21, 2025
Merged

[mlir][LLVM][NFC] Avoid rollback in FuncOp --> LLVM lowering #136477

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
41 changes: 25 additions & 16 deletions mlir/lib/Conversion/FuncToLLVM/FuncToLLVM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,13 +320,22 @@ mlir::convertFuncOpToLLVMFuncOp(FunctionOpInterface funcOp,
// overriden with an LLVM pointer type for later processing.
SmallVector<std::optional<NamedAttribute>> byValRefNonPtrAttrs;
TypeConverter::SignatureConversion result(funcOp.getNumArguments());
auto llvmType = converter.convertFunctionSignature(
funcOp, varargsAttr && varargsAttr.getValue(),
shouldUseBarePtrCallConv(funcOp, &converter), result,
byValRefNonPtrAttrs);
auto llvmType = dyn_cast_or_null<LLVM::LLVMFunctionType>(
converter.convertFunctionSignature(
funcOp, varargsAttr && varargsAttr.getValue(),
shouldUseBarePtrCallConv(funcOp, &converter), result,
byValRefNonPtrAttrs));
if (!llvmType)
return rewriter.notifyMatchFailure(funcOp, "signature conversion failed");

// Check for unsupported variadic functions.
if (!shouldUseBarePtrCallConv(funcOp, &converter))
if (funcOp->getAttrOfType<UnitAttr>(
LLVM::LLVMDialect::getEmitCWrapperAttrName()))
if (llvmType.isVarArg())
return funcOp.emitError("C interface for variadic functions is not "
"supported yet.");

// Create an LLVM function, use external linkage by default until MLIR
// functions have linkage.
LLVM::Linkage linkage = LLVM::Linkage::External;
Expand All @@ -342,6 +351,18 @@ mlir::convertFuncOpToLLVMFuncOp(FunctionOpInterface funcOp,
linkage = attr.getLinkage();
}

// Check for invalid attributes.
StringRef readnoneAttrName = LLVM::LLVMDialect::getReadnoneAttrName();
if (funcOp->hasAttr(readnoneAttrName)) {
auto attr = funcOp->getAttrOfType<UnitAttr>(readnoneAttrName);
if (!attr) {
funcOp->emitError() << "Contains " << readnoneAttrName
<< " attribute not of type UnitAttr";
return rewriter.notifyMatchFailure(
funcOp, "Contains readnone attribute not of type UnitAttr");
}
}

SmallVector<NamedAttribute, 4> attributes;
filterFuncAttributes(funcOp, attributes);
auto newFuncOp = rewriter.create<LLVM::LLVMFuncOp>(
Expand All @@ -352,15 +373,7 @@ mlir::convertFuncOpToLLVMFuncOp(FunctionOpInterface funcOp,
.setVisibility(funcOp.getVisibility());

// Create a memory effect attribute corresponding to readnone.
StringRef readnoneAttrName = LLVM::LLVMDialect::getReadnoneAttrName();
if (funcOp->hasAttr(readnoneAttrName)) {
auto attr = funcOp->getAttrOfType<UnitAttr>(readnoneAttrName);
if (!attr) {
funcOp->emitError() << "Contains " << readnoneAttrName
<< " attribute not of type UnitAttr";
return rewriter.notifyMatchFailure(
funcOp, "Contains readnone attribute not of type UnitAttr");
}
auto memoryAttr = LLVM::MemoryEffectsAttr::get(
rewriter.getContext(),
{LLVM::ModRefInfo::NoModRef, LLVM::ModRefInfo::NoModRef,
Expand Down Expand Up @@ -447,10 +460,6 @@ mlir::convertFuncOpToLLVMFuncOp(FunctionOpInterface funcOp,
if (!shouldUseBarePtrCallConv(funcOp, &converter)) {
if (funcOp->getAttrOfType<UnitAttr>(
LLVM::LLVMDialect::getEmitCWrapperAttrName())) {
if (newFuncOp.isVarArg())
return funcOp.emitError("C interface for variadic functions is not "
"supported yet.");

if (newFuncOp.isExternal())
wrapExternalFunction(rewriter, funcOp->getLoc(), converter, funcOp,
newFuncOp);
Expand Down
Loading