AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

P4 to Git Change 1453266 by fdaniil@rocm_spec on 2017/08/30 12:27:36

Browse Source 
SWDEV-102733 - [OCL-LC-ROCm] Cmake build Write CMakeLists.txt to enable building with and without the DK environment

	Update from git http://git.amd.com:8080/#/c/103512/

	1. fixed ninja warning on multiple targets generating .inc files
	2. added libamdocl64.so and libOpenCL.so.1.2 libraries installation into install/lib
	3. added Khronos OpenCL headers installation into install/include
	4. added clinfo application installation int install/bin
	5. removed installation of dozens of LLVM libs and tools
	6. fixed minor misspellings in llvm options setup

Affected files ...

... //depot/stg/opencl/drivers/opencl/CMakeLists.txt#15 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/CMakeLists.txt#11 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/CMakeLists.txt#9 edit
... //depot/stg/opencl/drivers/opencl/tools/clinfo/CMakeLists.txt#3 edit
This commit is contained in:
foreman
2017-08-30 12:44:23 -04:00
parent b6c867ed8b
commit bd0e789f7c
3 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opencl/CMakeLists.txt
+17 -9
View File
@@ -14,14 +14,12 @@ set(CMAKE_MODULE_PATH
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
)
set(LLVM_INCLUDE_TESTS CACHE BOOL OFF)
set(LLVM_BUILD_TOOLS CACHE BOOL OFF)
set(LLVM_INCLUDE_TESTS OFF CACHE BOOL "")
set(LLVM_BUILD_TOOLS OFF CACHE BOOL "")
set(LLVM_INSTALL_TOOLCHAIN_ONLY ON CACHE BOOL "")
set(LLVM_TARGETS_TO_BUILD "AMDGPU" CACHE STRING "")
set(LLVM_ENABLE_PROJECTS CACHE STRING "clang")
set(LLVM_BUILD_GLOBAL_ISEL CACHE BOOL OFF)
set(LLVM_ENABLE_ZLIB OFF CACHE BOOL "")
set(CLANG_ENABLE_ARCMT CACHE BOOL OFF)
set(CLANG_ENABLE_STATIC_ANALYZER CACHE BOOL OFF)
set(CLANG_ENABLE_ARCMT OFF CACHE BOOL "")
set(CLANG_ENABLE_STATIC_ANALYZER OFF CACHE BOOL "")
add_subdirectory(compiler/llvm)
@@ -41,8 +39,8 @@ include_directories(${CMAKE_BINARY_DIR}/compiler/llvm/lib/Target/AMDGPU)
add_subdirectory(compiler/driver)
set(BUILD_HC_LIB CACHE BOOL OFF)
set(ROCM_DEVICELIB_INCLUDE_TESTS CACHE BOOL OFF)
set(BUILD_HC_LIB OFF CACHE BOOL "")
set(ROCM_DEVICELIB_INCLUDE_TESTS OFF CACHE BOOL "")
set(AMDGCN_TARGETS_LIB_LIST "AMDGCN_LIB_TARGETS")
set(AMDGPU_TARGET_TRIPLE "amdgcn-amd-amdhsa-opencl")
add_subdirectory(library/amdgcn)
@@ -60,3 +58,13 @@ add_subdirectory(api/opencl/amdocl)
add_subdirectory(api/opencl/khronos/icd)
add_subdirectory(tools/clinfo)
install(PROGRAMS $<TARGET_FILE:OpenCL>
DESTINATION lib)
install(DIRECTORY
"${CMAKE_CURRENT_SOURCE_DIR}/api/opencl/khronos/headers/opencl2.0"
DESTINATION include
USE_SOURCE_PERMISSIONS
PATTERN cl_egl.h EXCLUDE)
opencl/api/opencl/amdocl/CMakeLists.txt
+3 -1
View File
@@ -22,7 +22,7 @@ include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/loaders)
include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/loaders/elf/utils/libelf)
include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/loaders/elf/utils/common)
include_directories(${CMAKE_SOURCE_DIR}/compiler/tools)
add_library(amdocl64 SHARED
cl_memobj.cpp
cl_program.cpp
@@ -54,3 +54,5 @@ add_library(amdocl64 SHARED
)
target_link_libraries(amdocl64 opencl_driver oclelf pthread dl ${ROCR_LIBRARIES})
install(TARGETS amdocl64 LIBRARY DESTINATION lib)
opencl/tools/clinfo/CMakeLists.txt
+2
View File
@@ -9,3 +9,5 @@ add_definitions(-DHAVE_CL2_HPP)
add_executable(clinfo clinfo.cpp)
target_link_libraries(clinfo OpenCL)
install(TARGETS clinfo DESTINATION bin)