cleanup after separating for staging and npi branches

Change-Id: Iadd624df21b85f1590e901a8125680743e3281a3

test/run.sh

@@ -56,24 +56,7 @@ eval_test() {
   test_number=$((test_number + 1))
 }
 
-# profiler library lookup
-pwd
-echo "ENV CHECK"
-env
-echo "OPTROCM CHECK"
-find -L /opt -name "librocprofiler*"
-echo "PKGLIB CHECK"
-find -L ../.. -name "librocprofiler*"
-echo "COMPKG CHECK"
-find -L /home/jenkins/compute-package -name "librocprofiler*"
-
-ls -la /home/jenkins/compute-package
-ls -la /home/jenkins/compute-package/lib
-ls -la /home/jenkins/compute-package/lib/*
-
 # paths to ROC profiler and oher libraries
-#ROCP_LIB_PATH=$(find -L /opt/rocm* -name librocprofiler64.so.1 | head -n1)
-#ROCP_LIB_DIR=$(dirname $ROCP_LIB_PATH)
 export LD_LIBRARY_PATH=$PWD:$PWD/../../lib:/home/jenkins/compute-package/lib
 
 # enable tools load failure reporting
@@ -126,7 +109,6 @@ export ROCP_TOOL_LIB=libtool.so
 # ROC profiler kernels timing
 export ROCP_TIMESTAMP_ON=1
 # output directory for the tool library, for metrics results file 'results.txt'
-# and SQTT trace files 'thread_trace.se<n>.out'
 export ROCP_OUTPUT_DIR=./RESULTS
 
 if [ ! -e $ROCP_TOOL_LIB ] ; then
@@ -170,44 +152,12 @@ export ROCP_THRS=10
 export ROCP_INPUT=pmc_input1.xml
 eval_test "'rocprof' libtool PMC n-thread test1" ./test/ctrl
 
-export ROCP_KITER=20
-export ROCP_DITER=20
-export ROCP_AGENTS=1
-export ROCP_THRS=1
-export ROCP_INPUT=sqtt_input.xml
-eval_test "'rocprof' libtool SQTT test" ./test/ctrl
-
-## SPM test
-# export ROCP_KITER=3
-# export ROCP_DITER=3
-# export ROCP_AGENTS=1
-# export ROCP_THRS=1
-# export ROCP_INPUT=spm_input.xml
-# export ROCP_SPM=1
-# eval_test "libtool test, SPM trace test" ./test/ctrl
-# unset ROCP_SPM
-
-## Libtool test, counter sets
-# Memcopies tracking
-export ROCP_MCOPY_TRACKING=1
-
-export ROCP_KITER=1
-export ROCP_DITER=4
-export ROCP_INPUT=set_input.xml
-eval_test "libtool test, counter sets" ./test/ctrl
-
-## OpenCL test
-#export ROCP_INPUT=input1.xml
-#eval_test "libtool test, OpenCL sample" ./test/ocl/SimpleConvolution
-
-# Memcopies tracking
 unset ROCP_MCOPY_TRACKING
 # enable HSA intercepting
 export ROCP_HSA_INTERC=1
 
 export ROCP_KITER=10
 export ROCP_DITER=10
-#export ROCP_INPUT=input1.xml
 eval_test "libtool test, counter sets" ./test/ctrl
 
 ## OpenCL test