X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2FMakefile.tests;h=7b18402e366abdb6fb95e535ac3496cf1f8a2a59;hb=54bda7e66ded623da056099e01a4b91f0174d500;hp=9d321ea58542192fcd4c1404a56181e334ccb3b7;hpb=c63ffc54e545b8ba1ad8a973b275634758d12334;p=oota-llvm.git

diff --git a/test/Makefile.tests b/test/Makefile.tests
index 9d321ea5854..7b18402e366 100644
--- a/test/Makefile.tests
+++ b/test/Makefile.tests
@@ -1,13 +1,29 @@
-##-----------------------------------------------------------*-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
 
+# 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
+
 .PHONY: clean default
 
 # These files, which might be intermediate results, should not be deleted by
@@ -18,83 +34,110 @@ include ${LEVEL}/Makefile.common
 .PRECIOUS: Output/%.llvm.bc
 .PRECIOUS: Output/%.llvm
 
+TOOLS    = $(LLVMTOOLCURRENT)
+
 # LLVM Tool Definitions...
 #
-LCC      = $(LLVMGCCDIR)/bin/gcc
-LCC1     = $(LLVMGCCDIR)/lib/gcc-lib/llvm/3.1/cc1
-TOOLS    = $(BUILD_ROOT_TOP)/tools/Debug
+LCC      = $(LLVMGCC)   ## FIXME: remove these definitions, use LLVMGCC directly
+LCXX     = $(LLVMGXX)   ## FIXME: remove these definitions, use LLVMGXX directly
+LAS      = $(LLVMAS)    ## FIXME: remove these definitions, use LLVMAS directly
+
 LLI      = $(TOOLS)/lli
 LLC      = $(TOOLS)/llc
-LAS      = $(TOOLS)/as
 LGCCAS   = $(TOOLS)/gccas
-LGCCLD   = $(TOOLS)/gccld -L$(LLVMGCCDIR)/lib/gcc-lib/llvm/3.1/
-LDIS     = $(TOOLS)/dis 
+LGCCLD   = $(TOOLS)/gccld -L$(LLVMGCCDIR)/lib/gcc/$(LLVMGCCARCH) -L$(LLVMGCCDIR)/lib
+LGCCLDPROG = $(TOOLS)/gccld
+LDIS     = $(TOOLS)/llvm-dis 
 LOPT     = $(TOOLS)/opt
 LLINK    = $(TOOLS)/link
 LANALYZE = $(TOOLS)/analyze
+LBUGPOINT= $(TOOLS)/bugpoint
 
 LCCFLAGS  += -O2 -Wall
+LCXXFLAGS += -O2 -Wall
 LLCFLAGS =
-FAILURE  = $(LEVEL)/test/Failure.sh
-TESTRUNR = $(LEVEL)/test/TestRunner.sh
+FAILURE  = $(LLVM_SRC_ROOT)/test/Failure.sh
+TESTRUNR = @echo Running test: $<; \
+             PATH=$(LLVMTOOLCURRENT):$(LLVM_SRC_ROOT)/test/Scripts:$(PATH) \
+                  $(LLVM_SRC_ROOT)/test/TestRunner.sh
 
 # Native Tool Definitions
-NATGCC  = /usr/dcs/software/supported/bin/gcc
-## CC      = /opt/SUNWspro/bin/cc
-## AS	= /opt/SUNWspro/bin/cc
-## DIS     = /usr/ccs/bin/dis
-## CFLAGS  += -g -xarch=v9
+NATGCC  = $(CC)
 CP	= /bin/cp -f
 
-
+## If TRACE or TRACEM is "yes", set the appropriate llc flag (-trace or -tracem)
+## mark that tracing on, and set the TRACELIBS variable.
+TRACEFLAGS = 
 ifeq ($(TRACE), yes)
-    LLCFLAGS += -trace basicblock
-    LLCLIBS := -L$(LEVEL)/test/Libraries/Output -linstr64
-else
-    ifeq ($(TRACEM), yes)
-        LLCFLAGS += -trace function
-	LLCLIBS := -L$(LEVEL)/test/Libraries/Output -linstr64
-    endif
+    TRACEFLAGS = -trace
+    TRACELIBS := -L$(LEVEL)/test/Libraries/Output -linstr.$(ARCH)
+endif
+
+ifeq ($(TRACEM), yes)
+    TRACEFLAGS = -tracem
+    TRACELIBS := -L$(LEVEL)/test/Libraries/Output -linstr.$(ARCH)
 endif
 
 LLCLIBS := $(LLCLIBS) -lm
 
 clean::
-	$(RM) a.out core
+	$(RM) -f a.out core
 	$(RM) -rf Output/
 
 # Compile from X.c to Output/X.ll
+Output/%.ll: $(SourceDir)/%.c $(LCC1) Output/.dir $(INCLUDES)
+	$(LCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@
+
 Output/%.ll: %.c $(LCC1) Output/.dir $(INCLUDES)
-	$(LCC) $(LCCFLAGS) -S $< -o $@
+	$(LCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@
+
+# Compile from X.cpp to Output/X.ll
+Output/%.ll: $(SourceDir)/%.cpp $(LCC1XX) Output/.dir $(INCLUDES)
+	$(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
+
+Output/%.ll: %.cpp $(LCC1XX) Output/.dir $(INCLUDES)
+	$(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
+
+# Compile from X.cc to Output/X.ll
+Output/%.ll: $(SourceDir)/%.cc $(LCC1XX) Output/.dir $(INCLUDES)
+	$(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
+
+Output/%.ll: %.cc $(LCC1XX) Output/.dir $(INCLUDES)
+	$(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -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) $< -o $@
+	$(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 $(LAS) Output/.dir
+Output/%.bc: $(SourceDir)/%.ll $(LAS) Output/.dir
 	$(LAS) -f $< -o $@
 
-# Compile a linked program to machine code for this processor.
-#
-Output/%.llc.s: Output/%.llvm.bc
-	$(LLC) $(LLCFLAGS) -f $< -o $@
-
-# Assemble (and link) an LLVM-linked program using the system assembler...
-#
-Output/%.llc: Output/%.llc.s
-	$(CC) $(CFLAGS) $< $(LLCLIBS) -o $@
-
 #
 # Testing versions of provided utilities...
 #
+Output/%.tll: $(SourceDir)/%.c $(LCC1) Output/.dir $(INCLUDES)
+	@echo "======== Compiling $<"
+	$(LCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@ || \
+	    ( rm -f $@; $(FAILURE) $@ )
+
 Output/%.tll: %.c $(LCC1) Output/.dir $(INCLUDES)
 	@echo "======== Compiling $<"
-	$(LCC) $(LCCFLAGS) -S $< -o $@ || \
+	$(LCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@ || \
+	    ( rm -f $@; $(FAILURE) $@ )
+
+Output/%.tll: $(SourceDir)/%.cpp $(LCC1XX) Output/.dir $(INCLUDES)
+	@echo "======== Compiling $<"
+	$(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@ || \
+	    ( rm -f $@; $(FAILURE) $@ )
+
+Output/%.tll: %.cpp $(LCC1XX) Output/.dir $(INCLUDES)
+	@echo "======== Compiling $<"
+	$(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@ || \
 	    ( rm -f $@; $(FAILURE) $@ )
 
 Output/%.tbc: Output/%.tll $(LAS)