X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2FMakefile.tests;h=b2e53006bf08dba1163dd6d08a1a757d9993062c;hb=052538124fc45e6d90e8678b130e819472612151;hp=3390d01b118ba5c06623ea1099c66eb71d858b8c;hpb=747604218fecb44cf3acf553984cfc57444bd7d4;p=oota-llvm.git

diff --git a/test/Makefile.tests b/test/Makefile.tests
index 3390d01b118..b2e53006bf0 100644
--- a/test/Makefile.tests
+++ b/test/Makefile.tests
@@ -1,83 +1,63 @@
-##-----------------------------------------------------------*-Makefile-*-
+##----------------------------------------------------------*- Makefile -*-===##
+##
 ## Common rules for generating, linking, and compiling via LLVM.  This is
 ## used to implement a robust testing framework for LLVM
-##------------------------------------------------------------------------
-
-## NOTE: This is preliminary and will change in the future
+##
+##-------------------------------------------------------------------------===##
+
+# 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
 
+# We do not want to make .d files for tests! 
+DISABLE_AUTO_DEPENDENCIES=1
 
 include ${LEVEL}/Makefile.common
 
-.PHONY: clean default
-
-## keep %.bc and %.s from being deleted while we're debugging
-.PRECIOUS: Output/%.bc Output/%.ll %.s Output/.dir
-
-
-TOOLS    = $(LEVEL)/tools/Debug
-
-LLI      = $(TOOLS)/lli
-LLC      = $(TOOLS)/llc
-LAS      = $(TOOLS)/gccas
-LDIS     = $(TOOLS)/dis 
-LOPT     = $(TOOLS)/opt
-LLINK    = $(TOOLS)/link
-LLCFLAGS =
-
-LCC      = /home/vadve/lattner/cvs/gcc_install/bin/gcc
-LCFLAGS  += -O2 -Wall
-
-LLCLIB   = $(LEVEL)/test/runtime.o
-LIBS    += $(LLCLIB)
-
-ifeq ($(TRACE), yes)
-    LLCFLAGS += -trace
-endif
-ifeq ($(TRACEM), yes)
-    LLCFLAGS += -tracem
+# 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
 
-NATGCC  = /usr/dcs/software/supported/bin/gcc
+.PHONY: clean default
 
-CC      = /opt/SUNWspro/bin/cc
-AS	= /opt/SUNWspro/bin/cc
-DIS     = /usr/ccs/bin/dis
-CP	= /bin/cp -f
-CFLAGS  += -g -xarch=v9
+# 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
 
-## Special target to force target-dependent library to be compiled
-## directly to native code.
-## 
-$(LLCLIB): $(LLCLIB:.o=.c)
-	cd $(LEVEL)/test; $(MAKE) $(@F)
+LCCFLAGS  += -O2 -Wall
+LCXXFLAGS += -O2 -Wall
+LLCFLAGS =
+TESTRUNR = @echo Running test: $<; \
+             PATH="$(LLVMTOOLCURRENT):$(PATH)" \
+                  $(LLVM_SRC_ROOT)/test/TestRunner.sh
 
-#runtime.o: runtime.c
-#	$(CC) -c $(CCFLAGS) $<
+LLCLIBS := $(LLCLIBS) -lm
 
-clean ::
-	$(RM) *.bc *.mc *.s *.o a.out core
+clean::
+	$(RM) -f a.out core
 	$(RM) -rf Output/
 
-%.mc: %.bc $(LLC) $(AS)
-	@echo "Generating machine instructions for $<"
-	$(LLC) -f -dsched y $(LLCFLAGS) $< > $@
-
-%.trace.bc: %.bc $(LLC)
-	$(LLC) -f -trace $(LLCFLAGS) $<
-
-
-Output/%.ll: %.c $(LCC) Output/.dir
-	$(LCC) $(LCFLAGS) -S $< -o $@
-
-Output/%.bc: Output/%.ll $(LAS)
-	$(LAS) $< -o $@
-
-#%.s: %.linked.bc
-#	$(LLC) -f $(LCFLAGS) $< -o $@
-
-#%: %.o $(LIBS)
-#	$(CC) $(LDFLAGS) $< $(LIBS) -o $@
+# 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 $@
 
+# 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) $< -o $@
 
 ## Cancel built-in implicit rules that override above rules
 %: %.s
@@ -86,11 +66,3 @@ Output/%.bc: Output/%.ll $(LAS)
 
 %.o: %.c
 
-## The next two rules are for disassembling an executable or an object file
-#%.dis: %
-#	$(DIS) $< > $@
-
-#%.dis: %.o
-#	$(DIS) $< > $@
-
-