From b4c244f4b8c8778ab6307b2ff6622d162bc89f5f Mon Sep 17 00:00:00 2001 From: foreman Date: Mon, 29 May 2017 18:12:58 -0400 Subject: [PATCH] P4 to Git Change 1415531 by fdaniil@rocm_spec on 2017/05/29 18:01:59 SWDEV-102733 - [OCL-LC-ROCm] Cmake build Write CMakeLists.txt to enable building with and without the DK environment - Update from git. Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/CMakeLists.txt#6 edit --- rocclr/runtime/device/rocm/CMakeLists.txt | 36 ++++++++++------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/rocclr/runtime/device/rocm/CMakeLists.txt b/rocclr/runtime/device/rocm/CMakeLists.txt index 4ef88c3ad1..35513b90cd 100644 --- a/rocclr/runtime/device/rocm/CMakeLists.txt +++ b/rocclr/runtime/device/rocm/CMakeLists.txt @@ -1,7 +1,4 @@ -foreach(AMDGCN_LIB_TARGET ${AMDGCN_LIB_TARGETS}) - get_target_property(lib_file_name ${AMDGCN_LIB_TARGET} ARCHIVE_OUTPUT_NAME) - list(APPEND headers "${lib_file_name}.amdgcn.inc") -endforeach(AMDGCN_LIB_TARGET ${AMDGCN_LIB_TARGETS}) +set(INC_SUFFIX "amdgcn.inc") include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/loaders/elf/utils/common) include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/loaders/elf/utils/libelf) @@ -19,20 +16,17 @@ add_library(oclrocm OBJECT rocglinterop.cpp rocappprofile.cpp rocsettings.cpp - libraries.amdgcn.inc - opencl1.2-c.amdgcn.inc - opencl2.0-c.amdgcn.inc - ${headers} ) set_target_properties(oclrocm PROPERTIES POSITION_INDEPENDENT_CODE ON) +# generating libraries.amdgcn.inc file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/libraries.amdgcn.inc "// Automatically generated file; DO NOT EDIT.\n") foreach(AMDGCN_LIB_TARGET ${AMDGCN_LIB_TARGETS}) get_target_property(lib_file_name ${AMDGCN_LIB_TARGET} ARCHIVE_OUTPUT_NAME) get_target_property(lib_file_path ${AMDGCN_LIB_TARGET} ARCHIVE_OUTPUT_DIRECTORY) set(bclib "${lib_file_path}/${lib_file_name}.lib.bc") - set(header "${lib_file_name}.amdgcn.inc") + set(header "${lib_file_name}.${INC_SUFFIX}") set(symbol "${lib_file_name}_amdgcn") add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${header} COMMAND bc2h ${bclib} ${CMAKE_CURRENT_BINARY_DIR}/${header} ${symbol} @@ -42,17 +36,16 @@ foreach(AMDGCN_LIB_TARGET ${AMDGCN_LIB_TARGETS}) set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/${target}.inc) add_custom_target(${header} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${header}) - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${header} PROPERTIES HEADER_FILE_ONLY TRUE) + add_dependencies(oclrocm ${header}) file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libraries.amdgcn.inc "#include \"${header}\"\n") endforeach() file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libraries.amdgcn.inc "static inline std::pair\nget_oclc_isa_version(uint gfxip)\n{\nswitch (gfxip) {\n") -foreach(file ${headers}) - string(REGEX MATCH "oclc_isa_version_(.*).amdgcn.inc" isa ${file}) - if (NOT "${isa}" STREQUAL "") - string(REGEX REPLACE "oclc_isa_version_(.*).amdgcn.inc" "\\1" gfxip ${file}) +foreach(AMDGCN_LIB_TARGET ${AMDGCN_LIB_TARGETS}) + if (${AMDGCN_LIB_TARGET} MATCHES "^oclc_isa_version_[0-9]+_lib$") + string(REGEX REPLACE "^oclc_isa_version_([0-9]+)_lib$" "\\1" gfxip ${AMDGCN_LIB_TARGET}) file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libraries.amdgcn.inc "case ${gfxip}: return std::make_pair(oclc_isa_version_${gfxip}_amdgcn, oclc_isa_version_${gfxip}_amdgcn_size); break;\n") endif() @@ -60,10 +53,9 @@ endforeach() file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libraries.amdgcn.inc "default: return std::make_pair((const void*)0,(size_t)0);\n}\n}\n") -foreach(file ${headers}) - string(REGEX MATCH "oclc_(.*)_on.amdgcn.inc" is_control ${file}) - if (NOT "${is_control}" STREQUAL "") - string(REGEX REPLACE "oclc_(.*)_on.amdgcn.inc" "\\1" function ${file}) +foreach(AMDGCN_LIB_TARGET ${AMDGCN_LIB_TARGETS}) + if (${AMDGCN_LIB_TARGET} MATCHES "oclc_(.*)_on_lib") + string(REGEX REPLACE "oclc_(.*)_on_lib" "\\1" function ${AMDGCN_LIB_TARGET}) file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libraries.amdgcn.inc "static inline std::pair get_oclc_${function}(bool on)\n{ return std::make_pair(" "(const char*)(on ? oclc_${function}_on_amdgcn : oclc_${function}_off_amdgcn)," @@ -71,6 +63,7 @@ foreach(file ${headers}) endif() endforeach() +# generating opencl*.inc files add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/opencl1.2-c.amdgcn.pch COMMAND clang -cc1 -x cl-header -triple amdgcn-amd-amdhsa-opencl -Werror -O3 -Dcl_khr_fp64 -Dcl_khr_fp16 -DNDEBUG -cl-std=CL1.2 -emit-pch -o ${CMAKE_CURRENT_BINARY_DIR}/opencl1.2-c.amdgcn.pch < ${CMAKE_SOURCE_DIR}/compiler/llvm/tools/clang/lib/Headers/opencl-c.h DEPENDS clang ${CMAKE_SOURCE_DIR}/compiler/llvm/tools/clang/lib/Headers/opencl-c.h @@ -81,7 +74,9 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/opencl1.2-c.amdgcn.inc DEPENDS bc2h ${CMAKE_CURRENT_BINARY_DIR}/opencl1.2-c.amdgcn.pch COMMENT "Generating opencl1.2-c.amdgcn.inc" ) -set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.amdgcn.inc ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.amdgcn.pch) +set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/opencl1.2-c.amdgcn.inc ${CMAKE_CURRENT_BINARY_DIR}/opencl1.2-c.amdgcn.pch) +add_custom_target(opencl1.2-c.amdgcn.inc ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/opencl1.2-c.amdgcn.inc) +add_dependencies(oclrocm opencl1.2-c.amdgcn.inc) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.amdgcn.pch COMMAND clang -cc1 -x cl-header -triple amdgcn-amd-amdhsa-opencl -Werror -O3 -Dcl_khr_fp64 -Dcl_khr_fp16 -DNDEBUG -cl-std=CL2.0 -emit-pch -o ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.amdgcn.pch < ${CMAKE_SOURCE_DIR}/compiler/llvm/tools/clang/lib/Headers/opencl-c.h @@ -94,4 +89,5 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.amdgcn.inc COMMENT "Generating opencl2.0-c.amdgcn.inc" ) set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.amdgcn.inc ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.amdgcn.pch) - +add_custom_target(opencl2.0-c.amdgcn.inc ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.amdgcn.inc) +add_dependencies(oclrocm opencl2.0-c.amdgcn.inc) \ No newline at end of file