From 6fa37cf5bd9360748ee02797d767073a37950dc6 Mon Sep 17 00:00:00 2001
From: foreman <dl.swbuild@amd.com>
Date: Tue, 26 Nov 2019 17:03:41 -0500
Subject: [PATCH] P4 to Git Change 2037147 by kjayapra@1_HIPWS_LNX1_PAL on
 2019/11/26 16:58:07

	SWDEV-144570 - Adding hipMemcpyWithStream API

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/hip/hip_hcc.def.in#36 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_hcc.map.in#34 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_memory.cpp#87 edit


[ROCm/clr commit: d2570e225479777ded3bb27ab80f29ce38518a51]
---
 projects/clr/hipamd/api/hip/hip_hcc.def.in | 1 +
 projects/clr/hipamd/api/hip/hip_hcc.map.in | 1 +
 projects/clr/hipamd/api/hip/hip_memory.cpp | 9 +++++++++
 3 files changed, 11 insertions(+)

diff --git a/projects/clr/hipamd/api/hip/hip_hcc.def.in b/projects/clr/hipamd/api/hip/hip_hcc.def.in
index 51f0bcefe1..145e8ef2cc 100644
--- a/projects/clr/hipamd/api/hip/hip_hcc.def.in
+++ b/projects/clr/hipamd/api/hip/hip_hcc.def.in
@@ -81,6 +81,7 @@ hipMallocArray
 hipMemAllocPitch
 hipMallocPitch
 hipMemcpy
+hipMemcpyWithStream
 hipMemcpyParam2D
 hipMemcpy2D
 hipMemcpy2DAsync
diff --git a/projects/clr/hipamd/api/hip/hip_hcc.map.in b/projects/clr/hipamd/api/hip/hip_hcc.map.in
index e9cb1498e9..55defef49a 100644
--- a/projects/clr/hipamd/api/hip/hip_hcc.map.in
+++ b/projects/clr/hipamd/api/hip/hip_hcc.map.in
@@ -82,6 +82,7 @@ global:
     hipMallocPitch;
     hipMemAllocPitch;
     hipMemcpy;
+    hipMemcpyWithStream;
     hipMemcpyParam2D;
     hipMemcpy2D;
     hipMemcpy2DAsync;
diff --git a/projects/clr/hipamd/api/hip/hip_memory.cpp b/projects/clr/hipamd/api/hip/hip_memory.cpp
index c1cc189bb7..0a6cc7f966 100644
--- a/projects/clr/hipamd/api/hip/hip_memory.cpp
+++ b/projects/clr/hipamd/api/hip/hip_memory.cpp
@@ -233,6 +233,15 @@ hipError_t hipMemcpy(void* dst, const void* src, size_t sizeBytes, hipMemcpyKind
   HIP_RETURN(ihipMemcpy(dst, src, sizeBytes, kind, *queue));
 }
 
+hipError_t hipMemcpyWithStream(void* dst, const void* src, size_t sizeBytes,
+                               hipMemcpyKind kind, hipStream_t stream) {
+  HIP_INIT_API(hipMemcpyWithStream, dst, src, sizeBytes, kind, stream);
+
+  amd::HostQueue* queue = hip::getQueue(stream);
+
+  HIP_RETURN(ihipMemcpy(dst, src, sizeBytes, kind, *queue, true));
+}
+
 hipError_t hipMemPtrGetInfo(void *ptr, size_t *size) {
   HIP_INIT_API(hipMemPtrGetInfo, ptr, size);