Initial changes to add packaging code

CMakeLists.txt

@@ -46,14 +46,14 @@ add_definitions(-DHSA_DEPRECATED=)
 
 # Enable debug trace
 if(DEFINED ENV{CMAKE_DEBUG_TRACE})
-  add_definitions (-DDEBUG_TRACE=1)
+  add_definitions(-DDEBUG_TRACE=1)
 endif()
 
-
 # Linux Compiler options
 set(CMAKE_CXX_FLAGS "-std=c++11")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-dev")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type")
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
@@ -67,7 +67,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-threadsafe-statics")
 
 # CLANG options
 if("$ENV{CXX}" STREQUAL "/usr/bin/clang++")
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ferror-limit=1000000")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ferror-limit=1000000")
 endif()
 
 set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bdynamic -Wl,-z,noexecstack")
@@ -122,6 +122,25 @@ if(NOT EXISTS ${ROCR_LIB_DIR}/${CORE_RUNTIME_LIBRARY}.so)
   RETURN()
 endif()
 
+# Add cmake_modules to default module path if it is not
+# already set and include utils from cmake modules
+if(NOT DEFINED CMAKE_MODULE_PATH)
+  set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/")
+endif()
+include(utils)
+
+#
+# Set the package version for the test. It is critical that this
+# value track what is used in the test source. The code from utils
+# module will parse the string into major, minor and patch sub-fields
+#
+get_version("1.0.0")
+
+# Bind the Major, Minor and Patch values
+set(BUILD_VERSION_MAJOR ${VERSION_MAJOR})
+set(BUILD_VERSION_MINOR ${VERSION_MINOR})
+set(BUILD_VERSION_PATCH ${VERSION_PATCH})
+
 # Basic Tool Chain Information
 message(" ")
 message("----------------NBIT: ${NBIT}")
@@ -134,17 +153,43 @@ message("-----CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
 message("---CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")
 message(" ")
 
+# Specify name of project to build, install and package
 set(PROJECT_NAME "rocm_bandwidth_test")
 set(TEST_NAME "${PROJECT_NAME}")
 project(${PROJECT_NAME})
 
+# Add directories to look for header files to compile
 INCLUDE_DIRECTORIES(${ROCR_INC_DIR})
 
+# Add directories to look for library files to link 
 LINK_DIRECTORIES(${ROCR_LIB_DIR})
 
 # Add sources that belong to the project
 aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} Src)
 
+# Build and link the test program
 add_executable(${TEST_NAME} ${Src})
 target_link_libraries(${TEST_NAME} ${CORE_RUNTIME_TARGET} ${ROC_THUNK_NAME} c stdc++ dl pthread rt)
 
+# Add install directives for rocm_bandwidth_test
+install(TARGETS ${TEST_NAME} RUNTIME DESTINATION bin)
+
+# Add packaging directives for rocm_bandwidth_test
+set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
+set(CPACK_PACKAGE_VENDOR "AMD")
+set(CPACK_PACKAGE_VERSION_MAJOR ${BUILD_VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${BUILD_VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${BUILD_VERSION_PATCH})
+set(CPACK_PACKAGE_CONTACT "Advanced Micro Devices Inc.")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Test to measure PciE bandwidth on ROCm platforms")
+
+# Debian package specific variables
+set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/RadeonOpenCompute/rocm_bandwidth_test")
+
+# RPM package specific variables
+if(DEFINED CPACK_PACKAGING_INSTALL_PREFIX)
+  set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/bin")
+endif()
+
+include(CPack)
+

cmake_modules/utils.cmake

+################################################################################
+##
+## The University of Illinois/NCSA
+## Open Source License (NCSA)
+##
+## Copyright (c) 2014-2017, 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.
+##
+################################################################################
+
+## Parses the VERSION_STRING variable and places
+## the first, second and third number values in
+## the major, minor and patch variables.
+function( parse_version VERSION_STRING )
+
+    string ( FIND ${VERSION_STRING} "-" STRING_INDEX )
+
+    if ( ${STRING_INDEX} GREATER -1 )
+        math ( EXPR STRING_INDEX "${STRING_INDEX} + 1" )
+        string ( SUBSTRING ${VERSION_STRING} ${STRING_INDEX} -1 VERSION_BUILD )
+    endif ()
+
+    string ( REGEX MATCHALL "[0123456789]+" VERSIONS ${VERSION_STRING} )
+    list ( LENGTH VERSIONS VERSION_COUNT )
+
+    if ( ${VERSION_COUNT} GREATER 0)
+        list ( GET VERSIONS 0 MAJOR )
+        set ( VERSION_MAJOR ${MAJOR} PARENT_SCOPE )
+        set ( TEMP_VERSION_STRING "${MAJOR}" )
+    endif ()
+
+    if ( ${VERSION_COUNT} GREATER 1 )
+        list ( GET VERSIONS 1 MINOR )
+        set ( VERSION_MINOR ${MINOR} PARENT_SCOPE )
+        set ( TEMP_VERSION_STRING "${TEMP_VERSION_STRING}.${MINOR}" )
+    endif ()
+
+    if ( ${VERSION_COUNT} GREATER 2 )
+        list ( GET VERSIONS 2 PATCH )
+        set ( VERSION_PATCH ${PATCH} PARENT_SCOPE )
+        set ( TEMP_VERSION_STRING "${TEMP_VERSION_STRING}.${PATCH}" )
+    endif ()
+
+    if ( DEFINED VERSION_BUILD )
+        set ( VERSION_BUILD "${VERSION_BUILD}" PARENT_SCOPE )
+    endif ()
+
+    set ( VERSION_STRING "${TEMP_VERSION_STRING}" PARENT_SCOPE )
+
+endfunction ()
+
+## Gets the current version of the repository
+## using versioning tags and git describe.
+## Passes back a packaging version string
+## and a library version string.
+function ( get_version DEFAULT_VERSION_STRING )
+
+    parse_version ( ${DEFAULT_VERSION_STRING} )
+
+    find_program ( GIT NAMES git )
+
+    if ( GIT )
+
+        execute_process ( COMMAND "git describe --dirty --long --match [0-9]* 2> /dev/null"
+                          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                          OUTPUT_VARIABLE GIT_TAG_STRING
+                          OUTPUT_STRIP_TRAILING_WHITESPACE
+                          RESULT_VARIABLE RESULT )
+
+        if ( ${RESULT} EQUAL 0 )
+
+            parse_version ( ${GIT_TAG_STRING} )
+
+        endif ()
+
+    endif ()
+
+    set( VERSION_STRING "${VERSION_STRING}" PARENT_SCOPE )
+    set( VERSION_MAJOR  "${VERSION_MAJOR}" PARENT_SCOPE )
+    set( VERSION_MINOR  "${VERSION_MINOR}" PARENT_SCOPE )
+    set( VERSION_PATCH  "${VERSION_PATCH}" PARENT_SCOPE )
+    set( VERSION_BUILD  "${VERSION_BUILD}" PARENT_SCOPE )
+
+endfunction()