[llvm-commits] CVS: reopt/test/TEST.reopt.Makefile

[Brian Gaeke]

Changes in directory reopt/test:

TEST.reopt.Makefile updated: 1.30 -> 1.31
---
Log message:

-disable-strip is gone; don't use it in REOPTLLC_DEBUG_FLAGS.
Ignore failure exit codes from reopt-llc, g++ and diff; print PASS/FAIL
notations instead of stopping make.


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

Index: reopt/test/TEST.reopt.Makefile
diff -u reopt/test/TEST.reopt.Makefile:1.30 reopt/test/TEST.reopt.Makefile:1.31
--- reopt/test/TEST.reopt.Makefile:1.30	Mon Nov 22 22:40:05 2004
+++ reopt/test/TEST.reopt.Makefile	Thu Dec  9 11:07:20 2004
@@ -42,8 +42,7 @@
 ifdef ENABLE_OPTIMIZED
 REOPTLLC_DEBUG_FLAGS=
 else
-REOPTLLC_DEBUG_FLAGS=-disable-sched -disable-strip -dregalloc=y \
- -print-machineinstrs
+REOPTLLC_DEBUG_FLAGS=-disable-sched -dregalloc=y -print-machineinstrs
 endif
 
 # 1. Run the necessary instrumentation passes over the bytecode,
@@ -52,14 +51,17 @@
 $(PROGRAMS_TO_TEST:%=Output/%.reopt-llc.s): \
 Output/%.reopt-llc.s: Output/%.llvm.bc $(LOPT) $(LLC)
 	@echo "===== Building Reoptimizer version of $(TESTNAME) ====="
-	$(REOPTLLC) -enable-correct-eh-support $(REOPTLLC_DEBUG_FLAGS) \
-	-f -o=$@ $< 2>$@.log
+	-$(REOPTLLC) -enable-correct-eh-support $(REOPTLLC_DEBUG_FLAGS) -f -o=$@ $< 2>$@.log
+	@if test -f $@ -a -f $@.log; then echo "PASS: reopt-llc $(TESTNAME)"; \
+	else echo "FAIL: reopt-llc $(TESTNAME)"; fi
 
 # 2. Link the instrumented binary with the necessary parts of the
 # compiler.
 $(PROGRAMS_TO_TEST:%=Output/%.reopt-llc): \
 Output/%.reopt-llc: Output/%.reopt-llc.s $(REOPTIMIZER_LIB)
-	$(CXX) $(CFLAGS) $(PROFILE) $< -o $@ $(REOPTIMIZER_LIB) $(REOPTIMIZER_SOLARISLIBS)
+	-$(CXX) $(CFLAGS) $(PROFILE) $< -o $@ $(REOPTIMIZER_LIB) $(REOPTIMIZER_SOLARISLIBS)
+	@if test -x $@; then echo "PASS: reopt-link $(TESTNAME)"; \
+	else echo "FAIL: reopt-link $(TESTNAME)"; fi
 
 # 3. Run the reoptimized version.
 ifdef SPECTEST
@@ -82,4 +84,8 @@
 # 4. Diff it against the plain old llc version
 $(PROGRAMS_TO_TEST:%=Output/%.diff-reopt-llc): \
 Output/%.diff-reopt-llc: Output/%.out-llc Output/%.out-reopt-llc
-	-$(DIFFPROG) reopt-llc $* llc $(HIDEDIFF)
+	@if $(DIFFPROG) reopt-llc $* llc $(HIDEDIFF); then \
+	echo "PASS: reopt $(TESTNAME)"; \
+	else \
+	echo "FAIL: reopt $(TESTNAME)"; fi
+