From patchwork Thu Apr 28 17:17:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix LeClair X-Patchwork-Id: 35478 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp82267pzh; Thu, 28 Apr 2022 10:17:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwmIQDbuzwoivlMusLiWFA1nPhdwtjWPFtHldjo2JeWWpc7i8c4Ha1+S3pOQo1GI5q5Ss/8 X-Received: by 2002:a05:6402:190c:b0:426:1e86:8f1b with SMTP id e12-20020a056402190c00b004261e868f1bmr7503620edz.82.1651166260375; Thu, 28 Apr 2022 10:17:40 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id fp38-20020a1709069e2600b006e7afc3aeebsi3994506ejc.521.2022.04.28.10.17.38; Thu, 28 Apr 2022 10:17:40 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=QiakaJ6S; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2A05D6800D1; Thu, 28 Apr 2022 20:17:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam08olkn2035.outbound.protection.outlook.com [40.92.46.35]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 78D526800D1 for ; Thu, 28 Apr 2022 20:17:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JTn8/ZwaXtmOhvQD0aNOGxQyBtJqmkmAQjBXZLWp8Oxrvxu+wAa96Vvbsd+SMj3ODPRQ7wPwGLNba1uRZbV5FQqN+e7rjtxAShmh44B8wGHhuE3FSgw1Fp9TqO3UlD/U7j2SBi3hbMuWHGzFruXaX/NQb2fQculYyZSyriU5E8gvE3S10aQWGLlpM/Fgj3PyuMd0LTg1iUO+/SL3Tk+KqfpTmcO7HiJLU1nQ9WuMjnFVJYrR40Gaohj7PX+/KrmmixQHYezDNSqIocrgjc618mCCUdgFl40I4cp8SMaC8DUHYID5TAwAsyDr/NNZmoEc6TagP7dts330n85re53+mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=E7DSHuVEsfW5BfOzWt/nO4rVHu7nBF7xGOe7MnKT5+I=; b=AAERMIpLKVhbcQCthXAym4LW6rW5/WHJ6z0JRUnFdQdULlQ2I9RWUqQpdz5zftuvt+XBorl+4GvFHHduAO7zSIHn4L8MrHal5jRHiyZEXVnI7fGXxe37nR2ttFIKNH5T27EPqgrctx7yJL18BZT6Aq9tmLR8VI/scsj7BAo3atQK/xw+mbpy8c9MCX8Wh7ATdUyVwxQ8sxg29mspQL+iuxSWx0w9QODUn1f/DxJrKzc/swoc1cyFyj4Zy2GOVbS4O4n8bJcwgoCNbE6guErpyIEyfZP3dOjtQdda2N5mfshyFK24qtyP101bsbjNS4ydekWgMqbB/iuQiy2kJV1+Lw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=E7DSHuVEsfW5BfOzWt/nO4rVHu7nBF7xGOe7MnKT5+I=; b=QiakaJ6SmIwfoRV9m3qKRIoBs18TxIyKLLVg53VQmOvFE3lg2EHHY+Jobi73lRh55LYeFMWbqphQDwgu9lGToYqmFmwNb8/n1DQSQ767TiWxLWP/R8YrQAEkB58GdCaxUMO92VfT990urDjPAIJ1l+eFBqqd02G1LqWw+FjgY+f1ZR5w+6F4s19Gjc+D64Qw3DFxbj6Ydv2tiruO1O+QVN03z87Pt31A7MonUkwax5frKgZgqoXbLnNMZm8vgPD78WVYHRI/kE8KlSYjTMt72reDy5gXMGYwPGIV9L6gbBPViu5ghkrjnvpNH8P2IKzQRqEF7lS0XF+mQ57gBpbgRA== Received: from MN2PR18MB3328.namprd18.prod.outlook.com (2603:10b6:208:165::16) by DM6PR18MB3619.namprd18.prod.outlook.com (2603:10b6:5:2af::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.14; Thu, 28 Apr 2022 17:17:25 +0000 Received: from MN2PR18MB3328.namprd18.prod.outlook.com ([fe80::46e:9af4:d749:f44]) by MN2PR18MB3328.namprd18.prod.outlook.com ([fe80::46e:9af4:d749:f44%5]) with mapi id 15.20.5206.013; Thu, 28 Apr 2022 17:17:24 +0000 Message-ID: Date: Thu, 28 Apr 2022 13:17:22 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.8.1 From: Felix LeClair To: ffmpeg-devel@ffmpeg.org Content-Language: en-US X-TMN: [TheXgCn6moUJC2Nht+FWBZbywK6VxrOh] X-ClientProxiedBy: MN2PR15CA0050.namprd15.prod.outlook.com (2603:10b6:208:237::19) To MN2PR18MB3328.namprd18.prod.outlook.com (2603:10b6:208:165::16) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dfbf1a70-396c-428a-9cf4-08da293af58f X-MS-TrafficTypeDiagnostic: DM6PR18MB3619:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8lGD4ph9oYaSf17L10TlsCPg56EDqLLr30nMico/HEGpa2XK3DuYBpS6VoLxruR+epWtCuEdQv5xfoLaO9UBTBRmAbuFhvgvNaIMlgTsDPCseuzBasaTKkiyG3EXYSEdYmrkga/tWpLg9l48h2evxDPP6ca28eAol8t6gQT4odGJAwltXr/aYEQ9MzVJ4y+XoNqFMsg6nr4cdHAdGS9gtjZzNnhhTvZFr3b2dKXpFVFEy/R0vLgwccgNCsw5u8YUsBpi22cFGQDyTHZzMy5g3z8eX5ikROUNICKMwni6QcChAwtjsNpXm00XN3cDTtnsPD6iH0pCCjRc1BjeERDVaPBOat9TqEKqDll28oGeFRvfTW5yLD1HU3xlQQ1ikiuFLY/s/h6LauCrGegZ2fEOzOpAWZkb68nuWb5siqFC7LW61aqhZt5V1ZnNVNAboctVPw2ioo6fEXbadxoVWbZgLf66coPTEo0FKFCrVZuIQxtyU9sNxp0W3qm5LaY3zLM9NEeRyT0MrYiIQKY4m2r1DoR19cUicUUz686xuOwwUcNY9DBOiGzk9VhuvPkVd4jHZUUGTxHuhuoqFYzY3HzmnQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?4XnOvkX7AMH5kDIWeGsTWLgLCRPG?= =?utf-8?q?M7fiMk4bNHjI8semtLJFIfD/RbejCA6Mpm9jKI8KgXiu3Pdrlo9fqnu6mD0mJM6Ik?= =?utf-8?q?ak7swY1FwnBWsh195uT7+kvf50Erp4wzDLuJF+5OMUQkAjQy03dfy20LnzGFoZc6g?= =?utf-8?q?cWbKAWTouBq4lu7urSO4t9LnIN9Gjztes0TMZnRs4EpOK2optyh/Uv49NwA0evNYb?= =?utf-8?q?N70liD2l9HMOPCPpDhw71+CxL7AVfPx24cSF5KofCbRVVbBXsZWkk9kwBSTqrWoYf?= =?utf-8?q?pwW4LSCVtLwcPGxxNHzEN/uGHQuFJRch3GCDtXZvfaCr0kATmpHoFKkkMh6QfI/hX?= =?utf-8?q?+giwaXY3WzxuzyNRk0QEoQAaS7PEeOscqKi/dMk9nAaPzdIHbVD0L1QMSN2J7xInd?= =?utf-8?q?qIsVt827yp6pA3cRLz0lS2RPtQXCWGC5FbZt8y88Y1qXsaeVJwm/B1leoZuvILMyt?= =?utf-8?q?MewP9ksuem3YXn/0NNP/CCYMDJz+hMxco6SmepDomzyhdMld0ROic+JosX9T5Rd+X?= =?utf-8?q?dq81/Vonc5fTjN/o7lH847af9Fc5QcFbBEmdhjCQExCnGDN2vCc7+MAO7kODQboyy?= =?utf-8?q?hVcvDjnIDDd/IMBGF/9oUQRdyVysRLat/xzTE8LLcWy3k3SaH0CiO7X15XpcNo8su?= =?utf-8?q?BfpY0boBulUk9h0CJ2gPTc9m0Xf5uw0E/IQftiteoZSACG1aOP3vpeDnN/3oKe/3P?= =?utf-8?q?4BhT/pdGccDKCAutSd6luDSxs+xgUShe2lLow13eGyDHgWIiSUNG/z84/DL1srdr2?= =?utf-8?q?htJ01sH8mSQyiu8c9ynVSV/2kkYXOEBpYCU3wMgcdW5ErtnmIycw/smsIrvOzO1IY?= =?utf-8?q?GmuMQ6hkBacrQXmgvzWbJ/zGS0+04ynTplxGrozrM3ZcGpFfEZQfl7WfLDRJY7oQP?= =?utf-8?q?Q+1h/mOl77oFVAywBG4gIE0nnFi3oQuLKFpVsKYOSbf/HO8+yPyN2ijKoISP+oUID?= =?utf-8?q?eTl6q6VxakBig4j6DxbUrPY0IDxFZMZ9JS4uy5xsdBwcVwkpp42iD9WWXhVkb4bME?= =?utf-8?q?vAKW0qrLIIiK3BHL6ihOmtBW3ZhQe1DjAtI2aeDSf+kPPd04Y+SRkhLZUYLJGtfwx?= =?utf-8?q?MPwN46bGSsuvVQDDw33j26ibQRIuoJ7u2V+PhilA6u/ezYA56iAEm/KTttZOVHgqw?= =?utf-8?q?aKRvhh5Ke7JbLPUheuLsxJcu+2U3zQh57zRYTmx9ZJf0hLl/E1cB2RsinOsp9y+fC?= =?utf-8?q?ToqUrBWT0TK57/vHDSMRgdsubR93kc1ArBk3D5duLlA6+UtLkmafcte5tItpdg6Ph?= =?utf-8?q?6ZJp8W0YNwUVBTdmUww4x1oy+EAeQ1R+O2uZERVbE7ihPmY9TK+BWK9/IaqdPPhpg?= =?utf-8?q?vV1KCT7o4pt03Y9RO+BnfX9KHsXH8K4iIVmdTICz344hryu+U4r3sVrc4P0G8vMM5?= =?utf-8?q?7JgvasCsEgKIzJ?= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-db494.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: dfbf1a70-396c-428a-9cf4-08da293af58f X-MS-Exchange-CrossTenant-AuthSource: MN2PR18MB3328.namprd18.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 17:17:24.9142 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR18MB3619 Subject: [FFmpeg-devel] [PATCH] Fix AVX-512-VNNI_hevc_qpel_filters_avx512icl X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 4/pyWss9vzDo 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) --- libavcodec/x86/hevc_mc.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) %else 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