P4 to Git Change 1450441 by asalmanp@asalmanp-ocl-stg on 2017/08/22 17:11:11

SWDEV-79278 - adding support for Vega12/Vega20/Navi10
	ReviewBoardURL = http://ocltc.amd.com/reviews/r/13326/

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/libUtils.cpp#7 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings.h#20 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings_hsail.h#23 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings_hsail64.h#23 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/linker.cpp#156 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/bif/amuabi/amuABI.h#22 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/bif/amuabi/amuABIMultiBinary.cpp#22 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/libUtils.cpp#27 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings.h#52 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_hsail.h#48 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_hsail64.h#43 edit
... //depot/stg/opencl/drivers/opencl/compiler/tools/driver/driver.cpp#67 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudefs.hpp#148 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#568 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.cpp#234 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#352 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#180 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/caltarget.h#6 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldefs.hpp#18 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#45 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#26 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/binary/BIFEnumCheck.cpp#28 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/runtime/OCLOfflineCompilation.cpp#19 edit

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

@@ -513,6 +513,19 @@ CALGSLDevice::SetupContext(int32 &asic_id)
       m_target = CAL_TARGET_POLARIS22;
       m_elfmachine = ED_ATI_CAL_MACHINE_POLARIS22_ISA;
       break;
+  case GSL_ATIASIC_ID_VEGA12:
+      m_target = CAL_TARGET_VEGA12;
+      m_elfmachine = ED_ATI_CAL_MACHINE_VEGA12_ISA;
+      break;
+  case GSL_ATIASIC_ID_VEGA20:
+      m_target = CAL_TARGET_VEGA20;
+      m_elfmachine = ED_ATI_CAL_MACHINE_VEGA20_ISA;
+      break;
+  case GSL_ATIASIC_ID_NAVI10:
+      m_target = CAL_TARGET_NAVI10;
+      m_elfmachine = ED_ATI_CAL_MACHINE_NAVI10_ISA;
+      break;
+
   default:
         // 6XX is not supported
         m_adp->deleteContext(temp_cs);

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

@@ -48,7 +48,10 @@ typedef enum CALtargetEnum {
     CAL_TARGET_LEXA,               /**< LEXA GPU ISA*/
     CAL_TARGET_RAVEN,              /**< RAVEN GPU ISA*/
     CAL_TARGET_POLARIS22,          /**< POLARIS22 GPU ISA*/
-    CAL_TARGET_LAST = CAL_TARGET_POLARIS22, /**< last */
+    CAL_TARGET_VEGA12,            /**< VEGA12 GPU ISA*/
+    CAL_TARGET_VEGA20,            /**< VEGA20 GPU ISA*/
+    CAL_TARGET_NAVI10,            /**< NAVI10 GPU ISA*/
+    CAL_TARGET_LAST = CAL_TARGET_NAVI10, /**< last */
 //##END_PRIVATE##
 } CALtarget;