P4 to Git Change 1918730 by vsytchen@vsytchen-remote-ocl-win10 on 2019/06/28 14:40:48

SWDEV-193973 - [OpenCL][NV21] Add support for Navi21

	1. Add missing mainline checks

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palcounters.cpp#24 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#148 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#88 edit


[ROCm/clr commit: 77b6f9c6e7]

projects/clr/rocclr/runtime/device/pal/palcounters.cpp

@@ -670,7 +670,7 @@ void PerfCounter::convertInfo() {
         info_.counterIndex_ = std::get<1>(p);
       }
       break;
-    case Pal::GfxIpLevel::GfxIp10_1::
+    case Pal::GfxIpLevel::GfxIp10_1:
       if (info_.blockIndex_ < gfx10BlockIdPal.size()) {
         auto p = gfx10BlockIdPal[info_.blockIndex_];
         info_.blockIndex_ = std::get<0>(p);

projects/clr/rocclr/runtime/device/pal/paldevice.cpp

@@ -181,7 +181,7 @@ bool NullDevice::init() {
             ShouldNotReachHere();
             break;
           case 3:
-            ipLevel = Pal::GfxIpLevel::GfxIp10_3;
+            ShouldNotReachHere();
             break;
         }
     }

projects/clr/rocclr/runtime/device/pal/palsettings.cpp

@@ -471,7 +471,7 @@ bool Settings::create(const Pal::DeviceProperties& palProp,
   }
 
   if (useLightning_) {
-    switch (palProp.gfxLevel) {:
+    switch (palProp.gfxLevel) {
       case Pal::GfxIpLevel::GfxIp10_1:
       case Pal::GfxIpLevel::GfxIp9:
         singleFpDenorm_ = true;