[llvm-commits] [parallel] CVS: llvm/test/Programs/External/SPEC/Makefile.spec2000 Makefile.spec95 Makefile Makefile.spec
Misha Brukman
brukman at cs.uiuc.edu
Mon Mar 1 18:29:06 PST 2004
Changes in directory llvm/test/Programs/External/SPEC:
Makefile.spec2000 added (r1.2.2.1)
Makefile.spec95 added (r1.7.2.1)
Makefile updated: 1.5 -> 1.5.2.1
Makefile.spec updated: 1.21 -> 1.21.2.1
---
Log message:
Merge from trunk
---
Diffs of the changes: (+89 -18)
Index: llvm/test/Programs/External/SPEC/Makefile.spec2000
diff -c /dev/null llvm/test/Programs/External/SPEC/Makefile.spec2000:1.2.2.1
*** /dev/null Mon Mar 1 17:59:19 2004
--- llvm/test/Programs/External/SPEC/Makefile.spec2000 Mon Mar 1 17:59:09 2004
***************
*** 0 ****
--- 1,22 ----
+ ##===- 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
+
+ # RUN_TYPE - Either ref, test, or train. May be specified on the command line.
+ # individual tests may override this to provide better input sizes
+ ifndef RUN_TYPE
+ ifdef LARGE_PROBLEM_SIZE
+ RUN_TYPE := ref
+ else
+ RUN_TYPE := train
+ endif
+ endif
+
+ include $(LEVEL)/test/Programs/External/SPEC/Makefile.spec
Index: llvm/test/Programs/External/SPEC/Makefile.spec95
diff -c /dev/null llvm/test/Programs/External/SPEC/Makefile.spec95:1.7.2.1
*** /dev/null Mon Mar 1 17:59:19 2004
--- llvm/test/Programs/External/SPEC/Makefile.spec95 Mon Mar 1 17:59:09 2004
***************
*** 0 ****
--- 1,22 ----
+ ##===- Makefile.spec95 -------------------------------------*- Makefile -*-===##
+ #
+ # This makefile contains information for building SPEC95 as an external test.
+ #
+ ##===----------------------------------------------------------------------===##
+
+ include $(LEVEL)/Makefile.config
+
+ SPEC_ROOT := $(SPEC95_ROOT)
+ CPPFLAGS += -DSPEC_CPU95
+
+ # RUN_TYPE - Either ref, test, or train. May be specified on the command line.
+ # individual tests may override this to provide better input sizes
+ ifndef RUN_TYPE
+ ifdef LARGE_PROBLEM_SIZE
+ RUN_TYPE := ref
+ else
+ RUN_TYPE := train
+ endif
+ endif
+
+ include $(LEVEL)/test/Programs/External/SPEC/Makefile.spec
Index: llvm/test/Programs/External/SPEC/Makefile
diff -u llvm/test/Programs/External/SPEC/Makefile:1.5 llvm/test/Programs/External/SPEC/Makefile:1.5.2.1
--- llvm/test/Programs/External/SPEC/Makefile:1.5 Thu Dec 18 10:42:05 2003
+++ llvm/test/Programs/External/SPEC/Makefile Mon Mar 1 17:59:09 2004
@@ -1,3 +1,17 @@
LEVEL = ../../../..
-DIRS := CFP2000 CINT2000
+DIRS := CFP2000 CINT2000 CINT95
+include ${LEVEL}/Makefile.config
+
+#
+# Remove SPEC95 and SPEC2000 per the user's configuration
+#
+ifndef USE_SPEC2000
+DIRS := $(filter-out CFP2000/, $(DIRS))
+DIRS := $(filter-out CINT2000/, $(DIRS))
+endif
+
+ifndef USE_SPEC95
+DIRS := $(filter-out CINT95/, $(DIRS))
+endif
+
include ${LEVEL}/test/Programs/Makefile.programs
Index: llvm/test/Programs/External/SPEC/Makefile.spec
diff -u llvm/test/Programs/External/SPEC/Makefile.spec:1.21 llvm/test/Programs/External/SPEC/Makefile.spec:1.21.2.1
--- llvm/test/Programs/External/SPEC/Makefile.spec:1.21 Thu Dec 18 21:32:09 2003
+++ llvm/test/Programs/External/SPEC/Makefile.spec Mon Mar 1 17:59:09 2004
@@ -1,25 +1,17 @@
##===- 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.
#
##===----------------------------------------------------------------------===##
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
+LDFLAGS += -lm
# Get the current directory, the name of the benchmark, and the current
# subdirectory of the SPEC directory we are in (ie, CINT2000/164.gzip)
@@ -46,10 +38,10 @@
include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
# Do not pass -Wall to compile commands...
-LCCFLAGS := -O2
-LCXXFLAGS := -O2
+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...
@@ -86,6 +78,14 @@
-(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) \
@@ -133,14 +133,14 @@
# Rules to bugpoint the GCCAS, GCCLD, LLC, or LLI commands...
$(PROGRAMS_TO_TEST:%=Output/%.bugpoint-gccas): \
-Output/%.bugpoint-gccas: Output/%.linked.rll $(LBUGPOINT) \
+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/%.linked.bc $(LBUGPOINT) \
+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)
@@ -160,6 +160,20 @@
+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): \
@@ -173,4 +187,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