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

[Chris Lattner]

Changes in directory llvm/test/Programs:

Makefile.programs updated: 1.84 -> 1.85

---
Log message:

Clean out reoptimizer specific stuff that has been moved to TEST.reopt.Makefile!
Look at all of the -'s


---
Diffs of the changes:

Index: llvm/test/Programs/Makefile.programs
diff -u llvm/test/Programs/Makefile.programs:1.84 llvm/test/Programs/Makefile.programs:1.85
--- llvm/test/Programs/Makefile.programs:1.84	Fri Aug 15 13:41:40 2003
+++ llvm/test/Programs/Makefile.programs	Fri Aug 15 14:24:38 2003
@@ -45,7 +45,6 @@
 .PRECIOUS: Output/%.llvm Output/%.native Output/%.llc Output/%.llc.s
 .PRECIOUS: Output/%.cbe Output/%.cbe.c Output/%.llvm.bc
 .PRECIOUS: Output/%.linked.bc 
-.PRECIOUS: Output/%.run.bc Output/%.run.s Output/%.tracing Output/%.trace
 
 PROGDIR = $(LEVEL)/test/Programs
 
@@ -90,12 +89,6 @@
 LLCCODEGEN := $(addsuffix .llc.s,   $(PREFIXED_PROGRAMS_TO_TEST))
 CBECODEGEN := $(addsuffix .cbe,     $(PREFIXED_PROGRAMS_TO_TEST))
 
-#programs generated for tracing framework
-LLCBYTECODE := $(addsuffix .llc.bc,   $(PREFIXED_PROGRAMS_TO_TEST))
-TRACINGCODEGEN := $(addsuffix .run.bc,   $(PREFIXED_PROGRAMS_TO_TEST))
-TRACINGLLCCODEGEN := $(addsuffix .run.s,   $(PREFIXED_PROGRAMS_TO_TEST))
-TRACINGEXECUTABLE := $(addsuffix .trace,   $(PREFIXED_PROGRAMS_TO_TEST))
-
 # Output produced by programs run
 GCCOUTPUT := $(addsuffix .ll,       $(addprefix Output/,$basename $(Source)))
 NATOUTPUT := $(addsuffix .out-nat,  $(PREFIXED_PROGRAMS_TO_TEST))
@@ -104,9 +97,6 @@
 LLCOUTPUT := $(addsuffix .out-llc,  $(PREFIXED_PROGRAMS_TO_TEST))
 CBEOUTPUT := $(addsuffix .out-cbe,  $(PREFIXED_PROGRAMS_TO_TEST))
 
-#output for tracing framework
-TRACINGOUTPUT := $(addsuffix .out-trace,  $(PREFIXED_PROGRAMS_TO_TEST))
-
 # Diffs of program runs vs the native program
 LLIDIFFS  := $(addsuffix .diff-lli, $(PREFIXED_PROGRAMS_TO_TEST))
 JITDIFFS  := $(addsuffix .diff-jit, $(PREFIXED_PROGRAMS_TO_TEST))
@@ -114,8 +104,8 @@
 CBEDIFFS  := $(addsuffix .diff-cbe, $(PREFIXED_PROGRAMS_TO_TEST))
 
 # Build Program outputs:
-.PRECIOUS: Output/%.out-lli Output/%.out-jit Output/%.out-llc Output/%.out-trace
-.PRECIOUS: Output/%.out-nat Output/%.out-cbe Output/%.llc.bc
+.PRECIOUS: Output/%.out-lli Output/%.out-jit Output/%.out-llc
+.PRECIOUS: Output/%.out-nat Output/%.out-cbe
 
 # Build diffs from the output...
 .PRECIOUS: Output/%.diff-lli Output/%.diff-jit
@@ -159,28 +149,12 @@
 .PRECIOUS: $(LLIOUTPUT) $(JITOUTPUT) $(LLCOUTPUT) $(CBEOUTPUT)
 endif
 
-ifdef GET_LLVM_TRACE
-all:: $(LLCBYTECODE)
-endif
-
 ifndef DISABLE_LLC
 all:: $(LLCCODEGEN)
 else
 DISABLE_LLC_DIFFS = 1
 endif
 
-ifdef GET_LLVM_TRACE
-all:: $(TRACINGCODEGEN)
-all:: $(TRACINGLLCCODEGEN)
-all:: $(TRACINGEXECUTABLE)
-all:: $(TRACINGOUTPUT)
-
-DISABLE_CBE = 1
-DISABLE_LLC_DIFFS = 1
-DISABLE_CBE_DIFFS = 1
-DISABLE_JIT = 1
-endif
-
 ifndef DISABLE_CBE
 all:: $(CBECODEGEN)
 else
@@ -282,20 +256,10 @@
 #
 # Compile a linked program to machine code with LLC.
 #
-
-$(PROGRAMS_TO_TEST:%=Output/%.llc.bc): \
-Output/%.llc.bc: Output/%.llvm.bc $(LOPT)
-	-$(LOPT) -f $< -inline -lowerswitch -branch-combine -emitfuncs -o $@
-
-ifndef GET_LLVM_TRACE
 $(PROGRAMS_TO_TEST:%=Output/%.llc.s): \
 Output/%.llc.s: Output/%.llvm.bc $(LLC)
 	-$(LLC) $(LLCFLAGS) -f $< -o $@
-else
-$(PROGRAMS_TO_TEST:%=Output/%.llc.s): \
-Output/%.llc.s: Output/%.llc.bc $(LLC)
-	-$(LLC) $(LLCFLAGS) -f $< -o $@
-endif
+
 
 ## Alternative command to run llc remotely on another machine:
 ## This is very useful when debugging:
@@ -307,33 +271,6 @@
 Output/%.llc: Output/%.llc.s
 	-$(CC) $(CFLAGS) $< $(LLCLIBS) $(LDFLAGS) -o $@
 
-$(PROGRAMS_TO_TEST:%=Output/%.trace.llc): \
-Output/%.trace.llc: Output/%.trace.llc.s
-	-$(CC) $(CFLAGS) $< $(LLCLIBS) $(TRACELIBS) -o $@
-
-##compile and create traced executables
-$(PROGRAMS_TO_TEST:%=Output/%.run.bc): \
-Output/%.run.bc: Output/%.llc.bc $(LOPT)
-	-$(LOPT) -instloops $< > $@
-
-$(PROGRAMS_TO_TEST:%=Output/%.run.s): \
-Output/%.run.s: Output/%.run.bc $(LLC)
-	-$(LLC) -f $< -o $@
-
-STATIC_TRACE_LIBS = ${DESTLIBDEBUG}/firstTrigger.o ${DESTLIBDEBUG}/tracecache.o\
-	${DESTLIBCURRENT}/mapinfo.o ${DESTLIBDEBUG}/scratchmemory.o
-
-DYNAMIC_TRACE_LIBS = ${DESTLIBCURRENT}/libscalaropts.a \
-	${DESTLIBCURRENT}/libtransformutils.a ${DESTLIBCURRENT}/vmcore.o \
-	${DESTLIBCURRENT}/libsupport.a ${DESTLIBCURRENT}/bcreader.o \
-	${DESTLIBCURRENT}/libanalysis.a
-
-OPTIMIZER_TRACE_LIBS = ${STATIC_TRACE_LIBS} $(DYNAMIC_TRACE_LIBS) -lcpc -lm -lrt -lmalloc
-
-$(PROGRAMS_TO_TEST:%=Output/%.trace): \
-Output/%.trace: Output/%.run.s $(STATIC_TRACE_LIBS) ${DYNAMIC__TRACE_LIBS}
-	-$(CXX) $(CFLAGS) $< -o $@ ${OPTIMIZER_TRACE_LIBS}
-
 
 #
 # Rules to execute the program
@@ -372,10 +309,6 @@
 
 $(PROGRAMS_TO_TEST:%=Output/%.out-cbe): \
 Output/%.out-cbe: Output/%.cbe
-	-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
-
-$(PROGRAMS_TO_TEST:%=Output/%.out-trace): \
-Output/%.out-trace: Output/%.trace
 	-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
 
 endif