From 2a4e7126cd80b6f13833c7f310cc56e233b5c75e Mon Sep 17 00:00:00 2001
From: cdevadas <christudasan.devadasan@amd.com>
Date: Mon, 29 Apr 2019 17:50:56 +0530
Subject: [PATCH] Update TargetInfo.cpp

Enabling implicit kernel argument support for HIP.
---
 lib/CodeGen/TargetInfo.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/CodeGen/TargetInfo.cpp b/lib/CodeGen/TargetInfo.cpp
index 432e55da411d..9456b90428c4 100644
--- a/lib/CodeGen/TargetInfo.cpp
+++ b/lib/CodeGen/TargetInfo.cpp
@@ -7869,7 +7869,9 @@ void AMDGPUTargetCodeGenInfo::setTargetAttributes(
   const auto *ReqdWGS = M.getLangOpts().OpenCL ?
     FD->getAttr<ReqdWorkGroupSizeAttr>() : nullptr;
 
-  if (M.getLangOpts().OpenCL && FD->hasAttr<OpenCLKernelAttr>() &&
+  // add implicit kernargs for both openCL and HIP.
+  if (((M.getLangOpts().OpenCL && FD->hasAttr<OpenCLKernelAttr>()) ||
+       (M.getLangOpts().HIP && FD->hasAttr<CUDAGlobalAttr>())) &&
       (M.getTriple().getOS() == llvm::Triple::AMDHSA))
     F->addFnAttr("amdgpu-implicitarg-num-bytes", "48");