Add pcp support.

Author: dvalinrh

numa_streams/numa_streams_extra/run_numa_stream

@@ -36,6 +36,8 @@ cpus_per_node=""
 cache_cap_size=0
 host=`hostname`
 size_list="0"
+pcp=0
+pcpdir=""
 
 #
 # Define options
@@ -50,6 +52,7 @@ ARGUMENT_LIST=(
 	"numa_iterations"
 	"numb_sizes"
 	"optimize_lvl"
+	"pcp"
 	"results_dir"
 	"size_list"
 	"strides"
@@ -111,7 +114,11 @@ while [[ $# -gt 0 ]]; do
 			optim=${2}
 			shift 2
 		;;
-			
+		--pcp)
+			pcpdir=${2}
+			pcp=1
+			shift 2
+		;;
 		--results_dir)
 			echo setting result dir
 			resultdir=${2}
@@ -143,6 +150,11 @@ while [[ $# -gt 0 ]]; do
 	esac
 done
 
+if [[ $pcp -eq 1 ]]; then
+	source $TOOLS_BIN/pcp/pcp_commands.inc
+	setup_pcp
+	pcp_cfg=$TOOLS_BIN/pcp/default.cfg
+fi
 
 setup_sizing()
 {
@@ -251,7 +263,17 @@ create_numa_cache_list()
 	cache_size_mb="512 1000 2000 4000"
 	for cache_size  in $cache_size_mb
 	do
+		if [[ $pcp -eq 1 ]]; then
+			start_pcp_subset
+		fi
 		run_numa_test $threads $cache_size
+		if [[ $pcp -eq 1 ]]; then
+			echo "Send result to PCP archive"
+			out="${stream_size}_iter_${test_iters}"
+			result2pcp iteration_${iteration} ${out}
+			stop_pcp_subset
+		fi
+
 	done
 }
 
@@ -269,20 +291,26 @@ run_numa_streams()
 	cpus=`cat /proc/cpuinfo | grep processor | wc -l`
 	threads=1
 
+	if [[ $pcp -eq 1 ]]; then
+		echo "Start PCP"
+		start_pcp ${pcpdir}/ streams $pcp_cfg
+	fi
 	while [ $threads -lt $cpus ]
 	do
 		echo create_numa_cache_list $threads >> /root/debug_dups
 		create_numa_cache_list $threads
 		threads=`echo "${threads}*2" | bc`
 	done
 	create_numa_cache_list $cpus
+	if [[ $pcp -eq 1 ]]; then
+		shutdown_pcp
+	fi
 
 	#
 	# Record highest
 	#
 	echo Test:MB/sec > highest.csv
 
-	# DJV
 	record_numa_stream Copy
 	record_numa_stream Scale
 	record_numa_stream Add

numa_streams/numa_streams_run

@@ -19,6 +19,8 @@
 mem_offset=0
 numa_iterations=10
 arguments="$@"
+pcp=""
+pdir=""
 
 curdir=`pwd`
 if [[ $0 == "./"* ]]; then
@@ -256,18 +258,14 @@ set_up_test()
 	if [[ $results_dir == "" ]]; then
 		results_dir=results_${test_name}_${to_tuned_setting}_`date +"%Y%m%d%H%M%S"`
 	fi
-	if [ -d /$run_dir/run_numa_stream ]; then
-		rm -rf /$run_dir/run_numa_stream 2> /dev/null
-	fi
-	if [ -d /tmp/numa_streams_results ]; then
-		rm -rf /tmp/numa_streams_results 2> /dev/null
-	fi
+	rm -f /$run_dir/run_numa_stream 
+	rm -rf /tmp/numa_streams_results
 	mkdir /tmp/numa_streams_results
 
 	#
 	# Setup the run script
 	#
-	cp $run_dir/numa_numa_streams_extra/run_numa_stream $run_dir
+	cp $run_dir/numa_streams_extra/run_numa_stream $run_dir
 	chmod 755 $run_dir/run_numa_stream
 }
 
@@ -276,13 +274,13 @@ set_up_test()
 #
 run_numa_stream()
 {
-	cd $run_dir
-	./run_numa_stream   --cache_cap_size ${cache_cap_size} --iterations ${to_times_to_run}  --cache_start_size $cache_start_factor --optimize_lvl ${1} --cache_multiply $cache_multiply --numb_sizes $nsizes --thread_multiply $threads_multiple --results_dir ${results_dir} --host ${to_configuration} --size_list ${size_list} --numa_iterations=${numa_iterations} --mem_offset=${mem_offset} > /tmp/numa_streams_results/${2}_opt_${1}
+	pushd $run_dir > /dev/null
+	./run_numa_stream   --cache_cap_size ${cache_cap_size} --iterations ${to_times_to_run}  --cache_start_size $cache_start_factor --optimize_lvl ${1} --cache_multiply $cache_multiply --numb_sizes $nsizes --thread_multiply $threads_multiple --results_dir ${results_dir} --host ${to_configuration} --size_list ${size_list} --numa_iterations=${numa_iterations} --mem_offset=${mem_offset} ${pcp} > /tmp/numa_streams_results/${2}_opt_${1}
 	mv ${results_dir}_* /tmp/numa_streams_results
-	cd ..
+	popd > /dev/null
 }
 
-streams_run()
+numa_streams_run()
 {
 	run_numa_stream 3  "numa_streams_O3_${to_tuned_setting}.out"
 }
@@ -362,6 +360,7 @@ fi
 
 ${curdir}/test_tools/gather_data ${curdir}
 source test_tools/general_setup "$@"
+export TOOLS_BIN
 
 if [ ! -f "/tmp/${test_name}.out" ]; then
 	${TOOLS_BIN}/invoke_test --test_name ${test_name} --command ${0} --options "${arguments}"
@@ -483,7 +482,13 @@ while [[ $# -gt 0 ]]; do
 done
 
 set_up_test
-streams_run
+
+if [[ $to_use_pcp -eq 1 ]]; then
+	pdir=/tmp/pcp_`date "+%Y.%m.%d-%H.%M.%S"`
+	pcp="--pcp ${pdir}"
+fi
+
+numa_streams_run
 wdir=`pwd`
 cd /tmp
 if [[ $results_dir == "" ]]; then
@@ -496,14 +501,12 @@ else
 	mkdir ${results_dir}
 	cp /tmp/results_numa_streams/* $results_dir
 fi
-#${curdir}/test_tools/move_data $curdir $results_dir
 #
 # report the results
 #
 pushd $results_dir > /dev/null
 mv /tmp/${test_name}.out .
-mv /tmp/test_results_report .
 popd > /dev/null
 tar hcf /tmp/results_${test_name}_${to_tuned_setting}.tar $results_dir
-${curdir}/test_tools/save_results --curdir $curdir --home_root $to_home_root --test_name $test_name --tuned_setting=$to_tuned_setting --version NONE --user $to_user  --copy_dir $results_dir
+${curdir}/test_tools/save_results --curdir $curdir --home_root $to_home_root --test_name $test_name --tuned_setting=$to_tuned_setting --version NONE --user $to_user  --copy_dir "$results_dir $pdir"
 exit 0