From e2487a261eb0a87099768ec53eccaff4ee5aec29 Mon Sep 17 00:00:00 2001
From: Phaneendr-kumar Lanka <planka@hcBLR-Fiji3.amd.com>
Date: Mon, 18 Dec 2017 14:31:00 +0530
Subject: [PATCH] [nvccTests] Resubmit hipMemcpyDtoD & inline_asm_vadd

[ROCm/hip commit: 7cceebd9ed5187553a819bbdb891384f69254bb1]
---
 projects/hip/tests/src/kernel/inline_asm_vadd.cpp      |  2 +-
 .../hip/tests/src/runtimeApi/memory/hipMemcpyDtoD.cpp  | 10 +++++-----
 .../tests/src/runtimeApi/memory/hipMemcpyDtoDAsync.cpp |  7 +++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/projects/hip/tests/src/kernel/inline_asm_vadd.cpp b/projects/hip/tests/src/kernel/inline_asm_vadd.cpp
index 23406eefff..541632f72c 100644
--- a/projects/hip/tests/src/kernel/inline_asm_vadd.cpp
+++ b/projects/hip/tests/src/kernel/inline_asm_vadd.cpp
@@ -16,7 +16,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTI
 THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
 
 /* HIT_START
- * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvcc
+ * BUILD: %t %s
  * RUN: %t
  * HIT_END
  */
diff --git a/projects/hip/tests/src/runtimeApi/memory/hipMemcpyDtoD.cpp b/projects/hip/tests/src/runtimeApi/memory/hipMemcpyDtoD.cpp
index c64b01f8a7..cf0eb28e2d 100644
--- a/projects/hip/tests/src/runtimeApi/memory/hipMemcpyDtoD.cpp
+++ b/projects/hip/tests/src/runtimeApi/memory/hipMemcpyDtoD.cpp
@@ -23,7 +23,7 @@ THE SOFTWARE.
  */
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
+ * BUILD: %t %s ../../test_common.cpp
  * RUN: %t
  * HIT_END
  */
@@ -32,7 +32,7 @@ THE SOFTWARE.
 
 int main()
 {
-    hipDevice_t device;
+   
     size_t Nbytes = N*sizeof(int);
     int numDevices = 0;
     int *A_d, *B_d, *C_d, *X_d, *Y_d, *Z_d;
@@ -69,8 +69,8 @@ int main()
 
 
         HIPCHECK(hipSetDevice(1));
-        HIPCHECK(hipMemcpyDtoD(X_d, A_d,  Nbytes));
-        HIPCHECK(hipMemcpyDtoD(Y_d, B_d,  Nbytes));
+        HIPCHECK(hipMemcpyDtoD((hipDeviceptr_t)X_d, (hipDeviceptr_t)A_d,  Nbytes));
+        HIPCHECK(hipMemcpyDtoD((hipDeviceptr_t)Y_d, (hipDeviceptr_t)B_d,  Nbytes));
 
         hipLaunchKernel(
           HipTest::vectorADD,
@@ -82,7 +82,7 @@ int main()
           static_cast<const int*>(Y_d),
           Z_d,
           N);
-        HIPCHECK(hipMemcpyDtoH(C_h, Z_d, Nbytes));
+        HIPCHECK(hipMemcpyDtoH(C_h, (hipDeviceptr_t)Z_d, Nbytes));
         HIPCHECK(hipDeviceSynchronize());
         HipTest::checkVectorADD(A_h, B_h, C_h, N);
 
diff --git a/projects/hip/tests/src/runtimeApi/memory/hipMemcpyDtoDAsync.cpp b/projects/hip/tests/src/runtimeApi/memory/hipMemcpyDtoDAsync.cpp
index 6d21ac62e7..e259af0c29 100644
--- a/projects/hip/tests/src/runtimeApi/memory/hipMemcpyDtoDAsync.cpp
+++ b/projects/hip/tests/src/runtimeApi/memory/hipMemcpyDtoDAsync.cpp
@@ -32,7 +32,6 @@ THE SOFTWARE.
 
 int main()
 {
-    hipDevice_t device;
     size_t Nbytes = N*sizeof(int);
     int numDevices = 0;
     int *A_d, *B_d, *C_d, *X_d, *Y_d, *Z_d;
@@ -70,8 +69,8 @@ int main()
 
         HIPCHECK(hipStreamCreate(&s));
         HIPCHECK(hipSetDevice(1));
-        HIPCHECK(hipMemcpyDtoDAsync(X_d, A_d, Nbytes, s));
-        HIPCHECK(hipMemcpyDtoDAsync(Y_d, B_d, Nbytes, s));
+        HIPCHECK(hipMemcpyDtoDAsync((hipDeviceptr_t)X_d, (hipDeviceptr_t)A_d, Nbytes, s));
+        HIPCHECK(hipMemcpyDtoDAsync((hipDeviceptr_t)Y_d, (hipDeviceptr_t)B_d, Nbytes, s));
 
         hipLaunchKernel(
             HipTest::vectorADD,
@@ -83,7 +82,7 @@ int main()
             static_cast<const int*>(Y_d),
             Z_d,
             N);
-        HIPCHECK(hipMemcpyDtoHAsync(C_h, Z_d, Nbytes, s));
+        HIPCHECK(hipMemcpyDtoHAsync(C_h, (hipDeviceptr_t)Z_d, Nbytes, s));
         HIPCHECK(hipStreamSynchronize(s));
         HIPCHECK(hipDeviceSynchronize());