X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2FMakefile.tests;h=27254ed93ff69a68ba0a4a61e1185c919fe4a664;hb=e76c4f6edf338cf9f8eb583cb47b825dbdc368b5;hp=beac97847c5fa2df5f5398248bbb9de4ddc816d8;hpb=0ab42dce0822570b06231febc4300836aa5e4a84;p=oota-llvm.git

diff --git a/test/Makefile.tests b/test/Makefile.tests
index beac97847c5..27254ed93ff 100644
--- a/test/Makefile.tests
+++ b/test/Makefile.tests
@@ -1,100 +1,106 @@
-## -*-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
 ##------------------------------------------------------------------------
 
-.PHONY: clean default
+## NOTE: This is preliminary and will change in the future
 
-## keep %.linked.bc and %.s from being deleted while we're debugging
-.PRECIOUS: %.linked.bc %.s
 
+include ${LEVEL}/Makefile.common
 
-TOOLS    = $(LEVEL)/tools/Debug
+.PHONY: clean default
+
+# 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
 
+# LLVM Tool Definitions...
+#
+LCC      = /home/vadve/lattner/cvs/gcc_install/bin/gcc
+LCC1     = /home/vadve/lattner/cvs/gcc_install/lib/gcc-lib/llvm/3.1/cc1
+TOOLS    = $(LEVEL)/tools/Debug
+LLI      = $(TOOLS)/lli
 LLC      = $(TOOLS)/llc
 LAS      = $(TOOLS)/as
+LGCCAS   = $(TOOLS)/gccas
+LGCCLD   = $(TOOLS)/gccld -L/home/vadve/lattner/cvs/gcc_install/lib/gcc-lib/llvm/3.1/
 LDIS     = $(TOOLS)/dis 
 LOPT     = $(TOOLS)/opt
 LLINK    = $(TOOLS)/link
-LLCFLAGS =
-
-LCC      = /home/vadve/lattner/cvs/gcc_install/bin/gcc
-LCFLAGS  = -O2 $(LOCAL_LCFLAGS) -Wall
+LANALYZE = $(TOOLS)/analyze
 
-LLCLIB   = $(LEVEL)/test/runtime.o
-LIBS     = $(LLCLIB) $(LOCAL_LIBS)
-
-ifeq ($(TRACE), yes)
-    LLCFLAGS := $(LLCFLAGS) -trace
-endif
+LCCFLAGS  += -O2 -Wall
+LLCFLAGS =
+FAILURE  = $(LEVEL)/test/Failure.sh
+TESTRUNR = $(LEVEL)/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
-CP	= /bin/cp -p
-CFLAGS  = -g -xarch=v9 $(LOCAL_CFLAGS)
-CCFLAGS = $(CFLAGS)
-LDFLAGS = $(CFLAGS) $(LOCAL_LDFLAGS)
-ASFLAGS = -c $(CFLAGS)
-
-## Special targets to build a program from multiple source files
-## 
-ifdef PROG
-
-  default:    $(PROG) $(PROG).native
-
-  ifeq ($(strip $(OBJS)),)
-    BCOBJS = $(PROG).bc
-  else
-    BCOBJS = $(OBJS:.o=.bc)
-  endif
-
-  $(PROG).linked.bc: $(BCOBJS)
-	$(LLINK) -f $(BCOBJS) -o $(PROG).tmp.bc
-	$(LOPT) -cleangcc -raise -constprop -dce $(PROG).tmp.bc -o $@
-	$(RM) $(PROG).tmp.bc
-
-  $(PROG).native: $(OBJS:.o=.c)
-	$(CC) $(OBJS:.o=.c) -O $(LOCAL_LCFLAGS) $(CFLAGS) -lm -o $@
-endif
+CP	= /bin/cp -f
+CFLAGS  += -g -xarch=v9
 
-## Special target to force target-dependent library to be compiled
-## directly to native code.
-## 
-$(LLCLIB): $(LLCLIB:.o=.c)
-	cd $(LEVEL)/test; $(MAKE) $(@F)
 
-runtime.o: runtime.c
-	$(CC) -c $(CCFLAGS) $<
+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
+endif
 
-clean :
-	$(RM) *.[123] *.bc *.mc *.s *.o a.out core $(PROG) 
+LLCLIBS := $(LLCLIBS) -lm
 
-%.mc: %.bc $(LLC) $(AS)
-	@echo "Generating machine instructions for $<"
-	$(LLC) -f -dsched y $(LLCFLAGS) $< > $@
+clean ::
+	$(RM) a.out core
+	$(RM) -rf Output/
 
-%.trace.bc: %.bc $(LLC)
-	$(LLC) -f -trace $(LLCFLAGS) $<
+# Compile from X.c to Output/X.ll
+Output/%.ll: %.c $(LCC1) Output/.dir $(INCLUDES)
+	$(LCC) $(LCCFLAGS) -S $< -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 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 $@
 
-%.bc: %.c
-	$(LCC) $(LCFLAGS) -c $< -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
+	$(LAS) -f $< -o $@
 
-%.bc: %.ll
-	$(LAS) -f $<
+# Compile a linked program to machine code for this processor.
+#
+Output/%.llc.s: Output/%.llvm.bc
+	$(LLC) $(LLCFLAGS) -f $< -o $@
 
-%.linked.bc: %.bc
-	$(CP) $< $@
+# Assemble (and link) an LLVM-linked program using the system assembler...
+#
+Output/%.llc: Output/%.llc.s
+	$(CC) $(CFLAGS) $< $(LLCLIBS) -o $@
 
-%.s: %.linked.bc
-	$(LLC) -f $(LLCFLAGS) $< -o $@
+#
+# Testing versions of provided utilities...
+#
+Output/%.tll: %.c $(LCC1) Output/.dir $(INCLUDES)
+	@echo "======== Compiling $<"
+	$(LCC) $(LCCFLAGS) -S $< -o $@ || \
+	    ( rm -f $@; $(FAILURE) $@ )
 
-%: %.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
@@ -104,11 +110,3 @@ clean :
 
 %.o: %.c
 
-## The next two rules are for disassembling an executable or an object file
-%.dis: %
-	$(DIS) $< > $@
-
-%.dis: %.o
-	$(DIS) $< > $@
-
-