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

diff --git a/test/Makefile.tests b/test/Makefile.tests
index 7eb189e5412..27254ed93ff 100644
--- a/test/Makefile.tests
+++ b/test/Makefile.tests
@@ -1,97 +1,112 @@
-.PHONY: clean default
+##-----------------------------------------------------------*-Makefile-*-
+## Common rules for generating, linking, and compiling via LLVM.  This is
+## used to implement a robust testing framework for LLVM
+##------------------------------------------------------------------------
 
-## Special targets to build a program from multiple source files
-## 
-ifdef PROG
-  default:    $(PROG)
-  .SECONDARY: $(PROG).clean.bc	## keep %.clean.bc from being deleted
+## NOTE: This is preliminary and will change in the future
 
-  $(PROG).bc: $(OBJS)
-	$(LLINK) -f $(OBJS) -o $@
-endif
 
-TOOLS    = $(LEVEL)/tools/Debug
+include ${LEVEL}/Makefile.common
+
+.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  = -DTORONTO -O2 $(LOCAL_CFLAGS) -Wall
-
-LLCLIB   = $(LEVEL)/test/runtime.o
-LIBS     = $(LLCLIB) $(LOCAL_LIBS)
+LANALYZE = $(TOOLS)/analyze
 
-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
-CFLAGS  = -g -xarch=v9
-CCFLAGS = $(CFLAGS)
-LDFLAGS = $(CFLAGS)
-ASFLAGS = -c $(CFLAGS)
-
+CP	= /bin/cp -f
+CFLAGS  += -g -xarch=v9
 
-## Special target to force target-dependent library to be compiled
-## directly to native code.
-## 
-$(LLCLIB):
-	cd $(LEVEL)/test; $(MAKE) $(@F)
 
-runtime.o: runtime.c
-	$(CC) -c $(CCFLAGS) $<
-
-clean :
-	rm -f *.[123] *.bc *.mc *.s *.o a.out core $(PROG) 
-
-%.mc: %.bc $(LLC) $(AS)
-	@echo "Generating machine instructions for $<"
-	$(LLC) -f -dsched y $(LLCFLAGS) $< > $@
-
-%.trace.bc: %.bc $(LLC)
-	$(LLC) -f -trace $(LLCFLAGS) $<
-
-%.o: %.c
-	$(LCC) $(LCFLAGS) -c $<
-
-%.bc: %.ll
-	$(LAS) -f $<
-
-%.ll: %.bc
-	$(LDIS) -f $<
-
-%.clean.bc: %.bc
-	$(LOPT) -cleangcc -raise -constprop -dce < $< > $@
-
-%.s: %.bc
-	$(LLC) -f $(LLCOPTS) $<
-
-%: %.o $(LIBS)
-	$(CC) -o $@ $(LDFLAGS) $< $(LIBS)
-
-## 
-## 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)
+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
 
-## Cancel built-in implicit rule that overrides the above rule
+LLCLIBS := $(LLCLIBS) -lm
+
+clean ::
+	$(RM) a.out core
+	$(RM) -rf Output/
+
+# Compile from X.c to Output/X.ll
+Output/%.ll: %.c $(LCC1) Output/.dir $(INCLUDES)
+	$(LCC) $(LCCFLAGS) -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 $@
+
+# 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 $@
+
+# 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: %.c $(LCC1) Output/.dir $(INCLUDES)
+	@echo "======== Compiling $<"
+	$(LCC) $(LCCFLAGS) -S $< -o $@ || \
+	    ( rm -f $@; $(FAILURE) $@ )
+
+Output/%.tbc: Output/%.tll $(LAS)
+	@echo "======== Assembling $<"
+	$(LAS) -f $< -o $@ || \
+            ( rm -f $@; $(FAILURE) $@ )
+
+
+## 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