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

[John Criswell]

Changes in directory poolalloc/test:

TEST.perf.Makefile updated: 1.6 -> 1.7

---
Log message:

1) Added code to run SPEC benchmarks.
2) Adjusted targets to run the .nonpa.cbe versions of the generate programs.
This should get us to run perfex on the bytecodes that were optimized with
the same post-poolallocator optimizations.



---
Diffs of the changes:  (+22 -1)

Index: poolalloc/test/TEST.perf.Makefile
diff -u poolalloc/test/TEST.perf.Makefile:1.6 poolalloc/test/TEST.perf.Makefile:1.7
--- poolalloc/test/TEST.perf.Makefile:1.6	Fri Mar  5 13:04:03 2004
+++ poolalloc/test/TEST.perf.Makefile	Fri Mar  5 13:28:20 2004
@@ -97,6 +97,8 @@
 # Rules for running the tests
 ############################################################################
 
+ifndef PROGRAMS_HAVE_CUSTOM_RUN_RULES
+
 #
 # Generate events for Pool Allocated CBE
 #
@@ -114,13 +116,32 @@
 # Generate events for CBE
 #
 $(PROGRAMS_TO_TEST:%=Output/test.$(TEST).%): \
-Output/test.$(TEST).%: Output/%.cbe
+Output/test.$(TEST).%: Output/%.nonpa.cbe
 	@echo "========================================="
 	@echo "Running '$(TEST)' test on '$(TESTNAME)' program"
 ifeq ($(RUN_OPTIONS),)
 	$(VERB) cat $(STDIN_FILENAME) | $(PERFEX) -o $@ $(EVENTS) $< > /dev/null
 else
 	$(VERB) cat $(STDIN_FILENAME) | $(PERFEX) -o $@ $(EVENTS) $< $(RUN_OPTIONS) > /dev/null
+endif
+
+else
+
+# This rule runs the generated executable, generating timing information, for
+# SPEC
+$(PROGRAMS_TO_TEST:%=Output/test.$(TEST).pa.%): \
+Output/test.$(TEST).pa.%: Output/%.poolalloc.cbe
+	-$(SPEC_SANDBOX) poolalloccbe-$(RUN_TYPE) /dev/null $(REF_IN_DIR) \
+             $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
+                  $(PERFEX) -o $@ $(EVENTS) ../../$< $(RUN_OPTIONS)
+
+# This rule runs the generated executable, generating timing information, for
+# SPEC
+$(PROGRAMS_TO_TEST:%=Output/test.$(TEST).%): \
+Output/test.$(TEST).%: Output/%.nonpa.cbe
+	-$(SPEC_SANDBOX) nonpacbe-$(RUN_TYPE) /dev/null $(REF_IN_DIR) \
+             $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
+                  $(PERFEX) -o $@ $(EVENTS) ../../$< $(RUN_OPTIONS)
 endif
 
 ############################################################################