# HG changeset patch # User michaelni # Date 1030540476 0 # Node ID 92e99e5069208cb75bbb89767b579db3d041507f # Parent a1e54c24f221fc6f04a93e68635d3b81594d3217 first cut at altivec support on darwin patch by (Brian Foley ) diff -r a1e54c24f221 -r 92e99e506920 Makefile --- a/Makefile Wed Aug 28 12:23:12 2002 +0000 +++ b/Makefile Wed Aug 28 13:14:36 2002 +0000 @@ -67,6 +67,11 @@ CFLAGS += -Wa,-mpca56 -finline-limit=8000 -fforce-addr -freduce-all-givs endif +ifeq ($(TARGET_ARCH_POWERPC),yes) +CFLAGS += -faltivec +OBJS += ppc/dsputil_altivec.o +endif + SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) OBJS := $(OBJS) $(ASM_OBJS) @@ -106,6 +111,7 @@ armv4l/*.o armv4l/*~ \ mlib/*.o mlib/*~ \ alpha/*.o alpha/*~ \ + ppc/*.o ppc/*~ \ liba52/*.o liba52/*~ \ apiexample $(TESTS) diff -r a1e54c24f221 -r 92e99e506920 dsputil.c --- a/dsputil.c Wed Aug 28 12:23:12 2002 +0000 +++ b/dsputil.c Wed Aug 28 13:14:36 2002 +0000 @@ -1341,6 +1341,9 @@ dsputil_init_alpha(); use_permuted_idct = 0; #endif +#ifdef ARCH_POWERPC + dsputil_init_altivec(); +#endif #ifdef SIMPLE_IDCT if (ff_idct == NULL) { diff -r a1e54c24f221 -r 92e99e506920 dsputil.h --- a/dsputil.h Wed Aug 28 12:23:12 2002 +0000 +++ b/dsputil.h Wed Aug 28 13:14:36 2002 +0000 @@ -163,6 +163,13 @@ void dsputil_init_alpha(void); +#elif defined(ARCH_POWERPC) + +#define emms_c() +#define __align8 __attribute__ ((aligned (16))) + +void dsputil_init_altivec(void); + #else #define emms_c() diff -r a1e54c24f221 -r 92e99e506920 ppc/dsputil_altivec.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ppc/dsputil_altivec.c Wed Aug 28 13:14:36 2002 +0000 @@ -0,0 +1,152 @@ +#include "../dsputil.h" + +#if CONFIG_DARWIN +#include +#endif + +int pix_abs16x16_altivec(uint8_t *pix1, uint8_t *pix2, int line_size); +int pix_abs8x8_altivec(uint8_t *pix1, uint8_t *pix2, int line_size); +int pix_sum_altivec(UINT8 * pix, int line_size); + +int has_altivec(void); + +int pix_abs16x16_altivec(uint8_t *pix1, uint8_t *pix2, int line_size) +{ + int i, s; + vector unsigned char perm1, perm2, *pix1v, *pix2v; + vector unsigned char t1, t2, t3,t4, t5; + vector unsigned int sad, zero; + vector signed int sumdiffs; + + zero = (vector unsigned int) (0); + sad = (vector unsigned int) (0); + + + for(i=0;i<16;i++) { + /* Read potentially unaligned pixels into t1 and t2 */ + perm1 = vec_lvsl(0, pix1); + pix1v = (vector unsigned char *) pix1; + perm2 = vec_lvsl(0, pix2); + pix2v = (vector unsigned char *) pix2; + t1 = vec_perm(pix1v[0], pix1v[1], perm1); + t2 = vec_perm(pix2v[0], pix2v[1], perm2); + + /* Calculate a sum of abs differences vector */ + t3 = vec_max(t1, t2); + t4 = vec_min(t1, t2); + t5 = vec_sub(t3, t4); + + /* Add each 4 pixel group together and put 4 results into sad */ + sad = vec_sum4s(t5, sad); + + pix1 += line_size; + pix2 += line_size; + } + + /* Sum up the four partial sums, and put the result into s */ + sumdiffs = vec_sums((vector signed int) sad, (vector signed int) zero); + sumdiffs = vec_splat(sumdiffs, 3); + vec_ste(sumdiffs, 0, &s); + + return s; +} + +int pix_abs8x8_altivec(uint8_t *pix1, uint8_t *pix2, int line_size) +{ + int i, s; + vector unsigned char perm1, perm2, permclear, *pix1v, *pix2v; + vector unsigned char t1, t2, t3,t4, t5; + vector unsigned int sad, zero; + vector signed int sumdiffs; + + zero = (vector unsigned int) (0); + sad = (vector unsigned int) (0); + permclear = (vector unsigned char) (255,255,255,255,255,255,255,255,0,0,0,0,0,0,0,0); + + for(i=0;i<8;i++) { + /* Read potentially unaligned pixels into t1 and t2 + Since we're reading 16 pixels, and actually only want 8, + mask out the last 8 pixels. The 0s don't change the sum. */ + perm1 = vec_lvsl(0, pix1); + pix1v = (vector unsigned char *) pix1; + perm2 = vec_lvsl(0, pix2); + pix2v = (vector unsigned char *) pix2; + t1 = vec_and(vec_perm(pix1v[0], pix1v[1], perm1), permclear); + t2 = vec_and(vec_perm(pix2v[0], pix2v[1], perm2), permclear); + + /* Calculate a sum of abs differences vector */ + t3 = vec_max(t1, t2); + t4 = vec_min(t1, t2); + t5 = vec_sub(t3, t4); + + /* Add each 4 pixel group together and put 4 results into sad */ + sad = vec_sum4s(t5, sad); + + pix1 += line_size; + pix2 += line_size; + } + + /* Sum up the four partial sums, and put the result into s */ + sumdiffs = vec_sums((vector signed int) sad, (vector signed int) zero); + sumdiffs = vec_splat(sumdiffs, 3); + vec_ste(sumdiffs, 0, &s); + + return s; +} + +int pix_sum_altivec(UINT8 * pix, int line_size) +{ + + vector unsigned char perm, *pixv; + vector unsigned char t1; + vector unsigned int sad, zero; + vector signed int sumdiffs; + + int s, i; + + zero = (vector unsigned int) (0); + sad = (vector unsigned int) (0); + + for (i = 0; i < 16; i++) { + /* Read the potentially unaligned 16 pixels into t1 */ + perm = vec_lvsl(0, pix); + pixv = (vector unsigned char *) pix; + t1 = vec_perm(pixv[0], pixv[1], perm); + + /* Add each 4 pixel group together and put 4 results into sad */ + sad = vec_sum4s(t1, sad); + + pix += line_size; + } + + /* Sum up the four partial sums, and put the result into s */ + sumdiffs = vec_sums((vector signed int) sad, (vector signed int) zero); + sumdiffs = vec_splat(sumdiffs, 3); + vec_ste(sumdiffs, 0, &s); + + return s; +} + +void dsputil_init_altivec(void) +{ + if (has_altivec()) { + pix_abs16x16 = pix_abs16x16_altivec; + pix_abs8x8 = pix_abs8x8_altivec; + pix_sum = pix_sum_altivec; + } +} + +int has_altivec(void) +{ +#if CONFIG_DARWIN + int sels[2] = {CTL_HW, HW_VECTORUNIT}; + int has_vu = 0; + size_t len = sizeof(has_vu); + int err; + + err = sysctl(sels, 2, &has_vu, &len, NULL, 0); + + if (err == 0) return (has_vu != 0); +#endif + return 0; +}