[x265] [PATCH] arm: Implement pixelavg_pp_NxN_neon
Deepthi Nandakumar
deepthi at multicorewareinc.com
Tue Feb 16 13:12:26 CET 2016
Thanks. Please re-send - this does not apply.
On Tue, Feb 16, 2016 at 2:52 PM, <radhakrishnan at multicorewareinc.com> wrote:
> # HG changeset patch
> # User radhakrishnan at multicorewareinc.com
> # Date 1455599542 -19800
> # Tue Feb 16 10:42:22 2016 +0530
> # Node ID a370f5d37fca01529c6f61d3611609e7d92e3562
> # Parent 425b583f25dbb57af86fc5c128548038954baf31
> arm: Implement pixelavg_pp_NxN_neon
>
> diff -r 425b583f25db -r a370f5d37fca source/common/arm/asm-primitives.cpp
> --- a/source/common/arm/asm-primitives.cpp Thu Feb 11 13:15:03 2016
> +0530
> +++ b/source/common/arm/asm-primitives.cpp Tue Feb 16 10:42:22 2016
> +0530
> @@ -42,6 +42,31 @@
> if (cpuMask & X265_CPU_NEON)
> {
> p.pu[LUMA_16x16].copy_pp = PFX(blockcopy_pp_16x16_neon);
> + p.pu[LUMA_4x4].pixelavg_pp = PFX(pixel_avg_pp_4x4_neon);
> + p.pu[LUMA_4x8].pixelavg_pp = PFX(pixel_avg_pp_4x8_neon);
> + p.pu[LUMA_4x16].pixelavg_pp = PFX(pixel_avg_pp_4x16_neon);
> + p.pu[LUMA_8x4].pixelavg_pp = PFX(pixel_avg_pp_8x4_neon);
> + p.pu[LUMA_8x8].pixelavg_pp = PFX(pixel_avg_pp_8x8_neon);
> + p.pu[LUMA_8x16].pixelavg_pp = PFX(pixel_avg_pp_8x16_neon);
> + p.pu[LUMA_8x32].pixelavg_pp = PFX(pixel_avg_pp_8x32_neon);
> + p.pu[LUMA_12x16].pixelavg_pp = PFX(pixel_avg_pp_12x16_neon);
> + p.pu[LUMA_16x4].pixelavg_pp = PFX(pixel_avg_pp_16x4_neon);
> + p.pu[LUMA_16x8].pixelavg_pp = PFX(pixel_avg_pp_16x8_neon);
> + p.pu[LUMA_16x12].pixelavg_pp = PFX(pixel_avg_pp_16x12_neon);
> + p.pu[LUMA_16x16].pixelavg_pp = PFX(pixel_avg_pp_16x16_neon);
> + p.pu[LUMA_16x32].pixelavg_pp = PFX(pixel_avg_pp_16x32_neon);
> + p.pu[LUMA_16x64].pixelavg_pp = PFX(pixel_avg_pp_16x64_neon);
> + p.pu[LUMA_24x32].pixelavg_pp = PFX(pixel_avg_pp_24x32_neon);
> + p.pu[LUMA_32x8].pixelavg_pp = PFX(pixel_avg_pp_32x8_neon);
> + p.pu[LUMA_32x16].pixelavg_pp = PFX(pixel_avg_pp_32x16_neon);
> + p.pu[LUMA_32x24].pixelavg_pp = PFX(pixel_avg_pp_32x24_neon);
> + p.pu[LUMA_32x32].pixelavg_pp = PFX(pixel_avg_pp_32x32_neon);
> + p.pu[LUMA_32x64].pixelavg_pp = PFX(pixel_avg_pp_32x64_neon);
> + p.pu[LUMA_48x64].pixelavg_pp = PFX(pixel_avg_pp_48x64_neon);
> + p.pu[LUMA_64x16].pixelavg_pp = PFX(pixel_avg_pp_64x16_neon);
> + p.pu[LUMA_64x32].pixelavg_pp = PFX(pixel_avg_pp_64x32_neon);
> + p.pu[LUMA_64x48].pixelavg_pp = PFX(pixel_avg_pp_64x48_neon);
> + p.pu[LUMA_64x64].pixelavg_pp = PFX(pixel_avg_pp_64x64_neon);
> }
> if (cpuMask & X265_CPU_ARMV6)
> {
> diff -r 425b583f25db -r a370f5d37fca source/common/arm/mc-a.S
> --- a/source/common/arm/mc-a.S Thu Feb 11 13:15:03 2016 +0530
> +++ b/source/common/arm/mc-a.S Tue Feb 16 10:42:22 2016 +0530
> @@ -100,3 +100,234 @@
> vst1.8 {q0}, [r0]
> bx lr
> endfunc
> +
> +//void pixelavg_pp(pixel* dst, intptr_t dstride, const pixel* src0,
> intptr_t sstride0, const pixel* src1, intptr_t sstride1, int)
> +.macro pixel_avg_pp_4xN_neon h
> +function x265_pixel_avg_pp_4x\h\()_neon
> + push {r4}
> + ldr r4, [sp, #4]
> + ldr r12, [sp, #8]
> +.rept \h
> + vld1.32 {d0[]}, [r2], r3
> + vld1.32 {d1[]}, [r4], r12
> + vrhadd.u8 d2, d0, d1
> + vst1.32 {d2[0]}, [r0], r1
> +.endr
> + pop {r4}
> + bx lr
> +endfunc
> +.endm
> +
> +pixel_avg_pp_4xN_neon 4
> +pixel_avg_pp_4xN_neon 8
> +pixel_avg_pp_4xN_neon 16
> +
> +.macro pixel_avg_pp_8xN_neon h
> +function x265_pixel_avg_pp_8x\h\()_neon
> + push {r4}
> + ldr r4, [sp, #4]
> + ldr r12, [sp, #8]
> +.rept \h
> + vld1.8 {d0}, [r2], r3
> + vld1.8 {d1}, [r4], r12
> + vrhadd.u8 d2, d0, d1
> + vst1.8 {d2}, [r0], r1
> +.endr
> + pop {r4}
> + bx lr
> +endfunc
> +.endm
> +
> +pixel_avg_pp_8xN_neon 4
> +pixel_avg_pp_8xN_neon 8
> +pixel_avg_pp_8xN_neon 16
> +pixel_avg_pp_8xN_neon 32
> +
> +function x265_pixel_avg_pp_12x16_neon
> + push {r4, r6}
> + mov r6, #8
> + ldr r4, [sp, #8]
> + ldr r12, [sp, #12]
> + sub r1, r6
> + sub r3, r6
> + sub r12, r6
> +.rept 16
> + vld1.32 {d0}, [r2]!
> + vld1.32 {d1[0]}, [r2], r3
> + vld1.32 {d2}, [r4]!
> + vld1.32 {d3[0]}, [r4], r12
> + vrhadd.u8 d0, d0, d2
> + vrhadd.u8 d1, d1, d3
> + vst1.8 {d0}, [r0]!
> + vst1.32 {d1[0]}, [r0], r1
> +.endr
> + pop {r4, r6}
> + bx lr
> +endfunc
> +
> +.macro pixel_avg_pp_16xN_neon h
> +function x265_pixel_avg_pp_16x\h\()_neon
> + push {r4}
> + ldr r4, [sp, #4]
> + ldr r12, [sp, #8]
> +.rept \h
> + vld1.8 {q0}, [r2], r3
> + vld1.8 {q1}, [r4], r12
> + vrhadd.u8 q2, q0, q1
> + vst1.8 {q2}, [r0], r1
> +.endr
> + pop {r4}
> + bx lr
> +endfunc
> +.endm
> +
> +pixel_avg_pp_16xN_neon 4
> +pixel_avg_pp_16xN_neon 8
> +pixel_avg_pp_16xN_neon 12
> +pixel_avg_pp_16xN_neon 16
> +pixel_avg_pp_16xN_neon 32
> +
> +function x265_pixel_avg_pp_16x64_neon
> + push {r4, r6}
> + ldr r4, [sp, #8]
> + ldr r12, [sp, #12]
> + mov r6, #8
> +lpavg_16x64:
> +.rept 8
> + vld1.8 {q0}, [r2], r3
> + vld1.8 {q1}, [r4], r12
> + vrhadd.u8 q2, q0, q1
> + vst1.8 {q2}, [r0], r1
> +.endr
> + subs r6, r6, #1
> + bne lpavg_16x64
> + pop {r4 , r6}
> + bx lr
> +endfunc
> +
> +function x265_pixel_avg_pp_24x32_neon
> + push {r4, r6}
> + ldr r4, [sp, #8]
> + ldr r12, [sp, #12]
> + mov r6, #4
> +lpavg_24x32:
> +.rept 8
> + vld1.8 {d0, d1, d2}, [r2], r3
> + vld1.8 {d3, d4, d5}, [r4], r12
> + vrhadd.u8 d0, d0, d3
> + vrhadd.u8 d1, d1, d4
> + vrhadd.u8 d2, d2, d5
> + vst1.8 {d0, d1, d2}, [r0], r1
> +.endr
> + subs r6, r6, #1
> + bne lpavg_24x32
> + pop {r4, r6}
> + bx lr
> +endfunc
> +
> +.macro pixel_avg_pp_32xN_neon h
> +function x265_pixel_avg_pp_32x\h\()_neon
> + push {r4}
> + ldr r4, [sp, #4]
> + ldr r12, [sp, #8]
> +.rept \h
> + vld1.8 {q0, q1}, [r2], r3
> + vld1.8 {q2, q3}, [r4], r12
> + vrhadd.u8 q0, q0, q2
> + vrhadd.u8 q1, q1, q3
> + vst1.8 {q0, q1}, [r0], r1
> +.endr
> + pop {r4}
> + bx lr
> +endfunc
> +.endm
> +
> +pixel_avg_pp_32xN_neon 8
> +pixel_avg_pp_32xN_neon 16
> +pixel_avg_pp_32xN_neon 24
> +
> +.macro pixel_avg_pp_32xN1_neon h i
> +function x265_pixel_avg_pp_32x\h\()_neon
> + push {r4, r6}
> + ldr r4, [sp, #8]
> + ldr r12, [sp, #12]
> + mov r6, #\i
> +lpavg_32x\h\():
> +.rept 8
> + vld1.8 {q0, q1}, [r2], r3
> + vld1.8 {q2, q3}, [r4], r12
> + vrhadd.u8 q0, q0, q2
> + vrhadd.u8 q1, q1, q3
> + vst1.8 {q0, q1}, [r0], r1
> +.endr
> + subs r6, r6, #1
> + bne lpavg_32x\h
> + pop {r4, r6}
> + bx lr
> +endfunc
> +.endm
> +
> +pixel_avg_pp_32xN1_neon 32 4
> +pixel_avg_pp_32xN1_neon 64 8
> +
> +function x265_pixel_avg_pp_48x64_neon
> + push {r4, r6, r7}
> + ldr r4, [sp, #12]
> + ldr r12, [sp, #16]
> + mov r6, #8
> + mov r7, #32
> + sub r1, r7
> + sub r3, r7
> + sub r12, r7
> +lpavg_48x64:
> +.rept 8
> + vld1.8 {q0, q1}, [r2]!
> + vld1.8 {q2}, [r2], r3
> + vld1.8 {q8, q9}, [r4]!
> + vld1.8 {q10}, [r4], r12
> + vrhadd.u8 q0, q0, q8
> + vrhadd.u8 q1, q1, q9
> + vrhadd.u8 q2, q2, q10
> + vst1.8 {q0, q1}, [r0]!
> + vst1.8 {q2}, [r0], r1
> +.endr
> + subs r6, r6, #1
> + bne lpavg_48x64
> + pop {r4, r6, r7}
> + bx lr
> +endfunc
> +
> +.macro pixel_avg_pp_64xN_neon h i
> +function x265_pixel_avg_pp_64x\h\()_neon
> + push {r4, r6, r7}
> + ldr r4, [sp, #12]
> + ldr r12, [sp, #16]
> + mov r7, #32
> + mov r6, #\i
> + sub r3, r7
> + sub r12, r7
> + sub r1, r7
> +lpavg_64x\h\():
> +.rept 4
> + vld1.8 {q0, q1}, [r2]!
> + vld1.8 {q2, q3}, [r2], r3
> + vld1.8 {q8, q9}, [r4]!
> + vld1.8 {q10, q11}, [r4], r12
> + vrhadd.u8 q0, q0, q8
> + vrhadd.u8 q1, q1, q9
> + vrhadd.u8 q2, q2, q10
> + vrhadd.u8 q3, q3, q11
> + vst1.8 {q0, q1}, [r0]!
> + vst1.8 {q2, q3}, [r0], r1
> +.endr
> + subs r6, r6, #1
> + bne lpavg_64x\h
> + pop {r4, r6, r7}
> + bx lr
> +endfunc
> +.endm
> +
> +pixel_avg_pp_64xN_neon 16 4
> +pixel_avg_pp_64xN_neon 32 8
> +pixel_avg_pp_64xN_neon 48 12
> +pixel_avg_pp_64xN_neon 64 16
> diff -r 425b583f25db -r a370f5d37fca source/common/arm/pixel.h
> --- a/source/common/arm/pixel.h Thu Feb 11 13:15:03 2016 +0530
> +++ b/source/common/arm/pixel.h Tue Feb 16 10:42:22 2016 +0530
> @@ -31,4 +31,29 @@
> #define X265_I386_PIXEL_ARM_H
> int x265_pixel_sad_4x4_armv6(const pixel* dst, intptr_t dstStride, const
> pixel* src, intptr_t srcStride);
> int x265_pixel_sad_4x8_armv6(const pixel* dst, intptr_t dstStride, const
> pixel* src, intptr_t srcStride);
> +void x265_pixel_avg_pp_4x4_neon (pixel* dst, intptr_t dstride, const
> pixel* src0, intptr_t sstride0, const pixel* src1, intptr_t sstride1, int);
> +void x265_pixel_avg_pp_4x8_neon (pixel* dst, intptr_t dstride, const
> pixel* src0, intptr_t sstride0, const pixel* src1, intptr_t sstride1, int);
> +void x265_pixel_avg_pp_4x16_neon (pixel* dst, intptr_t dstride, const
> pixel* src0, intptr_t sstride0, const pixel* src1, intptr_t sstride1, int);
> +void x265_pixel_avg_pp_8x4_neon (pixel* dst, intptr_t dstride, const
> pixel* src0, intptr_t sstride0, const pixel* src1, intptr_t sstride1, int);
> +void x265_pixel_avg_pp_8x8_neon (pixel* dst, intptr_t dstride, const
> pixel* src0, intptr_t sstride0, const pixel* src1, intptr_t sstride1, int);
> +void x265_pixel_avg_pp_8x16_neon (pixel* dst, intptr_t dstride, const
> pixel* src0, intptr_t sstride0, const pixel* src1, intptr_t sstride1, int);
> +void x265_pixel_avg_pp_8x32_neon (pixel* dst, intptr_t dstride, const
> pixel* src0, intptr_t sstride0, const pixel* src1, intptr_t sstride1, int);
> +void x265_pixel_avg_pp_12x16_neon (pixel* dst, intptr_t dstride, const
> pixel* src0, intptr_t sstride0, const pixel* src1, intptr_t sstride1, int);
> +void x265_pixel_avg_pp_16x4_neon (pixel* dst, intptr_t dstride, const
> pixel* src0, intptr_t sstride0, const pixel* src1, intptr_t sstride1, int);
> +void x265_pixel_avg_pp_16x8_neon (pixel* dst, intptr_t dstride, const
> pixel* src0, intptr_t sstride0, const pixel* src1, intptr_t sstride1, int);
> +void x265_pixel_avg_pp_16x12_neon (pixel* dst, intptr_t dstride, const
> pixel* src0, intptr_t sstride0, const pixel* src1, intptr_t sstride1, int);
> +void x265_pixel_avg_pp_16x16_neon (pixel* dst, intptr_t dstride, const
> pixel* src0, intptr_t sstride0, const pixel* src1, intptr_t sstride1, int);
> +void x265_pixel_avg_pp_16x32_neon (pixel* dst, intptr_t dstride, const
> pixel* src0, intptr_t sstride0, const pixel* src1, intptr_t sstride1, int);
> +void x265_pixel_avg_pp_16x64_neon (pixel* dst, intptr_t dstride, const
> pixel* src0, intptr_t sstride0, const pixel* src1, intptr_t sstride1, int);
> +void x265_pixel_avg_pp_24x32_neon (pixel* dst, intptr_t dstride, const
> pixel* src0, intptr_t sstride0, const pixel* src1, intptr_t sstride1, int);
> +void x265_pixel_avg_pp_32x8_neon (pixel* dst, intptr_t dstride, const
> pixel* src0, intptr_t sstride0, const pixel* src1, intptr_t sstride1, int);
> +void x265_pixel_avg_pp_32x16_neon (pixel* dst, intptr_t dstride, const
> pixel* src0, intptr_t sstride0, const pixel* src1, intptr_t sstride1, int);
> +void x265_pixel_avg_pp_32x24_neon (pixel* dst, intptr_t dstride, const
> pixel* src0, intptr_t sstride0, const pixel* src1, intptr_t sstride1, int);
> +void x265_pixel_avg_pp_32x32_neon (pixel* dst, intptr_t dstride, const
> pixel* src0, intptr_t sstride0, const pixel* src1, intptr_t sstride1, int);
> +void x265_pixel_avg_pp_32x64_neon (pixel* dst, intptr_t dstride, const
> pixel* src0, intptr_t sstride0, const pixel* src1, intptr_t sstride1, int);
> +void x265_pixel_avg_pp_48x64_neon (pixel* dst, intptr_t dstride, const
> pixel* src0, intptr_t sstride0, const pixel* src1, intptr_t sstride1, int);
> +void x265_pixel_avg_pp_64x16_neon (pixel* dst, intptr_t dstride, const
> pixel* src0, intptr_t sstride0, const pixel* src1, intptr_t sstride1, int);
> +void x265_pixel_avg_pp_64x32_neon (pixel* dst, intptr_t dstride, const
> pixel* src0, intptr_t sstride0, const pixel* src1, intptr_t sstride1, int);
> +void x265_pixel_avg_pp_64x48_neon (pixel* dst, intptr_t dstride, const
> pixel* src0, intptr_t sstride0, const pixel* src1, intptr_t sstride1, int);
> +void x265_pixel_avg_pp_64x64_neon (pixel* dst, intptr_t dstride, const
> pixel* src0, intptr_t sstride0, const pixel* src1, intptr_t sstride1, int);
> #endif // ifndef X265_I386_PIXEL_ARM_H
> _______________________________________________
> x265-devel mailing list
> x265-devel at videolan.org
> https://mailman.videolan.org/listinfo/x265-devel
>
--
Deepthi Nandakumar
Engineering Manager, x265
Multicoreware, Inc
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/x265-devel/attachments/20160216/009bb4bb/attachment-0001.html>
More information about the x265-devel
mailing list