[llvm-commits] CVS: reopt/test/run-tests

[Brian Gaeke]

Changes in directory reopt/test:

run-tests updated: 1.20 -> 1.21
---
Log message:

Add -release, -lps options.
Fix location of test/Programs, now called llvm-test.


---
Diffs of the changes:  (+9 -6)

Index: reopt/test/run-tests
diff -u reopt/test/run-tests:1.20 reopt/test/run-tests:1.21
--- reopt/test/run-tests:1.20	Mon Aug 30 14:56:44 2004
+++ reopt/test/run-tests	Thu Sep 23 14:48:38 2004
@@ -18,10 +18,13 @@
 # parse arguments
 skiptrace=0
 outputonly=0
+MKOPTS=''
 action=test
 for arg in $@; do
   case $arg in
     -output) outputonly=1 ;;
+    -release) MKOPTS="$MKOPTS ENABLE_OPTIMIZED=1" ;;
+    -lps) MKOPTS="$MKOPTS LARGE_PROBLEM_SIZE=1" ;;
     -clean) action=clean ;;
     -debug) action=debug ;;
     -test) action=test ;;
@@ -31,11 +34,11 @@
   esac
 done
 
-# get full path to test/Programs subdirectory
+# get full path to projects/llvm-test subdirectory
 objroot=`gmake prdirs | egrep 'LLVM.*Object Root' |cut -d: -f2-`
 
 EXTRATESTSUBDIR=SingleSource/Reoptimizer
-EXTRATESTDIR=${objroot}/test/Programs/$EXTRATESTSUBDIR
+EXTRATESTDIR=${objroot}/projects/llvm-test/$EXTRATESTSUBDIR
 # sanity check arguments
 if [ "$action" = "list" ]; then
   echo ""
@@ -101,14 +104,14 @@
 
   *) ucname=`echo $benchmk | perl -pe '$_ = ucfirst lc $_;'`
      SUBDIR=$EXTRATESTSUBDIR/$ucname
-     if [ ! -d $objroot/test/Programs/$SUBDIR ]
+     if [ ! -d $objroot/projects/llvm-test/$SUBDIR ]
      then
         die "Error: Unknown benchmark $benchmk"
      fi
      ;;
 esac
 echo "Starting ${action} on $benchmk"
-fullsubdirpath="${objroot}/test/Programs/${SUBDIR}"
+fullsubdirpath="${objroot}/projects/llvm-test/${SUBDIR}"
 
 do_debug () {
   cd $fullsubdirpath
@@ -144,9 +147,9 @@
 	# note: SPEC Sandbox.sh does NOT play nice with our debug output!
 	LLVM_REOPT='--enable-trace-opt'
 	export LLVM_REOPT
-    exec gmake SUBDIR=$SUBDIR SPECTEST=1 RUNTIMELIMIT=900
+    exec gmake SUBDIR=$SUBDIR SPECTEST=1 RUNTIMELIMIT=900 $MKOPTS
   else
-    exec gmake SUBDIR=$SUBDIR RUNTIMELIMIT=900
+    exec gmake SUBDIR=$SUBDIR RUNTIMELIMIT=900 $MKOPTS
   fi
 }