P4 to Git Change 1180763 by todli@todli-win-opencl-kv1 on 2015/08/14 22:54:27

EPR #399601 - OpenCL Stoney BU changes

	Reviewed by: Jeff, Brian, Saleel

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/scwrapper/devState.cpp#27 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/bif/amuabi/amuABI.h#17 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/bif/amuabi/amuABIMultiBinary.cpp#17 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings.h#32 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_amdil.h#27 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_amdil64.h#24 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_hsail.h#23 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_hsail64.h#18 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/lib/Target/AMDIL/AMDIL.h#4 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/lib/Target/AMDIL/AMDILSubtarget.cpp#4 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/lib/Target/AMDIL/Internal/AMDILInternalDeviceFlags.h#4 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/lib/Target/AMDIL/Internal/InternalProcessors.td#4 edit
... //depot/stg/opencl/drivers/opencl/compiler/tools/driver/driver.cpp#55 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudefs.hpp#124 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#518 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#323 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#134 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/caltarget.h#2 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/binary/BIFEnumCheck.cpp#24 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/math/OCLMathFunc.cpp#21 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/runtime/OCLDeviceQueries.cpp#26 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/runtime/OCLPerfCounters.cpp#23 edit

rocclr/runtime/device/gpu/gpudefs.hpp

@@ -127,6 +127,7 @@ static const AMDDeviceInfo DeviceInfo[] = {
 /* CAL_TARGET_ELLESMERE */  { ED_ATI_CAL_MACHINE_ELLESMERE_ISA, "",  "",    4, 16, 1, 256, 64 * Ki, 32, 800 },
 /* CAL_TARGET_BAFFIN */     { ED_ATI_CAL_MACHINE_BAFFIN_ISA,    "",     "",    4, 16, 1, 256, 64 * Ki, 32, 800 },
 /* CAL_TARGET_GREENLAND */  { ED_ATI_CAL_MACHINE_GREENLAND_ISA, "",  "",   4, 16, 1, 256, 64 * Ki, 32, 900 },
+/* CAL_TARGET_STONEY */     { ED_ATI_CAL_MACHINE_STONEY_ISA,    "Stoney",       "stoney",       4, 16, 1, 256, 64 * Ki, 32, 800 },
 };
 
 static const char* Gfx700 = "AMD:AMDGPU:7:0:0";

rocclr/runtime/device/gpu/gpudevice.cpp

@@ -152,6 +152,7 @@ NullDevice::create(CALtarget target)
     case CAL_TARGET_ELLESMERE:
     case CAL_TARGET_BAFFIN:
     case CAL_TARGET_GREENLAND:
+    case CAL_TARGET_STONEY:
         calAttr.doublePrecision = CAL_TRUE;
         calAttr.isOpenCL200Device = CAL_TRUE;
         break;

rocclr/runtime/device/gpu/gpusettings.cpp

@@ -243,6 +243,7 @@ Settings::create(
         aiPlus_ = true;
         // Fall through to VI ...
     case CAL_TARGET_CARRIZO:
+	case CAL_TARGET_STONEY:
         if (!aiPlus_) {
             // APU systems for VI
             apuSystem_  = true;

rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp

@@ -533,6 +533,10 @@ CALGSLDevice::SetupContext(int32 &asic_id)
         m_target = CAL_TARGET_GREENLAND;
         m_elfmachine = ED_ATI_CAL_MACHINE_GREENLAND_ISA;
         break;
+  case GSL_ATIASIC_ID_STONEY:
+        m_target = CAL_TARGET_STONEY;
+        m_elfmachine = ED_ATI_CAL_MACHINE_STONEY_ISA;
+        break;
     default:
         // 6XX is not supported
         m_adp->deleteContext(temp_cs);

rocclr/runtime/device/gpu/gslbe/src/rt/caltarget.h

@@ -44,7 +44,8 @@ typedef enum CALtargetEnum {
     CAL_TARGET_ELLESMERE,           /**< ELLESMERE GPU ISA*/
     CAL_TARGET_BAFFIN,             /**< BAFFIN GPU ISA*/
     CAL_TARGET_GREENLAND,          /**< GREENLAND GPU ISA*/
-    CAL_TARGET_LAST = CAL_TARGET_GREENLAND, /**< last */
+    CAL_TARGET_STONEY,             /**< STONEY GPU ISA*/
+    CAL_TARGET_LAST = CAL_TARGET_STONEY, /**< last */
 //##END_PRIVATE##
 } CALtarget;