[PATCH] D30750: Rename PT_NOTE namespace name used in AMDGPUPTNote.h
Guansong Zhang via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Thu Mar 9 12:26:01 PST 2017
guansong updated this revision to Diff 91210.
guansong added a comment.
Use ElfNote instead of AMD_PT_NOTE as suggested.
https://reviews.llvm.org/D30750
Files:
drivers/opencl/compiler/llvm/lib/Target/AMDGPU/AMDGPUPTNote.h
drivers/opencl/compiler/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp
drivers/opencl/compiler/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.h
Index: drivers/opencl/compiler/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.h
===================================================================
--- drivers/opencl/compiler/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.h
+++ drivers/opencl/compiler/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.h
@@ -85,7 +85,8 @@
class AMDGPUTargetELFStreamer : public AMDGPUTargetStreamer {
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);
public:
Index: drivers/opencl/compiler/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp
===================================================================
--- drivers/opencl/compiler/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp
+++ drivers/opencl/compiler/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp
@@ -125,20 +125,20 @@
}
void AMDGPUTargetELFStreamer::EmitAMDGPUNote(
- const MCExpr *DescSZ, PT_NOTE::NoteType Type,
+ const MCExpr *DescSZ, ElfNote::NoteType Type,
function_ref<void(MCELFStreamer &)> EmitDesc) {
auto &S = getStreamer();
auto &Context = S.getContext();
- auto NameSZ = sizeof(PT_NOTE::NoteName);
+ auto NameSZ = sizeof(ElfNote::NoteName);
S.PushSection();
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.EmitValue(DescSZ, 4); // descz
- S.EmitIntValue(Type, 4); // type
- S.EmitBytes(StringRef(PT_NOTE::NoteName, NameSZ)); // name
+ S.EmitIntValue(Type, 4); // type
+ S.EmitBytes(StringRef(ElfNote::NoteName, NameSZ)); // name
S.EmitValueToAlignment(4, 0, 1, 0); // padding 0
EmitDesc(S); // desc
S.EmitValueToAlignment(4, 0, 1, 0); // padding 0
@@ -151,7 +151,7 @@
EmitAMDGPUNote(
MCConstantExpr::create(8, getContext()),
- PT_NOTE::NT_AMDGPU_HSA_CODE_OBJECT_VERSION,
+ ElfNote::NT_AMDGPU_HSA_CODE_OBJECT_VERSION,
[&](MCELFStreamer &OS){
OS.EmitIntValue(Major, 4);
OS.EmitIntValue(Minor, 4);
@@ -174,7 +174,7 @@
EmitAMDGPUNote(
MCConstantExpr::create(DescSZ, getContext()),
- PT_NOTE::NT_AMDGPU_HSA_ISA,
+ ElfNote::NT_AMDGPU_HSA_ISA,
[&](MCELFStreamer &OS) {
OS.EmitIntValue(VendorNameSize, 2);
OS.EmitIntValue(ArchNameSize, 2);
@@ -240,7 +240,7 @@
EmitAMDGPUNote(
DescSZ,
- PT_NOTE::NT_AMDGPU_HSA_RUNTIME_METADATA,
+ ElfNote::NT_AMDGPU_HSA_RUNTIME_METADATA,
[&](MCELFStreamer &OS) {
OS.EmitLabel(DescBegin);
OS.EmitBytes(VerifiedMetadata.get());
Index: drivers/opencl/compiler/llvm/lib/Target/AMDGPU/AMDGPUPTNote.h
===================================================================
--- drivers/opencl/compiler/llvm/lib/Target/AMDGPU/AMDGPUPTNote.h
+++ drivers/opencl/compiler/llvm/lib/Target/AMDGPU/AMDGPUPTNote.h
@@ -19,7 +19,7 @@
namespace AMDGPU {
-namespace PT_NOTE {
+namespace ElfNote {
const char SectionName[] = ".note";
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D30750.91210.patch
Type: text/x-patch
Size: 3424 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170309/704db2e9/attachment.bin>
More information about the llvm-commits
mailing list