P4 to Git Change 1337771 by gandryey@gera-w8 on 2016/11/07 17:16:58

SWDEV-106509 - [CQE OCL][OpenCL on PAL][QR] 3 Conformance tests are failing/crashing
	- Add missing constant argument into the qualifiers lookup
	- Initialize rtCU count to the internal constant

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#33 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.cpp#23 edit

rocclr/runtime/device/pal/paldevice.cpp

@@ -928,7 +928,7 @@ Device::createVirtualDevice(
 {
     bool    profiling = false;
     bool    interopQueue = false;
-    uint    rtCUs  = 0;
+    uint    rtCUs  = amd::CommandQueue::RealTimeDisabled;
     uint    deviceQueueSize = 0;
 
     if (queue != nullptr) {

rocclr/runtime/device/pal/palkernel.cpp

@@ -141,8 +141,10 @@ GetHSAILAddrQual(const aclArgData* argInfo)
 {
     if (argInfo->type == ARG_TYPE_POINTER) {
         switch (argInfo->arg.pointer.memory) {
+            case PTR_MT_UAV_CONSTANT:
             case PTR_MT_CONSTANT_EMU:
             case PTR_MT_CONSTANT:
+                return HSAIL_ADDRESS_CONSTANT;
             case PTR_MT_UAV:
             case PTR_MT_GLOBAL:
                 return HSAIL_ADDRESS_GLOBAL;