X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2FMakefile.tests;h=ad9f2eabc7f1448143f2028dbc2e4c1648e5a4b6;hb=f45a82890e34984ad1e1e259f8fb902caddfb0b1;hp=7e54ccc555f5b155970d89399470a813c974414f;hpb=772d091e0046b2bfff4887e0ebf35a2e0b82f4f9;p=oota-llvm.git

diff --git a/test/Makefile.tests b/test/Makefile.tests
index 7e54ccc555f..ad9f2eabc7f 100644
--- a/test/Makefile.tests
+++ b/test/Makefile.tests
@@ -1,100 +1,80 @@
-## -*-Makefile-*-
-##------------------------------------------------------------------------
-## Common rules for generating, linking, and compiling via LLVM.
-##------------------------------------------------------------------------
-
-.PHONY: clean default
-
-## Special targets to build a program from multiple source files
-## 
-ifdef PROG
-  default:    $(PROG)
-  .SECONDARY: $(PROG).clean.bc	## keep %.clean.bc from being deleted
-
-  $(PROG).bc: $(OBJS)
-	$(LLINK) -f $(OBJS) -o $@
+##----------------------------------------------------------*- Makefile -*-===##
+##
+## Common rules for generating, linking, and compiling via LLVM.  This is
+## used to implement a robust testing framework for LLVM
+##
+##-------------------------------------------------------------------------===##
+
+# If the user specified a TEST= option on the command line, we do not want to do
+# the default testing type.  Instead, we change the default target to be the
+# test:: target.
+#
+ifdef TEST
+test::
 endif
 
-TOOLS    = $(LEVEL)/tools/Debug
+# We do not want to make .d files for tests! 
+DISABLE_AUTO_DEPENDENCIES=1
 
-LLC      = $(TOOLS)/llc
-LAS      = $(TOOLS)/as
-LDIS     = $(TOOLS)/dis 
-LOPT     = $(TOOLS)/opt
-LLINK    = $(TOOLS)/link
-LLCFLAGS =
-
-LCC      = /home/vadve/lattner/cvs/gcc_install/bin/gcc
-LCFLAGS  = -O2 $(LOCAL_CFLAGS) -Wall
+include ${LEVEL}/Makefile.common
 
-LLCLIB   = $(LEVEL)/test/runtime.o
-LIBS     = $(LLCLIB) $(LOCAL_LIBS)
-
-ifeq ($(TRACE), yes)
-    LLCFLAGS := $(LLCFLAGS) -trace
+# Specify ENABLE_STATS on the command line to enable -stats and -time-passes
+# output from gccas and gccld.
+ifdef ENABLE_STATS
+STATS = -stats -time-passes
 endif
 
-CC      = /opt/SUNWspro/bin/cc
-AS	= /opt/SUNWspro/bin/cc
-DIS     = /usr/ccs/bin/dis
-CFLAGS  = -g -xarch=v9
-CCFLAGS = $(CFLAGS)
-LDFLAGS = $(CFLAGS)
-ASFLAGS = -c $(CFLAGS)
-
-
-## Special target to force target-dependent library to be compiled
-## directly to native code.
-## 
-$(LLCLIB):
-	cd $(LEVEL)/test; $(MAKE) $(@F)
+.PHONY: clean default
 
-runtime.o: runtime.c
-	$(CC) -c $(CCFLAGS) $<
+# These files, which might be intermediate results, should not be deleted by
+# make
+.PRECIOUS: Output/%.bc  Output/%.ll
+.PRECIOUS: Output/%.tbc Output/%.tll
+.PRECIOUS: Output/.dir
+.PRECIOUS: Output/%.llvm.bc
+.PRECIOUS: Output/%.llvm
 
-clean :
-	rm -f *.[123] *.bc *.mc *.s *.o a.out core $(PROG) 
+LCCFLAGS  += -O2 -Wall
+LCXXFLAGS += -O2 -Wall
+LLCFLAGS =
+TESTRUNR = @echo Running test: $<; \
+             PATH="$(LLVMTOOLCURRENT):$(LLVM_SRC_ROOT)/test/Scripts:$(PATH)" \
+                  $(LLVM_SRC_ROOT)/test/TestRunner.sh
 
-%.mc: %.bc $(LLC) $(AS)
-	@echo "Generating machine instructions for $<"
-	$(LLC) -f -dsched y $(LLCFLAGS) $< > $@
+LLCLIBS := $(LLCLIBS) -lm
 
-%.trace.bc: %.bc $(LLC)
-	$(LLC) -f -trace $(LLCFLAGS) $<
+clean::
+	$(RM) -f a.out core
+	$(RM) -rf Output/
 
-%.o: %.c
-	$(LCC) $(LCFLAGS) -S -o $*.ll $<
-	$(LAS) -o $@ $*.ll
+# Compile from X.c to Output/X.ll
+Output/%.ll: %.c $(LCC1) Output/.dir $(INCLUDES)
+	-$(LLVMGCCWITHPATH) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@
 
-%.bc: %.ll
-	$(LAS) -f $<
+# Compile from X.cpp to Output/X.ll
+Output/%.ll: %.cpp $(LCC1XX) Output/.dir $(INCLUDES)
+	-$(LLVMGXXWITHPATH) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
 
-%.clean.bc: %.bc
-	$(LOPT) -cleangcc -raise -constprop -dce < $< > $@
+# Compile from X.cc to Output/X.ll
+Output/%.ll: %.cc $(LCC1XX) Output/.dir $(INCLUDES)
+	-$(LLVMGXXWITHPATH) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
 
-%.s: %.bc
-	$(LLC) -f $(LLCOPTS) $<
+# LLVM Assemble from Output/X.ll to Output/X.bc.  Output/X.ll must have come
+# from GCC output, so use GCCAS.
+#
+Output/%.bc: Output/%.ll $(LGCCAS)
+	-$(LGCCAS) $(STATS) $< -o $@
 
-%: %.o $(LIBS)
-	$(CC) -o $@ $(LDFLAGS) $< $(LIBS)
+# LLVM Assemble from X.ll to Output/X.bc.  Because we are coming directly from
+# LLVM source, use the non-transforming assembler.
+#
+Output/%.bc: %.ll $(LLVMAS) Output/.dir
+	-$(LLVMAS) -f $< -o $@
 
-## 
-## Use a single rule to go from %.bc to % to avoid ambiguity in
-## llvm bytecode files and native object code files, both named %.o
-## 
-%: %.clean.bc $(LIBS)
-	$(LLC) -f $(LLCFLAGS) -o $*.s $<
-	$(AS) $(ASFLAGS) $*.s
-	$(CC) -o $@ $(LDFLAGS) $*.o $(LIBS)
-
-## Cancel built-in implicit rule that overrides the above rule
+## Cancel built-in implicit rules that override above rules
 %: %.s
 
-## The next two rules are for disassembling an executable or an object file
-%.dis: %
-	$(DIS) $< > $@
-
-%.dis: %.o
-	$(DIS) $< > $@
+%: %.c
 
+%.o: %.c