From 0ddf28890417def0c33ec2ff33730fd66867eb9f Mon Sep 17 00:00:00 2001
From: foreman <dl.constructicon@amd.com>
Date: Wed, 2 May 2018 19:14:52 -0400
Subject: [PATCH] P4 to Git Change 1549012 by lmoriche@lmoriche_opencl_dev2 on
 2018/05/02 16:56:02

	SWDEV-145570 - [HIP] - Add hipMemset2DAsync, fix the HCC triple for device binaries (make sure to update to the latest HCC).

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/hip/hip_hcc.def.in#4 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_hcc.map.in#4 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_memory.cpp#17 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_platform.cpp#10 edit
---
 api/hip/hip_hcc.def.in   | 1 +
 api/hip/hip_hcc.map.in   | 1 +
 api/hip/hip_memory.cpp   | 9 +++++++++
 api/hip/hip_platform.cpp | 2 +-
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/api/hip/hip_hcc.def.in b/api/hip/hip_hcc.def.in
index e7fd04ad04..d2916f3885 100644
--- a/api/hip/hip_hcc.def.in
+++ b/api/hip/hip_hcc.def.in
@@ -98,6 +98,7 @@ hipMemPtrGetInfo
 hipMemset
 hipMemset2D
 hipMemsetAsync
+hipMemset2DAsync
 hipMemsetD8
 hipModuleGetFunction
 hipModuleGetGlobal
diff --git a/api/hip/hip_hcc.map.in b/api/hip/hip_hcc.map.in
index d0bc6b4618..761641425e 100644
--- a/api/hip/hip_hcc.map.in
+++ b/api/hip/hip_hcc.map.in
@@ -99,6 +99,7 @@ global:
     hipMemset;
     hipMemset2D;
     hipMemsetAsync;
+    hipMemset2DAsync;
     hipMemsetD8;
     hipModuleGetFunction;
     hipModuleGetGlobal;
diff --git a/api/hip/hip_memory.cpp b/api/hip/hip_memory.cpp
index 10299de971..921cfbe288 100644
--- a/api/hip/hip_memory.cpp
+++ b/api/hip/hip_memory.cpp
@@ -958,6 +958,15 @@ hipError_t hipMemset2D(void* dst, size_t pitch, int value, size_t width, size_t
   return hipSuccess;
 }
 
+hipError_t hipMemset2DAsync(void* dst, size_t pitch, int value, size_t width, size_t height,
+                       hipStream_t stream) {
+  HIP_INIT_API(dst, pitch, value, width, height, stream);
+
+  assert(0 && "Unimplemented");
+
+  return hipErrorUnknown;
+}
+
 hipError_t hipMemsetD8(hipDeviceptr_t dst, unsigned char value, size_t sizeBytes) {
   HIP_INIT_API(dst, value, sizeBytes);
 
diff --git a/api/hip/hip_platform.cpp b/api/hip/hip_platform.cpp
index 9f7ccbe658..386d711275 100644
--- a/api/hip/hip_platform.cpp
+++ b/api/hip/hip_platform.cpp
@@ -40,7 +40,7 @@ struct __CudaFatBinaryWrapper {
 
 #define CLANG_OFFLOAD_BUNDLER_MAGIC_STR "__CLANG_OFFLOAD_BUNDLE__"
 #define OPENMP_AMDGCN_AMDHSA_TRIPLE "openmp-amdgcn--amdhsa"
-#define HCC_AMDGCN_AMDHSA_TRIPLE "hcc-amdgcn--amdhsa"
+#define HCC_AMDGCN_AMDHSA_TRIPLE "hcc-amdgcn-amd-amdhsa-"
 
 struct __ClangOffloadBundleDesc {
   uint64_t offset;