[llvm-commits] [parallel] CVS: llvm/test/Programs/Makefile.programs TEST.vtl.Makefile

[Misha Brukman]

Changes in directory llvm/test/Programs:

Makefile.programs updated: 1.109.2.1 -> 1.109.2.2
TEST.vtl.Makefile updated: 1.3.2.1 -> 1.3.2.2

---
Log message:

Merge from trunk.

---
Diffs of the changes:  (+2 -19)

Index: llvm/test/Programs/Makefile.programs
diff -u llvm/test/Programs/Makefile.programs:1.109.2.1 llvm/test/Programs/Makefile.programs:1.109.2.2
--- llvm/test/Programs/Makefile.programs:1.109.2.1	Mon Mar  1 17:59:09 2004
+++ llvm/test/Programs/Makefile.programs	Wed Mar 10 19:09:31 2004
@@ -395,7 +395,7 @@
 #
 $(PROGRAMS_TO_TEST:%=Output/%.llvm-prof.bc): \
 Output/%.llvm-prof.bc: Output/%.llvm.bc
-	$(LOPT) -insert-block-profiling $< -o $@ -f
+	$(LOPT) -insert-edge-profiling $< -o $@ -f
 
 $(PROGRAMS_TO_TEST:%=Output/%.printprof): \
 Output/%.printprof: Output/%.llvm.bc Output/%.prof $(LPROF)


Index: llvm/test/Programs/TEST.vtl.Makefile
diff -u llvm/test/Programs/TEST.vtl.Makefile:1.3.2.1 llvm/test/Programs/TEST.vtl.Makefile:1.3.2.2
--- llvm/test/Programs/TEST.vtl.Makefile:1.3.2.1	Mon Mar  1 17:59:09 2004
+++ llvm/test/Programs/TEST.vtl.Makefile	Wed Mar 10 19:09:31 2004
@@ -30,26 +30,9 @@
 	#-$(VERB) $(VTL) view > $@
 	#$(VERB)  $(VTL) delete $* -f
 
-test:: $(PROGRAMS_TO_TEST:%=test.$(TEST).pa.%)
 
 #
-# Generate events for Pool Allocated CBE
-#
-$(PROGRAMS_TO_TEST:%=test.$(TEST).pa.%): \
-test.$(TEST).pa.%: Output/%.poolalloc.cbe
-	@echo "========================================="
-	@echo "Running '$(TEST)' test on '$(TESTNAME)' program"
-ifeq ($(RUN_OPTIONS),)
-	$(VERB) cat $(STDIN_FILENAME) | $(VTL) activity $* -d 50 -c sampling -o $(EVENTS) -app $<
-else
-	$(VERB) cat $(STDIN_FILENAME) | $(VTL) activity $* -d 50 -c sampling -o $(EVENTS) -app $<,"$(RUN_OPTIONS)"
-endif
-	-$(VERB) $(VTL) run $*
-	-$(VERB) $(VTL) view > $@
-	$(VERB)  $(VTL) delete $* -f
-
-#
-# Generate events for Pool Allocated CBE
+# Generate events for CBE
 #
 $(PROGRAMS_TO_TEST:%=test.$(TEST).%): \
 test.$(TEST).%: Output/%.cbe