P4 to Git Change 1449513 by skudchad@skudchad_test_win_opencl2 on 2017/08/20 12:41:18

SWDEV-107271 - Add Raven IDs.
	- Refactor PAL backend code

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/libUtils.cpp#6 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings.h#19 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings_hsail.h#22 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings_hsail64.h#22 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/linker.cpp#155 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/libUtils.cpp#26 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings.h#51 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_hsail.h#47 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_hsail64.h#42 edit
... //depot/stg/opencl/drivers/opencl/compiler/tools/driver/driver.cpp#66 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldefs.hpp#17 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#49 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/math/OCLMathFunc.cpp#29 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/runtime/OCLDeviceQueries.cpp#45 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/runtime/OCLPerfCounters.cpp#39 edit

rocclr/runtime/device/pal/paldevice.cpp

@@ -651,16 +651,19 @@ bool Device::create(Pal::IDevice* device) {
   ipLevel_ = properties().gfxLevel;
   asicRevision_ = properties().revision;
 
+   // XNACK flag should be set for  PageMigration | IOMMUv2 Support
+  uint isXNACKSupported = static_cast<uint>(properties_.gpuMemoryProperties.flags.pageMigrationEnabled
+      || properties_.gpuMemoryProperties.flags.iommuv2Support);
+  uint subtarget = isXNACKSupported;
+
   // Update HW info for the device
   if ((GPU_ENABLE_PAL == 1) && (properties().revision <= Pal::AsicRevision::Baffin)) {
     hwInfo_ = &DeviceInfo[static_cast<uint>(properties().revision)];
   } else if (ipLevel_ >= Pal::GfxIpLevel::GfxIp9) {
-    if (properties().gpuType == Pal::GpuType::Integrated ||
-        properties_.gpuMemoryProperties.flags.pageMigrationEnabled) {
-      hwInfo_ = &Gfx901DeviceInfo;
-    } else {
-      hwInfo_ = &GfxIpDeviceInfo[static_cast<uint>(ipLevel_)];
-    }
+      // For compiler sub targets
+      subtarget = (static_cast<uint>(asicRevision_) % static_cast<uint>(Pal::AsicRevision::Vega10)) << 1 |
+          subtarget;
+      hwInfo_ = &Gfx9PlusSubDeviceInfo[subtarget];
   } else {
     return false;
   }