2006-10-27 Joel Schopp <jschopp@austin.ibm.com>

        * libc/machine/spu/memcpy.c: Override generic function with vectorized
        version optimized for the cell spu.
        * libc/machine/spu/memmove.c: Ditto.
        * libc/machine/spu/memset.c: Ditto.
        * libc/machine/spu/strcat.c: Ditto.
        * libc/machine/spu/strchr.c: Ditto.
        * libc/machine/spu/strcmp.c: Ditto.
        * libc/machine/spu/strcpy.c: Ditto.
        * libc/machine/spu/strcspn.c: Ditto.
        * libc/machine/spu/strlen.c: Ditto.
        * libc/machine/spu/strncat.c: Ditto.
        * libc/machine/spu/strncmp.c: Ditto.
        * libc/machine/spu/strncpy.c: Ditto.
        * libc/machine/spu/strpbrk.c: Ditto.
        * libc/machine/spu/strrchr.c: Ditto.
        * libc/machine/spu/strspn.c: Ditto.
        * libc/machine/spu/strxfrm.c: Ditto.
        * libc/machine/spu/vec_literal.h: Add abstraction of vector literals,
        removing altivec style initializers.
        * libc/machine/spu/Makefile.am: Add new files to list so they build
        * libc/machine/spu/Makefile.in: Regenerate from new Makefile.am

1 files changed, 96 insertions, 0 deletions

diff --git a/newlib/libc/machine/spu/strcspn.c b/newlib/libc/machine/spu/strcspn.c
new file mode 100644
index 000000000..5f75a290a
--- /dev/null
+++ b/newlib/libc/machine/spu/strcspn.c
@@ -0,0 +1,96 @@
+/*
+  (C) Copyright 2001,2006,
+  International Business Machines Corporation,
+  Sony Computer Entertainment, Incorporated,
+  Toshiba Corporation,
+
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+    * Neither the names of the copyright holders nor the names of their
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.
+*/
+#include <spu_intrinsics.h>
+#include <stddef.h>
+#include "vec_literal.h"
+
+/* Computes the length of the maximum initial segement
+ * of the string pointed to by s1 which consists entirely
+ * of characters not contained in the string pointed to by s2.
+ */
+size_t strcspn(const char *s1, const char *s2)
+{
+  size_t len, cnt;
+  unsigned int offset;
+  vec_uchar16 shuffle, match, initial_splat, splat;
+  vec_uchar16 data1, data2, dataA, dataB, *ptr1, *ptr2;
+
+  ptr1 = (vec_uchar16 *)s1;
+
+  offset = (unsigned int)(s1) & 15;
+  shuffle = (vec_uchar16)spu_add((vec_uint4)spu_splats((unsigned char) offset),
+				 VEC_LITERAL(vec_uint4, 0x0010203, 0x04050607, 0x08090A0B, 0x0C0D0E0F));
+
+  len = 0;
+
+  dataA = *ptr1++;
+  dataB = *ptr1++;
+
+  initial_splat = spu_splats((unsigned char)((unsigned int)(s2) & 0xF));
+
+  /* For each quadword of the string s1.
+   */
+  do {
+    data1 = spu_shuffle(dataA, dataB, shuffle);
+
+
+    ptr2 = (vec_uchar16 *)s2;
+    data2 = *ptr2;
+    data2 = spu_shuffle(data2, data2, initial_splat);
+    ptr2 = (vec_uchar16 *)((unsigned int)(ptr2) + 1);
+    splat = initial_splat;
+
+    match = spu_cmpeq(data1, 0);
+
+    /* For each character of s2, compare agains a quadword of s1,
+     * accumulating match success in the variable match.
+     */
+    while (spu_extract((vec_uint4)data2, 0)) {
+      match = spu_or(match, spu_cmpeq(data1, data2));
+
+      splat = spu_and((vec_uchar16)(spu_add((vec_uint4)splat, VEC_SPLAT_U32(0x01010101))), 0xF);
+
+      data2 = *ptr2;
+      data2 = spu_shuffle(data2, data2, splat);
+      ptr2 = (vec_uchar16 *)((unsigned int)(ptr2) + 1);
+    }
+
+    cnt = spu_extract(spu_cntlz(spu_gather(match)), 0);
+    len = (len - 16) + cnt;
+
+    dataA = dataB;
+    dataB = *ptr1++;
+  } while (cnt == 32);
+
+  return (len);
+}