[llvm-commits] CVS: llvm/test/Programs/External/SPEC/Makefile.spec2000 Makefile.spec95 Makefile.spec
Alkis Evlogimenos
alkis at niobe.cs.uiuc.edu
Wed Feb 25 18:02:34 PST 2004
Changes in directory llvm/test/Programs/External/SPEC:
Makefile.spec2000 added (r1.1)
Makefile.spec95 updated: 1.4 -> 1.5
Makefile.spec updated: 1.25 -> 1.26
---
Log message:
Make SPEC tests share a common Makefile.
---
Diffs of the changes: (+21 -195)
Index: llvm/test/Programs/External/SPEC/Makefile.spec2000
diff -c /dev/null llvm/test/Programs/External/SPEC/Makefile.spec2000:1.1
*** /dev/null Wed Feb 25 18:01:31 2004
--- llvm/test/Programs/External/SPEC/Makefile.spec2000 Wed Feb 25 18:01:21 2004
***************
*** 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
Index: llvm/test/Programs/External/SPEC/Makefile.spec95
diff -u llvm/test/Programs/External/SPEC/Makefile.spec95:1.4 llvm/test/Programs/External/SPEC/Makefile.spec95:1.5
--- llvm/test/Programs/External/SPEC/Makefile.spec95:1.4 Tue Feb 24 15:16:06 2004
+++ llvm/test/Programs/External/SPEC/Makefile.spec95 Wed Feb 25 18:01:21 2004
@@ -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
Index: llvm/test/Programs/External/SPEC/Makefile.spec
diff -u llvm/test/Programs/External/SPEC/Makefile.spec:1.25 llvm/test/Programs/External/SPEC/Makefile.spec:1.26
--- llvm/test/Programs/External/SPEC/Makefile.spec:1.25 Wed Feb 25 17:19:24 2004
+++ llvm/test/Programs/External/SPEC/Makefile.spec Wed Feb 25 18:01:21 2004
@@ -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 @@
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 @@
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 @@
$(PROGRAMS_TO_TEST:%=Output/%.performance): \
Output/%.performance: Output/%.out-llc Output/%.out-tracing
-$(TIMESCRIPT) $* Output/$*.out-llc.time Output/$*.out-tracing.time $@
-
More information about the llvm-commits
mailing list