浏览代码

Fix running shell-based tests on MIC

Samuel Thibault 7 年之前
父节点
当前提交
369d001ece
共有 6 个文件被更改,包括 47 次插入4 次删除
  1. 6 0
      examples/heat/heat.sh
  2. 12 0
      examples/lu/lu.sh
  3. 7 0
      tests/datawizard/locality.sh
  4. 8 3
      tests/loader-cross.sh.in
  5. 7 1
      tests/microbenchs/microbench.sh
  6. 7 0
      tests/overlap/overlap.sh

+ 6 - 0
examples/heat/heat.sh

@@ -22,6 +22,12 @@ set -e
 
 PREFIX=$(dirname $0)
 
+if [ -n "$STARPU_MIC_SINK_PROGRAM_PATH" ] ; then
+	STARPU_MIC_SINK_PROGRAM_NAME=$STARPU_MIC_SINK_PROGRAM_PATH/heat
+	# in case libtool got into play
+	[ -x "$STARPU_MIC_SINK_PROGRAM_PATH/.libs/heat" ] && STARPU_MIC_SINK_PROGRAM_NAME=$STARPU_MIC_SINK_PROGRAM_PATH/.libs/heat
+fi
+
 $PREFIX/heat -shape 0
 $PREFIX/heat -shape 1
 # sometimes lead to pivot being 0

+ 12 - 0
examples/lu/lu.sh

@@ -21,12 +21,24 @@ set -e
 
 PREFIX=$(dirname $0)
 
+if [ -n "$STARPU_MIC_SINK_PROGRAM_PATH" ] ; then
+	STARPU_MIC_SINK_PROGRAM_NAME=$STARPU_MIC_SINK_PROGRAM_PATH/lu_implicit_example_float
+	# in case libtool got into play
+	[ -x "$STARPU_MIC_SINK_PROGRAM_PATH/.libs/lu_implicit_example_float" ] && STARPU_MIC_SINK_PROGRAM_NAME=$STARPU_MIC_SINK_PROGRAM_PATH/.libs/lu_implicit_example_float
+fi
+
 $PREFIX/lu_implicit_example_float -size $((960 * 4)) -nblocks 4 -piv
 $PREFIX/lu_implicit_example_float -size $((960 * 4)) -nblocks 4 -no-stride
 $PREFIX/lu_implicit_example_float -size $((960 * 4)) -nblocks 4 -bound
 $PREFIX/lu_implicit_example_float -size $((960 * 2)) -nblocks 2 -bounddeps
 $PREFIX/lu_implicit_example_float -size $((960 * 2)) -nblocks 2 -bound -bounddeps -bounddepsprio
 
+if [ -n "$STARPU_MIC_SINK_PROGRAM_PATH" ] ; then
+	STARPU_MIC_SINK_PROGRAM_NAME=$STARPU_MIC_SINK_PROGRAM_PATH/lu_example_float
+	# in case libtool got into play
+	[ -x "$STARPU_MIC_SINK_PROGRAM_PATH/.libs/lu_example_float" ] && STARPU_MIC_SINK_PROGRAM_NAME=$STARPU_MIC_SINK_PROGRAM_PATH/.libs/lu_example_float
+fi
+
 $PREFIX/lu_example_float -size $((960 * 4)) -nblocks 4 -piv
 $PREFIX/lu_example_float -size $((960 * 4)) -nblocks 4 -no-stride
 $PREFIX/lu_example_float -size $((960 * 4)) -nblocks 4 -bound

+ 7 - 0
tests/datawizard/locality.sh

@@ -21,6 +21,13 @@
 set -e
 
 PREFIX=$(dirname $0)
+
+if [ -n "$STARPU_MIC_SINK_PROGRAM_PATH" ] ; then
+	STARPU_MIC_SINK_PROGRAM_NAME=$STARPU_MIC_SINK_PROGRAM_PATH/locality
+	# in case libtool got into play
+	[ -x "$STARPU_MIC_SINK_PROGRAM_PATH/.libs/locality" ] && STARPU_MIC_SINK_PROGRAM_NAME=$STARPU_MIC_SINK_PROGRAM_PATH/.libs/locality
+fi
+
 test -x $PREFIX/../../tools/starpu_fxt_tool || exit 77
 STARPU_SCHED=modular-eager STARPU_FXT_PREFIX=$PREFIX/ $PREFIX/locality
 $PREFIX/../../tools/starpu_fxt_tool -i $PREFIX/prof_file_${USER}_0

+ 8 - 3
tests/loader-cross.sh.in

@@ -2,7 +2,7 @@
 #
 # StarPU --- Runtime system for heterogeneous multicore architectures.
 #
-# Copyright (C) 2013, 2015 Universite de Bordeaux
+# Copyright (C) 2013, 2015, 2017 Universite de Bordeaux
 # Copyright (C) 2015       CNRS
 #
 # StarPU is free software; you can redistribute it and/or modify
@@ -27,15 +27,20 @@ then
     echo "[Error] Syntax: $0 <mic_executable> <args>"
     exit 1
 fi
+case "$exec" in
+	/*) ;;
+	*) exec="$PWD/$exec"
+esac
 
-NATIVE=${PWD/\/build_mic\//\/build_host\/}
+NATIVE=${exec/\/build_mic\//\/build_host\/}
 DIR="$(dirname "$exec")"
 FILE="$(basename "$exec")"
 
 export SINK_LD_LIBRARY_PATH="$top_builddir/src/.libs:$SINK_LD_LIBRARY_PATH"
 export STARPU_MIC_SINK_PROGRAM_NAME="$exec" 
+export STARPU_MIC_SINK_PROGRAM_PATH="$DIR"
 
 # in case libtool got into play
 [ -x "$DIR/.libs/$FILE" ] && STARPU_MIC_SINK_PROGRAM_NAME="$DIR/.libs/$FILE" 
 
-$top_builddir/../build_host/tests/loader "$NATIVE/$exec" "$@"
+$top_builddir/../build_host/tests/loader "$NATIVE" "$@"

+ 7 - 1
tests/microbenchs/microbench.sh

@@ -1,6 +1,6 @@
 # StarPU --- Runtime system for heterogeneous multicore architectures.
 #
-# Copyright (C) 2016  Université de Bordeaux
+# Copyright (C) 2016-2017  Université de Bordeaux
 # Copyright (C) 2016, 2017  CNRS
 #
 # StarPU is free software; you can redistribute it and/or modify
@@ -33,6 +33,12 @@ test_scheds()
 	pass=""
 	skip=""
 
+	if [ -n "$STARPU_MIC_SINK_PROGRAM_PATH" ] ; then
+		STARPU_MIC_SINK_PROGRAM_NAME=$STARPU_MIC_SINK_PROGRAM_PATH/$TEST
+		# in case libtool got into play
+		[ -x "$STARPU_MIC_SINK_PROGRAM_PATH/.libs/$TEST" ] && STARPU_MIC_SINK_PROGRAM_NAME=$STARPU_MIC_SINK_PROGRAM_PATH/.libs/$TEST
+	fi
+
 	RESULT=0
 	for sched in $SCHEDS;
 	do

+ 7 - 0
tests/overlap/overlap.sh

@@ -21,6 +21,13 @@
 set -e
 
 PREFIX=$(dirname $0)
+
+if [ -n "$STARPU_MIC_SINK_PROGRAM_PATH" ] ; then
+	STARPU_MIC_SINK_PROGRAM_NAME=$STARPU_MIC_SINK_PROGRAM_PATH/overlap
+	# in case libtool got into play
+	[ -x "$STARPU_MIC_SINK_PROGRAM_PATH/.libs/overlap" ] && STARPU_MIC_SINK_PROGRAM_NAME=$STARPU_MIC_SINK_PROGRAM_PATH/.libs/overlap
+fi
+
 STARPU_SCHED=dmdas STARPU_FXT_PREFIX=$PREFIX/ $PREFIX/overlap
 [ ! -x $PREFIX/../../tools/starpu_perfmodel_display ] || $PREFIX/../../tools/starpu_perfmodel_display -s overlap_sleep_1024_24
 if [ -x $PREFIX/../../tools/starpu_fxt_tool ];