From a7c8c754e4d701a11182edc9c5ae92fd1425d5da Mon Sep 17 00:00:00 2001 From: foreman Date: Tue, 16 May 2017 16:06:16 -0400 Subject: [PATCH] P4 to Git Change 1410307 by lmoriche@lmoriche_palamida on 2017/05/16 15:09:08 SWDEV-102733 - [OCL-LC-ROCm] Cmake build Write CMakeLists.txt to enable building with and without the DK environment - Fix the build breakage caused by the latest changes from device-libs. Affected files ... ... //depot/stg/opencl/drivers/opencl/CMakeLists.txt#7 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_platform.h#8 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/CMakeLists.txt#4 edit [ROCm/clr commit: df4503304729321dc58612a99fd12d2703fdad01] --- projects/clr/rocclr/CMakeLists.txt | 5 +---- projects/clr/rocclr/runtime/device/rocm/CMakeLists.txt | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/projects/clr/rocclr/CMakeLists.txt b/projects/clr/rocclr/CMakeLists.txt index 9396d5fd4b..b54fd4298b 100644 --- a/projects/clr/rocclr/CMakeLists.txt +++ b/projects/clr/rocclr/CMakeLists.txt @@ -8,7 +8,7 @@ endif() project(OpenCL-ROCm) set(LLVM_INCLUDE_TESTS CACHE BOOL OFF) -set(LLVM_TARGETS_TO_BUILD "AMDGPU" "X86" CACHE STRING "") +set(LLVM_TARGETS_TO_BUILD "AMDGPU" CACHE STRING "") set(LLVM_ENABLE_PROJECTS CACHE STRING "clang") set(LLVM_BUILD_GLOBAL_ISEL CACHE BOOL OFF) set(CLANG_ENABLE_ARCMT CACHE BOOL OFF) @@ -32,7 +32,6 @@ include_directories(${CMAKE_BINARY_DIR}/compiler/llvm/lib/Target/AMDGPU) add_subdirectory(compiler/driver) -set(CMAKE_C_COMPILER "${PROJECT_BINARY_DIR}/compiler/llvm/bin/clang") set(BUILD_HC_LIB CACHE BOOL OFF) set(ROCM_DEVICELIB_INCLUDE_TESTS CACHE BOOL OFF) add_subdirectory(library/amdgcn) @@ -40,8 +39,6 @@ add_subdirectory(library/amdgcn) add_subdirectory(compiler/lib/loaders/elf/utils/libelf) add_subdirectory(tools/bc2h) -add_dependencies(bc2h clang) # FIXME: remove -add_dependencies(oclelf clang) # FIXME: remove add_subdirectory(runtime) add_subdirectory(api/opencl/amdocl) diff --git a/projects/clr/rocclr/runtime/device/rocm/CMakeLists.txt b/projects/clr/rocclr/runtime/device/rocm/CMakeLists.txt index 2641622290..888e083f65 100644 --- a/projects/clr/rocclr/runtime/device/rocm/CMakeLists.txt +++ b/projects/clr/rocclr/runtime/device/rocm/CMakeLists.txt @@ -56,7 +56,7 @@ foreach(header ${headers}) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${target}.inc COMMAND bc2h ${bclib} ${CMAKE_CURRENT_BINARY_DIR}/${target}.inc ${symbol} - DEPENDS ${bclib} ${lib_bc}_lib_bc + DEPENDS ${bclib} ${lib_bc}_lib COMMENT "Generating ${target}.inc" ) set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/${target}.inc) @@ -65,7 +65,6 @@ foreach(header ${headers}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${target}.inc PROPERTIES HEADER_FILE_ONLY TRUE) string(REGEX REPLACE ".amdgcn.inc$" "" lib_bc ${header}) - #add_dependencies(${target}.inc ${lib_bc}_lib_bc) endforeach() file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/libraries.amdgcn.inc "// Automatically generated file; DO NOT EDIT.\n")