Skip to content

[CIR][CodeGen] Refactor setExtraAttributesForFunc to better align with OG #830

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 12, 2024
Merged

[CIR][CodeGen] Refactor setExtraAttributesForFunc to better align with OG #830

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion clang/lib/CIR/CodeGen/CIRGenCXX.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ mlir::cir::FuncOp CIRGenModule::codegenCXXStructor(GlobalDecl GD) {
CurCGF = nullptr;

setNonAliasAttributes(GD, Fn);
// TODO: SetLLVMFunctionAttributesForDefinition
setCIRFunctionAttributesForDefinition(cast<CXXMethodDecl>(GD.getDecl()), Fn);
return Fn;
}

Expand Down
34 changes: 18 additions & 16 deletions clang/lib/CIR/CodeGen/CIRGenModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ void CIRGenModule::buildGlobalFunctionDefinition(GlobalDecl GD,
CurCGF = nullptr;

setNonAliasAttributes(GD, Op);
// TODO: SetLLVMFunctionAttributesForDeclaration
setCIRFunctionAttributesForDefinition(D, Fn);

if (const ConstructorAttr *CA = D->getAttr<ConstructorAttr>())
AddGlobalCtor(Fn, CA->getPriority());
Expand Down Expand Up @@ -2264,7 +2264,9 @@ CIRGenModule::createCIRFunction(mlir::Location loc, StringRef name,
mlir::SymbolTable::setSymbolVisibility(
f, mlir::SymbolTable::Visibility::Private);

setExtraAttributesForFunc(f, FD);
// Initialize with empty dict of extra attributes.
f.setExtraAttrsAttr(mlir::cir::ExtraFuncAttributesAttr::get(
builder.getContext(), builder.getDictionaryAttr({})));

if (!curCGF)
theModule.push_back(f);
Expand Down Expand Up @@ -2333,16 +2335,16 @@ static bool hasUnwindExceptions(const LangOptions &LangOpts) {
return true;
}

void CIRGenModule::setExtraAttributesForFunc(FuncOp f,
const clang::FunctionDecl *FD) {
mlir::NamedAttrList attrs;
void CIRGenModule::setCIRFunctionAttributesForDefinition(const Decl *decl,
FuncOp f) {
mlir::NamedAttrList attrs{f.getExtraAttrs().getElements().getValue()};

if (!hasUnwindExceptions(getLangOpts())) {
auto attr = mlir::cir::NoThrowAttr::get(builder.getContext());
attrs.set(attr.getMnemonic(), attr);
}

if (!FD) {
if (!decl) {
// If we don't have a declaration to control inlining, the function isn't
// explicitly marked as alwaysinline for semantic reasons, and inlining is
// disabled, mark the function as noinline.
Expand All @@ -2351,12 +2353,12 @@ void CIRGenModule::setExtraAttributesForFunc(FuncOp f,
builder.getContext(), mlir::cir::InlineKind::AlwaysInline);
attrs.set(attr.getMnemonic(), attr);
}
} else if (FD->hasAttr<NoInlineAttr>()) {
} else if (decl->hasAttr<NoInlineAttr>()) {
// Add noinline if the function isn't always_inline.
auto attr = mlir::cir::InlineAttr::get(builder.getContext(),
mlir::cir::InlineKind::NoInline);
attrs.set(attr.getMnemonic(), attr);
} else if (FD->hasAttr<AlwaysInlineAttr>()) {
} else if (decl->hasAttr<AlwaysInlineAttr>()) {
// (noinline wins over always_inline, and we can't specify both in IR)
auto attr = mlir::cir::InlineAttr::get(builder.getContext(),
mlir::cir::InlineKind::AlwaysInline);
Expand All @@ -2371,18 +2373,18 @@ void CIRGenModule::setExtraAttributesForFunc(FuncOp f,
// Otherwise, propagate the inline hint attribute and potentially use its
// absence to mark things as noinline.
// Search function and template pattern redeclarations for inline.
auto CheckForInline = [](const FunctionDecl *FD) {
auto CheckForInline = [](const FunctionDecl *decl) {
auto CheckRedeclForInline = [](const FunctionDecl *Redecl) {
return Redecl->isInlineSpecified();
};
if (any_of(FD->redecls(), CheckRedeclForInline))
if (any_of(decl->redecls(), CheckRedeclForInline))
return true;
const FunctionDecl *Pattern = FD->getTemplateInstantiationPattern();
const FunctionDecl *Pattern = decl->getTemplateInstantiationPattern();
if (!Pattern)
return false;
return any_of(Pattern->redecls(), CheckRedeclForInline);
};
if (CheckForInline(FD)) {
if (CheckForInline(cast<FunctionDecl>(decl))) {
auto attr = mlir::cir::InlineAttr::get(builder.getContext(),
mlir::cir::InlineKind::InlineHint);
attrs.set(attr.getMnemonic(), attr);
Expand All @@ -2397,10 +2399,10 @@ void CIRGenModule::setExtraAttributesForFunc(FuncOp f,
// starting with the default for this optimization level.
bool ShouldAddOptNone =
!codeGenOpts.DisableO0ImplyOptNone && codeGenOpts.OptimizationLevel == 0;
if (FD) {
ShouldAddOptNone &= !FD->hasAttr<MinSizeAttr>();
ShouldAddOptNone &= !FD->hasAttr<AlwaysInlineAttr>();
ShouldAddOptNone |= FD->hasAttr<OptimizeNoneAttr>();
if (decl) {
ShouldAddOptNone &= !decl->hasAttr<MinSizeAttr>();
ShouldAddOptNone &= !decl->hasAttr<AlwaysInlineAttr>();
ShouldAddOptNone |= decl->hasAttr<OptimizeNoneAttr>();
}

if (ShouldAddOptNone) {
Expand Down
10 changes: 6 additions & 4 deletions clang/lib/CIR/CodeGen/CIRGenModule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,12 @@ class CIRGenModule : public CIRGenTypeCache {

/// Set the CIR function attributes (sext, zext, etc).
void setCIRFunctionAttributes(GlobalDecl GD, const CIRGenFunctionInfo &info,
mlir::cir::FuncOp func, bool isThunk);
mlir::cir::FuncOp func, bool isThunk);

/// Set the CIR function attributes which only apply to a function
/// definition.
void setCIRFunctionAttributesForDefinition(const Decl *decl,
mlir::cir::FuncOp func);

void buildGlobalDefinition(clang::GlobalDecl D,
mlir::Operation *Op = nullptr);
Expand Down Expand Up @@ -665,9 +670,6 @@ class CIRGenModule : public CIRGenTypeCache {
void ReplaceUsesOfNonProtoTypeWithRealFunction(mlir::Operation *Old,
mlir::cir::FuncOp NewFn);

void setExtraAttributesForFunc(mlir::cir::FuncOp f,
const clang::FunctionDecl *FD);

// TODO: CodeGen also passes an AttributeList here. We'll have to match that
// in CIR
mlir::cir::FuncOp
Expand Down
2 changes: 1 addition & 1 deletion clang/test/CIR/CodeGen/attributes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ int __attribute__((section(".shared"))) glob = 42;


void __attribute__((__visibility__("hidden"))) foo();
// CIR: cir.func no_proto private hidden @foo(...) extra(#fn_attr)
// CIR: cir.func no_proto private hidden @foo(...)
int bah()
{
foo();
Expand Down
6 changes: 3 additions & 3 deletions clang/test/CIR/CodeGen/visibility-attribute.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ int call_glob()
}

void foo_default();
// CIR: cir.func no_proto private @foo_default(...) extra(#fn_attr)
// CIR: cir.func no_proto private @foo_default(...)
// LLVM: declare {{.*}} void @foo_default(...)

void __attribute__((__visibility__("hidden"))) foo_hidden();
// CIR: cir.func no_proto private hidden @foo_hidden(...) extra(#fn_attr)
// CIR: cir.func no_proto private hidden @foo_hidden(...)
// LLVM: declare {{.*}} hidden void @foo_hidden(...)

void __attribute__((__visibility__("protected"))) foo_protected();
// CIR: cir.func no_proto private protected @foo_protected(...) extra(#fn_attr)
// CIR: cir.func no_proto private protected @foo_protected(...)
// LLVM: declare {{.*}} protected void @foo_protected(...)

void call_foo()
Expand Down