Modify memcpy and memset to follow C/C++ standard:

- memcpy src is const
    - memset val is int


[ROCm/hip commit: d572e0616e]
This commit is contained in:
Ben Sander
2017-03-06 16:38:22 -06:00
parent 6e13b64b35
commit 0dd1393f97
2 changed files with 6 additions and 5 deletions
@@ -353,7 +353,7 @@ __device__ int __hip_move_dpp(int src, int dpp_ctrl, int row_mask, int bank_mask
#define hipGridDim_y (hc_get_num_groups(1))
#define hipGridDim_z (hc_get_num_groups(2))
extern "C" __device__ void* __hip_hc_memcpy(void* dst, void* src, size_t size);
extern "C" __device__ void* __hip_hc_memcpy(void* dst, const void* src, size_t size);
extern "C" __device__ void* __hip_hc_memset(void* ptr, uint8_t val, size_t size);
extern "C" __device__ void* __hip_hc_malloc(size_t);
extern "C" __device__ void* __hip_hc_free(void *ptr);
@@ -368,14 +368,15 @@ static inline __device__ void* free(void *ptr)
return __hip_hc_free(ptr);
}
static inline __device__ void* memcpy(void* dst, void* src, size_t size)
static inline __device__ void* memcpy(void* dst, const void* src, size_t size)
{
return __hip_hc_memcpy(dst, src, size);
}
static inline __device__ void* memset(void* ptr, uint8_t val, size_t size)
static inline __device__ void* memset(void* ptr, int val, size_t size)
{
return __hip_hc_memset(ptr, val, size);
uint8_t val8 = static_cast <uint8_t> (val);
return __hip_hc_memset(ptr, val8, size);
}
+1 -1
View File
@@ -99,7 +99,7 @@ __device__ void* __hip_hc_free(void *ptr)
// loop unrolling
__device__ void* __hip_hc_memcpy(void* dst, void* src, size_t size)
__device__ void* __hip_hc_memcpy(void* dst, const void* src, size_t size)
{
uint8_t *dstPtr, *srcPtr;
dstPtr = (uint8_t*)dst;