From patchwork Thu Jun 9 23:55:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36124 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp655393pzj; Thu, 9 Jun 2022 17:00:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx7wY7qHLbLbKKLSLKqyvswUxvRVP7bF6oh1xV/GqNbsutlNjsmO2teo2rw4mLbrWA90avt X-Received: by 2002:a05:6402:120b:b0:42f:aa44:4d85 with SMTP id c11-20020a056402120b00b0042faa444d85mr38776705edw.338.1654819205150; Thu, 09 Jun 2022 17:00:05 -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 t17-20020a1709066bd100b007035ad9a503si9565708ejs.325.2022.06.09.17.00.04; Thu, 09 Jun 2022 17:00:05 -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=@outlook.com header.s=selector1 header.b=QvcfzQjB; 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 834E468B8F4; Fri, 10 Jun 2022 02:57:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073013.outbound.protection.outlook.com [40.92.73.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 213F568B8C7 for ; Fri, 10 Jun 2022 02:56:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UPn6Fd041OMJ/WGmycwDrWrmOaSIGB5PvvBR+KE0lXr0Ilz30vEUqjqo71X5zfstUAd9fxEHv/cJa4+jHDpE1CtA7TTlf//gAu6cBCsES2SOWnt1MBDra0bTBy4WltP7uoLjGjBk0GlskUwGlMteO/KGAHC4KL7/6iGSW5Yc/RXeyCn20RDrVVhhXDVjQ2GG2lhL3t1oYnrJ7hsgX1CGy5b2S8IHbF/bXO2E6I2hoHhagVl5c8r6YSwxwXyfT7XyJgwds5T8GZB0PNoArLWgK8Vz0hefJ5e8gE8RxxUb0HBRTNl6moY8ksjmTABa2pJRYp1BNCROPn/HOrXc+bZ0Sg== 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=WJ3w6OLhcPqAiobD7hx4cnQp5DvOFpjG8X4P6junb9k=; b=jdK6vnVNXb2L0ButjUCGNQwU7a4GuwkrSJ7Nb0v+UakDdNKuHlla7Sy+pZ4n3L8zhRGbhICOleVTDTU3PR6PB9sPJUitvqZd8CEwb6SA2wMo26Wskf/fYK8bw89cigditDBtdqU68ph4LyI7QlspjdopJ7KaKwGN2S2cH9R8tuHFe+upH6bZBGhIcVlgFsd6hRlWe3FBZlrbcWazKFWyD1zVz6VJtDlkEQF9bccqfq/dJ5Y4BcuTDY6oMonoPLyDt3ee6r7FOs8zb9S+H7NXS4qTfXGvDC6PaSlUQW7ZpKtocqKDX33jN+JkPM4wKRfa5nTEFtx6Xd+xLCXpJYeCGw== 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=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WJ3w6OLhcPqAiobD7hx4cnQp5DvOFpjG8X4P6junb9k=; b=QvcfzQjBRILwrg+ADySqS4m2zjrj7xMDWzoIZCPrt0ymm3PfCaIQVlmhebN/ymsjrCSwG+Znj8nR8UcfEs/MJbbNF8f8tNGSv19lJP9d0VA/ELBLmZCiHE2vzO1PPG72IZKEay/f/EzldIckR8IzMosL25JKrdrp1kC2dkFPZiTpSPP28SmXXfPThpml6ar8TJugy4ez3zZUoRVly/LaLTT5KluYYaZfFidHH6IUD/9TnL7aoDpJ4Lt0u6pTKLywHCIQ7gJdkyBbPkbRFOJpzDqKBwTdAcXNbflBSs2GIw/l56tjoD22ADCa+kUY18g/1AE+ngXhZ+Wrmjq84JrguA== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB6PR01MB3862.eurprd01.prod.exchangelabs.com (2603:10a6:6:48::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.15; Thu, 9 Jun 2022 23:56:57 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5332.013; Thu, 9 Jun 2022 23:56:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jun 2022 01:55:08 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [Y+UHDfXVE7hbMShLHK6aYX6Xir6dQO6X] X-ClientProxiedBy: AM5PR04CA0005.eurprd04.prod.outlook.com (2603:10a6:206:1::18) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220609235523.458689-26-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 47e0ba63-b9d6-4521-16f3-08da4a73bc93 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTijo6adWu98SHbtEySq1lKLkAYCmHAduXdaKWs31JD+0jDYp8N73WvD1chXvPwZoi7eAyHul819mqIOSQQV3rSG91QPtOlV+4Ps4AHuS/afGTPFcNxO6zkJMmvySjWeDWJctdpiQ6K0cpE3/wbwIZQfKhUxZUxqIMRQG1OhH0rF0jwMn0ALIMXF4e9/p+vKtlKLzAOkZgm4yf0KELv59phiVGyl2e/77T7/wt/wyKYDQJlNRZ5x77HxrL1nedVcIVhSvm2o8peGmDim21Dpnhe1fXkNZ81y1zu4SxptMXpHyt+OptAE6RztQx+ev2eJr/iOpifpIV1pmbtzoOR9tKSbLhaDvxkjmYARUYwijki3BBgJ8LYO1AcB7k9ikbGKfT8L5j4IK9errwzyVBEX3Jx8LHjbInqEKcyMT12g+5Ku3v1qqfiNhGzLiYHeG18CM7+WtAHsKEI3qZzfoLRMthVUUGJBaRTXteAfNaIzkEwAcmwkAzMQRZAVQmFqzXs2Is1zwiEc5Vcnmb5ULd0TEoQPwY0K9saZsmLvfXBnQ80kPfrF16FFsrSNtjBuhdygqeIMxkmi6ikwVgsEuP20/TBRuCgHHYZ5ylMKSNQNOVTxUh4znfJ90vI0Au20Mp9MDhsqOdJ0Tp6uk1+iHYroP9T/OizD9hYNSPeknzFziTmX492bBUGCk9Eo8E65h9CQBiMDtGGisSjcZIFftXHTiCt3oayC6G0sHhcned/gg5iy3r9Fs3lgBVcxq0M9dhWmlg= X-MS-TrafficTypeDiagnostic: DB6PR01MB3862:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Nb/mzMER+uvVV9LPCLW8k0w8t64W2BMJQb6wkXPLWiOKFRWOUzy12Ap9rgml66fsipxcsYc25aM17Z8Wt6DWuHqIeaODXOXNilhkuEk/q9/lCAyg1OsfyYX2FXphR/i4foGZzE8xS9b9I5TPhQFoITElkBbptjasIyJ5/yBPmDr7mHzC0HtfG9x20YepAz/igDNcRI2O6M64/IR2AD2fPSqkd4mv11sAG/Sq+dfWz6/H4F9n9ma7vjyoFNjIl2/+2yFZL17SLJml6KJQ8wjaSsGNkaYhBox8hBurnAD5A/bpLkzLP2H34kPLcnSbi5kcB0z05MRxOC8yRE1qUHvU/w11C3opej3qau2bIFDtyQMRKxkWiNV+xXs2atPKrz3VCGNXHEam0zo+7SOK1LRRNkX4IxuWzj2ToFDaRremmM5tvVHMoBb7hErUb9l/fqWJGNurQiBhp1qNgXyWeiMJgip5rHc+jJfU2t7bVIbgtdLLDkFbZyKydCzVZTctU7rxxjogmEcYELWn5tDf16woWRGdp8RulyR8xUaiHnWQUaeqJquKz9YSyHTDNWEKXXYRfvY6J3ifJ45DmOyBoXvUxg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hQK+OWWqEnVtNTABoSgKbxnZ98DeyvvbasxkQhPTLU0pMazBaHzWJK1pnFVc6NM+Yoe8VILOQ3kYOmELJGq69ZyKR9sYamh0s1Xw/95B5tI0sZpvn+WsuMY4v88k/8Ywgf5Eb9b6zAX5800YAzRi8/7sN+cNYLqPENPoE5s06rgfykkttlLiguh54pCpU2yLihkGtYzaHW0C3I4qDcSzI7im/p1s8wIFt1HLu6PKLvI8nDfJDCXpL59zZfTwYL+cjvveokTKEHPXp+BK3auYHXmdxnhzNTlFqbK7X84ad9eQLtHP53EXY+z1b9ekKoKtMb+MbdtIGz1ntxhcTNirBOVrYWuAW1y5/5JRezcPQ78iEUZieqmWNUgY1edET6HZSRBuKWDis3HfVvfB88iGSbQnUPyQOi6khk7EuqPgcmX11aGvz8FfOPaLTRqJu7E2Z08IfZWBF8SBwxKxpekUioMSyFhHl+kfgESecUsxCy8C4Hq0Szj8wTxs9iTSi/9rvN6J3UqEmYrARMstwMveaw8nELKIZzQLWqDu62p2aissK56fkamUgqkbxurcjN4fRSBsdHdJ4md9XpL+udNLJq81fVMSBikTpqaJrITUiM0dDyMgXumdSWxXpFVlCgLdLfT/hGH5QssoMewCd/hXBtQR50fewFGqk5sXIB2g7xcP9xEOTOcG3DBijyQCBj+HndQdnEOLSz9yJQGbG0M97DQnNb+MTPV7bFcbtf+7rW8P5/ylMAurY4/wTqGgyobcyDozZMz3tmQcJV9wKYErw6887zuopvEb+c/X9VRU23fSVdrj9nDlke3FQTPSjvjmlHc4eZV+AQFwDY3tuh6zw9Z1MLhfJEE6kGCA/PYjcla6LRVqRcAAwBCqPEaorsk6t0skhjyGjCHUh11vzz2BFB1r5SYeCgzemQX2BpV1N1ZVz2dMFDRM0DR6zy98a4naT4Yy3kWz6ygWK6F0z81rZtv4CB806GO60i5ts2iFAtvwQpMqUXhSAYiKJqpdLMVTvnOBdAH0ny8pNIz7mT14G5EfgUTarlmDjtCBUDl5eCEHcjWALh/KII4zOyj0v/KXX3dAFZuEB4/1t6fggby7TrAGZc87Eyb3/wGm8iVQGoXMoNUo25R2fIFE0KVcTGhip2y7kgRtiwxRR6gTri2eH3u2R0Elp2I9V69EAbZkHFjqv0ohp+IV10QzmKb+8FN32gqM1BDycRCNNO+JWP9Kxo1WZ2aJd/QWAhcCX3Md4dtBi/nQvA3+Xnrm0ZaKX9YjF6unnFJbmsKVwtrabcUJgA1cUPj2hvd/fr9SYws5Rtv1eu9XUk0wPjL+UCVCcJKjT50eLDhZwesVn4LjZIjNWV7PZrRVkV4l4q0femTsgHVHuHLAq/xHPXtGrNeavcb87Ku6clZjfcRnljVOa+2W6evhz5jqAlJr6Nw5AQ1chCTUCK2kAL5CV1Hjy0BOxjKLISHNJWyxhT4p62apL6NHqw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 47e0ba63-b9d6-4521-16f3-08da4a73bc93 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jun 2022 23:56:57.5859 (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: DB6PR01MB3862 Subject: [FFmpeg-devel] [PATCH 26/41] avcodec/x86/pixblockdsp_init: Disable overridden functions on x64 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: QNl1GiyiorfR x64 always has MMX, MMXEXT, SSE and SSE2 and this means that some functions for MMX, MMXEXT, SSE and 3dnow are always overridden by other functions (unless one e.g. explicitly disables SSE2). This commit therefore disables the MMX implementation (which is overridden by the SSE2 specific implementation) at compile-time for x64. Signed-off-by: Andreas Rheinhardt --- libavcodec/x86/pixblockdsp.asm | 4 ++++ libavcodec/x86/pixblockdsp_init.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/libavcodec/x86/pixblockdsp.asm b/libavcodec/x86/pixblockdsp.asm index 440fe29bcc..4a6369d7da 100644 --- a/libavcodec/x86/pixblockdsp.asm +++ b/libavcodec/x86/pixblockdsp.asm @@ -25,6 +25,7 @@ SECTION .text +%if ARCH_X86_32 INIT_MMX mmx ; void ff_get_pixels_mmx(int16_t *block, const uint8_t *pixels, ptrdiff_t stride) cglobal get_pixels, 3,4 @@ -48,6 +49,7 @@ cglobal get_pixels, 3,4 add r3, 32 js .loop REP_RET +%endif INIT_XMM sse2 cglobal get_pixels, 3, 4, 5 @@ -121,8 +123,10 @@ cglobal diff_pixels, 4,5,5 RET %endmacro +%if ARCH_X86_32 INIT_MMX mmx DIFF_PIXELS +%endif INIT_XMM sse2 DIFF_PIXELS diff --git a/libavcodec/x86/pixblockdsp_init.c b/libavcodec/x86/pixblockdsp_init.c index 3a5eb6959c..684879598e 100644 --- a/libavcodec/x86/pixblockdsp_init.c +++ b/libavcodec/x86/pixblockdsp_init.c @@ -36,6 +36,7 @@ av_cold void ff_pixblockdsp_init_x86(PixblockDSPContext *c, { int cpu_flags = av_get_cpu_flags(); +#if ARCH_X86_32 if (EXTERNAL_MMX(cpu_flags)) { if (!high_bit_depth) { c->get_pixels_unaligned = @@ -44,6 +45,7 @@ av_cold void ff_pixblockdsp_init_x86(PixblockDSPContext *c, c->diff_pixels_unaligned = c->diff_pixels = ff_diff_pixels_mmx; } +#endif if (EXTERNAL_SSE2(cpu_flags)) { if (!high_bit_depth) {