P4 to Git Change 1132412 by asalmanp@asalmanp-opencl-stg1 on 2015/03/19 10:25:28

EPR #394115 - [OpenCL][Arctic Islands] Adding support for Greenland (gfx9)

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

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/linker.cpp#121 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/amdil_be.cpp#41 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/hsail_be.cpp#39 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/sclibdefs.opencl#22 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/scwrapper/SI/devStateSI.cpp#19 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/scwrapper/devState.cpp#26 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/scwrapper/scCompileBase.cpp#42 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/bif/amuabi/amuABI.h#16 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/bif/amuabi/amuABIMultiBinary.cpp#16 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings.h#31 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_amdil.h#26 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_amdil64.h#23 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_hsail.h#22 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_hsail64.h#17 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_9/target_mappings.h#26 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_9/target_mappings_amdil.h#25 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_9/target_mappings_amdil64.h#27 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/lib/Target/AMDIL/AMDIL.h#3 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/lib/Target/AMDIL/AMDILDeviceInfo.h#2 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/lib/Target/AMDIL/AMDILIOExpansion.cpp#2 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/lib/Target/AMDIL/AMDILPointerManager.cpp#2 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/lib/Target/AMDIL/AMDILSubtarget.cpp#3 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/lib/Target/AMDIL/AMDILSubtarget.h#2 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/lib/Target/AMDIL/Internal/AMDILInternalDeviceFlags.h#3 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/lib/Target/AMDIL/Internal/InternalProcessors.td#3 edit
... //depot/stg/opencl/drivers/opencl/compiler/tools/driver/driver.cpp#54 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudefs.hpp#120 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#502 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#306 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/include/cal/cal.h#34 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#112 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/binary/BIFEnumCheck.cpp#22 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/CLTargetInfo.cpp#27 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/math/OCLMathFunc.cpp#20 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/runtime/OCLDeviceQueries.cpp#25 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/runtime/OCLPerfCounters.cpp#22 edit

rocclr/runtime/device/gpu/gpudefs.hpp

@@ -125,6 +125,7 @@ static const AMDDeviceInfo DeviceInfo[] = {
 /* CAL_TARGET_CARRIZO */    { ED_ATI_CAL_MACHINE_CARRIZO_ISA,   "Carrizo" ,     "carrizo",      4, 16, 1, 256, 64 * Ki, 32, 800 },
 /* 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 },
 };
 
 // Supported OpenCL versions

rocclr/runtime/device/gpu/gpudevice.cpp

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

rocclr/runtime/device/gpu/gpusettings.cpp

@@ -238,6 +238,8 @@ Settings::create(
         break;
     case CAL_TARGET_CARRIZO:
         apuSystem_ = true;
+    case CAL_TARGET_GREENLAND:
+        //TODO: specific code for AI
     case CAL_TARGET_ICELAND:
     case CAL_TARGET_TONGA:
     case CAL_TARGET_FIJI:

rocclr/runtime/device/gpu/gslbe/src/include/cal/cal.h

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

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

@@ -592,7 +592,10 @@ CALGSLDevice::SetupContext(int32 &asic_id)
         m_target = CAL_TARGET_BAFFIN;
         m_elfmachine = ED_ATI_CAL_MACHINE_BAFFIN_ISA;
         break;
-
+  case GSL_ATIASIC_ID_GREENLAND:
+        m_target = CAL_TARGET_GREENLAND;
+        m_elfmachine = ED_ATI_CAL_MACHINE_GREENLAND_ISA;
+        break;
     default:
         // 6XX is not supported
         m_adp->deleteContext(temp_cs);