[AMDGPU] Bump up n_type for metadata v2

[arsenm]

Needs a test update?

[kzhuravl]

In D29115#655884, @arsenm wrote:

Needs a test update?

No. But we can add a check lines to metadata tests to check for n_type?

[arsenm]

In D29115#655900, @kzhuravl wrote:

In D29115#655884, @arsenm wrote:

Needs a test update?

No. But we can add a check lines to metadata tests to check for n_type?

In D29115#655900, @kzhuravl wrote:

In D29115#655884, @arsenm wrote:

Needs a test update?

No. But we can add a check lines to metadata tests to check for n_type?

Yes, I think it's surprising there wasn't one before

[kzhuravl]

Add a todo for possibly moving n_type into include/llvm/Support

[kzhuravl]

In D29115#655901, @arsenm wrote:

In D29115#655900, @kzhuravl wrote:

In D29115#655884, @arsenm wrote:

Needs a test update?

No. But we can add a check lines to metadata tests to check for n_type?

In D29115#655900, @kzhuravl wrote:

In D29115#655884, @arsenm wrote:

Needs a test update?

No. But we can add a check lines to metadata tests to check for n_type?

Yes, I think it's surprising there wasn't one before

I have added such test in D29131

[arsenm]

LGTM

llvm/trunk/lib/Target/AMDGPU/AMDGPUPTNote.h

 namespace AMDGPU {
 
 namespace PT_NOTE {
 
 const char SectionName[] = ".note";
 
 const char NoteName[] = "AMD";
 
+// TODO: Move this enum to include/llvm/Support so it can be used in tools?
 enum NoteType{
     NT_AMDGPU_HSA_CODE_OBJECT_VERSION = 1,
     NT_AMDGPU_HSA_HSAIL = 2,
     NT_AMDGPU_HSA_ISA = 3,
     NT_AMDGPU_HSA_PRODUCER = 4,
     NT_AMDGPU_HSA_PRODUCER_OPTIONS = 5,
     NT_AMDGPU_HSA_EXTENSION = 6,
-    NT_AMDGPU_HSA_RUNTIME_METADATA = 7,
+    NT_AMDGPU_HSA_RUNTIME_METADATA_V_1 = 7, // deprecated since 12/14/16.
+    NT_AMDGPU_HSA_RUNTIME_METADATA_V_2 = 8,
+    NT_AMDGPU_HSA_RUNTIME_METADATA = NT_AMDGPU_HSA_RUNTIME_METADATA_V_2,
     NT_AMDGPU_HSA_HLDEBUG_DEBUG = 101,
     NT_AMDGPU_HSA_HLDEBUG_TARGET = 102
 };
 }
 }
 
 #endif // LLVM_LIB_TARGET_AMDGPU_AMDGPUNOTETYPE_H

llvm/trunk/tools/llvm-readobj/ELFDumper.cpp

 template <class ELFT> void ELFDumper<ELFT>::printAMDGPURuntimeMD() {
   const Elf_Shdr *Shdr = findSectionByName(*Obj, ".note");
   if (!Shdr) {
     W.startLine() << "There is no .note section in the file.\n";
     return;
   }
   ArrayRef<uint8_t> Sec = unwrapOrError(Obj->getSectionContents(Shdr));
 
-  const uint32_t RuntimeMDNoteType = 7;
+  const uint32_t RuntimeMDNoteType = 8;
   for (auto I = reinterpret_cast<const Elf_Word *>(&Sec[0]),
        E = I + Sec.size()/4; I != E;) {
     uint32_t NameSZ = I[0];
     uint32_t DescSZ = I[1];
     uint32_t Type = I[2];
     I += 3;
 
     StringRef Name;