From 78905ef7e9ba67343c3fd3de388dbd3e56232e16 Mon Sep 17 00:00:00 2001 From: foreman Date: Wed, 29 May 2019 14:38:26 -0400 Subject: [PATCH] P4 to Git Change 1789054 by cpaquot@cpaquot-ocl-lc-lnx on 2019/05/29 14:02:50 SWDEV-190565 - [HIP] Don't use clSetEventWaitList and just add the event to the list in HIP. Affected files ... ... //depot/stg/opencl/drivers/opencl/api/hip/hip_event.cpp#10 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_common.hpp#24 edit --- api/hip/hip_event.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/api/hip/hip_event.cpp b/api/hip/hip_event.cpp index aa61443d2f..b7929461cb 100644 --- a/api/hip/hip_event.cpp +++ b/api/hip/hip_event.cpp @@ -84,13 +84,11 @@ hipError_t Event::streamWait(hipStream_t stream, uint flags) { amd::ScopedLock lock(lock_); - cl_event clEvent = as_cl(event_); - - amd::Command::EventWaitList eventWaitList; - cl_int err = amd::clSetEventWaitList(eventWaitList, *hostQueue, 1, &clEvent); - if (err != CL_SUCCESS) { + if (!event_->notifyCmdQueue()) { return hipErrorUnknown; } + amd::Command::EventWaitList eventWaitList; + eventWaitList.push_back(event_); amd::Command* command = new amd::Marker(*hostQueue, true, eventWaitList); if (command == NULL) {