[llvm-commits] CVS: llvm-test/MultiSource/Makefile.multisrc

[Reid Spencer]

Changes in directory llvm-test/MultiSource:

Makefile.multisrc updated: 1.56 -> 1.57
---
Log message:

For PR1159: http://llvm.org/PR1159 :
Avoid going to LLVM assembly files at all to improve performance of the
nightly test. Bytecode is now processed like this:

llvm-gcc -c -emit-llvm %.c -o %.bc
gccld -disable-opt -link-as-library *.bc -o %.linked.rbc
opt -std-compile-opts %.linked.rbc -o %.linked.bc
gccld %.linked.bc -o %.llvm

This eliminates one gccas invocation for each source file compilation, and 
two translations between .ll and .bc.


---
Diffs of the changes:  (+2 -14)

 Makefile.multisrc |   16 ++--------------
 1 files changed, 2 insertions(+), 14 deletions(-)


Index: llvm-test/MultiSource/Makefile.multisrc
diff -u llvm-test/MultiSource/Makefile.multisrc:1.56 llvm-test/MultiSource/Makefile.multisrc:1.57
--- llvm-test/MultiSource/Makefile.multisrc:1.56	Thu Jan 11 18:58:38 2007
+++ llvm-test/MultiSource/Makefile.multisrc	Fri Feb  2 22:30:17 2007
@@ -20,13 +20,13 @@
 include $(LEVEL)/Makefile.programs
 
 # Figure out what object files we want to build...
-LObjs    := $(sort $(addsuffix .rbc, $(notdir $(basename $(Source)))))
+LObjs    := $(sort $(addsuffix .bc, $(notdir $(basename $(Source)))))
 LObjects := $(addprefix Output/,$(LObjs))
 
 NObjs    := $(sort $(addsuffix .o, $(notdir $(basename $(Source)))))
 NObjects := $(addprefix Output/,$(NObjs))
 
-.PRECIOUS: $(LObjects) $(NObjects) Output/%.linked.rll
+.PRECIOUS: $(LObjects) $(NObjects)
 
 Output/%.o: %.c Output/.dir
 	-$(CC) $(CPPFLAGS) $(CFLAGS) -O2 $(TARGET_FLAGS) -c $< -o $@
@@ -48,11 +48,6 @@
 bugpoint-cbe:   Output/$(PROG).bugpoint-cbe
 misopt: Output/$(PROG).misopt.out
 
-# Raw bytecode files are files created by simply assembling the output of the
-# GCC frontend, without running any optimizations.
-#
-Output/%.rbc: Output/%.ll $(LGCCAS)
-	-$(LGCCAS) -disable-opt $< -o $@
 
 ifndef USE_PRECOMPILED_BYTECODE
 
@@ -60,13 +55,6 @@
 Output/%.linked.rbc: $(LObjects) $(LGCCLDPROG)
 	-$(LGCCLDPROG) -link-as-library -disable-opt $(LObjects) -o $@
 
-# Output/*.linked.ll is all of the bytecode files of the program linked together
-# without any libraries linked in...
-#
-$(PROGRAMS_TO_TEST:%=Output/%.linked.rll): \
-Output/%.linked.rll: Output/%.linked.rbc $(LDIS)
-	-$(LDIS) $< -o $@ -f
-
 $(PROGRAMS_TO_TEST:%=Output/%.LOC.txt): \
 Output/%.LOC.txt: $(Source)
 	cat $^ $(wildcard $(SourceDir)/*.h) | wc -l > $@