Use fpcmp instead of plain diff for checking results in SPECs.

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

5 files changed, 9 insertions, 9 deletions

diff --git a/LNTBased/speccpu2006/fp/433.milc/TestModule b/LNTBased/speccpu2006/fp/433.milc/TestModule
index 0fb3a8ab..afb8e299 100644
--- a/LNTBased/speccpu2006/fp/433.milc/TestModule
+++ b/LNTBased/speccpu2006/fp/433.milc/TestModule
@@ -11,11 +11,11 @@ class SPEC2006_433_milc(spec.TestModule):
     train_input_set = ['train/input/su3imp.in']
     train_output_set = ['train/output/su3imp.out']
     train_args = ['< su3imp.in > 433.milc.su3imp.out 2> 433.milc.su3imp.err']
-    train_cmp_cmds = ['diff 433.milc.su3imp.out su3imp.out --strip-trailing-cr > 433.milc.su3imp.cmp']
+    train_cmp_cmds = ['fpcmp -r 0.0001 -a 0.0000002 433.milc.su3imp.out su3imp.out > 433.milc.su3imp.cmp']
     ref_input_set = ['ref/input/su3imp.in']
     ref_output_set = ['ref/output/su3imp.out']
     ref_args = ['< su3imp.in > 433.milc.su3imp.out 2> 433.milc.su3imp.err']
-    ref_cmp_cmds = ['diff 433.milc.su3imp.out su3imp.out --strip-trailing-cr > 433.milc.su3imp.cmp']
+    ref_cmp_cmds = ['fpcmp -r 0.0001 -a 0.0000002 433.milc.su3imp.out su3imp.out > 433.milc.su3imp.cmp']
 
 # This is the only required entry point to the module.
 test_class = SPEC2006_433_milc
diff --git a/LNTBased/speccpu2006/fp/447.dealII/TestModule b/LNTBased/speccpu2006/fp/447.dealII/TestModule
index 112822bc..73f510f5 100644
--- a/LNTBased/speccpu2006/fp/447.dealII/TestModule
+++ b/LNTBased/speccpu2006/fp/447.dealII/TestModule
@@ -11,11 +11,11 @@ class SPEC2006_447_dealII(spec.TestModule):
     train_input_set = []
     train_output_set = ['train/output/log']
     train_args = ['10 > 447.dealII.10.out 2> 447.dealII.10.err']
-    train_cmp_cmds = ['diff 447.dealII.10.out log --strip-trailing-cr > 447.dealII.10.cmp']
+    train_cmp_cmds = ['fpcmp -a .0000001 447.dealII.10.out log > 447.dealII.10.cmp']
     ref_input_set = []
     ref_output_set = ['ref/output/log']
     ref_args = ['23 > 447.dealII.23.out 2> 447.dealII.23.err']
-    ref_cmp_cmds = ['diff 447.dealII.23.out log --strip-trailing-cr > 447.dealII.23.cmp']
+    ref_cmp_cmds = ['fpcmp -a .0000001 447.dealII.23.out log > 447.dealII.23.cmp']
 
 # This is the only required entry point to the module.
 test_class = SPEC2006_447_dealII
diff --git a/LNTBased/speccpu2006/fp/450.soplex/TestModule b/LNTBased/speccpu2006/fp/450.soplex/TestModule
index 1d3a48d5..cea57fcb 100644
--- a/LNTBased/speccpu2006/fp/450.soplex/TestModule
+++ b/LNTBased/speccpu2006/fp/450.soplex/TestModule
@@ -11,11 +11,11 @@ class SPEC2006_450_soplex(spec.TestModule):
     train_input_set = ['train/input/train.mps', 'train/input/pds-20.mps']
     train_output_set = ['train/output/pds-20.mps.out', 'train/output/train.out']
     train_args = ['-s1 -e -m5000 pds-20.mps > 450.soplex.pds-20.out 2> 450.soplex.pds-20.err', '-m1200 train.mps > 450.soplex.train.out 2> 450.soplex.train.err']
-    train_cmp_cmds = ['diff 450.soplex.pds-20.out pds-20.mps.out --strip-trailing-cr > 450.soplex.pds-20.cmp', 'diff 450.soplex.train.out train.out --strip-trailing-cr > 450.soplex.train.cmp']
+    train_cmp_cmds = ['fpcmp -a 1.0e-5 -r 20 450.soplex.pds-20.out pds-20.mps.out > 450.soplex.pds-20.cmp', 'fpcmp -a 1.0e-5 -r 20 450.soplex.train.out train.out > 450.soplex.train.cmp']
     ref_input_set = ['ref/input/ref.mps', 'ref/input/pds-50.mps']
     ref_output_set = ['ref/output/pds-50.mps.out', 'ref/output/ref.out']
     ref_args = ['-s1 -e -m45000 pds-50.mps > 450.soplex.pds-50.out 2> 450.soplex.pds-50.err', '-m3500 ref.mps > 450.soplex.ref.out 2> 450.soplex.ref.err']
-    ref_cmp_cmds = ['diff 450.soplex.pds-50.out pds-50.mps.out --strip-trailing-cr > 450.soplex.pds-50.cmp', 'diff 450.soplex.ref.out ref.out --strip-trailing-cr > 450.soplex.ref.cmp']
+    ref_cmp_cmds = ['fpcmp -a 1.0e-5 -r 0.02 450.soplex.pds-50.out pds-50.mps.out > 450.soplex.pds-50.cmp', 'fpcmp -a 1.0e-5 -r 0.02 450.soplex.ref.out ref.out > 450.soplex.ref.cmp']
 
 # This is the only required entry point to the module.
 test_class = SPEC2006_450_soplex
diff --git a/LNTBased/speccpu2006/fp/470.lbm/TestModule b/LNTBased/speccpu2006/fp/470.lbm/TestModule
index d09b94fe..1f3e0aa4 100644
--- a/LNTBased/speccpu2006/fp/470.lbm/TestModule
+++ b/LNTBased/speccpu2006/fp/470.lbm/TestModule
@@ -11,11 +11,11 @@ class SPEC2006_470_lbm(spec.TestModule):
     train_input_set = ['train/input/100_100_130_cf_b.of']
     train_output_set = ['train/output/lbm.out']
     train_args = ['300 reference.dat 0 1 100_100_130_cf_b.of > 470.lbm.train.out 2> 470.lbm.train.err']
-    train_cmp_cmds = ['diff 470.lbm.train.out lbm.out --strip-trailing-cr > 470.lbm.train.cmp']
+    train_cmp_cmds = ['fpcmp -a 0.0000001 470.lbm.train.out lbm.out > 470.lbm.train.cmp']
     ref_input_set = ['ref/input/100_100_130_ldc.of']
     ref_output_set = ['ref/output/lbm.out']
     ref_args = ['3000 reference.dat 0 0 100_100_130_ldc.of > 470.lbm.ref.out 2> 470.lbm.ref.err']
-    ref_cmp_cmds = ['diff 470.lbm.ref.out lbm.out --strip-trailing-cr > 470.lbm.ref.cmp']
+    ref_cmp_cmds = ['fpcmp -a 0.0000001 470.lbm.ref.out lbm.out > 470.lbm.ref.cmp']
 
 # This is the only required entry point to the module.
 test_class = SPEC2006_470_lbm
diff --git a/LNTBased/speccpu2006/fp/482.sphinx3/TestModule b/LNTBased/speccpu2006/fp/482.sphinx3/TestModule
index d5e13438..27228efa 100644
--- a/LNTBased/speccpu2006/fp/482.sphinx3/TestModule
+++ b/LNTBased/speccpu2006/fp/482.sphinx3/TestModule
@@ -16,7 +16,7 @@ class SPEC2006_482_sphinx3(spec.TestModule):
     ref_input_set = ['all/input/model', 'ref/input/beams.dat', 'ref/input/an391-mjwl-b.le.raw', 'ref/input/an400-miry-b.le.raw', 'ref/input/an419-fjlp-b.le.raw', 'ref/input/an428-fvap-b.le.raw', 'ref/input/an437-mjgm-b.le.raw', 'ref/input/cen1-fjlp-b.le.raw', 'ref/input/cen2-fjlp-b.le.raw', 'ref/input/cen3-fjlp-b.le.raw', 'ref/input/cen4-fjlp-b.le.raw', 'ref/input/cen5-fjlp-b.le.raw', 'ref/input/cen6-fjlp-b.le.raw', 'ref/input/cen7-fjlp-b.le.raw', 'ref/input/cen8-fjlp-b.le.raw', 'ref/input/an392-mjwl-b.le.raw', 'ref/input/an401-mdms2-b.le.raw', 'ref/input/an420-fjlp-b.le.raw', 'ref/input/an429-fvap-b.le.raw', 'ref/input/an438-mjgm-b.le.raw', 'ref/input/cen1-fvap-b.le.raw', 'ref/input/cen2-fvap-b.le.raw', 'ref/input/cen3-fvap-b.le.raw', 'ref/input/cen4-fvap-b.le.raw', 'ref/input/cen5-fvap-b.le.raw', 'ref/input/cen6-fvap-b.le.raw', 'ref/input/cen7-fvap-b.le.raw', 'ref/input/cen8-fvap-b.le.raw', 'ref/input/an393-mjwl-b.le.raw', 'ref/input/an402-mdms2-b.le.raw', 'ref/input/an421-menk-b.le.raw', 'ref/input/an430-fvap-b.le.raw', 'ref/input/an439-mjgm-b.le.raw', 'ref/input/cen1-marh-b.le.raw', 'ref/input/cen2-marh-b.le.raw', 'ref/input/cen3-marh-b.le.raw', 'ref/input/cen4-marh-b.le.raw', 'ref/input/cen5-marh-b.le.raw', 'ref/input/cen6-marh-b.le.raw', 'ref/input/cen7-marh-b.le.raw', 'ref/input/cen8-marh-b.le.raw', 'ref/input/an394-mjwl-b.le.raw', 'ref/input/an403-mdms2-b.le.raw', 'ref/input/an422-menk-b.le.raw', 'ref/input/an431-marh-b.le.raw', 'ref/input/an440-mjgm-b.le.raw', 'ref/input/cen1-mdms2-b.le.raw', 'ref/input/cen2-mdms2-b.le.raw', 'ref/input/cen3-mdms2-b.le.raw', 'ref/input/cen4-mdms2-b.le.raw', 'ref/input/cen5-mdms2-b.le.raw', 'ref/input/cen6-mdms2-b.le.raw', 'ref/input/cen7-mdms2-b.le.raw', 'ref/input/cen8-mdms2-b.le.raw', 'ref/input/an395-mjwl-b.le.raw', 'ref/input/an404-mdms2-b.le.raw', 'ref/input/an423-menk-b.le.raw', 'ref/input/an432-marh-b.le.raw', 'ref/input/an441-mmxg-b.le.raw', 'ref/input/cen1-menk-b.le.raw', 'ref/input/cen2-menk-b.le.raw', 'ref/input/cen3-menk-b.le.raw', 'ref/input/cen4-menk-b.le.raw', 'ref/input/cen5-menk-b.le.raw', 'ref/input/cen6-menk-b.le.raw', 'ref/input/cen7-menk-b.le.raw', 'ref/input/cen8-menk-b.le.raw', 'ref/input/an396-miry-b.le.raw', 'ref/input/an405-mdms2-b.le.raw', 'ref/input/an424-menk-b.le.raw', 'ref/input/an433-marh-b.le.raw', 'ref/input/an442-mmxg-b.le.raw', 'ref/input/cen1-miry-b.le.raw', 'ref/input/cen2-miry-b.le.raw', 'ref/input/cen3-miry-b.le.raw', 'ref/input/cen4-miry-b.le.raw', 'ref/input/cen5-miry-b.le.raw', 'ref/input/cen6-miry-b.le.raw', 'ref/input/cen7-miry-b.le.raw', 'ref/input/cen8-miry-b.le.raw', 'ref/input/an397-miry-b.le.raw', 'ref/input/an416-fjlp-b.le.raw', 'ref/input/an425-menk-b.le.raw', 'ref/input/an434-marh-b.le.raw', 'ref/input/an443-mmxg-b.le.raw', 'ref/input/cen1-mjgm-b.le.raw', 'ref/input/cen2-mjgm-b.le.raw', 'ref/input/cen3-mjgm-b.le.raw', 'ref/input/cen4-mjgm-b.le.raw', 'ref/input/cen5-mjgm-b.le.raw', 'ref/input/cen6-mjgm-b.le.raw', 'ref/input/cen7-mjgm-b.le.raw', 'ref/input/cen8-mjgm-b.le.raw', 'ref/input/an398-miry-b.le.raw', 'ref/input/an417-fjlp-b.le.raw', 'ref/input/an426-fvap-b.le.raw', 'ref/input/an435-marh-b.le.raw', 'ref/input/an444-mmxg-b.le.raw', 'ref/input/cen1-mjwl-b.le.raw', 'ref/input/cen2-mjwl-b.le.raw', 'ref/input/cen3-mjwl-b.le.raw', 'ref/input/cen4-mjwl-b.le.raw', 'ref/input/cen5-mjwl-b.le.raw', 'ref/input/cen6-mjwl-b.le.raw', 'ref/input/cen7-mjwl-b.le.raw', 'ref/input/cen8-mjwl-b.le.raw', 'ref/input/an399-miry-b.le.raw', 'ref/input/an418-fjlp-b.le.raw', 'ref/input/an427-fvap-b.le.raw', 'ref/input/an436-mjgm-b.le.raw', 'ref/input/an445-mmxg-b.le.raw', 'ref/input/cen1-mmxg-b.le.raw', 'ref/input/cen2-mmxg-b.le.raw', 'ref/input/cen3-mmxg-b.le.raw', 'ref/input/cen4-mmxg-b.le.raw', 'ref/input/cen5-mmxg-b.le.raw', 'ref/input/cen6-mmxg-b.le.raw', 'ref/input/cen7-mmxg-b.le.raw', 'ref/input/cen8-mmxg-b.le.raw', 'ref/input/args.an4']
     ref_output_set = ['ref/output/an4.log']
     ref_args = ['ctlfile . args.an4 > 482.sphinx3.an4.out 2> 482.sphinx3.an4.err']
-    ref_cmp_cmds = ['sed -i bak "s/\\.le//g" 482.sphinx3.an4.out ; sed -i bak "s,[^ ]*/\\([^/]*\\.c\\),\\1," 482.sphinx3.an4.out; diff 482.sphinx3.an4.out an4.log > 482.sphinx3.an4.cmp']
+    ref_cmp_cmds = ['sed -i bak "s/\\.le//g" 482.sphinx3.an4.out ; sed -i bak "s,[^ ]*/\\([^/]*\\.c\\),\\1," 482.sphinx3.an4.out; fpcmp -r .001 482.sphinx3.an4.out an4.log > 482.sphinx3.an4.cmp']
 
     def copy_input_set(self, dest_dir, size):
         spec.TestModule.copy_input_set(self, dest_dir, size)