[llvm-commits] CVS: llvm/test/Programs/Makefile.programs

[Alkis Evlogimenos]

Changes in directory llvm/test/Programs:

Makefile.programs updated: 1.106 -> 1.107

---
Log message:

Add jit-ls targets.

Also modify the enviroment logic a bit. Disabling llc disables llc-ls
too even if ENABLE_LINEARSCAN is defined. Ditto for jit.


---
Diffs of the changes:  (+24 -4)

Index: llvm/test/Programs/Makefile.programs
diff -u llvm/test/Programs/Makefile.programs:1.106 llvm/test/Programs/Makefile.programs:1.107
--- llvm/test/Programs/Makefile.programs:1.106	Mon Jan  5 02:34:43 2004
+++ llvm/test/Programs/Makefile.programs	Sun Jan 11 23:27:31 2004
@@ -94,6 +94,7 @@
 NATOUTPUT := $(addsuffix .out-nat,  $(PREFIXED_PROGRAMS_TO_TEST))
 LLIOUTPUT := $(addsuffix .out-lli,  $(PREFIXED_PROGRAMS_TO_TEST))
 JITOUTPUT := $(addsuffix .out-jit,  $(PREFIXED_PROGRAMS_TO_TEST))
+JITLSOUTPUT := $(addsuffix .out-jit-ls,  $(PREFIXED_PROGRAMS_TO_TEST))
 LLCOUTPUT := $(addsuffix .out-llc,  $(PREFIXED_PROGRAMS_TO_TEST))
 LLCLSOUTPUT := $(addsuffix .out-llc-ls,  $(PREFIXED_PROGRAMS_TO_TEST))
 CBEOUTPUT := $(addsuffix .out-cbe,  $(PREFIXED_PROGRAMS_TO_TEST))
@@ -101,6 +102,7 @@
 # Diffs of program runs vs the native program
 LLIDIFFS  := $(addsuffix .diff-lli, $(PREFIXED_PROGRAMS_TO_TEST))
 JITDIFFS  := $(addsuffix .diff-jit, $(PREFIXED_PROGRAMS_TO_TEST))
+JITLSDIFFS  := $(addsuffix .diff-jit-ls, $(PREFIXED_PROGRAMS_TO_TEST))
 LLCDIFFS  := $(addsuffix .diff-llc, $(PREFIXED_PROGRAMS_TO_TEST))
 LLCLSDIFFS  := $(addsuffix .diff-llc-ls, $(PREFIXED_PROGRAMS_TO_TEST))
 CBEDIFFS  := $(addsuffix .diff-cbe, $(PREFIXED_PROGRAMS_TO_TEST))
@@ -166,6 +168,9 @@
 ifndef DISABLE_DIFFS
 ifndef DISABLE_LLC_DIFFS
 all:: $(LLCDIFFS)
+ifdef ENABLE_LINEARSCAN
+all:: $(LLCLSDIFFS)
+endif
 endif
 
 ifndef DISABLE_CBE_DIFFS
@@ -176,10 +181,9 @@
 ifndef DISABLE_JIT
 all:: $(JITDIFFS)
 endif
-endif
-
 ifdef ENABLE_LINEARSCAN
-all:: $(LLCLSDIFFS)
+all:: $(JITLSDIFFS)
+endif
 endif
 
 ifdef ENABLE_LLI
@@ -276,6 +280,7 @@
 
 LLI_OPTS = -force-interpreter=true $(EXTRA_LLI_OPTS)
 JIT_OPTS = -force-interpreter=false $(EXTRA_LLI_OPTS)
+JIT_LS_OPTS = -force-interpreter=false -regalloc=linearscan $(EXTRA_LLI_OPTS)
 
 native: $(PROGRAMS_TO_TEST:%=Output/%.native)
 stripped-bytecode:: $(PROGRAMS_TO_TEST:%=Output/%.llvm.stripped.bc)
@@ -297,7 +302,14 @@
 Output/%.out-jit: Output/%.llvm.bc $(LLI)
 	-$(RUNSAFELY) $(STDIN_FILENAME) $@ $(LLI) $(JIT_OPTS) $< $(RUN_OPTIONS)
 ifdef PROGRAM_REQUIRED_TO_EXIT_OK
-	@if test \! -f $@.exitok; then echo "TEST: $* FAILED!"; rm -f $@; fi
+	@if test \! -f $@.exitok; then echo "TEST (jit): $* FAILED!"; rm -f $@; fi
+endif
+
+$(PROGRAMS_TO_TEST:%=Output/%.out-jit-ls): \
+Output/%.out-jit-ls: Output/%.llvm.bc $(LLI)
+	-$(RUNSAFELY) $(STDIN_FILENAME) $@ $(LLI) $(JIT_LS_OPTS) $< $(RUN_OPTIONS)
+ifdef PROGRAM_REQUIRED_TO_EXIT_OK
+	@if test \! -f $@.exitok; then echo "TEST (jit-ls): $* FAILED!"; rm -f $@; fi
 endif
 
 $(PROGRAMS_TO_TEST:%=Output/%.out-llc): \
@@ -354,6 +366,10 @@
 Output/%.diff-jit: Output/%.out-nat Output/%.out-jit
 	-$(DIFFPROG) jit $* $(HIDEDIFF)
 
+$(PROGRAMS_TO_TEST:%=Output/%.diff-jit-ls): \
+Output/%.diff-jit-ls: Output/%.out-nat Output/%.out-jit-ls
+	-$(DIFFPROG) jit-ls $* $(HIDEDIFF)
+
 $(PROGRAMS_TO_TEST:%=Output/%.diff-llc): \
 Output/%.diff-llc: Output/%.out-nat Output/%.out-llc
 	-$(DIFFPROG) llc $* $(HIDEDIFF)
@@ -373,6 +389,10 @@
 
 $(PROGRAMS_TO_TEST:%=Output/%.exe-jit): \
 Output/%.exe-jit: Output/%.diff-jit
+	-cp $< $@
+
+$(PROGRAMS_TO_TEST:%=Output/%.exe-jit-ls): \
+Output/%.exe-jit-ls: Output/%.diff-jit-ls
 	-cp $< $@
 
 $(PROGRAMS_TO_TEST:%=Output/%.exe-llc): \