[test-suite] r220454 - Adjust 403.gcc/450.soplex for v1.2

[Hal Finkel]

Author: hfinkel
Date: Wed Oct 22 19:31:39 2014
New Revision: 220454

URL: http://llvm.org/viewvc/llvm-project?rev=220454&view=rev
Log:
Adjust 403.gcc/450.soplex for v1.2

Some misc. fixes made after 1.0.1 require changes to the input file names for
403.gcc (and thus also the output hash) and the output for 450.soplex. Try to
pick up the benchmark version and use that as the reference key when available
(and when the reference key is not already set). This should allow the test
suite to use v1.2 without breaking the system for currently-happy users of
older versions.

Added:
    test-suite/trunk/External/SPEC/CFP2006/450.soplex/450.soplex.reference_output.v1.2
    test-suite/trunk/External/SPEC/CINT2006/403.gcc/403.gcc.reference_output.v1.2
Modified:
    test-suite/trunk/External/SPEC/CINT2006/403.gcc/Makefile
    test-suite/trunk/External/SPEC/Makefile.spec
    test-suite/trunk/External/SPEC/Makefile.spec.config

Added: test-suite/trunk/External/SPEC/CFP2006/450.soplex/450.soplex.reference_output.v1.2
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CFP2006/450.soplex/450.soplex.reference_output.v1.2?rev=220454&view=auto
==============================================================================
--- test-suite/trunk/External/SPEC/CFP2006/450.soplex/450.soplex.reference_output.v1.2 (added)
+++ test-suite/trunk/External/SPEC/CFP2006/450.soplex/450.soplex.reference_output.v1.2 Wed Oct 22 19:31:39 2014
@@ -0,0 +1,46 @@
+Total iters=386; Iterations by algorithm type: leave=308, enter=78
+Factorizations: 42
+Delta   =     1.000000e-06
+Epsilon =     1.000000e-17
+Leaving algorithm
+Column representation
+Forest-Tomlin update
+Steep pricing
+Fast ratiotest
+No scaling
+General simplifier
+Weight starter
+loading LP file test.mps
+LP has 497	rows and
+       614	columns
+solving LP
+SPxRem1SM:	removed 23 row(s)
+SPxRem1SM:	removed 65 column(s)
+SPxRem1SM:	removed 33 row(s)
+SPxRem1SM:	removed 8 column(s)
+SPxRem1SM:	removed 8 row(s)
+SPxRem1SM:	removed 4 column(s)
+SPxRem1SM:	removed 2 row(s)
+SPxRem1SM:	removed 2 column(s)
+SPxAggregateSM:	removed 25 row(s) and column(s)
+SPxAggregateSM:	delta = 7.914284e+03
+SPxRedundantSM: removed 3 column(s)
+SPxRedundantSM:	removed 13 row(s)
+SPxRem1SM:	removed 7 row(s)
+SPxRem1SM:	removed 5 column(s)
+SPxAggregateSM:	removed 1 row(s) and column(s)
+SPxAggregateSM:	delta = 7.914284e+03
+SPxRedundantSM: removed 7 column(s)
+SPxRem1SM:	removed 9 row(s)
+SPxRem1SM:	removed 3 column(s)
+SPxAggregateSM:	removed 1 row(s) and column(s)
+SPxAggregateSM:	delta = 7.914284e+03
+SPxRedundantSM: removed 1 column(s)
+SPxRem1SM:	removed 6 row(s)
+SPxRem1SM:	removed 3 column(s)
+removed 128 rows
+removed 128 columns
+Finished solving (status=1, objValue=1.464410e+05)
+solution value is: 1.4644102e+05
+
+exit 0

Added: test-suite/trunk/External/SPEC/CINT2006/403.gcc/403.gcc.reference_output.v1.2
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2006/403.gcc/403.gcc.reference_output.v1.2?rev=220454&view=auto
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2006/403.gcc/403.gcc.reference_output.v1.2 (added)
+++ test-suite/trunk/External/SPEC/CINT2006/403.gcc/403.gcc.reference_output.v1.2 Wed Oct 22 19:31:39 2014
@@ -0,0 +1 @@
+e1ecf07565b5a32847a15cb30f74444f

Modified: test-suite/trunk/External/SPEC/CINT2006/403.gcc/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2006/403.gcc/Makefile?rev=220454&r1=220453&r2=220454&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2006/403.gcc/Makefile (original)
+++ test-suite/trunk/External/SPEC/CINT2006/403.gcc/Makefile Wed Oct 22 19:31:39 2014
@@ -23,10 +23,18 @@ HASH_PROGRAM_OUTPUT = 1
 include ../../Makefile.spec2006
 
 ifeq ($(RUN_TYPE),test)
+ifeq ($(SPEC_VERSION),1.2)
+  RUN_OPTIONS      = cccp.in -o -
+else
   RUN_OPTIONS      = cccp.i -o -
+endif
   STDOUT_FILENAME := cccp.s
 else
+ifeq ($(SPEC_VERSION),1.2)
+  RUN_OPTIONS      = integrate.in -o -
+else
   RUN_OPTIONS      = integrate.i -o -
+endif
   STDOUT_FILENAME := integrate.s
 endif
 

Modified: test-suite/trunk/External/SPEC/Makefile.spec
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/Makefile.spec?rev=220454&r1=220453&r2=220454&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/Makefile.spec (original)
+++ test-suite/trunk/External/SPEC/Makefile.spec Wed Oct 22 19:31:39 2014
@@ -25,6 +25,10 @@ SPEC_OUTPUT_FILE_FILTER = cat
 # the program in a sandbox (a special directory we create), then we cat all of
 # the outputs together.
 
+ifeq ($(REFERENCE_OUTPUT_KEY),)
+REFERENCE_OUTPUT_KEY := v$(SPEC_VERSION)
+endif
+
 ifndef USE_REFERENCE_OUTPUT
 
 $(PROGRAMS_TO_TEST:%=Output/%.out-nat): \

Modified: test-suite/trunk/External/SPEC/Makefile.spec.config
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/Makefile.spec.config?rev=220454&r1=220453&r2=220454&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/Makefile.spec.config (original)
+++ test-suite/trunk/External/SPEC/Makefile.spec.config Wed Oct 22 19:31:39 2014
@@ -39,6 +39,10 @@ ifndef SPEC_BENCH_DIR
 SPEC_BENCH_DIR := $(SPEC_ROOT)/$(SPEC_SUBDIR)
 endif
 
+ifndef SPEC_VERSION
+SPEC_VERSION := $(shell cat $(SPEC_ROOT)/../version.txt 2>/dev/null || echo 1.0)
+endif
+
 ifndef Source
 Source := $(wildcard $(SPEC_BENCH_DIR)/src/*.c   \
                      $(SPEC_BENCH_DIR)/src/*.C   \