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/pal/paldevice.cpp

@@ -162,13 +162,20 @@ bool NullDevice::init() {
 
       Pal::GfxIpLevel ipLevel = Pal::GfxIpLevel::_None;
       uint ipLevelMajor = round(pal::Gfx9PlusSubDeviceInfo[id].gfxipVersion_ / 100);
+      uint ipLevelMinor = round(pal::Gfx9PlusSubDeviceInfo[id].gfxipVersion_ / 10 % 10);
       switch (ipLevelMajor) {
       case 9:
           ipLevel = Pal::GfxIpLevel::GfxIp9;
           break;
       case 10:
+        switch (ipLevelMinor) {
+        case 0:
           ipLevel = Pal::GfxIpLevel::GfxIp10;
           break;
+        case 1:
+          ipLevel = Pal::GfxIpLevel::GfxIp10_1;
+          break;
+        }
       }
 
       Pal::AsicRevision revision = Pal::AsicRevision::Unknown;
@@ -192,6 +199,9 @@ bool NullDevice::init() {
           revision = Pal::AsicRevision::Vega20;
           break;
       case 1000:
+          revision = Pal::AsicRevision::Navi10Lite;
+          break;
+      case 1010:
           revision = Pal::AsicRevision::Navi10;
           break;
       }