From: Chris Li <chrisl@vmware.com>
Date: Wed, 14 Jul 2010 13:19:11 +0000 (+0100)
Subject: llvmpipe: Addi ssse3 swizzling for B8G8R8A8_UNORM.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bed78862d4db044a87d6c3808548abd6df95dd7d;p=mesa.git

llvmpipe: Addi ssse3 swizzling for B8G8R8A8_UNORM.
---

diff --git a/src/gallium/drivers/llvmpipe/SConscript b/src/gallium/drivers/llvmpipe/SConscript
index 543d42dadd2..548423cb474 100644
--- a/src/gallium/drivers/llvmpipe/SConscript
+++ b/src/gallium/drivers/llvmpipe/SConscript
@@ -23,6 +23,14 @@ env.Depends('lp_tile_soa.c', [
     '#src/gallium/auxiliary/util/u_format_pack.py', 
 ])
 
+
+# Only enable SSSE3 for lp_tile_soa_sse3.c
+ssse3_env = env.Clone()
+if env['gcc'] and env['machine'] in ('x86', 'x86_64'):
+    ssse3_env.Append(CCFLAGS = ['-mssse3'])
+lp_tile_soa_os = ssse3_env.SharedObject('lp_tile_soa.c')
+
+
 llvmpipe = env.ConvenienceLibrary(
 	target = 'llvmpipe',
 	source = [
@@ -66,7 +74,7 @@ llvmpipe = env.ConvenienceLibrary(
 		'lp_tex_sample.c',
 		'lp_texture.c',
 		'lp_tile_image.c',
-		'lp_tile_soa.c',
+        lp_tile_soa_os,
 	])
 
 
diff --git a/src/gallium/drivers/llvmpipe/lp_tile_shuffle_mask.py b/src/gallium/drivers/llvmpipe/lp_tile_shuffle_mask.py
new file mode 100644
index 00000000000..ea2fc0f3758
--- /dev/null
+++ b/src/gallium/drivers/llvmpipe/lp_tile_shuffle_mask.py
@@ -0,0 +1,32 @@
+
+tile =  [[0,1,4,5],
+	 [2,3,6,7],
+	 [8,9,12,13],
+	 [10,11,14,15]]
+shift = 0
+align = 1
+value = 0L
+holder = []
+
+import sys
+
+basemask = [0x
+fd = sys.stdout
+indent = " "*9
+for c in range(4):
+   fd.write(indent + "*pdst++ = \n");
+   for l,line in enumerate(tile):
+	fd.write(indent + "   %s_mm_shuffle_epi8(line%d, (__m128i){"%(l and '+' or ' ',l))
+	for i,pos in enumerate(line):
+	    mask = 0x00ffffffff & (~(0xffL << shift))
+	    value = mask | ((pos) << shift)
+	    holder.append(value)
+            if holder and (i + 1) %2 == 0:
+		fd.write("0x%8.0x"%(holder[0] + (holder[1] << 32)))
+		holder = []
+		if (i) %4 == 1:
+			fd.write( ',')
+	        
+        fd.write("})%s\n"%((l == 3) and ';' or ''))
+   print
+   shift += 8
diff --git a/src/gallium/drivers/llvmpipe/lp_tile_soa.py b/src/gallium/drivers/llvmpipe/lp_tile_soa.py
index bf70c936b4b..dc947c43916 100644
--- a/src/gallium/drivers/llvmpipe/lp_tile_soa.py
+++ b/src/gallium/drivers/llvmpipe/lp_tile_soa.py
@@ -289,6 +289,175 @@ def generate_format_write(format, src_channel, src_native_type, src_suffix):
     print
     
 
+def generate_ssse3():
+    print '''
+#ifdef PIPE_ARCH_SSSE3
+
+#include <tmmintrin.h>
+
+static void
+lp_tile_b8g8r8a8_unorm_swizzle_4ub_ssse3(uint8_t *dst,
+                                         const uint8_t *src, unsigned src_stride,
+                                         unsigned x0, unsigned y0)
+{
+
+   unsigned x, y;
+   __m128i *pdst = (__m128i*) dst;
+   const uint8_t *ysrc0 = src + y0*src_stride + x0*sizeof(uint32_t);
+   unsigned int tile_stridex = src_stride*(TILE_VECTOR_HEIGHT - 1) - sizeof(uint32_t)*TILE_VECTOR_WIDTH;
+   unsigned int tile_stridey = src_stride*TILE_VECTOR_HEIGHT;
+
+   const __m128i shuffle00 = _mm_setr_epi8(0x02,0x06,0xff,0xff,0x0a,0x0e,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff);
+   const __m128i shuffle01 = _mm_setr_epi8(0x01,0x05,0xff,0xff,0x09,0x0d,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff);
+   const __m128i shuffle02 = _mm_setr_epi8(0x00,0x04,0xff,0xff,0x08,0x0c,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff);
+   const __m128i shuffle03 = _mm_setr_epi8(0x03,0x07,0xff,0xff,0x0b,0x0f,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff);
+
+   const __m128i shuffle10 = _mm_setr_epi8(0xff,0xff,0x02,0x06,0xff,0xff,0x0a,0x0e,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff);
+   const __m128i shuffle11 = _mm_setr_epi8(0xff,0xff,0x01,0x05,0xff,0xff,0x09,0x0d,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff);
+   const __m128i shuffle12 = _mm_setr_epi8(0xff,0xff,0x00,0x04,0xff,0xff,0x08,0x0c,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff);
+   const __m128i shuffle13 = _mm_setr_epi8(0xff,0xff,0x03,0x07,0xff,0xff,0x0b,0x0f,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff);
+
+   const __m128i shuffle20 = _mm_setr_epi8(0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x02,0x06,0xff,0xff,0x0a,0x0e,0xff,0xff);
+   const __m128i shuffle21 = _mm_setr_epi8(0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x05,0xff,0xff,0x09,0x0d,0xff,0xff);
+   const __m128i shuffle22 = _mm_setr_epi8(0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x04,0xff,0xff,0x08,0x0c,0xff,0xff);
+   const __m128i shuffle23 = _mm_setr_epi8(0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x07,0xff,0xff,0x0b,0x0f,0xff,0xff);
+
+   const __m128i shuffle30 = _mm_setr_epi8(0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x02,0x06,0xff,0xff,0x0a,0x0e);
+   const __m128i shuffle31 = _mm_setr_epi8(0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x05,0xff,0xff,0x09,0x0d);
+   const __m128i shuffle32 = _mm_setr_epi8(0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x04,0xff,0xff,0x08,0x0c);
+   const __m128i shuffle33 = _mm_setr_epi8(0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x07,0xff,0xff,0x0b,0x0f);
+
+   for (y = 0; y < TILE_SIZE; y += TILE_VECTOR_HEIGHT) {
+      __m128i line0 = *(__m128i*)ysrc0;
+      const uint8_t *ysrc = ysrc0 + src_stride;
+      ysrc0 += tile_stridey;
+
+      for (x = 0; x < TILE_SIZE; x += TILE_VECTOR_WIDTH) {
+         __m128i r, g, b, a, line1;
+         line1 = *(__m128i*)ysrc;
+         PIPE_READ_WRITE_BARRIER();
+         ysrc += src_stride;
+         r = _mm_shuffle_epi8(line0, shuffle00);
+         g = _mm_shuffle_epi8(line0, shuffle01);
+         b = _mm_shuffle_epi8(line0, shuffle02);
+         a = _mm_shuffle_epi8(line0, shuffle03);
+
+         line0 = *(__m128i*)ysrc;
+         PIPE_READ_WRITE_BARRIER();
+         ysrc += src_stride;
+         r = _mm_or_si128(r, _mm_shuffle_epi8(line1, shuffle10));
+         g = _mm_or_si128(g, _mm_shuffle_epi8(line1, shuffle11));
+         b = _mm_or_si128(b, _mm_shuffle_epi8(line1, shuffle12));
+         a = _mm_or_si128(a, _mm_shuffle_epi8(line1, shuffle13));
+
+         line1 = *(__m128i*)ysrc;
+         PIPE_READ_WRITE_BARRIER();
+         ysrc -= tile_stridex;
+         r = _mm_or_si128(r, _mm_shuffle_epi8(line0, shuffle20));
+         g = _mm_or_si128(g, _mm_shuffle_epi8(line0, shuffle21));
+         b = _mm_or_si128(b, _mm_shuffle_epi8(line0, shuffle22));
+         a = _mm_or_si128(a, _mm_shuffle_epi8(line0, shuffle23));
+
+         if (x + 1 < TILE_SIZE) {
+            line0 = *(__m128i*)ysrc;
+            ysrc += src_stride;
+         }
+
+         PIPE_READ_WRITE_BARRIER();
+         r = _mm_or_si128(r, _mm_shuffle_epi8(line1, shuffle30));
+         g = _mm_or_si128(g, _mm_shuffle_epi8(line1, shuffle31));
+         b = _mm_or_si128(b, _mm_shuffle_epi8(line1, shuffle32));
+         a = _mm_or_si128(a, _mm_shuffle_epi8(line1, shuffle33));
+
+         *pdst++ = r;
+         *pdst++ = g;
+         *pdst++ = b;
+         *pdst++ = a;
+      }
+   }
+
+}
+
+static void
+lp_tile_b8g8r8a8_unorm_unswizzle_4ub_ssse3(const uint8_t *src,
+                                          uint8_t *dst, unsigned dst_stride,
+                                          unsigned x0, unsigned y0)
+{
+   unsigned int x, y;
+   const __m128i *psrc = (__m128i*) src;
+   const __m128i *end = (__m128i*) (src + (y0 + TILE_SIZE - 1)*dst_stride + (x0 + TILE_SIZE - 1)*sizeof(uint32_t));
+   uint8_t *pdst = dst + y0 * dst_stride + x0 * sizeof(uint32_t);
+   __m128i c0 = *psrc++;
+   __m128i c1;
+
+   const __m128i shuffle00 = _mm_setr_epi8(0xff,0xff,0x00,0xff,0xff,0xff,0x01,0xff,0xff,0xff,0x04,0xff,0xff,0xff,0x05,0xff);
+   const __m128i shuffle01 = _mm_setr_epi8(0xff,0xff,0x02,0xff,0xff,0xff,0x03,0xff,0xff,0xff,0x06,0xff,0xff,0xff,0x07,0xff);
+   const __m128i shuffle02 = _mm_setr_epi8(0xff,0xff,0x08,0xff,0xff,0xff,0x09,0xff,0xff,0xff,0x0c,0xff,0xff,0xff,0x0d,0xff);
+   const __m128i shuffle03 = _mm_setr_epi8(0xff,0xff,0x0a,0xff,0xff,0xff,0x0b,0xff,0xff,0xff,0x0e,0xff,0xff,0xff,0x0f,0xff);
+
+   const __m128i shuffle10 = _mm_setr_epi8(0xff,0x00,0xff,0xff,0xff,0x01,0xff,0xff,0xff,0x04,0xff,0xff,0xff,0x05,0xff,0xff);
+   const __m128i shuffle11 = _mm_setr_epi8(0xff,0x02,0xff,0xff,0xff,0x03,0xff,0xff,0xff,0x06,0xff,0xff,0xff,0x07,0xff,0xff);
+   const __m128i shuffle12 = _mm_setr_epi8(0xff,0x08,0xff,0xff,0xff,0x09,0xff,0xff,0xff,0x0c,0xff,0xff,0xff,0x0d,0xff,0xff);
+   const __m128i shuffle13 = _mm_setr_epi8(0xff,0x0a,0xff,0xff,0xff,0x0b,0xff,0xff,0xff,0x0e,0xff,0xff,0xff,0x0f,0xff,0xff);
+
+   const __m128i shuffle20 = _mm_setr_epi8(0x00,0xff,0xff,0xff,0x01,0xff,0xff,0xff,0x04,0xff,0xff,0xff,0x05,0xff,0xff,0xff);
+   const __m128i shuffle21 = _mm_setr_epi8(0x02,0xff,0xff,0xff,0x03,0xff,0xff,0xff,0x06,0xff,0xff,0xff,0x07,0xff,0xff,0xff);
+   const __m128i shuffle22 = _mm_setr_epi8(0x08,0xff,0xff,0xff,0x09,0xff,0xff,0xff,0x0c,0xff,0xff,0xff,0x0d,0xff,0xff,0xff);
+   const __m128i shuffle23 = _mm_setr_epi8(0x0a,0xff,0xff,0xff,0x0b,0xff,0xff,0xff,0x0e,0xff,0xff,0xff,0x0f,0xff,0xff,0xff);
+
+   const __m128i shuffle30 = _mm_setr_epi8(0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x01,0xff,0xff,0xff,0x04,0xff,0xff,0xff,0x05);
+   const __m128i shuffle31 = _mm_setr_epi8(0xff,0xff,0xff,0x02,0xff,0xff,0xff,0x03,0xff,0xff,0xff,0x06,0xff,0xff,0xff,0x07);
+   const __m128i shuffle32 = _mm_setr_epi8(0xff,0xff,0xff,0x08,0xff,0xff,0xff,0x09,0xff,0xff,0xff,0x0c,0xff,0xff,0xff,0x0d);
+   const __m128i shuffle33 = _mm_setr_epi8(0xff,0xff,0xff,0x0a,0xff,0xff,0xff,0x0b,0xff,0xff,0xff,0x0e,0xff,0xff,0xff,0x0f);
+
+   for (y = 0; y < TILE_SIZE; y += TILE_VECTOR_HEIGHT) {
+      __m128i *tile = (__m128i*) pdst;
+      pdst += dst_stride * TILE_VECTOR_HEIGHT;
+      for (x = 0; x < TILE_SIZE; x += TILE_VECTOR_WIDTH) {
+         uint8_t *linep = (uint8_t*) (tile++);
+         __m128i line0, line1, line2, line3;
+
+         c1 = *psrc++; /* r */
+         PIPE_READ_WRITE_BARRIER();
+         line0 = _mm_shuffle_epi8(c0, shuffle00);
+         line1 = _mm_shuffle_epi8(c0, shuffle01);
+         line2 = _mm_shuffle_epi8(c0, shuffle02);
+         line3 = _mm_shuffle_epi8(c0, shuffle03);
+
+         c0 = *psrc++; /* g */
+         PIPE_READ_WRITE_BARRIER();
+         line0 = _mm_or_si128(line0, _mm_shuffle_epi8(c1, shuffle10));
+         line1 = _mm_or_si128(line1, _mm_shuffle_epi8(c1, shuffle11));
+         line2 = _mm_or_si128(line2, _mm_shuffle_epi8(c1, shuffle12));
+         line3 = _mm_or_si128(line3, _mm_shuffle_epi8(c1, shuffle13));
+
+         c1 = *psrc++; /* b */
+         PIPE_READ_WRITE_BARRIER();
+         line0 = _mm_or_si128(line0, _mm_shuffle_epi8(c0, shuffle20));
+         line1 = _mm_or_si128(line1, _mm_shuffle_epi8(c0, shuffle21));
+         line2 = _mm_or_si128(line2, _mm_shuffle_epi8(c0, shuffle22));
+         line3 = _mm_or_si128(line3, _mm_shuffle_epi8(c0, shuffle23));
+
+         if (psrc != end)
+                 c0 = *psrc++; /* a */
+         PIPE_READ_WRITE_BARRIER();
+         line0 = _mm_or_si128(line0, _mm_shuffle_epi8(c1, shuffle30));
+         line1 = _mm_or_si128(line1, _mm_shuffle_epi8(c1, shuffle31));
+         line2 = _mm_or_si128(line2, _mm_shuffle_epi8(c1, shuffle32));
+         line3 = _mm_or_si128(line3, _mm_shuffle_epi8(c1, shuffle33));
+
+         *(__m128i*) (linep) = line0;
+         *(__m128i*) (((char*)linep) + dst_stride) = line1;
+         *(__m128i*) (((char*)linep) + 2 * dst_stride) = line2;
+         *(__m128i*) (((char*)linep) + 3 * dst_stride) = line3;
+      }
+   }
+}
+
+#endif /* PIPE_ARCH_SSSE3 */
+'''
+
+
 def generate_swizzle(formats, dst_channel, dst_native_type, dst_suffix):
     '''Generate the dispatch function to read pixels from any format'''
 
@@ -307,7 +476,15 @@ def generate_swizzle(formats, dst_channel, dst_native_type, dst_suffix):
     for format in formats:
         if is_format_supported(format):
             print '   case %s:' % format.name
-            print '      func = &lp_tile_%s_swizzle_%s;' % (format.short_name(), dst_suffix)
+            func_name = 'lp_tile_%s_swizzle_%s' % (format.short_name(), dst_suffix)
+            if format.name == 'PIPE_FORMAT_B8G8R8A8_UNORM':
+                print '#ifdef PIPE_ARCH_SSSE3'
+                print '      func = util_cpu_caps.has_ssse3 ? %s_ssse3 : %s;' % (func_name, func_name)
+                print '#else'
+                print '      func = %s;' % (func_name,)
+                print '#endif'
+            else:
+                print '      func = %s;' % (func_name,)
             print '      break;'
     print '   default:'
     print '      debug_printf("%s: unsupported format %s\\n", __FUNCTION__, util_format_name(format));'
@@ -337,7 +514,15 @@ def generate_unswizzle(formats, src_channel, src_native_type, src_suffix):
     for format in formats:
         if is_format_supported(format):
             print '   case %s:' % format.name
-            print '      func = &lp_tile_%s_unswizzle_%s;' % (format.short_name(), src_suffix)
+            func_name = 'lp_tile_%s_unswizzle_%s' % (format.short_name(), src_suffix)
+            if format.name == 'PIPE_FORMAT_B8G8R8A8_UNORM':
+                print '#ifdef PIPE_ARCH_SSSE3'
+                print '      func = util_cpu_caps.has_ssse3 ? %s_ssse3 : %s;' % (func_name, func_name)
+                print '#else'
+                print '      func = %s;' % (func_name,)
+                print '#endif'
+            else:
+                print '      func = %s;' % (func_name,)
             print '      break;'
     print '   default:'
     print '      debug_printf("%s: unsupported format %s\\n", __FUNCTION__, util_format_name(format));'
@@ -362,6 +547,7 @@ def main():
     print '#include "util/u_format.h"'
     print '#include "util/u_math.h"'
     print '#include "util/u_half.h"'
+    print '#include "util/u_cpu_detect.h"'
     print '#include "lp_tile_soa.h"'
     print
     print '#ifdef DEBUG'
@@ -391,6 +577,8 @@ def main():
     print '};'
     print
 
+    generate_ssse3()
+
     channel = Channel(UNSIGNED, True, 8)
     native_type = 'uint8_t'
     suffix = '4ub'