P4 to Git Change 2039367 by todli@todli-win-opencl-kv1 on 2019/12/02 10:17:56

SWDEV-211683 - 1.remove Renoir from GPU path device creation 2.adjust Renoir's postions in compiler and runtime

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/bif/amuabi/amuABI.h#25 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/bif/amuabi/amuABIMultiBinary.cpp#25 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.hpp#173 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#192 edit


[ROCm/clr commit: 3f566e4656]

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

@@ -116,7 +116,8 @@ class NullDevice : public amd::Device {
  protected:
   bool usePal() const {
     return (calTarget_ == CAL_TARGET_GREENLAND || calTarget_ == CAL_TARGET_RAVEN ||
-            calTarget_ == CAL_TARGET_RAVEN2 || calTarget_ >= CAL_TARGET_VEGA12);
+            calTarget_ == CAL_TARGET_RAVEN2 || calTarget_ == CAL_TARGET_RENOIR ||
+            calTarget_ >= CAL_TARGET_VEGA12);
   }
 
   //! Answer the question: "Should HSAIL Program be created?",

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

@@ -665,6 +665,10 @@ CALGSLDevice::SetupContext(int32 &asic_id)
       m_target = CAL_TARGET_RAVEN2;
       m_elfmachine = ED_ATI_CAL_MACHINE_RAVEN2_ISA;
       break;
+  case GSL_ATIASIC_ID_RENOIR:
+      m_target = CAL_TARGET_RENOIR;
+      m_elfmachine = ED_ATI_CAL_MACHINE_RENOIR_ISA;
+      break;
   case GSL_ATIASIC_ID_POLARIS22:
       m_target = CAL_TARGET_POLARIS22;
       m_elfmachine = ED_ATI_CAL_MACHINE_POLARIS22_ISA;
@@ -677,10 +681,6 @@ 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);