Skip to content

Add hipclang amdgcn functions #515

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
mangupta merged 22 commits into from
Jul 17, 2018
Merged

Add hipclang amdgcn functions #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c453b42
Add hipclang amdgcn functions
aaronenyeshi Jun 12, 2018
cfa8fc1
Add __llvm_fence funcs and __ prefixes
aaronenyeshi Jun 13, 2018
871cfc6
Add prefix __ to memory scope and order
aaronenyeshi Jun 13, 2018
27f600b
Add get_dynamicgroupbaseptr def and remove hc_
aaronenyeshi Jun 13, 2018
cfe3748
Split __llvm and device lib funcs into new headers
aaronenyeshi Jun 14, 2018
fe4e6c5
Move hipclang funcs into corresponding headers
aaronenyeshi Jun 15, 2018
e02fc7e
Implement device_functions.cpp into HIP headers
aaronenyeshi Jun 19, 2018
2142eb4
Implement hip_hc.ll into HIP headers
aaronenyeshi Jun 19, 2018
6dc16bb
Implement __ballot, __any, __all into HIP headers
aaronenyeshi Jun 19, 2018
8ac864c
Replace __hip_hc_ir_ inline asm with __ockl_* functions
aaronenyeshi Jun 20, 2018
9ac31e0
Implement __shfl_* funcs into HIP headers
aaronenyeshi Jun 22, 2018
2975f2a
Merge branch 'master' into hipclang-add-amdgcn-funcs
aaronenyeshi Jul 4, 2018
07de5cb
Workaround cast warning of smaller integer type for __to_local
aaronenyeshi Jul 4, 2018
930a16b
Implement Memory Fence Functions in header
aaronenyeshi Jul 4, 2018
47d78e3
Implement min/max functions in HIP header
aaronenyeshi Jul 5, 2018
76f86ef
Implement hip_ldg Functions into HIP header
aaronenyeshi Jul 5, 2018
22b60af
Enable surface functions on HIP clang path
aaronenyeshi Jul 5, 2018
e0390dd
Add declare of __get_dynamicgroupbaseptr for host compilation
yxsamliu Jul 8, 2018
5ec7973
Add workaround __local_to_generic
yxsamliu Jul 9, 2018
d1323f4
Remove activelanemask asm using ockl and llvm instrinsics
aaronenyeshi Jul 10, 2018
1f87173
Add func attributes to match ocml and ockl
aaronenyeshi Jul 10, 2018
4a7ad93
Fix min/max, icmp asm and add comment for conversion functions
aaronenyeshi Jul 10, 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
5 changes: 1 addition & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,7 @@ if(HIP_PLATFORM STREQUAL "hcc")
src/program_state.cpp)

set(SOURCE_FILES_DEVICE
src/device_util.cpp
src/hip_ldg.cpp
src/device_functions.cpp)
src/device_util.cpp)

execute_process(COMMAND ${HCC_HOME}/bin/hcc-config --ldflags OUTPUT_VARIABLE HCC_LD_FLAGS)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${HCC_LD_FLAGS} -Wl,-Bsymbolic")
Expand Down Expand Up @@ -238,7 +236,6 @@ endif()
# Install hip_hcc if platform is hcc
if(HIP_PLATFORM STREQUAL "hcc")
install(TARGETS hip_hcc_static hip_hcc hip_device DESTINATION lib)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/hip_hc.ll DESTINATION lib)

# Install .hipInfo
install(FILES ${PROJECT_BINARY_DIR}/.hipInfo DESTINATION lib)
Expand Down
5 changes: 2 additions & 3 deletions bin/hipcc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,7 @@ if($HIP_PLATFORM eq "hcc"){
}

if(($HIP_PLATFORM eq "hcc")){
$ENV{HCC_EXTRA_LIBRARIES}="$HIP_PATH/lib/hip_hc.ll\n";
$ENV{HIP_HC_IR_FILE}="";
$ENV{HCC_EXTRA_LIBRARIES}="\n";
}

if($HIP_PLATFORM eq "nvcc"){
Expand Down Expand Up @@ -533,7 +532,7 @@ if($HIP_PLATFORM eq "hcc" or $HIP_PLATFORM eq "clang"){
print "No valid AMD GPU target was either specified or found. Please specify a valid target using --amdgpu-target=" and die();
}

$ENV{HCC_EXTRA_LIBRARIES}="$HIP_PATH/lib/hip_hc.ll\n";
$ENV{HCC_EXTRA_LIBRARIES}="\n";

if($HIP_PLATFORM eq "hcc") {
$GPU_ARCH_OPT = " --amdgpu-target=";
Expand Down
Loading