Minor changes.

[oota-llvm.git] / test / Makefile.tests

diff --git a/test/Makefile.tests b/test/Makefile.tests
index 1f283410d820cbcc13dbbbe58080ff1d2a98cf4d..c6c7862ea04979a1090338c5c346de04c8e770b1 100644 (file)
--- a/test/Makefile.tests
+++ b/test/Makefile.tests
@@ -10,26 +10,44 @@ 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
-
-
+# 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
+
+# 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)/gccas
+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
+
+LCCFLAGS  += -O2 -Wall
 LLCFLAGS =
+FAILURE  = $(LEVEL)/test/Failure.sh
+TESTRUNR = $(LEVEL)/test/TestRunner.sh
 
-LCC      = /home/vadve/lattner/cvs/gcc_install/bin/gcc
-LCFLAGS  += -O2 -Wall
+# 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 -f
+CFLAGS  += -g -xarch=v9
 
 LLCLIB   = $(LEVEL)/test/runtime.o
 LIBS    += $(LLCLIB)
 
+
+
 ifeq ($(TRACE), yes)
     LLCFLAGS += -trace
 endif
@@ -37,50 +55,48 @@ ifeq ($(TRACEM), yes)
     LLCFLAGS += -tracem
 endif
 
-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 -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) $<
-
 clean ::
-       $(RM) *.bc *.mc *.s *.o a.out core
+       $(RM) 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) $<
-
-
-## FIXME: LIBS should be specified, not hardcoded to -lm
-#Output/%.native: %.c Output/.dir
-#      $(NATGCC) $+ -lm -o $@
-
-Output/%.ll: %.c $(LCC) Output/.dir
-       $(LCC) $(LCFLAGS) -S $< -o $@
-
-%.bc: %.ll $(LAS)
-       $(LAS) $< -o $@
-
-#%.s: %.linked.bc
-#      $(LLC) -f $(LCFLAGS) $< -o $@
-
-#%: %.o $(LIBS)
-#      $(CC) $(LDFLAGS) $< $(LIBS) -o $@
+# Compile from X.c to Output/X.ll
+Output/%.ll: %.c $(LCC1) Output/.dir
+       $(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/%.linked.bc
+       $(LLC) $(LLCFLAGS) -f $< -o $@
+
+# Assemble (and link) an LLVM-linked program using the system assembler...
+#
+Output/%.llc: Output/%.llc.s
+       $(CC) $(CFLAGS) $< -o $@
+
+#
+# Testing versions of provided utilities...
+#
+Output/%.tll: %.c $(LCC1) Output/.dir
+       @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
@@ -90,11 +106,3 @@ Output/%.ll: %.c $(LCC) Output/.dir
 
 %.o: %.c
 
-## The next two rules are for disassembling an executable or an object file
-%.dis: %
-       $(DIS) $< > $@
-
-%.dis: %.o
-       $(DIS) $< > $@
-
-