From fa0c9d8a73f28356a568bb243daa9450b0d78b3e Mon Sep 17 00:00:00 2001
From: Rahul Garg <rahul.garg@amd.com>
Date: Thu, 28 Feb 2019 06:54:49 +0530
Subject: [PATCH 1/3] Update hipMemset test

[ROCm/hip commit: 026dc9457e2c910c6a0dbfd732af31d72c5e1092]
---
 .../tests/src/runtimeApi/memory/hipMemset.cpp | 78 +++++++++++++------
 1 file changed, 56 insertions(+), 22 deletions(-)

diff --git a/projects/hip/tests/src/runtimeApi/memory/hipMemset.cpp b/projects/hip/tests/src/runtimeApi/memory/hipMemset.cpp
index 2d63133039..1617c0fd9e 100644
--- a/projects/hip/tests/src/runtimeApi/memory/hipMemset.cpp
+++ b/projects/hip/tests/src/runtimeApi/memory/hipMemset.cpp
@@ -37,32 +37,66 @@ THE SOFTWARE.
 #include "hip/hip_runtime.h"
 #include "test_common.h"
 
+bool testhipMemset(int memsetval,int p_gpuDevice)
+{
+    size_t Nbytes = N*sizeof(char);
+    printf ("testhipMemset N=%zu  memsetval=%2x device=%d\n", N, memsetval, p_gpuDevice);
+    char *A_d;
+    char *A_h;
+    bool testResult = true;
 
-int main(int argc, char* argv[]) {
-    HipTest::parseStandardArguments(argc, argv, true);
-
-    HIPCHECK(hipSetDevice(p_gpuDevice));
-
-    size_t Nbytes = N * sizeof(char);
-
-    printf("N=%zu  memsetval=%2x device=%d\n", N, memsetval, p_gpuDevice);
-
-    char* A_d;
-    char* A_h;
-
-    HIPCHECK(hipMalloc(&A_d, Nbytes));
+    HIPCHECK ( hipMalloc(&A_d, Nbytes) );
     A_h = (char*)malloc(Nbytes);
+    HIPCHECK ( hipMemset(A_d, memsetval, Nbytes) );
+    HIPCHECK ( hipMemcpy(A_h, A_d, Nbytes, hipMemcpyDeviceToHost));
 
-    HIPCHECK(hipMemset(A_d, memsetval, Nbytes));
-
-    HIPCHECK(hipMemcpy(A_h, A_d, Nbytes, hipMemcpyDeviceToHost));
-
-    for (int i = 0; i < N; i++) {
+    for (int i=0; i<N; i++) {
         if (A_h[i] != memsetval) {
-            failed("mismatch at index:%d computed:%02x, memsetval:%02x\n", i, (int)A_h[i],
-                   (int)memsetval);
+            testResult = false;
+            printf("mismatch at index:%d computed:%02x, memsetval:%02x\n", i, (int)A_h[i], (int)memsetval);
+            break;
         }
     }
-
-    passed();
+    hipFree(A_d);
+    free(A_h);
+    return testResult;
+}
+
+bool testhipMemsetAsync(int memsetval,int p_gpuDevice)
+{
+    size_t Nbytes = N*sizeof(int);
+    printf ("testhipMemsetAsync N=%zu  memsetval=%2x device=%d\n", N, memsetval, p_gpuDevice);
+    hipDeviceptr_t A_d;
+    char *A_h;
+    bool testResult = true;
+
+    HIPCHECK ( hipMalloc((void**)&A_d, Nbytes) );
+    A_h = (char*)malloc(Nbytes);
+    hipStream_t stream;
+    HIPCHECK(hipStreamCreate(&stream));
+    HIPCHECK ( hipMemsetAsync(A_d, memsetval, Nbytes, stream ));
+    HIPCHECK ( hipMemcpy(A_h, (void*)A_d, Nbytes, hipMemcpyDeviceToHost));
+
+    for (int i=0; i<N; i++) {
+        if (A_h[i] != memsetval) {
+            testResult = false;
+            printf("mismatch at index:%d computed:%02x, memsetval:%02x\n", i, (int)A_h[i], (int)memsetval);
+            break;
+        }
+    }
+    hipFree((void*)A_d);
+    free(A_h);
+    return testResult;
+}
+
+int main(int argc, char *argv[])
+{
+    HipTest::parseStandardArguments(argc, argv, true);
+    bool testResult = false;
+    HIPCHECK(hipSetDevice(p_gpuDevice));
+    testResult = testhipMemset(memsetval, p_gpuDevice);
+    if(testResult)
+        testResult = testhipMemsetAsync(memsetval, p_gpuDevice);
+    if(testResult)
+        passed();
 }

From 4093c03dd742efa4f55490302f11e2b9f45b2da0 Mon Sep 17 00:00:00 2001
From: Rahul Garg <rahul.garg@amd.com>
Date: Fri, 1 Mar 2019 03:46:57 +0530
Subject: [PATCH 2/3] Fix hipMemset test for HIP/NVCC

[ROCm/hip commit: 77c6d5451fd156e62542d88a2d2dec7f3be0c800]
---
 projects/hip/tests/src/runtimeApi/memory/hipMemset.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/hip/tests/src/runtimeApi/memory/hipMemset.cpp b/projects/hip/tests/src/runtimeApi/memory/hipMemset.cpp
index 1617c0fd9e..5c8b1a18c1 100644
--- a/projects/hip/tests/src/runtimeApi/memory/hipMemset.cpp
+++ b/projects/hip/tests/src/runtimeApi/memory/hipMemset.cpp
@@ -66,7 +66,7 @@ bool testhipMemsetAsync(int memsetval,int p_gpuDevice)
 {
     size_t Nbytes = N*sizeof(int);
     printf ("testhipMemsetAsync N=%zu  memsetval=%2x device=%d\n", N, memsetval, p_gpuDevice);
-    hipDeviceptr_t A_d;
+    char *A_d;
     char *A_h;
     bool testResult = true;
 

From 7a9ebee08abfcffd720d6f4190b8c28ccad492b0 Mon Sep 17 00:00:00 2001
From: Rahul Garg <rahul.garg@amd.com>
Date: Sat, 2 Mar 2019 23:38:37 +0530
Subject: [PATCH 3/3] Fix review comments

[ROCm/hip commit: 131c0ea3261a1db3c6031ecb2394d59f644c6770]
---
 .../tests/src/runtimeApi/memory/hipMemset.cpp   | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/projects/hip/tests/src/runtimeApi/memory/hipMemset.cpp b/projects/hip/tests/src/runtimeApi/memory/hipMemset.cpp
index 5c8b1a18c1..bcb0adbeef 100644
--- a/projects/hip/tests/src/runtimeApi/memory/hipMemset.cpp
+++ b/projects/hip/tests/src/runtimeApi/memory/hipMemset.cpp
@@ -57,7 +57,7 @@ bool testhipMemset(int memsetval,int p_gpuDevice)
             break;
         }
     }
-    hipFree(A_d);
+    HIPCHECK(hipFree(A_d));
     free(A_h);
     return testResult;
 }
@@ -75,6 +75,7 @@ bool testhipMemsetAsync(int memsetval,int p_gpuDevice)
     hipStream_t stream;
     HIPCHECK(hipStreamCreate(&stream));
     HIPCHECK ( hipMemsetAsync(A_d, memsetval, Nbytes, stream ));
+    HIPCHECK ( hipStreamSynchronize(stream));
     HIPCHECK ( hipMemcpy(A_h, (void*)A_d, Nbytes, hipMemcpyDeviceToHost));
 
     for (int i=0; i<N; i++) {
@@ -84,7 +85,8 @@ bool testhipMemsetAsync(int memsetval,int p_gpuDevice)
             break;
         }
     }
-    hipFree((void*)A_d);
+    HIPCHECK(hipFree((void*)A_d));
+    HIPCHECK(hipStreamDestroy(stream));
     free(A_h);
     return testResult;
 }
@@ -92,11 +94,10 @@ bool testhipMemsetAsync(int memsetval,int p_gpuDevice)
 int main(int argc, char *argv[])
 {
     HipTest::parseStandardArguments(argc, argv, true);
-    bool testResult = false;
+    bool testResult = true;
     HIPCHECK(hipSetDevice(p_gpuDevice));
-    testResult = testhipMemset(memsetval, p_gpuDevice);
-    if(testResult)
-        testResult = testhipMemsetAsync(memsetval, p_gpuDevice);
-    if(testResult)
-        passed();
+    testResult &= testhipMemset(memsetval, p_gpuDevice);
+    testResult &= testhipMemsetAsync(memsetval, p_gpuDevice);
+    if (testResult) passed();
+    failed("Output Mismatch\n"); 
 }