| Message ID | MN2PR18MB3328646865E51F9118303E07D3FD9@MN2PR18MB3328.namprd18.prod.outlook.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel] Fix AVX-512-VNNI_hevc_qpel_filters_avx512icl | expand |
| Context | Check | Description |
|---|---|---|
| andriy/configure_armv7_RPi4 | warning | Failed to apply patch |
| yinshiyou/configure_loongarch64 | warning | Failed to apply patch |
| andriy/configure_x86 | warning | Failed to apply patch |
> Felix LeClair<mailto:felix.leclair123@hotmail.com>: > Sent: 2022年4月29日 1:17 > To: ffmpeg-devel@ffmpeg.org<mailto:ffmpeg-devel@ffmpeg.org> > Subject: [FFmpeg-devel] [PATCH] Fix AVX-512-VNNI_hevc_qpel_filters_avx512icl > > This commit fixes the above by swapping lines 1796 and 1795, moving the > define out of the conditional > > sub srcq, tmpq > sub myq, 1 > shl myq, 5 > -%ifdef PIC > %define %%table hevc_qpel_filters_avx512icl_v_%1 >+%ifdef PIC > lea tmpq, [%%table] > %define FILTER tmpq > %else >-- LGTM. Thanks for the fix! Best regards, Jianhua
On Fri, 29 Apr 2022, Wu Jianhua wrote: >> Felix LeClair<mailto:felix.leclair123@hotmail.com>: >> Sent: 2022年4月29日 1:17 >> To: ffmpeg-devel@ffmpeg.org<mailto:ffmpeg-devel@ffmpeg.org> >> Subject: [FFmpeg-devel] [PATCH] Fix AVX-512-VNNI_hevc_qpel_filters_avx512icl >> >> This commit fixes the above by swapping lines 1796 and 1795, moving the >> define out of the conditional >> >> sub srcq, tmpq >> sub myq, 1 >> shl myq, 5 >> -%ifdef PIC >> %define %%table hevc_qpel_filters_avx512icl_v_%1 >> +%ifdef PIC >> lea tmpq, [%%table] >> %define FILTER tmpq >> %else >> -- > > LGTM. Thanks for the fix! Thanks applied. Regards, Marton
diff --git a/libavcodec/x86/hevc_mc.asm b/libavcodec/x86/hevc_mc.asm index c07948dd9b..e159adccc7 100644 --- a/libavcodec/x86/hevc_mc.asm +++ b/libavcodec/x86/hevc_mc.asm @@ -1792,8 +1792,8 @@ cglobal hevc_put_hevc_qpel_hv%1_%2, 6, 7, 27, dst, src, srcstride, height, mx, m sub srcq, tmpq sub myq, 1 shl myq, 5 -%ifdef PIC %define %%table hevc_qpel_filters_avx512icl_v_%1 +%ifdef PIC lea tmpq, [%%table] %define FILTER tmpq
Issue: On extremely new hardware using either IceLake or super sets of Intel IceLakes avx512 instructions, commit d4cd8830bdac3e26c8e75cd92e574c159fecc4f7 causes build issues. Specifically a NASM macro expansion of qpel_filter_v is never properly defined/initialized. The issue is the definition was erroneously placed inside a conditional which will not trigger unless the original definition failed (has to do with if PIC is defined, becomes a bit of a catch 22) Specifically the error is X86ASM libavcodec/x86/hevc_mc.o libavcodec/x86/hevc_mc.asm:1854: error: symbol `..@88472.table' not defined libavcodec/x86/hevc_mc.asm:1806: ... from macro `HEVC_PUT_HEVC_QPEL_HV_AVX512ICL' defined here libavcodec/x86/hevc_mc.asm:1730: ... from macro `QPEL_FILTER_V' defined here ... repeats a few times... ... make: *** [ffbuild/common.mak:100: libavcodec/x86/hevc_mc.o] Error 1 ``` Specific error was discussed by kurosu and myself (fclc) on the ffmpeg-devel irc. This commit fixes the above by swapping lines 1796 and 1795, moving the define out of the conditional Side note: It seems fate didn't pick up on this, may merit looking into (as mentioned by nevcairiel). Signed-off-by: Felix LeClair (FCLC) <felix.leclair123@hotmail.com> --- libavcodec/x86/hevc_mc.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) %else