From patchwork Thu Apr 28 13:24:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix LeClair X-Patchwork-Id: 35466 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp3587874pzh; Thu, 28 Apr 2022 06:25:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxoktkBy8UF0wsHZp6+WFAwFkGN/ts+8p72nsge8rWwxNA+3H4tabIAXiyvBuiFT+/vKRTt X-Received: by 2002:a17:907:6d27:b0:6f0:c67:c0bc with SMTP id sa39-20020a1709076d2700b006f00c67c0bcmr31240330ejc.432.1651152301936; Thu, 28 Apr 2022 06:25:01 -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 a19-20020a1709065f9300b006df846edd5fsi3748481eju.998.2022.04.28.06.25.01; Thu, 28 Apr 2022 06:25:01 -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=F8nURD9k; 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 4C27568B3D8; Thu, 28 Apr 2022 16:24:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10olkn2093.outbound.protection.outlook.com [40.92.40.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA97368B3CA for ; Thu, 28 Apr 2022 16:24:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NtJ2I5qumLuEwPaPqiAyKfav7OT60KdznrWnw1aWJMqLbMHAWtSf12RJnFD3LzDjFh8Ayf2dF3We100A36HrsCOL4/AYor29+NXpNBUfIXlPwJbVzTQa7Vopc+k8v7SuAJ/wnpxkshxB1NsAENC5elOijTHqOGBHgCe1WOq3wp3VynJw6D4N/VkPssW2Z4x1/nm2V90DTzkhuBhMKi4fM3l2HlSyqQ+786mDKd86jnqgKZnzDrTLUKTcFB46fXb3COvb5P9v/3ECajkK32RHf3qPcdWzjVoQWjqqpOskT4hUZCZ1HYTpniPPIh3K4rIDAKJ44n8LwhrtgMpTQL8XCg== 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=VLLF2qwKgS+91yOzs98PwlFKoQZzOIY6QVYQu4eK9I0=; b=Kj0+7d7tEpWLXp59lq8BSKyfOnI8+apgRIUNbKdRRmJZr19c1Sbap7lBAi7iVHpCwwCtI87gXXaZylob0U4N/hRu8RsXT1iLtCjG8ZMyrtMBHEeXwRYqPFkJJ6wwx8XfDBd3zynaG0+P9gD2gLKZ24xHMFIElczXeg3JRJjDl532o7+SFcCD1y5VLxX2cH+u4Jo37he3M4dopO97webQSGa9tNbF/HVO2Tcyz36FjaJoHrBaZA05yImEbBUOTKv2xT9TN1HFCmHDx5ht0uxx1BJiCwWrcR2GY5HxsJWoW8CrRzOvFfRBNnPKMdbJ9JvAARAp66Ks2/zg7Xx2Z9wrlg== 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=VLLF2qwKgS+91yOzs98PwlFKoQZzOIY6QVYQu4eK9I0=; b=F8nURD9k/p+m1vUSxEo5iCyNJcyio9FwSH32TKD97KMfI2qZQ8psETuUmGT7fNm/Qp7LIAAHEbw59jNQ/CR3xl/6oM2hTA6PWHV0Dy5vpbW1c3dQG2AeO3POs9Gd20i8w3hEsnIH6ezoAqmbJHOvMwyRUpThdGzRTvM5ehCeniL/eMGPib7e3fbXZ0qfcJZPBzC/tBcefvEe6L9mZpZnNwYE9/CyWYpeS/Gwv8TPtY/GqXtJh3Ch+Pp8wKOrbqmqgU2gF5BnE7KE7kK3vzu96s5ZySlA/f7YO/FaEr4CObWAQ33wUOS8xgOrqjnlLK/7h9XOMz95Ah5qU1AezaHTbg== Received: from MN2PR18MB3328.namprd18.prod.outlook.com (2603:10b6:208:165::16) by PH0PR18MB4104.namprd18.prod.outlook.com (2603:10b6:510:2d::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13; Thu, 28 Apr 2022 13:24:53 +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 13:24:53 +0000 Message-ID: Date: Thu, 28 Apr 2022 09:24:51 -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: [/eCaTKCbuQ8AOLvrB+E90r8uIdY/ITJ3] X-ClientProxiedBy: YT3PR01CA0063.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:84::28) 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: 597026d3-a812-492a-7d67-08da291a7a6d X-MS-TrafficTypeDiagnostic: PH0PR18MB4104:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ucc3gTFEfZtTKbcG+vQsZKtbM7DkMMLIKiMoVIiuQUwIk8bcaXSe/6zYu5u+6u+130h7rEInD6EiC2DquJw4ZhelqjPuxRZiKu5AlXgawKl0s+7InRE+UORRjEuNTnqEYxUz0NlRlGJdgvxucD+1c8u6xrJ0XWbfi6UEP5nSMglnVrz6hWrvhcPfVO19vuZQGLQzuPv9XtMUBVQNpXQSMwLn8/dl0H+6RgOn/1WO9QTBVAhlzanut48D2ilU20o4I+QBaNade2f8uViLft/AikVoBt7GHWoCRW30HyVkOdWZ7ByAGTr5CEeIOsywrY8Le7yCkkEWipKKWGBHQWFH8nGC3zO8n3ZNdTFzJDjIGqvpZsYbFxYRnZeMITgabgatNebHJCzSwQwCuUeMhZSd7ww6gYumsV00S8WpvdfshHdTx3Q+A0CWzZo3aSNJmRd/8FuUoXu869vd1y9a7NF6UPLZWDa1LJoelSjyUGZ76TBkWOkUzU7VBviA3HBmUiMfCMu4582Lbz7dp7B/NvAUnQ7iPTPAudHnrDSGdO3JTE8DpQlyY6Jfe16L6SZHXDjSTmcZMi8vgKjB/wq11Z5r3Q== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?KEHsGDqKf+3QlyPH0Kcoe66HHfz0?= =?utf-8?q?EvGleqHOT9JPnFHEmXkxU0iG54Ru0hHn+AXqeQp48dY3FIMN6UWsl4nENJ+EqCNlZ?= =?utf-8?q?E1vt1Wk+zi2OXE74jnjuH8FMwEtBe1FAEAyUcGjoGNBeB87jqRIgmBfQTu7fZ+dyi?= =?utf-8?q?KOTBiT9Ecop48kQjjlIRrITrrhDNPPZ+ISA03HOKeL1HdRVxtRDBy3q5gA1ae08Jq?= =?utf-8?q?z6jPsSWhUijZb/ejpk1nhyVmgwrgup60CHlDheV+ihThelbJ9RqpjYSeGf7VBLnqu?= =?utf-8?q?zuzn/SBOx56Xyuay4Nh0lbJIN5Ke3bQVCRJgL0ERP8wGqPn4RkmIJZBMMaJpgFtU1?= =?utf-8?q?6huSlvWgiOk8I0kdT9bwt3H5OtFvDAn1gWA5qHTNWp+mlhD0W7YzGRZsvgmyfaeYu?= =?utf-8?q?flQ3RNvwY0yviFoVAkRg/ABKs4DlDxJaZmu5gyOuiMqu5M1V0hTSp+QbZaurv6fHu?= =?utf-8?q?1TdakRD13WRsoa3maGNsrkPM9SR3kwrXzMsSWC1RHi5ASnpWkNuym3bFBzHJDTl9l?= =?utf-8?q?WtdSWrkUh5FHS1zMRpldwdnYLqI8pxpB5lEwnZY0jdxXn0SzXT08M+5XYCWuIoz2N?= =?utf-8?q?0lYqfGnZ66UThzMrYYcbXxdPR/hExFoUTgDoRnsVA3K8uybrijLJCo+q3I7xW1970?= =?utf-8?q?vaSzkBTyILFIjJJLbPMmmOF5+GTt6u0E5W0wxh0i3tJ3KCYlZgBx4G1B3Td/feR52?= =?utf-8?q?xd69hq+dWGnLq+IUnckwiViOsnmToVb4qqVjF2EmqPXfAXrLECdQyrDzDTVZUbikW?= =?utf-8?q?LPwhzOgEqJPcEl7Uw6Spul+Qm+j69bHI1HDP58wmYlrvQ+6E2UNJKLuRVQ+yWvQFY?= =?utf-8?q?6lXLLSSXcG4Tm7aTBnAwA4IcaN8f4Yy/vji31gsbgVkYg3u5SKkUrub0v0UPy+CJ3?= =?utf-8?q?S+/JK9wGVJ2fMP2DgqPFr/uGvzbkg9+AOa4UNrmv8KFE4m+8SJcn1EPI1G7tD/Voz?= =?utf-8?q?+70o0TR4XJPxQgXxmSvoQsQKTdbGWEiyR9Bo2M8GCsBSQjG8g7WRX8gITmqkTPXab?= =?utf-8?q?cV6ghn6XltCkP+BMI4XsARqeHp6xXD5FwxMFPfDA7zxcD1rbzdxgK5FPtqcPEWKSI?= =?utf-8?q?RoGWmOrkuXss+VI8b1PhQggbYMjQNbJ5Xk0FnaC/VH6cy42kwwFWOwLBCAmVZzl/B?= =?utf-8?q?vnNjblZVo7MZS84hiZyg1DcjU08py+M7acJblqQOQG3XL+HMdonusr8Dl2Vp+qW5Y?= =?utf-8?q?o7U33n0Q6CMqmsAOHi/OB+zjCevoffS4g+gjHzEOq+BLrUk47z/8zBjaaFW1c3mVs?= =?utf-8?q?ULyJ2VMk0o9GskcRDvguRQYvEvaMkA9VYYBVxaxMhtbX6oTsihK4bmMb6BBQ4Huhq?= =?utf-8?q?+4N2RqmwkFcGRJ/v2KipmeQp5iWbC1iyMXCyDqkZH5+wVG5g24yNBPgKt6CRIkSf7?= =?utf-8?q?LbaXTH/C++AoWi?= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-db494.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 597026d3-a812-492a-7d67-08da291a7a6d X-MS-Exchange-CrossTenant-AuthSource: MN2PR18MB3328.namprd18.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 13:24:53.1699 (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: PH0PR18MB4104 Subject: [FFmpeg-devel] [PATCH-v2] Fix AVX-512-VNNI__hevc_qpel_filters_avx512icl_v_%_2 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: miehtMBmJFlZ 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: 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