From 069667dfd49ec39c845f18c5ca2bf81bffd778e0 Mon Sep 17 00:00:00 2001 From: Maneesh Gupta Date: Thu, 3 Mar 2016 09:52:41 +0530 Subject: [PATCH] Fix hip_ballot.cpp compilation on hcc [ROCm/clr commit: eefa31620d15a5a12b5ed689245e8fcad6ddbe45] --- projects/clr/hipamd/tests/src/hip_ballot.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/projects/clr/hipamd/tests/src/hip_ballot.cpp b/projects/clr/hipamd/tests/src/hip_ballot.cpp index 76fb673ecc..17e86a12ad 100644 --- a/projects/clr/hipamd/tests/src/hip_ballot.cpp +++ b/projects/clr/hipamd/tests/src/hip_ballot.cpp @@ -9,8 +9,11 @@ __global__ void int tid = hipThreadIdx_x + hipBlockIdx_x * hipBlockDim_x; const unsigned int warp_num = hipThreadIdx_x >> pshift; - if (pshift ==6) {atomicAdd(&device_ballot[warp_num+hipBlockIdx_x*Num_Warps_per_Block],__popcll(__ballot(tid - 245)));} - else {atomicAdd(&device_ballot[warp_num+hipBlockIdx_x*Num_Warps_per_Block],__popc(__ballot(tid - 245)));} +#ifdef __HIP_PLATFORM_HCC__ + atomicAdd(&device_ballot[warp_num+hipBlockIdx_x*Num_Warps_per_Block],__popcll(__ballot(tid - 245))); +#else + atomicAdd(&device_ballot[warp_num+hipBlockIdx_x*Num_Warps_per_Block],__popc(__ballot(tid - 245))); +#endif }