This is an archive of the discontinued LLVM Phabricator instance.

Differential D71256

llc: Don't overwrite frame-pointer attribute
ClosedPublic

Authored by arsenm on Dec 10 2019, 4:45 AM.

Details

Reviewers
echristo
thegameg
ahatanak
aemerson
Summary

Continue making command line flags with matching attribute behavior
consistent.

Diff Detail

Event Timeline

arsenm created this revision.Dec 10 2019, 4:45 AM
Herald added a project: Restricted Project. · View Herald TranscriptDec 10 2019, 4:45 AM
Herald added subscribers: dexonsmith, wdng. · View Herald Transcript
arsenm added a parent revision: D71253: llc/MIR: Fix setFunctionAttributes for MIR functions.Dec 10 2019, 4:46 AM
arsenm added a comment.Jan 6 2020, 7:41 AM

ping

aemerson accepted this revision.Jan 6 2020, 1:01 PM
aemerson added a subscriber: aemerson.

LGTM.

This revision is now accepted and ready to land.Jan 6 2020, 1:01 PM
arsenm closed this revision.Jan 15 2020, 5:57 PM

77eb1b8f63c120f90ba529a5da2d392e165a4bc4

Revision Contents

PathSize
llvm/
include/
llvm/
CodeGen/
3 lines
test/
Other/
50 lines

Diff 233054

llvm/include/llvm/CodeGen/CommandFlags.inc

Show First 20 Lines • Show All 389 Lines • ▼ Show 20 Lines if (OldFeatures.empty())
NewAttrs.addAttribute("target-features", Features); NewAttrs.addAttribute("target-features", Features);
else { else {
SmallString<256> Appended(OldFeatures); SmallString<256> Appended(OldFeatures);
Appended.push_back(','); Appended.push_back(',');
Appended.append(Features); Appended.append(Features);
NewAttrs.addAttribute("target-features", Appended); NewAttrs.addAttribute("target-features", Appended);
} }
} }
if (FramePointerUsage.getNumOccurrences() > 0) { if (FramePointerUsage.getNumOccurrences() > 0 &&
!F.hasFnAttribute("frame-pointer")) {
if (FramePointerUsage == llvm::FramePointer::All) if (FramePointerUsage == llvm::FramePointer::All)
NewAttrs.addAttribute("frame-pointer", "all"); NewAttrs.addAttribute("frame-pointer", "all");
else if (FramePointerUsage == llvm::FramePointer::NonLeaf) else if (FramePointerUsage == llvm::FramePointer::NonLeaf)
NewAttrs.addAttribute("frame-pointer", "non-leaf"); NewAttrs.addAttribute("frame-pointer", "non-leaf");
else if (FramePointerUsage == llvm::FramePointer::None) else if (FramePointerUsage == llvm::FramePointer::None)
NewAttrs.addAttribute("frame-pointer", "none"); NewAttrs.addAttribute("frame-pointer", "none");
} }
if (DisableTailCalls.getNumOccurrences() > 0) if (DisableTailCalls.getNumOccurrences() > 0)
Show All 28 Lines

llvm/test/Other/opt-override-frame-pointer.ll

  • This file was added.
; RUN: opt < %s -mtriple=x86_64-apple-darwin -frame-pointer=all -S | FileCheck -check-prefixes=ALL,CHECK %s
; RUN: opt < %s -mtriple=x86_64-apple-darwin -frame-pointer=none -S | FileCheck -check-prefixes=NONE,CHECK %s
; RUN: opt < %s -mtriple=x86_64-apple-darwin -frame-pointer=non-leaf -S | FileCheck -check-prefixes=NONLEAF,CHECK %s
; Check behavior of -frame-pointer flag and frame-pointer atttribute.
; CHECK: @no_frame_pointer_attr() [[VARATTR:#[0-9]+]] {
define i32 @no_frame_pointer_attr() #0 {
entry:
ret i32 0
}
; CHECK: @frame_pointer_attr_all() [[ALL_ATTR:#[0-9]+]] {
define i32 @frame_pointer_attr_all() #1 {
entry:
ret i32 0
}
; CHECK: @frame_pointer_attr_none() [[NONE_ATTR:#[0-9]+]] {
define i32 @frame_pointer_attr_none() #2 {
entry:
ret i32 0
}
; CHECK: @frame_pointer_attr_leaf() [[NONLEAF_ATTR:#[0-9]+]] {
define i32 @frame_pointer_attr_leaf() #3 {
entry:
ret i32 0
}
; ALL-DAG: attributes [[VARATTR]] = { nounwind "frame-pointer"="all" }
; ALL-DAG: attributes [[NONE_ATTR]] = { nounwind "frame-pointer"="none" }
; ALL-DAG: attributes [[NONLEAF_ATTR]] = { nounwind "frame-pointer"="non-leaf" }
; ALL-NOT: attributes
; NONE-DAG: attributes [[VARATTR]] = { nounwind "frame-pointer"="none" }
; NONE-DAG: attributes [[ALL_ATTR]] = { nounwind "frame-pointer"="all" }
; NONE-DAG: attributes [[NONLEAF_ATTR]] = { nounwind "frame-pointer"="non-leaf" }
; NONE-NOT: attributes
; NONLEAF-DAG: attributes [[VARATTR]] = { nounwind "frame-pointer"="non-leaf" }
; NONLEAF-DAG: attributes [[ALL_ATTR]] = { nounwind "frame-pointer"="all" }
; NONLEAF-DAG: attributes [[NONE_ATTR]] = { nounwind "frame-pointer"="none" }
; NONLEAF-NOT: attributes
attributes #0 = { nounwind }
attributes #1 = { nounwind "frame-pointer"="all" }
attributes #2 = { nounwind "frame-pointer"="none" }
attributes #3 = { nounwind "frame-pointer"="non-leaf" }