From 2b07a14f503d2cf4f8c84b7fc046ceec9762d83d Mon Sep 17 00:00:00 2001
From: foreman <dl.constructicon@amd.com>
Date: Thu, 31 Aug 2017 11:10:32 -0400
Subject: [PATCH] P4 to Git Change 1453746 by asalmanp@asalmanp-ocl-stg on
 2017/08/31 10:53:40

	SWDEV-79278 - [OCL][NV10] adding Pal::GfxIpLevel::GfxIp10 into couple of places and fixing a typo in GfxIpDeviceInfo table (gfx801 should be 810)

	ReviewBoardURL = http://ocltc.amd.com/reviews/r/13369/

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldefs.hpp#20 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#52 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#28 edit
---
 rocclr/runtime/device/pal/paldefs.hpp     | 2 +-
 rocclr/runtime/device/pal/paldevice.cpp   | 2 +-
 rocclr/runtime/device/pal/palsettings.cpp | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/rocclr/runtime/device/pal/paldefs.hpp b/rocclr/runtime/device/pal/paldefs.hpp
index 449cd9233a..7f8f092594 100644
--- a/rocclr/runtime/device/pal/paldefs.hpp
+++ b/rocclr/runtime/device/pal/paldefs.hpp
@@ -154,7 +154,7 @@ static const AMDDeviceInfo GfxIpDeviceInfo[] = {
     /* GFX600 */    {"gfx600",  "gfx600",   4, 16, 1, 256, 64 * Ki, 32, 600},
     /* GFX700 */    {"gfx700",  "gfx700",   4, 16, 1, 256, 64 * Ki, 32, 700},
     /* GFX800 */    {"gfx800",  "gfx800",   4, 16, 1, 256, 64 * Ki, 32, 800},
-    /* GFX801 */    {"gfx801",  "gfx801",   4, 16, 1, 256, 64 * Ki, 32, 801},
+    /* GFX810 */    {"gfx810",  "gfx810",   4, 16, 1, 256, 64 * Ki, 32, 810},
     /* GFX900 */    {"gfx900",  "gfx900",   4, 16, 1, 256, 64 * Ki, 32, 900},
     /* GFX1000 */   {"gfx1000", "gfx1000",  4, 16, 1, 256, 64 * Ki, 32, 1000 },
 };
diff --git a/rocclr/runtime/device/pal/paldevice.cpp b/rocclr/runtime/device/pal/paldevice.cpp
index f944528e58..92833852b0 100644
--- a/rocclr/runtime/device/pal/paldevice.cpp
+++ b/rocclr/runtime/device/pal/paldevice.cpp
@@ -99,7 +99,7 @@ bool NullDevice::init() {
 
   // Loop through all supported devices and create each of them
   for (uint id = static_cast<uint>(Pal::GfxIpLevel::GfxIp7);
-       id <= static_cast<uint>(Pal::GfxIpLevel::GfxIp9); ++id) {
+       id <= static_cast<uint>(Pal::GfxIpLevel::GfxIp10); ++id) {
     bool foundActive = false;
     Pal::GfxIpLevel ipLevel = static_cast<Pal::GfxIpLevel>(id);
 
diff --git a/rocclr/runtime/device/pal/palsettings.cpp b/rocclr/runtime/device/pal/palsettings.cpp
index e05fa0ba39..8dcf524a40 100644
--- a/rocclr/runtime/device/pal/palsettings.cpp
+++ b/rocclr/runtime/device/pal/palsettings.cpp
@@ -164,6 +164,7 @@ bool Settings::create(const Pal::DeviceProperties& palProp,
   switch (palProp.revision) {
     case Pal::AsicRevision::Unknown:
       switch (palProp.gfxLevel) {
+        case Pal::GfxIpLevel::GfxIp10:
         case Pal::GfxIpLevel::GfxIp9:
           aiPlus_ = true;
           break;
@@ -410,6 +411,7 @@ bool Settings::create(const Pal::DeviceProperties& palProp,
 
 #if defined(WITH_LIGHTNING_COMPILER)
   switch (palProp.gfxLevel) {
+    case Pal::GfxIpLevel::GfxIp10:
     case Pal::GfxIpLevel::GfxIp9:
       singleFpDenorm_ = true;
       break;