P4 to Git Change 1552209 by cpaquot@cpaquot-ocl-lc-lnx on 2018/05/08 20:24:32

SWDEV-145570 - [HIP] Use the as_amd()->asHostQueue with streamSet

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/hip/hip_stream.cpp#6 edit

api/hip/hip_stream.cpp

@@ -61,7 +61,7 @@ hipError_t hipStreamCreate(hipStream_t *stream) {
 hipError_t hipStreamGetFlags(hipStream_t stream, unsigned int *flags) {
   HIP_INIT_API(stream, flags);
 
-  amd::HostQueue* hostQueue = reinterpret_cast<amd::HostQueue*>(stream);
+  amd::HostQueue* hostQueue = as_amd(reinterpret_cast<cl_command_queue>(stream))->asHostQueue();
   auto it = streamSet.find(hostQueue);
 
   if(flags != nullptr) {
@@ -100,10 +100,11 @@ hipError_t hipStreamDestroy(hipStream_t stream) {
     return hipErrorInvalidResourceHandle;
   }
 
-  amd::HostQueue* hostQueue = reinterpret_cast<amd::HostQueue*>(stream);
+  amd::HostQueue* hostQueue = as_amd(reinterpret_cast<cl_command_queue>(stream))->asHostQueue();
+
   streamSet.erase(hostQueue);
 
-  as_amd(reinterpret_cast<cl_command_queue>(stream))->release();
+  hostQueue->release();
 
   return hipSuccess;
 }