From 8aa2ebb4de2838cef2ada0b38b0355556e876bba Mon Sep 17 00:00:00 2001
From: Jatin Chaudhary <jatin.chaudhary@amd.com>
Date: Wed, 18 Nov 2020 06:31:36 -0500
Subject: [PATCH] Adding checks for function, size and params in
 ihipModuleLaunchKernel to have common message for hipModuleLaunch and
 hipExtModuleLaunch

Change-Id: I11921ad753930872572571dbfd1c12daba83a725


[ROCm/clr commit: dfe6f1ef277c83a14bc702ec60b237a261e473a7]
---
 projects/clr/hipamd/rocclr/hip_module.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/projects/clr/hipamd/rocclr/hip_module.cpp b/projects/clr/hipamd/rocclr/hip_module.cpp
index 0cbebb5114..1480a3dc8c 100755
--- a/projects/clr/hipamd/rocclr/hip_module.cpp
+++ b/projects/clr/hipamd/rocclr/hip_module.cpp
@@ -222,6 +222,16 @@ hipError_t ihipModuleLaunchKernel(hipFunction_t f, uint32_t globalWorkSizeX,
     blockDimX, blockDimY, blockDimZ, sharedMemBytes, hStream, kernelParams, extra, startEvent,
     stopEvent, flags, params);
 
+  if (f == nullptr) {
+    DevLogPrintfError("%s", "Function passed is null");
+    return hipErrorInvalidImage;
+  }
+  if ((kernelParams != nullptr) && (extra != nullptr)) {
+    DevLogPrintfError(
+        "%s", "Both, kernelParams and extra Params are provided, only one should be provided");
+    return hipErrorInvalidValue;
+  }
+
   hip::DeviceFunc* function = hip::DeviceFunc::asFunction(f);
   amd::Kernel* kernel = function->kernel();