[rs6000] Intrinsic compatibility tests should not pass just because DEBUG is set

Message ID 674c2386-63ed-c345-c75b-21161ba52d29@linux.ibm.com
State New
Headers show
Series
  • [rs6000] Intrinsic compatibility tests should not pass just because DEBUG is set
Related show

Commit Message

Bill Schmidt Oct. 25, 2018, 7:58 p.m.
Hi,

A number of the test cases for the intrinsic compatibility headers are set up
to dump more information when a test case fails and the DEBUG macro has been
set.  Unfortunately, many of them also then pass the test case since they no
longer call abort().  This patch fixes that oversight (or intentional oddity).

A lot of these tests are also miserably formatted, so I took the liberty of
cleaning that up while I was in here.

Tested on powerpc64le-linux-gnu with no failures.  Is this ok for trunk, and
potential backport to 8?

Thanks!
Bill


2018-10-25  Bill Schmidt  <wschmidt@linux.ibm.com>
	    Jinsong Ji  <jji@us.ibm.com>

	* gcc.target/powerpc/sse-addss-1.c: Call abort under DEBUG also;
	formatting cleanup.
	* gcc.target/powerpc/sse-pavgw-1.c: Likewise.
	* gcc.target/powerpc/sse2-addsd-1.c: Likewise.
	* gcc.target/powerpc/sse2-cvtdq2pd-1.c: Likewise.
	* gcc.target/powerpc/sse2-cvtpd2dq-1.c: Likewise.
	* gcc.target/powerpc/sse2-cvtpd2ps-1.c: Likewise.
	* gcc.target/powerpc/sse2-cvtps2dq-1.c: Likewise.
	* gcc.target/powerpc/sse2-cvtps2pd-1.c: Likewise.
	* gcc.target/powerpc/sse2-cvtsd2si-1.c: Likewise.
	* gcc.target/powerpc/sse2-cvtsd2si-2.c: Likewise.
	* gcc.target/powerpc/sse2-cvtsd2ss-1.c: Likewise.
	* gcc.target/powerpc/sse2-cvtss2sd-1.c: Likewise.
	* gcc.target/powerpc/sse2-cvttpd2dq-1.c: Likewise.
	* gcc.target/powerpc/sse2-cvttsd2si-1.c: Likewise.
	* gcc.target/powerpc/sse2-divpd-1.c: Likewise.
	* gcc.target/powerpc/sse2-divsd-1.c: Likewise.
	* gcc.target/powerpc/sse2-maxsd-1.c: Likewise.
	* gcc.target/powerpc/sse2-minsd-1.c: Likewise.
	* gcc.target/powerpc/sse2-movmskpd-1.c: Likewise.
	* gcc.target/powerpc/sse2-movq-1.c: Likewise.
	* gcc.target/powerpc/sse2-movsd-3.c: Likewise.
	* gcc.target/powerpc/sse2-mulpd-1.c: Likewise.
	* gcc.target/powerpc/sse2-mulsd-1.c: Likewise.
	* gcc.target/powerpc/sse2-packssdw-1.c: Likewise.
	* gcc.target/powerpc/sse2-packsswb-1.c: Likewise.
	* gcc.target/powerpc/sse2-packuswb-1.c: Likewise.
	* gcc.target/powerpc/sse2-paddsb-1.c: Likewise.
	* gcc.target/powerpc/sse2-paddsw-1.c: Likewise.
	* gcc.target/powerpc/sse2-paddusb-1.c: Likewise.
	* gcc.target/powerpc/sse2-pmovmskb-1.c: Likewise.
	* gcc.target/powerpc/sse2-pmulhw-1.c: Likewise.
	* gcc.target/powerpc/sse2-pmuludq1.c: Likewise.
	* gcc.target/powerpc/sse2-psadbw-1.c: Likewise.
	* gcc.target/powerpc/sse2-pshufd-1.c: Likewise.
	* gcc.target/powerpc/sse2-pshufhw-1.c: Likewise.
	* gcc.target/powerpc/sse2-pshuflw-1.c: Likewise.
	* gcc.target/powerpc/sse2-pslld-2.c: Likewise.
	* gcc.target/powerpc/sse2-pslldq-1.c: Likewise.
	* gcc.target/powerpc/sse2-psrld-1.c: Likewise.
	* gcc.target/powerpc/sse2-psrld-2.c: Likewise.
	* gcc.target/powerpc/sse2-psrldq-1.c: Likewise.
	* gcc.target/powerpc/sse2-psubusb-1.c: Likewise.
	* gcc.target/powerpc/sse2-sqrtpd-1.c: Likewise.
	* gcc.target/powerpc/sse2-subsd-1.c: Likewise.

Comments

Segher Boessenkool Oct. 26, 2018, 7:03 p.m. | #1
Hi Bill,

On Thu, Oct 25, 2018 at 02:58:59PM -0500, Bill Schmidt wrote:
> A number of the test cases for the intrinsic compatibility headers are set up

> to dump more information when a test case fails and the DEBUG macro has been

> set.  Unfortunately, many of them also then pass the test case since they no

> longer call abort().  This patch fixes that oversight (or intentional oddity).

> 

> A lot of these tests are also miserably formatted, so I took the liberty of

> cleaning that up while I was in here.

> 

> Tested on powerpc64le-linux-gnu with no failures.  Is this ok for trunk, and

> potential backport to 8?


Sure, that's fine.  Thanks!


Segher

Patch

Index: gcc/testsuite/gcc.target/powerpc/sse-addss-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse-addss-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse-addss-1.c	(working copy)
@@ -40,17 +40,16 @@  TEST (void)
   e[3] = s1.a[3];
 
   if (check_union128 (u, e))
+  {
 #if DEBUG
-  {
-	  printf ("sse_test_addss_1; check_union128 failed\n");
-      printf ("\t add ([%f,%f,%f,%f], [%f,%f,%f,%f]) -> [%f,%f,%f,%F]\n",
-    		  s1.x[0], s1.x[1], s1.x[2], s1.x[3],
-    		  s2.x[0], s2.x[1], s2.x[2], s2.x[3],
-			  u.x[0], u.x[1], u.x[2], u.x[3]);
-      printf ("\t expect [%f,%f,%f%f]\n",
-    		  e[0], e[1], e[2], e[3]);
+    printf ("sse_test_addss_1; check_union128 failed\n");
+    printf ("\t add ([%f,%f,%f,%f], [%f,%f,%f,%f]) -> [%f,%f,%f,%F]\n",
+	    s1.x[0], s1.x[1], s1.x[2], s1.x[3],
+	    s2.x[0], s2.x[1], s2.x[2], s2.x[3],
+	    u.x[0], u.x[1], u.x[2], u.x[3]);
+    printf ("\t expect [%f,%f,%f%f]\n",
+	    e[0], e[1], e[2], e[3]);
+#endif
+    abort ();
   }
-#else
-    abort ();
-#endif
 }
Index: gcc/testsuite/gcc.target/powerpc/sse-pavgw-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse-pavgw-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse-pavgw-1.c	(working copy)
@@ -43,13 +43,12 @@  TEST (void)
     }
 
   if (u.as_m64 != e.as_m64)
+    {
 #if DEBUG
-    {
       printf ("test_mmx_pavgw_1; failed\n");
       printf ("\t _mm_avg_pu16 (%llx, %llx) -> %llx != %llx\n", s1.as_m64,
 	      s2.as_m64, u.as_m64, e.as_m64);
+#endif
+      abort ();
     }
-#else
-  abort ();
-#endif
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-addsd-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-addsd-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-addsd-1.c	(working copy)
@@ -41,14 +41,13 @@  TEST (void)
   e[1] = s1.a[1];
 
   if (check_union128d (u, e))
+    {
 #if DEBUG
-  {
       printf ("sse2_test_addsd_1; check_union128d failed\n");
       printf ("\t [%f,%f] + [%f,%f] -> [%f,%f]\n", s1.a[0], s1.a[1], s2.a[0],
 	      s2.a[1], u.a[0], u.a[1]);
       printf ("\t expect [%f,%f]\n", e[0], e[1]);
-  }
-#else
-    abort ();
 #endif
+      abort ();
+    }
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-cvtdq2pd-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-cvtdq2pd-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-cvtdq2pd-1.c	(working copy)
@@ -39,17 +39,15 @@  TEST (void)
   e[1] = (double)s.a[1]; 
 
   if (check_union128d (u, e))
+    {
 #if DEBUG
-  {
       printf ("sse2_test_cvtepi32_pd; check_union128d failed\n");
       printf ("\t [%d,%d, %d, %d] -> [%f,%f]\n",
-    		  s.a[0], s.a[1], s.a[2], s.a[3],
-			  u.a[0], u.a[1]);
-      printf ("\t expect [%f,%f]\n",
-			  e[0], e[1]);
-  }
-#else
-    abort ();
+	      s.a[0], s.a[1], s.a[2], s.a[3],
+	      u.a[0], u.a[1]);
+      printf ("\t expect [%f,%f]\n", e[0], e[1]);
 #endif
+      abort ();
+    }
 #endif
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-cvtpd2dq-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-cvtpd2dq-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-cvtpd2dq-1.c	(working copy)
@@ -37,14 +37,13 @@  TEST (void)
   e[1] = (int)(s.a[1] + 0.5); 
 
   if (check_union128i_d (u, e))
+    {
 #if DEBUG
-  {
       printf ("sse2_test_cvtpd_epi32; check_union128i_d failed\n");
       printf ("\t [%f,%f] -> [%d,%d,%d,%d]\n", s.a[0], s.a[1], u.a[0], u.a[1],
 	      u.a[2], u.a[3]);
       printf ("\t expect [%d,%d,%d,%d]\n", e[0], e[1], e[2], e[3]);
-  }
-#else
-    abort ();
 #endif
+      abort ();
+    }
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-cvtpd2ps-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-cvtpd2ps-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-cvtpd2ps-1.c	(working copy)
@@ -37,14 +37,13 @@  TEST (void)
   e[1] = (float)s.a[1]; 
 
   if (check_union128 (u, e))
+    {
 #if DEBUG
-  {
-    printf ("sse2_test_cvtpd_ps; check_union128 failed\n");
+      printf ("sse2_test_cvtpd_ps; check_union128 failed\n");
       printf ("\t [%f,%f] -> [%f,%f,%f,%f]\n", s.a[0], s.a[1], u.a[0], u.a[1],
 	      u.a[2], u.a[3]);
       printf ("\t expect [%f,%f,%f,%f]\n", e[0], e[1], e[2], e[3]);
-  }
-#else
-    abort ();
 #endif
+      abort ();
+    }
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-cvtps2dq-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-cvtps2dq-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-cvtps2dq-1.c	(working copy)
@@ -39,14 +39,13 @@  TEST (void)
   e[3] = (int)(s.a[3] + 0.5); 
 
   if (check_union128i_d (u, e))
+    {
 #if DEBUG
-  {
       printf ("sse2_test_cvtps2dq_1; check_union128i_d failed\n");
       printf ("\t [%f,%f,%f,%f] -> [%d,%d,%d,%d]\n", s.a[0], s.a[1], s.a[2],
 	      s.a[3], u.a[0], u.a[1], u.a[2], u.a[3]);
       printf ("\t expect [%d,%d,%d,%d]\n", e[0], e[1], e[2], e[3]);
-  }
-#else
-    abort ();
 #endif
+      abort ();
+    }
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-cvtps2pd-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-cvtps2pd-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-cvtps2pd-1.c	(working copy)
@@ -37,14 +37,13 @@  TEST (void)
   e[1] = (double)s.a[1]; 
 
   if (check_union128d (u, e))
+    {
 #if DEBUG
-  {
       printf ("sse2_test_cvtps2pd_1; check_union128d failed\n");
       printf ("\t cvt\t [%f,%f,%f,%f] -> [%f,%f]\n", s.a[0], s.a[1], s.a[2],
 	      s.a[3], u.a[0], u.a[1]);
       printf ("\t expect\t [%f,%f]\n", e[0], e[1]);
-  }
-#else
-    abort ();
 #endif
+      abort ();
+    }
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-cvtsd2si-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-cvtsd2si-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-cvtsd2si-1.c	(working copy)
@@ -37,13 +37,12 @@  TEST (void)
   e = (int)(s.a[0] + 0.5);
 
   if (d != e)
+    {
 #if DEBUG
-  {
       printf ("sse2_test_cvtsd2si_1; failed\n");
       printf ("\t [%f,%f] -> [%d]\n", s.a[0], s.a[1], d);
       printf ("\t expect [%d]\n", e);
-  }
-#else
-    abort ();
 #endif
+      abort ();
+    }
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-cvtsd2si-2.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-cvtsd2si-2.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-cvtsd2si-2.c	(working copy)
@@ -36,13 +36,12 @@  TEST (void)
   e = (long long)(s.a[0] + 0.5);
 
   if (d != e)
+    {
 #if DEBUG
-  {
       printf ("sse2_test_cvtsd2si_2; failed\n");
       printf ("\t [%f,%f] -> [%ld]\n", s.a[0], s.a[1], d);
       printf ("\t expect [%ld]\n", e);
-  }
-#else
-    abort ();
 #endif
+      abort ();
+    }
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-cvtsd2ss-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-cvtsd2ss-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-cvtsd2ss-1.c	(working copy)
@@ -39,15 +39,14 @@  TEST (void)
   e[0] = (float)source1[0];
 
   if (check_union128(u, e))
+    {
 #if DEBUG
-  {
       printf ("sse2_test_cvtsd2ss_1; check_union128 failed\n");
       printf ("\t [%f,%f,%f,%f],[%f,%f]\n", s2.a[0], s2.a[1], s2.a[2], s2.a[3],
-    		  s1.a[0], s1.a[1]);
+	      s1.a[0], s1.a[1]);
       printf ("\t -> \t[%f,%f,%f,%f]\n", u.a[0], u.a[1], u.a[2], u.a[3]);
       printf ("\texpect\t[%f,%f,%f,%f]\n", e[0], e[1], e[2], e[3]);
-  }
-#else
-    abort ();
 #endif
+      abort ();
+    }
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-cvtss2sd-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-cvtss2sd-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-cvtss2sd-1.c	(working copy)
@@ -38,15 +38,14 @@  TEST (void)
   e[1] = s1.a[1];
 
   if (check_union128d (u, e))
+    {
 #if DEBUG
-  {
       printf ("sse2_test_cvtss2sd_1; check_union128d failed\n");
-      printf ("\t [%f,%f], [%f,%f,%f,%f]\n", s1.a[0], s1.a[1], s2.a[0], s2.a[1],
-	      s2.a[2], s2.a[3]);
+      printf ("\t [%f,%f], [%f,%f,%f,%f]\n", s1.a[0], s1.a[1],
+	      s2.a[0], s2.a[1], s2.a[2], s2.a[3]);
       printf ("\t -> \t[%f,%f]\n", u.a[0], u.a[1]);
       printf ("\texpect\t[%f,%f]\n", e[0], e[1]);
-  }
-#else
-    abort ();
 #endif
+      abort ();
+    }
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-cvttpd2dq-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-cvttpd2dq-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-cvttpd2dq-1.c	(working copy)
@@ -37,14 +37,13 @@  TEST (void)
   e[1] = (int)s.a[1]; 
 
   if (check_union128i_d (u, e))
+    {
 #if DEBUG
-  {
-	  printf ("sse2_test_cvttpd_epi32; check_union128i_d failed\n");
+      printf ("sse2_test_cvttpd_epi32; check_union128i_d failed\n");
       printf ("\t [%f,%f] -> [%d,%d,%d,%d]\n", s.a[0], s.a[1], u.a[0], u.a[1],
 	      u.a[2], u.a[3]);
       printf ("\t expect [%d,%d,%d,%d]\n", e[0], e[1], e[2], e[3]);
-  }
-#else
-    abort ();
 #endif
+      abort ();
+    }
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-cvttsd2si-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-cvttsd2si-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-cvttsd2si-1.c	(working copy)
@@ -36,13 +36,12 @@  TEST (void)
   e = (int)(s.a[0]);
 
   if (d != e)
+    {
 #if DEBUG
-  {
       printf ("sse2_test_cvttsd2si_1; failed\n");
       printf ("\t [%f,%f] -> [%d]\n", s.a[0], s.a[1], d);
       printf ("\t expect [%d]\n", e);
-  }
-#else
-    abort ();
 #endif
+      abort ();
+    }
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-divpd-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-divpd-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-divpd-1.c	(working copy)
@@ -37,14 +37,13 @@  TEST (void)
   e[1] = s1.a[1] / s2.a[1];
 
   if (check_union128d (u, e))
+    {
 #if DEBUG
-  {
-    printf ("sse2_test_divpd_1; check_union128d failed\n");
-    printf ("\t [%f,%f] * [%f,%f] -> [%f,%f]\n", s1.a[0], s1.a[1], s2.a[0],
+      printf ("sse2_test_divpd_1; check_union128d failed\n");
+      printf ("\t [%f,%f] * [%f,%f] -> [%f,%f]\n", s1.a[0], s1.a[1], s2.a[0],
 	      s2.a[1], u.a[0], u.a[1]);
-    printf ("\t expect [%f,%f]\n", e[0], e[1]);
-  }
-#else
-    abort ();
+      printf ("\t expect [%f,%f]\n", e[0], e[1]);
 #endif
+      abort ();
+    }
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-divsd-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-divsd-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-divsd-1.c	(working copy)
@@ -37,14 +37,13 @@  TEST (void)
   e[1] = s1.a[1];
 
   if (check_union128d (u, e))
+    {
 #if DEBUG
-  {
-    printf ("sse2_test_divsd_1; check_union128d failed\n");
-    printf ("\t [%f,%f] / [%f,%f] -> [%f,%f]\n", s1.a[0], s1.a[1], s2.a[0],
+      printf ("sse2_test_divsd_1; check_union128d failed\n");
+      printf ("\t [%f,%f] / [%f,%f] -> [%f,%f]\n", s1.a[0], s1.a[1], s2.a[0],
 	      s2.a[1], u.a[0], u.a[1]);
-    printf ("\t expect [%f,%f]\n", e[0], e[1]);
-  }
-#else
-    abort ();
+      printf ("\t expect [%f,%f]\n", e[0], e[1]);
 #endif
+      abort ();
+    }
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-maxsd-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-maxsd-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-maxsd-1.c	(working copy)
@@ -37,14 +37,13 @@  TEST (void)
   e[1] = s1.a[1];
 
   if (check_union128d (u, e))
+    {
 #if DEBUG
-  {
       printf ("sse2_test_maxsd_3; check_union128d failed\n");
       printf ("\t [%f,%f] + [%f,%f] -> [%f,%f]\n", s1.a[0], s1.a[1], s2.a[0],
 	      s2.a[1], u.a[0], u.a[1]);
       printf ("\t expect [%f,%f]\n", e[0], e[1]);
-  }
-#else
-    abort ();
 #endif
+      abort ();
+    }
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-minsd-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-minsd-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-minsd-1.c	(working copy)
@@ -37,14 +37,13 @@  TEST (void)
   e[1] = s1.a[1];
 
   if (check_union128d (u, e))
+    {
 #if DEBUG
-  {
       printf ("sse2_test_minsd_3; check_union128d failed\n");
       printf ("\t [%f,%f] + [%f,%f] -> [%f,%f]\n", s1.a[0], s1.a[1], s2.a[0],
 	      s2.a[1], u.a[0], u.a[1]);
       printf ("\t expect [%f,%f]\n", e[0], e[1]);
-  }
-#else
-    abort ();
 #endif
+      abort ();
+    }
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-movmskpd-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-movmskpd-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-movmskpd-1.c	(working copy)
@@ -46,16 +46,13 @@  TEST (void)
     e |= 1 << 1;
 
   if (checkVi (&d, &e, 1))
+    {
 #if DEBUG
-  {
-    printf ("sse2_test_movmskpd_1; check_union128d failed\n");
-    printf ("\t [%f,%f] -> [%d]\n",
-    		  s1.a[0], s1.a[1], d);
-    printf ("\t expect [%d]\n",
-			  e);
-  }
-#else
-    abort ();
+      printf ("sse2_test_movmskpd_1; check_union128d failed\n");
+      printf ("\t [%f,%f] -> [%d]\n", s1.a[0], s1.a[1], d);
+      printf ("\t expect [%d]\n", e);
 #endif
+      abort ();
+    }
 #endif
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-movq-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-movq-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-movq-1.c	(working copy)
@@ -34,14 +34,13 @@  TEST (void)
   e[0] = s1.a[0];
 
   if (check_union128i_q (u, e))
+    {
 #if DEBUG
-  {
       printf ("sse2_test_movq_1; check_union128i_q failed\n");
       printf ("\t move_epi64 ([%llx, %llx]) -> [%llx, %llx]\n", s1.a[0],
 	      s1.a[1], u.a[0], u.a[1]);
       printf ("\t expect [%llx, %llx]\n", e[0], e[1]);
-  }
-#else
-    abort ();
 #endif
+      abort ();
+    }
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-movsd-3.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-movsd-3.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-movsd-3.c	(working copy)
@@ -35,14 +35,13 @@  TEST (void)
   u.x = test (s1.x, s2.x);
 
   if (check_union128d (u, e))
+    {
 #if DEBUG
-  {
       printf ("sse2_test_movsd_3; check_union128d failed\n");
       printf ("\t [%f,%f], [%f,%f] -> [%f,%f]\n", s1.a[0], s1.a[1], s2.a[0],
 	      s2.a[1], u.a[0], u.a[1]);
       printf ("\t expect [%f,%f]\n", e[0], e[1]);
-  }
-#else
-    abort ();
 #endif
+      abort ();
+    }
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-mulpd-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-mulpd-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-mulpd-1.c	(working copy)
@@ -37,14 +37,13 @@  TEST (void)
   e[1] = s1.a[1] * s2.a[1];
 
   if (check_union128d (u, e))
+    {
 #if DEBUG
-  {
       printf ("sse2_test_mul_pd_1; check_union128d failed\n");
       printf ("\t [%f,%f] * [%f,%f] -> [%f,%f]\n", s1.a[0], s1.a[1], s2.a[0],
 	      s2.a[1], u.a[0], u.a[1]);
       printf ("\t expect [%f,%f]\n", e[0], e[1]);
-  }
-#else
-    abort ();
 #endif
+      abort ();
+    }
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-mulsd-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-mulsd-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-mulsd-1.c	(working copy)
@@ -37,14 +37,13 @@  TEST (void)
   e[1] = s1.a[1];
 
   if (check_union128d (u, e))
+    {
 #if DEBUG
-  {
       printf ("sse2_test_mul_sd_1; check_union128d failed\n");
       printf ("\t [%f,%f] * [%f,%f] -> [%f,%f]\n", s1.a[0], s1.a[1], s2.a[0],
 	      s2.a[1], u.a[0], u.a[1]);
       printf ("\t expect [%f,%f]\n", e[0], e[1]);
-  }
-#else
-    abort ();
 #endif
+      abort ();
+    }
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-packssdw-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-packssdw-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-packssdw-1.c	(working copy)
@@ -56,18 +56,17 @@  TEST (void)
     }
 
   if (check_union128i_w (u, e))
+    {
 #if DEBUG
-  {
       printf ("sse2_test_packssdw_1; check_union128i_w failed\n");
-      printf (
-	  "\t ([%x,%x,%x,%x], [%x,%x,%x,%x]) -> [%x,%x,%x,%x, %x,%x,%x,%x]\n",
-	  s1.a[0], s1.a[1], s1.a[2], s1.a[3], s2.a[0], s2.a[1], s2.a[2],
-	  s2.a[3], u.a[0], u.a[1], u.a[2], u.a[3], u.a[4], u.a[5], u.a[6],
-	  u.a[7]);
+      printf ("\t ([%x,%x,%x,%x], [%x,%x,%x,%x])"
+	      " -> [%x,%x,%x,%x, %x,%x,%x,%x]\n",
+	      s1.a[0], s1.a[1], s1.a[2], s1.a[3], s2.a[0], s2.a[1], s2.a[2],
+	      s2.a[3], u.a[0], u.a[1], u.a[2], u.a[3], u.a[4], u.a[5], u.a[6],
+	      u.a[7]);
       printf ("\t expect [%x,%x,%x,%x, %x,%x,%x,%x]\n", e[0], e[1], e[2], e[3],
-			  e[4], e[5], e[6], e[7]);
-  }
-#else
-    abort ();
+	      e[4], e[5], e[6], e[7]);
 #endif
+      abort ();
+    }
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-packsswb-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-packsswb-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-packsswb-1.c	(working copy)
@@ -56,8 +56,8 @@  TEST (void)
     }
 
   if (check_union128i_b (u, e))
+    {
 #if DEBUG
-    {
       printf ("sse2_test_packsswb_1; check_union128i_w failed\n");
       printf ("\t ([%x,%x,%x,%x, %x,%x,%x,%x], [%x,%x,%x,%x, %x,%x,%x,%x])\n",
 	      s1.a[0], s1.a[1], s1.a[2], s1.a[3], s1.a[4], s1.a[5], s1.a[6],
@@ -67,12 +67,11 @@  TEST (void)
 	      u.a[0], u.a[1], u.a[2], u.a[3], u.a[4], u.a[5], u.a[6], u.a[7],
 	      u.a[8], u.a[9], u.a[10], u.a[11], u.a[12], u.a[13], u.a[14],
 	      u.a[15]);
-      printf (
-	  "\t expect [%x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x]\n",
-	  e[0], e[1], e[2], e[3], e[4], e[5], e[6], e[7], e[8], e[9], e[10],
-	  e[11], e[12], e[13], e[14], e[15]);
+      printf ("\t expect [%x,%x,%x,%x, %x,%x,%x,%x,"
+	      " %x,%x,%x,%x, %x,%x,%x,%x]\n",
+	      e[0], e[1], e[2], e[3], e[4], e[5], e[6], e[7], e[8], e[9],
+	      e[10], e[11], e[12], e[13], e[14], e[15]);
+#endif
+      abort ();
     }
-#else
-    abort ();
-#endif
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-packuswb-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-packuswb-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-packuswb-1.c	(working copy)
@@ -47,8 +47,8 @@  TEST (void)
     }
 
   if (check_union128i_ub (u, e))
+    {
 #if DEBUG
-    {
       printf ("sse2_test_packuswb_1; check_union128i_w failed\n");
       printf ("\t ([%x,%x,%x,%x, %x,%x,%x,%x], [%x,%x,%x,%x, %x,%x,%x,%x])\n",
 	      s1.a[0], s1.a[1], s1.a[2], s1.a[3], s1.a[4], s1.a[5], s1.a[6],
@@ -58,12 +58,11 @@  TEST (void)
 	      u.a[0], u.a[1], u.a[2], u.a[3], u.a[4], u.a[5], u.a[6], u.a[7],
 	      u.a[8], u.a[9], u.a[10], u.a[11], u.a[12], u.a[13], u.a[14],
 	      u.a[15]);
-      printf (
-	  "\t expect [%x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x]\n",
-	  e[0], e[1], e[2], e[3], e[4], e[5], e[6], e[7], e[8], e[9], e[10],
-	  e[11], e[12], e[13], e[14], e[15]);
+      printf ("\t expect [%x,%x,%x,%x, %x,%x,%x,%x,"
+	      " %x,%x,%x,%x, %x,%x,%x,%x]\n",
+	      e[0], e[1], e[2], e[3], e[4], e[5], e[6], e[7], e[8], e[9],
+	      e[10], e[11], e[12], e[13], e[14], e[15]);
+#endif
+      abort ();
     }
-#else
-    abort ();
-#endif
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-paddsb-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-paddsb-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-paddsb-1.c	(working copy)
@@ -47,28 +47,27 @@  TEST (void)
     }
 
   if (check_union128i_b (u, e))
+    {
 #if DEBUG
-    {
       printf ("sse2_test_paddsb_1; check_union128i_b failed\n");
-      printf (
-	  "\tadds\t([%x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x],\n",
+      printf ("\tadds\t([%x,%x,%x,%x, %x,%x,%x,%x,"
+	      " %x,%x,%x,%x, %x,%x,%x,%x],\n",
 	      s1.a[0], s1.a[1], s1.a[2], s1.a[3], s1.a[4], s1.a[5], s1.a[6],
-	      s1.a[7], s1.a[8], s1.a[9], s1.a[10], s1.a[11], s1.a[12], s1.a[13],
-	      s1.a[14], s1.a[15]);
+	      s1.a[7], s1.a[8], s1.a[9], s1.a[10], s1.a[11], s1.a[12],
+	      s1.a[13], s1.a[14], s1.a[15]);
       printf ("\t\t [%x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x])\n",
 	      s2.a[0], s2.a[1], s2.a[2], s2.a[3], s2.a[4], s2.a[5], s2.a[6],
-	      s2.a[7], s2.a[8], s2.a[9], s2.a[10], s2.a[11], s2.a[12], s2.a[13],
-	      s2.a[14], s2.a[15]);
+	      s2.a[7], s2.a[8], s2.a[9], s2.a[10], s2.a[11], s2.a[12],
+	      s2.a[13], s2.a[14], s2.a[15]);
       printf ("\t ->\t [%x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x]\n",
 	      u.a[0], u.a[1], u.a[2], u.a[3], u.a[4], u.a[5], u.a[6], u.a[7],
 	      u.a[8], u.a[9], u.a[10], u.a[11], u.a[12], u.a[13], u.a[14],
 	      u.a[15]);
-      printf (
-	  "\texpect\t [%x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x]\n",
-	  e[0], e[1], e[2], e[3], e[4], e[5], e[6], e[7], e[8], e[9], e[10],
-	  e[11], e[12], e[13], e[14], e[15]);
+      printf ("\texpect\t [%x,%x,%x,%x, %x,%x,%x,%x,"
+	      " %x,%x,%x,%x, %x,%x,%x,%x]\n",
+	      e[0], e[1], e[2], e[3], e[4], e[5], e[6], e[7], e[8], e[9],
+	      e[10], e[11], e[12], e[13], e[14], e[15]);
+#endif
+      abort ();
     }
-#else
-    abort ();
-#endif
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-paddsw-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-paddsw-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-paddsw-1.c	(working copy)
@@ -47,8 +47,8 @@  TEST (void)
     }
 
   if (check_union128i_w (u, e))
+    {
 #if DEBUG
-    {
       printf ("sse2_test_paddsw_1; check_union128i_w failed\n");
       printf ("\tadds\t([%x,%x,%x,%x, %x,%x,%x,%x],\n", s1.a[0], s1.a[1],
 	      s1.a[2], s1.a[3], s1.a[4], s1.a[5], s1.a[6], s1.a[7]);
@@ -56,10 +56,9 @@  TEST (void)
 	      s2.a[3], s2.a[4], s2.a[5], s2.a[6], s2.a[7]);
       printf ("\t ->\t [%x,%x,%x,%x, %x,%x,%x,%x]\n", u.a[0], u.a[1], u.a[2],
 	      u.a[3], u.a[4], u.a[5], u.a[6], u.a[7]);
-      printf ("\texpect\t [%x,%x,%x,%x, %x,%x,%x,%x]\n", e[0], e[1], e[2], e[3],
-	      e[4], e[5], e[6], e[7]);
+      printf ("\texpect\t [%x,%x,%x,%x, %x,%x,%x,%x]\n", e[0], e[1], e[2],
+	      e[3], e[4], e[5], e[6], e[7]);
+#endif
+      abort ();
     }
-#else
-    abort ();
-#endif
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-paddusb-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-paddusb-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-paddusb-1.c	(working copy)
@@ -47,28 +47,27 @@  TEST (void)
     }
 
   if (check_union128i_b (u, e))
+    {
 #if DEBUG
-    {
       printf ("sse2_test_paddusb_1; check_union128i_b failed\n");
-      printf (
-	  "\tadds\t([%x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x],\n",
+      printf ("\tadds\t([%x,%x,%x,%x, %x,%x,%x,%x,"
+	      " %x,%x,%x,%x, %x,%x,%x,%x],\n",
 	      s1.a[0], s1.a[1], s1.a[2], s1.a[3], s1.a[4], s1.a[5], s1.a[6],
-	      s1.a[7], s1.a[8], s1.a[9], s1.a[10], s1.a[11], s1.a[12], s1.a[13],
-	      s1.a[14], s1.a[15]);
+	      s1.a[7], s1.a[8], s1.a[9], s1.a[10], s1.a[11], s1.a[12],
+	      s1.a[13], s1.a[14], s1.a[15]);
       printf ("\t\t [%x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x])\n",
 	      s2.a[0], s2.a[1], s2.a[2], s2.a[3], s2.a[4], s2.a[5], s2.a[6],
-	      s2.a[7], s2.a[8], s2.a[9], s2.a[10], s2.a[11], s2.a[12], s2.a[13],
-	      s2.a[14], s2.a[15]);
+	      s2.a[7], s2.a[8], s2.a[9], s2.a[10], s2.a[11], s2.a[12],
+	      s2.a[13], s2.a[14], s2.a[15]);
       printf ("\t ->\t [%x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x]\n",
 	      u.a[0], u.a[1], u.a[2], u.a[3], u.a[4], u.a[5], u.a[6], u.a[7],
 	      u.a[8], u.a[9], u.a[10], u.a[11], u.a[12], u.a[13], u.a[14],
 	      u.a[15]);
-      printf (
-	  "\texpect\t [%x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x]\n",
-	  e[0], e[1], e[2], e[3], e[4], e[5], e[6], e[7], e[8], e[9], e[10],
-	  e[11], e[12], e[13], e[14], e[15]);
+      printf ("\texpect\t [%x,%x,%x,%x, %x,%x,%x,%x,"
+	      " %x,%x,%x,%x, %x,%x,%x,%x]\n",
+	      e[0], e[1], e[2], e[3], e[4], e[5], e[6], e[7], e[8], e[9],
+	      e[10], e[11], e[12], e[13], e[14], e[15]);
+#endif
+      abort ();
     }
-#else
-    abort ();
-#endif
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-pmovmskb-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-pmovmskb-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-pmovmskb-1.c	(working copy)
@@ -41,17 +41,17 @@  TEST (void)
       e = e | (1<<i);
 
   if (checkVi (&u, &e, 1))
+    {
 #if DEBUG
-    {
       printf ("sse2_test_pmovmskb_1; checkVi failed\n");
-      printf ("\t ([%x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x], -> %x)\n",
+      printf ("\t ([%x,%x,%x,%x, %x,%x,%x,%x,"
+	      " %x,%x,%x,%x, %x,%x,%x,%x], -> %x)\n",
 	      s1.a[0], s1.a[1], s1.a[2], s1.a[3], s1.a[4], s1.a[5], s1.a[6],
-	      s1.a[7], s1.a[8], s1.a[9], s1.a[10], s1.a[11], s1.a[12], s1.a[13],
-	      s1.a[14], s1.a[15], u);
+	      s1.a[7], s1.a[8], s1.a[9], s1.a[10], s1.a[11], s1.a[12],
+	      s1.a[13], s1.a[14], s1.a[15], u);
       printf ("\t expect %x\n", e);
+#endif
+      abort ();
     }
-#else
-    abort ();
 #endif
-#endif
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-pmulhw-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-pmulhw-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-pmulhw-1.c	(working copy)
@@ -42,8 +42,8 @@  TEST (void)
     }
 
   if (check_union128i_w (u, e))
+    {
 #if DEBUG
-    {
       printf ("sse2_test_pmulhw_1; check_union128i_w failed\n");
       printf ("\tmulhi\t([%x,%x,%x,%x, %x,%x,%x,%x],\n", s1.a[0], s1.a[1],
 	      s1.a[2], s1.a[3], s1.a[4], s1.a[5], s1.a[6], s1.a[7]);
@@ -51,10 +51,9 @@  TEST (void)
 	      s2.a[3], s2.a[4], s2.a[5], s2.a[6], s2.a[7]);
       printf ("\t ->\t [%x,%x,%x,%x, %x,%x,%x,%x]\n", u.a[0], u.a[1], u.a[2],
 	      u.a[3], u.a[4], u.a[5], u.a[6], u.a[7]);
-      printf ("\texpect\t [%x,%x,%x,%x, %x,%x,%x,%x]\n", e[0], e[1], e[2], e[3],
-	      e[4], e[5], e[6], e[7]);
+      printf ("\texpect\t [%x,%x,%x,%x, %x,%x,%x,%x]\n", e[0], e[1], e[2],
+	      e[3], e[4], e[5], e[6], e[7]);
+#endif
+      abort ();
     }
-#else
-    abort ();
-#endif
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-pmuludq-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-pmuludq-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-pmuludq-1.c	(working copy)
@@ -39,15 +39,14 @@  TEST (void)
   e[1] = s1.a[2] * s2.a[2];
 
   if (check_union128i_q (u, e))
+    {
 #if DEBUG
-    {
       printf ("sse2_test_pmuludq_1; check_union128i_q failed\n");
       printf ("\t ([%x,%x,%x,%x], [%x,%x,%x,%x], -> [%llx, %llx])\n", s1.a[0],
 	      s1.a[1], s1.a[2], s1.a[3], s2.a[0], s2.a[1], s2.a[2], s2.a[3],
 	      u.a[0], u.a[1]);
       printf ("\t expect [%llx, %llx]\n", e[0], e[1]);
+#endif
+      abort ();
     }
-#else
-    abort ();
-#endif
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-psadbw-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-psadbw-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-psadbw-1.c	(working copy)
@@ -46,24 +46,23 @@  TEST (void)
 
 
   if (check_union128i_w (u, e))
+    {
 #if DEBUG
-    {
       printf ("sse2_test_psadbw_1; check_union128i_w failed\n");
-      printf (
-	  "\tadds\t([%x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x],\n",
+      printf ("\tadds\t([%x,%x,%x,%x, %x,%x,%x,%x,"
+	      " %x,%x,%x,%x, %x,%x,%x,%x],\n",
 	      s1.a[0], s1.a[1], s1.a[2], s1.a[3], s1.a[4], s1.a[5], s1.a[6],
-	      s1.a[7], s1.a[8], s1.a[9], s1.a[10], s1.a[11], s1.a[12], s1.a[13],
-	      s1.a[14], s1.a[15]);
+	      s1.a[7], s1.a[8], s1.a[9], s1.a[10], s1.a[11], s1.a[12],
+	      s1.a[13], s1.a[14], s1.a[15]);
       printf ("\t\t [%x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x])\n",
 	      s2.a[0], s2.a[1], s2.a[2], s2.a[3], s2.a[4], s2.a[5], s2.a[6],
-	      s2.a[7], s2.a[8], s2.a[9], s2.a[10], s2.a[11], s2.a[12], s2.a[13],
-	      s2.a[14], s2.a[15]);
+	      s2.a[7], s2.a[8], s2.a[9], s2.a[10], s2.a[11], s2.a[12],
+	      s2.a[13], s2.a[14], s2.a[15]);
       printf ("\t ->\t [%x,%x,%x,%x, %x,%x,%x,%x]\n", u.a[0], u.a[1], u.a[2],
 	      u.a[3], u.a[4], u.a[5], u.a[6], u.a[7]);
-      printf ("\texpect\t [%x,%x,%x,%x, %x,%x,%x,%x]\n", e[0], e[1], e[2], e[3],
-	      e[4], e[5], e[6], e[7]);
+      printf ("\texpect\t [%x,%x,%x,%x, %x,%x,%x,%x]\n", e[0], e[1], e[2],
+	      e[3], e[4], e[5], e[6], e[7]);
+#endif
+      abort ();
     }
-#else
-    abort ();
-#endif
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-pshufd-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-pshufd-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-pshufd-1.c	(working copy)
@@ -38,14 +38,13 @@  TEST (void)
     e[i] = s1.a[((N & (0x3<<(2*i)))>>(2*i))];
 
   if (check_union128i_d(u, e))
+    {
 #if DEBUG
-  {
       printf ("sse2_test_pshufd_1; check_union128i_d failed\n");
       printf ("\t ([%x,%x,%x,%x]) -> [%x,%x,%x,%x]\n", s1.a[0], s1.a[1],
 	      s1.a[2], s1.a[3], u.a[0], u.a[1], u.a[2], u.a[3]);
       printf ("\t expect [%x,%x,%x,%x]\n", e[0], e[1], e[2], e[3]);
-  }
-#else
-    abort ();
 #endif
+      abort ();
+    }
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-pshufhw-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-pshufhw-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-pshufhw-1.c	(working copy)
@@ -47,19 +47,18 @@  TEST (void)
     e[i+4] = (s1.a[1] >> (16 * m2[i])) & 0xffff;
 
   if (check_union128i_w(u, e))
+    {
 #if DEBUG
-  {
-    union128i_w s;
-    s.x = s1.x;
-    printf ("sse2_test_pshufhw_1; check_union128i_w failed\n");
-    printf ("\t ([%hx,%hx,%hx,%hx, %hx,%hx,%hx,%hx])\n", s.a[0], s.a[1],
+      union128i_w s;
+      s.x = s1.x;
+      printf ("sse2_test_pshufhw_1; check_union128i_w failed\n");
+      printf ("\t ([%hx,%hx,%hx,%hx, %hx,%hx,%hx,%hx])\n", s.a[0], s.a[1],
 	      s.a[2], s.a[3], s.a[4], s.a[5], s.a[6], s.a[7]);
-    printf ("\t\t -> [%hx,%hx,%hx,%hx, %hx,%hx,%hx,%hx]\n", u.a[0], u.a[1],
+      printf ("\t\t -> [%hx,%hx,%hx,%hx, %hx,%hx,%hx,%hx]\n", u.a[0], u.a[1],
 	      u.a[2], u.a[3], u.a[4], u.a[5], u.a[6], u.a[7]);
-    printf ("\t expect [%hx,%hx,%hx,%hx, %hx,%hx,%hx,%hx]\n", e[0], e[1],
+      printf ("\t expect [%hx,%hx,%hx,%hx, %hx,%hx,%hx,%hx]\n", e[0], e[1],
 	      e[2], e[3], e[4], e[5], e[6], e[7]);
-  }
-#else
-    abort ();
 #endif
+      abort ();
+    }
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-pshuflw-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-pshuflw-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-pshuflw-1.c	(working copy)
@@ -47,19 +47,18 @@  TEST (void)
     e[i] = (s1.a[0] >> (16 * m2[i])) & 0xffff;
 
   if (check_union128i_w(u, e))
+    {
 #if DEBUG
-  {
-    union128i_w s;
-    s.x = s1.x;
-    printf ("sse2_test_pshuflw_1; check_union128i_w failed\n");
-    printf ("\t ([%hx,%hx,%hx,%hx, %hx,%hx,%hx,%hx])\n", s.a[0], s.a[1],
+      union128i_w s;
+      s.x = s1.x;
+      printf ("sse2_test_pshuflw_1; check_union128i_w failed\n");
+      printf ("\t ([%hx,%hx,%hx,%hx, %hx,%hx,%hx,%hx])\n", s.a[0], s.a[1],
 	      s.a[2], s.a[3], s.a[4], s.a[5], s.a[6], s.a[7]);
-    printf ("\t\t -> [%hx,%hx,%hx,%hx, %hx,%hx,%hx,%hx]\n", u.a[0], u.a[1],
+      printf ("\t\t -> [%hx,%hx,%hx,%hx, %hx,%hx,%hx,%hx]\n", u.a[0], u.a[1],
 	      u.a[2], u.a[3], u.a[4], u.a[5], u.a[6], u.a[7]);
-    printf ("\t expect [%hx,%hx,%hx,%hx, %hx,%hx,%hx,%hx]\n", e[0], e[1],
+      printf ("\t expect [%hx,%hx,%hx,%hx, %hx,%hx,%hx,%hx]\n", e[0], e[1],
 	      e[2], e[3], e[4], e[5], e[6], e[7]);
-  }
-#else
-    abort ();
 #endif
+      abort ();
+    }
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-pslld-2.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-pslld-2.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-pslld-2.c	(working copy)
@@ -41,15 +41,14 @@  TEST (void)
       e[i] = s.a[i] << c.a[0]; 
 
   if (check_union128i_d (u, e))
+    {
 #if DEBUG
-    {
       printf ("sse2_test_pslld_2; check_union128i_d failed\n");
       printf ("\tsll\t([%x,%x,%x,%x], [%llx,%llx]\n", s.a[0], s.a[1], s.a[2],
 	      s.a[3], c.a[0], c.a[1]);
       printf ("\t ->\t [%x,%x,%x,%x]\n", u.a[0], u.a[1], u.a[2], u.a[3]);
       printf ("\texpect\t [%x,%x,%x,%x]\n", e[0], e[1], e[2], e[3]);
+#endif
+      abort ();
     }
-#else
-    abort ();
-#endif
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-pslldq-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-pslldq-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-pslldq-1.c	(working copy)
@@ -42,24 +42,23 @@  TEST (void)
     e[i + N] = src[i];
 
   if (check_union128i_b (u, e))
+    {
 #if DEBUG
-    {
       printf ("sse2_test_pslldq_1; check_union128i_b failed\n");
-
       printf ("\t s ([%x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x])\n",
 	      s.a[0], s.a[1], s.a[2], s.a[3], s.a[4], s.a[5], s.a[6], s.a[7],
 	      s.a[8], s.a[9], s.a[10], s.a[11], s.a[12], s.a[13], s.a[14],
 	      s.a[15]);
-      printf (
-	  "\t u ->\t [%x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x]\n",
-	  u.a[0], u.a[1], u.a[2], u.a[3], u.a[4], u.a[5], u.a[6], u.a[7],
-	  u.a[8], u.a[9], u.a[10], u.a[11], u.a[12], u.a[13], u.a[14], u.a[15]);
-      printf (
-	  "\t expect\t [%x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x]\n",
-	  e[0], e[1], e[2], e[3], e[4], e[5], e[6], e[7], e[8], e[9], e[10],
-	  e[11], e[12], e[13], e[14], e[15]);
+      printf ("\t u ->\t [%x,%x,%x,%x, %x,%x,%x,%x,"
+	      " %x,%x,%x,%x, %x,%x,%x,%x]\n",
+	      u.a[0], u.a[1], u.a[2], u.a[3], u.a[4], u.a[5], u.a[6], u.a[7],
+	      u.a[8], u.a[9], u.a[10], u.a[11], u.a[12], u.a[13], u.a[14],
+	      u.a[15]);
+      printf ("\t expect\t [%x,%x,%x,%x, %x,%x,%x,%x,"
+	      " %x,%x,%x,%x, %x,%x,%x,%x]\n",
+	      e[0], e[1], e[2], e[3], e[4], e[5], e[6], e[7], e[8], e[9],
+	      e[10], e[11], e[12], e[13], e[14], e[15]);
+#endif
+      abort ();
     }
-#else
-  abort ();
-#endif
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-psrld-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-psrld-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-psrld-1.c	(working copy)
@@ -44,14 +44,13 @@  TEST (void)
       }
 
   if (check_union128i_d (u, e))
+    {
 #if DEBUG
-    {
       printf ("sse2_test_psrld_1; check_union128i_d failed\n");
       printf ("\tsrl\t([%x,%x,%x,%x],%d\n", s.a[0], s.a[1], s.a[2], s.a[3], N);
       printf ("\t ->\t [%x,%x,%x,%x]\n", u.a[0], u.a[1], u.a[2], u.a[3]);
       printf ("\texpect\t [%x,%x,%x,%x]\n", e[0], e[1], e[2], e[3]);
+#endif
+      abort ();
     }
-#else
-    abort ();
-#endif
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-psrld-2.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-psrld-2.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-psrld-2.c	(working copy)
@@ -45,15 +45,14 @@  TEST (void)
       } 
 
   if (check_union128i_d (u, e))
+    {
 #if DEBUG
-    {
       printf ("sse2_test_psrld_2; check_union128i_d failed\n");
       printf ("\tsrld\t([%x,%x,%x,%x], [%llx,%llx]\n", s.a[0], s.a[1], s.a[2],
 	      s.a[3], c.a[0], c.a[1]);
       printf ("\t ->\t [%x,%x,%x,%x]\n", u.a[0], u.a[1], u.a[2], u.a[3]);
       printf ("\texpect\t [%x,%x,%x,%x]\n", e[0], e[1], e[2], e[3]);
+#endif
+      abort ();
     }
-#else
-    abort ();
-#endif
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-psrldq-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-psrldq-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-psrldq-1.c	(working copy)
@@ -40,10 +40,11 @@  TEST (void)
     e[i] = src[i+N];
 
   if (check_union128i_b (u, e))
+    {
 #if DEBUG
-    {
       printf ("sse2_test_psrldq_1; check_union128i_b failed\n");
-      printf ("\tsrl\t([%x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x],\n",
+      printf ("\tsrl\t([%x,%x,%x,%x, %x,%x,%x,%x,"
+	      " %x,%x,%x,%x, %x,%x,%x,%x],\n",
 	      s.a[0], s.a[1], s.a[2], s.a[3], s.a[4], s.a[5], s.a[6], s.a[7],
 	      s.a[8], s.a[9], s.a[10], s.a[11], s.a[12], s.a[13], s.a[14],
 	      s.a[15]);
@@ -51,12 +52,11 @@  TEST (void)
 	      u.a[0], u.a[1], u.a[2], u.a[3], u.a[4], u.a[5], u.a[6], u.a[7],
 	      u.a[8], u.a[9], u.a[10], u.a[11], u.a[12], u.a[13], u.a[14],
 	      u.a[15]);
-      printf (
-	  "\texpect\t [%x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x]\n",
-	  e[0], e[1], e[2], e[3], e[4], e[5], e[6], e[7], e[8], e[9], e[10],
-	  e[11], e[12], e[13], e[14], e[15]);
+      printf ("\texpect\t [%x,%x,%x,%x, %x,%x,%x,%x,"
+	      " %x,%x,%x,%x, %x,%x,%x,%x]\n",
+	      e[0], e[1], e[2], e[3], e[4], e[5], e[6], e[7], e[8], e[9],
+	      e[10], e[11], e[12], e[13], e[14], e[15]);
+#endif
+      abort ();
     }
-#else
-    abort ();
-#endif
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-psubusb-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-psubusb-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-psubusb-1.c	(working copy)
@@ -47,28 +47,27 @@  TEST (void)
     }
 
   if (check_union128i_b (u, e))
+    {
 #if DEBUG
-    {
       printf ("sse2_test_psubusb_1; check_union128i_b failed\n");
-      printf (
-	  "\tadds\t([%x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x],\n",
+      printf ("\tadds\t([%x,%x,%x,%x, %x,%x,%x,%x,"
+	      " %x,%x,%x,%x, %x,%x,%x,%x],\n",
 	      s1.a[0], s1.a[1], s1.a[2], s1.a[3], s1.a[4], s1.a[5], s1.a[6],
-	      s1.a[7], s1.a[8], s1.a[9], s1.a[10], s1.a[11], s1.a[12], s1.a[13],
-	      s1.a[14], s1.a[15]);
+	      s1.a[7], s1.a[8], s1.a[9], s1.a[10], s1.a[11], s1.a[12],
+	      s1.a[13], s1.a[14], s1.a[15]);
       printf ("\t\t [%x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x])\n",
 	      s2.a[0], s2.a[1], s2.a[2], s2.a[3], s2.a[4], s2.a[5], s2.a[6],
-	      s2.a[7], s2.a[8], s2.a[9], s2.a[10], s2.a[11], s2.a[12], s2.a[13],
-	      s2.a[14], s2.a[15]);
+	      s2.a[7], s2.a[8], s2.a[9], s2.a[10], s2.a[11], s2.a[12],
+	      s2.a[13], s2.a[14], s2.a[15]);
       printf ("\t ->\t [%x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x]\n",
 	      u.a[0], u.a[1], u.a[2], u.a[3], u.a[4], u.a[5], u.a[6], u.a[7],
 	      u.a[8], u.a[9], u.a[10], u.a[11], u.a[12], u.a[13], u.a[14],
 	      u.a[15]);
-      printf (
-	  "\texpect\t [%x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x, %x,%x,%x,%x]\n",
-	  e[0], e[1], e[2], e[3], e[4], e[5], e[6], e[7], e[8], e[9], e[10],
-	  e[11], e[12], e[13], e[14], e[15]);
+      printf ("\texpect\t [%x,%x,%x,%x, %x,%x,%x,%x,"
+	      " %x,%x,%x,%x, %x,%x,%x,%x]\n",
+	      e[0], e[1], e[2], e[3], e[4], e[5], e[6], e[7], e[8], e[9],
+	      e[10], e[11], e[12], e[13], e[14], e[15]);
+#endif
+      abort ();
     }
-#else
-    abort ();
-#endif
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-sqrtpd-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-sqrtpd-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-sqrtpd-1.c	(working copy)
@@ -42,13 +42,12 @@  TEST (void)
     }
 
   if (check_union128d (u, e))
+    {
 #if DEBUG
-  {
       printf ("sse2_test_sqrt_pd_1; check_union128d failed\n");
       printf ("\t [%f,%f] -> [%f,%f]\n", s1.a[0], s1.a[1], u.a[0], u.a[1]);
       printf ("\t expect [%f,%f]\n", e[0], e[1]);
-  }
-#else
-    abort ();
 #endif
+      abort ();
+    }
 }
Index: gcc/testsuite/gcc.target/powerpc/sse2-subsd-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/sse2-subsd-1.c	(revision 265464)
+++ gcc/testsuite/gcc.target/powerpc/sse2-subsd-1.c	(working copy)
@@ -37,14 +37,13 @@  TEST (void)
   e[1] = s1.a[1];
 
   if (check_union128d (u, e))
+    {
 #if DEBUG
-  {
       printf ("sse2_test_subsd_1; check_union128d failed\n");
       printf ("\t [%f,%f] - [%f,%f] -> [%f,%f]\n", s1.a[0], s1.a[1], s2.a[0],
 	      s2.a[1], u.a[0], u.a[1]);
       printf ("\t expect [%f,%f]\n", e[0], e[1]);
-  }
-#else
-    abort ();
 #endif
+      abort ();
+    }
 }