From c44f2795d5c038b380acdcbfd2b245b9f6ebd965 Mon Sep 17 00:00:00 2001 From: Yaxun Sam Liu Date: Sun, 11 Nov 2018 22:51:28 -0500 Subject: [PATCH] Define __hip_device_heap in header for hip-clang only --- hipamd/include/hip/hcc_detail/hip_memory.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hipamd/include/hip/hcc_detail/hip_memory.h b/hipamd/include/hip/hcc_detail/hip_memory.h index 2c9ec1b7c3..866b9e879e 100644 --- a/hipamd/include/hip/hcc_detail/hip_memory.h +++ b/hipamd/include/hip/hcc_detail/hip_memory.h @@ -41,8 +41,14 @@ THE SOFTWARE. #define __HIP_SIZE_OF_HEAP (__HIP_NUM_PAGES * __HIP_SIZE_OF_PAGE) +#if __HIP__ && __HIP_DEVICE_COMPILE__ +__attribute__((weak)) __device__ char __hip_device_heap[__HIP_SIZE_OF_HEAP]; +__attribute__((weak)) __device__ + uint32_t __hip_device_page_flag[__HIP_NUM_PAGES]; +#else extern __device__ char __hip_device_heap[]; extern __device__ uint32_t __hip_device_page_flag[]; +#endif extern "C" inline __device__ void* __hip_malloc(size_t size) { char* heap = (char*)__hip_device_heap;