Make SPEC tests share a common Makefile.

git-svn-id: https://llvm.org/svn/llvm-project/test-suite/trunk@11856 91177308-0d34-0410-b5e6-96231b3b80d8

19 files changed, 37 insertions, 211 deletions

diff --git a/External/SPEC/CFP2000/177.mesa/Makefile b/External/SPEC/CFP2000/177.mesa/Makefile
index b21b95bb..21f261e0 100644
--- a/External/SPEC/CFP2000/177.mesa/Makefile
+++ b/External/SPEC/CFP2000/177.mesa/Makefile
@@ -20,4 +20,4 @@ Source = $(addprefix $(SPEC_BENCH_DIR)/src/,  \
             texstate.c texture.c triangle.c varray.c vb.c vbfill.c vbrender.c \
             vbxform.c winpos.c xform.c mesa4.c)
 
-include ../../Makefile.spec
+include ../../Makefile.spec2000
diff --git a/External/SPEC/CFP2000/179.art/Makefile b/External/SPEC/CFP2000/179.art/Makefile
index 8f3aa52d..1919b831 100644
--- a/External/SPEC/CFP2000/179.art/Makefile
+++ b/External/SPEC/CFP2000/179.art/Makefile
@@ -8,4 +8,4 @@ endif
 STDOUT_FILENAME = $(RUN_TYPE).out
 
 CPPFLAGS =
-include ../../Makefile.spec
+include ../../Makefile.spec2000
diff --git a/External/SPEC/CFP2000/183.equake/Makefile b/External/SPEC/CFP2000/183.equake/Makefile
index 23956239..9f2a2662 100644
--- a/External/SPEC/CFP2000/183.equake/Makefile
+++ b/External/SPEC/CFP2000/183.equake/Makefile
@@ -3,4 +3,4 @@ RUN_OPTIONS     =
 STDIN_FILENAME  = inp.in
 STDOUT_FILENAME = inp.out
 CPPFLAGS =
-include ../../Makefile.spec
+include ../../Makefile.spec2000
diff --git a/External/SPEC/CFP2000/188.ammp/Makefile b/External/SPEC/CFP2000/188.ammp/Makefile
index ee2f8561..4929dc49 100644
--- a/External/SPEC/CFP2000/188.ammp/Makefile
+++ b/External/SPEC/CFP2000/188.ammp/Makefile
@@ -3,4 +3,4 @@ RUN_OPTIONS     =
 STDIN_FILENAME  = ammp.in
 STDOUT_FILENAME = ammp.out
 CPPFLAGS =
-include ../../Makefile.spec
+include ../../Makefile.spec2000
diff --git a/External/SPEC/CINT2000/164.gzip/Makefile b/External/SPEC/CINT2000/164.gzip/Makefile
index efb0ba6e..b3e8582a 100644
--- a/External/SPEC/CINT2000/164.gzip/Makefile
+++ b/External/SPEC/CINT2000/164.gzip/Makefile
@@ -1,4 +1,4 @@
 LEVEL = ../../../../../..
 RUN_OPTIONS     = `cat $(REF_IN_DIR)control`
 STDOUT_FILENAME := input.compressed.out
-include ../../Makefile.spec
+include ../../Makefile.spec2000
diff --git a/External/SPEC/CINT2000/175.vpr/Makefile b/External/SPEC/CINT2000/175.vpr/Makefile
index 81840f09..60757dcc 100644
--- a/External/SPEC/CINT2000/175.vpr/Makefile
+++ b/External/SPEC/CINT2000/175.vpr/Makefile
@@ -3,4 +3,4 @@ LDFLAGS = -lm
 RUN_OPTIONS     = net.in arch.in place.out dum.out -nodisp -place_only -init_t 5 -exit_t 0.005 -alpha_t 0.9412 -inner_num 2
 STDOUT_FILENAME := place_log.out
 CPPFLAGS := -DNO_GRAPHICS
-include ../../Makefile.spec
+include ../../Makefile.spec2000
diff --git a/External/SPEC/CINT2000/176.gcc/Makefile b/External/SPEC/CINT2000/176.gcc/Makefile
index da0eb70b..98e1d110 100644
--- a/External/SPEC/CINT2000/176.gcc/Makefile
+++ b/External/SPEC/CINT2000/176.gcc/Makefile
@@ -1,7 +1,7 @@
 LEVEL = ../../../../../..
 RUN_OPTIONS     = cccp.i -o cccp.s
 STDOUT_FILENAME = cccp.out
-include ../../Makefile.spec
+include ../../Makefile.spec2000
 ifeq ($(ARCH),Sparc)
   ## SPEC portability note for GCC says to use these flags and cross fingers:
   CPPFLAGS += -DHOST_WORDS_BIG_ENDIAN -DSPEC_CPU2000_LP64
diff --git a/External/SPEC/CINT2000/181.mcf/Makefile b/External/SPEC/CINT2000/181.mcf/Makefile
index 0b6bd6fa..7e641491 100644
--- a/External/SPEC/CINT2000/181.mcf/Makefile
+++ b/External/SPEC/CINT2000/181.mcf/Makefile
@@ -1,4 +1,4 @@
 LEVEL = ../../../../../..
 RUN_OPTIONS         := inp.in
 STDOUT_FILENAME := inp.out
-include ../../Makefile.spec
+include ../../Makefile.spec2000
diff --git a/External/SPEC/CINT2000/186.crafty/Makefile b/External/SPEC/CINT2000/186.crafty/Makefile
index 64e7b3eb..cfc7edd9 100644
--- a/External/SPEC/CINT2000/186.crafty/Makefile
+++ b/External/SPEC/CINT2000/186.crafty/Makefile
@@ -5,4 +5,4 @@ STDOUT_FILENAME = crafty.out
 CPPFLAGS = -DSPEC_CPU2000 -DLINUX_i386
 Source = $(addprefix $(SPEC_BENCH_DIR)/src/, attacks.c  draw.c   enprise.c   init.c      iterate.c  make.c    nexte.c   output.c  preeval.c  resign.c  searchr.c   swap.c    utility.c boolean.c  drawn.c  evaluate.c  input.c     lookup.c   movgen.c  nextr.c   phase.c   quiesce.c  root.c    setboard.c  time.c    validate.c  edit.c   history.c   interupt.c  main.c     next.c    option.c  ponder.c  repeat.c   search.c  store.c     unmake.c  valid.c)
 
-include ../../Makefile.spec
+include ../../Makefile.spec2000
diff --git a/External/SPEC/CINT2000/197.parser/Makefile b/External/SPEC/CINT2000/197.parser/Makefile
index b84ed64d..5338a7ea 100644
--- a/External/SPEC/CINT2000/197.parser/Makefile
+++ b/External/SPEC/CINT2000/197.parser/Makefile
@@ -3,4 +3,4 @@ RUN_OPTIONS     = 2.1.dict -batch
 STDIN_FILENAME  = $(RUN_TYPE).in
 STDOUT_FILENAME = $(RUN_TYPE).out
 CPPFLAGS =
-include ../../Makefile.spec
+include ../../Makefile.spec2000
diff --git a/External/SPEC/CINT2000/252.eon/Makefile b/External/SPEC/CINT2000/252.eon/Makefile
index 8c68d168..2fc8efa9 100755
--- a/External/SPEC/CINT2000/252.eon/Makefile
+++ b/External/SPEC/CINT2000/252.eon/Makefile
@@ -49,7 +49,7 @@ Source = $(addprefix $(SPEC_BENCH_DIR)/src/,  \
             mrInstance.cc mrMaterial.cc mrPhongAreaTriangleLuminaire.cc \
             mrSolidTexture.cc mrSphere.cc mrSurface.cc mrSurfaceTexture.cc \
             mrXYRectangle.cc mrXZRectangle.cc mrYZRectangle.cc myrand.cc)
-include ../../Makefile.spec
+include ../../Makefile.spec2000
 LDFLAGS = -lstdc++ -lm
 LIBS    = -lstdc++ -lm
 
diff --git a/External/SPEC/CINT2000/253.perlbmk/Makefile b/External/SPEC/CINT2000/253.perlbmk/Makefile
index 9fc8b9be..c0042247 100644
--- a/External/SPEC/CINT2000/253.perlbmk/Makefile
+++ b/External/SPEC/CINT2000/253.perlbmk/Makefile
@@ -8,4 +8,4 @@ ifneq ($(ARCH),Sparc)
 CPPFLAGS += -D__LITTLE_ENDIAN__
 endif
 
-include ../../Makefile.spec
+include ../../Makefile.spec2000
diff --git a/External/SPEC/CINT2000/254.gap/Makefile b/External/SPEC/CINT2000/254.gap/Makefile
index 127c0c27..b845a125 100644
--- a/External/SPEC/CINT2000/254.gap/Makefile
+++ b/External/SPEC/CINT2000/254.gap/Makefile
@@ -3,7 +3,7 @@ RUN_OPTIONS     = -l ./ -q -m 64M
 STDOUT_FILENAME = $(RUN_TYPE).out
 STDIN_FILENAME  = $(RUN_TYPE).in
 CPPFLAGS = -DSYS_IS_USG -DSYS_HAS_CALLOC_PROTO -DSYS_HAS_IOCTL_PROTO -DSYS_HAS_TIME_PROTO
-include ../../Makefile.spec
+include ../../Makefile.spec2000
 ifeq ($(ARCH),Sparc)
 CPPFLAGS+= -DSPEC_CPU2000_LP64
 endif
diff --git a/External/SPEC/CINT2000/255.vortex/Makefile b/External/SPEC/CINT2000/255.vortex/Makefile
index f485fc34..30ee81e5 100644
--- a/External/SPEC/CINT2000/255.vortex/Makefile
+++ b/External/SPEC/CINT2000/255.vortex/Makefile
@@ -1,7 +1,7 @@
 LEVEL = ../../../../../..
 #STDOUT_FILENAME := input.random.out
 
-include ../../Makefile.spec
+include ../../Makefile.spec2000
 
 ifeq ($(ARCH),Sparc)
   ## SPEC portability note for vortex says to use this flag on 64-bit machines
diff --git a/External/SPEC/CINT2000/256.bzip2/Makefile b/External/SPEC/CINT2000/256.bzip2/Makefile
index 45e8e88a..e8f5f542 100644
--- a/External/SPEC/CINT2000/256.bzip2/Makefile
+++ b/External/SPEC/CINT2000/256.bzip2/Makefile
@@ -1,4 +1,4 @@
 LEVEL = ../../../../../..
 RUN_OPTIONS     = `cat $(REF_IN_DIR)control`
 STDOUT_FILENAME := input.random.out
-include ../../Makefile.spec
+include ../../Makefile.spec2000
diff --git a/External/SPEC/CINT2000/300.twolf/Makefile b/External/SPEC/CINT2000/300.twolf/Makefile
index 57c1ce0a..c9c99740 100644
--- a/External/SPEC/CINT2000/300.twolf/Makefile
+++ b/External/SPEC/CINT2000/300.twolf/Makefile
@@ -2,5 +2,5 @@ LEVEL = ../../../../../..
 LDFLAGS = -lm
 RUN_OPTIONS     = $(RUN_TYPE)
 STDOUT_FILENAME = $(RUN_TYPE).net.stdout
-include ../../Makefile.spec
+include ../../Makefile.spec2000
 
diff --git a/External/SPEC/Makefile.spec b/External/SPEC/Makefile.spec
index 2f1a9472..ed3a3fd7 100644
--- a/External/SPEC/Makefile.spec
+++ b/External/SPEC/Makefile.spec
@@ -1,6 +1,7 @@
 ##===- Makefile.spec ---------------------------------------*- Makefile -*-===##
 #
-# This makefile contains information for building SPEC as an external test.
+# This makefile is a template for building SPEC as an external
+# test. It is included by Makefile.spec2000 and Makefile.spec95.
 #
 ##===----------------------------------------------------------------------===##
 
@@ -32,7 +33,7 @@ SPEC_SUBDIR := $(subst $(shell cd ../..; pwd),,$(CURRENT_DIR))
 BENCH_NAME  := $(patsubst /%,%,$(BENCH_NAME))
 SPEC_SUBDIR := $(patsubst /%,%,$(SPEC_SUBDIR))
 
-SPEC_BENCH_DIR := $(SPEC2000_ROOT)/$(SPEC_SUBDIR)
+SPEC_BENCH_DIR := $(SPEC_ROOT)/$(SPEC_SUBDIR)
 
 PROG := $(BENCH_NAME)
 ifndef Source
@@ -49,7 +50,7 @@ include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
 LCCFLAGS  := -O3
 LCXXFLAGS := -O3
 
-CPPFLAGS += -DSPEC_CPU2000 -I $(SPEC_BENCH_DIR)/src/
+CPPFLAGS += -I $(SPEC_BENCH_DIR)/src/
 SPEC_SANDBOX := $(LLVM_SRC_ROOT)/test/Programs/External/SPEC/Sandbox.sh
 
 # Information about testing the program...
@@ -195,4 +196,3 @@ Output/%.out-tracing: Output/%.trace
 $(PROGRAMS_TO_TEST:%=Output/%.performance): \
 Output/%.performance: Output/%.out-llc Output/%.out-tracing
 	-$(TIMESCRIPT) $* Output/$*.out-llc.time Output/$*.out-tracing.time $@
-
diff --git a/External/SPEC/Makefile.spec2000 b/External/SPEC/Makefile.spec2000
new file mode 100644
index 00000000..16ea2ce1
--- /dev/null
+++ b/External/SPEC/Makefile.spec2000
@@ -0,0 +1,12 @@
+##===- Makefile.spec2000 -----------------------------------*- Makefile -*-===##
+#
+# This makefile contains information for building SPEC2000 as an external test.
+#
+##===----------------------------------------------------------------------===##
+
+include $(LEVEL)/Makefile.config
+
+SPEC_ROOT := $(SPEC2000_ROOT)
+CPPFLAGS += -DSPEC_CPU2000
+
+include $(LEVEL)/test/Programs/External/SPEC/Makefile.spec
diff --git a/External/SPEC/Makefile.spec95 b/External/SPEC/Makefile.spec95
index bd2fcccf..6a2b2de9 100644
--- a/External/SPEC/Makefile.spec95
+++ b/External/SPEC/Makefile.spec95
@@ -1,198 +1,12 @@
-##===- Makefile.spec ---------------------------------------*- Makefile -*-===##
+##===- Makefile.spec95 -------------------------------------*- Makefile -*-===##
 #
-# This makefile contains information for building SPEC as an external test.
+# This makefile contains information for building SPEC95 as an external test.
 #
 ##===----------------------------------------------------------------------===##
 
 include $(LEVEL)/Makefile.config
 
-# RUN_TYPE - Either ref, test, or train.  May be specified on the command line.
-ifdef LARGE_PROBLEM_SIZE
-RUN_TYPE  := train
-else
-RUN_TYPE  := test
-endif
-
-## Information the test should have provided...
-ifndef STDOUT_FILENAME
-STDOUT_FILENAME := standard.out
-endif
-ifndef LDFLAGS
-LDFLAGS = -lm
-endif
-
-# Get the current directory, the name of the benchmark, and the current
-# subdirectory of the SPEC directory we are in (ie, CINT2000/164.gzip)
-#
-CURRENT_DIR := $(shell cd .; pwd)
-BENCH_NAME  := $(subst $(shell cd ..   ; pwd),,$(CURRENT_DIR))
-SPEC_SUBDIR := $(subst $(shell cd ../..; pwd),,$(CURRENT_DIR))
-
-# Remove any leading /'s from the paths
-BENCH_NAME  := $(patsubst /%,%,$(BENCH_NAME))
-SPEC_SUBDIR := $(patsubst /%,%,$(SPEC_SUBDIR))
-
-SPEC_BENCH_DIR := $(SPEC95_ROOT)/$(SPEC_SUBDIR)
-
-PROG := $(BENCH_NAME)
-ifndef Source
-Source := $(wildcard $(SPEC_BENCH_DIR)/src/*.c $(SPEC_BENCH_DIR)/src/*.cc)
-endif
-
-# Disable the default Output/%.out-* targets...
-PROGRAMS_HAVE_CUSTOM_RUN_RULES := 1
-SourceDir := $(SPEC_BENCH_DIR)/src/
-
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
-
-# Do not pass -Wall to compile commands...
-LCCFLAGS  := -O2
-LCXXFLAGS := -O2
-
-CPPFLAGS += -DSPEC_CPU2000 -I $(SPEC_BENCH_DIR)/src/
-SPEC_SANDBOX := $(LLVM_SRC_ROOT)/test/Programs/External/SPEC/Sandbox.sh
-
-# Information about testing the program...
-REF_IN_DIR  := $(SPEC_BENCH_DIR)/data/$(RUN_TYPE)/input/
-REF_OUT_DIR := $(SPEC_BENCH_DIR)/data/$(RUN_TYPE)/output/
-LOCAL_OUTPUTS := $(notdir $(wildcard $(REF_OUT_DIR)/*))
-
-
-# Specify how to generate output from the SPEC programs.  Basically we just run
-# the program in a sandbox (a special directory we create), then we cat all of
-# the outputs together.
-
-$(PROGRAMS_TO_TEST:%=Output/%.out-nat): \
-Output/%.out-nat: Output/%.native
-	$(SPEC_SANDBOX) nat-$(RUN_TYPE) $@ $(REF_IN_DIR) \
-             $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
-                  ../../$< $(RUN_OPTIONS)
-	-(cd Output/nat-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
-	-cp Output/nat-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
-
-$(PROGRAMS_TO_TEST:%=Output/%.out-lli): \
-Output/%.out-lli: Output/%.llvm.bc $(LLI)
-	$(SPEC_SANDBOX) lli-$(RUN_TYPE) $@ $(REF_IN_DIR) \
-             $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
-                  $(LLI) $(LLI_OPTS) ../../$< $(RUN_OPTIONS)
-	-(cd Output/lli-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
-	-cp Output/lli-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
-
-$(PROGRAMS_TO_TEST:%=Output/%.out-jit): \
-Output/%.out-jit: Output/%.llvm.bc $(LLI)
-	$(SPEC_SANDBOX) jit-$(RUN_TYPE) $@ $(REF_IN_DIR) \
-             $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
-                  $(LLI) $(JIT_OPTS) ../../$< $(RUN_OPTIONS)
-	-(cd Output/jit-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
-	-cp Output/jit-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
-
-$(PROGRAMS_TO_TEST:%=Output/%.out-jit-ls): \
-Output/%.out-jit-ls: Output/%.llvm.bc $(LLI)
-	$(SPEC_SANDBOX) jit-ls-$(RUN_TYPE) $@ $(REF_IN_DIR) \
-             $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
-                  $(LLI) -regalloc=linearscan $(JIT_OPTS) ../../$< $(RUN_OPTIONS)
-	-(cd Output/jit-ls-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
-	-cp Output/jit-ls-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
-
-$(PROGRAMS_TO_TEST:%=Output/%.out-llc): \
-Output/%.out-llc: Output/%.llc
-	$(SPEC_SANDBOX) llc-$(RUN_TYPE) $@ $(REF_IN_DIR) \
-             $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
-                  ../../$< $(RUN_OPTIONS)
-	-(cd Output/llc-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
-	-cp Output/llc-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
-
-$(PROGRAMS_TO_TEST:%=Output/%.out-llc-ls): \
-Output/%.out-llc-ls: Output/%.llc-ls
-	$(SPEC_SANDBOX) llc-ls-$(RUN_TYPE) $@ $(REF_IN_DIR) \
-             $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
-                  ../../$< $(RUN_OPTIONS)
-	-(cd Output/llc-ls-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
-	-cp Output/llc-ls-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
-
-$(PROGRAMS_TO_TEST:%=Output/%.out-cbe): \
-Output/%.out-cbe: Output/%.cbe
-	$(SPEC_SANDBOX) cbe-$(RUN_TYPE) $@ $(REF_IN_DIR) \
-             $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
-                  ../../$< $(RUN_OPTIONS)
-	-(cd Output/cbe-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
-	-cp Output/cbe-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
-
-$(PROGRAMS_TO_TEST:%=Output/%.trace-out-llc): \
-Output/%.trace-out-llc: Output/%.trace.llc
-	$(SPEC_SANDBOX) llc-$(RUN_TYPE) $@ $(REF_IN_DIR) \
-             $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
-                  ../../$< $(RUN_OPTIONS)
-	-(cd Output/llc-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
-	-cp Output/llc-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
-
-$(PROGRAMS_TO_TEST:%=Output/%.trace-out-cbe): \
-Output/%.trace-out-cbe: Output/%.trace.cbe
-	$(SPEC_SANDBOX) cbe-$(RUN_TYPE) $@ $(REF_IN_DIR) \
-             $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
-                  ../../$< $(RUN_OPTIONS)
-	-(cd Output/cbe-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
-	-cp Output/cbe-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
-
-
-# Specify stdin, reference output, and command line options for the program...
-BUGPOINT_OPTIONS += -input=$(STDIN_FILENAME) -output=../$*.out-nat
-BUGPOINT_OPTIONS += --args -- $(RUN_OPTIONS)
-
-# Rules to bugpoint the GCCAS, GCCLD, LLC, or LLI commands...
-$(PROGRAMS_TO_TEST:%=Output/%.bugpoint-gccas): \
-Output/%.bugpoint-gccas: Output/%.noopt-llvm.bc $(LBUGPOINT) \
-                         Output/gccas-pass-args Output/%.out-nat
-	$(SPEC_SANDBOX) bugpoint-$(RUN_TYPE) $@ $(REF_IN_DIR) \
-	    $(LBUGPOINT) ../../$< `cat Output/gccas-pass-args` $(BUGPOINT_OPTIONS)
-	@echo "===> Leaving Output/bugpoint-$(RUN_TYPE)"
-
-$(PROGRAMS_TO_TEST:%=Output/%.bugpoint-gccld): \
-Output/%.bugpoint-gccld: Output/%.noopt-llvm.bc $(LBUGPOINT) \
-                         Output/gccld-pass-args Output/%.out-nat
-	$(SPEC_SANDBOX) bugpoint-$(RUN_TYPE) $@ $(REF_IN_DIR) \
-	    $(LBUGPOINT) ../../$< `cat Output/gccld-pass-args` $(BUGPOINT_OPTIONS)
-	@echo "===> Leaving Output/bugpoint-$(RUN_TYPE)"
-
-$(PROGRAMS_TO_TEST:%=Output/%.bugpoint-llc): \
-Output/%.bugpoint-llc: Output/%.llvm.bc $(LBUGPOINT) Output/%.out-nat
-	$(SPEC_SANDBOX) bugpoint-$(RUN_TYPE) $@ $(REF_IN_DIR) \
-	    $(LBUGPOINT) ../../$< -run-llc $(BUGPOINT_OPTIONS)
-	@echo "===> Leaving Output/bugpoint-$(RUN_TYPE)"
-
-$(PROGRAMS_TO_TEST:%=Output/%.bugpoint-jit): \
-Output/%.bugpoint-jit: Output/%.llvm.bc $(LBUGPOINT) Output/%.out-nat
-	$(SPEC_SANDBOX) bugpoint-$(RUN_TYPE) $@ $(REF_IN_DIR) \
-	    $(LBUGPOINT) ../../$< -run-jit $(BUGPOINT_OPTIONS)
-	@echo "===> Leaving Output/bugpoint-$(RUN_TYPE)"
-
-
-LIBPROFILESO = $(LEVEL)/lib/Debug/libprofile_rt.so
-
-$(PROGRAMS_TO_TEST:%=Output/%.prof): \
-Output/%.prof: Output/%.llvm-prof.bc Output/%.out-nat $(LIBPROFILESO)
-	@rm -f $@
-	$(SPEC_SANDBOX) profile-$(RUN_TYPE) Output/$*.out-prof $(REF_IN_DIR) \
-	  $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) $(LLI) $(JIT_OPTS)\
-            -fake-argv0 '../$*.llvm.bc' -load ../../$(LIBPROFILESO) ../../$< -llvmprof-output ../../$@ $(RUN_OPTIONS)
-	-(cd Output/profile-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > Output/$*.out-prof
-	-cp Output/profile-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
-	@cmp -s Output/$*.out-prof Output/$*.out-nat || \
-		printf "***\n***\n*** WARNING: Output of profiled program (Output/$*.out-prof)\n*** doesn't match the output of the native program (Output/$*.out-nat)!\n***\n***\n";
-
-
-
-
-
-$(PROGRAMS_TO_TEST:%=Output/%.out-tracing): \
-Output/%.out-tracing: Output/%.trace
-	$(SPEC_SANDBOX) trace-$(RUN_TYPE) $@ $(REF_IN_DIR) \
-             $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
-                  ../../$< $(RUN_OPTIONS)
-	-(cd Output/trace-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
-	-cp Output/trace-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
-
-$(PROGRAMS_TO_TEST:%=Output/%.performance): \
-Output/%.performance: Output/%.out-llc Output/%.out-tracing
-	-$(TIMESCRIPT) $* Output/$*.out-llc.time Output/$*.out-tracing.time $@
+SPEC_ROOT := $(SPEC95_ROOT)
+CPPFLAGS += -DSPEC_CPU95
 
+include $(LEVEL)/test/Programs/External/SPEC/Makefile.spec