P4 to Git Change 1981152 by cpaquot@cpaquot-ocl-lc-lnx on 2019/08/09 20:33:32

SWDEV-193430 - [HIP] Delay creating HostQueue till commands are enqueued.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/hip/hip_event.cpp#14 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_event.hpp#5 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_internal.hpp#34 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_memory.cpp#68 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_module.cpp#31 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_stream.cpp#21 edit

api/hip/hip_event.cpp

@@ -98,9 +98,7 @@ hipError_t Event::elapsedTime(Event& eStop, float& ms) {
   return hipSuccess;
 }
 
-hipError_t Event::streamWait(hipStream_t stream, uint flags) {
-  amd::HostQueue* hostQueue = as_amd(reinterpret_cast<cl_command_queue>(stream))->asHostQueue();
-
+hipError_t Event::streamWait(amd::HostQueue* hostQueue, uint flags) {
   if (stream_ == hostQueue) return hipSuccess;
 
   amd::ScopedLock lock(lock_);
@@ -237,7 +235,7 @@ hipError_t hipEventRecord(hipEvent_t event, hipStream_t stream) {
   if (stream == nullptr) {
     queue = hip::getNullStream();
   } else {
-    queue = as_amd(reinterpret_cast<cl_command_queue>(stream))->asHostQueue();
+    queue = reinterpret_cast<hip::Stream*>(stream)->asHostQueue();
   }
 
   amd::Command* command = queue->getLastQueuedCommand(true);