P4 to Git Change 1492890 by gandryey@gera-w8 on 2017/12/11 15:58:00

SWDEV-79445 - OCL generic changes and code clean-up
	- More changes to remove gfx804

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldefs.hpp#27 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#50 edit

rocclr/runtime/device/pal/paldefs.hpp

@@ -171,7 +171,8 @@ enum gfx_handle {
   gfx702    = 702,
   gfx800    = 800,
   gfx801    = 801,
-  gfx804    = 804,
+  gfx802    = 802,
+  gfx803    = 803,
   gfx810    = 810,
   gfx900    = 900,
   gfx901    = 901,
@@ -189,7 +190,8 @@ static const char* Gfx700   = "AMD:AMDGPU:7:0:0";
 static const char* Gfx701   = "AMD:AMDGPU:7:0:1";
 static const char* Gfx800   = "AMD:AMDGPU:8:0:0";
 static const char* Gfx801   = "AMD:AMDGPU:8:0:1";
-static const char* Gfx804   = "AMD:AMDGPU:8:0:4";
+static const char* Gfx802   = "AMD:AMDGPU:8:0:2"; 
+static const char* Gfx803   = "AMD:AMDGPU:8:0:3";
 static const char* Gfx810   = "AMD:AMDGPU:8:1:0";
 static const char* Gfx900   = "AMD:AMDGPU:9:0:0";
 static const char* Gfx901   = "AMD:AMDGPU:9:0:1";

rocclr/runtime/device/pal/palprogram.cpp

@@ -875,8 +875,12 @@ hsa_isa_t PALHSALoaderContext::IsaFromName(const char* name) {
     isa.handle = gfx801;
     return isa;
   }
-  if (!strcmp(Gfx804, name)) {
-    isa.handle = gfx804;
+  if (!strcmp(Gfx802, name)) {
+      isa.handle = gfx802;
+      return isa;
+  }
+  if (!strcmp(Gfx803, name)) {
+    isa.handle = gfx803;
     return isa;
   }
   if (!strcmp(Gfx810, name)) {