[PATCH] D29115: [AMDGPU] Bump up n_type for metadata v2

[Konstantin Zhuravlyov via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL293083: [AMDGPU] Bump up n_type for metadata v2 (authored by kzhuravl).

Changed prior to commit:
  https://reviews.llvm.org/D29115?vs=85770&id=85792#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D29115

Files:
  llvm/trunk/lib/Target/AMDGPU/AMDGPUPTNote.h
  llvm/trunk/tools/llvm-readobj/ELFDumper.cpp


Index: llvm/trunk/lib/Target/AMDGPU/AMDGPUPTNote.h
===================================================================
--- llvm/trunk/lib/Target/AMDGPU/AMDGPUPTNote.h
+++ llvm/trunk/lib/Target/AMDGPU/AMDGPUPTNote.h
@@ -25,14 +25,17 @@
 
 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
 };
Index: llvm/trunk/tools/llvm-readobj/ELFDumper.cpp
===================================================================
--- llvm/trunk/tools/llvm-readobj/ELFDumper.cpp
+++ llvm/trunk/tools/llvm-readobj/ELFDumper.cpp
@@ -2364,7 +2364,7 @@
   }
   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];


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D29115.85792.patch
Type: text/x-patch
Size: 1424 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170125/96a27714/attachment.bin>