update compilation and installation

bin/gpupunk

@@ -22,6 +22,10 @@ export GPUPUNK_WITH_HPCRUN=0
 export GPUPUNK_VERBOSE=0
 # filter cubins
 export GPUPUNK_CUBIN_FILTER=1
+
+export SANITIZER_DISABLE_PARALLEL_LAUNCHES=1
+
+
 usage() {
     cat <<EOF
 Usage:

bin/install.sh

@@ -42,13 +42,8 @@ if [ ! -d spack ];then
 fi
 export SPACK_ROOT=$(pwd)/spack
 source ${SPACK_ROOT}/share/spack/setup-env.sh
-# This is necessary and used when statically compiling redshow.
-# mbedtls has to older than 2.28.0
-# spack install [email protected] [email protected] libs=shared [email protected]
 spack install boost mbedtls libs=shared elfutils
 check_status "spack install"
-# TODO: find a better solution for those packages' installation
-# spack load [email protected] [email protected]  [email protected]
 spack load boost mbedtls elfutils
 
 # Find spack and boost dir

bin/setgpupunk.sh

@@ -9,5 +9,13 @@ export REDSHOW_PATH=${GPUPUNK_PATH}/redshow
 export GPUTRIGGER_PATH=${GPUPUNK_PATH}/gputrigger
 export DRCCTPROF_PATH=${GPUPUNK_PATH}/drcctprof
 
-export LD_LIBRARY_PATH=${GPUTRIGGER_PATH}:${REDSHOW_PATH}/lib:$LD_LIBRARY_PATH
+SPACK_PATH=${SPACK_PATH:-$GPUPUNK_PATH/spack}
+source ${SPACK_PATH}/share/spack/setup-env.sh
+spack load boost mbedtls elfutils
+# @FindHao NOTE: this is a hack to get the path of the latest version of mbedtls
+B=$(spack find --path mbedtls | tail -n 1 | cut -d ' ' -f 3)
+S=${B%/*}
+echo "GPUPUNK-> mbedtls install path is " $B
+
+export LD_LIBRARY_PATH=$B/lib:${GPUTRIGGER_PATH}:${REDSHOW_PATH}/lib:$LD_LIBRARY_PATH
 export PATH=${GPUPUNK_PATH}/bin/:${DRCCTPROF_PATH}/bin:$PATH

cubin_filter/CMakeLists.txt

@@ -34,12 +34,10 @@ else ()
 endif ()
 enable_language(CUDA)
 
-include(FindLibElf.cmake)
+
 include(FindMbedTLS.cmake)
 
 message(INFO "==========")
-message(STATUS ${LIBELF_INCLUDE_DIRS})
-message(STATUS ${LIBELF_LIBRARIES_PATH})
 message(STATUS ${MBEDTLS_INCLUDE_DIRS})
 message(STATUS ${MBEDCRYPTO_LIBRARY_PATH})
 
@@ -49,7 +47,6 @@ include_directories(${SANITIZER_PATH}/include/
         ${CUDAToolkit_TARGET_DIR}/include/
         ${CMAKE_CURRENT_LIST_DIR}/include/
         ${CMAKE_CURRENT_LIST_DIR}/src/
-        ${LIBELF_INCLUDE_DIRS}
         ${MBEDTLS_INCLUDE_DIRS}
         )
 message(INFO ${SANITIZER_PATH} ${CUDAToolkit_NVCC_EXECUTABLE})
@@ -60,7 +57,7 @@ file(GLOB cubin_filter_head CONFIGURE_DEPENDS "${CMAKE_CURRENT_LIST_DIR}/*.h" )
 
 
 
-add_link_options(-L${LIBELF_LIBRARIES_PATH} -L${MBEDTLS_LIBRARY_PATH} -L${MBEDCRYPTO_LIBRARY_PATH})
+add_link_options(-L${MBEDTLS_LIBRARY_PATH} -L${MBEDCRYPTO_LIBRARY_PATH})
 
 message(INFO ${mbedcrypto_lib})
 

cubin_filter/crypto-hash.c

@@ -122,7 +122,7 @@ crypto_hash_compute
   memset(hash, 0, hash_length); 
 
   // compute an MD5 hash of input
-  mbedtls_md5_ret(input, input_length, hash);
+  mbedtls_md5(input, input_length, hash);
 
   return 0;
 }