[llvm-commits] CVS: llvm/test/Programs/MultiSource/SPEC/Makefile.spec

[Vikram Adve]

Changes in directory llvm/test/Programs/MultiSource/SPEC:

Makefile.spec updated: 1.1 -> 1.2

---
Log message:

Fix so that symbolic link "data" is created if needed.


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/SPEC/Makefile.spec
diff -u llvm/test/Programs/MultiSource/SPEC/Makefile.spec:1.1 llvm/test/Programs/MultiSource/SPEC/Makefile.spec:1.2
--- llvm/test/Programs/MultiSource/SPEC/Makefile.spec:1.1	Wed Oct  9 15:42:33 2002
+++ llvm/test/Programs/MultiSource/SPEC/Makefile.spec	Wed Oct  9 16:16:40 2002
@@ -17,8 +17,12 @@
 
 PROGRAMS_TO_TEST = $(BENCH)
 
+
 include	$(LEVEL)/test/Makefile.tests
 
+data:
+	@test -L data || ln -s $(BENCHDATADIR)
+
 ifndef DISABLE_LLC
 all :: Output/$(BENCH).diff-llc
 endif
@@ -30,13 +34,19 @@
 
 ##--- SPEC-dependent rules to do a test run or a reportable reference run
 
-## EXPECTED_OUTPUTS includes all the output files provided in the output dir.
+# BENCHDATADIR - The directory holding expected SPEC benchmark results
+BENCHDATADIR = /home/vadve/shared/Benchmarks/speccpu2000/benchspec/CINT2000/$(BENCH)/data
+
+## BENCHMARK_OUTPUTS includes all the output files provided in the output dir.
 ## $(BENCHOUT) defined above should be one of these output files.
 ## 
-EXPECTED_OUTPUTS = $(wildcard data/test/output/*.out)
-LLC_OUTPUTS = $(subst data/test/output/,,$(EXPECTED_OUTPUTS))
+BENCHMARK_OUTPUTS = $(wildcard $(BENCHDATADIR)/test/output/*.out)
+LLC_OUTPUTS = $(subst $(BENCHDATADIR)/test/output/,,$(BENCHMARK_OUTPUTS))
 CBE_OUTPUTS = $(LLC_OUTPUTS)
 
+check:
+	echo orig = $(BENCHMARK_OUTPUTS)
+	echo llc = $(LLC_OUTPUTS)
 
 ref: Output/$(BENCH).llc
 	Output/$(BENCH).llc $(REFOPTS)
@@ -69,8 +79,8 @@
 Output/%.cbe: Output/%.cbe.c
 	$(CC) -o $@ $< $(LDFLAGS) $(CFLAGS)
 
-Output/%.out-nat: $(EXPECTED_OUTPUTS) Output/.dir
-	cat $(EXPECTED_OUTPUTS) > $@
+Output/%.out-nat: $(BENCHMARK_OUTPUTS) Output/.dir
+	cat $(BENCHMARK_OUTPUTS) > $@
 
 ifdef COPYFILES
 Output/.copy:
@@ -94,7 +104,7 @@
 Output/%.diff-llc: Output/%.out-nat Output/%.out-llc Output/.dir
 	$(DIFFPROG) llc $(subst Output/,,$(@:.diff-llc=))
 
-Output/%.diff-cbe: Output/%.out-nat Output/%.out-cbe Output/.dir
+Output/%.diff-cbe: data Output/%.out-nat Output/%.out-cbe Output/.dir
 	$(DIFFPROG) cbe $(subst Output/,,$(@:.diff-cbe=))