From patchwork Thu Jun 9 23:54:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36120 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp654797pzj; Thu, 9 Jun 2022 16:58:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxpMPGUxOyeUaptWahIyl9emT5vnR4bnMW9ha+KsVLfuGk2VAsNSdsUTfVWqbgO/QqEi/hf X-Received: by 2002:a05:6402:3293:b0:42e:18a:d6eb with SMTP id f19-20020a056402329300b0042e018ad6ebmr47851533eda.293.1654819103610; Thu, 09 Jun 2022 16:58:23 -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 k4-20020a1709062a4400b006e844990dcdsi5173657eje.334.2022.06.09.16.58.23; Thu, 09 Jun 2022 16:58:23 -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=B44nLMYX; 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 ED57768B8A3; Fri, 10 Jun 2022 02:56:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070066.outbound.protection.outlook.com [40.92.70.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BFA1568B882 for ; Fri, 10 Jun 2022 02:56:26 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iCMCgESq9fm0PXWvfCBJVD96gFxiEGMkW1+Qbj6VwSczg2tCGI1aR7jgbi1THYr1hA92XnI6i8bl/MNjTemslBSciM8/BCwRrVCdreX1ha41kp34f4bS0R++1wTGcodQi0X8Y+zqRWi1/Aklo7L99wY3UZceKF4IIjnvQ0bCNwB1GWiyB5eHHcdT/Luu5haobeZgET52e6Jj2FSYeHpMCrpKrzMH278Yn8q4U9maYkNuE6Prk5/L10PCI6o4jFKy3RfJo0JElXRWl87HHrHNohQrQsfq1gSCCnBQMyFGMVAHpFzoePlZekJRsjXeXm0xY+NDObkLSzPxt7pgAGXB8g== 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=uX0KlbFFGURU3ScwIdqjpD7wjbDDonh78aQJoj3m1Ak=; b=lZtCiYLmm7JHuGQY/ONtlEPaLcHPltcDIXUYVTWsUGTuzh0r85PIMd8nfXL22cQe92gqDlfHUcTDSk2DpR+mkpvFkLTqNkDlrf0PjvUhCeOnbYbmDuyoU3InMCSumC+G7xXn9ahBJlxEDf5YmUI7yPzI6zU3kBZx1YX7U+7z4Him0jVJtP7gAXhVhjc/xnoE3WxvF3Mw8zLU1o6vE50C2LxrzVyIcWkvBQc+yX2ZfUfxWcQHJ/bJC9BU8qC9DJpLPj5gV1OjZuxqE5c2XzYTBuFFQw5RA62CMDs+xX/KKZZ1jlZw23uiz20GV/6Da+9JdaYsbw6nkwzFzc+sQkdDrg== 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=uX0KlbFFGURU3ScwIdqjpD7wjbDDonh78aQJoj3m1Ak=; b=B44nLMYXj+uqlwAwRXx4wApIvCwkL4kHGaTn1nGCl5AI86xPuWdmVqlS1OxyzVUgtVkSq9Z8Ixr1dti/Qt96hWMcYsCh45luO/JuqEIThHa12BSn11eAPHVuXPXzpnk2f6KHyOkbD26QWO9O/4euPAlTrGb2Cb+exF+F1Q0gHiN5O5MpF+W0QZ6EHLQwrol2RloNOfLnMYrpE0v5HOUIJSg0T8IjSuK5svNUXTvF1HsAIIMqJOyRnFAuvjdrpzr7mJJuqcoDs2mIBNSsMI7m3uAbVPZc8iuvlqioyRSkOhp/mYH4e5N5p1p5kmvZ2DMmqklVVRrB4OUhcLIZ1wxXKg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM0PR01MB5809.eurprd01.prod.exchangelabs.com (2603:10a6:208:16f::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.12; Thu, 9 Jun 2022 23:56:23 +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:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jun 2022 01:54:58 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [ycDNlvEcOF31TcRuAzDyXo5iUmvMYwds] 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-16-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 45eb1ffe-a969-46e3-ce96-08da4a73a853 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTijo6adWu98SHbtEySq1lKMY/u9/dCHeuGrjcp4sPm30bBzK6iL9NRH3pv2T48t5UtlSMmn3RS56xP/ZLBwOAOQ9na7FHO5ZiJeM/hqvQyKT5mdulGqwlxph0TvkR6lw6i5Nh09zCYHudu+ubQQDD66+sWK+z9L4e2wwPs8ogOuept4XahIZfkMWerQ5IshJIqXKFo2Q31L/7KiA/ykHsbNALGR82VoT8TEfYKeUv0bDyOk2f7dJVHPr8+i8gej03ZWhLI915cry3OZ+Ws2hQyict9E2/W/r2ql8+7gXb2NgOsNaVdcSaCLmnciusNWmKyWgmiHBndoljuS/bqlS6IQ7GQToqy1xL3drk1nIfC/+x6HXOnKVKuZVvcjTdsls877QtkCWCjUKchTJMiltY7jLtbv9+f10A4jbFxTyXzsGsVwN6uYQ8l5L7l/aNstJTQ62MCyGi06X7qNB6bcql4iO3fnDRVkUHP+ltNvTu3fGRX+tHTxfz84j3OhysmAuY2OXgPxeJRSKGEmf7fEQdtl8zH6vVlEDK3yJvUgQO2CmdLtNDqchZRT8yGWY5NwUn8iAaj4GpMYH3xQCNgn/Sf8SWlC8RNQy8gLxeKH2N5yOQ7k0jtk18L9PXWEITNi2nuhGWt/Ob85SNkRksmZGRPg+tYqlQtKUtxbXjuH2bxmAV0P5WeO/AVQyKIPjL7UyD65YiOC4zTJfvVETMkxlIGfMv/G3JHG9EUiggsTtXSwKUAcZp3vt/Ps1N38L/EKNM= X-MS-TrafficTypeDiagnostic: AM0PR01MB5809:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Fdz6yFIDrUIZbEem8YU7UM3xyrSeeALJRvrMWIlNq80eezNCyaFQvWCHJTBago17ekbq35NFIUYYgJYjcCYYD/+IyaLQZ8m3/JKsR0qUulZV9M01LjUVLT0LFAhq/53E2n27vDAQifp9N75j8ZKi9+03wz2fn/bdq6Uom4ZhUYfeVWUBrl7Eo0g1bNCKbS6EEtPrT+dRYj3gaNZAdqwD6PqDMMfhXPeNemsi3yKmKHRbIK9sN/YWdukbrWOnh/Mk8YTzuElyPK2Ao/iWTDnrE98qsntoeh+zkIHk5+wq+AfOvOA9yCxc9faX7FQz7l7cel9i4IMjSGfvGvwK2uYYodO28vjJhu4R8dEreVbGvgUfpyDYk2PdBRw2LKFjpCG+MyOXCAiWarw5sWyzzBYCrjTkChqJIcmnaTZbrVt5fTdrsfj6EYxDWK0KUm1n6arSPLrPd5Zkd3g0Ibvgo+G8wO5tfwsSsee/ssKp2jiItBE9okXsHjLR3nXLPm9gkUu0gsyvO5tKN/Ns3BTjYBk8wcYLcyGaSelvGvmIXFQh1pqvy3v4oVllAmKyKmgCmNJgQ5yS7WiW5Vkz/LH4s7y6CQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cuecmyV5I31Rr8d5ZBd8PBBfg4kGP/5bwNSpwwlo22+9MlVmfPimeM4e7YlbOGswyPip/RJ8KHtGv5VVllKIMfjO0InEe6KRExv+SBNcD+AYxBVU3/7EDc5p66TFgaHjUOesRVPiYFQ87RGKhGbv6joPYK+4N7Y/+npBmTjHLzxM7AmnTEkQgo+zDXJHBcPZxCxmvgX+MN5HZscgfWjrftoJjh+5UxyFWovsTjfcb5rcQ/87zOgrCXrmjDEpFOJcUE/ge/3ObHGJmve9OAcq59xlBMmK2zSSQ44e77RuCqmpeci9tokh0we/nKDBO3nen0jXCWmK9l8pOp9xudL/zwsjhgR06WVO6A6wW1lMM2Ei260kBDr2j/6JrjZI/VcTi02pYTGio+xwcr3GjRsUKGEwO+mkfDwQxTYXV4LJ+Pdm6iLOv75hl3MCS9e7EwL6kl1ht0cqX49keTYDk6o2lx9ZYoJkOoA7biUGhEp/iF0F46SEkvC2XfGEie1rJI7FHhGtG71PowLy5fV7AbfOHwLv18rV7kpRXcuaNMnsYU+fw0IsNtbHJWUStGHrqa6+FLAMlrNl6CClgRvOhZxbGMNFOTqJrEi0y//CER/7k8mDZTwZHGR77lZ/+gXavbA2t0cis0x/9HGWvg0JOTOCMYfJkYkafZze6oFyvyDR4i4EsTywe4OO38CXO9/XJCwvTq2skt2uG8D/hhiPvsyfghJpkxIhRL2maywh/jINN/oqWnvpGgBD+hNi5bO5WVU+aTJZZEOTVdT+vFJdKYGE/nLth5MCd2jyvzsRWcY255IWXxz+XAJ/YX+AzMavYnNPhEaz34H+Jy1WOiNg5fWQvP8uURC6u/+MXnPtfEq0ANzOy4Hib/YZIboisC3ZcP+iKCc9wfo9kD2Wu7rrF0VXlioMvBKBAGb4dFxGYW2JTuEfcBA9e08ZFNi0RxqXhFPlydhrWQiRgQob4hOl/HhSSK1lQi+VkNoWNGcd7E47XosLonH1rMMlrbAn2vUkzscve3VACTJjXll56eYovmKgXB6xk2lwO3x18QX2Qk56Kj0Mp2ekKAVBHIOj/MIy7X5AUriPppFREGX1oGbT76ky4RYD8tZNea24/uYtXSTAgA+y6Gu0j4NpK545UShIxO90mew8IyvLNx+5Sl+ChAhmieidTY6AeRBMucjuMug7oe2h9gzXSC5gpFbOotZYFsFvVh75dtZ3iVUbjVdxpOLkLQ8iMaA0F6uxbSNUGduwgSvnwzNTi1gVZ2JnZAOZ06w/51c16OClZOXRAZcVEsmFgIOoShZeS/l4qWRt8hshGBHF5lJ8BWARdgv85/AmNschoG/KErMEbqYiYhSZYA0ZQXlhryC7e50TAgcTCY+tvFx9d8RWkjEhugy3Y+92T9TGtPq99oE8o9qm5TiZ0dODV32mUKNDHuXBsnElvpaiXsGu7jDAyJBc6bnQ+4KW/VjSdkdj47qiaiU2PG/Xz8Iuew== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 45eb1ffe-a969-46e3-ce96-08da4a73a853 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:23.4449 (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: AM0PR01MB5809 Subject: [FFmpeg-devel] [PATCH 16/41] avcodec/x86/rv40dsp_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: fOv0Y0fFyEPl 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 such RV40-dsp functions at compile-time. Signed-off-by: Andreas Rheinhardt --- libavcodec/x86/h264_chromamc.asm | 4 ++-- libavcodec/x86/rv40dsp.asm | 2 ++ libavcodec/x86/rv40dsp_init.c | 10 ++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/libavcodec/x86/h264_chromamc.asm b/libavcodec/x86/h264_chromamc.asm index 0421fa8695..d59c183371 100644 --- a/libavcodec/x86/h264_chromamc.asm +++ b/libavcodec/x86/h264_chromamc.asm @@ -450,10 +450,10 @@ INIT_MMX 3dnow chroma_mc8_mmx_func avg, h264, _rnd %if ARCH_X86_32 chroma_mc8_mmx_func avg, vc1, _nornd -%endif chroma_mc8_mmx_func avg, rv40 -chroma_mc4_mmx_func avg, h264 chroma_mc4_mmx_func avg, rv40 +%endif +chroma_mc4_mmx_func avg, h264 %macro chroma_mc8_ssse3_func 2-3 cglobal %1_%2_chroma_mc8%3, 6, 7, 8 diff --git a/libavcodec/x86/rv40dsp.asm b/libavcodec/x86/rv40dsp.asm index bcad1aee80..7fa271a5d5 100644 --- a/libavcodec/x86/rv40dsp.asm +++ b/libavcodec/x86/rv40dsp.asm @@ -481,11 +481,13 @@ cglobal rv40_weight_func_%1_%2, 6, 7, 8 REP_RET %endmacro +%if ARCH_X86_32 INIT_MMX mmxext RV40_WEIGHT rnd, 8, 3 RV40_WEIGHT rnd, 16, 4 RV40_WEIGHT nornd, 8, 3 RV40_WEIGHT nornd, 16, 4 +%endif INIT_XMM sse2 RV40_WEIGHT rnd, 8, 3 diff --git a/libavcodec/x86/rv40dsp_init.c b/libavcodec/x86/rv40dsp_init.c index 7a05ab14ad..7a60a30295 100644 --- a/libavcodec/x86/rv40dsp_init.c +++ b/libavcodec/x86/rv40dsp_init.c @@ -207,10 +207,12 @@ DEFINE_FN(avg, 16, ssse3) #if HAVE_MMX_INLINE DEFINE_FN(put, 8, mmx) +#if ARCH_X86_32 DEFINE_FN(avg, 8, mmx) DEFINE_FN(put, 16, mmx) DEFINE_FN(avg, 16, mmx) #endif +#endif av_cold void ff_rv40dsp_init_x86(RV34DSPContext *c) { @@ -218,10 +220,12 @@ av_cold void ff_rv40dsp_init_x86(RV34DSPContext *c) #if HAVE_MMX_INLINE if (INLINE_MMX(cpu_flags)) { - c->put_pixels_tab[0][15] = put_rv40_qpel16_mc33_mmx; c->put_pixels_tab[1][15] = put_rv40_qpel8_mc33_mmx; +#if ARCH_X86_32 + c->put_pixels_tab[0][15] = put_rv40_qpel16_mc33_mmx; c->avg_pixels_tab[0][15] = avg_rv40_qpel16_mc33_mmx; c->avg_pixels_tab[1][15] = avg_rv40_qpel8_mc33_mmx; +#endif } #endif /* HAVE_MMX_INLINE */ @@ -231,12 +235,10 @@ av_cold void ff_rv40dsp_init_x86(RV34DSPContext *c) c->put_chroma_pixels_tab[1] = ff_put_rv40_chroma_mc4_mmx; #if ARCH_X86_32 QPEL_MC_SET(put_, _mmx) -#endif } if (EXTERNAL_AMD3DNOW(cpu_flags)) { c->avg_chroma_pixels_tab[0] = ff_avg_rv40_chroma_mc8_3dnow; c->avg_chroma_pixels_tab[1] = ff_avg_rv40_chroma_mc4_3dnow; -#if ARCH_X86_32 QPEL_MC_SET(avg_, _3dnow) #endif } @@ -244,11 +246,11 @@ av_cold void ff_rv40dsp_init_x86(RV34DSPContext *c) c->avg_pixels_tab[1][15] = avg_rv40_qpel8_mc33_mmxext; c->avg_chroma_pixels_tab[0] = ff_avg_rv40_chroma_mc8_mmxext; c->avg_chroma_pixels_tab[1] = ff_avg_rv40_chroma_mc4_mmxext; +#if ARCH_X86_32 c->rv40_weight_pixels_tab[0][0] = ff_rv40_weight_func_rnd_16_mmxext; c->rv40_weight_pixels_tab[0][1] = ff_rv40_weight_func_rnd_8_mmxext; c->rv40_weight_pixels_tab[1][0] = ff_rv40_weight_func_nornd_16_mmxext; c->rv40_weight_pixels_tab[1][1] = ff_rv40_weight_func_nornd_8_mmxext; -#if ARCH_X86_32 QPEL_MC_SET(avg_, _mmxext) #endif }