Fix memory leak in roctxRangePushA

.gitignore

@@ -5,6 +5,5 @@
 *.swp
 *.Po
 build
-test/hsa
 test/MatrixTranspose/MatrixTranspose
 test/MatrixTranspose_test/MatrixTranspose

CMakeLists.txt

@@ -195,6 +195,7 @@ else()
 endif()
 message ( "Using CPACK_DEBIAN_PACKAGE_RELEASE ${CPACK_DEBIAN_PACKAGE_RELEASE}" )
 set ( CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT" )
+set ( CPACK_DEBIAN_PACKAGE_DEPENDS "rocm-core" )
 ## Process the Debian install/remove scripts to update the CPACK variables
 configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/DEBIAN/postinst.in DEBIAN/postinst @ONLY )
 configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/DEBIAN/prerm.in DEBIAN/prerm @ONLY )
@@ -221,7 +222,14 @@ if ( PROC_RESULT EQUAL "0" AND NOT EVAL_RESULT STREQUAL "" )
   string ( APPEND CPACK_RPM_PACKAGE_RELEASE "%{?dist}" )
 endif()
 set ( CPACK_RPM_FILE_NAME "RPM-DEFAULT" )
+set ( CPACK_RPM_PACKAGE_REQUIRES "rocm-core" )
 message("CPACK_RPM_PACKAGE_RELEASE: ${CPACK_RPM_PACKAGE_RELEASE}")
+
+if(NOT ROCM_DEP_ROCMCORE)
+    string(REGEX REPLACE ",? ?rocm-core" "" CPACK_RPM_PACKAGE_REQUIRES ${CPACK_RPM_PACKAGE_REQUIRES})
+    string(REGEX REPLACE ",? ?rocm-core" "" CPACK_DEBIAN_PACKAGE_DEPENDS ${CPACK_DEBIAN_PACKAGE_DEPENDS})
+endif()
+
 ## Process the Rpm install/remove scripts to update the CPACK variables
 configure_file ( "${CMAKE_CURRENT_SOURCE_DIR}/RPM/post.in" RPM/post @ONLY )
 configure_file ( "${CMAKE_CURRENT_SOURCE_DIR}/RPM/postun.in" RPM/postun @ONLY )

README.md

@@ -62,7 +62,10 @@ rocTX API:
 
  - To build roctracer library:
   export CMAKE_BUILD_TYPE=<debug|release> # release by default
+
   cd <your path>/roctracer && mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX=/opt/rocm .. && make -j <nproc>
+ or
+  ./build.sh
 
  - To build and run test:
   make mytest

src/core/roctracer.cpp

@@ -760,7 +760,7 @@ static inline uint32_t get_op_end(uint32_t domain) {
     case ACTIVITY_DOMAIN_HSA_API: return HSA_API_ID_NUMBER;
     case ACTIVITY_DOMAIN_HSA_EVT: return HSA_EVT_ID_NUMBER;
     case ACTIVITY_DOMAIN_HCC_OPS: return HIP_OP_ID_NUMBER;
-    case ACTIVITY_DOMAIN_HIP_API: return HIP_API_ID_LAST + 1;;
+    case ACTIVITY_DOMAIN_HIP_API: return HIP_API_ID_LAST + 1;
     case ACTIVITY_DOMAIN_EXT_API: return 0;
     case ACTIVITY_DOMAIN_ROCTX: return ROCTX_API_ID_NUMBER;
     default:

src/roctx/roctx.cpp

@@ -140,7 +140,7 @@ PUBLIC_API int roctxRangePushA(const char* message) {
   void* api_callback_arg = NULL;
   roctx::cb_table.get(ROCTX_API_ID_roctxRangePushA, &api_callback_fun, &api_callback_arg);
   if (api_callback_fun) api_callback_fun(ACTIVITY_DOMAIN_ROCTX, ROCTX_API_ID_roctxRangePushA, &api_data, api_callback_arg);
-  roctx::message_stack->push(strdup(message));
+  roctx::message_stack->emplace(message);
 
   return roctx::message_stack->size() - 1;
   API_METHOD_CATCH(-1);

test/CMakeLists.txt

@@ -44,7 +44,6 @@ endif ()
 
 ## Path to HSA test
 set ( HSA_TEST_DIR "${TEST_DIR}/hsa/test" )
-set ( HSA_REV "f8b3870" )
 
 ## test run script
 set ( RUN_SCRIPT "${TEST_DIR}/run.sh" )
@@ -70,8 +69,6 @@ add_custom_target( mytest
 )
 
 ## Build HSA test
-execute_process ( COMMAND sh -xc "if [ ! -e ${TEST_DIR}/hsa ] ; then git clone https://github.com/ROCmSoftwarePlatform/hsa-class.git ${TEST_DIR}/hsa; fi" )
-execute_process ( COMMAND sh -xc "if [ -e ${TEST_DIR}/hsa ] ; then cd ${TEST_DIR}/hsa && git fetch origin && git checkout ${HSA_REV}; fi" )
 set ( TMP ${TEST_DIR} )
 set ( TEST_DIR ${HSA_TEST_DIR} )
 add_subdirectory ( ${HSA_TEST_DIR} ${PROJECT_BINARY_DIR}/test/hsa )

test/hsa/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2018 Advanced Micro Devices, Inc. All rights reserved.
+[MITx11 license]
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in 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:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+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
+AUTHORS 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 IN
+THE SOFTWARE.

test/hsa/README.md

@@ -0,0 +1,4 @@
+# HSA-class
+```
+HSA high level C++ API
+```

test/hsa/script/build_kernel.sh

@@ -0,0 +1,80 @@
+#!/bin/sh -x
+SO_EXT="hsaco"
+
+TEST_NAME=$1
+DST_DIR=$2
+ROCM_DIR=$3
+TGT_LIST=$4
+
+if [ -z "$TEST_NAME" ] ; then
+  echo "Usage: $0 <test name> <dst dir>"
+  echo "  Will look for <test name>.cl and will build <test name>.$SO_EXT dynamic code object library"
+  exit 1
+fi
+OBJ_NAME=$(echo "_$(basename $TEST_NAME)" | sed -e 's/_./\U&\E/g' -e 's/_//g')
+
+if [ -z "$DST_DIR" ] ; then
+  DST_DIR=$(dirname TEST_NAME)
+fi
+
+if [ -z "$ROCM_DIR" ] ; then
+  ROCM_DIR=/opt/rocm
+fi
+
+if [ -z "$TGT_LIST" ] ; then
+  TGT_LIST=`$ROCM_DIR/bin/rocminfo | grep "amdgcn-amd-amdhsa--" | head -n 1 | sed -n "s/^.*amdgcn-amd-amdhsa--\(\w*\).*$/\1/p"`
+fi
+
+if [ -z "$TGT_LIST" ] ; then
+  echo "Error: GPU targets not found"
+  exit 1
+fi
+
+OCL_VER="2.0"
+
+if [ -e $ROCM_DIR/llvm ] ; then
+  LLVM_DIR=$ROCM_DIR/llvm
+  LIB_DIR=$ROCM_DIR/lib
+else
+  LLVM_DIR=$ROCM_DIR/hcc
+  LIB_DIR=$LLVM_DIR/lib
+fi
+
+# Determine whether using new or old device-libs layout
+if [ -e $LIB_DIR/bitcode/opencl.amdgcn.bc ]; then
+  BC_DIR=$LIB_DIR/bitcode
+elif [ -e $LIB_DIR/opencl.amdgcn.bc ]; then
+  BC_DIR=$LIB_DIR
+elif [ -e $ROCM_DIR/amdgcn/bitcode/opencl.bc ]; then
+  BC_DIR=$ROCM_DIR/amdgcn/bitcode
+else
+  echo "Error: Cannot find amdgcn bitcode directory"
+  exit 1
+fi
+
+CLANG_ROOT=$LLVM_DIR/lib/clang
+CLANG_DIR=`ls -d $CLANG_ROOT/* | head -n 1`
+if [ "$CLANG_DIR" = "" ] ; then
+  echo "Error: LLVM clang library was not found"
+  exit 1
+fi
+
+BIN_DIR=$LLVM_DIR/bin
+INC_DIR=$CLANG_DIR/include
+if [ -e $BC_DIR/opencl.amdgcn.bc ]; then
+  BITCODE_OPTS="-nogpulib \
+    -Xclang -mlink-bitcode-file -Xclang $BC_DIR/opencl.amdgcn.bc \
+    -Xclang -mlink-bitcode-file -Xclang $BC_DIR/ockl.amdgcn.bc \
+    -Xclang -mlink-bitcode-file -Xclang $BC_DIR/ocml.amdgcn.bc"
+else
+  BITCODE_OPTS="--hip-device-lib-path=$BC_DIR"
+fi
+
+for GFXIP in $TGT_LIST ; do
+  OBJ_PREF=$GFXIP
+  OBJ_FILE="${OBJ_PREF}_${OBJ_NAME}.$SO_EXT"
+  $BIN_DIR/clang -cl-std=CL$OCL_VER -include $INC_DIR/opencl-c.h $BITCODE_OPTS -target amdgcn-amd-amdhsa -mcpu=$GFXIP $TEST_NAME.cl -o $DST_DIR/$OBJ_FILE
+  echo "'$OBJ_FILE' generated"
+done
+
+exit 0