From patchwork Thu Apr 28 11:23:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix LeClair X-Patchwork-Id: 35465 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp3524220pzh; Thu, 28 Apr 2022 04:23:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy1QSOzR//9AbSklw8ohx/QKIt57VXR86dk2wRUjJvGJG81OMKjrn7ylTVE72MSt1EwQKkv X-Received: by 2002:a17:907:a413:b0:6f3:a9e5:d076 with SMTP id sg19-20020a170907a41300b006f3a9e5d076mr14219526ejc.183.1651145022709; Thu, 28 Apr 2022 04:23:42 -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 b16-20020a170906151000b006e82dbd30b1si3563296ejd.83.2022.04.28.04.23.42; Thu, 28 Apr 2022 04:23:42 -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=bYqi+jdu; 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 2AFEB68B3C0; Thu, 28 Apr 2022 14:23:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12olkn2086.outbound.protection.outlook.com [40.92.21.86]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AB08D68B39E for ; Thu, 28 Apr 2022 14:23:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OaV8TROy+KTD+tliFsRMgz++8NPFBAqIq6UhZErD749BJMrtDmmKBVJRAJIr/naCBmOpyTCvCTVZBj3+93F1DHCjHQ0uSxqpv8WCMtAw5NqM8QuXuC7HMphDFiBlRCaFdMAUe6776mM5727bSEXzdxS33ELTdYkR2DHw/RS55m4GHJahe456dLahEquqrUY/APQQ9NAPCGhe46zgoDwamd1kHkYr5ssy2xHygEkG5Sut7NvuR6D2dvSdlQl67rwDGSxcbdQcfAw0I3a91feTkpoI5JMPUxK3DVmRuSEa0H6/1d0Z0tJBRmAw6uJOwtcYLEJ+84spiDLY3TNs3p9c7g== 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=2S3sP9AlfqRt+7NIXBqToCdw6s/ap/uWnCzsEZoU1Y8=; b=OwKRv8HisOO30znJi1Ho+hUgpPBSrWXlq/GXt0H2/zP/qdLpm9EyXsDw2a61AQShgIPbbSV3+Ej3S52+rjh6IZdO+984UlZfSQutm0ebVaojZPdEvPbnXsii6kG8PuAirpHfLHXtKp7cczY772vfbYrNDRjQbFlRg/cuNAda02FjJe+nwrShqr+AJi7iNaDs5zK0cts9O6kB2P+byp7AAqBLPE3iByBx1kCknozbqB9T5nRfMS6AikzPqPDIyb8lFD2OP3LUytyYVKr5cr7UAQdt3wdSVoPsffwsEV6q2Exjm12mhUHhuCV2FKUNaGVT7VP54hFFuVZBoJyTMah4Qg== 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=2S3sP9AlfqRt+7NIXBqToCdw6s/ap/uWnCzsEZoU1Y8=; b=bYqi+jdurvAlnASwPeqsjBeQbEyaEtHRT+tfj2ZMXCLOX0skGPWPA1XvAM9/jfu+UjDuKFKNuGWP0adgNjsA4OjJFxWsgwGdWrEbNrott3JHnzHPdreVlsAyX0M2DUXG6K+iPVS/yUooPD9UWZvZaRjIsmgPDhZJ2j5FSl7jMWqeeGODilMOOmbRbQ4pWgb2G/GryaRwElDFQ2zQAYg7gwPASJYUdIhZiIrTaKt1FrZWNBEGUxA223A4fZWQeKMQoY8OcH7rYE9sH1gg2OZjtq3WgoeqbrC/R0mEOAue2E5v+GweiD931NBKJg5gBntAqhpWqWwziGr8bPJkuQFAog== Received: from MN2PR18MB3328.namprd18.prod.outlook.com (2603:10b6:208:165::16) by BN8PR18MB2546.namprd18.prod.outlook.com (2603:10b6:408:97::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.12; Thu, 28 Apr 2022 11:23:30 +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 11:23:30 +0000 Message-ID: Date: Thu, 28 Apr 2022 07:23:28 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 From: Felix LeClair To: ffmpeg-devel@ffmpeg.org Content-Language: en-US X-TMN: [HjDhcne9YdZg4wnd5W3xZj/jv+sptmV4] X-ClientProxiedBy: YT3PR01CA0100.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:85::33) To MN2PR18MB3328.namprd18.prod.outlook.com (2603:10b6:208:165::16) X-Microsoft-Original-Message-ID: <5fcf3fe9-3245-82fa-1811-88d67072010d@hotmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 87baf54d-7da9-4171-25b7-08da2909859e X-MS-TrafficTypeDiagnostic: BN8PR18MB2546:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3BCJc6++QFK3isg97o3lKTWy4W4NBzd7FmuBp98am9kGhXUc6eMLev9wabmaevPL/Ec3RwaTgD5xXqaY5lcFQsAOYAZ8nCC7pURUXvGKIlgwISA8PWZOFRCam83NAxwTQmOi+jGkxrrkskWQzFWrVikVjJwxRwUbd9tQPb/Q+MUdTVjZ2J9eEUqJziYgEmY/78hXcfE0jfPT0kTIt+/1GWc/QNUQvT9z5cqHRIUkUC0WVstou4563B3t2RUCfxRVLQku0c9Zi1GIj2dHkUH+o+NwvGS3fBwwpRkNpveSEPmLjl8kOT/tcI6JrMhtPa+AxLjBm+415pC3sbXiZicYwUbcLjD6c6WOv3rADYaxuho3oF9NikY++eFqIgIcE3H3Tr1dTH2CeLRQREyEwdwaAVMLqhzwBwITbLzlWjbaa1+r1tCQNjOObWClNCuiU0Qy0qneygkQ6ZfQnGeLe/Vg01oEcpx1pVrQDtNNpEm1p74b7XyK0rVVCNoDHjb0K1QXrw7Iw5d23FnTxrGAOSX8CnWT9D5N4zIwr2zxeQuk0YJcdcwWTeWgBUmB2yR9lzPTx8ZbApYi8MnkhBZlEKeGEw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?QUp5RGfrsoqocEznFLFjHV47nOW6?= =?utf-8?q?m5YX5Twt3TIKv0yuC8WMeTa8Gnb6Tt8FxK07bH9qFZa+IjtQJJ6GTLnWsmsxGeZWL?= =?utf-8?q?d1CEHPfl0SaFdT7EwD5jAupAU3Qz5rZFGwDmhrH2eyJKJjLCmkbVvJyYxvacPhbK1?= =?utf-8?q?Efl3Yt3zHTuXRxxG8ImBYv50rUOa+gKQTX2/SnHdv4Fe/pX2ugFMjG7E1DEOQoMBm?= =?utf-8?q?hAoNsoQ8pc/fL4gzEgTX0xT33tcjXPVmcZHUHj9JDI950fhks4pjOnybnrj0s0LrJ?= =?utf-8?q?48RedWVENpsXVYvNr2qVMypi8BpODKLvwrm6Cr2oMvJhuRIOK9rBgF2j2tGJC+gRz?= =?utf-8?q?YMWL18vOTjR9EoqtiGzQoxbjpN58sotmFMu/ot81UR0opUXL0LvMc12YPE9mROgpu?= =?utf-8?q?EZZB+zuuEU5ditWXttWdUS0qYTq1JclagjeKiv6SbKDPXGp/xK5zOtAU533BSMbtD?= =?utf-8?q?dsLVd1/u3IQIGff3mwWYT1XANpGNsvGN/6lhIv0K9nDiglrq05Rxoj2ldiQjcnkKj?= =?utf-8?q?fkCq1zXWKHqLy8rTDDbvVOw+W4FmtaNaIW9IZk17B0QtG3acjXHrG/MZhknLJJGr8?= =?utf-8?q?5ieS83PJ1KUGi0wZuzenEV29cdTHLj3RPDViJqZXZ/8wER2SaHwCsTNeoVhzKYSLn?= =?utf-8?q?5v1TKLGRfbyZKM7KlRsLY224Alrqwgyv9wHX+YStV41kh5Yfz+GoqnGF8V6p0Eo/v?= =?utf-8?q?XbsgO/JHaM3pCb91FUTicqf1utKLJNNnDgBZ6vAQZKx3maoXTSaw+8p/qPhDmDWuW?= =?utf-8?q?tzFo22Nz5cyDrXUFXwt13xSWYAFQsqf3Dq8y1JNFpu7piL2gVDMY8AOxjeTj0RcWh?= =?utf-8?q?z0c6cr3y7s7ZLwKFydqlhdJxjzRAjyGfkRAY4czuhIH/bu4tWknP8Y3ayFZqKxUa8?= =?utf-8?q?fDTLZUg/Fq6y6nB81OWXvoglMnDFoI8ojFKemWuI7KPfwWfq5s5BwEiUBvB04NTTy?= =?utf-8?q?YlA6I7HQUMk4N5mIe/3SPbb/dbgrxW669VNn+qS2ay3YtcbHwgzmxwgQU7zm0w81L?= =?utf-8?q?OGLUsrBPyVS++KvoQaGI8jsZg7bZL2jjLvKhGvO8/i+Rej/zAY6QYaDdYMv9IJRcq?= =?utf-8?q?PnA3UMbcgCASp/BNYHk3jEW3RVETCFU2c+h9RiE/KhW/h7OeQzJT9ilDhV32piXBE?= =?utf-8?q?DARkNInNABrx4lDjqmCWAutDabDJzjmawh6m+ZMxPvxTMw1huINOCNC3UOLZJKZDI?= =?utf-8?q?DXvsqCdyqglcROOXGFYdvc/varcWmLS0HYpr4vJH3dqiYXhKjUFMxXanKc7UM0Kxd?= =?utf-8?q?asTtgDOoueMPM9PCCoIQjbSt59f/0BwsKN7hs0/iyUEaTU14/5wdA7FYA7cgXuCeZ?= =?utf-8?q?/o/ZQMcP+dbwZgrgJjXl7TtSwwb6HtYCvYRo140pvJAbKrFzj+I2u37wyWyIW3hVo?= =?utf-8?q?fISQEJqnEK83FL?= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-db494.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 87baf54d-7da9-4171-25b7-08da2909859e X-MS-Exchange-CrossTenant-AuthSource: MN2PR18MB3328.namprd18.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 11:23:30.4993 (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: BN8PR18MB2546 Subject: [FFmpeg-devel] [PATCH] Fix AVX-512-VNNI__hevc_qpel_filters_avx512icl_v_%1 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: 9I9pXbqLGFRi 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) Signed-off-by: FelixCLC (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