-## -*-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 from being deleted
-.PRECIOUS: %.linked.bc
+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_CFLAGS) -Wall
-
-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
-CCFLAGS = $(CFLAGS)
-LDFLAGS = $(CFLAGS)
-ASFLAGS = -c $(CFLAGS)
-
-## Special targets to build a program from multiple source files
-##
-ifdef PROG
+CP = /bin/cp -f
+CFLAGS += -g -xarch=v9
- default: $(PROG) $(PROG).native
+#LLCLIB = $(LEVEL)/test/Libraries/runtime.o
+#LIBS += $(LLCLIB)
- ifeq ($(strip $(OBJS)),)
- BCOBJS = $(PROG).bc
- else
- BCOBJS = $(OBJS:.o=.bc)
- endif
- $(PROG).linked.bc: $(BCOBJS)
- $(LLINK) -f $(BCOBJS) -o $@
- $(PROG).native: $(OBJS:.o=.c)
- gcc $(OBJS:.o=.c) -O2 $(LOCAL_CFLAGS) -Wall -o $@
+ifeq ($(TRACE), yes)
+ LLCFLAGS += -trace
+endif
+ifeq ($(TRACEM), yes)
+ LLCFLAGS += -tracem
endif
-## 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) *.[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) $<
-
-## Leave this rule out to avoid problems in tests that have both .c and .ll
-## %.ll: %.c
-## $(LCC) $(LCFLAGS) -S $< -o $*.ll
-
-%.bc: %.c
- $(LCC) $(LCFLAGS) -c $< -o $*.tmp.bc
- $(LOPT) -cleangcc -raise -constprop -dce $*.tmp.bc -o $@
- $(RM) $*.tmp.bc
-
-%.bc: %.ll
- $(LAS) -f $<
-
-%.linked.bc: %.bc
- $(CP) $< $@
-
-%.s: %.linked.bc
- $(LLC) -f $(LLCFLAGS) $< -o $@
-
-%: %.o $(LIBS)
- $(CC) $(LDFLAGS) $< $(LIBS) -o $@
+clean ::
+ $(RM) a.out core
+ $(RM) -rf Output/
+
+# 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/%.llvm.bc
+ $(LLC) $(LLCFLAGS) -f $< -o $@
+
+# Assemble (and link) an LLVM-linked program using the system assembler...
+#
+Output/%.llc: Output/%.llc.s
+ $(CC) $(CFLAGS) $< $(LIBS) -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
%.o: %.c
-## The next two rules are for disassembling an executable or an object file
-%.dis: %
- $(DIS) $< > $@
-
-%.dis: %.o
- $(DIS) $< > $@
-
-