6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-07-21 02:29:22 +00:00
Code Issues Projects Releases Wiki Activity

Change ForceSizeOpt attribute into MinSize attribute

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@167020 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Quentin Colombet 2012-10-30 16:32:52 +00:00
parent 446cf94cdb
commit 9a419f656e
10 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/llvm/Attributes.h
View File

@ -58,9 +58,9 @@ public:
///< 0 means unaligned different from align 1
AlwaysInline, ///< inline=always
ByVal, ///< Pass structure by value
ForceSizeOpt, ///< Function must be optimized for size first
InlineHint, ///< Source said inlining was desirable
InReg, ///< Force argument to be passed in register
MinSize, ///< Function must be optimized for size first
Naked, ///< Naked function
Nest, ///< Nested function static chain
NoAlias, ///< Considered to not alias after call
@ -154,7 +154,7 @@ public:
hasAttribute(Attributes::NonLazyBind) ||
hasAttribute(Attributes::ReturnsTwice) ||
hasAttribute(Attributes::AddressSafety) ||
hasAttribute(Attributes::ForceSizeOpt);
hasAttribute(Attributes::MinSize);
}
bool operator==(const Attributes &A) const {
@ -266,7 +266,7 @@ public:
.removeAttribute(Attributes::NonLazyBind)
.removeAttribute(Attributes::ReturnsTwice)
.removeAttribute(Attributes::AddressSafety)
.removeAttribute(Attributes::ForceSizeOpt);
.removeAttribute(Attributes::MinSize);
}
uint64_t Raw() const { return Bits; }

2
lib/AsmParser/LLLexer.cpp
View File

@ -558,7 +558,7 @@ lltok::Kind LLLexer::LexIdentifier() {
KEYWORD(naked);
KEYWORD(nonlazybind);
KEYWORD(address_safety);
KEYWORD(forcesizeopt);
KEYWORD(minsize);
KEYWORD(type);
KEYWORD(opaque);

4
lib/AsmParser/LLParser.cpp
View File

@ -953,7 +953,7 @@ bool LLParser::ParseOptionalAttrs(AttrBuilder &B, unsigned AttrKind) {
case lltok::kw_naked: B.addAttribute(Attributes::Naked); break;
case lltok::kw_nonlazybind: B.addAttribute(Attributes::NonLazyBind); break;
case lltok::kw_address_safety: B.addAttribute(Attributes::AddressSafety); break;
case lltok::kw_forcesizeopt: B.addAttribute(Attributes::ForceSizeOpt); break;
case lltok::kw_minsize: B.addAttribute(Attributes::MinSize); break;
case lltok::kw_alignstack: {
unsigned Alignment;
@ -1012,7 +1012,7 @@ bool LLParser::ParseOptionalAttrs(AttrBuilder &B, unsigned AttrKind) {
case lltok::kw_nonlazybind:
case lltok::kw_returns_twice:
case lltok::kw_address_safety:
case lltok::kw_forcesizeopt:
case lltok::kw_minsize:
if (AttrKind != 2)
HaveError |= Error(AttrLoc, "invalid use of function-only attribute");
break;

2
lib/AsmParser/LLToken.h
View File

@ -110,7 +110,7 @@ namespace lltok {
kw_naked,
kw_nonlazybind,
kw_address_safety,
kw_forcesizeopt,
kw_minsize,
kw_type,
kw_opaque,

8
lib/Target/ARM/ARMISelLowering.cpp
View File

@ -1594,15 +1594,15 @@ ARMTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
// FIXME: handle tail calls differently.
unsigned CallOpc;
bool HasForceSizeAttr = MF.getFunction()->getFnAttributes().
hasAttribute(Attributes::ForceSizeOpt);
bool HasMinSizeAttr = MF.getFunction()->getFnAttributes().
hasAttribute(Attributes::MinSize);
if (Subtarget->isThumb()) {
if ((!isDirect || isARMFunc) && !Subtarget->hasV5TOps())
CallOpc = ARMISD::CALL_NOLINK;
else if (doesNotRet && isDirect && !isARMFunc &&
Subtarget->hasRAS() && !Subtarget->isThumb1Only() &&
// Emit regular call when code size is the priority
!HasForceSizeAttr)
!HasMinSizeAttr)
// "mov lr, pc; b _foo" to avoid confusing the RSP
CallOpc = ARMISD::CALL_NOLINK;
else
@ -1612,7 +1612,7 @@ ARMTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
CallOpc = ARMISD::CALL_NOLINK;
} else if (doesNotRet && isDirect && Subtarget->hasRAS() &&
// Emit regular call when code size is the priority
!HasForceSizeAttr)
!HasMinSizeAttr)
// "mov lr, pc; b _foo" to avoid confusing the RSP
CallOpc = ARMISD::CALL_NOLINK;
else

1
lib/Target/CppBackend/CPPBackend.cpp
View File

@ -507,6 +507,7 @@ void CppWriter::printAttributes(const AttrListPtr &PAL,
HANDLE_ATTR(ReturnsTwice);
HANDLE_ATTR(UWTable);
HANDLE_ATTR(NonLazyBind);
HANDLE_ATTR(MinSize);
#undef HANDLE_ATTR
if (attrs.hasAttribute(Attributes::StackAlignment))
Out << " B.addStackAlignmentAttr(" << attrs.getStackAlignment() << ")\n";

6
lib/VMCore/Attributes.cpp
View File

@ -201,8 +201,8 @@ std::string Attributes::getAsString() const {
Result += "nonlazybind ";
if (hasAttribute(Attributes::AddressSafety))
Result += "address_safety ";
if (hasAttribute(Attributes::ForceSizeOpt))
Result += "forcesizeopt ";
if (hasAttribute(Attributes::MinSize))
Result += "minsize ";
if (hasAttribute(Attributes::StackAlignment)) {
Result += "alignstack(";
Result += utostr(getStackAlignment());
@ -326,7 +326,7 @@ uint64_t AttributesImpl::getAttrMask(uint64_t Val) {
case Attributes::UWTable: return 1 << 30;
case Attributes::NonLazyBind: return 1U << 31;
case Attributes::AddressSafety: return 1ULL << 32;
case Attributes::ForceSizeOpt: return 1ULL << 33;
case Attributes::MinSize: return 1ULL << 33;
}
llvm_unreachable("Unsupported attribute type");
}

4
test/CodeGen/ARM/call-noret-forsize.ll → test/CodeGen/ARM/call-noret-minsize.ll
View File

@ -3,7 +3,7 @@
; RUN: llc < %s -mtriple=thumbv7-apple-ios -mcpu=cortex-a8 | FileCheck %s -check-prefix=T2
; rdar://12348580
define void @t1() noreturn forcesizeopt nounwind ssp {
define void @t1() noreturn minsize nounwind ssp {
entry:
; ARM: t1:
; ARM: bl _bar
@ -17,7 +17,7 @@ entry:
unreachable
}
define void @t2() noreturn forcesizeopt nounwind ssp {
define void @t2() noreturn minsize nounwind ssp {
entry:
; ARM: t2:
; ARM: bl _t1

7
test/Feature/forceoptsize_attr.ll
View File

@ -1,7 +0,0 @@
; RUN: llvm-as < %s | llvm-dis | FileCheck %s
define void @test1() forcesizeopt {
; CHECK: define void @test1() forcesizeopt
ret void
}

7
test/Feature/minsize_attr.ll Normal file
View File

@ -0,0 +1,7 @@
; RUN: llvm-as < %s | llvm-dis | FileCheck %s
define void @test1() minsize {
; CHECK: define void @test1() minsize
ret void
}