P4 to Git Change 1748192 by jujiang@JJ-OCL-w8 on 2019/02/25 14:20:20

SWDEV-181012 - [CQE OCL][DTB-BLOCKER][QR][Windows][19.10] clinfo results in "clBuildProgram" error with OCL binaries. Faulty CL#1737731

	- Remove some dead code as suggested by Konstantin Zhuravlyov

	- These strings are no longer needed, loader will never ask about them

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudefs.hpp#158 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.cpp#248 edit

rocclr/runtime/device/gpu/gpuprogram.cpp

@@ -1807,10 +1807,6 @@ hsa_isa_t ORCAHSALoaderContext::IsaFromName(const char* name) {
     isa.handle = gfx900;
     return isa;
   }
-  if (!strcmp(Gfx901, name)) {
-    isa.handle = gfx901;
-    return isa;
-  }
   if (!strcmp(Gfx902, name)) {
       isa.handle = gfx902;
       return isa;
@@ -1823,18 +1819,10 @@ hsa_isa_t ORCAHSALoaderContext::IsaFromName(const char* name) {
       isa.handle = gfx904;
       return isa;
   }
-  if (!strcmp(Gfx905, name)) {
-      isa.handle = gfx905;
-      return isa;
-  }
   if (!strcmp(Gfx906, name)) {
       isa.handle = gfx906;
       return isa;
   }
-  if (!strcmp(Gfx907, name)) {
-      isa.handle = gfx907;
-      return isa;
-  }
 
   return isa;
 }
@@ -1871,22 +1859,19 @@ bool ORCAHSALoaderContext::IsaSupportedByAgent(hsa_agent_t agent, hsa_isa_t isa)
           return false;
       }
     case gfx900:
-    case gfx901:
     case gfx902:
     case gfx903:
     case gfx904:
-    case gfx905:
     case gfx906:
-    case gfx907:
       switch (program_->dev().hwInfo()->machine_) {
         case ED_ATI_CAL_MACHINE_GREENLAND_ISA:
-          return isa.handle == gfx900 || isa.handle == gfx901;
+          return isa.handle == gfx900;
         case ED_ATI_CAL_MACHINE_RAVEN_ISA:
             return isa.handle == gfx902 || isa.handle == gfx903;
         case ED_ATI_CAL_MACHINE_VEGA12_ISA:
-            return isa.handle == gfx904 || isa.handle == gfx905;
+            return isa.handle == gfx904;
         case ED_ATI_CAL_MACHINE_VEGA20_ISA:
-            return isa.handle == gfx906 || isa.handle == gfx907;
+            return isa.handle == gfx906;
         default:
           assert(0);
           return false;