From e34b0ccd48d2cdf100ad4d112da07a91e6506495 Mon Sep 17 00:00:00 2001
From: "Wen-Heng (Jack) Chung" <whchung@gmail.com>
Date: Tue, 5 Mar 2019 05:51:05 +0000
Subject: [PATCH] Address code review comments to use hipDeviceptr_t

[ROCm/clr commit: 8b7baa0bd9185f3b09d05ee7b3141106b5c95cb1]
---
 .../clr/hipamd/include/hip/hcc_detail/hip_runtime_api.h     | 3 ++-
 .../clr/hipamd/include/hip/nvcc_detail/hip_runtime_api.h    | 6 +++---
 projects/clr/hipamd/src/hip_memory.cpp                      | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/projects/clr/hipamd/include/hip/hcc_detail/hip_runtime_api.h b/projects/clr/hipamd/include/hip/hcc_detail/hip_runtime_api.h
index 9c50ca4755..73996982d1 100644
--- a/projects/clr/hipamd/include/hip/hcc_detail/hip_runtime_api.h
+++ b/projects/clr/hipamd/include/hip/hcc_detail/hip_runtime_api.h
@@ -1547,7 +1547,8 @@ hipError_t hipMemsetAsync(void* dst, int value, size_t sizeBytes, hipStream_t st
  *  @param[in]  stream - Stream identifier
  *  @return #hipSuccess, #hipErrorInvalidValue, #hipErrorMemoryFree
  */
-hipError_t hipMemsetD32Async(void* dst, int value, size_t count, hipStream_t stream __dparm(0));
+hipError_t hipMemsetD32Async(hipDeviceptr_t dst, int value, size_t count,
+                             hipStream_t stream __dparm(0));
 
 /**
  *  @brief Fills the memory area pointed to by dst with the constant value.
diff --git a/projects/clr/hipamd/include/hip/nvcc_detail/hip_runtime_api.h b/projects/clr/hipamd/include/hip/nvcc_detail/hip_runtime_api.h
index abce9a5fc6..a463d17e6d 100644
--- a/projects/clr/hipamd/include/hip/nvcc_detail/hip_runtime_api.h
+++ b/projects/clr/hipamd/include/hip/nvcc_detail/hip_runtime_api.h
@@ -655,7 +655,7 @@ inline static hipError_t hipMemset(void* devPtr, int value, size_t count) {
     return hipCUDAErrorTohipError(cudaMemset(devPtr, value, count));
 }
 
-inline static hipError_t hipMemsetD32(void* devPtr, int value, size_t count) {
+inline static hipError_t hipMemsetD32(hipDeviceptr_t devPtr, int value, size_t count) {
     return hipCUDAErrorTohipError(cuMemsetD32(devPtr, value, count));
 }
 
@@ -664,8 +664,8 @@ inline static hipError_t hipMemsetAsync(void* devPtr, int value, size_t count,
     return hipCUDAErrorTohipError(cudaMemsetAsync(devPtr, value, count, stream));
 }
 
-inline static hipError_t hipMemsetD32Async(void* devPtr, int value, size_t count,
-                                        hipStream_t stream __dparm(0)) {
+inline static hipError_t hipMemsetD32Async(hipDeviceptr_t devPtr, int value, size_t count,
+                                           hipStream_t stream __dparm(0)) {
     return hipCUDAErrorTohipError(cuMemsetD32Async(devPtr, value, count, stream));
 }
 
diff --git a/projects/clr/hipamd/src/hip_memory.cpp b/projects/clr/hipamd/src/hip_memory.cpp
index b194faa1ca..d8a9bd5708 100644
--- a/projects/clr/hipamd/src/hip_memory.cpp
+++ b/projects/clr/hipamd/src/hip_memory.cpp
@@ -1719,7 +1719,7 @@ hipError_t hipMemsetAsync(void* dst, int value, size_t sizeBytes, hipStream_t st
     return ihipLogStatus(e);
 };
 
-hipError_t hipMemsetD32Async(void* dst, int value, size_t count, hipStream_t stream) {
+hipError_t hipMemsetD32Async(hipDeviceptr_t dst, int value, size_t count, hipStream_t stream) {
     HIP_INIT_SPECIAL_API(hipMemsetD32Async, (TRACE_MCMD), dst, value, count, stream);
 
     hipError_t e = hipSuccess;