From 82474ca1db5b7d36b69d4e9ae72bac2673217d78 Mon Sep 17 00:00:00 2001 From: Jaydeep Patel Date: Mon, 3 Jun 2024 11:17:51 +0000 Subject: [PATCH] SWDEV-465220 - Validate stream on which Kernel is planned to be launched. Change-Id: I34c679bd888c275584c11ad3e8346d4d542976f9 [ROCm/clr commit: b0047d690a539484015d2250ee48a1dda2ac240f] --- projects/clr/hipamd/src/hip_module.cpp | 2 +- projects/clr/hipamd/src/hip_platform.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/projects/clr/hipamd/src/hip_module.cpp b/projects/clr/hipamd/src/hip_module.cpp index 9d4a9e9512..9c325d73a8 100644 --- a/projects/clr/hipamd/src/hip_module.cpp +++ b/projects/clr/hipamd/src/hip_module.cpp @@ -705,7 +705,7 @@ hipError_t hipExtLaunchKernel(const void* hostFunction, dim3 gridDim, dim3 block HIP_INIT_API(hipExtLaunchKernel, hostFunction, gridDim, blockDim, args, sharedMemBytes, stream, startEvent, stopEvent, flags); - if (!hip::isValid(stream) || !hip::isValid(startEvent) || !hip::isValid(stopEvent)) { + if (!hip::isValid(startEvent) || !hip::isValid(stopEvent)) { HIP_RETURN(hipErrorInvalidValue); } diff --git a/projects/clr/hipamd/src/hip_platform.cpp b/projects/clr/hipamd/src/hip_platform.cpp index 3c02198c9e..5f88d53654 100644 --- a/projects/clr/hipamd/src/hip_platform.cpp +++ b/projects/clr/hipamd/src/hip_platform.cpp @@ -606,6 +606,9 @@ hipError_t hipOccupancyMaxActiveBlocksPerMultiprocessorWithFlags(int* numBlocks, hipError_t ihipLaunchKernel(const void* hostFunction, dim3 gridDim, dim3 blockDim, void** args, size_t sharedMemBytes, hipStream_t stream, hipEvent_t startEvent, hipEvent_t stopEvent, int flags) { + if (!hip::isValid(stream)) { + return hipErrorInvalidValue; + } hipFunction_t func = nullptr; int deviceId = hip::Stream::DeviceId(stream); hipError_t hip_error = PlatformState::instance().getStatFunc(&func, hostFunction, deviceId);