Bring naming on par with the spec (hsa-runtime)

Change-Id: Ie1903c90a195cf95b186eb5552131a20af408adf

runtime/hsa-runtime/core/runtime/hsa.cpp

@@ -1821,6 +1821,71 @@ hsa_status_t hsa_code_object_destroy(
   CATCH;
 }
 
+static std::string ConvertOldTargetNameToNew(
+    const std::string &OldName, bool IsFinalizer, uint32_t EFlags) {
+  std::string NewName = "";
+
+  // FIXME #1: Should 9:0:3 be completely (loader, sc, etc.) removed?
+  // FIXME #2: What does PAL do with respect to boltzmann/usual fiji/tonga?
+  if (OldName == "AMD:AMDGPU:7:0:0")
+    NewName = "amdgcn-amd-amdhsa--gfx700";
+  else if (OldName == "AMD:AMDGPU:7:0:1")
+    NewName = "amdgcn-amd-amdhsa--gfx701";
+  else if (OldName == "AMD:AMDGPU:7:0:2")
+    NewName = "amdgcn-amd-amdhsa--gfx702";
+  else if (OldName == "AMD:AMDGPU:7:0:3")
+    NewName = "amdgcn-amd-amdhsa--gfx703";
+  else if (OldName == "AMD:AMDGPU:7:0:4")
+    NewName = "amdgcn-amd-amdhsa--gfx704";
+  else if (OldName == "AMD:AMDGPU:8:0:0")
+    NewName = "amdgcn-amd-amdhsa--gfx800";
+  else if (OldName == "AMD:AMDGPU:8:0:1")
+    NewName = "amdgcn-amd-amdhsa--gfx801";
+  else if (OldName == "AMD:AMDGPU:8:0:2")
+    NewName = "amdgcn-amd-amdhsa--gfx802";
+  else if (OldName == "AMD:AMDGPU:8:0:3")
+    NewName = "amdgcn-amd-amdhsa--gfx803";
+  else if (OldName == "AMD:AMDGPU:8:0:4")
+    NewName = "amdgcn-amd-amdhsa--gfx804";
+  else if (OldName == "AMD:AMDGPU:8:1:0")
+    NewName = "amdgcn-amd-amdhsa--gfx810";
+  else if (OldName == "AMD:AMDGPU:9:0:0")
+    NewName = "amdgcn-amd-amdhsa--gfx900";
+  else if (OldName == "AMD:AMDGPU:9:0:1")
+    NewName = "amdgcn-amd-amdhsa--gfx900";
+  else if (OldName == "AMD:AMDGPU:9:0:2")
+    NewName = "amdgcn-amd-amdhsa--gfx902";
+  else if (OldName == "AMD:AMDGPU:9:0:3")
+    NewName = "amdgcn-amd-amdhsa--gfx902";
+  else if (OldName == "AMD:AMDGPU:9:0:4")
+    NewName = "amdgcn-amd-amdhsa--gfx904";
+  else if (OldName == "AMD:AMDGPU:9:0:6")
+    NewName = "amdgcn-amd-amdhsa--gfx906";
+  else
+    assert(false && "Unhandled target");
+
+  if (IsFinalizer && (EFlags & EF_AMDGPU_XNACK)) {
+    NewName = NewName + "+xnack";
+  } else {
+    if (EFlags != 0 && (EFlags & EF_AMDGPU_XNACK_LC)) {
+      NewName = NewName + "+xnack";
+    } else {
+      if (OldName == "AMD:AMDGPU:8:0:1")
+        NewName = NewName + "+xnack";
+      else if (OldName == "AMD:AMDGPU:8:1:0")
+        NewName = NewName + "+xnack";
+      else if (OldName == "AMD:AMDGPU:9:0:1")
+        NewName = NewName + "+xnack";
+      else if (OldName == "AMD:AMDGPU:9:0:2")
+        NewName = NewName + "+xnack";
+      else if (OldName == "AMD:AMDGPU:9:0:3")
+        NewName = NewName + "+xnack";
+    }
+  }
+
+  return NewName;
+}
+
 /* deprecated */
 hsa_status_t hsa_code_object_get_info(
     hsa_code_object_t code_object,
@@ -1857,27 +1922,12 @@ hsa_status_t hsa_code_object_get_info(
         // Only finalizer generated the "HSAIL" note.
         IsFinalizer = false;
       }
-      if (IsFinalizer && (code->EFlags() & EF_AMDGPU_XNACK)) {
-        isa_name_str = isa_name_str + "-xnack";
-      } else {
-        if (code->EFlags() != 0 && (code->EFlags() & EF_AMDGPU_XNACK_LC)) {
-          isa_name_str = isa_name_str + "-xnack";
-        } else {
-          if (isa_name_str == "AMD:AMDGPU:8:0:1")
-            isa_name_str = isa_name_str + "-xnack";
-          else if (isa_name_str == "AMD:AMDGPU:8:1:0")
-            isa_name_str = isa_name_str + "-xnack";
-          else if (isa_name_str == "AMD:AMDGPU:9:0:1")
-            isa_name_str = isa_name_str + "-xnack";
-          else if (isa_name_str == "AMD:AMDGPU:9:0:2")
-            isa_name_str = isa_name_str + "-xnack";
-          else if (isa_name_str == "AMD:AMDGPU:9:0:3")
-            isa_name_str = isa_name_str + "-xnack";
-        }
-      }
+
+      std::string new_isa_name_str =
+          ConvertOldTargetNameToNew(isa_name_str, IsFinalizer, code->EFlags());
 
       hsa_isa_t isa_handle = {0};
-      status = HSA::hsa_isa_from_name(isa_name_str.c_str(), &isa_handle);
+      status = HSA::hsa_isa_from_name(new_isa_name_str.c_str(), &isa_handle);
       if (status != HSA_STATUS_SUCCESS) {
         return status;
       }