| Message ID | 20210916073408.65561-1-jianhua.wu@intel.com |
|---|---|
| State | Accepted |
| Commit | fcf10c925dc4a4ab883b4ad14ea61bbdaa6f8521 |
| Headers | show |
| Series | [FFmpeg-devel,1/2] libavfilter/x86/vf_gblur: fixed the fate-test failed on MacOS | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
| andriy/make_ppc | success | Make finished |
| andriy/make_fate_ppc | success | Make fate finished |
Jianhua wrote: > From: Wu, Jianhua <jianhua.wu@intel.com> > Sent: Thursday, September 16, 2021 3:34 PM > To: ffmpeg-devel@ffmpeg.org > Cc: Wu, Jianhua <jianhua.wu@intel.com> > Subject: [PATCH 1/2] libavfilter/x86/vf_gblur: fixed the fate-test failed on > MacOS > > Signed-off-by: Wu Jianhua <jianhua.wu@intel.com> > --- Hi Zhili, I have submitted the patches fixing the fate-test that failed on macOS. Could you help try to apply the patches to check if they work? Here is the link: http://ffmpeg.org/pipermail/ffmpeg-devel/2021-September/285376.html And the illegal instructions:4 occurred might be the version of your GCC installed less than 4.7, which could be fixed by specific a compiler option, -mmacosx-version-min=10.x, by the way, the exact I used is 10.10. To enable it on FFmpeg, you might have to specify in the --extra-cflags option when configuring. But I recommend updating the GCC to the newest version, which can fix this as well. If there is another problem, feel free to let me know. Best regards, Jianhua
> On Sep 16, 2021, at 3:48 PM, Wu, Jianhua <jianhua.wu@intel.com> wrote: > > Jianhua wrote: >> From: Wu, Jianhua <jianhua.wu@intel.com> >> Sent: Thursday, September 16, 2021 3:34 PM >> To: ffmpeg-devel@ffmpeg.org >> Cc: Wu, Jianhua <jianhua.wu@intel.com> >> Subject: [PATCH 1/2] libavfilter/x86/vf_gblur: fixed the fate-test failed on >> MacOS >> >> Signed-off-by: Wu Jianhua <jianhua.wu@intel.com> >> --- > > Hi Zhili, > > I have submitted the patches fixing the fate-test that failed on macOS. Could > you help try to apply the patches to check if they work? Here is the link: > http://ffmpeg.org/pipermail/ffmpeg-devel/2021-September/285376.html > > And the illegal instructions:4 occurred might be the version of your GCC > installed less than 4.7, which could be fixed by specific a compiler option, > -mmacosx-version-min=10.x, by the way, the exact I used is 10.10. To enable > it on FFmpeg, you might have to specify in the --extra-cflags option when > configuring. But I recommend updating the GCC to the newest version, which > can fix this as well. Thanks, the patch fixed both issues. By the way, the default toolchain on macOS is clang, gcc has been dropped by Apple long time ago. > > If there is another problem, feel free to let me know. > > Best regards, > Jianhua > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". >
diff --git a/libavfilter/x86/vf_gblur.asm b/libavfilter/x86/vf_gblur.asm index c0d57cc82b..64c067538a 100644 --- a/libavfilter/x86/vf_gblur.asm +++ b/libavfilter/x86/vf_gblur.asm @@ -455,12 +455,13 @@ cglobal horiz_slice, 4, 9, 9, ptr, width, height, steps, nu, bscale, x, y, step, mov nuq, localbufm DEFINE_ARGS buffer, width, height, steps, \ localbuf, x, y, step, stride, remain, ptr, mask - MOVSXDIFNIDN width, height, steps %else VBROADCASTSS m0, xmm0 ; nu VBROADCASTSS m1, xmm1 ; bscale %endif + MOVSXDIFNIDN width, height, steps + %if cpuflag(avx512) vpbroadcastd m2, widthd INIT_WORD_MASK k6, k5, k4, k3, k2, k1 @@ -861,11 +862,12 @@ cglobal verti_slice, 6, 12, 9, 0-mmsize*2, buffer, width, height, cbegin, cend, VBROADCASTSS m1, bscalem DEFINE_ARGS buffer, width, height, cbegin, cend, \ steps, x, y, cwidth, step, ptr, stride - MOVSXDIFNIDN width, height, cbegin, cend, steps %else VBROADCASTSS m0, xmm0 ; nu VBROADCASTSS m1, xmm1 ; bscale %endif + MOVSXDIFNIDN width, height, cbegin, cend, steps + mov cwidthq, cendq sub cwidthq, cbeginq lea strideq, [widthq * 4]
Signed-off-by: Wu Jianhua <jianhua.wu@intel.com> --- libavfilter/x86/vf_gblur.asm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)