From 2bc49fb55c55ab9dfe8bbc461278b83fb0e9b131 Mon Sep 17 00:00:00 2001
From: Vladislav Sytchenko <vsytchen@amd.com>
Date: Tue, 15 Oct 2019 17:15:49 -0400
Subject: [PATCH] In the hipMemset2D and hipMemset3D tests synchronize with the
 default stream after performing an async memset.

[ROCm/clr commit: cc5abec0929ca815691d2c8faae4b5ca3dcb367e]
---
 .../clr/hipamd/tests/src/runtimeApi/memory/hipMemset2D.cpp | 7 ++++---
 .../clr/hipamd/tests/src/runtimeApi/memory/hipMemset3D.cpp | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/projects/clr/hipamd/tests/src/runtimeApi/memory/hipMemset2D.cpp b/projects/clr/hipamd/tests/src/runtimeApi/memory/hipMemset2D.cpp
index 73f3f5d415..449f0b6f78 100644
--- a/projects/clr/hipamd/tests/src/runtimeApi/memory/hipMemset2D.cpp
+++ b/projects/clr/hipamd/tests/src/runtimeApi/memory/hipMemset2D.cpp
@@ -45,7 +45,7 @@ bool testhipMemset2D(int memsetval,int p_gpuDevice)
     char *A_d;
     char *A_h;
     bool testResult = true;
-    HIPCHECK ( hipMemAllocPitch((hipDeviceptr_t*)&A_d, &pitch_A, width , numH,16) );
+    HIPCHECK(hipMemAllocPitch((hipDeviceptr_t*)&A_d, &pitch_A, width , numH,16));
     A_h = (char*)malloc(sizeElements);
     HIPASSERT(A_h != NULL);
     for (size_t i=0; i<elements; i++) {
@@ -89,8 +89,9 @@ bool testhipMemset2DAsync(int memsetval,int p_gpuDevice)
     }
     hipStream_t stream;
     HIPCHECK(hipStreamCreate(&stream));
-    HIPCHECK ( hipMemset2DAsync(A_d, pitch_A, memsetval, numW, numH, stream) );
-    HIPCHECK ( hipMemcpy2D(A_h, width, A_d, pitch_A, numW, numH, hipMemcpyDeviceToHost));
+    HIPCHECK(hipMemset2DAsync(A_d, pitch_A, memsetval, numW, numH, stream) );
+    HIPCHECK(hipStreamSynchronize(stream));
+    HIPCHECK(hipMemcpy2D(A_h, width, A_d, pitch_A, numW, numH, hipMemcpyDeviceToHost));
 
     for (int i=0; i<elements; i++) {
         if (A_h[i] != memsetval) {
diff --git a/projects/clr/hipamd/tests/src/runtimeApi/memory/hipMemset3D.cpp b/projects/clr/hipamd/tests/src/runtimeApi/memory/hipMemset3D.cpp
index ce2459a438..a47b609c73 100644
--- a/projects/clr/hipamd/tests/src/runtimeApi/memory/hipMemset3D.cpp
+++ b/projects/clr/hipamd/tests/src/runtimeApi/memory/hipMemset3D.cpp
@@ -53,7 +53,7 @@ bool testhipMemset3D(int memsetval,int p_gpuDevice)
     for (size_t i=0; i<elements; i++) {
         A_h[i] = 1;
     }
-    HIPCHECK ( hipMemset3D( devPitchedPtr, memsetval, extent) );
+    HIPCHECK(hipMemset3D( devPitchedPtr, memsetval, extent));
     hipMemcpy3DParms myparms = {0};
     myparms.srcPos = make_hipPos(0,0,0);
     myparms.dstPos = make_hipPos(0,0,0);
@@ -103,7 +103,8 @@ bool testhipMemset3DAsync(int memsetval,int p_gpuDevice)
     }
     hipStream_t stream;
     HIPCHECK(hipStreamCreate(&stream));
-    HIPCHECK ( hipMemset3DAsync( devPitchedPtr, memsetval, extent, stream) );
+    HIPCHECK(hipMemset3DAsync(devPitchedPtr, memsetval, extent, stream));
+    HIPCHECK(hipStreamSynchronize(stream));
     hipMemcpy3DParms myparms = {0};
     myparms.srcPos = make_hipPos(0,0,0);
     myparms.dstPos = make_hipPos(0,0,0);