optabs.c (expand_vector_binop, [...]): Don't assume GET_MODE_UNIT_SIZE (mode) == UNITS_PER_WORD.

gcc:
	* optabs.c (expand_vector_binop, expand_vector_unop): Don't assume
	GET_MODE_UNIT_SIZE (mode) == UNITS_PER_WORD.
gcc/testsuite:
	* gcc.c-torture/execute/simd-2.c: New test.

From-SVN: r54994

4 files changed, 70 insertions, 8 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 541c41a..735d56f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,4 +1,7 @@
-Tue Jun 25 20:59:56 2002  J"orn Rennecke <joern.rennecke@superh.com>
+Tue Jun 25 21:51:13 2002  J"orn Rennecke <joern.rennecke@superh.com>
+
+	* optabs.c (expand_vector_binop, expand_vector_unop): Don't assume
+	GET_MODE_UNIT_SIZE (mode) == UNITS_PER_WORD.
 
 	* config/sh/lib1funcs.asm (udivdi3): Make first divide step 
 	produce a 32 bit result before normalization, then normalize with a
diff --git a/gcc/optabs.c b/gcc/optabs.c
index 61990e3..d3568b2 100644
--- a/gcc/optabs.c
+++ b/gcc/optabs.c
@@ -1924,13 +1924,14 @@ expand_vector_binop (mode, binoptab, op0, op1, target, unsignedp, methods)
      enum optab_methods methods;
 {
   enum machine_mode submode;
-  int elts, i;
+  int elts, subsize, i;
   rtx t, a, b, res, seq;
   enum mode_class class;
 
   class = GET_MODE_CLASS (mode);
 
   submode = GET_MODE_INNER (mode);
+  subsize = GET_MODE_UNIT_SIZE (mode);
   elts = GET_MODE_NUNITS (mode);
 
   if (!target)
@@ -1951,11 +1952,11 @@ expand_vector_binop (mode, binoptab, op0, op1, target, unsignedp, methods)
       for (i = 0; i < elts; ++i)
 	{
 	  t = simplify_gen_subreg (submode, target, mode,
-				   i * UNITS_PER_WORD);
+				   i * subsize);
 	  a = simplify_gen_subreg (submode, op0, mode,
-				   i * UNITS_PER_WORD);
+				   i * subsize);
 	  b = simplify_gen_subreg (submode, op1, mode,
-				   i * UNITS_PER_WORD);
+				   i * subsize);
 
 	  if (binoptab->code == DIV)
 	    {
@@ -1999,10 +2000,11 @@ expand_vector_unop (mode, unoptab, op0, target, unsignedp)
      int unsignedp;
 {
   enum machine_mode submode;
-  int elts, i;
+  int elts, subsize, i;
   rtx t, a, res, seq;
 
   submode = GET_MODE_INNER (mode);
+  subsize = GET_MODE_UNIT_SIZE (mode);
   elts = GET_MODE_NUNITS (mode);
 
   if (!target)
@@ -2016,8 +2018,8 @@ expand_vector_unop (mode, unoptab, op0, target, unsignedp)
 
   for (i = 0; i < elts; ++i)
     {
-      t = simplify_gen_subreg (submode, target, mode, i * UNITS_PER_WORD);
-      a = simplify_gen_subreg (submode, op0, mode, i * UNITS_PER_WORD);
+      t = simplify_gen_subreg (submode, target, mode, i * subsize);
+      a = simplify_gen_subreg (submode, op0, mode, i * subsize);
 
       res = expand_unop (submode, unoptab, a, t, unsignedp);
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6988b9c..dacb054 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jun 25 21:50:38 2002  J"orn Rennecke <joern.rennecke@superh.com>
+
+	* gcc.c-torture/execute/simd-2.c: New test.
+
 2002-06-25  Neil Booth  <neil@daikokuya.co.uk>
 
 	* gcc.dg/cpp/mi7.c, gcc.dg/cpp/mi7a.h, gcc.dg/cpp/mi7b.h,
diff --git a/gcc/testsuite/gcc.c-torture/execute/simd-2.c b/gcc/testsuite/gcc.c-torture/execute/simd-2.c
new file mode 100644
index 0000000..258477e
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/simd-2.c
@@ -0,0 +1,53 @@
+/* 
+   Purpose: Test generic SIMD support, V8HImode.  This test should work
+   regardless of if the target has SIMD instructions.
+*/
+
+typedef int __attribute__((mode(V8HI))) vecint;
+
+vecint i = { 150, 100, 150, 200 };
+vecint j = { 10, 13, 20, 30 };
+vecint k;
+
+union {
+  vecint v;
+  short i[8];
+} res;
+
+/* This should go away once we can use == and != on vector types.  */
+void
+verify (int a1, int a2, int a3, int a4,
+	int b1, int b2, int b3, int b4)
+{
+  if (a1 != b1
+      || a2 != b2
+      || a3 != b3
+      || a4 != b4)
+    abort ();
+}
+
+int
+main ()
+{
+  k = i + j;
+  res.v = k;
+
+  verify (res.i[0], res.i[1], res.i[2], res.i[3], 160, 113, 170, 230);
+
+  k = i * j;
+  res.v = k;
+
+  verify (res.i[0], res.i[1], res.i[2], res.i[3], 1500, 1300, 3000, 6000);
+
+  k = i / j;
+  res.v = k;
+
+  verify (res.i[0], res.i[1], res.i[2], res.i[3], 15, 7, 7, 6);
+
+  k = -i;
+  res.v = k;
+  verify (res.i[0], res.i[1], res.i[2], res.i[3],
+	  -150, -100, -150, -200);
+
+  exit (0);
+}