public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc(refs/users/marxin/heads/TSVC-v2)] WIP - add run-time support.
@ 2021-10-26 14:29 Martin Liska
  0 siblings, 0 replies; only message in thread
From: Martin Liska @ 2021-10-26 14:29 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:9618e45cb2f1dab44450663be6e0f678739ac535

commit 9618e45cb2f1dab44450663be6e0f678739ac535
Author: Martin Liska <mliska@suse.cz>
Date:   Tue Oct 26 15:57:23 2021 +0200

    WIP - add run-time support.

Diff:
---
 gcc/testsuite/gcc.dg/vect/tsvc/tsvc.h             | 1402 ++++++++++++++++++++-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s000.c   |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s111.c   |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1111.c  |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1112.c  |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1113.c  |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1115.c  |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1119.c  |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s112.c   |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s113.c   |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s114.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s115.c   |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s116.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1161.c  |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s118.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s119.c   |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s121.c   |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1213.c  |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s122.c   |   28 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1221.c  |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s123.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1232.c  |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s124.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1244.c  |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s125.c   |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1251.c  |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s126.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s127.c   |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1279.c  |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s128.c   |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1281.c  |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s131.c   |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s13110.c |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s132.c   |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1351.c  |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s141.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1421.c  |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s151.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s152.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s161.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s162.c   |   28 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s171.c   |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s172.c   |   28 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s173.c   |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s174.c   |   28 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s175.c   |   28 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s176.c   |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2101.c  |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2102.c  |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s211.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2111.c  |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s212.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s221.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s222.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2233.c  |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2244.c  |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2251.c  |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2275.c  |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s231.c   |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s232.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s233.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s235.c   |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s241.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s242.c   |   28 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s243.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s244.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s251.c   |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s252.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s253.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s254.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s255.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s256.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s257.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s258.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s261.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s271.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2710.c  |   28 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2711.c  |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2712.c  |   27 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s272.c   |   28 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s273.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s274.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s275.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s276.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s277.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s278.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s279.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s281.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s291.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s292.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s293.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s311.c   |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s3110.c  |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s3111.c  |   27 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s31111.c |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s3112.c  |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s3113.c  |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s312.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s313.c   |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s314.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s315.c   |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s316.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s317.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s318.c   |   28 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s319.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s321.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s322.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s323.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s3251.c  |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s331.c   |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s332.c   |   28 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s341.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s342.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s343.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s351.c   |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s352.c   |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s353.c   |   28 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4112.c  |   28 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4113.c  |   28 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4114.c  |   28 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4115.c  |   28 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4116.c  |   28 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4117.c  |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4121.c  |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s421.c   |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s422.c   |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s423.c   |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s424.c   |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s431.c   |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s441.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s442.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s443.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s451.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s452.c   |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s453.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s471.c   |   27 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s481.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s482.c   |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s491.c   |   28 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-va.c     |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vag.c    |   28 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vas.c    |   28 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vbor.c   |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vdotr.c  |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vif.c    |   25 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vpv.c    |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vpvpv.c  |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vpvts.c  |   28 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vpvtv.c  |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vsumr.c  |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vtv.c    |   26 +-
 gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vtvtv.c  |   26 +-
 152 files changed, 4002 insertions(+), 1294 deletions(-)

diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/tsvc.h b/gcc/testsuite/gcc.dg/vect/tsvc/tsvc.h
index cfc00cba0c5..47d10e389aa 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/tsvc.h
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/tsvc.h
@@ -1,9 +1,12 @@
-#define iterations 100000
+#define iterations 10000
 #define LEN_1D 32000
 #define LEN_2D 256
 #define ARRAY_ALIGNMENT 64
 
+#include <stdio.h>
 #include <stdlib.h>
+#include <malloc.h>
+#include <string.h>
 #include <math.h>
 
 typedef float real_t;
@@ -13,13 +16,1398 @@ int dummy(real_t[LEN_1D], real_t[LEN_1D], real_t[LEN_1D], real_t[LEN_1D],
           real_t[LEN_1D], real_t[LEN_2D][LEN_2D], real_t[LEN_2D][LEN_2D],
           real_t[LEN_2D][LEN_2D], real_t);
 
-extern __attribute__((aligned(ARRAY_ALIGNMENT)))
+__attribute__((aligned(ARRAY_ALIGNMENT)))
 real_t flat_2d_array[LEN_2D * LEN_2D];
-extern __attribute__((aligned(ARRAY_ALIGNMENT))) real_t x[LEN_1D];
-extern __attribute__((aligned(ARRAY_ALIGNMENT))) real_t a[LEN_1D], b[LEN_1D],
+__attribute__((aligned(ARRAY_ALIGNMENT))) real_t x[LEN_1D];
+__attribute__((aligned(ARRAY_ALIGNMENT))) real_t a[LEN_1D], b[LEN_1D],
     c[LEN_1D], d[LEN_1D], e[LEN_1D], aa[LEN_2D][LEN_2D], bb[LEN_2D][LEN_2D],
     cc[LEN_2D][LEN_2D], tt[LEN_2D][LEN_2D];
-extern __attribute__((aligned(ARRAY_ALIGNMENT))) int indx[LEN_1D];
+__attribute__((aligned(ARRAY_ALIGNMENT))) int indx[LEN_1D];
 
-extern real_t* __restrict__ xx;
-extern real_t* yy;
+real_t* __restrict__ xx;
+real_t* yy;
+
+void set_1d_array(real_t * arr, int length, real_t value, int stride);
+void set_2d_array(real_t arr[LEN_2D][LEN_2D], real_t value, int stride);
+
+struct args_t {
+    struct timeval t1;
+    struct timeval t2;
+    void * __restrict__ arg_info;
+};
+
+enum {SET1D_RECIP_IDX = -1, SET1D_RECIP_IDX_SQ = -2};
+
+real_t sum1d(real_t arr[LEN_1D]);
+real_t sum2d(real_t arr[LEN_2D][LEN_2D]);
+
+real_t sum_x();
+real_t sum_a();
+real_t sum_b();
+real_t sum_c();
+real_t sum_e();
+
+real_t sum_half_xx();
+
+real_t sum_a_aa();
+
+real_t sum_aa();
+real_t sum_bb();
+real_t sum_cc();
+real_t sum_xx();
+
+real_t sum_aa_bb();
+
+real_t sum_flat_2d_array();
+
+real_t sum1d(real_t arr[LEN_1D]){
+    real_t ret = 0.;
+    for (int i = 0; i < LEN_1D; i++)
+        ret += arr[i];
+    return ret;
+}
+
+real_t sum2d(real_t arr[LEN_2D][LEN_2D]){
+    real_t sum = 0.;
+    for (int i = 0; i < LEN_2D; i++){
+        for (int j = 0; j < LEN_2D; j++){
+            sum += arr[i][j];
+        }
+    }
+
+    return sum;
+}
+
+real_t sum_x()
+{
+    return sum1d(x);
+}
+
+real_t sum_xx()
+{
+    return sum1d(xx);
+}
+
+real_t sum_a()
+{
+    return sum1d(a);
+}
+
+real_t sum_b()
+{
+    return sum1d(b);
+}
+
+real_t sum_a_aa()
+{
+    return sum1d(a) + sum2d(aa);
+}
+
+real_t sum_c()
+{
+    return sum1d(c);
+}
+
+real_t sum_e()
+{
+    return sum1d(e);
+}
+
+real_t sum_aa()
+{
+    return sum2d(aa);
+}
+
+real_t sum_bb()
+{
+    return sum2d(bb);
+}
+
+real_t sum_aa_bb()
+{
+    return sum2d(aa) + sum2d(bb);
+}
+
+real_t sum_cc()
+{
+    return sum2d(cc);
+}
+
+real_t sum_half_xx()
+{
+    real_t temp = 00;
+
+    for (int i = 0; i < LEN_1D/2; i++){
+        temp += xx[i];
+    }
+
+    return temp;
+}
+
+real_t sum_flat_2d_array()
+{
+    real_t sum = 0.;
+
+    for (int i = 0; i < LEN_2D*LEN_2D; i++){
+        sum += flat_2d_array[i];
+    }
+
+    return sum;
+}
+
+
+void set_1d_array(real_t * arr, int length, real_t value, int stride)
+{
+    if (stride == SET1D_RECIP_IDX) {
+        for (int i = 0; i < length; i++) {
+            arr[i] = 1. / (real_t) (i+1);
+        }
+    } else if (stride == SET1D_RECIP_IDX_SQ) {
+        for (int i = 0; i < length; i++) {
+            arr[i] = 1. / (real_t) ((i+1) * (i+1));
+        }
+    } else {
+        for (int i = 0; i < length; i += stride) {
+            arr[i] = value;
+        }
+    }
+}
+
+void set_2d_array(real_t arr[LEN_2D][LEN_2D], real_t value, int stride)
+{
+    for (int i = 0; i < LEN_2D; i++) {
+        set_1d_array(arr[i], LEN_2D, value, stride);
+    }
+}
+
+void init(int** ip, real_t* s1, real_t* s2){
+    xx = (real_t*) memalign(ARRAY_ALIGNMENT, LEN_1D*sizeof(real_t));
+    *ip = (int *) memalign(ARRAY_ALIGNMENT, LEN_1D*sizeof(real_t));
+
+    for (int i = 0; i < LEN_1D; i = i+5){
+        (*ip)[i]   = (i+4);
+        (*ip)[i+1] = (i+2);
+        (*ip)[i+2] = (i);
+        (*ip)[i+3] = (i+3);
+        (*ip)[i+4] = (i+1);
+    }
+
+    set_1d_array(a, LEN_1D, 1.,1);
+    set_1d_array(b, LEN_1D, 1.,1);
+    set_1d_array(c, LEN_1D, 1.,1);
+    set_1d_array(d, LEN_1D, 1.,1);
+    set_1d_array(e, LEN_1D, 1.,1);
+    set_1d_array(x, LEN_1D, 1.,1);
+    set_2d_array(aa, 0.,SET1D_RECIP_IDX);
+    set_2d_array(bb, 0.,SET1D_RECIP_IDX);
+    set_2d_array(cc, 0.,SET1D_RECIP_IDX);
+
+    for (int i = 0; i < LEN_1D; i++) {
+        indx[i] = (i+1) % 4+1;
+    }
+
+    *s1 = 1.0;
+    *s2 = 2.0;
+}
+
+int initialise_arrays(const char* name)
+{
+    real_t any=0.;
+    real_t zero=0.;
+    real_t half=.5;
+    real_t one=1.;
+    real_t two=2.;
+    real_t small = .000001;
+    int unit =1;
+    int frac = SET1D_RECIP_IDX;
+    int frac2 = SET1D_RECIP_IDX_SQ;
+
+    if    (!strcmp(name, "s000")) {
+      for (int i = 0; i < LEN_1D; i++) {
+            a[i] = 1+i;
+            b[i] = 2+i;
+            c[i] = 3+i;
+            d[i] = 4+i;
+            e[i] = 5+i;
+          }
+    } else if (!strcmp(name, "s111")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac2);
+        set_1d_array(c, LEN_1D, any,frac2);
+        set_1d_array(d, LEN_1D, any,frac2);
+        set_1d_array(e, LEN_1D, any,frac2);
+    } else if (!strcmp(name, "s112")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac2);
+    } else if (!strcmp(name, "s113")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac2);
+    } else if (!strcmp(name, "s114")) {
+        set_2d_array(aa, any,frac);
+        set_2d_array(bb, any,frac2);
+    } else if (!strcmp(name, "s115")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_2d_array(aa,small,unit);
+        set_2d_array(bb,small,unit);
+        set_2d_array(cc,small,unit);
+    } else if (!strcmp(name, "s116")) {
+        set_1d_array(a, LEN_1D, one,unit);
+    } else if (!strcmp(name, "s118")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_2d_array(bb,small,unit);
+    } else if (!strcmp(name, "s119")) {
+        set_2d_array(aa, one,unit);
+        set_2d_array(bb, any,frac2);
+    } else if (!strcmp(name, "s121")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac2);
+    } else if (!strcmp(name, "s122")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac2);
+    } else if (!strcmp(name, "s123")) {
+        set_1d_array(a, LEN_1D,zero,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+        set_1d_array(c, LEN_1D, one,unit);
+        set_1d_array(d, LEN_1D, any,frac);
+        set_1d_array(e, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s124")) {
+        set_1d_array(a, LEN_1D,zero,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+        set_1d_array(c, LEN_1D, one,unit);
+        set_1d_array(d, LEN_1D, any,frac);
+        set_1d_array(e, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s125")) {
+        set_1d_array(flat_2d_array, LEN_2D*LEN_2D,zero,unit);
+        set_2d_array(aa, one,unit);
+        set_2d_array(bb,half,unit);
+        set_2d_array(cc, two,unit);
+    } else if (!strcmp(name, "s126")) {
+        set_2d_array(bb, one,unit);
+        set_1d_array( flat_2d_array, LEN_2D*LEN_2D,any,frac);
+        set_2d_array(cc, any,frac);
+    } else if (!strcmp(name, "s127")) {
+        set_1d_array(a, LEN_1D,zero,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+        set_1d_array(c, LEN_1D, any,frac);
+        set_1d_array(d, LEN_1D, any,frac);
+        set_1d_array(e, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s128")) {
+        set_1d_array(a, LEN_1D,zero,unit);
+        set_1d_array(b, LEN_1D, two,unit);
+        set_1d_array(c, LEN_1D, one,unit);
+        set_1d_array(d, LEN_1D, one,unit);
+    } else if (!strcmp(name, "s131")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac2);
+    } else if (!strcmp(name, "s132")) {
+        set_2d_array(aa, one,unit);
+        set_1d_array(b, LEN_1D, any,frac);
+        set_1d_array(c, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s141")) {
+        set_1d_array( flat_2d_array, LEN_2D*LEN_2D, one,unit);
+        set_2d_array(bb, any,frac2);
+    } else if (!strcmp(name, "s151")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac2);
+    } else if (!strcmp(name, "s152")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D,zero,unit);
+        set_1d_array(c, LEN_1D, any,frac);
+        set_1d_array(d, LEN_1D, any,frac);
+        set_1d_array(e, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s161")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array( &b[0], LEN_1D/2, one,2);
+        set_1d_array( &b[1], LEN_1D/2,-one,2);
+        set_1d_array(c, LEN_1D, one,unit);
+        set_1d_array(d, LEN_1D, any,frac);
+        set_1d_array(e, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s162")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac);
+        set_1d_array(c, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s171")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac2);
+    } else if (!strcmp(name, "s172")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac2);
+    } else if (!strcmp(name, "s173")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac2);
+    } else if (!strcmp(name, "s174")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac2);
+    } else if (!strcmp(name, "s175")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac2);
+    } else if (!strcmp(name, "s176")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac);
+        set_1d_array(c, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s211")) {
+        set_1d_array(a, LEN_1D,zero,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+        set_1d_array(c, LEN_1D, any,frac);
+        set_1d_array(d, LEN_1D, any,frac);
+        set_1d_array(e, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s212")) {
+        set_1d_array(a, LEN_1D, any,frac);
+        set_1d_array(b, LEN_1D, one,unit);
+        set_1d_array(c, LEN_1D, one,unit);
+        set_1d_array(d, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s221")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac);
+        set_1d_array(c, LEN_1D, any,frac);
+        set_1d_array(d, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s222")) {
+        set_1d_array(a, LEN_1D,zero,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+        set_1d_array(c, LEN_1D, one,unit);
+    } else if (!strcmp(name, "s231")) {
+        set_2d_array(aa, one,unit);
+        set_2d_array(bb, any,frac2);
+    } else if (!strcmp(name, "s232")) {
+        set_2d_array(aa, one,unit);
+        set_2d_array(bb,zero,unit);
+    } else if (!strcmp(name, "s233")) {
+        set_2d_array(aa, any,frac);
+        set_2d_array(bb, any,frac);
+        set_2d_array(cc, any,frac);
+    } else if (!strcmp(name, "s234")) {
+        set_2d_array(aa, one,unit);
+        set_2d_array(bb, any,frac);
+        set_2d_array(cc, any,frac);
+    } else if (!strcmp(name, "s235")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac);
+        set_1d_array(c, LEN_1D, any,frac);
+        set_2d_array(aa, one,unit);
+        set_2d_array(bb, any, frac2);
+    } else if (!strcmp(name, "s241")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+        set_1d_array(c, LEN_1D, one,unit);
+        set_1d_array(d, LEN_1D, one,unit);
+    } else if (!strcmp(name, "s242")) {
+        set_1d_array(a, LEN_1D,small,unit);
+        set_1d_array(b, LEN_1D,small,unit);
+        set_1d_array(c, LEN_1D,small,unit);
+        set_1d_array(d, LEN_1D,small,unit);
+    } else if (!strcmp(name, "s243")) {
+        set_1d_array(a, LEN_1D,zero,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+        set_1d_array(c, LEN_1D, any,frac);
+        set_1d_array(d, LEN_1D, any,frac);
+        set_1d_array(e, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s244")) {
+        set_1d_array(a, LEN_1D,zero,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+        set_1d_array(c, LEN_1D,small,unit);
+        set_1d_array(d, LEN_1D,small,unit);
+    } else if (!strcmp(name, "s251")) {
+        set_1d_array(a, LEN_1D,zero,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+        set_1d_array(c, LEN_1D, any,frac);
+        set_1d_array(d, LEN_1D, any,frac);
+        set_1d_array(e, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s252")) {
+        set_1d_array(a, LEN_1D,zero,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+        set_1d_array(c, LEN_1D, one,unit);
+    } else if (!strcmp(name, "s253")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D,small,unit);
+        set_1d_array(c, LEN_1D, one,unit);
+        set_1d_array(d, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s254")) {
+        set_1d_array(a, LEN_1D,zero,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+    } else if (!strcmp(name, "s255")) {
+        set_1d_array(a, LEN_1D,zero,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+    } else if (!strcmp(name, "s256")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(d, LEN_1D, two,frac);
+        set_2d_array(aa, two,unit);
+        set_2d_array(bb, one,unit);
+    } else if (!strcmp(name, "s257")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_2d_array(aa, two,unit);
+        set_2d_array(bb, one,unit);
+    } else if (!strcmp(name, "s258")) {
+        set_1d_array(a, LEN_1D, any,frac);
+        set_1d_array(b, LEN_1D,zero,unit);
+        set_1d_array(c, LEN_1D, any,frac);
+        set_1d_array(d, LEN_1D, any,frac);
+        set_1d_array(e, LEN_1D,zero,unit);
+        set_2d_array(aa, any,frac);
+    } else if (!strcmp(name, "s261")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac2);
+        set_1d_array(c, LEN_1D, any,frac2);
+        set_1d_array(d, LEN_1D, one,unit);
+    } else if (!strcmp(name, "s271")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac);
+        set_1d_array(c, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s272")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+        set_1d_array(c, LEN_1D, any,frac);
+        set_1d_array(d, LEN_1D, any,frac);
+        set_1d_array(e, LEN_1D, two,unit);
+    } else if (!strcmp(name, "s273")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+        set_1d_array(c, LEN_1D, one,unit);
+        set_1d_array(d, LEN_1D,small,unit);
+        set_1d_array(e, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s274")) {
+        set_1d_array(a, LEN_1D,zero,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+        set_1d_array(c, LEN_1D, one,unit);
+        set_1d_array(d, LEN_1D, any,frac);
+        set_1d_array(e, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s275")) {
+        set_2d_array(aa, one,unit);
+        set_2d_array(bb,small,unit);
+        set_2d_array(cc,small,unit);
+    } else if (!strcmp(name, "s276")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac);
+        set_1d_array(c, LEN_1D, any,frac);
+        set_1d_array(d, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s277")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array( b, LEN_1D/2, one,unit);
+        set_1d_array( &b[LEN_1D/2], LEN_1D/2,-one,unit);
+        set_1d_array(c, LEN_1D, any,frac);
+        set_1d_array(d, LEN_1D, any,frac);
+        set_1d_array(e, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s278")) {
+        set_1d_array( a, LEN_1D/2,-one,unit);
+        set_1d_array( &a[LEN_1D/2], LEN_1D/2,one,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+        set_1d_array(c, LEN_1D, any,frac);
+        set_1d_array(d, LEN_1D, any,frac);
+        set_1d_array(e, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s279")) {
+        set_1d_array( a, LEN_1D/2,-one,unit);
+        set_1d_array( &a[LEN_1D/2], LEN_1D/2,one,unit);
+//        set_1d_array(a, LEN_1D, -one,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+        set_1d_array(c, LEN_1D, any,frac);
+        set_1d_array(d, LEN_1D, any,frac);
+        set_1d_array(e, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s2710")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+        set_1d_array(c, LEN_1D, any,frac);
+        set_1d_array(d, LEN_1D, any,frac);
+        set_1d_array(e, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s2711")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac);
+        set_1d_array(c, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s2712")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac);
+        set_1d_array(c, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s281")) {
+        set_1d_array(a, LEN_1D,zero,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+        set_1d_array(c, LEN_1D, one,unit);
+    } else if (!strcmp(name, "1s281")) {
+        set_1d_array(a, LEN_1D,zero,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+        set_1d_array(c, LEN_1D, one,unit);
+        set_1d_array(d, LEN_1D, one,unit);
+        set_1d_array(e, LEN_1D, one,unit);
+        set_1d_array(x, LEN_1D, one,unit);
+    } else if (!strcmp(name, "s291")) {
+        set_1d_array(a, LEN_1D,zero,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+    } else if (!strcmp(name, "s292")) {
+        set_1d_array(a, LEN_1D,zero,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+    } else if (!strcmp(name, "s293")) {
+        set_1d_array(a, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s2101")) {
+        set_2d_array(aa, one,unit);
+        set_2d_array(bb, any,frac);
+        set_2d_array(cc, any,frac);
+    } else if (!strcmp(name, "s2102")) {
+        set_2d_array(aa,zero,unit);
+    } else if (!strcmp(name, "s2111")) {
+        set_2d_array(aa, small,unit);
+    } else if (!strcmp(name, "s311")) {
+        set_1d_array(a, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s312")) {
+        set_1d_array(a, LEN_1D,1.000001,unit);
+    } else if (!strcmp(name, "s313")) {
+        set_1d_array(a, LEN_1D, any,frac);
+        set_1d_array(b, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s314")) {
+        set_1d_array(a, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s315")) {
+        set_1d_array(a, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s316")) {
+        set_1d_array(a, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s317")) {
+    } else if (!strcmp(name, "s318")) {
+        set_1d_array(a, LEN_1D, any,frac);
+        a[LEN_1D-1] = -two;
+    } else if (!strcmp(name, "s319")) {
+        set_1d_array(a, LEN_1D,zero,unit);
+        set_1d_array(b, LEN_1D,zero,unit);
+        set_1d_array(c, LEN_1D, any,frac);
+        set_1d_array(d, LEN_1D, any,frac);
+        set_1d_array(e, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s3110")) {
+        set_2d_array(aa, any,frac);
+        aa[LEN_2D-1][LEN_2D-1] = two;
+    } else if (!strcmp(name, "s3111")) {
+        set_1d_array(a, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s3112")) {
+        set_1d_array(a, LEN_1D, any,frac2);
+        set_1d_array(b, LEN_1D,zero,unit);
+    } else if (!strcmp(name, "s3113")) {
+        set_1d_array(a, LEN_1D, any,frac);
+        a[LEN_1D-1] = -two;
+    } else if (!strcmp(name, "s321")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D,zero,unit);
+    } else if (!strcmp(name, "s322")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D,zero,unit);
+        set_1d_array(c, LEN_1D,zero,unit);
+    } else if (!strcmp(name, "s323")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+        set_1d_array(c, LEN_1D, any,frac);
+        set_1d_array(d, LEN_1D, any,frac);
+        set_1d_array(e, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s331")) {
+        set_1d_array(a, LEN_1D, any,frac);
+        a[LEN_1D-1] = -one;
+    } else if (!strcmp(name, "s332")) {
+        set_1d_array(a, LEN_1D, any,frac2);
+        a[LEN_1D-1] = two;
+    } else if (!strcmp(name, "s341")) {
+        set_1d_array(a, LEN_1D,zero,unit);
+        set_1d_array(b, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s342")) {
+        set_1d_array(a, LEN_1D, any,frac);
+        set_1d_array(b, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s343")) {
+        set_2d_array(aa, any,frac);
+        set_2d_array(bb, one,unit);
+    } else if (!strcmp(name, "s351")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+        c[0] = 1.;
+    } else if (!strcmp(name, "s352")) {
+        set_1d_array(a, LEN_1D, any,frac);
+        set_1d_array(b, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s353")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+        c[0] = 1.;
+    } else if (!strcmp(name, "s411")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac);
+        set_1d_array(c, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s412")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac);
+        set_1d_array(c, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s413")) {
+        set_1d_array(a, LEN_1D,zero,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+        set_1d_array(c, LEN_1D, one,unit);
+        set_1d_array(d, LEN_1D, any,frac);
+        set_1d_array(e, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s414")) {
+        set_2d_array(aa, one,unit);
+        set_2d_array(bb, any,frac);
+        set_2d_array(cc, any,frac);
+    } else if (!strcmp(name, "s415")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac);
+        set_1d_array(c, LEN_1D, any,frac);
+        a[LEN_1D-1] = -one;
+    } else if (!strcmp(name, "s421")) {
+        set_1d_array(a, LEN_1D, any,frac2);
+        set_1d_array(flat_2d_array, LEN_1D, one, unit);
+    } else if (!strcmp(name, "s422")) {
+        set_1d_array(flat_2d_array, LEN_1D,one,unit);
+        set_1d_array(a, LEN_1D, any,frac2);
+        set_1d_array(flat_2d_array + LEN_1D, LEN_1D, zero, unit);
+    } else if (!strcmp(name, "s1421")) {
+        set_1d_array(b, LEN_1D, one, unit);
+    } else if (!strcmp(name, "s423")) {
+        set_1d_array(flat_2d_array, LEN_1D,zero,unit);
+        set_1d_array(a, LEN_1D, any,frac2);
+        set_1d_array(flat_2d_array + LEN_1D, LEN_1D, one, unit);
+    } else if (!strcmp(name, "s424")) {
+        set_1d_array(flat_2d_array, LEN_1D,one,unit);
+        set_1d_array(a, LEN_1D, any,frac2);
+        set_1d_array(flat_2d_array, LEN_1D, zero, unit);
+    } else if (!strcmp(name, "s431")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac2);
+    } else if (!strcmp(name, "s432")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac2);
+    } else if (!strcmp(name, "s441")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac);
+        set_1d_array(c, LEN_1D, any,frac);
+        set_1d_array(&d[0],             LEN_1D/3  , -one,unit);
+        set_1d_array(&d[LEN_1D/3],      LEN_1D/3  , zero,unit);
+        set_1d_array(&d[(2*LEN_1D/3)],  LEN_1D/3+1, one,unit);
+    } else if (!strcmp(name, "s442")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac);
+        set_1d_array(c, LEN_1D, any,frac);
+        set_1d_array(d, LEN_1D, any,frac);
+        set_1d_array(e, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s443")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac);
+        set_1d_array(c, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s451")) {
+        set_1d_array(b, LEN_1D, any,frac);
+        set_1d_array(c, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s452")) {
+        set_1d_array(a, LEN_1D,zero,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+        set_1d_array(c, LEN_1D,small,unit);
+    } else if (!strcmp(name, "s453")) {
+        set_1d_array(a, LEN_1D,zero,unit);
+        set_1d_array(b, LEN_1D, any,frac2);
+    } else if (!strcmp(name, "s471")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+        set_1d_array(c, LEN_1D, one,unit);
+        set_1d_array(d, LEN_1D, any,frac);
+        set_1d_array(e, LEN_1D, any,frac);
+        set_1d_array(x, LEN_1D, zero, unit);
+    } else if (!strcmp(name, "s481")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac);
+        set_1d_array(c, LEN_1D, any,frac);
+        set_1d_array(d, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s482")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac);
+        set_1d_array(c, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s491")) {
+        set_1d_array(a, LEN_1D,zero,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+        set_1d_array(c, LEN_1D, any,frac);
+        set_1d_array(d, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s4112")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s4113")) {
+        set_1d_array(a, LEN_1D,zero,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+        set_1d_array(c, LEN_1D, any,frac2);
+    } else if (!strcmp(name, "s4114")) {
+        set_1d_array(a, LEN_1D,zero,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+        set_1d_array(c, LEN_1D, any,frac);
+        set_1d_array(d, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s4115")) {
+        set_1d_array(a, LEN_1D, any,frac);
+        set_1d_array(b, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s4116")) {
+        set_1d_array(a, LEN_1D, any,frac);
+        set_2d_array(aa, any,frac);
+    } else if (!strcmp(name, "s4117")) {
+        set_1d_array(a, LEN_1D,zero,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+        set_1d_array(c, LEN_1D, any,frac);
+        set_1d_array(d, LEN_1D, any,frac);
+    } else if (!strcmp(name, "s4121")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac);
+        set_1d_array(c, LEN_1D, any,frac);
+    } else if (!strcmp(name, "va")) {
+        set_1d_array(a, LEN_1D,zero,unit);
+        set_1d_array(b, LEN_1D, any,frac2);
+    } else if (!strcmp(name, "vag")) {
+        set_1d_array(a, LEN_1D,zero,unit);
+        set_1d_array(b, LEN_1D, any,frac2);
+    } else if (!strcmp(name, "vas")) {
+        set_1d_array(a, LEN_1D,zero,unit);
+        set_1d_array(b, LEN_1D, any,frac2);
+    } else if (!strcmp(name, "vif")) {
+        set_1d_array(a, LEN_1D,zero,unit);
+        set_1d_array(b, LEN_1D, any,frac2);
+    } else if (!strcmp(name, "vpv")) {
+        set_1d_array(a, LEN_1D,zero,unit);
+        set_1d_array(b, LEN_1D, any,frac2);
+    } else if (!strcmp(name, "vtv")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, one,unit);
+    } else if (!strcmp(name, "vpvtv")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac);
+        set_1d_array(c, LEN_1D, any,frac);
+    } else if (!strcmp(name, "vpvts")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, any,frac2);
+    } else if (!strcmp(name, "vpvpv")) {
+        set_1d_array(a, LEN_1D, any,frac2);
+        set_1d_array(b, LEN_1D, one,unit);
+        set_1d_array(c, LEN_1D,-one,unit);
+    } else if (!strcmp(name, "vtvtv")) {
+        set_1d_array(a, LEN_1D, one,unit);
+        set_1d_array(b, LEN_1D, two,unit);
+        set_1d_array(c, LEN_1D,half,unit);
+    } else if (!strcmp(name, "vsumr")) {
+        set_1d_array(a, LEN_1D, any,frac);
+    } else if (!strcmp(name, "vdotr")) {
+        set_1d_array(a, LEN_1D, any,frac);
+        set_1d_array(b, LEN_1D, any,frac);
+    } else if (!strcmp(name, "vbor")) {
+        set_1d_array(a, LEN_1D, any,frac);
+        set_1d_array(b, LEN_1D, any,frac);
+        set_1d_array(c, LEN_1D, one,frac);
+        set_1d_array(d, LEN_1D, two,frac);
+        set_1d_array(e, LEN_1D,half,frac);
+        set_2d_array(aa, any,frac);
+    } else {
+        set_1d_array(a, LEN_1D, any,frac);
+        set_1d_array(b, LEN_1D, any,frac);
+        set_1d_array(c, LEN_1D, one,frac);
+        set_1d_array(d, LEN_1D, two,frac);
+        set_1d_array(e, LEN_1D,half,frac);
+        set_2d_array(aa, half,frac);
+        set_2d_array(bb, one,frac);
+        set_2d_array(cc, any,frac);
+    }
+
+    return 0;
+}
+
+real_t calc_checksum(const char * name)
+{
+    if (!strcmp(name, "s000")) {
+        return sum_a();
+    } else if (!strcmp(name, "s111")) {
+        return sum_a();
+    } else if (!strcmp(name, "s1111")) {
+        return sum_a();
+    } else if (!strcmp(name, "s112")) {
+        return sum_a();
+    } else if (!strcmp(name, "s1112")) {
+        return sum_a();
+    } else if (!strcmp(name, "s113")) {
+        return sum_a();
+    } else if (!strcmp(name, "s1113")) {
+        return sum_a();
+    } else if (!strcmp(name, "s114")) {
+        return sum_aa();
+    } else if (!strcmp(name, "s115")) {
+        return sum_a();
+    } else if (!strcmp(name, "s1115")) {
+        return sum_aa();
+    } else if (!strcmp(name, "s116")) {
+        return sum_a();
+    } else if (!strcmp(name, "s118")) {
+        return sum_a();
+    } else if (!strcmp(name, "s119")) {
+        return sum_aa();
+    } else if (!strcmp(name, "s1119")) {
+        return sum_aa();
+    } else if (!strcmp(name, "s121")) {
+        return sum_a();
+    } else if (!strcmp(name, "s122")) {
+        return sum_a();
+    } else if (!strcmp(name, "s123")) {
+        return sum_a();
+    } else if (!strcmp(name, "s124")) {
+        return sum_a();
+    } else if (!strcmp(name, "s125")) {
+        return sum_flat_2d_array();
+    } else if (!strcmp(name, "s126")) {
+        return sum_bb();
+    } else if (!strcmp(name, "s127")) {
+        return sum_a();
+    } else if (!strcmp(name, "s128")) {
+        return sum_a() + sum_b();
+    } else if (!strcmp(name, "s131")) {
+        return sum_a();
+    } else if (!strcmp(name, "s132")) {
+        return sum_aa();
+    } else if (!strcmp(name, "s141")) {
+        return sum_flat_2d_array();
+    } else if (!strcmp(name, "s151")) {
+        return sum_a();
+    } else if (!strcmp(name, "s152")) {
+        return sum_a();
+    } else if (!strcmp(name, "s161")) {
+        return sum_a() + sum_c();
+    } else if (!strcmp(name, "s1161")) {
+        return sum_a() + sum_c();
+    } else if (!strcmp(name, "s162")) {
+        return sum_a();
+    } else if (!strcmp(name, "s171")) {
+        return sum_a();
+    } else if (!strcmp(name, "s172")) {
+        return sum_a();
+    } else if (!strcmp(name, "s173")) {
+        return sum_a();
+    } else if (!strcmp(name, "s174")) {
+        return sum_a();
+    } else if (!strcmp(name, "s175")) {
+        return sum_a();
+    } else if (!strcmp(name, "s176")) {
+        return sum_a();
+    } else if (!strcmp(name, "s211")) {
+        return sum_a() + sum_b();
+    } else if (!strcmp(name, "s212")) {
+        return sum_a() + sum_b();
+    } else if (!strcmp(name, "s1213")) {
+        return sum_a() + sum_b();
+    } else if (!strcmp(name, "s221")) {
+        return sum_a() + sum_b();
+    } else if (!strcmp(name, "s1221")) {
+        return sum_a() + sum_b();
+    } else if (!strcmp(name, "s222")) {
+        return sum_a() + sum_b();
+    } else if (!strcmp(name, "s231")) {
+        return sum_aa();
+    } else if (!strcmp(name, "s232")) {
+        return sum_aa();
+    } else if (!strcmp(name, "s1232")) {
+        return sum_aa();
+    } else if (!strcmp(name, "s233")) {
+        return sum_aa_bb();
+    } else if (!strcmp(name, "s2233")) {
+        return sum_aa_bb();
+    } else if (!strcmp(name, "s235")) {
+        return sum_a() + sum_b();
+    } else if (!strcmp(name, "s241")) {
+        return sum_a() + sum_b();
+    } else if (!strcmp(name, "s242")) {
+        return sum_a();
+    } else if (!strcmp(name, "s243")) {
+        return sum_a() + sum_b();
+    } else if (!strcmp(name, "s244")) {
+        return sum_a() + sum_b();
+    } else if (!strcmp(name, "s1244")) {
+        return sum_a() + sum_b();
+    } else if (!strcmp(name, "s2244")) {
+        return sum_a() + sum_b();
+    } else if (!strcmp(name, "s251")) {
+        return sum_a();
+    } else if (!strcmp(name, "s1251")) {
+        return sum_a();
+    } else if (!strcmp(name, "s2251")) {
+        return sum_a();
+    } else if (!strcmp(name, "s3251")) {
+        return sum_a();
+    } else if (!strcmp(name, "s252")) {
+        return sum_a();
+    } else if (!strcmp(name, "s253")) {
+        return sum_a() + sum_c();
+    } else if (!strcmp(name, "s254")) {
+        return sum_a();
+    } else if (!strcmp(name, "s255")) {
+        return sum_a();
+    } else if (!strcmp(name, "s256")) {
+        return sum_a_aa();
+    } else if (!strcmp(name, "s257")) {
+        return sum_a_aa();
+    } else if (!strcmp(name, "s258")) {
+        return sum_b() + sum_e();
+    } else if (!strcmp(name, "s261")) {
+        return sum_a() + sum_c();
+    } else if (!strcmp(name, "s271")) {
+        return sum_a();
+    } else if (!strcmp(name, "s272")) {
+        return sum_a() + sum_b();
+    } else if (!strcmp(name, "s273")) {
+        return sum_a() + sum_b() + sum_c();
+    } else if (!strcmp(name, "s274")) {
+        return sum_a() + sum_b();
+    } else if (!strcmp(name, "s275")) {
+        return sum_aa();
+    } else if (!strcmp(name, "s2275")) {
+        return sum_aa();
+    } else if (!strcmp(name, "s276")) {
+        return sum_a();
+    } else if (!strcmp(name, "s277")) {
+        return sum_a() + sum_b();
+    } else if (!strcmp(name, "s278")) {
+        return sum_a() + sum_b() + sum_c();
+    } else if (!strcmp(name, "s279")) {
+        return sum_a() + sum_b() + sum_c();
+    } else if (!strcmp(name, "s1279")) {
+        return sum_a() + sum_b() + sum_c();
+    } else if (!strcmp(name, "s2710")) {
+        return sum_a() + sum_b() + sum_c();
+    } else if (!strcmp(name, "s2711")) {
+        return sum_a();
+    } else if (!strcmp(name, "s2712")) {
+        return sum_a();
+    } else if (!strcmp(name, "s281")) {
+        return sum_a() + sum_b();
+    } else if (!strcmp(name, "s1281")) {
+        return sum_a() + sum_b();
+    } else if (!strcmp(name, "s291")) {
+        return sum_a();
+    } else if (!strcmp(name, "s292")) {
+        return sum_a();
+    } else if (!strcmp(name, "s293")) {
+        return sum_a();
+    } else if (!strcmp(name, "s2101")) {
+        return sum_aa();
+    } else if (!strcmp(name, "s2102")) {
+        return sum_aa();
+    } else if (!strcmp(name, "s2111")) {
+        return sum_aa();
+    } else if (!strcmp(name, "s311")) {
+        return sum_a();
+    } else if (!strcmp(name, "s31111")) {
+        return sum_a();
+    } else if (!strcmp(name, "s321")) {
+        return sum_a();
+    } else if (!strcmp(name, "s322")) {
+        return sum_a();
+    } else if (!strcmp(name, "s323")) {
+        return sum_a() + sum_b();
+    } else if (!strcmp(name, "s341")) {
+        return sum_a();
+    } else if (!strcmp(name, "s342")) {
+        return sum_a();
+    } else if (!strcmp(name, "s343")) {
+        return sum_flat_2d_array();
+    } else if (!strcmp(name, "s351")) {
+        return sum_a();
+    } else if (!strcmp(name, "s1351")) {
+        return sum_a();
+    } else if (!strcmp(name, "s353")) {
+        return sum_a();
+    } else if (!strcmp(name, "s421")) {
+        return sum_xx();
+    } else if (!strcmp(name, "s1421")) {
+        return sum_half_xx();
+    } else if (!strcmp(name, "s422")) {
+        return sum_xx();
+    } else if (!strcmp(name, "s423")) {
+        return sum_flat_2d_array();
+    } else if (!strcmp(name, "s424")) {
+        return sum_xx();
+    } else if (!strcmp(name, "s431")) {
+        return sum_a();
+    } else if (!strcmp(name, "s441")) {
+        return sum_a();
+    } else if (!strcmp(name, "s442")) {
+        return sum_a();
+    } else if (!strcmp(name, "s443")) {
+        return sum_a();
+    } else if (!strcmp(name, "s451")) {
+        return sum_a();
+    } else if (!strcmp(name, "s452")) {
+        return sum_a();
+    } else if (!strcmp(name, "s453")) {
+        return sum_a();
+    } else if (!strcmp(name, "s471")) {
+        return sum_x() + sum_b();
+    } else if (!strcmp(name, "s481")) {
+        return sum_a();
+    } else if (!strcmp(name, "s482")) {
+        return sum_a();
+    } else if (!strcmp(name, "s491")) {
+        return sum_a();
+    } else if (!strcmp(name, "s4112")) {
+        return sum_a();
+    } else if (!strcmp(name, "s4113")) {
+        return sum_a();
+    } else if (!strcmp(name, "s4114")) {
+        return sum_a();
+    } else if (!strcmp(name, "s4117")) {
+        return sum_a();
+    } else if (!strcmp(name, "s4121")) {
+        return sum_a();
+    } else if (!strcmp(name, "va")) {
+        return sum_a();
+    } else if (!strcmp(name, "vag")) {
+        return sum_a();
+    } else if (!strcmp(name, "vas")) {
+        return sum_a();
+    } else if (!strcmp(name, "vif")) {
+        return sum_a();
+    } else if (!strcmp(name, "vpv")) {
+        return sum_a();
+    } else if (!strcmp(name, "vtv")) {
+        return sum_a();
+    } else if (!strcmp(name, "vpvtv")) {
+        return sum_a();
+    } else if (!strcmp(name, "vpvts")) {
+        return sum_a();
+    } else if (!strcmp(name, "vpvpv")) {
+        return sum_a();
+    } else if (!strcmp(name, "vtvtv")) {
+        return sum_a();
+    } else if (!strcmp(name, "vsumr")) {
+        return sum_a();
+    } else if (!strcmp(name, "vbor")) {
+        return sum_x();
+    } else {
+        fprintf(stderr, "Unknown function name passed to calc_checksum: %s\n", name);
+        exit(1);
+    }
+}
+
+real_t get_expected_result(const char * name) 
+{
+    if (!strcmp(name, "s000")) {
+	return 512075584.f;
+    } else if (!strcmp(name, "s111")) {
+	return 32000.410156f;
+    } else if (!strcmp(name, "s1111")) {
+	return 13.352669f;
+    } else if (!strcmp(name, "s112")) {
+	return 81335.929688f;
+    } else if (!strcmp(name, "s1112")) {
+	return 32009.560547f;
+    } else if (!strcmp(name, "s113")) {
+	return 32000.642578f;
+    } else if (!strcmp(name, "s1113")) {
+	return 40010.613281f;
+    } else if (!strcmp(name, "s114")) {
+	return 919.856323f;
+    } else if (!strcmp(name, "s115")) {
+	return 31727.289062f;
+    } else if (!strcmp(name, "s1115")) {
+	return 25487.052734f;
+    } else if (!strcmp(name, "s116")) {
+	return 32000.f;
+    } else if (!strcmp(name, "s118")) {
+	return 32353.884766f;
+    } else if (!strcmp(name, "s119")) {
+	return 86338.984375f;
+    } else if (!strcmp(name, "s1119")) {
+	return 201466.421875f;
+    } else if (!strcmp(name, "s121")) {
+	return 32009.027344f;
+    } else if (!strcmp(name, "s122")) {
+	return 48446.664062f;
+    } else if (!strcmp(name, "s123")) {
+	return 32003.285156f;
+    } else if (!strcmp(name, "s124")) {
+	return 32001.642578f;
+    } else if (!strcmp(name, "s125")) {
+	return 131072.f;
+    } else if (!strcmp(name, "s126")) {
+	return 66955.132812f;
+    } else if (!strcmp(name, "s127")) {
+	return 32003.285156f;
+    } else if (!strcmp(name, "s128")) {
+	return 80000.f;
+    } else if (!strcmp(name, "s131")) {
+	return 32009.027344f;
+    } else if (!strcmp(name, "s132")) {
+	return 65538.5625f;
+    } else if (!strcmp(name, "s141")) {
+	return 3307351.5f;
+    } else if (!strcmp(name, "s151")) {
+	return 32009.027344f;
+    } else if (!strcmp(name, "s152")) {
+	return 44020.523438f;
+    } else if (!strcmp(name, "s161")) {
+	return 64002.054688f;
+    } else if (!strcmp(name, "s1161")) {
+	return 23.546331f;
+    } else if (!strcmp(name, "s162")) {
+	return 32009.023438f;
+    } else if (!strcmp(name, "s171")) {
+	return 48448.019531f;
+    } else if (!strcmp(name, "s172")) {
+	return 48448.019531f;
+    } else if (!strcmp(name, "s173")) {
+	return 32001.626953f;
+    } else if (!strcmp(name, "s174")) {
+	return 32001.626953f;
+    } else if (!strcmp(name, "s175")) {
+	return 32009.023438f;
+    } else if (!strcmp(name, "s176")) {
+	return 32000.f;
+    } else if (!strcmp(name, "s211")) {
+	return 63983.308594f;
+    } else if (!strcmp(name, "s212")) {
+	return 42008.136719f;
+    } else if (!strcmp(name, "s1213")) {
+	return 14.450508f;
+    } else if (!strcmp(name, "s221")) {
+	return 615418176.f;
+    } else if (!strcmp(name, "s1221")) {
+	return 79623.265625f;
+    } else if (!strcmp(name, "s222")) {
+	return 32000.f;
+    } else if (!strcmp(name, "s231")) {
+	return 119107.445312f;
+    } else if (!strcmp(name, "s232")) {
+	return 65536.f;
+    } else if (!strcmp(name, "s1232")) {
+	return 2885.801514f;
+    } else if (!strcmp(name, "s233")) {
+	return 504911.65625f;
+    } else if (!strcmp(name, "s2233")) {
+	return 337652.8125f;
+    } else if (!strcmp(name, "s235")) {
+	return 44810.886719f;
+    } else if (!strcmp(name, "s241")) {
+	return 64000.f;
+    } else if (!strcmp(name, "s242")) {
+	return 1535966208.f;
+    } else if (!strcmp(name, "s243")) {
+	return 138653.21875f;
+    } else if (!strcmp(name, "s244")) {
+	return 64623.015625f;
+    } else if (!strcmp(name, "s1244")) {
+	return 36.141911f;
+    } else if (!strcmp(name, "s2244")) {
+	return 32.852161f;
+    } else if (!strcmp(name, "s251")) {
+	return 32004.367188f;
+    } else if (!strcmp(name, "s1251")) {
+	return 39967.507812f;
+    } else if (!strcmp(name, "s2251")) {
+	return 2.635388f;
+    } else if (!strcmp(name, "s3251")) {
+	return 13.59558f;
+    } else if (!strcmp(name, "s252")) {
+	return 63999.f;
+    } else if (!strcmp(name, "s253")) {
+	return 320115936.f;
+    } else if (!strcmp(name, "s254")) {
+	return 32000.f;
+    } else if (!strcmp(name, "s255")) {
+	return 31953.501953f;
+    } else if (!strcmp(name, "s256")) {
+	return 66207.828125f;
+    } else if (!strcmp(name, "s257")) {
+	return 163072.f;
+    } else if (!strcmp(name, "s258")) {
+	return 14.65278f;
+    } else if (!strcmp(name, "s261")) {
+	return 54894.515625f;
+    } else if (!strcmp(name, "s271")) {
+	return 97793.570312f;
+    } else if (!strcmp(name, "s272")) {
+	return 64000.f;
+    } else if (!strcmp(name, "s273")) {
+	return 96311.546875f;
+    } else if (!strcmp(name, "s274")) {
+	return 320133920.f;
+    } else if (!strcmp(name, "s275")) {
+	return 65536.f;
+    } else if (!strcmp(name, "s2275")) {
+	return 1640158.5f;
+    } else if (!strcmp(name, "s276")) {
+	return 97793.570312f;
+    } else if (!strcmp(name, "s277")) {
+	return 32000.f;
+    } else if (!strcmp(name, "s278")) {
+	return 64012.589844f;
+    } else if (!strcmp(name, "s279")) {
+	return 64014.289062f;
+    } else if (!strcmp(name, "s1279")) {
+	return 32.852161f;
+    } else if (!strcmp(name, "s2710")) {
+	return 96003.28125f;
+    } else if (!strcmp(name, "s2711")) {
+	return 97793.570312f;
+    } else if (!strcmp(name, "s2712")) {
+	return 97793.570312f;
+    } else if (!strcmp(name, "s281")) {
+	return 32000.f;
+    } else if (!strcmp(name, "s1281")) {
+	return INFINITY;
+    } else if (!strcmp(name, "s291")) {
+	return 32000.f;
+    } else if (!strcmp(name, "s292")) {
+	return 31953.501953f;
+    } else if (!strcmp(name, "s293")) {
+	return 31999.998047f;
+    } else if (!strcmp(name, "s2101")) {
+	return 229657.921875f;
+    } else if (!strcmp(name, "s2102")) {
+	return 256.f;
+    } else if (!strcmp(name, "s2111")) {
+	return 34544940.f;
+    } else if (!strcmp(name, "s311")) {
+	return 10.950721f;
+    } else if (!strcmp(name, "s31111")) {
+	return 10.950721f;
+    } else if (!strcmp(name, "s312")) {
+	return 1.030869f;
+    } else if (!strcmp(name, "s313")) {
+	return 1.644824f;
+    } else if (!strcmp(name, "s314")) {
+	return 1.f;
+    } else if (!strcmp(name, "s315")) {
+	return 54857.f;
+    } else if (!strcmp(name, "s316")) {
+	return 0.000031f;
+    } else if (!strcmp(name, "s317")) {
+	return 0.f;
+    } else if (!strcmp(name, "s318")) {
+	return 32002.f;
+    } else if (!strcmp(name, "s319")) {
+	return 43.802898f;
+    } else if (!strcmp(name, "s3110")) {
+	return 514.f;
+    } else if (!strcmp(name, "s13110")) {
+	return 3.f;
+    } else if (!strcmp(name, "s3111")) {
+	return 10.950725f;
+    } else if (!strcmp(name, "s3112")) {
+	return 1.644725f;
+    } else if (!strcmp(name, "s3113")) {
+	return 2.f;
+    } else if (!strcmp(name, "s321")) {
+	return 32000.f;
+    } else if (!strcmp(name, "s322")) {
+	return 32000.f;
+    } else if (!strcmp(name, "s323")) {
+	return 146472.4375f;
+    } else if (!strcmp(name, "s331")) {
+	return 32000.f;
+    } else if (!strcmp(name, "s332")) {
+	return -1.f;
+    } else if (!strcmp(name, "s341")) {
+	return 10.950721f;
+    } else if (!strcmp(name, "s342")) {
+	return 10.950721f;
+    } else if (!strcmp(name, "s343")) {
+	return 1567.932129f;
+    } else if (!strcmp(name, "s351")) {
+	return 2560660224.f;
+    } else if (!strcmp(name, "s1351")) {
+	return 21.901442f;
+    } else if (!strcmp(name, "s352")) {
+	return 1.644808f;
+    } else if (!strcmp(name, "s353")) {
+	return 320084192.f;
+    } else if (!strcmp(name, "s421")) {
+	return 32009.023438f;
+    } else if (!strcmp(name, "s1421")) {
+	return 16000.f;
+    } else if (!strcmp(name, "s422")) {
+	return 3.737715f;
+    } else if (!strcmp(name, "s423")) {
+	return 64006.683594f;
+    } else if (!strcmp(name, "s424")) {
+	return 822.364014f;
+    } else if (!strcmp(name, "s431")) {
+	return 196500.265625f;
+    } else if (!strcmp(name, "s441")) {
+	return 48448.019531f;
+    } else if (!strcmp(name, "s442")) {
+	return 40224.117188f;
+    } else if (!strcmp(name, "s443")) {
+	return 64895.867188f;
+    } else if (!strcmp(name, "s451")) {
+	return 32007.898438f;
+    } else if (!strcmp(name, "s452")) {
+	return 32511.939453f;
+    } else if (!strcmp(name, "s453")) {
+	return 21.901442f;
+    } else if (!strcmp(name, "s471")) {
+	return 64004.925781f;
+    } else if (!strcmp(name, "s481")) {
+	return 48448.019531f;
+    } else if (!strcmp(name, "s482")) {
+	return 48448.019531f;
+    } else if (!strcmp(name, "s491")) {
+	return 32001.640625f;
+    } else if (!strcmp(name, "s4112")) {
+	return 141504.875f;
+    } else if (!strcmp(name, "s4113")) {
+	return 32001.640625f;
+    } else if (!strcmp(name, "s4114")) {
+	return 32000.f;
+    } else if (!strcmp(name, "s4115")) {
+	return 1.038636f;
+    } else if (!strcmp(name, "s4116")) {
+	return 0.753265f;
+    } else if (!strcmp(name, "s4117")) {
+	return 32002.205078f;
+    } else if (!strcmp(name, "s4121")) {
+	return 48448.019531f;
+    } else if (!strcmp(name, "va")) {
+	return 1.644725f;
+    } else if (!strcmp(name, "vag")) {
+	return 1.644725f;
+    } else if (!strcmp(name, "vas")) {
+	return 1.644725f;
+    } else if (!strcmp(name, "vif")) {
+	return 1.644725f;
+    } else if (!strcmp(name, "vpv")) {
+	return 164487.78125f;
+    } else if (!strcmp(name, "vtv")) {
+	return 32000.f;
+    } else if (!strcmp(name, "vpvtv")) {
+	return 97793.570312f;
+    } else if (!strcmp(name, "vpvts")) {
+	return 17522152701952.f;
+    } else if (!strcmp(name, "vpvpv")) {
+	return 1.644725f;
+    } else if (!strcmp(name, "vtvtv")) {
+	return 32000.f;
+    } else if (!strcmp(name, "vsumr")) {
+	return 10.950725f;
+    } else if (!strcmp(name, "vdotr")) {
+	return 1.644824f;
+    } else if (!strcmp(name, "vbor")) {
+	return 31924.046875f;
+    } else {
+        fprintf(stderr, "Unknown function name passed to expected_result: %s\n", name);
+        exit(1);
+    }
+}
+
+typedef real_t(*test_function_t)(struct args_t *);
+
+static _Bool is_checksum_same(real_t expected, real_t value)
+{
+  if (expected == INFINITY)
+      return value == INFINITY;
+  else if(expected == 0.f)
+      return value <= 0.01f;
+  else {
+      real_t fraction = value / expected;
+      return 0.99f <= fraction && fraction <= 1.01f;
+  }
+}
+
+void run(test_function_t vector_func, const char *fname, void * arg_info)
+{
+    struct args_t func_args = {.arg_info=arg_info};
+
+    double result = vector_func(&func_args);
+    double expected_result = get_expected_result(fname);
+
+    if (!is_checksum_same(expected_result, result))
+      {
+	fprintf (stderr, "value: %f, expected: %f\n", result, expected_result);
+	__builtin_abort();
+      }
+}
+
+int
+__attribute__((noipa))
+dummy(float a[LEN_1D], float b[LEN_1D], float c[LEN_1D], float d[LEN_1D], float e[LEN_1D], float aa[LEN_2D][LEN_2D], float bb[LEN_2D][LEN_2D], float cc[LEN_2D][LEN_2D], float s){
+    // --  called in each loop to make all computations appear required
+    return 0;
+}
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s000.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s000.c
index c6c57404757..842bd55ece8 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s000.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s000.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s000 (void)
+real_t s000(struct args_t * func_args)
 {
 //    linear dependence testing
 //    no dependence - vectorizable
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 2*iterations; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
@@ -19,5 +13,19 @@ void s000 (void)
         }
         dummy((real_t*)a, (real_t*)b, (real_t*)c, (real_t*)d, (real_t*)e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s000, "s000", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s111.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s111.c
index b63fb6ddaf7..b5e8a2e0379 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s111.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s111.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s111 (void)
+real_t s111(struct args_t * func_args)
 {
 //    linear dependence testing
 //    no dependence - vectorizable
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 2*iterations; nl++) {
         for (int i = 1; i < LEN_1D; i += 2) {
@@ -19,5 +13,19 @@ void s111 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s111, "s111", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1111.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1111.c
index e7c5a75424b..20110763618 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1111.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1111.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s1111 (void)
+real_t s1111(struct args_t * func_args)
 {
 //    no dependence - vectorizable
 //    jump in data access
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 2*iterations; nl++) {
         for (int i = 0; i < LEN_1D/2; i++) {
@@ -19,5 +13,19 @@ void s1111 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s1111, "s1111", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1112.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1112.c
index 80e8a71b543..57068fb46a1 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1112.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1112.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s1112 (void)
+real_t s1112(struct args_t * func_args)
 {
 //    linear dependence testing
 //    loop reversal
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations*3; nl++) {
         for (int i = LEN_1D - 1; i >= 0; i--) {
@@ -19,5 +13,19 @@ void s1112 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s1112, "s1112", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1113.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1113.c
index c26ac752230..42897390ae5 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1113.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1113.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s1113 (void)
+real_t s1113(struct args_t * func_args)
 {
 //    linear dependence testing
 //    one iteration dependency on a(LEN_1D/2) but still vectorizable
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 2*iterations; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
@@ -19,4 +13,19 @@ void s1113 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s1113, "s1113", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1115.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1115.c
index cf1ace4b4da..1bea08b007f 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1115.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1115.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s1115 (void)
+real_t s1115(struct args_t * func_args)
 {
 //    linear dependence testing
 //    triangular saxpy loop
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 100*(iterations/LEN_2D); nl++) {
         for (int i = 0; i < LEN_2D; i++) {
@@ -21,4 +15,19 @@ void s1115 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s1115, "s1115", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1119.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1119.c
index 61a531907b9..8eaa1de100b 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1119.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1119.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s1119 (void)
+real_t s1119(struct args_t * func_args)
 {
 //    linear dependence testing
 //    no dependence - vectorizable
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 200*(iterations/(LEN_2D)); nl++) {
         for (int i = 1; i < LEN_2D; i++) {
@@ -21,5 +15,19 @@ void s1119 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s1119, "s1119", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s112.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s112.c
index 9025825ef94..f30d7e5b711 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s112.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s112.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s112 (void)
+real_t s112(struct args_t * func_args)
 {
 //    linear dependence testing
 //    loop reversal
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 3*iterations; nl++) {
         for (int i = LEN_1D - 2; i >= 0; i--) {
@@ -19,5 +13,19 @@ void s112 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s112, "s112", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s113.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s113.c
index 4cdb8c0edeb..41d303bcc78 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s113.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s113.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s113 (void)
+real_t s113(struct args_t * func_args)
 {
 //    linear dependence testing
 //    a(i)=a(1) but no actual dependence cycle
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 4*iterations; nl++) {
         for (int i = 1; i < LEN_1D; i++) {
@@ -19,5 +13,19 @@ void s113 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s113, "s113", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s114.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s114.c
index f532c95421e..63f8c4066aa 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s114.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s114.c
@@ -1,18 +1,12 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s114 (void)
+real_t s114(struct args_t * func_args)
 {
 //    linear dependence testing
 //    transpose vectorization
 //    Jump in data access - not vectorizable
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 200*(iterations/(LEN_2D)); nl++) {
         for (int i = 0; i < LEN_2D; i++) {
@@ -22,4 +16,19 @@ void s114 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s114, "s114", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s115.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s115.c
index 75f1c4e72dd..808f5b90898 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s115.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s115.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s115 (void)
+real_t s115(struct args_t * func_args)
 {
 //    linear dependence testing
 //    triangular saxpy loop
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 1000*(iterations/LEN_2D); nl++) {
         for (int j = 0; j < LEN_2D; j++) {
@@ -21,5 +15,19 @@ void s115 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s115, "s115", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s116.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s116.c
index 3806e87e16b..05ee6b273ac 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s116.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s116.c
@@ -1,16 +1,10 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s116 (void)
+real_t s116(struct args_t * func_args)
 {
 //    linear dependence testing
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations*10; nl++) {
         for (int i = 0; i < LEN_1D - 5; i += 5) {
@@ -22,4 +16,19 @@ void s116 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s116, "s116", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1161.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1161.c
index 7a3303f87e3..ad516d546de 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1161.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1161.c
@@ -1,18 +1,12 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s1161 (void)
+real_t s1161(struct args_t * func_args)
 {
 //    control flow
 //    tests for recognition of loop independent dependences
 //    between statements in mutually exclusive regions.
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = 0; i < LEN_1D-1; ++i) {
@@ -28,4 +22,19 @@ L10:
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s1161, "s1161", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s118.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s118.c
index 290839919da..cc0a378f848 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s118.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s118.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s118 (void)
+real_t s118(struct args_t * func_args)
 {
 //    linear dependence testing
 //    potential dot product recursion
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 200*(iterations/LEN_2D); nl++) {
         for (int i = 1; i < LEN_2D; i++) {
@@ -21,4 +15,19 @@ void s118 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s118, "s118", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s119.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s119.c
index 2b98fa5467f..8a826787352 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s119.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s119.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s119 (void)
+real_t s119(struct args_t * func_args)
 {
 //    linear dependence testing
 //    no dependence - vectorizable
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 200*(iterations/(LEN_2D)); nl++) {
         for (int i = 1; i < LEN_2D; i++) {
@@ -21,5 +15,19 @@ void s119 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s119, "s119", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s121.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s121.c
index f8d1cc055cd..a98d3f29e67 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s121.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s121.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s121 (void)
+real_t s121(struct args_t * func_args)
 {
 //    induction variable recognition
 //    loop with possible ambiguity because of scalar store
 
+    initialise_arrays(__func__);
 
     int j;
     for (int nl = 0; nl < 3*iterations; nl++) {
@@ -21,5 +15,19 @@ void s121 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s121, "s121", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1213.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1213.c
index ad103d0fe59..45740ec6feb 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1213.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1213.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s1213 (void)
+real_t s1213(struct args_t * func_args)
 {
 //    statement reordering
 //    dependency needing temporary
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = 1; i < LEN_1D-1; i++) {
@@ -20,4 +14,19 @@ void s1213 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s1213, "s1213", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s122.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s122.c
index e8d294b9f92..4dd10165dcc 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s122.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s122.c
@@ -1,23 +1,16 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-struct arg{int a;int b;};
-
-void s122 (struct arg *x)
+real_t s122(struct args_t * func_args)
 {
 //    induction variable recognition
 //    variable lower and upper bound, and stride
 //    reverse data access and jump in data access
 
+    struct{int a;int b;} * x = func_args->arg_info;
     int n1 = x->a;
     int n3 = x->b;
 
+    initialise_arrays(__func__);
 
     int j, k;
     for (int nl = 0; nl < iterations; nl++) {
@@ -29,4 +22,19 @@ void s122 (struct arg *x)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s122, "s122", &(struct{int a;int b;}){n1, n3});
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1221.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1221.c
index 7992a65aae5..1946baf6ca5 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1221.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1221.c
@@ -1,16 +1,10 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s1221 (void)
+real_t s1221(struct args_t * func_args)
 {
 //    run-time symbolic resolution
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = 4; i < LEN_1D; i++) {
@@ -18,5 +12,19 @@ void s1221 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s1221, "s1221", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s123.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s123.c
index f17d5913a54..d2bcdfc4536 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s123.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s123.c
@@ -1,18 +1,12 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s123 (void)
+real_t s123(struct args_t * func_args)
 {
 //    induction variable recognition
 //    induction variable under an if
 //    not vectorizable, the condition cannot be speculated
 
+    initialise_arrays(__func__);
 
     int j;
     for (int nl = 0; nl < iterations; nl++) {
@@ -27,4 +21,19 @@ void s123 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s123, "s123", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1232.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1232.c
index 128804aed75..470167c06e2 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1232.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1232.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s1232 (void)
+real_t s1232(struct args_t * func_args)
 {
 //    loop interchange
 //    interchanging of triangular loops
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 100*(iterations/LEN_2D); nl++) {
         for (int j = 0; j < LEN_2D; j++) {
@@ -21,4 +15,19 @@ void s1232 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 1.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s1232, "s1232", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s124.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s124.c
index 4a23eeadbcf..aa83a7ec4f4 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s124.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s124.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s124 (void)
+real_t s124(struct args_t * func_args)
 {
 //    induction variable recognition
 //    induction variable under both sides of if (same value)
 
+    initialise_arrays(__func__);
 
     int j;
     for (int nl = 0; nl < iterations; nl++) {
@@ -27,4 +21,19 @@ void s124 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s124, "s124", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1244.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1244.c
index add25a328eb..b6acf3789b1 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1244.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1244.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s1244 (void)
+real_t s1244(struct args_t * func_args)
 {
 //    node splitting
 //    cycle with ture and anti dependency
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = 0; i < LEN_1D-1; i++) {
@@ -20,4 +14,19 @@ void s1244 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s1244, "s1244", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s125.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s125.c
index 871154c3786..ecad62fa156 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s125.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s125.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s125 (void)
+real_t s125(struct args_t * func_args)
 {
 //    induction variable recognition
 //    induction variable in two loops; collapsing possible
 
+    initialise_arrays(__func__);
 
     int k;
     for (int nl = 0; nl < 100*(iterations/(LEN_2D)); nl++) {
@@ -24,5 +18,19 @@ void s125 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s125, "s125", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1251.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1251.c
index a6cc3a42e1d..66f8806ef2f 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1251.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1251.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s1251 (void)
+real_t s1251(struct args_t * func_args)
 {
 //    scalar and array expansion
 //    scalar expansion
 
+    initialise_arrays(__func__);
 
     real_t s;
     for (int nl = 0; nl < 4*iterations; nl++) {
@@ -22,5 +16,19 @@ void s1251 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s1251, "s1251", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s126.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s126.c
index 011e5ce08e5..a7642318ac8 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s126.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s126.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s126 (void)
+real_t s126(struct args_t * func_args)
 {
 //    induction variable recognition
 //    induction variable in two loops; recurrence in inner loop
 
+    initialise_arrays(__func__);
 
     int k;
     for (int nl = 0; nl < 10*(iterations/LEN_2D); nl++) {
@@ -25,4 +19,19 @@ void s126 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s126, "s126", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s127.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s127.c
index b1cd4f99eff..49267259747 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s127.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s127.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s127 (void)
+real_t s127(struct args_t * func_args)
 {
 //    induction variable recognition
 //    induction variable with multiple increments
 
+    initialise_arrays(__func__);
 
     int j;
     for (int nl = 0; nl < 2*iterations; nl++) {
@@ -24,5 +18,19 @@ void s127 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s127, "s127", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1279.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1279.c
index 90cd2cec47b..e179f94b829 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1279.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1279.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s1279 (void)
+real_t s1279(struct args_t * func_args)
 {
 //    control flow
 //    vector if/gotos
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
@@ -23,4 +17,19 @@ void s1279 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s1279, "s1279", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s128.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s128.c
index 3356b16fe1e..6c6e2eda2d4 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s128.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s128.c
@@ -1,18 +1,12 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s128 (void)
+real_t s128(struct args_t * func_args)
 {
 //    induction variables
 //    coupled induction variables
 //    jump in data access
 
+    initialise_arrays(__func__);
 
     int j, k;
     for (int nl = 0; nl < 2*iterations; nl++) {
@@ -25,5 +19,19 @@ void s128 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 1.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s128, "s128", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1281.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1281.c
index 8534b71a1a4..355dc63fbf0 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1281.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1281.c
@@ -1,18 +1,12 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s1281 (void)
+real_t s1281(struct args_t * func_args)
 {
 //    crossing thresholds
 //    index set splitting
 //    reverse data access
 
+    initialise_arrays(__func__);
 
     real_t x;
     for (int nl = 0; nl < 4*iterations; nl++) {
@@ -23,5 +17,19 @@ void s1281 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s1281, "s1281", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s131.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s131.c
index 377b841d298..1d80e9b1bb6 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s131.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s131.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s131 (void)
+real_t s131(struct args_t * func_args)
 {
 //    global data flow analysis
 //    forward substitution
 
+    initialise_arrays(__func__);
 
     int m  = 1;
     for (int nl = 0; nl < 5*iterations; nl++) {
@@ -20,5 +14,19 @@ void s131 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s131, "s131", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s13110.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s13110.c
index efc3b61d7e1..1f3b1c0fb26 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s13110.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s13110.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s13110 (void)
+real_t s13110(struct args_t * func_args)
 {
 //    reductions
 //    if to max with index reductio 2 dimensions
 
+    initialise_arrays(__func__);
 
     int xindex, yindex;
     real_t max, chksum;
@@ -31,4 +25,19 @@ void s13110 (void)
         chksum = max + (real_t) xindex + (real_t) yindex;
         dummy(a, b, c, d, e, aa, bb, cc, chksum);
     }
+
+    return max + xindex+1 + yindex+1;
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s13110, "s13110", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s132.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s132.c
index 1837e11aa2c..b9d62287d9c 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s132.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s132.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s132 (void)
+real_t s132(struct args_t * func_args)
 {
 //    global data flow analysis
 //    loop with multiple dimension ambiguous subscripts
 
+    initialise_arrays(__func__);
 
     int m = 0;
     int j = m;
@@ -22,5 +16,19 @@ void s132 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s132, "s132", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1351.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1351.c
index fddaefb8e66..41f8f16cc81 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1351.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1351.c
@@ -1,16 +1,10 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s1351 (void)
+real_t s1351(struct args_t * func_args)
 {
 //    induction pointer recognition
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 8*iterations; nl++) {
         real_t* __restrict__ A = a;
@@ -24,5 +18,19 @@ void s1351 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s1351, "s1351", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s141.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s141.c
index 9ea1df48331..a9c820df58e 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s141.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s141.c
@@ -1,18 +1,12 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s141 (void)
+real_t s141(struct args_t * func_args)
 {
 //    nonlinear dependence testing
 //    walk a row in a symmetric packed array
 //    element a(i,j) for (int j>i) stored in location j*(j-1)/2+i
 
+    initialise_arrays(__func__);
 
     int k;
     for (int nl = 0; nl < 200*(iterations/LEN_2D); nl++) {
@@ -25,4 +19,19 @@ void s141 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s141, "s141", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1421.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1421.c
index 947e761f869..bf6d61126e9 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1421.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s1421.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s1421 (void)
+real_t s1421(struct args_t * func_args)
 {
 //    storage classes and equivalencing
 //    equivalence- no overlap
 
+    initialise_arrays(__func__);
 
     xx = &b[LEN_1D/2];
 
@@ -21,5 +15,19 @@ void s1421 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 1.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s1421, "s1421", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s151.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s151.c
index f04bdfa6c8c..1daa6161a80 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s151.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s151.c
@@ -1,10 +1,3 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
 void s151s(real_t a[LEN_1D], real_t b[LEN_1D],  int m)
@@ -14,16 +7,30 @@ void s151s(real_t a[LEN_1D], real_t b[LEN_1D],  int m)
     }
 }
 
-void s151 (void)
+real_t s151(struct args_t * func_args)
 {
 //    interprocedural data flow analysis
 //    passing parameter information into a subroutine
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 5*iterations; nl++) {
         s151s(a, b,  1);
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
 
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" } } */
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s151, "s151", NULL);
+
+  return 0;
+}
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s152.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s152.c
index 6ad1eb3a632..de3da7ad22f 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s152.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s152.c
@@ -1,10 +1,3 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
 void s152s(real_t a[LEN_1D], real_t b[LEN_1D], real_t c[LEN_1D], int i)
@@ -12,11 +5,12 @@ void s152s(real_t a[LEN_1D], real_t b[LEN_1D], real_t c[LEN_1D], int i)
     a[i] += b[i] * c[i];
 }
 
-void s152 (void)
+real_t s152(struct args_t * func_args)
 {
 //    interprocedural data flow analysis
 //    collecting information from a subroutine
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
@@ -25,6 +19,19 @@ void s152 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
 
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s152, "s152", NULL);
+
+  return 0;
+}
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s161.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s161.c
index 4bfa9a490ef..6c3099264dc 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s161.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s161.c
@@ -1,18 +1,12 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s161 (void)
+real_t s161(struct args_t * func_args)
 {
 //    control flow
 //    tests for recognition of loop independent dependences
 //    between statements in mutually exclusive regions.
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations/2; nl++) {
         for (int i = 0; i < LEN_1D-1; ++i) {
@@ -28,4 +22,19 @@ L10:
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s161, "s161", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s162.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s162.c
index 60f86fc61d9..7de89874c24 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s162.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s162.c
@@ -1,17 +1,14 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s162 (int k)
+real_t s162(struct args_t * func_args)
 {
 //    control flow
 //    deriving assertions
 
+    int k = *(int*)func_args->arg_info;
+
+    initialise_arrays(__func__);
+
     for (int nl = 0; nl < iterations; nl++) {
         if (k > 0) {
             for (int i = 0; i < LEN_1D-1; i++) {
@@ -20,6 +17,19 @@ void s162 (int k)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
 
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s162, "s162", &n1);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s171.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s171.c
index dd2e425ee20..0116c92b3df 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s171.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s171.c
@@ -1,18 +1,13 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s171 (int inc)
+real_t s171(struct args_t * func_args)
 {
 //    symbolics
 //    symbolic dependence tests
 
+    int inc = *(int*)func_args->arg_info;
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
@@ -20,6 +15,19 @@ void s171 (int inc)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
 
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s171, "s171", &n1);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s172.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s172.c
index a15355fcb64..9694308aa54 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s172.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s172.c
@@ -1,22 +1,15 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-struct arg{int a;int b;};
-
-void s172 (struct arg *x)
+real_t s172(struct args_t * func_args)
 {
 //    symbolics
 //    vectorizable if n3 .ne. 0
 
+    struct{int a;int b;} * x = func_args->arg_info;
     int n1 = x->a;
     int n3 = x->b;
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = n1-1; i < LEN_1D; i += n3) {
@@ -24,4 +17,19 @@ void s172 (struct arg *x)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s172, "s172", &(struct{int a;int b;}){n1, n3});
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s173.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s173.c
index def1c4eb22d..c5205580367 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s173.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s173.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s173 (void)
+real_t s173(struct args_t * func_args)
 {
 //    symbolics
 //    expression in loop bounds and subscripts
 
+    initialise_arrays(__func__);
 
     int k = LEN_1D/2;
     for (int nl = 0; nl < 10*iterations; nl++) {
@@ -20,5 +14,19 @@ void s173 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s173, "s173", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s174.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s174.c
index f0488fded38..50e8265ff30 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s174.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s174.c
@@ -1,23 +1,33 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s174 (int M)
+real_t s174(struct args_t * func_args)
 {
 //    symbolics
 //    loop with subscript that may seem ambiguous
 
+    int M = *(int*)func_args->arg_info;
+
+    initialise_arrays(__func__);
+
     for (int nl = 0; nl < 10*iterations; nl++) {
         for (int i = 0; i < M; i++) {
             a[i+M] = a[i] + b[i];
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
 
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s174, "s174", &(struct{int a;}){LEN_1D/2});
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s175.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s175.c
index 82825d0a27a..2b5d1da63b1 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s175.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s175.c
@@ -1,21 +1,33 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s175 (int inc)
+real_t s175(struct args_t * func_args)
 {
 //    symbolics
 //    symbolic dependence tests
 
+    int inc = *(int*)func_args->arg_info;
+
+    initialise_arrays(__func__);
+
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = 0; i < LEN_1D-1; i += inc) {
             a[i] = a[i + inc] + b[i];
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s175, "s175", &n1);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s176.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s176.c
index f7b79b5ee43..7fb82beb709 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s176.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s176.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s176 (void)
+real_t s176(struct args_t * func_args)
 {
 //    symbolics
 //    convolution
 
+    initialise_arrays(__func__);
 
     int m = LEN_1D/2;
     for (int nl = 0; nl < 4*(iterations/LEN_1D); nl++) {
@@ -22,5 +16,19 @@ void s176 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s176, "s176", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2101.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2101.c
index 22d298925af..8a11b92aef0 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2101.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2101.c
@@ -1,18 +1,12 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s2101 (void)
+real_t s2101(struct args_t * func_args)
 {
 //    diagonals
 //    main diagonal calculation
 //    jump in data access
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 10*iterations; nl++) {
         for (int i = 0; i < LEN_2D; i++) {
@@ -20,5 +14,19 @@ void s2101 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s2101, "s2101", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2102.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2102.c
index 6d243b3b389..625179df4d0 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2102.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2102.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s2102 (void)
+real_t s2102(struct args_t * func_args)
 {
 //    diagonals
 //    identity matrix, best results vectorize both inner and outer loops
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 100*(iterations/LEN_2D); nl++) {
         for (int i = 0; i < LEN_2D; i++) {
@@ -22,4 +16,19 @@ void s2102 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s2102, "s2102", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s211.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s211.c
index 51724c75688..0ad517b8057 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s211.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s211.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s211 (void)
+real_t s211(struct args_t * func_args)
 {
 //    statement reordering
 //    statement reordering allows vectorization
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = 1; i < LEN_1D-1; i++) {
@@ -20,4 +14,19 @@ void s211 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s211, "s211", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2111.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2111.c
index 296087c84f9..ee631ca8cc4 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2111.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2111.c
@@ -1,16 +1,10 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s2111 (void)
+real_t s2111(struct args_t * func_args)
 {
 //    wavefronts, it will make jump in data access
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 100*(iterations/(LEN_2D)); nl++) {
         for (int j = 1; j < LEN_2D; j++) {
@@ -20,4 +14,19 @@ void s2111 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s2111, "s2111", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s212.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s212.c
index 54f54860527..822d1aba18a 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s212.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s212.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s212 (void)
+real_t s212(struct args_t * func_args)
 {
 //    statement reordering
 //    dependency needing temporary
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = 0; i < LEN_1D-1; i++) {
@@ -20,4 +14,19 @@ void s212 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s212, "s212", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s221.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s221.c
index 04cc2cc3e18..63474c5a2eb 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s221.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s221.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s221 (void)
+real_t s221(struct args_t * func_args)
 {
 //    loop distribution
 //    loop that is partially recursive
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations/2; nl++) {
         for (int i = 1; i < LEN_1D; i++) {
@@ -20,4 +14,19 @@ void s221 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s221, "s221", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s222.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s222.c
index 9c9e78ea154..0d32440380b 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s222.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s222.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s222 (void)
+real_t s222(struct args_t * func_args)
 {
 //    loop distribution
 //    partial loop vectorizatio recurrence in middle
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations/2; nl++) {
         for (int i = 1; i < LEN_1D; i++) {
@@ -21,4 +15,19 @@ void s222 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s222, "s222", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2233.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2233.c
index 84ae8480476..3c187949c11 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2233.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2233.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s2233 (void)
+real_t s2233(struct args_t * func_args)
 {
 //    loop interchange
 //    interchanging with one of two inner loops
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 100*(iterations/LEN_2D); nl++) {
         for (int i = 1; i < LEN_2D; i++) {
@@ -24,5 +18,19 @@ void s2233 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s2233, "s2233", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2244.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2244.c
index 4c3ade37a1d..551804e8d91 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2244.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2244.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s2244 (void)
+real_t s2244(struct args_t * func_args)
 {
 //    node splitting
 //    cycle with ture and anti dependency
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = 0; i < LEN_1D-1; i++) {
@@ -20,5 +14,19 @@ void s2244 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s2244, "s2244", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2251.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2251.c
index 90de76781a4..431393ec97a 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2251.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2251.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s2251 (void)
+real_t s2251(struct args_t * func_args)
 {
 //    scalar and array expansion
 //    scalar expansion
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations; nl++) {
         real_t s = (real_t)0.0;
@@ -22,4 +16,19 @@ void s2251 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s2251, "s2251", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2275.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2275.c
index 31ae6a96d14..7f43172d1d1 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2275.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2275.c
@@ -1,16 +1,10 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s2275 (void)
+real_t s2275(struct args_t * func_args)
 {
 //    loop distribution is needed to be able to interchange
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 100*(iterations/LEN_2D); nl++) {
         for (int i = 0; i < LEN_2D; i++) {
@@ -21,5 +15,19 @@ void s2275 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s2275, "s2275", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s231.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s231.c
index 9e8aaf540ff..578ff2f027e 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s231.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s231.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s231 (void)
+real_t s231(struct args_t * func_args)
 {
 //    loop interchange
 //    loop with data dependency
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 100*(iterations/LEN_2D); nl++) {
         for (int i = 0; i < LEN_2D; ++i) {
@@ -21,5 +15,19 @@ void s231 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s231, "s231", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s232.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s232.c
index 8afb833eb81..a70f41a15ea 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s232.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s232.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s232 (void)
+real_t s232(struct args_t * func_args)
 {
 //    loop interchange
 //    interchanging of triangular loops
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 100*(iterations/(LEN_2D)); nl++) {
         for (int j = 1; j < LEN_2D; j++) {
@@ -21,4 +15,19 @@ void s232 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 1.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s232, "s232", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s233.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s233.c
index ce4f3af14fb..55e4f68f48d 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s233.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s233.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s233 (void)
+real_t s233(struct args_t * func_args)
 {
 //    loop interchange
 //    interchanging with one of two inner loops
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 100*(iterations/LEN_2D); nl++) {
         for (int i = 1; i < LEN_2D; i++) {
@@ -24,4 +18,19 @@ void s233 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s233, "s233", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s235.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s235.c
index 32167370462..0379bee7fba 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s235.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s235.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s235 (void)
+real_t s235(struct args_t * func_args)
 {
 //    loop interchanging
 //    imperfectly nested loops
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 200*(iterations/LEN_2D); nl++) {
         for (int i = 0; i < LEN_2D; i++) {
@@ -22,5 +16,19 @@ void s235 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s235, "s235", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s241.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s241.c
index 76b99267c5d..b04f466a06f 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s241.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s241.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s241 (void)
+real_t s241(struct args_t * func_args)
 {
 //    node splitting
 //    preloading necessary to allow vectorization
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 2*iterations; nl++) {
         for (int i = 0; i < LEN_1D-1; i++) {
@@ -20,4 +14,19 @@ void s241 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s241, "s241", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s242.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s242.c
index 3653ac1ed21..afc0e766099 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s242.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s242.c
@@ -1,21 +1,14 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-struct arg{real_t a;real_t b;};
-
-void s242 (struct arg *x)
+real_t s242(struct args_t * func_args)
 {
 //    node splitting
 
+    struct{real_t a;real_t b;} * x = func_args->arg_info;
     real_t s1 = x->a;
     real_t s2 = x->b;
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations/5; nl++) {
         for (int i = 1; i < LEN_1D; ++i) {
@@ -23,4 +16,19 @@ void s242 (struct arg *x)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s242, "s242", &(struct{real_t a;real_t b;}){s1, s2});
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s243.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s243.c
index a4afefc5ffe..28ac9eaad87 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s243.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s243.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s243 (void)
+real_t s243(struct args_t * func_args)
 {
 //    node splitting
 //    false dependence cycle breaking
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = 0; i < LEN_1D-1; i++) {
@@ -21,4 +15,19 @@ void s243 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s243, "s243", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s244.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s244.c
index b4a59001c9d..f4e9946f966 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s244.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s244.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s244 (void)
+real_t s244(struct args_t * func_args)
 {
 //    node splitting
 //    false dependence cycle breaking
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = 0; i < LEN_1D-1; ++i) {
@@ -21,4 +15,19 @@ void s244 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s244, "s244", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s251.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s251.c
index ed8db917e00..f9784bcd41b 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s251.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s251.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s251 (void)
+real_t s251(struct args_t * func_args)
 {
 //    scalar and array expansion
 //    scalar expansion
 
+    initialise_arrays(__func__);
 
     real_t s;
     for (int nl = 0; nl < 4*iterations; nl++) {
@@ -21,5 +15,19 @@ void s251 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s251, "s251", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s252.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s252.c
index 9f0df999701..e1698899b47 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s252.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s252.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s252 (void)
+real_t s252(struct args_t * func_args)
 {
 //    scalar and array expansion
 //    loop with ambiguous scalar temporary
 
+    initialise_arrays(__func__);
 
     real_t t, s;
     for (int nl = 0; nl < iterations; nl++) {
@@ -23,4 +17,19 @@ void s252 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s252, "s252", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s253.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s253.c
index 31416f05571..976cc9f5bb6 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s253.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s253.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s253 (void)
+real_t s253(struct args_t * func_args)
 {
 //    scalar and array expansion
 //    scalar expansio assigned under if
 
+    initialise_arrays(__func__);
 
     real_t s;
     for (int nl = 0; nl < iterations; nl++) {
@@ -24,4 +18,19 @@ void s253 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s253, "s253", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s254.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s254.c
index d38063e7f12..90861359c9c 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s254.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s254.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s254 (void)
+real_t s254(struct args_t * func_args)
 {
 //    scalar and array expansion
 //    carry around variable
 
+    initialise_arrays(__func__);
 
     real_t x;
     for (int nl = 0; nl < 4*iterations; nl++) {
@@ -22,4 +16,19 @@ void s254 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s254, "s254", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s255.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s255.c
index 0762eb202a2..4a3d6e9c7fd 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s255.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s255.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s255 (void)
+real_t s255(struct args_t * func_args)
 {
 //    scalar and array expansion
 //    carry around variables, 2 levels
 
+    initialise_arrays(__func__);
 
     real_t x, y;
     for (int nl = 0; nl < iterations; nl++) {
@@ -24,4 +18,19 @@ void s255 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s255, "s255", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s256.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s256.c
index 95436e79bd4..ca0e75a4175 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s256.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s256.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s256 (void)
+real_t s256(struct args_t * func_args)
 {
 //    scalar and array expansion
 //    array expansion
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 10*(iterations/LEN_2D); nl++) {
         for (int i = 0; i < LEN_2D; i++) {
@@ -22,4 +16,19 @@ void s256 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s256, "s256", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s257.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s257.c
index c794b7681e7..4ed9b7097a5 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s257.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s257.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s257 (void)
+real_t s257(struct args_t * func_args)
 {
 //    scalar and array expansion
 //    array expansion
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 10*(iterations/LEN_2D); nl++) {
         for (int i = 1; i < LEN_2D; i++) {
@@ -22,4 +16,19 @@ void s257 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s257, "s257", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s258.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s258.c
index 5d6983b3811..c5926dbd6d7 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s258.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s258.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s258 (void)
+real_t s258(struct args_t * func_args)
 {
 //    scalar and array expansion
 //    wrap-around scalar under an if
 
+    initialise_arrays(__func__);
 
     real_t s;
     for (int nl = 0; nl < iterations; nl++) {
@@ -25,4 +19,19 @@ void s258 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s258, "s258", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s261.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s261.c
index 0ad6328c70a..7ca6bf09cd0 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s261.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s261.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s261 (void)
+real_t s261(struct args_t * func_args)
 {
 //    scalar and array expansion
 //    wrap-around scalar under an if
 
+    initialise_arrays(__func__);
 
     real_t t;
     for (int nl = 0; nl < iterations; nl++) {
@@ -23,4 +17,19 @@ void s261 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s261, "s261", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s271.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s271.c
index fc685cc79b1..5dcba7e85b3 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s271.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s271.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s271 (void)
+real_t s271(struct args_t * func_args)
 {
 //    control flow
 //    loop with singularity handling
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 4*iterations; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
@@ -21,4 +15,19 @@ void s271 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s271, "s271", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2710.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2710.c
index 664427cccd9..473057beb4a 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2710.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2710.c
@@ -1,17 +1,14 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s2710 (int x)
+real_t s2710(struct args_t * func_args)
 {
 //    control flow
 //    scalar and vector ifs
 
+    int x = *(int*)func_args->arg_info;
+
+    initialise_arrays(__func__);
+
     for (int nl = 0; nl < iterations/2; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
             if (a[i] > b[i]) {
@@ -32,4 +29,19 @@ void s2710 (int x)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s2710, "s2710", &s1);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2711.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2711.c
index a16a6e4dae9..9cc3f663e70 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2711.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2711.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s2711 (void)
+real_t s2711(struct args_t * func_args)
 {
 //    control flow
 //    semantic if removal
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 4*iterations; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
@@ -21,4 +15,19 @@ void s2711 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s2711, "s2711", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2712.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2712.c
index 138b1e9ca5b..2f9c28dcc8d 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2712.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s2712.c
@@ -1,24 +1,33 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s2712 (void)
+real_t s2712(struct args_t * func_args)
 {
 //    control flow
 //    if to elemental min
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 4*iterations; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
-            if (a[i] > b[i]) {
+            if (a[i] >= b[i]) {
                 a[i] += b[i] * c[i];
             }
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s2712, "s2712", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s272.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s272.c
index 19d3e8066da..3ec45fc41bf 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s272.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s272.c
@@ -1,17 +1,14 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s272 (int t)
+real_t s272(struct args_t * func_args)
 {
 //    control flow
 //    loop with independent conditional
 
+    int t = *(int*)func_args->arg_info;
+
+    initialise_arrays(__func__);
+
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
             if (e[i] >= t) {
@@ -21,4 +18,19 @@ void s272 (int t)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s272, "s272", &s1);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s273.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s273.c
index 7757620810f..004f5ca1600 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s273.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s273.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s273 (void)
+real_t s273(struct args_t * func_args)
 {
 //    control flow
 //    simple loop with dependent conditional
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
@@ -22,4 +16,19 @@ void s273 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s273, "s273", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s274.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s274.c
index 989349b916b..c7a36282eac 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s274.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s274.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s274 (void)
+real_t s274(struct args_t * func_args)
 {
 //    control flow
 //    complex loop with dependent conditional
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
@@ -24,4 +18,19 @@ void s274 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s274, "s274", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s275.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s275.c
index 8c247fe4e34..a72aa68d78a 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s275.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s275.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s275 (void)
+real_t s275(struct args_t * func_args)
 {
 //    control flow
 //    if around inner loop, interchanging needed
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 10*(iterations/LEN_2D); nl++) {
         for (int i = 0; i < LEN_2D; i++) {
@@ -23,4 +17,19 @@ void s275 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s275, "s275", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s276.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s276.c
index ffa9d356115..a039ca8fb9b 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s276.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s276.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s276 (void)
+real_t s276(struct args_t * func_args)
 {
 //    control flow
 //    if test using loop index
 
+    initialise_arrays(__func__);
 
     int mid = (LEN_1D/2);
     for (int nl = 0; nl < 4*iterations; nl++) {
@@ -24,4 +18,19 @@ void s276 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s276, "s276", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s277.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s277.c
index 02756c9f97c..890fe8ebc58 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s277.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s277.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s277 (void)
+real_t s277(struct args_t * func_args)
 {
 //    control flow
 //    test for dependences arising from guard variable computation.
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = 0; i < LEN_1D-1; i++) {
@@ -29,4 +23,19 @@ L20:
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s277, "s277", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s278.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s278.c
index 9527e3a8cbc..983db4255fb 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s278.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s278.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s278 (void)
+real_t s278(struct args_t * func_args)
 {
 //    control flow
 //    if/goto to block if-then-else
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
@@ -27,4 +21,19 @@ L30:
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s278, "s278", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s279.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s279.c
index fb25252e51f..b16bf41f48f 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s279.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s279.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s279 (void)
+real_t s279(struct args_t * func_args)
 {
 //    control flow
 //    vector if/gotos
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations/2; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
@@ -31,4 +25,19 @@ L30:
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s279, "s279", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s281.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s281.c
index 72f7b539512..07ace28ea9b 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s281.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s281.c
@@ -1,18 +1,12 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s281 (void)
+real_t s281(struct args_t * func_args)
 {
 //    crossing thresholds
 //    index set splitting
 //    reverse data access
 
+    initialise_arrays(__func__);
 
     real_t x;
     for (int nl = 0; nl < iterations; nl++) {
@@ -23,4 +17,19 @@ void s281 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s281, "s281", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s291.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s291.c
index 7429ca6c0ed..020df31a319 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s291.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s291.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s291 (void)
+real_t s291(struct args_t * func_args)
 {
 //    loop peeling
 //    wrap around variable, 1 level
 
+    initialise_arrays(__func__);
 
     int im1;
     for (int nl = 0; nl < 2*iterations; nl++) {
@@ -22,4 +16,19 @@ void s291 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s291, "s291", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s292.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s292.c
index 8f8547477f7..c55898f881f 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s292.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s292.c
@@ -1,18 +1,12 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s292 (void)
+real_t s292(struct args_t * func_args)
 {
 //    loop peeling
 //    wrap around variable, 2 levels
 //    similar to S291
 
+    initialise_arrays(__func__);
 
     int im1, im2;
     for (int nl = 0; nl < iterations; nl++) {
@@ -25,4 +19,19 @@ void s292 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s292, "s292", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s293.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s293.c
index 0f735ddb331..a5c38f13099 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s293.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s293.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s293 (void)
+real_t s293(struct args_t * func_args)
 {
 //    loop peeling
 //    a(i)=a(0) with actual dependence cycle, loop is vectorizable
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 4*iterations; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
@@ -19,4 +13,19 @@ void s293 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s293, "s293", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s311.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s311.c
index deebb79a511..da873fda267 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s311.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s311.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s311 (void)
+real_t s311(struct args_t * func_args)
 {
 //    reductions
 //    sum reduction
 
+    initialise_arrays(__func__);
 
     real_t sum;
     for (int nl = 0; nl < iterations*10; nl++) {
@@ -21,5 +15,19 @@ void s311 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, sum);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s311, "s311", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s3110.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s3110.c
index f4792983a01..d0609f413e9 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s3110.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s3110.c
@@ -1,18 +1,12 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s3110 (void)
+real_t s3110(struct args_t * func_args)
 {
 //    reductions
 //    if to max with index reductio 2 dimensions
 //    similar to S315
 
+    initialise_arrays(__func__);
 
     int xindex, yindex;
     real_t max, chksum;
@@ -32,4 +26,19 @@ void s3110 (void)
         chksum = max + (real_t) xindex + (real_t) yindex;
         dummy(a, b, c, d, e, aa, bb, cc, chksum);
     }
+
+    return max + xindex+1 + yindex+1;
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s3110, "s3110", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s3111.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s3111.c
index 6bb681865c2..953e0f49007 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s3111.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s3111.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s3111 (void)
+real_t s3111(struct args_t * func_args)
 {
 //    reductions
 //    conditional sum reduction
 
+    initialise_arrays(__func__);
 
     real_t sum;
     for (int nl = 0; nl < iterations/2; nl++) {
@@ -23,4 +17,19 @@ void s3111 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, sum);
     }
-}
\ No newline at end of file
+
+    return sum;
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s3111, "s31111", NULL);
+
+  return 0;
+}
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s31111.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s31111.c
index a4b39772b60..652ff5ab170 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s31111.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s31111.c
@@ -1,10 +1,3 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
 real_t test(real_t* A){
@@ -14,11 +7,12 @@ real_t test(real_t* A){
   return s;
 }
 
-void s31111 (void)
+real_t s31111(struct args_t * func_args)
 {
 //    reductions
 //    sum reduction
 
+    initialise_arrays(__func__);
 
     real_t sum;
     for (int nl = 0; nl < 2000*iterations; nl++) {
@@ -33,6 +27,19 @@ void s31111 (void)
         sum += test(&a[28]);
         dummy(a, b, c, d, e, aa, bb, cc, sum);
     }
+
+    return calc_checksum(__func__);
 }
 
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s31111, "s31111", NULL);
+
+  return 0;
+}
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s3112.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s3112.c
index 06dd189781d..77d2ee2db32 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s3112.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s3112.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s3112 (void)
+real_t s3112(struct args_t * func_args)
 {
 //    reductions
 //    sum reduction saving running sums
 
+    initialise_arrays(__func__);
 
     real_t sum;
     for (int nl = 0; nl < iterations; nl++) {
@@ -22,4 +16,19 @@ void s3112 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, sum);
     }
+
+    return sum;
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s3112, "s3112", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s3113.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s3113.c
index 7c7ba129d64..702ed78b64b 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s3113.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s3113.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s3113 (void)
+real_t s3113(struct args_t * func_args)
 {
 //    reductions
 //    maximum of absolute value
 
+    initialise_arrays(__func__);
 
     real_t max;
     for (int nl = 0; nl < iterations*4; nl++) {
@@ -23,4 +17,19 @@ void s3113 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, max);
     }
+
+    return max;
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s3113, "s3113", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s312.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s312.c
index a031d285a85..18de4f0e985 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s312.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s312.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s312 (void)
+real_t s312(struct args_t * func_args)
 {
 //    reductions
 //    product reduction
 
+    initialise_arrays(__func__);
 
     real_t prod;
     for (int nl = 0; nl < 10*iterations; nl++) {
@@ -21,4 +15,19 @@ void s312 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, prod);
     }
+
+    return prod;
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s312, "s312", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s313.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s313.c
index 72c2bbfd18f..b9610bcbc2c 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s313.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s313.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s313 (void)
+real_t s313(struct args_t * func_args)
 {
 //    reductions
 //    dot product
 
+    initialise_arrays(__func__);
 
     real_t dot;
     for (int nl = 0; nl < iterations*5; nl++) {
@@ -21,5 +15,19 @@ void s313 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, dot);
     }
+
+    return dot;
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s313, "s313", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s314.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s314.c
index 591cc312565..5b03cefb68e 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s314.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s314.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s314 (void)
+real_t s314(struct args_t * func_args)
 {
 //    reductions
 //    if to max reduction
 
+    initialise_arrays(__func__);
 
     real_t x;
     for (int nl = 0; nl < iterations*5; nl++) {
@@ -23,4 +17,19 @@ void s314 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, x);
     }
+
+    return x;
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s314, "s314", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s315.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s315.c
index e23cef08be3..68bfbb6d1b6 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s315.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s315.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s315 (void)
+real_t s315(struct args_t * func_args)
 {
 //    reductions
 //    if to max with index reductio 1 dimension
 
+    initialise_arrays(__func__);
 
     for (int i = 0; i < LEN_1D; i++)
         a[i] = (i * 7) % LEN_1D;
@@ -30,5 +24,19 @@ void s315 (void)
         chksum = x + (real_t) index;
         dummy(a, b, c, d, e, aa, bb, cc, chksum);
     }
+
+    return index + x + 1;
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s315, "s315", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s316.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s316.c
index 72a307a719b..489e7d9230a 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s316.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s316.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s316 (void)
+real_t s316(struct args_t * func_args)
 {
 //    reductions
 //    if to min reduction
 
+    initialise_arrays(__func__);
 
     real_t x;
     for (int nl = 0; nl < iterations*5; nl++) {
@@ -23,4 +17,19 @@ void s316 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, x);
     }
+
+    return x;
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s316, "s316", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s317.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s317.c
index 61b575aff26..a7e4e1256da 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s317.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s317.c
@@ -1,19 +1,13 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s317 (void)
+real_t s317(struct args_t * func_args)
 {
 //    reductions
 //    product reductio vectorize with
 //    1. scalar expansion of factor, and product reduction
 //    2. closed form solution: q = factor**n
 
+    initialise_arrays(__func__);
 
     real_t q;
     for (int nl = 0; nl < 5*iterations; nl++) {
@@ -23,4 +17,19 @@ void s317 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, q);
     }
+
+    return q;
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s317, "s317", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s318.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s318.c
index 57327970a24..4ccc69c08a7 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s318.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s318.c
@@ -1,17 +1,14 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s318 (int inc)
+real_t s318(struct args_t * func_args)
 {
 //    reductions
 //    isamax, max absolute value, increments not equal to 1
 
+    int inc = *(int*)func_args->arg_info;
+
+    initialise_arrays(__func__);
+
     int k, index;
     real_t max, chksum;
     for (int nl = 0; nl < iterations/2; nl++) {
@@ -31,4 +28,19 @@ L5:
         chksum = max + (real_t) index;
         dummy(a, b, c, d, e, aa, bb, cc, chksum);
     }
+
+    return max + index + 1;
 }
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s318, "s318", &n1);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s319.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s319.c
index 4dbd5a88f15..fc7c5fc923c 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s319.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s319.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s319 (void)
+real_t s319(struct args_t * func_args)
 {
 //    reductions
 //    coupled reductions
 
+    initialise_arrays(__func__);
 
     real_t sum;
     for (int nl = 0; nl < 2*iterations; nl++) {
@@ -24,4 +18,19 @@ void s319 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, sum);
     }
+
+    return sum;
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s319, "s319", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s321.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s321.c
index a17ac96e334..607f330febc 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s321.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s321.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s321 (void)
+real_t s321(struct args_t * func_args)
 {
 //    recurrences
 //    first order linear recurrence
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = 1; i < LEN_1D; i++) {
@@ -19,4 +13,19 @@ void s321 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s321, "s321", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s322.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s322.c
index a82e6b1a9f0..e0ae91b68ab 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s322.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s322.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s322 (void)
+real_t s322(struct args_t * func_args)
 {
 //    recurrences
 //    second order linear recurrence
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations/2; nl++) {
         for (int i = 2; i < LEN_1D; i++) {
@@ -19,4 +13,19 @@ void s322 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s322, "s322", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s323.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s323.c
index 84ef82e877e..e2a28987ae3 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s323.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s323.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s323 (void)
+real_t s323(struct args_t * func_args)
 {
 //    recurrences
 //    coupled recurrence
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations/2; nl++) {
         for (int i = 1; i < LEN_1D; i++) {
@@ -20,4 +14,19 @@ void s323 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s323, "s323", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s3251.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s3251.c
index ba5de42d0da..f5b3be36ba8 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s3251.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s3251.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s3251 (void)
+real_t s3251(struct args_t * func_args)
 {
 //    scalar and array expansion
 //    scalar expansion
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = 0; i < LEN_1D-1; i++){
@@ -21,5 +15,19 @@ void s3251 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s3251, "s3251", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s331.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s331.c
index be0757713e1..426dee3158d 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s331.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s331.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s331 (void)
+real_t s331(struct args_t * func_args)
 {
 //    search loops
 //    if to last-1
 
+    initialise_arrays(__func__);
 
     int j;
     real_t chksum;
@@ -25,5 +19,19 @@ void s331 (void)
         chksum = (real_t) j;
         dummy(a, b, c, d, e, aa, bb, cc, chksum);
     }
+
+    return j+1;
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s331, "s331", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s332.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s332.c
index 1bfcd5fed7b..230e50182d9 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s332.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s332.c
@@ -1,17 +1,14 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s332 (int t)
+real_t s332(struct args_t * func_args)
 {
 //    search loops
 //    first value greater than threshold
 
+    int t = *(int*)func_args->arg_info;
+
+    initialise_arrays(__func__);
+
     int index;
     real_t value;
     real_t chksum;
@@ -29,4 +26,19 @@ L20:
         chksum = value + (real_t) index;
         dummy(a, b, c, d, e, aa, bb, cc, chksum);
     }
+
+    return value;
 }
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s332, "s332", &s1);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s341.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s341.c
index d64bfebf6a1..527f223d4a2 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s341.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s341.c
@@ -1,18 +1,12 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s341 (void)
+real_t s341(struct args_t * func_args)
 {
 //    packing
 //    pack positive values
 //    not vectorizable, value of j in unknown at each iteration
 
+    initialise_arrays(__func__);
 
     int j;
     for (int nl = 0; nl < iterations; nl++) {
@@ -25,4 +19,19 @@ void s341 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s341, "s341", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s342.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s342.c
index 883177d37c6..a8513db7e54 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s342.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s342.c
@@ -1,18 +1,12 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s342 (void)
+real_t s342(struct args_t * func_args)
 {
 //    packing
 //    unpacking
 //    not vectorizable, value of j in unknown at each iteration
 
+    initialise_arrays(__func__);
 
     int j = 0;
     for (int nl = 0; nl < iterations; nl++) {
@@ -25,4 +19,19 @@ void s342 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s342, "s342", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s343.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s343.c
index 6300856ea3a..2cc61a80df8 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s343.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s343.c
@@ -1,18 +1,12 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s343 (void)
+real_t s343(struct args_t * func_args)
 {
 //    packing
 //    pack 2-d array into one dimension
 //    not vectorizable, value of k in unknown at each iteration
 
+    initialise_arrays(__func__);
 
     int k;
     for (int nl = 0; nl < 10*(iterations/LEN_2D); nl++) {
@@ -27,4 +21,19 @@ void s343 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s343, "s343", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s351.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s351.c
index bfe7cee9989..bbbcf166c7c 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s351.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s351.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s351 (void)
+real_t s351(struct args_t * func_args)
 {
 //    loop rerolling
 //    unrolled saxpy
 
+    initialise_arrays(__func__);
 
     real_t alpha = c[0];
     for (int nl = 0; nl < 8*iterations; nl++) {
@@ -24,5 +18,19 @@ void s351 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s351, "s351", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s352.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s352.c
index 28e5d5000c3..833eddb1377 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s352.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s352.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s352 (void)
+real_t s352(struct args_t * func_args)
 {
 //    loop rerolling
 //    unrolled dot product
 
+    initialise_arrays(__func__);
 
     real_t dot;
     for (int nl = 0; nl < 8*iterations; nl++) {
@@ -22,5 +16,19 @@ void s352 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, dot);
     }
+
+    return dot;
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s352, "s352", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s353.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s353.c
index 1adb9bf5bab..e2be04c5288 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s353.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s353.c
@@ -1,18 +1,15 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s353 (int * __restrict__ ip)
+real_t s353(struct args_t * func_args)
 {
 //    loop rerolling
 //    unrolled sparse saxpy
 //    gather is required
 
+    int * __restrict__ ip = func_args->arg_info;
+
+    initialise_arrays(__func__);
+
     real_t alpha = c[0];
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = 0; i < LEN_1D; i += 5) {
@@ -24,4 +21,19 @@ void s353 (int * __restrict__ ip)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s353, "s353", ip);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4112.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4112.c
index 10197f751d7..727926020f8 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4112.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4112.c
@@ -1,23 +1,16 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-struct arg{int * __restrict__ a;real_t b;};
-
-void s4112 (struct arg *x)
+real_t s4112(struct args_t * func_args)
 {
 //    indirect addressing
 //    sparse saxpy
 //    gather is required
 
+    struct{int * __restrict__ a;real_t b;} * x = func_args->arg_info;
     int * __restrict__ ip = x->a;
     real_t s = x->b;
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
@@ -25,6 +18,19 @@ void s4112 (struct arg *x)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
 
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s4112, "s4112", &(struct{int*a;real_t b;}){ip, s1});
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4113.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4113.c
index 49bbe22b474..c75e8e1ee91 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4113.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4113.c
@@ -1,22 +1,34 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s4113 (int * __restrict__ ip)
+real_t s4113(struct args_t * func_args)
 {
 //    indirect addressing
 //    indirect addressing on rhs and lhs
 //    gather and scatter is required
 
+    int * __restrict__ ip = func_args->arg_info;
+
+    initialise_arrays(__func__);
+
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
             a[ip[i]] = b[ip[i]] + c[i];
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s4113, "s4113", ip);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4114.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4114.c
index d036ffcdce3..8a4c911e7e2 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4114.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4114.c
@@ -1,23 +1,16 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-struct arg{int * __restrict__ a;int b;};
-
-void s4114 (struct arg *x)
+real_t s4114(struct args_t * func_args)
 {
 //    indirect addressing
 //    mix indirect addressing with variable lower and upper bounds
 //    gather is required
 
+    struct{int * __restrict__ a;int b;} * x = func_args->arg_info;
     int * __restrict__ ip = x->a;
     int n1 = x->b;
 
+    initialise_arrays(__func__);
 
     int k;
     for (int nl = 0; nl < iterations; nl++) {
@@ -28,6 +21,19 @@ void s4114 (struct arg *x)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
 
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s4114, "s4114", &(struct{int*a;int b;}){ip, n1});
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4115.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4115.c
index 871fd1b8dd3..fc51e8cdc34 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4115.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4115.c
@@ -1,18 +1,15 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s4115 (int * __restrict__ ip)
+real_t s4115(struct args_t * func_args)
 {
 //    indirect addressing
 //    sparse dot product
 //    gather is required
 
+    int * __restrict__ ip = func_args->arg_info;
+
+    initialise_arrays(__func__);
+
     real_t sum;
     for (int nl = 0; nl < iterations; nl++) {
         sum = 0.;
@@ -21,4 +18,19 @@ void s4115 (int * __restrict__ ip)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return sum;
 }
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s4115, "s4115", ip);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4116.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4116.c
index 8c6ac7edc35..62d794a7c99 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4116.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4116.c
@@ -1,24 +1,17 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-struct arg{int * __restrict__ a;int b;int c;};
-
-void s4116 (struct arg *x)
+real_t s4116(struct args_t * func_args)
 {
 //    indirect addressing
 //    more complicated sparse sdot
 //    gather is required
 
+    struct{int * __restrict__ a;int b;int c;} * x = func_args->arg_info;
     int * __restrict__ ip = x->a;
     int j = x->b;
     int inc = x->c;
 
+    initialise_arrays(__func__);
 
     real_t sum;
     int off;
@@ -30,4 +23,19 @@ void s4116 (struct arg *x)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return sum;
 }
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s4116, "s4116", &(struct{int * a; int b; int c;}){ip, LEN_2D/2, n1});
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4117.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4117.c
index 6b220f31d6c..ee6825b5280 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4117.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4117.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s4117 (void)
+real_t s4117(struct args_t * func_args)
 {
 //    indirect addressing
 //    seq function
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
@@ -19,5 +13,19 @@ void s4117 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s4117, "s4117", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4121.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4121.c
index 999f78adf2f..2a82b6e6d91 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4121.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s4121.c
@@ -1,21 +1,15 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
 real_t f(real_t a, real_t b){
     return a*b;
 }
 
-void s4121 (void)
+real_t s4121(struct args_t * func_args)
 {
 //    statement functions
 //    elementwise multiplication
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
@@ -23,6 +17,19 @@ void s4121 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
 
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s4121, "s4121", NULL);
+
+  return 0;
+}
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s421.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s421.c
index eaa502699d4..428054a6e05 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s421.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s421.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s421 (void)
+real_t s421(struct args_t * func_args)
 {
 //    storage classes and equivalencing
 //    equivalence- no overlap
 
+    initialise_arrays(__func__);
 
     xx = flat_2d_array;
 
@@ -22,5 +16,19 @@ void s421 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 1.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s421, "s421", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s422.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s422.c
index 63b9104ff8b..f7163285b65 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s422.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s422.c
@@ -1,18 +1,12 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s422 (void)
+real_t s422(struct args_t * func_args)
 {
 //    storage classes and equivalencing
 //    common and equivalence statement
 //    anti-dependence, threshold of 4
 
+    initialise_arrays(__func__);
 
     xx = flat_2d_array + 4;
 
@@ -22,5 +16,19 @@ void s422 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s422, "s422", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s423.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s423.c
index 75eb4359382..788393d4dd3 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s423.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s423.c
@@ -1,13 +1,6 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s423 (void)
+real_t s423(struct args_t * func_args)
 {
 //    storage classes and equivalencing
 //    common and equivalenced variables - with anti-dependence
@@ -16,6 +9,7 @@ void s423 (void)
     int vl = 64;
     xx = flat_2d_array + vl;
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 4*iterations; nl++) {
         for (int i = 0; i < LEN_1D - 1; i++) {
@@ -23,5 +17,19 @@ void s423 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 1.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s423, "s423", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s424.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s424.c
index 145a2af9ede..c72a8a68afa 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s424.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s424.c
@@ -1,13 +1,6 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s424 (void)
+real_t s424(struct args_t * func_args)
 {
 //    storage classes and equivalencing
 //    common and equivalenced variables - overlap
@@ -17,6 +10,7 @@ void s424 (void)
     int vl = 63;
     xx = flat_2d_array + vl;
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 4*iterations; nl++) {
         for (int i = 0; i < LEN_1D - 1; i++) {
@@ -24,5 +18,19 @@ void s424 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 1.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s424, "s424", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s431.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s431.c
index 4f2597aff8f..0624fac0d18 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s431.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s431.c
@@ -1,13 +1,6 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s431 (void)
+real_t s431(struct args_t * func_args)
 {
 //    parameters
 //    parameter statement
@@ -16,6 +9,7 @@ void s431 (void)
     int k2=2;
     int k=2*k1-k2;
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations*10; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
@@ -23,5 +17,19 @@ void s431 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s431, "s431", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s441.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s441.c
index 7f7ab226fcd..2c8edf67cd6 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s441.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s441.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s441 (void)
+real_t s441(struct args_t * func_args)
 {
 //    non-logical if's
 //    arithmetic if
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
@@ -25,4 +19,19 @@ void s441 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s441, "s441", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s442.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s442.c
index 1c459e05151..836a1230fc4 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s442.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s442.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s442 (void)
+real_t s442(struct args_t * func_args)
 {
 //    non-logical if's
 //    computed goto
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations/2; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
@@ -37,4 +31,19 @@ L50:
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s442, "s442", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s443.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s443.c
index a8623f9119a..21130ab0f71 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s443.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s443.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s443 (void)
+real_t s443(struct args_t * func_args)
 {
 //    non-logical if's
 //    arithmetic if
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 2*iterations; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
@@ -30,4 +24,19 @@ L50:
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s443, "s443", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s451.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s451.c
index 3b13b2c7e13..1156e2b3f6c 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s451.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s451.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s451 (void)
+real_t s451(struct args_t * func_args)
 {
 //    intrinsic functions
 //    intrinsics
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations/5; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
@@ -19,4 +13,19 @@ void s451 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s451, "s451", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s452.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s452.c
index 7e0dc2190d6..8f6a03d61c4 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s452.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s452.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s452 (void)
+real_t s452(struct args_t * func_args)
 {
 //    intrinsic functions
 //    seq function
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 4*iterations; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
@@ -19,5 +13,19 @@ void s452 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s452, "s452", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s453.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s453.c
index c0115ce3753..fb0f487fe7d 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s453.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s453.c
@@ -1,18 +1,12 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s453 (void)
+real_t s453(struct args_t * func_args)
 {
 //    induction varibale recognition
 
     real_t s;
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations*2; nl++) {
         s = 0.;
@@ -22,4 +16,19 @@ void s453 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s453, "s453", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s471.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s471.c
index 5de316738f9..9ffbca67849 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s471.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s471.c
@@ -1,10 +1,3 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
 int s471s(void)
@@ -13,12 +6,13 @@ int s471s(void)
     return 0;
 }
 
-void s471 (void)
-{
+real_t s471(struct args_t * func_args){
+
 //    call statements
 
     int m = LEN_1D;
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations/2; nl++) {
         for (int i = 0; i < m; i++) {
@@ -28,6 +22,19 @@ void s471 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
 
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s471, "s471", NULL);
+
+  return 0;
+}
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s481.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s481.c
index 6ad8272aeb2..65fea292c72 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s481.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s481.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s481 (void)
+real_t s481(struct args_t * func_args)
 {
 //    non-local goto's
 //    stop statement
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
@@ -22,4 +16,19 @@ void s481 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s481, "s481", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s482.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s482.c
index bba5f744453..155edf11c41 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s482.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s482.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s482 (void)
+real_t s482(struct args_t * func_args)
 {
 //    non-local goto's
 //    other loop exit with code before exit
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
@@ -20,4 +14,19 @@ void s482 (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s482, "s482", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s491.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s491.c
index 546ba056955..7557f530f24 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s491.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s491.c
@@ -1,22 +1,34 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void s491 (int * __restrict__ ip)
+real_t s491(struct args_t * func_args)
 {
 //    vector semantics
 //    indirect addressing on lhs, store in sequence
 //    scatter is required
 
+    int * __restrict__ ip = func_args->arg_info;
+
+    initialise_arrays(__func__);
+
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
             a[ip[i]] = b[i] + c[i] * d[i];
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&s491, "s491", ip);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-va.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-va.c
index 6cce1d173cf..bd5a75e3a7a 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-va.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-va.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void va (void)
+real_t va(struct args_t * func_args)
 {
 //    control loops
 //    vector assignment
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations*10; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
@@ -19,5 +13,19 @@ void va (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&va, "va", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vag.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vag.c
index 9d994cad60a..41e1611ad97 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vag.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vag.c
@@ -1,24 +1,34 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void vag (int * __restrict__ ip)
+real_t vag(struct args_t * func_args)
 {
 //    control loops
 //    vector assignment, gather
 //    gather is required
 
+    int * __restrict__ ip = func_args->arg_info;
+
+    initialise_arrays(__func__);
+
     for (int nl = 0; nl < 2*iterations; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
             a[i] = b[ip[i]];
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
 
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&vag, "vag", ip);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vas.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vas.c
index 104e587ec14..6bb9012baee 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vas.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vas.c
@@ -1,22 +1,34 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void vas (int * __restrict__ ip)
+real_t vas(struct args_t * func_args)
 {
 //    control loops
 //    vector assignment, scatter
 //    scatter is required
 
+    int * __restrict__ ip = func_args->arg_info;
+
+    initialise_arrays(__func__);
+
     for (int nl = 0; nl < 2*iterations; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
             a[ip[i]] = b[i];
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&vas, "vas", ip);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vbor.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vbor.c
index 8455c94ce37..21dd7b08469 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vbor.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vbor.c
@@ -1,18 +1,12 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void vbor (void)
+real_t vbor(struct args_t * func_args)
 {
 //    control loops
 //    basic operations rates, isolate arithmetic from memory traffic
 //    all combinations of three, 59 flops for 6 loads and 1 store.
 
+    initialise_arrays(__func__);
 
     real_t a1, b1, c1, d1, e1, f1;
     for (int nl = 0; nl < iterations*10; nl++) {
@@ -34,5 +28,19 @@ void vbor (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&vbor, "vbor", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vdotr.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vdotr.c
index 56adc5180c2..461347e6c10 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vdotr.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vdotr.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void vdotr (void)
+real_t vdotr(struct args_t * func_args)
 {
 //    control loops
 //    vector dot product reduction
 
+    initialise_arrays(__func__);
 
     real_t dot;
     for (int nl = 0; nl < iterations*10; nl++) {
@@ -21,5 +15,19 @@ void vdotr (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, dot);
     }
+
+    return dot;
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&vdotr, "vdotr", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vif.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vif.c
index c3830822cae..7a3f7e7f53d 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vif.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vif.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void vif (void)
+real_t vif(struct args_t * func_args)
 {
 //    control loops
 //    vector if
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
@@ -21,4 +15,19 @@ void vif (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
+}
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&vif, "vif", NULL);
+
+  return 0;
 }
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vpv.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vpv.c
index 68d3025f536..b9bb780cc1c 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vpv.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vpv.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void vpv (void)
+real_t vpv(struct args_t * func_args)
 {
 //    control loops
 //    vector plus vector
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations*10; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
@@ -19,5 +13,19 @@ void vpv (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&vpv, "vpv", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vpvpv.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vpvpv.c
index 652e0424d01..1db2f433fb6 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vpvpv.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vpvpv.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void vpvpv (void)
+real_t vpvpv(struct args_t * func_args)
 {
 //    control loops
 //    vector plus vector plus vector
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 4*iterations; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
@@ -19,5 +13,19 @@ void vpvpv (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&vpvpv, "vpvpv", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vpvts.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vpvts.c
index 9531fd1df3c..a2b9692b77f 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vpvts.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vpvts.c
@@ -1,23 +1,33 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void vpvts (real_t s)
+real_t vpvts(struct args_t * func_args)
 {
 //    control loops
 //    vector plus vector times scalar
 
+    real_t s = *(int*)func_args->arg_info;
+
+    initialise_arrays(__func__);
+
     for (int nl = 0; nl < iterations; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
             a[i] += b[i] * s;
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
 
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&vpvts, "vpvts", &s1);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vpvtv.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vpvtv.c
index 3ab6b836a8e..38636f11df0 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vpvtv.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vpvtv.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void vpvtv (void)
+real_t vpvtv(struct args_t * func_args)
 {
 //    control loops
 //    vector plus vector times vector
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 4*iterations; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
@@ -19,5 +13,19 @@ void vpvtv (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&vpvtv, "vpvtv", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vsumr.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vsumr.c
index 73c644abcd6..d4d145ed1da 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vsumr.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vsumr.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void vsumr (void)
+real_t vsumr(struct args_t * func_args)
 {
 //    control loops
 //    vector sum reduction
 
+    initialise_arrays(__func__);
 
     real_t sum;
     for (int nl = 0; nl < iterations*10; nl++) {
@@ -21,5 +15,19 @@ void vsumr (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, sum);
     }
+
+    return sum;
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&vsumr, "vsumr", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vtv.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vtv.c
index 24bdfa55522..46b839e322f 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vtv.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vtv.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void vtv (void)
+real_t vtv(struct args_t * func_args)
 {
 //    control loops
 //    vector times vector
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < iterations*10; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
@@ -19,5 +13,19 @@ void vtv (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&vtv, "vtv", NULL);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vtvtv.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vtvtv.c
index 39dfbb98d1a..bea23ff10a3 100644
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vtvtv.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-vtvtv.c
@@ -1,17 +1,11 @@
-/*  This file is distributed under the University of Illinois Open Source
-    License. See license.txt for details.  */
-
-/* { dg-do compile } */
-/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
-/* { dg-require-effective-target vect_float } */
-
 #include "tsvc.h"
 
-void vtvtv (void)
+real_t vtvtv(struct args_t * func_args)
 {
 //    control loops
 //    vector times vector times vector
 
+    initialise_arrays(__func__);
 
     for (int nl = 0; nl < 4*iterations; nl++) {
         for (int i = 0; i < LEN_1D; i++) {
@@ -19,5 +13,19 @@ void vtvtv (void)
         }
         dummy(a, b, c, d, e, aa, bb, cc, 0.);
     }
+
+    return calc_checksum(__func__);
 }
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
\ No newline at end of file
+
+int main (int argc, char **argv)
+{
+  int n1 = 1;
+  int n3 = 1;
+  int* ip;
+  real_t s1,s2;
+  init(&ip, &s1, &s2);
+
+  run(&vtvtv, "vtvtv", NULL);
+
+  return 0;
+}
\ No newline at end of file


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2021-10-26 14:29 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-26 14:29 [gcc(refs/users/marxin/heads/TSVC-v2)] WIP - add run-time support Martin Liska

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).