P4 to Git Change 1121106 by bwicakso@opencl-hsa-stg-bwicakso on 2015/02/11 12:05:28

EPR #414268 - Back out the changes for HSAF1.0F on opencl branch (CL#1108891 & 1118596)

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/brig_loader.cpp#18 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/sc-hsa/Interface/hsa_ext_finalize.h#5 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#278 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.cpp#189 edit

rocclr/runtime/device/gpu/gpukernel.cpp

@@ -3817,7 +3817,7 @@ const uint16_t kDispatchPacketHeader =
     (HSA_PACKET_TYPE_KERNEL_DISPATCH << HSA_PACKET_HEADER_TYPE) |
     (1 << HSA_PACKET_HEADER_BARRIER) |
     (HSA_FENCE_SCOPE_SYSTEM << HSA_PACKET_HEADER_ACQUIRE_FENCE_SCOPE) |
-    (HSA_FENCE_SCOPE_AGENT << HSA_PACKET_HEADER_RELEASE_FENCE_SCOPE);
+    (HSA_FENCE_SCOPE_COMPONENT << HSA_PACKET_HEADER_RELEASE_FENCE_SCOPE);
 
 hsa_kernel_dispatch_packet_t*
 HSAILKernel::loadArguments(
@@ -4096,7 +4096,7 @@ HSAILKernel::loadArguments(
 
     hsaDisp->kernarg_address = reinterpret_cast<void*>(argList);
     hsaDisp->reserved2 = 0;
-    hsaDisp->completion_signal.handle = 0;
+    hsaDisp->completion_signal = 0;
 
     memList.push_back(cb);
     memList.push_back(gpuAqlCode());