| Message ID | 1622167481-10973-3-git-send-email-jinbo@loongson.cn |
|---|---|
| State | Accepted |
| Commit | 2fac1e370c9cf48b2e9d4a7f2c0d7236017f9bbe |
| Headers | show |
| Series | [FFmpeg-devel,1/3] libavcodec/mips: Fix specification of instruction name | expand |
| Context | Check | Description |
|---|---|---|
| andriy/x86_make | success | Make finished |
| andriy/x86_make_fate | success | Make fate finished |
| andriy/PPC64_make | success | Make finished |
| andriy/PPC64_make_fate | success | Make fate finished |
> -----原始邮件----- > 发件人: "Jin Bo" <jinbo@loongson.cn> > 发送时间: 2021-05-28 10:04:41 (星期五) > 收件人: ffmpeg-devel@ffmpeg.org > 抄送: "Jin Bo" <jinbo@loongson.cn> > 主题: [FFmpeg-devel] [PATCH 3/3] libavcodec/mips: Fix fate errors reported by clang > > The data width of gsldrc1/gsldlc1 should be 8 bytes wide. > > Signed-off-by: Jin Bo <jinbo@loongson.cn> > --- > libavcodec/mips/vp9_mc_mmi.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/libavcodec/mips/vp9_mc_mmi.c b/libavcodec/mips/vp9_mc_mmi.c > index fa65ff5..812f7a6 100644 > --- a/libavcodec/mips/vp9_mc_mmi.c > +++ b/libavcodec/mips/vp9_mc_mmi.c > @@ -83,9 +83,9 @@ static void convolve_horiz_mmi(const uint8_t *src, int32_t src_stride, > __asm__ volatile ( > "move %[tmp1], %[width] \n\t" > "pxor %[ftmp0], %[ftmp0], %[ftmp0] \n\t" > - "gsldlc1 %[filter1], 0x03(%[filter]) \n\t" > + "gsldlc1 %[filter1], 0x07(%[filter]) \n\t" > "gsldrc1 %[filter1], 0x00(%[filter]) \n\t" > - "gsldlc1 %[filter2], 0x0b(%[filter]) \n\t" > + "gsldlc1 %[filter2], 0x0f(%[filter]) \n\t" > "gsldrc1 %[filter2], 0x08(%[filter]) \n\t" > "li %[tmp0], 0x07 \n\t" > "dmtc1 %[tmp0], %[ftmp13] \n\t" > @@ -158,9 +158,9 @@ static void convolve_vert_mmi(const uint8_t *src, int32_t src_stride, > > __asm__ volatile ( > "pxor %[ftmp0], %[ftmp0], %[ftmp0] \n\t" > - "gsldlc1 %[ftmp4], 0x03(%[filter]) \n\t" > + "gsldlc1 %[ftmp4], 0x07(%[filter]) \n\t" > "gsldrc1 %[ftmp4], 0x00(%[filter]) \n\t" > - "gsldlc1 %[ftmp5], 0x0b(%[filter]) \n\t" > + "gsldlc1 %[ftmp5], 0x0f(%[filter]) \n\t" > "gsldrc1 %[ftmp5], 0x08(%[filter]) \n\t" > "punpcklwd %[filter10], %[ftmp4], %[ftmp4] \n\t" > "punpckhwd %[filter32], %[ftmp4], %[ftmp4] \n\t" > @@ -254,9 +254,9 @@ static void convolve_avg_horiz_mmi(const uint8_t *src, int32_t src_stride, > __asm__ volatile ( > "move %[tmp1], %[width] \n\t" > "pxor %[ftmp0], %[ftmp0], %[ftmp0] \n\t" > - "gsldlc1 %[filter1], 0x03(%[filter]) \n\t" > + "gsldlc1 %[filter1], 0x07(%[filter]) \n\t" > "gsldrc1 %[filter1], 0x00(%[filter]) \n\t" > - "gsldlc1 %[filter2], 0x0b(%[filter]) \n\t" > + "gsldlc1 %[filter2], 0x0f(%[filter]) \n\t" > "gsldrc1 %[filter2], 0x08(%[filter]) \n\t" > "li %[tmp0], 0x07 \n\t" > "dmtc1 %[tmp0], %[ftmp13] \n\t" > @@ -340,9 +340,9 @@ static void convolve_avg_vert_mmi(const uint8_t *src, int32_t src_stride, > > __asm__ volatile ( > "pxor %[ftmp0], %[ftmp0], %[ftmp0] \n\t" > - "gsldlc1 %[ftmp4], 0x03(%[filter]) \n\t" > + "gsldlc1 %[ftmp4], 0x07(%[filter]) \n\t" > "gsldrc1 %[ftmp4], 0x00(%[filter]) \n\t" > - "gsldlc1 %[ftmp5], 0x0b(%[filter]) \n\t" > + "gsldlc1 %[ftmp5], 0x0f(%[filter]) \n\t" > "gsldrc1 %[ftmp5], 0x08(%[filter]) \n\t" > "punpcklwd %[filter10], %[ftmp4], %[ftmp4] \n\t" > "punpckhwd %[filter32], %[ftmp4], %[ftmp4] \n\t" > -- > 2.1.0 > LGTM.</jinbo@loongson.cn></jinbo@loongson.cn></jinbo@loongson.cn>
On Tue, Jun 01, 2021 at 09:03:24PM +0800, yinshiyou-hf@loongson.cn wrote: [...] > > "punpcklwd %[filter10], %[ftmp4], %[ftmp4] \n\t" > > "punpckhwd %[filter32], %[ftmp4], %[ftmp4] \n\t" > > -- > > 2.1.0 > > > > LGTM.</jinbo@loongson.cn></jinbo@loongson.cn></jinbo@loongson.cn> will apply thx [...]
diff --git a/libavcodec/mips/vp9_mc_mmi.c b/libavcodec/mips/vp9_mc_mmi.c index fa65ff5..812f7a6 100644 --- a/libavcodec/mips/vp9_mc_mmi.c +++ b/libavcodec/mips/vp9_mc_mmi.c @@ -83,9 +83,9 @@ static void convolve_horiz_mmi(const uint8_t *src, int32_t src_stride, __asm__ volatile ( "move %[tmp1], %[width] \n\t" "pxor %[ftmp0], %[ftmp0], %[ftmp0] \n\t" - "gsldlc1 %[filter1], 0x03(%[filter]) \n\t" + "gsldlc1 %[filter1], 0x07(%[filter]) \n\t" "gsldrc1 %[filter1], 0x00(%[filter]) \n\t" - "gsldlc1 %[filter2], 0x0b(%[filter]) \n\t" + "gsldlc1 %[filter2], 0x0f(%[filter]) \n\t" "gsldrc1 %[filter2], 0x08(%[filter]) \n\t" "li %[tmp0], 0x07 \n\t" "dmtc1 %[tmp0], %[ftmp13] \n\t" @@ -158,9 +158,9 @@ static void convolve_vert_mmi(const uint8_t *src, int32_t src_stride, __asm__ volatile ( "pxor %[ftmp0], %[ftmp0], %[ftmp0] \n\t" - "gsldlc1 %[ftmp4], 0x03(%[filter]) \n\t" + "gsldlc1 %[ftmp4], 0x07(%[filter]) \n\t" "gsldrc1 %[ftmp4], 0x00(%[filter]) \n\t" - "gsldlc1 %[ftmp5], 0x0b(%[filter]) \n\t" + "gsldlc1 %[ftmp5], 0x0f(%[filter]) \n\t" "gsldrc1 %[ftmp5], 0x08(%[filter]) \n\t" "punpcklwd %[filter10], %[ftmp4], %[ftmp4] \n\t" "punpckhwd %[filter32], %[ftmp4], %[ftmp4] \n\t" @@ -254,9 +254,9 @@ static void convolve_avg_horiz_mmi(const uint8_t *src, int32_t src_stride, __asm__ volatile ( "move %[tmp1], %[width] \n\t" "pxor %[ftmp0], %[ftmp0], %[ftmp0] \n\t" - "gsldlc1 %[filter1], 0x03(%[filter]) \n\t" + "gsldlc1 %[filter1], 0x07(%[filter]) \n\t" "gsldrc1 %[filter1], 0x00(%[filter]) \n\t" - "gsldlc1 %[filter2], 0x0b(%[filter]) \n\t" + "gsldlc1 %[filter2], 0x0f(%[filter]) \n\t" "gsldrc1 %[filter2], 0x08(%[filter]) \n\t" "li %[tmp0], 0x07 \n\t" "dmtc1 %[tmp0], %[ftmp13] \n\t" @@ -340,9 +340,9 @@ static void convolve_avg_vert_mmi(const uint8_t *src, int32_t src_stride, __asm__ volatile ( "pxor %[ftmp0], %[ftmp0], %[ftmp0] \n\t" - "gsldlc1 %[ftmp4], 0x03(%[filter]) \n\t" + "gsldlc1 %[ftmp4], 0x07(%[filter]) \n\t" "gsldrc1 %[ftmp4], 0x00(%[filter]) \n\t" - "gsldlc1 %[ftmp5], 0x0b(%[filter]) \n\t" + "gsldlc1 %[ftmp5], 0x0f(%[filter]) \n\t" "gsldrc1 %[ftmp5], 0x08(%[filter]) \n\t" "punpcklwd %[filter10], %[ftmp4], %[ftmp4] \n\t" "punpckhwd %[filter32], %[ftmp4], %[ftmp4] \n\t"
The data width of gsldrc1/gsldlc1 should be 8 bytes wide. Signed-off-by: Jin Bo <jinbo@loongson.cn> --- libavcodec/mips/vp9_mc_mmi.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)