P4 to Git Change 1778971 by cpaquot@cpaquot-ocl-lc-lnx on 2019/05/06 17:03:12

SWDEV-187125 - [HIP] Protect hip::Event with lock and add threadId to logs.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/hip/hip_event.cpp#9 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_event.hpp#3 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_internal.hpp#30 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_module.cpp#24 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_stream.cpp#18 edit


[ROCm/clr commit: 84d257cf3b]
This commit is contained in:
foreman
2019-05-06 17:43:06 -04:00
parent be2ca7d2ef
commit 4f37e552ad
5 changed files with 121 additions and 74 deletions
+1 -16
View File
@@ -192,24 +192,9 @@ hipError_t hipStreamWaitEvent(hipStream_t stream, hipEvent_t event, unsigned int
HIP_RETURN(hipErrorInvalidResourceHandle);
}
amd::HostQueue* hostQueue = as_amd(reinterpret_cast<cl_command_queue>(stream))->asHostQueue();
hip::Event* e = reinterpret_cast<hip::Event*>(event);
cl_event clEvent = as_cl(e->event_);
amd::Command::EventWaitList eventWaitList;
cl_int err = amd::clSetEventWaitList(eventWaitList, *hostQueue, 1, &clEvent);
if (err != CL_SUCCESS) {
HIP_RETURN(hipErrorUnknown);
}
amd::Command* command = new amd::Marker(*hostQueue, true, eventWaitList);
if (command == NULL) {
HIP_RETURN(hipErrorOutOfMemory);
}
command->enqueue();
command->release();
HIP_RETURN(hipSuccess);
return HIP_RETURN(e->streamWait(stream, flags));
}
hipError_t hipStreamQuery(hipStream_t stream) {