diff options
author | Zhou Xiaoyong <zhouxiaoyong@loongson.cn> | 2016-10-10 16:09:12 +0800 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-10-23 03:23:09 +0200 |
commit | 89ec4adad6cb8c8bb4ecd61b51d42ebde424bcfb (patch) | |
tree | 27e253e28cafea544679ac48c458efef65dd12ad /libavcodec/mips/idctdsp_mmi.c | |
parent | b9cd9226609bd2d8bfd3a706c345a9a890e973e5 (diff) | |
download | ffmpeg-89ec4adad6cb8c8bb4ecd61b51d42ebde424bcfb.tar.gz |
avcodec/mips: loongson optimize mmi load and store operators
1.MMI_ load/store macros are defined in libavutil/mips/mmiutils.h
2.Replace some unnecessary unaligned access with aligned operator
3.The MMI_ load/store is compatible with cpu loongson2e/2f which not support instructions start with gs
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/mips/idctdsp_mmi.c')
-rw-r--r-- | libavcodec/mips/idctdsp_mmi.c | 130 |
1 files changed, 73 insertions, 57 deletions
diff --git a/libavcodec/mips/idctdsp_mmi.c b/libavcodec/mips/idctdsp_mmi.c index 24beb62df5..b7979650fd 100644 --- a/libavcodec/mips/idctdsp_mmi.c +++ b/libavcodec/mips/idctdsp_mmi.c @@ -23,36 +23,40 @@ #include "idctdsp_mips.h" #include "constants.h" -#include "libavutil/mips/asmdefs.h" +#include "libavutil/mips/mmiutils.h" void ff_put_pixels_clamped_mmi(const int16_t *block, uint8_t *av_restrict pixels, ptrdiff_t line_size) { double ftmp[8]; mips_reg addr[1]; + DECLARE_VAR_ALL64; + DECLARE_VAR_ADDRT; __asm__ volatile ( - "ldc1 %[ftmp0], 0x00(%[block]) \n\t" - "ldc1 %[ftmp1], 0x08(%[block]) \n\t" - "ldc1 %[ftmp2], 0x10(%[block]) \n\t" - "ldc1 %[ftmp3], 0x18(%[block]) \n\t" - "ldc1 %[ftmp4], 0x20(%[block]) \n\t" - "ldc1 %[ftmp5], 0x28(%[block]) \n\t" - "ldc1 %[ftmp6], 0x30(%[block]) \n\t" - "ldc1 %[ftmp7], 0x38(%[block]) \n\t" + MMI_LDC1(%[ftmp0], %[block], 0x00) + MMI_LDC1(%[ftmp1], %[block], 0x08) + MMI_LDC1(%[ftmp2], %[block], 0x10) + MMI_LDC1(%[ftmp3], %[block], 0x18) + MMI_LDC1(%[ftmp4], %[block], 0x20) + MMI_LDC1(%[ftmp5], %[block], 0x28) + MMI_LDC1(%[ftmp6], %[block], 0x30) + MMI_LDC1(%[ftmp7], %[block], 0x38) PTR_ADDU "%[addr0], %[pixels], %[line_size] \n\t" "packushb %[ftmp0], %[ftmp0], %[ftmp1] \n\t" "packushb %[ftmp2], %[ftmp2], %[ftmp3] \n\t" "packushb %[ftmp4], %[ftmp4], %[ftmp5] \n\t" "packushb %[ftmp6], %[ftmp6], %[ftmp7] \n\t" - "sdc1 %[ftmp0], 0x00(%[pixels]) \n\t" - "sdc1 %[ftmp2], 0x00(%[addr0]) \n\t" - "gssdxc1 %[ftmp4], 0x00(%[addr0], %[line_size]) \n\t" - "gssdxc1 %[ftmp6], 0x00(%[pixels], %[line_sizex3]) \n\t" + MMI_SDC1(%[ftmp0], %[pixels], 0x00) + MMI_SDC1(%[ftmp2], %[addr0], 0x00) + MMI_SDXC1(%[ftmp4], %[addr0], %[line_size], 0x00) + MMI_SDXC1(%[ftmp6], %[pixels], %[line_sizex3], 0x00) : [ftmp0]"=&f"(ftmp[0]), [ftmp1]"=&f"(ftmp[1]), [ftmp2]"=&f"(ftmp[2]), [ftmp3]"=&f"(ftmp[3]), [ftmp4]"=&f"(ftmp[4]), [ftmp5]"=&f"(ftmp[5]), [ftmp6]"=&f"(ftmp[6]), [ftmp7]"=&f"(ftmp[7]), + RESTRICT_ASM_ALL64 + RESTRICT_ASM_ADDRT [addr0]"=&r"(addr[0]), [pixels]"+&r"(pixels) : [line_size]"r"((mips_reg)line_size), @@ -65,27 +69,29 @@ void ff_put_pixels_clamped_mmi(const int16_t *block, block += 32; __asm__ volatile ( - "ldc1 %[ftmp0], 0x00(%[block]) \n\t" - "ldc1 %[ftmp1], 0x08(%[block]) \n\t" - "ldc1 %[ftmp2], 0x10(%[block]) \n\t" - "ldc1 %[ftmp3], 0x18(%[block]) \n\t" - "ldc1 %[ftmp4], 0x20(%[block]) \n\t" - "ldc1 %[ftmp5], 0x28(%[block]) \n\t" - "ldc1 %[ftmp6], 0x30(%[block]) \n\t" - "ldc1 %[ftmp7], 0x38(%[block]) \n\t" + MMI_LDC1(%[ftmp0], %[block], 0x00) + MMI_LDC1(%[ftmp1], %[block], 0x08) + MMI_LDC1(%[ftmp2], %[block], 0x10) + MMI_LDC1(%[ftmp3], %[block], 0x18) + MMI_LDC1(%[ftmp4], %[block], 0x20) + MMI_LDC1(%[ftmp5], %[block], 0x28) + MMI_LDC1(%[ftmp6], %[block], 0x30) + MMI_LDC1(%[ftmp7], %[block], 0x38) PTR_ADDU "%[addr0], %[pixels], %[line_size] \n\t" "packushb %[ftmp0], %[ftmp0], %[ftmp1] \n\t" "packushb %[ftmp2], %[ftmp2], %[ftmp3] \n\t" "packushb %[ftmp4], %[ftmp4], %[ftmp5] \n\t" "packushb %[ftmp6], %[ftmp6], %[ftmp7] \n\t" - "sdc1 %[ftmp0], 0x00(%[pixels]) \n\t" - "sdc1 %[ftmp2], 0x00(%[addr0]) \n\t" - "gssdxc1 %[ftmp4], 0x00(%[addr0], %[line_size]) \n\t" - "gssdxc1 %[ftmp6], 0x00(%[pixels], %[line_sizex3]) \n\t" + MMI_SDC1(%[ftmp0], %[pixels], 0x00) + MMI_SDC1(%[ftmp2], %[addr0], 0x00) + MMI_SDXC1(%[ftmp4], %[addr0], %[line_size], 0x00) + MMI_SDXC1(%[ftmp6], %[pixels], %[line_sizex3], 0x00) : [ftmp0]"=&f"(ftmp[0]), [ftmp1]"=&f"(ftmp[1]), [ftmp2]"=&f"(ftmp[2]), [ftmp3]"=&f"(ftmp[3]), [ftmp4]"=&f"(ftmp[4]), [ftmp5]"=&f"(ftmp[5]), [ftmp6]"=&f"(ftmp[6]), [ftmp7]"=&f"(ftmp[7]), + RESTRICT_ASM_ALL64 + RESTRICT_ASM_ADDRT [addr0]"=&r"(addr[0]), [pixels]"+&r"(pixels) : [line_size]"r"((mips_reg)line_size), @@ -102,56 +108,60 @@ void ff_put_signed_pixels_clamped_mmi(const int16_t *block, int64_t line_skip3 = 0; double ftmp[5]; mips_reg addr[1]; + DECLARE_VAR_ALL64; + DECLARE_VAR_ADDRT; __asm__ volatile ( PTR_ADDU "%[line_skip3], %[line_skip], %[line_skip] \n\t" - "ldc1 %[ftmp1], 0x00(%[block]) \n\t" - "ldc1 %[ftmp0], 0x08(%[block]) \n\t" + MMI_LDC1(%[ftmp1], %[block], 0x00) + MMI_LDC1(%[ftmp0], %[block], 0x08) "packsshb %[ftmp1], %[ftmp1], %[ftmp0] \n\t" - "ldc1 %[ftmp2], 0x10(%[block]) \n\t" - "ldc1 %[ftmp0], 0x18(%[block]) \n\t" + MMI_LDC1(%[ftmp2], %[block], 0x10) + MMI_LDC1(%[ftmp0], %[block], 0x18) "packsshb %[ftmp2], %[ftmp2], %[ftmp0] \n\t" - "ldc1 %[ftmp3], 0x20(%[block]) \n\t" - "ldc1 %[ftmp0], 0x28(%[block]) \n\t" + MMI_LDC1(%[ftmp3], %[block], 0x20) + MMI_LDC1(%[ftmp0], %[block], 0x28) "packsshb %[ftmp3], %[ftmp3], %[ftmp0] \n\t" - "ldc1 %[ftmp4], 48(%[block]) \n\t" - "ldc1 %[ftmp0], 56(%[block]) \n\t" + MMI_LDC1(%[ftmp4], %[block], 0x30) + MMI_LDC1(%[ftmp0], %[block], 0x38) "packsshb %[ftmp4], %[ftmp4], %[ftmp0] \n\t" "paddb %[ftmp1], %[ftmp1], %[ff_pb_80] \n\t" "paddb %[ftmp2], %[ftmp2], %[ff_pb_80] \n\t" "paddb %[ftmp3], %[ftmp3], %[ff_pb_80] \n\t" "paddb %[ftmp4], %[ftmp4], %[ff_pb_80] \n\t" - "sdc1 %[ftmp1], 0x00(%[pixels]) \n\t" - "gssdxc1 %[ftmp2], 0x00(%[pixels], %[line_skip]) \n\t" - "gssdxc1 %[ftmp3], 0x00(%[pixels], %[line_skip3]) \n\t" + MMI_SDC1(%[ftmp1], %[pixels], 0x00) + MMI_SDXC1(%[ftmp2], %[pixels], %[line_skip], 0x00) + MMI_SDXC1(%[ftmp3], %[pixels], %[line_skip3], 0x00) PTR_ADDU "%[line_skip3], %[line_skip3], %[line_skip] \n\t" - "gssdxc1 %[ftmp4], 0x00(%[pixels], %[line_skip3]) \n\t" + MMI_SDXC1(%[ftmp4], %[pixels], %[line_skip3], 0x00) PTR_ADDU "%[addr0], %[line_skip3], %[line_skip] \n\t" PTR_ADDU "%[pixels], %[pixels], %[addr0] \n\t" - "ldc1 %[ftmp1], 0x40(%[block]) \n\t" - "ldc1 %[ftmp0], 0x48(%[block]) \n\t" + MMI_LDC1(%[ftmp1], %[block], 0x40) + MMI_LDC1(%[ftmp0], %[block], 0x48) "packsshb %[ftmp1], %[ftmp1], %[ftmp0] \n\t" - "ldc1 %[ftmp2], 0x50(%[block]) \n\t" - "ldc1 %[ftmp0], 0x58(%[block]) \n\t" + MMI_LDC1(%[ftmp2], %[block], 0x50) + MMI_LDC1(%[ftmp0], %[block], 0x58) "packsshb %[ftmp2], %[ftmp2], %[ftmp0] \n\t" - "ldc1 %[ftmp3], 0x60(%[block]) \n\t" - "ldc1 %[ftmp0], 0x68(%[block]) \n\t" + MMI_LDC1(%[ftmp3], %[block], 0x60) + MMI_LDC1(%[ftmp0], %[block], 0x68) "packsshb %[ftmp3], %[ftmp3], %[ftmp0] \n\t" - "ldc1 %[ftmp4], 0x70(%[block]) \n\t" - "ldc1 %[ftmp0], 0x78(%[block]) \n\t" + MMI_LDC1(%[ftmp4], %[block], 0x70) + MMI_LDC1(%[ftmp0], %[block], 0x78) "packsshb %[ftmp4], %[ftmp4], %[ftmp0] \n\t" "paddb %[ftmp1], %[ftmp1], %[ff_pb_80] \n\t" "paddb %[ftmp2], %[ftmp2], %[ff_pb_80] \n\t" "paddb %[ftmp3], %[ftmp3], %[ff_pb_80] \n\t" "paddb %[ftmp4], %[ftmp4], %[ff_pb_80] \n\t" - "sdc1 %[ftmp1], 0x00(%[pixels]) \n\t" - "gssdxc1 %[ftmp2], 0x00(%[pixels], %[line_skip]) \n\t" + MMI_SDC1(%[ftmp1], %[pixels], 0x00) + MMI_SDXC1(%[ftmp2], %[pixels], %[line_skip], 0x00) PTR_ADDU "%[addr0], %[line_skip], %[line_skip] \n\t" - "gssdxc1 %[ftmp3], 0x00(%[pixels], %[addr0]) \n\t" - "gssdxc1 %[ftmp4], 0x00(%[pixels], %[line_skip3]) \n\t" + MMI_SDXC1(%[ftmp3], %[pixels], %[addr0], 0x00) + MMI_SDXC1(%[ftmp4], %[pixels], %[line_skip3], 0x00) : [ftmp0]"=&f"(ftmp[0]), [ftmp1]"=&f"(ftmp[1]), [ftmp2]"=&f"(ftmp[2]), [ftmp3]"=&f"(ftmp[3]), [ftmp4]"=&f"(ftmp[4]), + RESTRICT_ASM_ALL64 + RESTRICT_ASM_ADDRT [addr0]"=&r"(addr[0]), [pixels]"+&r"(pixels), [line_skip3]"+&r"(line_skip3) : [block]"r"(block), @@ -166,17 +176,20 @@ void ff_add_pixels_clamped_mmi(const int16_t *block, { double ftmp[8]; uint64_t tmp[1]; + mips_reg addr[1]; + DECLARE_VAR_ALL64; + DECLARE_VAR_ADDRT; __asm__ volatile ( "li %[tmp0], 0x04 \n\t" "xor %[ftmp0], %[ftmp0], %[ftmp0] \n\t" "1: \n\t" - "ldc1 %[ftmp1], 0x00(%[block]) \n\t" - "ldc1 %[ftmp2], 0x08(%[block]) \n\t" - "ldc1 %[ftmp3], 0x10(%[block]) \n\t" - "ldc1 %[ftmp4], 0x18(%[block]) \n\t" - "ldc1 %[ftmp5], 0x00(%[pixels]) \n\t" - "gsldxc1 %[ftmp6], 0x00(%[pixels], %[line_size]) \n\t" + MMI_LDC1(%[ftmp1], %[block], 0x00) + MMI_LDC1(%[ftmp2], %[block], 0x08) + MMI_LDC1(%[ftmp3], %[block], 0x10) + MMI_LDC1(%[ftmp4], %[block], 0x18) + MMI_LDC1(%[ftmp5], %[pixels], 0x00) + MMI_LDXC1(%[ftmp6], %[pixels], %[line_size], 0x00) "mov.d %[ftmp7], %[ftmp5] \n\t" "punpcklbh %[ftmp5], %[ftmp5], %[ftmp0] \n\t" "punpckhbh %[ftmp7], %[ftmp7], %[ftmp0] \n\t" @@ -189,8 +202,8 @@ void ff_add_pixels_clamped_mmi(const int16_t *block, "paddh %[ftmp4], %[ftmp4], %[ftmp7] \n\t" "packushb %[ftmp1], %[ftmp1], %[ftmp2] \n\t" "packushb %[ftmp3], %[ftmp3], %[ftmp4] \n\t" - "sdc1 %[ftmp1], 0x00(%[pixels]) \n\t" - "gssdxc1 %[ftmp3], 0x00(%[pixels], %[line_size]) \n\t" + MMI_SDC1(%[ftmp1], %[pixels], 0x00) + MMI_SDXC1(%[ftmp3], %[pixels], %[line_size], 0x00) "addi %[tmp0], %[tmp0], -0x01 \n\t" PTR_ADDIU "%[block], %[block], 0x20 \n\t" PTR_ADDU "%[pixels], %[pixels], %[line_size] \n\t" @@ -201,6 +214,9 @@ void ff_add_pixels_clamped_mmi(const int16_t *block, [ftmp4]"=&f"(ftmp[4]), [ftmp5]"=&f"(ftmp[5]), [ftmp6]"=&f"(ftmp[6]), [ftmp7]"=&f"(ftmp[7]), [tmp0]"=&r"(tmp[0]), + RESTRICT_ASM_ALL64 + RESTRICT_ASM_ADDRT + [addr0]"=&r"(addr[0]), [pixels]"+&r"(pixels), [block]"+&r"(block) : [line_size]"r"((mips_reg)line_size) : "memory" |