Correct code object V2 support

- Remove gfx800, gfx804 and gfx901 as they do not exist.
- Map the V2 note record of "AMD:AMDGPU:8:0:0" to gfx802 as they are
  the same target just connected to a differnt motherboard.
- Correct typo for supporting gfx902:xnack+.
- Support agent names with a minor or stepping version greater than 9.

Change-Id: Ife933449f60ab4687e2aaab9baf4c9fc5b86339d

runtime/hsa-runtime/loader/loaders.cpp

@@ -116,35 +116,23 @@ namespace loader {
       return gfx704;
     } else if (sname == "AMD:AMDGPU:7:0:5") {
       return gfx705;
-    } else if (sname == "AMD:AMDGPU:8:0:0") {
-      return gfx800;
     } else if (sname == "AMD:AMDGPU:8:0:1") {
       return gfx801;
-    } else if (sname == "AMD:AMDGPU:8:0:2") {
+    } else if (sname == "AMD:AMDGPU:8:0:0" || sname == "AMD:AMDGPU:8:0:2") {
       return gfx802;
-    } else if (sname == "AMD:AMDGPU:8:0:3") {
+    } else if (sname == "AMD:AMDGPU:8:0:3" || sname == "AMD:AMDGPU:8:0:4") {
       return gfx803;
-    } else if (sname == "AMD:AMDGPU:8:0:4") {
-      return gfx804;
     } else if (sname == "AMD:AMDGPU:8:0:5") {
       return gfx805;
     } else if (sname == "AMD:AMDGPU:8:1:0") {
       return gfx810;
-    } else if (sname == "AMD:AMDGPU:9:0:0") {
+    } else if (sname == "AMD:AMDGPU:9:0:0" || sname == "AMD:AMDGPU:9:0:1") {
       return gfx900;
-    } else if (sname == "AMD:AMDGPU:9:0:1") {
-      return gfx901;
-    } else if (sname == "AMD:AMDGPU:9:0:2") {
+    } else if (sname == "AMD:AMDGPU:9:0:2" || sname == "AMD:AMDGPU:9:0:3") {
       return gfx902;
-    } else if (sname == "AMD:AMDGPU:9:0:3") {
-      return gfx902;
-    } else if (sname == "AMD:AMDGPU:9:0:4") {
+    } else if (sname == "AMD:AMDGPU:9:0:4" || sname == "AMD:AMDGPU:9:0:5") {
       return gfx904;
-    } else if (sname == "AMD:AMDGPU:9:0:5") {
-      return gfx904;
-    } else if (sname == "AMD:AMDGPU:9:0:6") {
-      return gfx906;
-    } else if (sname == "AMD:AMDGPU:9:0:7") {
+    } else if (sname == "AMD:AMDGPU:9:0:6" || sname == "AMD:AMDGPU:9:0:7") {
       return gfx906;
     } else if (sname == "AMD:AMDGPU:9:0:8") {
       return gfx908;

runtime/hsa-runtime/loader/loaders.hpp

@@ -56,8 +56,8 @@ namespace loader {
   private:
     hsa_isa_t invalid;
     hsa_isa_t gfx700, gfx701, gfx702, gfx703, gfx704, gfx705;
-    hsa_isa_t gfx800, gfx801, gfx802, gfx803, gfx804, gfx805, gfx810;
-    hsa_isa_t gfx900, gfx901, gfx902, gfx904, gfx906, gfx908;
+    hsa_isa_t gfx801, gfx802, gfx803, gfx805, gfx810;
+    hsa_isa_t gfx900, gfx902, gfx904, gfx906, gfx908;
     hsa_isa_t gfx1010, gfx1011, gfx1012, gfx1030, gfx1031, gfx1032;
     std::ostream& out;
     typedef std::set<void*> PointerSet;
@@ -73,7 +73,7 @@ namespace loader {
     void* SegmentAlloc(amdgpu_hsa_elf_segment_t segment, hsa_agent_t agent, size_t size, size_t align, bool zero) override;
 
     bool SegmentCopy(amdgpu_hsa_elf_segment_t segment, hsa_agent_t agent, void* dst, size_t offset, const void* src, size_t size) override;
-    
+
     void SegmentFree(amdgpu_hsa_elf_segment_t segment, hsa_agent_t agent, void* seg, size_t size = 0) override;
 
     void* SegmentAddress(amdgpu_hsa_elf_segment_t segment, hsa_agent_t agent, void* seg, size_t offset) override;