RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2024-12-11 05:35:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add hook in MCSection to decide when to use "optimized nops", for each

Browse Source 
section kind. Previously, optimized nops were only used for MachO.
Also added tests for ELF and COFF.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@115523 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jan Wen Voung 2010-10-04 17:32:41 +00:00
parent 7a391832f4
commit 083cf1574f
13 changed files with 113 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/llvm/MC/MCSection.h
View File

@ -61,6 +61,10 @@ namespace llvm {
return false;
}
// UseCodeAlign - Return true if a .align directive should use
// "optimized nops" to fill instead of 0s.
virtual bool UseCodeAlign() const = 0;
static bool classof(const MCSection *) { return true; }
};

1
include/llvm/MC/MCSectionCOFF.h
View File

@ -55,6 +55,7 @@ namespace llvm {
virtual void PrintSwitchToSection(const MCAsmInfo &MAI,
raw_ostream &OS) const;
virtual bool UseCodeAlign() const;
static bool classof(const MCSection *S) {
return S->getVariant() == SV_COFF;

3
include/llvm/MC/MCSectionELF.h
View File

@ -178,7 +178,8 @@ public:
void PrintSwitchToSection(const MCAsmInfo &MAI,
raw_ostream &OS) const;
virtual bool UseCodeAlign() const;
/// isBaseAddressKnownZero - We know that non-allocatable sections (like
/// debug info) have a base of zero.
virtual bool isBaseAddressKnownZero() const {

1
include/llvm/MC/MCSectionMachO.h
View File

@ -165,6 +165,7 @@ public:
virtual void PrintSwitchToSection(const MCAsmInfo &MAI,
raw_ostream &OS) const;
virtual bool UseCodeAlign() const;
static bool classof(const MCSection *S) {
return S->getVariant() == SV_MachO;

7
lib/MC/MCParser/AsmParser.cpp
View File

@ -1654,12 +1654,7 @@ bool AsmParser::ParseDirectiveAlign(bool IsPow2, unsigned ValueSize) {
// Check whether we should use optimal code alignment for this .align
// directive.
//
// FIXME: This should be using a target hook.
bool UseCodeAlign = false;
if (const MCSectionMachO *S = dyn_cast<MCSectionMachO>(
getStreamer().getCurrentSection()))
UseCodeAlign = S->hasAttribute(MCSectionMachO::S_ATTR_PURE_INSTRUCTIONS);
bool UseCodeAlign = getStreamer().getCurrentSection()->UseCodeAlign();
if ((!HasFillExpr || Lexer.getMAI().getTextAlignFillValue() == FillExpr) &&
ValueSize == 1 && UseCodeAlign) {
getStreamer().EmitCodeAlignment(Alignment, MaxBytesToFill);

4
lib/MC/MCSectionCOFF.cpp
View File

@ -74,3 +74,7 @@ void MCSectionCOFF::PrintSwitchToSection(const MCAsmInfo &MAI,
}
}
}
bool MCSectionCOFF::UseCodeAlign() const {
return getKind().isText();
}

4
lib/MC/MCSectionELF.cpp
View File

@ -112,6 +112,10 @@ void MCSectionELF::PrintSwitchToSection(const MCAsmInfo &MAI,
OS << '\n';
}
bool MCSectionELF::UseCodeAlign() const {
return getFlags() & MCSectionELF::SHF_EXECINSTR;
}
// HasCommonSymbols - True if this section holds common symbols, this is
// indicated on the ELF object file by a symbol with SHN_COMMON section
// header index.

5
lib/MC/MCSectionMachO.cpp
View File

@ -148,6 +148,10 @@ void MCSectionMachO::PrintSwitchToSection(const MCAsmInfo &MAI,
OS << '\n';
}
bool MCSectionMachO::UseCodeAlign() const {
return hasAttribute(MCSectionMachO::S_ATTR_PURE_INSTRUCTIONS);
}
/// StripSpaces - This removes leading and trailing spaces from the StringRef.
static void StripSpaces(StringRef &Str) {
while (!Str.empty() && isspace(Str[0]))
@ -283,4 +287,3 @@ std::string MCSectionMachO::ParseSectionSpecifier(StringRef Spec, // In.
return "";
}

4
lib/Target/PIC16/PIC16Section.cpp
View File

@ -102,3 +102,7 @@ void PIC16Section::PrintSwitchToSection(const MCAsmInfo &MAI,
OS << '\n';
}
bool PIC16Section::UseCodeAlign() const {
return isCODE_Type();
}

2
lib/Target/PIC16/PIC16Section.h
View File

@ -88,6 +88,8 @@ namespace llvm {
virtual void PrintSwitchToSection(const MCAsmInfo &MAI,
raw_ostream &OS) const;
virtual bool UseCodeAlign() const;
static bool classof(const MCSection *S) {
return S->getVariant() == SV_PIC16;
}

45
test/MC/COFF/align-nops.s Normal file
View File

@ -0,0 +1,45 @@
// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s -o %t
// RUN: coff-dump.py %abs_tmp | FileCheck %s
// Test that we get optimal nops in text
.text
f0:
.long 0
.align 8, 0x90
.long 0
.align 8
// But not in another section
.data
.long 0
.align 8, 0x90
.long 0
.align 8
//CHECK: Name = .text
//CHECK-NEXT: VirtualSize
//CHECK-NEXT: VirtualAddress
//CHECK-NEXT: SizeOfRawData = 16
//CHECK-NEXT: PointerToRawData
//CHECK-NEXT: PointerToRelocations
//CHECK-NEXT: PointerToLineNumbers
//CHECK-NEXT: NumberOfRelocations
//CHECK-NEXT: NumberOfLineNumbers
//CHECK-NEXT: Charateristics = 0x400001
//CHECK-NEXT: IMAGE_SCN_ALIGN_8BYTES
//CHECK-NEXT: SectionData =
//CHECK-NEXT: 00 00 00 00 0F 1F 40 00 - 00 00 00 00 0F 1F 40 00
//CHECK: Name = .data
//CHECK-NEXT: VirtualSize
//CHECK-NEXT: VirtualAddress
//CHECK-NEXT: SizeOfRawData = 16
//CHECK-NEXT: PointerToRawData
//CHECK-NEXT: PointerToRelocations
//CHECK-NEXT: PointerToLineNumbers
//CHECK-NEXT: NumberOfRelocations
//CHECK-NEXT: NumberOfLineNumbers
//CHECK-NEXT: Charateristics = 0x400001
//CHECK-NEXT: IMAGE_SCN_ALIGN_8BYTES
//CHECK-NEXT: SectionData =
//CHECK-NEXT: 00 00 00 00 90 90 90 90 - 00 00 00 00 00 00 00 00

2
test/MC/COFF/dg.exp
View File

@ -1,5 +1,5 @@
load_lib llvm.exp
if { [llvm_supports_target X86] } {
RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll}]]
RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,s}]]
}

40
test/MC/ELF/align-nops.s Normal file
View File

@ -0,0 +1,40 @@
// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | elf-dump --dump-section-data | FileCheck %s
// Test that we get optimal nops in text
.text
f0:
.long 0
.align 8, 0x90
.long 0
.align 8
// But not in another section
.data
.long 0
.align 8, 0x90
.long 0
.align 8
// CHECK: (('sh_name', 1) # '.text'
// CHECK-NEXT: ('sh_type', 1)
// CHECK-NEXT: ('sh_flags', 6)
// CHECK-NEXT: ('sh_addr',
// CHECK-NEXT: ('sh_offset',
// CHECK-NEXT: ('sh_size', 16)
// CHECK-NEXT: ('sh_link', 0)
// CHECK-NEXT: ('sh_info', 0)
// CHECK-NEXT: ('sh_addralign', 8)
// CHECK-NEXT: ('sh_entsize', 0)
// CHECK-NEXT: ('_section_data', '00000000 0f1f4000 00000000 0f1f4000')
// CHECK: (('sh_name', 7) # '.data'
// CHECK-NEXT: ('sh_type', 1)
// CHECK-NEXT: ('sh_flags', 3)
// CHECK-NEXT: ('sh_addr',
// CHECK-NEXT: ('sh_offset',
// CHECK-NEXT: ('sh_size', 16)
// CHECK-NEXT: ('sh_link', 0)
// CHECK-NEXT: ('sh_info', 0)
// CHECK-NEXT: ('sh_addralign', 8)
// CHECK-NEXT: ('sh_entsize', 0)
// CHECK-NEXT: ('_section_data', '00000000 90909090 00000000 00000000')