compiling for CentOS support

Change-Id: I0c01b4f34ac3701b5cea324e2e2a34835163aee0

CMakeLists.txt

@@ -22,7 +22,7 @@
 ## SOFTWARE.
 ################################################################################
 
-cmake_minimum_required ( VERSION 3.5.0 )
+cmake_minimum_required ( VERSION 2.8.12 )
 
 ## Verbose output.
 set ( CMAKE_VERBOSE_MAKEFILE TRUE CACHE BOOL "Verbose Output" FORCE )

cmake_modules/env.cmake

@@ -51,6 +51,7 @@ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fmerge-all-constants" )
 set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fms-extensions" )
 set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fmerge-all-constants" )
 set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=unused-result" )
+#set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=int-in-bool-context" )
 set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC" )
 
 set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bdynamic -Wl,-z,noexecstack" )

src/util/exception.h

@@ -32,27 +32,27 @@ SOFTWARE.
 #include <string>
 
 #define EXC_ABORT(error, stream)                                                                   \
-  {                                                                                                \
+  do {                                                                                             \
     std::ostringstream oss;                                                                        \
     oss << __FUNCTION__ << "(), " << stream;                                                       \
-    std::cout << oss.str() << std::endl;                                                           \
+    std::cout << "error(" << error << ") \"" << oss.str() << "\"" << std::endl;                    \
     abort();                                                                                       \
-  }
+  } while (0)
 
 #define EXC_RAISING(error, stream)                                                                 \
-  {                                                                                                \
+  do {                                                                                             \
     std::ostringstream oss;                                                                        \
     oss << __FUNCTION__ << "(), " << stream;                                                       \
     throw rocprofiler::util::exception(error, oss.str());                                          \
-  }
+  } while (0)
 
 #define AQL_EXC_RAISING(error, stream)                                                             \
-  {                                                                                                \
+  do {                                                                                             \
     const char* error_string = NULL;                                                               \
     const rocprofiler::pfn_t* api = rocprofiler::util::HsaRsrcFactory::Instance().AqlProfileApi(); \
     api->hsa_ven_amd_aqlprofile_error_string(&error_string);                                       \
     EXC_RAISING(error, stream << ", " << error_string);                                            \
-  }
+  } while (0)
 
 namespace rocprofiler {
 namespace util {

src/util/hsa_rsrc_factory.h

@@ -45,21 +45,23 @@ SOFTWARE.
 #define HSA_QUEUE_ALIGN_BYTES 64
 #define HSA_PACKET_ALIGN_BYTES 64
 
-#define CHECK_STATUS(msg, status)                                                                  \
-  if (status != HSA_STATUS_SUCCESS) {                                                              \
+#define CHECK_STATUS(msg, status) do {                                                             \
+  if ((status) != HSA_STATUS_SUCCESS) {                                                            \
     const char* emsg = 0;                                                                          \
     hsa_status_string(status, &emsg);                                                              \
     printf("%s: %s\n", msg, emsg ? emsg : "<unknown error>");                                      \
     exit(1);                                                                                       \
-  }
+  }                                                                                                \
+} while (0)
 
-#define CHECK_ITER_STATUS(msg, status)                                                             \
-  if (status != HSA_STATUS_INFO_BREAK) {                                                           \
+#define CHECK_ITER_STATUS(msg, status) do {                                                        \
+  if ((status) != HSA_STATUS_INFO_BREAK) {                                                         \
     const char* emsg = 0;                                                                          \
     hsa_status_string(status, &emsg);                                                              \
     printf("%s: %s\n", msg, emsg ? emsg : "<unknown error>");                                      \
     exit(1);                                                                                       \
-  }
+  }                                                                                                \
+} while (0)
 
 namespace rocprofiler {
 namespace util {

test/CMakeLists.txt

@@ -22,7 +22,7 @@
 ## SOFTWARE.
 ################################################################################
 
-cmake_minimum_required ( VERSION 3.5.0 )
+cmake_minimum_required ( VERSION 2.8.12 )
 set ( CMAKE_VERBOSE_MAKEFILE TRUE CACHE BOOL "Verbose Output" FORCE )
 
 set ( EXE_NAME "ctrl" )
@@ -51,7 +51,7 @@ execute_process ( COMMAND sh -xc "cp ${TEST_DIR}/${TEST_NAME}/*.hsaco ${PROJECT_
 ## Building test executable
 add_executable ( ${EXE_NAME} ${KERN_SRC} ${CTRL_SRC} ${UTIL_SRC} )
 target_include_directories ( ${EXE_NAME} PRIVATE ${TEST_DIR} ${ROOT_DIR} ${HSA_RUNTIME_INC_PATH} )
-target_link_libraries( ${EXE_NAME} ${HSA_RUNTIME_LIB} ${HSA_KMT_LIB} c stdc++ dl pthread rt atomic )
+target_link_libraries( ${EXE_NAME} ${HSA_RUNTIME_LIB} ${HSA_KMT_LIB} c stdc++ dl pthread rt )
 execute_process ( COMMAND sh -xc "cp ${TEST_DIR}/run.sh ${PROJECT_BINARY_DIR}" )
 execute_process ( COMMAND sh -xc "cp ${TEST_DIR}/tool/*.xml ${PROJECT_BINARY_DIR}" )
 execute_process ( COMMAND sh -xc "mkdir -p ${PROJECT_BINARY_DIR}/RESULTS" )
@@ -61,4 +61,4 @@ set ( TEST_LIB "tool" )
 set ( TEST_LIB_SRC ${TEST_DIR}/tool/tool.cpp ${UTIL_SRC} )
 add_library ( ${TEST_LIB} SHARED ${TEST_LIB_SRC} )
 target_include_directories ( ${TEST_LIB} PRIVATE ${TEST_DIR} ${ROOT_DIR} ${HSA_RUNTIME_INC_PATH} )
-target_link_libraries ( ${TEST_LIB} ${ROCPROFILER_TARGET} ${HSA_RUNTIME_LIB} c stdc++ dl pthread rt atomic )
+target_link_libraries ( ${TEST_LIB} ${ROCPROFILER_TARGET} ${HSA_RUNTIME_LIB} c stdc++ dl pthread rt )