Skip to content

Replace HC intrinsics with HIP intrinsics introduced in ROCm 1.8.2 #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jszuppe merged 2 commits into from
Aug 24, 2018
Merged

Replace HC intrinsics with HIP intrinsics introduced in ROCm 1.8.2 #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0702a4a
Replace HC intrinsics with new HIP intrinsics for HIP API
Jul 19, 2018
8538632
Change required ROCm/HIP version
Jul 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ endif()
# Package

if(HIP_PLATFORM STREQUAL "hcc")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip_hcc (>= 1.4)")
set(CPACK_RPM_PACKAGE_REQUIRES "hip_hcc >= 1.4")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip_hcc (>= 1.5.18263)") # 1.5.18263 is HIP version in ROCm 1.8.2
set(CPACK_RPM_PACKAGE_REQUIRES "hip_hcc >= 1.5.18263")
else()
set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip_nvcc (>= 1.3)")
set(CPACK_RPM_PACKAGE_REQUIRES "hip_nvcc >= 1.3")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip_nvcc (>= 1.5.18263)")
set(CPACK_RPM_PACKAGE_REQUIRES "hip_nvcc >= 1.5.18263")
endif()
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
if(NOT CPACK_PACKAGING_INSTALL_PREFIX)
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ performant GPU-accelerated code on AMD ROCm platform.

* Git
* CMake (3.5.1 or later)
* AMD [ROCm](https://rocm.github.io/install.html) platform (1.7.1 or later)
* AMD [ROCm](https://rocm.github.io/install.html) platform (1.8.2 or later)
* Including [HCC](https://github.com/RadeonOpenCompute/hcc) compiler, which must be
set as C++ compiler on ROCm platform.

Expand Down
2 changes: 1 addition & 1 deletion cmake/VerifyCompiler.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
# by nvcc compiler (CMake's CUDA package handles this).

# Find HIP package
find_package(HIP REQUIRED)
find_package(HIP 1.5.18263 REQUIRED) # 1.5.18263 is HIP version in ROCm 1.8.2

if(HIP_PLATFORM STREQUAL "nvcc")
include(cmake/SetupNVCC.cmake)
Expand Down
3 changes: 1 addition & 2 deletions rocprim/include/rocprim/intrinsics/thread.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@ unsigned int lane_id()
#ifdef ROCPRIM_HC_API
return hc::__lane_id();
#else // HIP
// TODO: Find HIP function for that
return hc::__lane_id();
return ::__lane_id();
#endif
}

Expand Down
7 changes: 3 additions & 4 deletions rocprim/include/rocprim/intrinsics/warp.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ unsigned long long ballot(int predicate)
#ifdef ROCPRIM_HC_API
return hc::__ballot(predicate);
#else // HIP
return __ballot(predicate);
return ::__ballot(predicate);
#endif
}

Expand All @@ -56,10 +56,9 @@ unsigned int masked_bit_count(unsigned long long x, unsigned int add = 0)
c = hc::__amdgcn_mbcnt_hi(static_cast<int>(x >> 32), c);
return c;
#else // HIP
// TODO: Use HIP function(s)
int c;
c = hc::__amdgcn_mbcnt_lo(static_cast<int>(x), add);
c = hc::__amdgcn_mbcnt_hi(static_cast<int>(x >> 32), c);
c = ::__mbcnt_lo(static_cast<int>(x), add);
c = ::__mbcnt_hi(static_cast<int>(x >> 32), c);
return c;
#endif
}
Expand Down