From 6a2104171863e67f32a79a9adcd9ca38930f384d 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 [ROCm/clr commit: 37785124630a3cd943cbaef38a3a71d5016a65ba] --- projects/clr/opencl/api/opencl/amdocl/cl_common.hpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/clr/opencl/api/opencl/amdocl/cl_common.hpp b/projects/clr/opencl/api/opencl/amdocl/cl_common.hpp index adc331c111..c642f82bd8 100644 --- a/projects/clr/opencl/api/opencl/amdocl/cl_common.hpp +++ b/projects/clr/opencl/api/opencl/amdocl/cl_common.hpp @@ -196,6 +196,9 @@ clSetEventWaitList( if (!is_valid(event)) { return CL_INVALID_EVENT_WAIT_LIST; } + if (&hostQueue.context() != &amdEvent->context()) { + return CL_INVALID_CONTEXT; + } if ((amdEvent->command().queue() != &hostQueue) && !amdEvent->notifyCmdQueue()) { return CL_INVALID_EVENT_WAIT_LIST; }