From 1b30c322f07837728f2809d2efeb234292f459e7 Mon Sep 17 00:00:00 2001 From: James Edwards Date: Fri, 30 Sep 2016 13:02:30 -0500 Subject: [PATCH] Remove unneeded CMakeList.txt file. Move link and def files. Change-Id: I219317496aa564bde488a8e56e7d83808ebddb66 --- runtime/hsa-runtime/CMakeLists.txt | 6 +- runtime/hsa-runtime/core/CMakeLists.txt | 133 ------------------ runtime/hsa-runtime/{core => }/hsacore.so.def | 0 .../hsa-runtime/{core => }/hsacore.so.link | 0 4 files changed, 3 insertions(+), 136 deletions(-) delete mode 100644 runtime/hsa-runtime/core/CMakeLists.txt rename runtime/hsa-runtime/{core => }/hsacore.so.def (100%) rename runtime/hsa-runtime/{core => }/hsacore.so.link (100%) diff --git a/runtime/hsa-runtime/CMakeLists.txt b/runtime/hsa-runtime/CMakeLists.txt index 852a5d23a3..b3b8b107d0 100644 --- a/runtime/hsa-runtime/CMakeLists.txt +++ b/runtime/hsa-runtime/CMakeLists.txt @@ -3,7 +3,7 @@ ## The University of Illinois/NCSA ## Open Source License (NCSA) ## -## Copyright (c) 2014-2015, Advanced Micro Devices, Inc. All rights reserved. +## Copyright (c) 2014-2016, Advanced Micro Devices, Inc. All rights reserved. ## ## Developed by: ## @@ -116,9 +116,9 @@ endif () ## ------------------------- Linux Compiler and Linker options ------------------------- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -fexceptions -fno-rtti -fvisibility=hidden -Wno-error=sign-compare -Wno-sign-compare -Wno-write-strings -Wno-conversion-null -fno-math-errno -fno-threadsafe-statics -fmerge-all-constants -fms-extensions -Wno-error=comment -Wno-comment -Wno-error=pointer-arith -Wno-pointer-arith -Wno-error=unused-variable -Wno-error=unused-but-set-variable -Wno-error=unused-function" ) -set ( DRVDEF "${CMAKE_CURRENT_SOURCE_DIR}/core/hsacore.so.def" ) +set ( DRVDEF "${CMAKE_CURRENT_SOURCE_DIR}/hsacore.so.def" ) -set ( LNKSCR "${CMAKE_CURRENT_SOURCE_DIR}/core/hsacore.so.link" ) +set ( LNKSCR "${CMAKE_CURRENT_SOURCE_DIR}/hsacore.so.link" ) set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bdynamic -Wl,-z,noexecstack -Wl,${LNKSCR} -Wl,--version-script=${DRVDEF}" ) diff --git a/runtime/hsa-runtime/core/CMakeLists.txt b/runtime/hsa-runtime/core/CMakeLists.txt deleted file mode 100644 index f078e79571..0000000000 --- a/runtime/hsa-runtime/core/CMakeLists.txt +++ /dev/null @@ -1,133 +0,0 @@ -################################################################################ -## -## The University of Illinois/NCSA -## Open Source License (NCSA) -## -## Copyright (c) 2014-2015, Advanced Micro Devices, Inc. All rights reserved. -## -## Developed by: -## -## AMD Research and AMD HSA Software Development -## -## Advanced Micro Devices, Inc. -## -## www.amd.com -## -## Permission is hereby granted, free of charge, to any person obtaining a copy -## of this software and associated documentation files (the "Software"), to -## deal with the Software without restriction, including without limitation -## the rights to use, copy, modify, merge, publish, distribute, sublicense, -## and#or sell copies of the Software, and to permit persons to whom the -## Software is furnished to do so, subject to the following conditions: -## -## - Redistributions of source code must retain the above copyright notice, -## this list of conditions and the following disclaimers. -## - Redistributions in binary form must reproduce the above copyright -## notice, this list of conditions and the following disclaimers in -## the documentation and#or other materials provided with the distribution. -## - Neither the names of Advanced Micro Devices, Inc, -## nor the names of its contributors may be used to endorse or promote -## products derived from this Software without specific prior written -## permission. -## -## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -## IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -## THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -## OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -## ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -## DEALINGS WITH THE SOFTWARE. -## -################################################################################ - -cmake_minimum_required ( VERSION 2.8.0 ) -## GCC 4.8 or higher compiler required. - -if ( WIN32 ) - MESSAGE ( FATAL_ERROR "Windows build is not supported." ) -endif () - -## Verbose output. -set ( CMAKE_VERBOSE_MAKEFILE on ) - -## Compiler preproc definitions. -add_definitions ( -D__linux__ ) -add_definitions ( -DHSA_EXPORT=1 ) -add_definitions ( -DHSA_EXPORT_FINALIZER=1 ) -add_definitions ( -DHSA_EXPORT_IMAGES=1 ) - -if ( DEFINED BUILDID ) - add_definitions ( -DROCR_BUILD_ID=${BUILDID} ) -else ( NOT DEFINED BUILDID ) - ## get date information based on UTC - full date - execute_process(COMMAND date --utc +%F WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE ROCR_BUILD_TIME OUTPUT_STRIP_TRAILING_WHITESPACE ) - ## get commit information - execute_process(COMMAND git rev-parse --short HEAD WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE ROCR_BUILD_COMMIT OUTPUT_STRIP_TRAILING_WHITESPACE ) - ## check dirty tree status - execute_process(COMMAND git diff --shortstat COMMAND wc -l WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE ROCR_DIRTY_TREE OUTPUT_STRIP_TRAILING_WHITESPACE ) - set ( BUILD_ID "${ROCR_BUILD_COMMIT}.${ROCR_BUILD_TIME}.${ROCR_DIRTY_TREE}" ) - add_definitions ( -DROCR_BUILD_ID=${BUILD_ID} ) -endif () - -## ------------------------- Linux Compiler and Linker options ------------------------- -set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -fexceptions -fno-rtti -fvisibility=hidden -Wno-error=sign-compare -Wno-sign-compare -Wno-write-strings -Wno-conversion-null -fno-math-errno -fno-threadsafe-statics -fmerge-all-constants -fms-extensions -Wno-error=comment -Wno-comment -Wno-error=pointer-arith -Wno-pointer-arith -Wno-error=unused-variable -Wno-error=unused-but-set-variable -Wno-error=unused-function" ) - -set ( DRVDEF "${CMAKE_CURRENT_SOURCE_DIR}/hsacore.so.def" ) - -set ( LNKSCR "${CMAKE_CURRENT_SOURCE_DIR}/hsacore.so.link" ) - -set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bdynamic -Wl,-z,noexecstack -Wl,${LNKSCR} -Wl,--version-script=${DRVDEF}" ) - -set ( CMAKE_SKIP_BUILD_RPATH TRUE ) - -## ------------------------- End Compiler and Linker options ---------------------------- - -## Source files. -set ( CORE_SRCS util/lnx/os_linux.cpp ) -set ( CORE_SRCS ${CORE_SRCS} util/small_heap.cpp ) -set ( CORE_SRCS ${CORE_SRCS} util/timer.cpp ) -set ( CORE_SRCS ${CORE_SRCS} runtime/amd_blit_kernel.cpp ) -set ( CORE_SRCS ${CORE_SRCS} runtime/amd_blit_sdma.cpp ) -set ( CORE_SRCS ${CORE_SRCS} runtime/amd_cpu_agent.cpp ) -set ( CORE_SRCS ${CORE_SRCS} runtime/amd_gpu_agent.cpp ) -set ( CORE_SRCS ${CORE_SRCS} runtime/amd_aql_queue.cpp ) -set ( CORE_SRCS ${CORE_SRCS} runtime/amd_loader_context.cpp ) -set ( CORE_SRCS ${CORE_SRCS} runtime/hsa_ven_amd_loader.cpp ) -set ( CORE_SRCS ${CORE_SRCS} runtime/amd_memory_region.cpp ) -set ( CORE_SRCS ${CORE_SRCS} runtime/amd_topology.cpp ) -set ( CORE_SRCS ${CORE_SRCS} runtime/default_signal.cpp ) -set ( CORE_SRCS ${CORE_SRCS} runtime/host_queue.cpp ) -set ( CORE_SRCS ${CORE_SRCS} runtime/hsa.cpp ) -set ( CORE_SRCS ${CORE_SRCS} runtime/hsa_api_trace.cpp ) -set ( CORE_SRCS ${CORE_SRCS} runtime/hsa_ext_amd.cpp ) -set ( CORE_SRCS ${CORE_SRCS} runtime/hsa_ext_interface.cpp ) -set ( CORE_SRCS ${CORE_SRCS} runtime/interrupt_signal.cpp ) -set ( CORE_SRCS ${CORE_SRCS} runtime/isa.cpp ) -set ( CORE_SRCS ${CORE_SRCS} runtime/runtime.cpp ) -set ( CORE_SRCS ${CORE_SRCS} runtime/signal.cpp ) -set ( CORE_SRCS ${CORE_SRCS} runtime/cache.cpp ) -set ( CORE_SRCS ${CORE_SRCS} common/shared.cpp ) -set ( CORE_SRCS ${CORE_SRCS} common/hsa_table_interface.cpp ) - -add_library ( ${CORE_RUNTIME_TARGET} SHARED ${CORE_SRCS} ) - -## Set the VERSION and SOVERSION values -if ( DEFINED VERSION_STRING ) - set_property ( TARGET ${CORE_RUNTIME_TARGET} PROPERTY VERSION "${RUNTIME_VERSION_STRING}" ) -endif () - -set_property ( TARGET ${CORE_RUNTIME_TARGET} PROPERTY SOVERSION "${RUNTIME_VERSION_MAJOR}" ) - -target_link_libraries ( ${CORE_RUNTIME_TARGET} - PRIVATE amdhsaloader - PRIVATE amdhsacode - PRIVATE hsakmt - dl pthread rt -) - -## If the build is Release, strip the target library -if ( "${CMAKE_BUILD_TYPE}" STREQUAL Release ) - add_custom_command ( TARGET ${CORE_RUNTIME_TARGET} POST_BUILD COMMAND ${CMAKE_STRIP} *.so ) -endif () - -install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION lib COMPONENT ${CORE_RUNTIME_COMPONENT} ) diff --git a/runtime/hsa-runtime/core/hsacore.so.def b/runtime/hsa-runtime/hsacore.so.def similarity index 100% rename from runtime/hsa-runtime/core/hsacore.so.def rename to runtime/hsa-runtime/hsacore.so.def diff --git a/runtime/hsa-runtime/core/hsacore.so.link b/runtime/hsa-runtime/hsacore.so.link similarity index 100% rename from runtime/hsa-runtime/core/hsacore.so.link rename to runtime/hsa-runtime/hsacore.so.link