maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Rename PT_NOTE namespace name used in AMDGPUPTNote.h 

Patch by Guansong Zhang.

Differential Revision: https://reviews.llvm.org/D30750

llvm-svn: 297498
This commit is contained in:
Yaxun Liu 2017-03-10 19:35:43 +00:00
parent a135649f42
commit 874d26a89d
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/lib/Target/AMDGPU/AMDGPUPTNote.h
View File

@ -19,7 +19,7 @@
namespace AMDGPU { namespace AMDGPU {
namespace PT_NOTE { namespace ElfNote {
const char SectionName[] = ".note"; const char SectionName[] = ".note";

16
llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp
View File

@ -125,20 +125,20 @@ MCELFStreamer &AMDGPUTargetELFStreamer::getStreamer() {
} }
void AMDGPUTargetELFStreamer::EmitAMDGPUNote( void AMDGPUTargetELFStreamer::EmitAMDGPUNote(
const MCExpr *DescSZ, PT_NOTE::NoteType Type, const MCExpr *DescSZ, ElfNote::NoteType Type,
function_ref<void(MCELFStreamer &)> EmitDesc) { function_ref<void(MCELFStreamer &)> EmitDesc) {
auto &S = getStreamer(); auto &S = getStreamer();
auto &Context = S.getContext(); auto &Context = S.getContext();
auto NameSZ = sizeof(PT_NOTE::NoteName); auto NameSZ = sizeof(ElfNote::NoteName);
S.PushSection(); S.PushSection();
S.SwitchSection(Context.getELFSection( S.SwitchSection(Context.getELFSection(
PT_NOTE::SectionName, ELF::SHT_NOTE, ELF::SHF_ALLOC)); ElfNote::SectionName, ELF::SHT_NOTE, ELF::SHF_ALLOC));
S.EmitIntValue(NameSZ, 4); // namesz S.EmitIntValue(NameSZ, 4); // namesz
S.EmitValue(DescSZ, 4); // descz S.EmitValue(DescSZ, 4); // descz
S.EmitIntValue(Type, 4); // type S.EmitIntValue(Type, 4); // type
S.EmitBytes(StringRef(PT_NOTE::NoteName, NameSZ)); // name S.EmitBytes(StringRef(ElfNote::NoteName, NameSZ)); // name
S.EmitValueToAlignment(4, 0, 1, 0); // padding 0 S.EmitValueToAlignment(4, 0, 1, 0); // padding 0
EmitDesc(S); // desc EmitDesc(S); // desc
S.EmitValueToAlignment(4, 0, 1, 0); // padding 0 S.EmitValueToAlignment(4, 0, 1, 0); // padding 0
@ -151,7 +151,7 @@ AMDGPUTargetELFStreamer::EmitDirectiveHSACodeObjectVersion(uint32_t Major,
EmitAMDGPUNote( EmitAMDGPUNote(
MCConstantExpr::create(8, getContext()), MCConstantExpr::create(8, getContext()),
PT_NOTE::NT_AMDGPU_HSA_CODE_OBJECT_VERSION, ElfNote::NT_AMDGPU_HSA_CODE_OBJECT_VERSION,
[&](MCELFStreamer &OS){ [&](MCELFStreamer &OS){
OS.EmitIntValue(Major, 4); OS.EmitIntValue(Major, 4);
OS.EmitIntValue(Minor, 4); OS.EmitIntValue(Minor, 4);
@ -174,7 +174,7 @@ AMDGPUTargetELFStreamer::EmitDirectiveHSACodeObjectISA(uint32_t Major,
EmitAMDGPUNote( EmitAMDGPUNote(
MCConstantExpr::create(DescSZ, getContext()), MCConstantExpr::create(DescSZ, getContext()),
PT_NOTE::NT_AMDGPU_HSA_ISA, ElfNote::NT_AMDGPU_HSA_ISA,
[&](MCELFStreamer &OS) { [&](MCELFStreamer &OS) {
OS.EmitIntValue(VendorNameSize, 2); OS.EmitIntValue(VendorNameSize, 2);
OS.EmitIntValue(ArchNameSize, 2); OS.EmitIntValue(ArchNameSize, 2);
@ -240,7 +240,7 @@ bool AMDGPUTargetELFStreamer::EmitRuntimeMetadata(const FeatureBitset &Features,
EmitAMDGPUNote( EmitAMDGPUNote(
DescSZ, DescSZ,
PT_NOTE::NT_AMDGPU_HSA_RUNTIME_METADATA, ElfNote::NT_AMDGPU_HSA_RUNTIME_METADATA,
[&](MCELFStreamer &OS) { [&](MCELFStreamer &OS) {
OS.EmitLabel(DescBegin); OS.EmitLabel(DescBegin);
OS.EmitBytes(VerifiedMetadata.get()); OS.EmitBytes(VerifiedMetadata.get());

3
llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.h
View File

@ -85,7 +85,8 @@ public:
class AMDGPUTargetELFStreamer : public AMDGPUTargetStreamer { class AMDGPUTargetELFStreamer : public AMDGPUTargetStreamer {
MCStreamer &Streamer; MCStreamer &Streamer;
void EmitAMDGPUNote(const MCExpr *DescSize, AMDGPU::PT_NOTE::NoteType Type, void EmitAMDGPUNote(const MCExpr *DescSize,
AMDGPU::ElfNote::NoteType Type,
function_ref<void(MCELFStreamer &)> EmitDesc); function_ref<void(MCELFStreamer &)> EmitDesc);
public: public: