From 6233dc5c57ec533101a038a3fb6e44a01924cb8d Mon Sep 17 00:00:00 2001
From: FindHao <find@findhao.net>
Date: Tue, 28 Mar 2023 17:42:08 -0400
Subject: [PATCH] update compilation and installation

---
 bin/gpupunk                 |  4 ++++
 bin/install.sh              |  5 -----
 bin/setgpupunk.sh           | 10 +++++++++-
 cubin_filter/CMakeLists.txt |  7 ++-----
 cubin_filter/crypto-hash.c  |  2 +-
 gpupunk_samples             |  2 +-
 gputrigger                  |  2 +-
 7 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/bin/gpupunk b/bin/gpupunk
index 8280c82..1e5693f 100755
--- a/bin/gpupunk
+++ b/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:
diff --git a/bin/install.sh b/bin/install.sh
index 13435ca..e039a95 100755
--- a/bin/install.sh
+++ b/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 boost@1.76.0 mbedtls@2.28.0 libs=shared elfutils@0.186
 spack install boost mbedtls libs=shared elfutils
 check_status "spack install"
-# TODO: find a better solution for those packages' installation
-# spack load boost@1.76.0 mbedtls@2.28.0  elfutils@0.186
 spack load boost mbedtls elfutils
 
 # Find spack and boost dir
diff --git a/bin/setgpupunk.sh b/bin/setgpupunk.sh
index 57387d5..ed83d66 100644
--- a/bin/setgpupunk.sh
+++ b/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
diff --git a/cubin_filter/CMakeLists.txt b/cubin_filter/CMakeLists.txt
index 90e5635..86ac631 100644
--- a/cubin_filter/CMakeLists.txt
+++ b/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})
 
diff --git a/cubin_filter/crypto-hash.c b/cubin_filter/crypto-hash.c
index fb1c7ce..b5648c0 100644
--- a/cubin_filter/crypto-hash.c
+++ b/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;
 }
diff --git a/gpupunk_samples b/gpupunk_samples
index f1175bb..70ec35d 160000
--- a/gpupunk_samples
+++ b/gpupunk_samples
@@ -1 +1 @@
-Subproject commit f1175bb892bfdb0f2ef68d4a26df3c49cd0d968f
+Subproject commit 70ec35d325d04409ca6697fa18bb6715caf2f741
diff --git a/gputrigger b/gputrigger
index 26aad67..5bb8fb0 160000
--- a/gputrigger
+++ b/gputrigger
@@ -1 +1 @@
-Subproject commit 26aad674cfadab59241eea09ceff02d751ca471c
+Subproject commit 5bb8fb00ca3b58a198da5110e51b4dcf2fab301e