From bc49031828d30ac1344545e67ea4ea625911cbbf Mon Sep 17 00:00:00 2001
From: saleelk <saleel@asu.edu>
Date: Sun, 22 Jul 2018 22:34:14 -0700
Subject: [PATCH] Fix hipHostRegister mem leak and copy kind in hipMemcpyAsync
 (#587)

[ROCm/clr commit: e8a5ad629f7446318964056d623e6ef986970d77]
---
 .../clr/hipamd/tests/src/runtimeApi/memory/hipHostRegister.cpp | 3 +++
 .../clr/hipamd/tests/src/runtimeApi/memory/hipMemcpyAsync.cpp  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/projects/clr/hipamd/tests/src/runtimeApi/memory/hipHostRegister.cpp b/projects/clr/hipamd/tests/src/runtimeApi/memory/hipHostRegister.cpp
index e7ebcfd1be..2b832a8bc1 100644
--- a/projects/clr/hipamd/tests/src/runtimeApi/memory/hipHostRegister.cpp
+++ b/projects/clr/hipamd/tests/src/runtimeApi/memory/hipHostRegister.cpp
@@ -108,6 +108,7 @@ int main(int argc, char* argv[]) {
         HIPCHECK(hipHostUnregister(A));
 
         free(A);
+        delete [] Ad;
     }
 
 
@@ -144,6 +145,8 @@ int main(int argc, char* argv[]) {
 
 
         free(A);
+        free(Bh);
+        hipFree(Bd);
     }
 
 
diff --git a/projects/clr/hipamd/tests/src/runtimeApi/memory/hipMemcpyAsync.cpp b/projects/clr/hipamd/tests/src/runtimeApi/memory/hipMemcpyAsync.cpp
index f13e0f59b2..f7be5e4f3d 100644
--- a/projects/clr/hipamd/tests/src/runtimeApi/memory/hipMemcpyAsync.cpp
+++ b/projects/clr/hipamd/tests/src/runtimeApi/memory/hipMemcpyAsync.cpp
@@ -41,7 +41,7 @@ void simpleNegTest() {
 
 
     // Not sure what happens here, the memory must be pinned.
-    e = hipMemcpyAsync(A_malloc, A_d, Nbytes, hipMemcpyHostToDevice, NULL);
+    e = hipMemcpyAsync(A_malloc, A_d, Nbytes, hipMemcpyDeviceToHost, NULL);
 
     printf("  async memcpy of A_malloc to A_d. Result=%d\n", e);
     // HIPASSERT (e==hipErrorInvalidValue);