From fabdcf97a572387959d363a90ef2808b1007bc29 Mon Sep 17 00:00:00 2001 From: Bill Schmidt Date: Tue, 4 Mar 2014 17:00:21 +0000 Subject: [PATCH] extract-vsx.c: Replace "vector long" with "vector long long" throughout. 2014-03-04 Bill Schmidt * gcc.dg/vmx/extract-vsx.c: Replace "vector long" with "vector long long" throughout. * gcc.dg/vmx/extract-vsx-be-order.c: Likewise. * gcc.dg/vmx/insert-vsx.c: Likewise. * gcc.dg/vmx/insert-vsx-be-order.c: Likewise. * gcc.dg/vmx/ld-vsx.c: Likewise. * gcc.dg/vmx/ld-vsx-be-order.c: Likewise. * gcc.dg/vmx/ldl-vsx.c: Likewise. * gcc.dg/vmx/ldl-vsx-be-order.c: Likewise. * gcc.dg/vmx/merge-vsx.c: Likewise. * gcc.dg/vmx/merge-vsx-be-order.c: Likewise. * gcc.dg/vmx/st-vsx.c: Likewise. * gcc.dg/vmx/st-vsx-be-order.c: Likewise. * gcc.dg/vmx/stl-vsx.c: Likewise. * gcc.dg/vmx/stl-vsx-be-order.c: Likewise. From-SVN: r208321 --- gcc/testsuite/ChangeLog | 18 +++++++++++++++++ .../gcc.dg/vmx/extract-vsx-be-order.c | 2 +- gcc/testsuite/gcc.dg/vmx/extract-vsx.c | 2 +- .../gcc.dg/vmx/insert-vsx-be-order.c | 12 +++++------ gcc/testsuite/gcc.dg/vmx/insert-vsx.c | 10 +++++----- gcc/testsuite/gcc.dg/vmx/ld-vsx-be-order.c | 10 +++++----- gcc/testsuite/gcc.dg/vmx/ld-vsx.c | 8 ++++---- gcc/testsuite/gcc.dg/vmx/ldl-vsx-be-order.c | 10 +++++----- gcc/testsuite/gcc.dg/vmx/ldl-vsx.c | 8 ++++---- gcc/testsuite/gcc.dg/vmx/merge-vsx-be-order.c | 20 +++++++++---------- gcc/testsuite/gcc.dg/vmx/merge-vsx.c | 16 +++++++-------- gcc/testsuite/gcc.dg/vmx/st-vsx-be-order.c | 8 ++++---- gcc/testsuite/gcc.dg/vmx/st-vsx.c | 6 +++--- gcc/testsuite/gcc.dg/vmx/stl-vsx-be-order.c | 8 ++++---- gcc/testsuite/gcc.dg/vmx/stl-vsx.c | 6 +++--- 15 files changed, 81 insertions(+), 63 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3d8b5459ada..f9fa2b9deef 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,21 @@ +2014-03-04 Bill Schmidt + + * gcc.dg/vmx/extract-vsx.c: Replace "vector long" with "vector + long long" throughout. + * gcc.dg/vmx/extract-vsx-be-order.c: Likewise. + * gcc.dg/vmx/insert-vsx.c: Likewise. + * gcc.dg/vmx/insert-vsx-be-order.c: Likewise. + * gcc.dg/vmx/ld-vsx.c: Likewise. + * gcc.dg/vmx/ld-vsx-be-order.c: Likewise. + * gcc.dg/vmx/ldl-vsx.c: Likewise. + * gcc.dg/vmx/ldl-vsx-be-order.c: Likewise. + * gcc.dg/vmx/merge-vsx.c: Likewise. + * gcc.dg/vmx/merge-vsx-be-order.c: Likewise. + * gcc.dg/vmx/st-vsx.c: Likewise. + * gcc.dg/vmx/st-vsx-be-order.c: Likewise. + * gcc.dg/vmx/stl-vsx.c: Likewise. + * gcc.dg/vmx/stl-vsx-be-order.c: Likewise. + 2014-03-04 Paulo Matos * gcc.dg/lto/pr55113_0.c: New testcase. diff --git a/gcc/testsuite/gcc.dg/vmx/extract-vsx-be-order.c b/gcc/testsuite/gcc.dg/vmx/extract-vsx-be-order.c index fbeda7b5a62..6428ea5d8b3 100644 --- a/gcc/testsuite/gcc.dg/vmx/extract-vsx-be-order.c +++ b/gcc/testsuite/gcc.dg/vmx/extract-vsx-be-order.c @@ -6,7 +6,7 @@ static void test() { - vector long vl = {0, 1}; + vector long long vl = {0, 1}; vector double vd = {0.0, 1.0}; #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ diff --git a/gcc/testsuite/gcc.dg/vmx/extract-vsx.c b/gcc/testsuite/gcc.dg/vmx/extract-vsx.c index 68f0909c155..cd34a2ae3d3 100644 --- a/gcc/testsuite/gcc.dg/vmx/extract-vsx.c +++ b/gcc/testsuite/gcc.dg/vmx/extract-vsx.c @@ -6,7 +6,7 @@ static void test() { - vector long vl = {0, 1}; + vector long long vl = {0, 1}; vector double vd = {0.0, 1.0}; check (vec_extract (vl, 0) == 0, "vec_extract, vl, 0"); diff --git a/gcc/testsuite/gcc.dg/vmx/insert-vsx-be-order.c b/gcc/testsuite/gcc.dg/vmx/insert-vsx-be-order.c index 375c8ff18f2..672fc449eb5 100644 --- a/gcc/testsuite/gcc.dg/vmx/insert-vsx-be-order.c +++ b/gcc/testsuite/gcc.dg/vmx/insert-vsx-be-order.c @@ -4,7 +4,7 @@ #include "harness.h" -static int vec_long_eq (vector long x, vector long y) +static int vec_long_long_eq (vector long long x, vector long long y) { return (x[0] == y[0] && x[1] == y[1]); } @@ -16,19 +16,19 @@ static int vec_dbl_eq (vector double x, vector double y) static void test() { - vector long vl = {0, 1}; + vector long long vl = {0, 1}; vector double vd = {0.0, 1.0}; - vector long vlr = vec_insert (2, vl, 0); + vector long long vlr = vec_insert (2, vl, 0); vector double vdr = vec_insert (2.0, vd, 1); #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ - vector long vler = {0, 2}; + vector long long vler = {0, 2}; vector double vder = {2.0, 1.0}; #else - vector long vler = {2, 1}; + vector long long vler = {2, 1}; vector double vder = {0.0, 2.0}; #endif - check (vec_long_eq (vlr, vler), "vl"); + check (vec_long_long_eq (vlr, vler), "vl"); check (vec_dbl_eq (vdr, vder), "vd"); } diff --git a/gcc/testsuite/gcc.dg/vmx/insert-vsx.c b/gcc/testsuite/gcc.dg/vmx/insert-vsx.c index bda6b6ccdae..afb9c70166b 100644 --- a/gcc/testsuite/gcc.dg/vmx/insert-vsx.c +++ b/gcc/testsuite/gcc.dg/vmx/insert-vsx.c @@ -4,7 +4,7 @@ #include "harness.h" -static int vec_long_eq (vector long x, vector long y) +static int vec_long_long_eq (vector long long x, vector long long y) { return (x[0] == y[0] && x[1] == y[1]); } @@ -16,13 +16,13 @@ static int vec_dbl_eq (vector double x, vector double y) static void test() { - vector long vl = {0, 1}; + vector long long vl = {0, 1}; vector double vd = {0.0, 1.0}; - vector long vlr = vec_insert (2, vl, 0); + vector long long vlr = vec_insert (2, vl, 0); vector double vdr = vec_insert (2.0, vd, 1); - vector long vler = {2, 1}; + vector long long vler = {2, 1}; vector double vder = {0.0, 2.0}; - check (vec_long_eq (vlr, vler), "vl"); + check (vec_long_long_eq (vlr, vler), "vl"); check (vec_dbl_eq (vdr, vder), "vd"); } diff --git a/gcc/testsuite/gcc.dg/vmx/ld-vsx-be-order.c b/gcc/testsuite/gcc.dg/vmx/ld-vsx-be-order.c index a4c49c94808..fc81beb0d0c 100644 --- a/gcc/testsuite/gcc.dg/vmx/ld-vsx-be-order.c +++ b/gcc/testsuite/gcc.dg/vmx/ld-vsx-be-order.c @@ -4,7 +4,7 @@ #include "harness.h" -static unsigned long svul[2] __attribute__ ((aligned (16))); +static unsigned long long svul[2] __attribute__ ((aligned (16))); static double svd[2] __attribute__ ((aligned (16))); static void init () @@ -20,20 +20,20 @@ static void init () static void test () { #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ - vector unsigned long evul = {1,0}; + vector unsigned long long evul = {1,0}; vector double evd = {1.0,0.0}; #else - vector unsigned long evul = {0,1}; + vector unsigned long long evul = {0,1}; vector double evd = {0.0,1.0}; #endif - vector unsigned long vul; + vector unsigned long long vul; vector double vd; unsigned i; init (); - vul = vec_ld (0, (vector unsigned long *)svul); + vul = vec_ld (0, (vector unsigned long long *)svul); vd = vec_ld (0, (vector double *)svd); for (i = 0; i < 2; ++i) diff --git a/gcc/testsuite/gcc.dg/vmx/ld-vsx.c b/gcc/testsuite/gcc.dg/vmx/ld-vsx.c index aebf2ea91ca..9d2a529f8be 100644 --- a/gcc/testsuite/gcc.dg/vmx/ld-vsx.c +++ b/gcc/testsuite/gcc.dg/vmx/ld-vsx.c @@ -4,7 +4,7 @@ #include "harness.h" -static unsigned long svul[2] __attribute__ ((aligned (16))); +static unsigned long long svul[2] __attribute__ ((aligned (16))); static double svd[2] __attribute__ ((aligned (16))); static void init () @@ -19,16 +19,16 @@ static void init () static void test () { - vector unsigned long evul = {0,1}; + vector unsigned long long evul = {0,1}; vector double evd = {0.0,1.0}; - vector unsigned long vul; + vector unsigned long long vul; vector double vd; unsigned i; init (); - vul = vec_ld (0, (vector unsigned long *)svul); + vul = vec_ld (0, (vector unsigned long long *)svul); vd = vec_ld (0, (vector double *)svd); for (i = 0; i < 2; ++i) diff --git a/gcc/testsuite/gcc.dg/vmx/ldl-vsx-be-order.c b/gcc/testsuite/gcc.dg/vmx/ldl-vsx-be-order.c index a7c14cea26e..1dd0ca33ea2 100644 --- a/gcc/testsuite/gcc.dg/vmx/ldl-vsx-be-order.c +++ b/gcc/testsuite/gcc.dg/vmx/ldl-vsx-be-order.c @@ -4,7 +4,7 @@ #include "harness.h" -static unsigned long svul[2] __attribute__ ((aligned (16))); +static unsigned long long svul[2] __attribute__ ((aligned (16))); static double svd[2] __attribute__ ((aligned (16))); static void init () @@ -20,20 +20,20 @@ static void init () static void test () { #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ - vector unsigned long evul = {1,0}; + vector unsigned long long evul = {1,0}; vector double evd = {1.0,0.0}; #else - vector unsigned long evul = {0,1}; + vector unsigned long long evul = {0,1}; vector double evd = {0.0,1.0}; #endif - vector unsigned long vul; + vector unsigned long long vul; vector double vd; unsigned i; init (); - vul = vec_ldl (0, (vector unsigned long *)svul); + vul = vec_ldl (0, (vector unsigned long long *)svul); vd = vec_ldl (0, (vector double *)svd); for (i = 0; i < 2; ++i) diff --git a/gcc/testsuite/gcc.dg/vmx/ldl-vsx.c b/gcc/testsuite/gcc.dg/vmx/ldl-vsx.c index 3faa62ca68f..4bf3224f67b 100644 --- a/gcc/testsuite/gcc.dg/vmx/ldl-vsx.c +++ b/gcc/testsuite/gcc.dg/vmx/ldl-vsx.c @@ -4,7 +4,7 @@ #include "harness.h" -static unsigned long svul[2] __attribute__ ((aligned (16))); +static unsigned long long svul[2] __attribute__ ((aligned (16))); static double svd[2] __attribute__ ((aligned (16))); static void init () @@ -19,16 +19,16 @@ static void init () static void test () { - vector unsigned long evul = {0,1}; + vector unsigned long long evul = {0,1}; vector double evd = {0.0,1.0}; - vector unsigned long vul; + vector unsigned long long vul; vector double vd; unsigned i; init (); - vul = vec_ldl (0, (vector unsigned long *)svul); + vul = vec_ldl (0, (vector unsigned long long *)svul); vd = vec_ldl (0, (vector double *)svd); for (i = 0; i < 2; ++i) diff --git a/gcc/testsuite/gcc.dg/vmx/merge-vsx-be-order.c b/gcc/testsuite/gcc.dg/vmx/merge-vsx-be-order.c index 386db2e0805..440ac9a004d 100644 --- a/gcc/testsuite/gcc.dg/vmx/merge-vsx-be-order.c +++ b/gcc/testsuite/gcc.dg/vmx/merge-vsx-be-order.c @@ -4,7 +4,7 @@ #include "harness.h" -static int vec_long_eq (vector long x, vector long y) +static int vec_long_long_eq (vector long long x, vector long long y) { return (x[0] == y[0] && x[1] == y[1]); } @@ -17,24 +17,24 @@ static int vec_double_eq (vector double x, vector double y) static void test() { /* Input vectors. */ - vector long vla = {-2,-1}; - vector long vlb = {0,1}; + vector long long vla = {-2,-1}; + vector long long vlb = {0,1}; vector double vda = {-2.0,-1.0}; vector double vdb = {0.0,1.0}; /* Result vectors. */ - vector long vlh, vll; + vector long long vlh, vll; vector double vdh, vdl; /* Expected result vectors. */ #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ - vector long vlrh = {1,-1}; - vector long vlrl = {0,-2}; + vector long long vlrh = {1,-1}; + vector long long vlrl = {0,-2}; vector double vdrh = {1.0,-1.0}; vector double vdrl = {0.0,-2.0}; #else - vector long vlrh = {-2,0}; - vector long vlrl = {-1,1}; + vector long long vlrh = {-2,0}; + vector long long vlrl = {-1,1}; vector double vdrh = {-2.0,0.0}; vector double vdrl = {-1.0,1.0}; #endif @@ -44,8 +44,8 @@ static void test() vdh = vec_mergeh (vda, vdb); vdl = vec_mergel (vda, vdb); - check (vec_long_eq (vlh, vlrh), "vlh"); - check (vec_long_eq (vll, vlrl), "vll"); + check (vec_long_long_eq (vlh, vlrh), "vlh"); + check (vec_long_long_eq (vll, vlrl), "vll"); check (vec_double_eq (vdh, vdrh), "vdh" ); check (vec_double_eq (vdl, vdrl), "vdl" ); } diff --git a/gcc/testsuite/gcc.dg/vmx/merge-vsx.c b/gcc/testsuite/gcc.dg/vmx/merge-vsx.c index 2c8e72c0850..851f35bd3e8 100644 --- a/gcc/testsuite/gcc.dg/vmx/merge-vsx.c +++ b/gcc/testsuite/gcc.dg/vmx/merge-vsx.c @@ -4,7 +4,7 @@ #include "harness.h" -static int vec_long_eq (vector long x, vector long y) +static int vec_long_long_eq (vector long long x, vector long long y) { return (x[0] == y[0] && x[1] == y[1]); } @@ -17,18 +17,18 @@ static int vec_double_eq (vector double x, vector double y) static void test() { /* Input vectors. */ - vector long vla = {-2,-1}; - vector long vlb = {0,1}; + vector long long vla = {-2,-1}; + vector long long vlb = {0,1}; vector double vda = {-2.0,-1.0}; vector double vdb = {0.0,1.0}; /* Result vectors. */ - vector long vlh, vll; + vector long long vlh, vll; vector double vdh, vdl; /* Expected result vectors. */ - vector long vlrh = {-2,0}; - vector long vlrl = {-1,1}; + vector long long vlrh = {-2,0}; + vector long long vlrl = {-1,1}; vector double vdrh = {-2.0,0.0}; vector double vdrl = {-1.0,1.0}; @@ -37,8 +37,8 @@ static void test() vdh = vec_mergeh (vda, vdb); vdl = vec_mergel (vda, vdb); - check (vec_long_eq (vlh, vlrh), "vlh"); - check (vec_long_eq (vll, vlrl), "vll"); + check (vec_long_long_eq (vlh, vlrh), "vlh"); + check (vec_long_long_eq (vll, vlrl), "vll"); check (vec_double_eq (vdh, vdrh), "vdh" ); check (vec_double_eq (vdl, vdrl), "vdl" ); } diff --git a/gcc/testsuite/gcc.dg/vmx/st-vsx-be-order.c b/gcc/testsuite/gcc.dg/vmx/st-vsx-be-order.c index 6656a8acc58..a2688fab570 100644 --- a/gcc/testsuite/gcc.dg/vmx/st-vsx-be-order.c +++ b/gcc/testsuite/gcc.dg/vmx/st-vsx-be-order.c @@ -4,7 +4,7 @@ #include "harness.h" -static unsigned long svul[2] __attribute__ ((aligned (16))); +static unsigned long long svul[2] __attribute__ ((aligned (16))); static double svd[2] __attribute__ ((aligned (16))); static void check_arrays () @@ -20,14 +20,14 @@ static void check_arrays () static void test () { #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ - vector unsigned long vul = {1,0}; + vector unsigned long long vul = {1,0}; vector double vd = {1.0,0.0}; #else - vector unsigned long vul = {0,1}; + vector unsigned long long vul = {0,1}; vector double vd = {0.0,1.0}; #endif - vec_st (vul, 0, (vector unsigned long *)svul); + vec_st (vul, 0, (vector unsigned long long *)svul); vec_st (vd, 0, (vector double *)svd); check_arrays (); diff --git a/gcc/testsuite/gcc.dg/vmx/st-vsx.c b/gcc/testsuite/gcc.dg/vmx/st-vsx.c index 8505ea9babb..ef67de0baec 100644 --- a/gcc/testsuite/gcc.dg/vmx/st-vsx.c +++ b/gcc/testsuite/gcc.dg/vmx/st-vsx.c @@ -4,7 +4,7 @@ #include "harness.h" -static unsigned long svul[2] __attribute__ ((aligned (16))); +static unsigned long long svul[2] __attribute__ ((aligned (16))); static double svd[2] __attribute__ ((aligned (16))); static void check_arrays () @@ -19,10 +19,10 @@ static void check_arrays () static void test () { - vector unsigned long vul = {0,1}; + vector unsigned long long vul = {0,1}; vector double vd = {0.0,1.0}; - vec_st (vul, 0, (vector unsigned long *)svul); + vec_st (vul, 0, (vector unsigned long long *)svul); vec_st (vd, 0, (vector double *)svd); check_arrays (); diff --git a/gcc/testsuite/gcc.dg/vmx/stl-vsx-be-order.c b/gcc/testsuite/gcc.dg/vmx/stl-vsx-be-order.c index 14ac8005901..26f2c27726f 100644 --- a/gcc/testsuite/gcc.dg/vmx/stl-vsx-be-order.c +++ b/gcc/testsuite/gcc.dg/vmx/stl-vsx-be-order.c @@ -4,7 +4,7 @@ #include "harness.h" -static unsigned long svul[2] __attribute__ ((aligned (16))); +static unsigned long long svul[2] __attribute__ ((aligned (16))); static double svd[2] __attribute__ ((aligned (16))); static void check_arrays () @@ -20,14 +20,14 @@ static void check_arrays () static void test () { #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ - vector unsigned long vul = {1,0}; + vector unsigned long long vul = {1,0}; vector double vd = {1.0,0.0}; #else - vector unsigned long vul = {0,1}; + vector unsigned long long vul = {0,1}; vector double vd = {0.0,1.0}; #endif - vec_stl (vul, 0, (vector unsigned long *)svul); + vec_stl (vul, 0, (vector unsigned long long *)svul); vec_stl (vd, 0, (vector double *)svd); check_arrays (); diff --git a/gcc/testsuite/gcc.dg/vmx/stl-vsx.c b/gcc/testsuite/gcc.dg/vmx/stl-vsx.c index 7e7be7b93cc..9a1cce6f8f8 100644 --- a/gcc/testsuite/gcc.dg/vmx/stl-vsx.c +++ b/gcc/testsuite/gcc.dg/vmx/stl-vsx.c @@ -4,7 +4,7 @@ #include "harness.h" -static unsigned long svul[2] __attribute__ ((aligned (16))); +static unsigned long long svul[2] __attribute__ ((aligned (16))); static double svd[2] __attribute__ ((aligned (16))); static void check_arrays () @@ -19,10 +19,10 @@ static void check_arrays () static void test () { - vector unsigned long vul = {0,1}; + vector unsigned long long vul = {0,1}; vector double vd = {0.0,1.0}; - vec_stl (vul, 0, (vector unsigned long *)svul); + vec_stl (vul, 0, (vector unsigned long long *)svul); vec_stl (vd, 0, (vector double *)svd); check_arrays (); -- 2.30.2