P4 to Git Change 1601516 by asalmanp@asalmanp-ocl-stg on 2018/09/04 16:37:05

SWDEV-132899 - [OCL][GFX10.1] Adding gfx1010 support and use  Pal::GfxIpLevel::GfxIp10_1/Pal::AsicRevision::Navi10 for gfx1010 and Pal::GfxIpLevel::GfxIp10/Pal::AsicRevision::Navi10Lite for Ariel (gfx1000)

	ReviewRequestURL = http://ocltc.amd.com/reviews/r/15740/

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudefs.hpp#152 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.cpp#240 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palcounters.cpp#17 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldefs.hpp#38 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#108 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#54 edit

rocclr/runtime/device/gpu/gpuprogram.cpp

@@ -2226,12 +2226,8 @@ hsa_isa_t ORCAHSALoaderContext::IsaFromName(const char* name) {
       isa.handle = gfx907;
       return isa;
   }
-  if (!strcmp(Gfx1000, name)) {
-      isa.handle = gfx1000;
-      return isa;
-  }
-  if (!strcmp(Gfx1001, name)) {
-      isa.handle = gfx1001;
+  if (!strcmp(Gfx1010, name)) {
+      isa.handle = gfx1010;
       return isa;
   }
 
@@ -2290,11 +2286,10 @@ bool ORCAHSALoaderContext::IsaSupportedByAgent(hsa_agent_t agent, hsa_isa_t isa)
           assert(0);
           return false;
       }
-    case gfx1000:
-    case gfx1001:
+    case gfx1010:
       switch (program_->dev().hwInfo()->machine_) {
         case ED_ATI_CAL_MACHINE_NAVI10_ISA:
-            return isa.handle == gfx1000 || isa.handle == gfx1001;
+            return isa.handle == gfx1010;
         default:
             assert(0);
             return false;