From 986ca859ad9cb655279cdff3e18481c3341e5cac Mon Sep 17 00:00:00 2001
From: foreman <dl.swbuild@amd.com>
Date: Fri, 15 Feb 2019 18:52:53 -0500
Subject: [PATCH] P4 to Git Change 1744867 by asalmanp@asalmanp-ocl-stg on
 2019/02/15 18:26:24

	SWDEV-132899 - Adding support for Navi14/Navi12.
	ReviewRequestURL = http://ocltc.amd.com/reviews/r/16708/diff/1/

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#188 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbedefs#28 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldefs.hpp#48 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#68 edit
---
 rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp | 8 ++++++++
 rocclr/runtime/device/pal/paldefs.hpp                | 7 +++++++
 rocclr/runtime/device/pal/palsettings.cpp            | 1 +
 3 files changed, 16 insertions(+)

diff --git a/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp b/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp
index 3569cf6442..cbed58c79f 100644
--- a/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp
+++ b/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp
@@ -675,6 +675,14 @@ CALGSLDevice::SetupContext(int32 &asic_id)
       m_target = CAL_TARGET_NAVI10;
       m_elfmachine = ED_ATI_CAL_MACHINE_NAVI10_ISA;
       break;
+  case GSL_ATIASIC_ID_NAVI14:
+    m_target = CAL_TARGET_NAVI10;
+    m_elfmachine = ED_ATI_CAL_MACHINE_NAVI10_ISA;
+    break;
+  case GSL_ATIASIC_ID_NAVI12:
+    m_target = CAL_TARGET_NAVI10;
+    m_elfmachine = ED_ATI_CAL_MACHINE_NAVI10_ISA;
+    break;
 
   default:
         // 6XX is not supported
diff --git a/rocclr/runtime/device/pal/paldefs.hpp b/rocclr/runtime/device/pal/paldefs.hpp
index 2a58e18701..abe0ab112e 100644
--- a/rocclr/runtime/device/pal/paldefs.hpp
+++ b/rocclr/runtime/device/pal/paldefs.hpp
@@ -182,6 +182,13 @@ static const AMDDeviceInfo Gfx9PlusSubDeviceInfo[] = {
     /* Navi10 XNACK */{"gfx1010", "gfx1010", "gfx1010", 4, 16, 1, 256, 64 * Ki, 32, 1010, 1010, true},
     /* Navi10Lite       */{"gfx1000", "gfx1000","gfx1000", 4, 16, 1, 256, 64 * Ki, 32, 1000, 1000, false},
     /* Navi10Lite XNACK */{"gfx1000", "gfx1000", "gfx1000", 4, 16, 1, 256, 64 * Ki, 32, 1000, 1000, true},
+    /* Navi12       */{ "gfx1010", "gfx1010", "gfx1010", 4, 16, 1, 256, 64 * Ki, 32, 1010, 1010, false },
+    /* Navi12 XNACK */{ "gfx1010", "gfx1010", "gfx1010", 4, 16, 1, 256, 64 * Ki, 32, 1010, 1010, true },
+    /* Navi12Lite   */{ "gfx1010", "gfx1010", "gfx1010", 4, 16, 1, 256, 64 * Ki, 32, 1010, 1010, false },
+    /* Navi12Lite XNACK */{ "gfx1010", "gfx1010", "gfx1010", 4, 16, 1, 256, 64 * Ki, 32, 1010, 1010, true },
+    /* Navi14       */{ "gfx1010", "gfx1010", "gfx1010", 4, 16, 1, 256, 64 * Ki, 32, 1010, 1010, false },
+    /* Navi14 XNACK */{ "gfx1010", "gfx1010", "gfx1010", 4, 16, 1, 256, 64 * Ki, 32, 1010, 1010, true },
+
 };
 
 // Supported OpenCL versions
diff --git a/rocclr/runtime/device/pal/palsettings.cpp b/rocclr/runtime/device/pal/palsettings.cpp
index 1a375d4581..b2995a9c71 100644
--- a/rocclr/runtime/device/pal/palsettings.cpp
+++ b/rocclr/runtime/device/pal/palsettings.cpp
@@ -186,6 +186,7 @@ bool Settings::create(const Pal::DeviceProperties& palProp,
           assert(0 && "Unknown GfxIP type!");
           return false;
       }
+    case Pal::AsicRevision::Navi12:
     case Pal::AsicRevision::Navi14:
     case Pal::AsicRevision::Navi10:
     case Pal::AsicRevision::Navi10Lite: