X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2FFeature%2FTestOptimizer.sh;h=648d7168ea4cd3950099a699522ee89b66eab188;hb=a12f1e79bbca1d2519b67249b14259e6af70f083;hp=5473647118eb8c8a0c4129cb81c8f8feccc6c6a4;hpb=8ce0669a56f97eaa83f6386edf65fcbe4caa39c8;p=oota-llvm.git

diff --git a/test/Feature/TestOptimizer.sh b/test/Feature/TestOptimizer.sh
index 5473647118e..648d7168ea4 100755
--- a/test/Feature/TestOptimizer.sh
+++ b/test/Feature/TestOptimizer.sh
@@ -1,23 +1,33 @@
 #!/bin/sh
-LD_LIBRARY_PATH=../lib/Assembly/Parser/Debug:../lib/Assembly/Writer/Debug:../lib/Analysis/Debug:../lib/VMCore/Debug:../lib/Bytecode/Writer/Debug:../lib/Bytecode/Reader/Debug:../lib/Optimizations/Debug
+LD_LIBRARY_PATH=$3
 export LD_LIBRARY_PATH
 
+AS=$2/as
+DIS=$2/dis
+OPT=$2/opt
 
-../tools/as/as < $1 | ../tools/opt/opt -q -inline -dce -constprop -dce | ../tools/dis/dis | ../tools/as/as > $1.bc.1 || exit 1
+echo "======== Running optimizer test on $1"
 
-# Should not be able to optimize further!
-../tools/opt/opt -q -constprop -dce < $1.bc.1 > $1.bc.2 || exit 2
+(
+  $AS < $1 | $OPT -q -inline -dce -constprop -dce |$DIS| $AS > $1.bc.1 || exit 1
 
-dis < $1.bc.1 > $1.ll.1 || exit 3
-dis < $1.bc.2 > $1.ll.2 || exit 3
-diff $1.ll.[12] || exit 3
+  # Should not be able to optimize further!
+  $OPT -q -constprop -dce < $1.bc.1 > $1.bc.2 || exit 2
 
-# Try out SCCP
-../tools/as/as < $1 | ../tools/opt/opt -q -inline -dce -sccp -dce | ../tools/dis/dis | ../tools/as/as > $1.bc.3 || exit 1
+  $DIS < $1.bc.1 > $1.ll.1 || exit 3
+  $DIS < $1.bc.2 > $1.ll.2 || exit 3
+  gdiff -u $1.ll.[12] || exit 3
 
-# Should not be able to optimize further!
-#../tools/opt/opt -q -sccp -dce < $1.bc.3 > $1.bc.4 || exit 2
-
-#diff $1.bc.[34] || exit 3
-rm $1.bc.[123] $1.ll.[12]
+  # Try out SCCP 
+  $AS < $1 | $OPT -q -inline -dce -sccp -dce \
+           | $DIS | $AS > $1.bc.3 || exit 1
 
+  # Should not be able to optimize further!
+  $OPT -q -sccp -dce < $1.bc.3 > $1.bc.4 || exit 2
+  $DIS < $1.bc.3 > $1.ll.3 || exit 3
+  $DIS < $1.bc.4 > $1.ll.4 || exit 3
+  gdiff -u $1.ll.[34] || exit 3
+  rm $1.bc.[1234] $1.ll.[1234]
+  
+  touch Output/$1.opt  # Success!
+)|| ../Failure.sh "$1 Optimizer"