X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2FMakefile.tests;h=61312795350312fd9ab9ebd3f2992f8592db3ee5;hb=c43a4a4f84f0f2dbaec072ae7cefc47edadf1a61;hp=491ae53d82438a65e54fc33fda7650c1e226170f;hpb=54b7741dff59cd96647cee18e63df7689de28ca2;p=oota-llvm.git

diff --git a/test/Makefile.tests b/test/Makefile.tests
index 491ae53d824..61312795350 100644
--- a/test/Makefile.tests
+++ b/test/Makefile.tests
@@ -1,102 +1,121 @@
-## -*-Makefile-*-
-##------------------------------------------------------------------------
-## Common rules for generating, linking, and compiling via LLVM.
-##------------------------------------------------------------------------
+##----------------------------------------------------------*- 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
 
-.PHONY: clean default
+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
 
-## keep %.linked.bc from being deleted
-.PRECIOUS: %.linked.bc
 
+.PHONY: clean default
 
-TOOLS    = $(LEVEL)/tools/Debug
+# 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
+
+ifdef ENABLE_OPTIMIZED
+TOOLS    = $(BUILD_ROOT_TOP)/tools/Release
+else
+TOOLS    = $(BUILD_ROOT_TOP)/tools/Debug
+endif
 
+# LLVM Tool Definitions...
+#
+LCC      = $(LLVMGCCDIR)/bin/gcc
+LCC1     = $(LLVMGCCDIR)/lib/gcc-lib/$(LLVMGCCARCH)/cc1
+LCXX     = $(LLVMGCCDIR)/bin/g++
+LCC1XX   = $(LLVMGCCDIR)/lib/gcc-lib/$(LLVMGCCARCH)/cc1plus
+LLI      = $(TOOLS)/lli
 LLC      = $(TOOLS)/llc
 LAS      = $(TOOLS)/as
+LGCCAS   = $(TOOLS)/gccas
+LGCCLD   = $(TOOLS)/gccld -L$(LLVMGCCDIR)/lib/gcc-lib/$(LLVMGCCARCH) -L$(LLVMGCCDIR)/lib
 LDIS     = $(TOOLS)/dis 
 LOPT     = $(TOOLS)/opt
 LLINK    = $(TOOLS)/link
-LLCFLAGS =
+LANALYZE = $(TOOLS)/analyze
+LBUGPOINT= $(TOOLS)/bugpoint
 
-LCC      = /home/vadve/lattner/cvs/gcc_install/bin/gcc
-LCFLAGS  = -O2 $(LOCAL_CFLAGS) -Wall
+LCCFLAGS  += -O2 -Wall
+LCXXFLAGS += -O2 -Wall
+LLCFLAGS =
+FAILURE  = $(LEVEL)/test/Failure.sh
+TESTRUNR = $(LEVEL)/test/TestRunner.sh
 
-LLCLIB   = $(LEVEL)/test/runtime.o
-LIBS     = $(LLCLIB) $(LOCAL_LIBS)
+# Native Tool Definitions
+NATGCC  = /usr/dcs/software/supported/bin/gcc
+CP	= /bin/cp -f
 
 ifeq ($(TRACE), yes)
-    LLCFLAGS := $(LLCFLAGS) -trace
-endif
-
-CC      = /opt/SUNWspro/bin/cc
-AS	= /opt/SUNWspro/bin/cc
-DIS     = /usr/ccs/bin/dis
-CP	= /bin/cp -p
-CFLAGS  = -g -xarch=v9
-CCFLAGS = $(CFLAGS)
-LDFLAGS = $(CFLAGS)
-ASFLAGS = -c $(CFLAGS)
-
-## Special targets to build a program from multiple source files
-## 
-ifdef PROG
-
-  default:    $(PROG).clean.bc $(PROG).native $(PROG)
-
-  ifeq ($(strip $(OBJS)),)
-    BCOBJS = $(PROG).bc
-  else
-    BCOBJS = $(OBJS:.o=.bc)
-  endif
-
-  $(PROG).linked.bc: $(BCOBJS)
-	$(LLINK) -f $(BCOBJS) -o $@
-
-  $(PROG).clean.bc: $(PROG).linked.bc
-	$(LOPT) -cleangcc -raise -constprop -dce -o $@ -f $<
-
-  $(PROG).native: $(OBJS:.o=.c)
-	gcc $(OBJS:.o=.c) -O2 $(LOCAL_CFLAGS) -Wall -o $@
-
+    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
 endif
 
-## Special target to force target-dependent library to be compiled
-## directly to native code.
-## 
-$(LLCLIB):
-	cd $(LEVEL)/test; $(MAKE) $(@F)
+LLCLIBS := $(LLCLIBS) -lm
 
-runtime.o: runtime.c
-	$(CC) -c $(CCFLAGS) $<
+clean::
+	$(RM) a.out core
+	$(RM) -rf Output/
 
-clean :
-	$(RM) *.[123] *.bc *.mc *.s *.o a.out core $(PROG) 
+# Compile from X.c to Output/X.ll
+Output/%.ll: %.c $(LCC1) Output/.dir $(INCLUDES)
+	$(LCC) $(LCCFLAGS) -S $< -o $@
 
-%.mc: %.bc $(LLC) $(AS)
-	@echo "Generating machine instructions for $<"
-	$(LLC) -f -dsched y $(LLCFLAGS) $< > $@
+# Compile from X.cpp to Output/X.ll
+Output/%.ll: %.cpp $(LCC1XX) Output/.dir $(INCLUDES)
+	$(LCXX) $(LCXXFLAGS) -S $< -o $@
 
-%.trace.bc: %.bc $(LLC)
-	$(LLC) -f -trace $(LLCFLAGS) $<
+# 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 $@
 
-## Leave this rule out to avoid problems in tests that have both .c and .ll
-## %.ll: %.c
-## 	$(LCC) $(LCFLAGS) -S $< -o $*.ll
+# 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
+	$(LAS) -f $< -o $@
 
-%.bc: %.c
-	$(LCC) $(LCFLAGS) -c $< -o $@
+#
+# Testing versions of provided utilities...
+#
+Output/%.tll: %.c $(LCC1) Output/.dir $(INCLUDES)
+	@echo "======== Compiling $<"
+	$(LCC) $(LCCFLAGS) -S $< -o $@ || \
+	    ( rm -f $@; $(FAILURE) $@ )
 
-%.bc: %.ll
-	$(LAS) -f $<
+Output/%.tll: %.cpp $(LCC1XX) Output/.dir $(INCLUDES)
+	@echo "======== Compiling $<"
+	$(LCXX) $(LCXXFLAGS) -S $< -o $@ || \
+	    ( rm -f $@; $(FAILURE) $@ )
 
-%.linked.bc: %.bc
-	$(CP) $< $@
-
-%.s: %.clean.bc
-	$(LLC) -f $(LLCFLAGS) $< -o $@
-
-%: %.o $(LIBS)
-	$(CC) $(LDFLAGS) $< $(LIBS) -o $@
+Output/%.tbc: Output/%.tll $(LAS)
+	@echo "======== Assembling $<"
+	$(LAS) -f $< -o $@ || \
+            ( rm -f $@; $(FAILURE) $@ )
 
 
 ## Cancel built-in implicit rules that override above rules
@@ -106,11 +125,3 @@ clean :
 
 %.o: %.c
 
-## The next two rules are for disassembling an executable or an object file
-%.dis: %
-	$(DIS) $< > $@
-
-%.dis: %.o
-	$(DIS) $< > $@
-
-