P4 to Git Change 1978640 by todli@todli-win-opencl-kv1 on 2019/08/06 02:44:22

SWDEV-198179 - Add Renoir Support to OpenCL Staging

	http://ocltc.amd.com/reviews/r/17770/

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/bif/amuabi/amuABI.h#24 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/bif/amuabi/amuABIMultiBinary.cpp#24 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/libUtils.cpp#41 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_hsail.h#57 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_hsail64.h#52 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudefs.hpp#159 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#607 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.cpp#249 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#363 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#191 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/caltarget.h#9 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbedefs#45 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#93 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/binary/BIFEnumCheck.cpp#31 edit


[ROCm/clr commit: 194bddebaf]

projects/clr/rocclr/runtime/device/gpu/gpudefs.hpp

@@ -151,12 +151,14 @@ static const AMDDeviceInfo DeviceInfo[] = {
                                 IF(IS_BRAHMA, "", "gfx900"), 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},
-    /* CAL_TARGET_LEXA */ {ED_ATI_CAL_MACHINE_LEXA_ISA, "gfx804", "gfx804", 4, 16, 1, 256, 64 * Ki, 
+    /* CAL_TARGET_LEXA */ {ED_ATI_CAL_MACHINE_LEXA_ISA, "gfx804", "gfx804", 4, 16, 1, 256, 64 * Ki,
                              32, 800},
     /* CAL_TARGET_RAVEN */ {ED_ATI_CAL_MACHINE_RAVEN_ISA, IF(IS_BRAHMA, "", "gfx902"),
                             IF(IS_BRAHMA, "", "gfx902"), 4, 16, 1, 256, 64 * Ki, 32, 900},
     /* CAL_TARGET_RAVEN2 */ {ED_ATI_CAL_MACHINE_RAVEN2_ISA, IF(IS_BRAHMA, "", "gfx902"),
                             IF(IS_BRAHMA, "", "gfx902"), 4, 16, 1, 256, 64 * Ki, 32, 900},
+    /* CAL_TARGET_RENOIR */{ ED_ATI_CAL_MACHINE_RENOIR_ISA, IF(IS_BRAHMA, "", "gfx902"),
+                                IF(IS_BRAHMA, "", "gfx902"), 4, 16, 1, 256, 64 * Ki, 32, 900 },
     /* CAL_TARGET_POLARIS22 */ {ED_ATI_CAL_MACHINE_POLARIS22_ISA, IF(IS_BRAHMA, "", "gfx804"),
                                 IF(IS_BRAHMA, "", "gfx804"), 4, 16, 1, 256, 64 * Ki, 32, 800},
     /* CAL_TARGET_VEGA12 */{ ED_ATI_CAL_MACHINE_VEGA12_ISA, IF(IS_BRAHMA, "", "gfx904"),

projects/clr/rocclr/runtime/device/gpu/gpudevice.cpp

@@ -165,6 +165,7 @@ bool NullDevice::create(CALtarget target) {
     case CAL_TARGET_LEXA:
     case CAL_TARGET_RAVEN:
     case CAL_TARGET_RAVEN2:
+    case CAL_TARGET_RENOIR:
     case CAL_TARGET_POLARIS22:
     case CAL_TARGET_VEGA12:
     case CAL_TARGET_VEGA20:
@@ -867,7 +868,8 @@ bool Device::create(CALuint ordinal, CALuint numOfDevices) {
 
 #if defined(BRAHMA)
   if (calTarget_ == CAL_TARGET_GREENLAND || calTarget_ == CAL_TARGET_RAVEN ||
-      calTarget_ == CAL_TARGET_RAVEN2 || calTarget_ == CAL_TARGET_POLARIS22) {
+      calTarget_ == CAL_TARGET_RAVEN2 || calTarget_ == CAL_TARGET_POLARIS22 ||
+      calTarget_ == CAL_TARGET_RENOIR) {
     return false;
   }
 #endif

projects/clr/rocclr/runtime/device/gpu/gpuprogram.cpp

@@ -1867,6 +1867,7 @@ bool ORCAHSALoaderContext::IsaSupportedByAgent(hsa_agent_t agent, hsa_isa_t isa)
         case ED_ATI_CAL_MACHINE_GREENLAND_ISA:
           return isa.handle == gfx900;
         case ED_ATI_CAL_MACHINE_RAVEN_ISA:
+        case ED_ATI_CAL_MACHINE_RENOIR_ISA:
             return isa.handle == gfx902 || isa.handle == gfx903;
         case ED_ATI_CAL_MACHINE_VEGA12_ISA:
             return isa.handle == gfx904;

projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp

@@ -156,6 +156,7 @@ bool Settings::create(const CALdeviceattribs& calAttr, bool reportAsOCL12Device,
   switch (target) {
     case CAL_TARGET_RAVEN:
     case CAL_TARGET_RAVEN2:
+    case CAL_TARGET_RENOIR:
       // APU systems for AI
       apuSystem_ = true;
     case CAL_TARGET_GREENLAND:

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

@@ -677,6 +677,10 @@ CALGSLDevice::SetupContext(int32 &asic_id)
       m_target = CAL_TARGET_VEGA20;
       m_elfmachine = ED_ATI_CAL_MACHINE_VEGA20_ISA;
       break;
+  case GSL_ATIASIC_ID_RENOIR:
+      m_target = CAL_TARGET_RENOIR;
+      m_elfmachine = ED_ATI_CAL_MACHINE_RENOIR_ISA;
+      break;
   default:
         // 6XX is not supported
         m_adp->deleteContext(temp_cs);

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

@@ -51,7 +51,8 @@ typedef enum CALtargetEnum {
     CAL_TARGET_POLARIS22,          /**< POLARIS22 GPU ISA*/
     CAL_TARGET_VEGA12,            /**< VEGA12 GPU ISA*/
     CAL_TARGET_VEGA20,            /**< VEGA20 GPU ISA*/
-    CAL_TARGET_LAST = CAL_TARGET_VEGA20, /**< last */
+    CAL_TARGET_RENOIR,             /**< RENOIR GPU ISA*/
+    CAL_TARGET_LAST = CAL_TARGET_RENOIR, /**< last */
 //##END_PRIVATE##
 } CALtarget;