[Mplayer-cvslog] CVS: main/libmpeg2 idct_altivec.c,1.1,1.2
Arpi of Ize
arpi at mplayerhq.hu
Mon Jun 9 14:11:50 CEST 2003
Update of /cvsroot/mplayer/main/libmpeg2
In directory mail:/var/tmp.root/cvs-serv1727
Modified Files:
idct_altivec.c
Log Message:
libmpeg2-altivec patch by Magnus Damm <damm at opensource.se>:
Updated to version 1.19 from sourceforge
This version includes the gcc bugfix
The new file also ditches the old assembly version
and it must be built with correct altivec-flags
Index: idct_altivec.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpeg2/idct_altivec.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- idct_altivec.c 6 Apr 2003 16:41:49 -0000 1.1
+++ idct_altivec.c 9 Jun 2003 12:11:47 -0000 1.2
@@ -1,6 +1,6 @@
/*
* idct_altivec.c
- * Copyright (C) 2000-2002 Michel Lespinasse <walken at zoy.org>
+ * Copyright (C) 2000-2003 Michel Lespinasse <walken at zoy.org>
* Copyright (C) 1999-2000 Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
*
* This file is part of mpeg2dec, a free MPEG-2 video stream decoder.
@@ -21,513 +21,57 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef __ALTIVEC__
-
#include "config.h"
#ifdef ARCH_PPC
+#ifdef HAVE_ALTIVEC_H
+#include <altivec.h>
+#endif
#include <inttypes.h>
#include "mpeg2.h"
#include "mpeg2_internal.h"
#include "attributes.h"
-static const int16_t constants[5][8] ATTR_ALIGN(16) = {
- {23170, 13573, 6518, 21895, -23170, -21895, 32, 31},
- {16384, 22725, 21407, 19266, 16384, 19266, 21407, 22725},
- {22725, 31521, 29692, 26722, 22725, 26722, 29692, 31521},
- {21407, 29692, 27969, 25172, 21407, 25172, 27969, 29692},
- {19266, 26722, 25172, 22654, 19266, 22654, 25172, 26722}
-};
-
-/*
- * The asm code is generated with:
- *
- * gcc-2.95 -fvec -D__ALTIVEC__ -O9 -fomit-frame-pointer -mregnames -S
- * idct_altivec.c
- *
- * awk '{args=""; len=split ($2, arg, ",");
- * for (i=1; i<=len; i++) { a=arg[i]; if (i<len) a=a",";
- * args = args sprintf ("%-6s", a) }
- * printf ("\t\"\t%-16s%-24s\\n\"\n", $1, args) }' idct_altivec.s |
- * unexpand -a
- *
- * I then do some simple trimming on the function prolog/trailers
- */
-
-void mpeg2_idct_copy_altivec (int16_t * block, uint8_t * dest, int stride)
-{
- asm (" \n"
- "# stwu %r1, -128(%r1) \n"
- "# mflr %r0 \n"
- "# stw %r0, 132(%r1) \n"
- "# addi %r0, %r1, 128 \n"
- "# bl _savev25 \n"
-
- " addi %r9, %r3, 112 \n"
- " vspltish %v25, 4 \n"
- " vxor %v13, %v13, %v13 \n"
- " lis %r10, constants at ha \n"
- " lvx %v1, 0, %r9 \n"
- " la %r10, constants at l(%r10) \n"
- " lvx %v5, 0, %r3 \n"
- " addi %r9, %r3, 16 \n"
- " lvx %v8, 0, %r10 \n"
- " addi %r11, %r10, 32 \n"
- " lvx %v12, 0, %r9 \n"
- " lvx %v6, 0, %r11 \n"
- " addi %r8, %r3, 48 \n"
- " vslh %v1, %v1, %v25 \n"
- " addi %r9, %r3, 80 \n"
- " lvx %v11, 0, %r8 \n"
- " vslh %v5, %v5, %v25 \n"
- " lvx %v0, 0, %r9 \n"
- " addi %r11, %r10, 64 \n"
- " vsplth %v3, %v8, 2 \n"
- " lvx %v7, 0, %r11 \n"
- " addi %r9, %r3, 96 \n"
- " vslh %v12, %v12, %v25 \n"
- " vmhraddshs %v27, %v1, %v6, %v13 \n"
- " addi %r8, %r3, 32 \n"
- " vsplth %v2, %v8, 5 \n"
- " lvx %v1, 0, %r9 \n"
- " vslh %v11, %v11, %v25 \n"
- " addi %r3, %r3, 64 \n"
- " lvx %v9, 0, %r8 \n"
- " addi %r9, %r10, 48 \n"
- " vslh %v0, %v0, %v25 \n"
- " lvx %v4, 0, %r9 \n"
- " vmhraddshs %v31, %v12, %v6, %v13 \n"
- " addi %r10, %r10, 16 \n"
- " vmhraddshs %v30, %v0, %v7, %v13 \n"
- " lvx %v10, 0, %r3 \n"
- " vsplth %v19, %v8, 3 \n"
- " vmhraddshs %v15, %v11, %v7, %v13 \n"
- " lvx %v12, 0, %r10 \n"
- " vsplth %v6, %v8, 4 \n"
- " vslh %v1, %v1, %v25 \n"
- " vsplth %v11, %v8, 1 \n"
- " li %r9, 4 \n"
- " vslh %v9, %v9, %v25 \n"
- " vsplth %v7, %v8, 0 \n"
- " vmhraddshs %v18, %v1, %v4, %v13 \n"
- " vspltw %v8, %v8, 3 \n"
- " vsubshs %v0, %v13, %v27 \n"
- " vmhraddshs %v1, %v9, %v4, %v13 \n"
- " vmhraddshs %v17, %v3, %v31, %v0 \n"
- " vmhraddshs %v4, %v2, %v15, %v30 \n"
- " vslh %v10, %v10, %v25 \n"
- " vmhraddshs %v9, %v5, %v12, %v13 \n"
- " vspltish %v25, 6 \n"
- " vmhraddshs %v5, %v10, %v12, %v13 \n"
- " vmhraddshs %v28, %v19, %v30, %v15 \n"
- " vmhraddshs %v27, %v3, %v27, %v31 \n"
- " vsubshs %v0, %v13, %v18 \n"
- " vmhraddshs %v18, %v11, %v18, %v1 \n"
- " vaddshs %v30, %v17, %v4 \n"
- " vmhraddshs %v12, %v11, %v1, %v0 \n"
- " vsubshs %v4, %v17, %v4 \n"
- " vaddshs %v10, %v9, %v5 \n"
- " vsubshs %v17, %v27, %v28 \n"
- " vaddshs %v27, %v27, %v28 \n"
- " vsubshs %v1, %v9, %v5 \n"
- " vaddshs %v28, %v10, %v18 \n"
- " vsubshs %v18, %v10, %v18 \n"
- " vaddshs %v10, %v1, %v12 \n"
- " vsubshs %v1, %v1, %v12 \n"
- " vsubshs %v12, %v17, %v4 \n"
- " vaddshs %v4, %v17, %v4 \n"
- " vmhraddshs %v5, %v7, %v12, %v1 \n"
- " vmhraddshs %v26, %v6, %v4, %v10 \n"
- " vmhraddshs %v29, %v6, %v12, %v1 \n"
- " vmhraddshs %v14, %v7, %v4, %v10 \n"
- " vsubshs %v12, %v18, %v30 \n"
- " vaddshs %v9, %v28, %v27 \n"
- " vaddshs %v16, %v18, %v30 \n"
- " vsubshs %v10, %v28, %v27 \n"
- " vmrglh %v31, %v9, %v12 \n"
- " vmrglh %v30, %v5, %v26 \n"
- " vmrglh %v15, %v14, %v29 \n"
- " vmrghh %v5, %v5, %v26 \n"
- " vmrglh %v27, %v16, %v10 \n"
- " vmrghh %v9, %v9, %v12 \n"
- " vmrghh %v18, %v16, %v10 \n"
- " vmrghh %v1, %v14, %v29 \n"
- " vmrglh %v14, %v9, %v5 \n"
- " vmrglh %v16, %v31, %v30 \n"
- " vmrglh %v10, %v15, %v27 \n"
- " vmrghh %v9, %v9, %v5 \n"
- " vmrghh %v26, %v15, %v27 \n"
- " vmrglh %v27, %v16, %v10 \n"
- " vmrghh %v12, %v1, %v18 \n"
- " vmrglh %v29, %v1, %v18 \n"
- " vsubshs %v0, %v13, %v27 \n"
- " vmrghh %v5, %v31, %v30 \n"
- " vmrglh %v31, %v9, %v12 \n"
- " vmrglh %v30, %v5, %v26 \n"
- " vmrglh %v15, %v14, %v29 \n"
- " vmhraddshs %v17, %v3, %v31, %v0 \n"
- " vmrghh %v18, %v16, %v10 \n"
- " vmhraddshs %v27, %v3, %v27, %v31 \n"
- " vmhraddshs %v4, %v2, %v15, %v30 \n"
- " vmrghh %v1, %v14, %v29 \n"
- " vmhraddshs %v28, %v19, %v30, %v15 \n"
- " vmrghh %v0, %v9, %v12 \n"
- " vsubshs %v13, %v13, %v18 \n"
- " vmrghh %v5, %v5, %v26 \n"
- " vmhraddshs %v18, %v11, %v18, %v1 \n"
- " vaddshs %v9, %v0, %v8 \n"
- " vaddshs %v30, %v17, %v4 \n"
- " vmhraddshs %v12, %v11, %v1, %v13 \n"
- " vsubshs %v4, %v17, %v4 \n"
- " vaddshs %v10, %v9, %v5 \n"
- " vsubshs %v17, %v27, %v28 \n"
- " vaddshs %v27, %v27, %v28 \n"
- " vsubshs %v1, %v9, %v5 \n"
- " vaddshs %v28, %v10, %v18 \n"
- " vsubshs %v18, %v10, %v18 \n"
- " vaddshs %v10, %v1, %v12 \n"
- " vsubshs %v1, %v1, %v12 \n"
- " vsubshs %v12, %v17, %v4 \n"
- " vaddshs %v4, %v17, %v4 \n"
- " vaddshs %v9, %v28, %v27 \n"
- " vmhraddshs %v14, %v7, %v4, %v10 \n"
- " vsrah %v9, %v9, %v25 \n"
- " vmhraddshs %v5, %v7, %v12, %v1 \n"
- " vpkshus %v0, %v9, %v9 \n"
- " vmhraddshs %v29, %v6, %v12, %v1 \n"
- " stvewx %v0, 0, %r4 \n"
- " vaddshs %v16, %v18, %v30 \n"
- " vsrah %v31, %v14, %v25 \n"
- " stvewx %v0, %r9, %r4 \n"
- " add %r4, %r4, %r5 \n"
- " vsrah %v15, %v16, %v25 \n"
- " vpkshus %v0, %v31, %v31 \n"
- " vsrah %v1, %v5, %v25 \n"
- " stvewx %v0, 0, %r4 \n"
- " vsubshs %v12, %v18, %v30 \n"
- " stvewx %v0, %r9, %r4 \n"
- " vmhraddshs %v26, %v6, %v4, %v10 \n"
- " vpkshus %v0, %v1, %v1 \n"
- " add %r4, %r4, %r5 \n"
- " vsrah %v5, %v12, %v25 \n"
- " stvewx %v0, 0, %r4 \n"
- " vsrah %v30, %v29, %v25 \n"
- " stvewx %v0, %r9, %r4 \n"
- " vsubshs %v10, %v28, %v27 \n"
- " vpkshus %v0, %v15, %v15 \n"
- " add %r4, %r4, %r5 \n"
- " stvewx %v0, 0, %r4 \n"
- " vsrah %v18, %v26, %v25 \n"
- " stvewx %v0, %r9, %r4 \n"
- " vsrah %v27, %v10, %v25 \n"
- " vpkshus %v0, %v5, %v5 \n"
- " add %r4, %r4, %r5 \n"
- " stvewx %v0, 0, %r4 \n"
- " stvewx %v0, %r9, %r4 \n"
- " vpkshus %v0, %v30, %v30 \n"
- " add %r4, %r4, %r5 \n"
- " stvewx %v0, 0, %r4 \n"
- " stvewx %v0, %r9, %r4 \n"
- " vpkshus %v0, %v18, %v18 \n"
- " add %r4, %r4, %r5 \n"
- " stvewx %v0, 0, %r4 \n"
- " stvewx %v0, %r9, %r4 \n"
- " add %r4, %r4, %r5 \n"
- " vpkshus %v0, %v27, %v27 \n"
- " stvewx %v0, 0, %r4 \n"
- " stvewx %v0, %r9, %r4 \n"
-
- "# addi %r0, %r1, 128 \n"
- "# bl _restv25 \n"
- "# lwz %r0, 132(%r1) \n"
- "# mtlr %r0 \n"
- "# la %r1, 128(%r1) \n"
-
- " vxor %v1, %v1, %v1 \n"
- " addi %r9, %r3, 16 \n"
- " stvx %v1, 0, %r3 \n"
- " stvx %v1, 0, %r9 \n"
- " addi %r11, %r3, 32 \n"
- " stvx %v1, 0, %r11 \n"
- " addi %r9, %r3, 48 \n"
- " stvx %v1, 0, %r9 \n"
- " addi %r11, %r3, -64 \n"
- " stvx %v1, 0, %r11 \n"
- " addi %r9, %r3, -48 \n"
- " stvx %v1, 0, %r9 \n"
- " addi %r11, %r3, -32 \n"
- " stvx %v1, 0, %r11 \n"
- " addi %r3, %r3, -16 \n"
- " stvx %v1, 0, %r3 \n"
- );
-}
-
-void mpeg2_idct_add_altivec (int last, int16_t * block,
- uint8_t * dest, int stride)
+typedef vector signed char vector_s8_t;
+typedef vector unsigned char vector_u8_t;
+typedef vector signed short vector_s16_t;
+typedef vector unsigned short vector_u16_t;
+typedef vector signed int vector_s32_t;
+typedef vector unsigned int vector_u32_t;
+
+#if defined(HAVE_ALTIVEC_H) && (__GNUC__ * 100 + __GNUC_MINOR__ < 303)
+/* work around gcc <3.3 vec_mergel bug */
+static inline vector_s16_t my_vec_mergel (vector_s16_t const A,
+ vector_s16_t const B)
{
- asm (" \n"
- "# stwu %r1, -192(%r1) \n"
- "# mflr %r0 \n"
- "# stw %r0, 196(%r1) \n"
- "# addi %r0, %r1, 192 \n"
- "# bl _savev21 \n"
-
- " addi %r9, %r4, 112 \n"
- " vspltish %v21, 4 \n"
- " vxor %v1, %v1, %v1 \n"
- " lvx %v13, 0, %r9 \n"
- " lis %r10, constants at ha \n"
- " vspltisw %v3, -1 \n"
- " la %r10, constants at l(%r10) \n"
- " lvx %v5, 0, %r4 \n"
- " addi %r9, %r4, 16 \n"
- " lvx %v8, 0, %r10 \n"
- " lvx %v12, 0, %r9 \n"
- " addi %r11, %r10, 32 \n"
- " lvx %v6, 0, %r11 \n"
- " addi %r8, %r4, 48 \n"
- " vslh %v13, %v13, %v21 \n"
- " addi %r9, %r4, 80 \n"
- " lvx %v11, 0, %r8 \n"
- " vslh %v5, %v5, %v21 \n"
- " lvx %v0, 0, %r9 \n"
- " addi %r11, %r10, 64 \n"
- " vsplth %v2, %v8, 2 \n"
- " lvx %v7, 0, %r11 \n"
- " vslh %v12, %v12, %v21 \n"
- " addi %r9, %r4, 96 \n"
- " vmhraddshs %v24, %v13, %v6, %v1 \n"
- " addi %r8, %r4, 32 \n"
- " vsplth %v17, %v8, 5 \n"
- " lvx %v13, 0, %r9 \n"
- " vslh %v11, %v11, %v21 \n"
- " addi %r4, %r4, 64 \n"
- " lvx %v10, 0, %r8 \n"
- " vslh %v0, %v0, %v21 \n"
- " addi %r9, %r10, 48 \n"
- " vmhraddshs %v31, %v12, %v6, %v1 \n"
- " lvx %v4, 0, %r9 \n"
- " addi %r10, %r10, 16 \n"
- " vmhraddshs %v26, %v0, %v7, %v1 \n"
- " lvx %v9, 0, %r4 \n"
- " vsplth %v16, %v8, 3 \n"
- " vmhraddshs %v22, %v11, %v7, %v1 \n"
- " lvx %v6, 0, %r10 \n"
- " lvsl %v19, 0, %r5 \n"
- " vsubshs %v12, %v1, %v24 \n"
- " lvsl %v0, %r6, %r5 \n"
- " vsplth %v11, %v8, 1 \n"
- " vslh %v10, %v10, %v21 \n"
- " vmrghb %v19, %v3, %v19 \n"
- " lvx %v15, 0, %r5 \n"
- " vslh %v13, %v13, %v21 \n"
- " vmrghb %v3, %v3, %v0 \n"
- " li %r9, 4 \n"
- " vmhraddshs %v14, %v2, %v31, %v12 \n"
- " vsplth %v7, %v8, 0 \n"
- " vmhraddshs %v23, %v13, %v4, %v1 \n"
- " vsplth %v18, %v8, 4 \n"
- " vmhraddshs %v27, %v10, %v4, %v1 \n"
- " vspltw %v8, %v8, 3 \n"
- " vmhraddshs %v12, %v17, %v22, %v26 \n"
- " vperm %v15, %v15, %v1, %v19 \n"
- " vslh %v9, %v9, %v21 \n"
- " vmhraddshs %v10, %v5, %v6, %v1 \n"
- " vspltish %v21, 6 \n"
- " vmhraddshs %v30, %v9, %v6, %v1 \n"
- " vmhraddshs %v26, %v16, %v26, %v22 \n"
- " vmhraddshs %v24, %v2, %v24, %v31 \n"
- " vmhraddshs %v31, %v11, %v23, %v27 \n"
- " vsubshs %v0, %v1, %v23 \n"
- " vaddshs %v23, %v14, %v12 \n"
- " vmhraddshs %v9, %v11, %v27, %v0 \n"
- " vsubshs %v12, %v14, %v12 \n"
- " vaddshs %v6, %v10, %v30 \n"
- " vsubshs %v14, %v24, %v26 \n"
- " vaddshs %v24, %v24, %v26 \n"
- " vsubshs %v13, %v10, %v30 \n"
- " vaddshs %v26, %v6, %v31 \n"
- " vsubshs %v31, %v6, %v31 \n"
- " vaddshs %v6, %v13, %v9 \n"
- " vsubshs %v13, %v13, %v9 \n"
- " vsubshs %v9, %v14, %v12 \n"
- " vaddshs %v12, %v14, %v12 \n"
- " vmhraddshs %v30, %v7, %v9, %v13 \n"
- " vmhraddshs %v25, %v18, %v12, %v6 \n"
- " vmhraddshs %v28, %v18, %v9, %v13 \n"
- " vmhraddshs %v29, %v7, %v12, %v6 \n"
- " vaddshs %v10, %v26, %v24 \n"
- " vsubshs %v5, %v31, %v23 \n"
- " vsubshs %v13, %v26, %v24 \n"
- " vaddshs %v4, %v31, %v23 \n"
- " vmrglh %v26, %v30, %v25 \n"
- " vmrglh %v31, %v10, %v5 \n"
- " vmrglh %v22, %v29, %v28 \n"
- " vmrghh %v30, %v30, %v25 \n"
- " vmrglh %v24, %v4, %v13 \n"
- " vmrghh %v10, %v10, %v5 \n"
- " vmrghh %v23, %v4, %v13 \n"
- " vmrghh %v27, %v29, %v28 \n"
- " vmrglh %v29, %v10, %v30 \n"
- " vmrglh %v4, %v31, %v26 \n"
- " vmrglh %v13, %v22, %v24 \n"
- " vmrghh %v10, %v10, %v30 \n"
- " vmrghh %v25, %v22, %v24 \n"
- " vmrglh %v24, %v4, %v13 \n"
- " vmrghh %v5, %v27, %v23 \n"
- " vmrglh %v28, %v27, %v23 \n"
- " vsubshs %v0, %v1, %v24 \n"
- " vmrghh %v30, %v31, %v26 \n"
- " vmrglh %v31, %v10, %v5 \n"
- " vmrglh %v26, %v30, %v25 \n"
- " vmrglh %v22, %v29, %v28 \n"
- " vmhraddshs %v14, %v2, %v31, %v0 \n"
- " vmrghh %v23, %v4, %v13 \n"
- " vmhraddshs %v24, %v2, %v24, %v31 \n"
- " vmhraddshs %v12, %v17, %v22, %v26 \n"
- " vmrghh %v27, %v29, %v28 \n"
- " vmhraddshs %v26, %v16, %v26, %v22 \n"
- " vmrghh %v0, %v10, %v5 \n"
- " vmhraddshs %v31, %v11, %v23, %v27 \n"
- " vmrghh %v30, %v30, %v25 \n"
- " vsubshs %v13, %v1, %v23 \n"
- " vaddshs %v10, %v0, %v8 \n"
- " vaddshs %v23, %v14, %v12 \n"
- " vsubshs %v12, %v14, %v12 \n"
- " vaddshs %v6, %v10, %v30 \n"
- " vsubshs %v14, %v24, %v26 \n"
- " vmhraddshs %v9, %v11, %v27, %v13 \n"
- " vaddshs %v24, %v24, %v26 \n"
- " vaddshs %v26, %v6, %v31 \n"
- " vsubshs %v13, %v10, %v30 \n"
- " vaddshs %v10, %v26, %v24 \n"
- " vsubshs %v31, %v6, %v31 \n"
- " vaddshs %v6, %v13, %v9 \n"
- " vsrah %v10, %v10, %v21 \n"
- " vsubshs %v13, %v13, %v9 \n"
- " vaddshs %v0, %v15, %v10 \n"
- " vsubshs %v9, %v14, %v12 \n"
- " vaddshs %v12, %v14, %v12 \n"
- " vpkshus %v15, %v0, %v0 \n"
- " stvewx %v15, 0, %r5 \n"
- " vaddshs %v4, %v31, %v23 \n"
- " vmhraddshs %v29, %v7, %v12, %v6 \n"
- " stvewx %v15, %r9, %r5 \n"
- " add %r5, %r5, %r6 \n"
- " vsubshs %v5, %v31, %v23 \n"
- " lvx %v15, 0, %r5 \n"
- " vmhraddshs %v30, %v7, %v9, %v13 \n"
- " vsrah %v22, %v4, %v21 \n"
- " vperm %v15, %v15, %v1, %v3 \n"
- " vmhraddshs %v28, %v18, %v9, %v13 \n"
- " vsrah %v31, %v29, %v21 \n"
- " vsubshs %v13, %v26, %v24 \n"
- " vaddshs %v0, %v15, %v31 \n"
- " vsrah %v27, %v30, %v21 \n"
- " vpkshus %v15, %v0, %v0 \n"
- " vsrah %v30, %v5, %v21 \n"
- " stvewx %v15, 0, %r5 \n"
- " vsrah %v26, %v28, %v21 \n"
- " stvewx %v15, %r9, %r5 \n"
- " vmhraddshs %v25, %v18, %v12, %v6 \n"
- " add %r5, %r5, %r6 \n"
- " vsrah %v24, %v13, %v21 \n"
- " lvx %v15, 0, %r5 \n"
- " vperm %v15, %v15, %v1, %v19 \n"
- " vsrah %v23, %v25, %v21 \n"
- " vaddshs %v0, %v15, %v27 \n"
- " vpkshus %v15, %v0, %v0 \n"
- " stvewx %v15, 0, %r5 \n"
- " stvewx %v15, %r9, %r5 \n"
- " add %r5, %r5, %r6 \n"
- " lvx %v15, 0, %r5 \n"
- " vperm %v15, %v15, %v1, %v3 \n"
- " vaddshs %v0, %v15, %v22 \n"
- " vpkshus %v15, %v0, %v0 \n"
- " stvewx %v15, 0, %r5 \n"
- " stvewx %v15, %r9, %r5 \n"
- " add %r5, %r5, %r6 \n"
- " lvx %v15, 0, %r5 \n"
- " vperm %v15, %v15, %v1, %v19 \n"
- " vaddshs %v0, %v15, %v30 \n"
- " vpkshus %v15, %v0, %v0 \n"
- " stvewx %v15, 0, %r5 \n"
- " stvewx %v15, %r9, %r5 \n"
- " add %r5, %r5, %r6 \n"
- " lvx %v15, 0, %r5 \n"
- " vperm %v15, %v15, %v1, %v3 \n"
- " vaddshs %v0, %v15, %v26 \n"
- " vpkshus %v15, %v0, %v0 \n"
- " stvewx %v15, 0, %r5 \n"
- " stvewx %v15, %r9, %r5 \n"
- " add %r5, %r5, %r6 \n"
- " lvx %v15, 0, %r5 \n"
- " vperm %v15, %v15, %v1, %v19 \n"
- " vaddshs %v0, %v15, %v23 \n"
- " vpkshus %v15, %v0, %v0 \n"
- " stvewx %v15, 0, %r5 \n"
- " stvewx %v15, %r9, %r5 \n"
- " add %r5, %r5, %r6 \n"
- " lvx %v15, 0, %r5 \n"
- " vperm %v15, %v15, %v1, %v3 \n"
- " vaddshs %v0, %v15, %v24 \n"
- " vpkshus %v15, %v0, %v0 \n"
- " stvewx %v15, 0, %r5 \n"
- " stvewx %v15, %r9, %r5 \n"
-
- "# addi %r0, %r1, 192 \n"
- "# bl _restv21 \n"
- "# lwz %r0, 196(%r1) \n"
- "# mtlr %r0 \n"
- "# la %r1, 192(%r1) \n"
-
- " addi %r9, %r4, 16 \n"
- " stvx %v1, 0, %r4 \n"
- " stvx %v1, 0, %r9 \n"
- " addi %r11, %r4, 32 \n"
- " stvx %v1, 0, %r11 \n"
- " addi %r9, %r4, 48 \n"
- " stvx %v1, 0, %r9 \n"
- " addi %r11, %r4, -64 \n"
- " stvx %v1, 0, %r11 \n"
- " addi %r9, %r4, -48 \n"
- " stvx %v1, 0, %r9 \n"
- " addi %r11, %r4, -32 \n"
- " stvx %v1, 0, %r11 \n"
- " addi %r4, %r4, -16 \n"
- " stvx %v1, 0, %r4 \n"
- );
+ static const vector_u8_t mergel = {
+ 0x08, 0x09, 0x18, 0x19, 0x0a, 0x0b, 0x1a, 0x1b,
+ 0x0c, 0x0d, 0x1c, 0x1d, 0x0e, 0x0f, 0x1e, 0x1f
+ };
+ return vec_perm (A, B, mergel);
}
-
-void mpeg2_idct_altivec_init (void)
-{
- extern uint8_t mpeg2_scan_norm[64];
- extern uint8_t mpeg2_scan_alt[64];
- int i, j;
-
- i = constants[0][0]; /* just pretending - keeps gcc happy */
-
- /* the altivec idct uses a transposed input, so we patch scan tables */
- for (i = 0; i < 64; i++) {
- j = mpeg2_scan_norm[i];
- mpeg2_scan_norm[i] = (j >> 3) | ((j & 7) << 3);
- j = mpeg2_scan_alt[i];
- mpeg2_scan_alt[i] = (j >> 3) | ((j & 7) << 3);
- }
-}
-
-#endif /* ARCH_PPC */
-
-#else /* __ALTIVEC__ */
-
-#define vector_s16_t vector signed short
-#define vector_u16_t vector unsigned short
-#define vector_s8_t vector signed char
-#define vector_u8_t vector unsigned char
-#define vector_s32_t vector signed int
-#define vector_u32_t vector unsigned int
+#undef vec_mergel
+#define vec_mergel my_vec_mergel
+#endif
+
+#ifdef HAVE_ALTIVEC_H /* gnu */
+#define VEC_S16(a,b,c,d,e,f,g,h) {a, b, c, d, e, f, g, h}
+#else /* apple */
+#define VEC_S16(a,b,c,d,e,f,g,h) (vector_s16_t) (a, b, c, d, e, f, g, h)
+#endif
+
+static const vector_s16_t constants ATTR_ALIGN(16) =
+ VEC_S16 (23170, 13573, 6518, 21895, -23170, -21895, 32, 31);
+static const vector_s16_t constants_1 ATTR_ALIGN(16) =
+ VEC_S16 (16384, 22725, 21407, 19266, 16384, 19266, 21407, 22725);
+static const vector_s16_t constants_2 ATTR_ALIGN(16) =
+ VEC_S16 (22725, 31521, 29692, 26722, 22725, 26722, 29692, 31521);
+static const vector_s16_t constants_3 ATTR_ALIGN(16) =
+ VEC_S16 (21407, 29692, 27969, 25172, 21407, 25172, 27969, 29692);
+static const vector_s16_t constants_4 ATTR_ALIGN(16) =
+ VEC_S16 (19266, 26722, 25172, 22654, 19266, 22654, 25172, 26722);
#define IDCT_HALF \
/* 1st stage */ \
@@ -571,25 +115,25 @@
vector_s16_t t0, t1, t2, t3, t4, t5, t6, t7, t8; \
vector_u16_t shift; \
\
- c4 = vec_splat (constants[0], 0); \
- a0 = vec_splat (constants[0], 1); \
- a1 = vec_splat (constants[0], 2); \
- a2 = vec_splat (constants[0], 3); \
- mc4 = vec_splat (constants[0], 4); \
- ma2 = vec_splat (constants[0], 5); \
- bias = (vector_s16_t)vec_splat ((vector_s32_t)constants[0], 3); \
+ c4 = vec_splat (constants, 0); \
+ a0 = vec_splat (constants, 1); \
+ a1 = vec_splat (constants, 2); \
+ a2 = vec_splat (constants, 3); \
+ mc4 = vec_splat (constants, 4); \
+ ma2 = vec_splat (constants, 5); \
+ bias = (vector_s16_t)vec_splat ((vector_s32_t)constants, 3); \
\
zero = vec_splat_s16 (0); \
shift = vec_splat_u16 (4); \
\
- vx0 = vec_mradds (vec_sl (block[0], shift), constants[1], zero); \
- vx1 = vec_mradds (vec_sl (block[1], shift), constants[2], zero); \
- vx2 = vec_mradds (vec_sl (block[2], shift), constants[3], zero); \
- vx3 = vec_mradds (vec_sl (block[3], shift), constants[4], zero); \
- vx4 = vec_mradds (vec_sl (block[4], shift), constants[1], zero); \
- vx5 = vec_mradds (vec_sl (block[5], shift), constants[4], zero); \
- vx6 = vec_mradds (vec_sl (block[6], shift), constants[3], zero); \
- vx7 = vec_mradds (vec_sl (block[7], shift), constants[2], zero); \
+ vx0 = vec_mradds (vec_sl (block[0], shift), constants_1, zero); \
+ vx1 = vec_mradds (vec_sl (block[1], shift), constants_2, zero); \
+ vx2 = vec_mradds (vec_sl (block[2], shift), constants_3, zero); \
+ vx3 = vec_mradds (vec_sl (block[3], shift), constants_4, zero); \
+ vx4 = vec_mradds (vec_sl (block[4], shift), constants_1, zero); \
+ vx5 = vec_mradds (vec_sl (block[5], shift), constants_4, zero); \
+ vx6 = vec_mradds (vec_sl (block[6], shift), constants_3, zero); \
+ vx7 = vec_mradds (vec_sl (block[7], shift), constants_2, zero); \
\
IDCT_HALF \
\
@@ -632,17 +176,10 @@
vx6 = vec_sra (vy6, shift); \
vx7 = vec_sra (vy7, shift);
-static const vector_s16_t constants[5] = {
- (vector_s16_t)(23170, 13573, 6518, 21895, -23170, -21895, 32, 31),
- (vector_s16_t)(16384, 22725, 21407, 19266, 16384, 19266, 21407, 22725),
- (vector_s16_t)(22725, 31521, 29692, 26722, 22725, 26722, 29692, 31521),
- (vector_s16_t)(21407, 29692, 27969, 25172, 21407, 25172, 27969, 29692),
- (vector_s16_t)(19266, 26722, 25172, 22654, 19266, 22654, 25172, 26722)
-};
-
-void mpeg2_idct_copy_altivec (vector_s16_t * const block, unsigned char * dest,
+void mpeg2_idct_copy_altivec (int16_t * const _block, uint8_t * dest,
const int stride)
{
+ vector_s16_t * const block = (vector_s16_t *)_block;
vector_u8_t tmp;
IDCT
@@ -661,12 +198,14 @@
COPY (dest, vx6) dest += stride;
COPY (dest, vx7)
- memset (block, 0, 64 * sizeof (signed short));
+ block[0] = block[1] = block[2] = block[3] = zero;
+ block[4] = block[5] = block[6] = block[7] = zero;
}
-void mpeg2_idct_add_altivec (const int last, vector_s16_t * const block,
- unsigned char * dest, const int stride)
+void mpeg2_idct_add_altivec (const int last, int16_t * const _block,
+ uint8_t * dest, const int stride)
{
+ vector_s16_t * const block = (vector_s16_t *)_block;
vector_u8_t tmp;
vector_s16_t tmp2, tmp3;
vector_u8_t perm0;
@@ -699,7 +238,23 @@
ADD (dest, vx6, perm0) dest += stride;
ADD (dest, vx7, perm1)
- memset (block, 0, 64 * sizeof (signed short));
+ block[0] = block[1] = block[2] = block[3] = zero;
+ block[4] = block[5] = block[6] = block[7] = zero;
+}
+
+void mpeg2_idct_altivec_init (void)
+{
+ extern uint8_t mpeg2_scan_norm[64];
+ extern uint8_t mpeg2_scan_alt[64];
+ int i, j;
+
+ /* the altivec idct uses a transposed input, so we patch scan tables */
+ for (i = 0; i < 64; i++) {
+ j = mpeg2_scan_norm[i];
+ mpeg2_scan_norm[i] = (j >> 3) | ((j & 7) << 3);
+ j = mpeg2_scan_alt[i];
+ mpeg2_scan_alt[i] = (j >> 3) | ((j & 7) << 3);
+ }
}
-#endif /* __ALTIVEC__ */
+#endif
More information about the MPlayer-cvslog
mailing list