From patchwork Thu Jun 9 23:55:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36135 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp656342pzj; Thu, 9 Jun 2022 17:02:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxdjmEIJeo/F6FJmM3OrAnf/6K9VjWUK7C4eN6WR0vZwavVekbwU/e1y0cZKqI7lGjzceRY X-Received: by 2002:a17:906:a45a:b0:711:d546:478f with SMTP id cb26-20020a170906a45a00b00711d546478fmr19210527ejb.741.1654819335455; Thu, 09 Jun 2022 17:02:15 -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 qa42-20020a17090786aa00b006dff4dd30f9si11604970ejc.862.2022.06.09.17.02.14; Thu, 09 Jun 2022 17:02:15 -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=ndkUylyA; 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 2C10868B820; Fri, 10 Jun 2022 02:57:40 +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-oln040092073052.outbound.protection.outlook.com [40.92.73.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CB73C68B937 for ; Fri, 10 Jun 2022 02:57:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h0KY2NBdSLo3+6CMLG/aaYNQc4aIFmqP/hBzlRuSUnysZQtYdDTZHC9VlT85iVcx4GwSPlh751DVe5V1+CLPHlxuHH8V+X/oXvnWbmaRrdtFag+CrS5JT8wUJMuSNjOdPAvLKqNMfgSKHvEABIsrMmQs+vHdP+RPgyXQN+WWDrXT4obeQ8UmksKfzycpSg2dl7zfmt2PvGnCxbjyF8utKkONT0zzlrRc3FIYImRlLPxDsrOrNPiF+sLWY7O4x5qiWWNLMXFbf1fxJqZI3ioW0mzLumktxtzxtSBz0+NnYy9vg/yUxRX2+lxq44MmSlgJi8kJ88K8VLh36DoKPGHOIA== 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=56Va3EDl1Vp30DLIU9d0p/XBWVa4baMi0ePKSchM47o=; b=P4vMDrWIXK0yiryYJDIBXTODDaP/N6tH1W+Q4Zs+36xzY7QXRY8yxKTGcdLgs9Jd2RdlYYhvSlyq0hmufpLqHNo7bACect+2pc1YcdlVnwfKrV9pnAJFIraaku5YWdpWUOwHyP6I4LKATCPBt3lApK9pFhKJtRbYECFhLXTf41Ln6HDV+Ie2dg90a26tJnlkiJhrBNP+fxW8GkDDPaaqvZEQFsp1pmsREa2BI9atIHDyBnG1tvlnkipMgLDt9PIyQ0bod+E0xB/7SS6wqyLCEbeW804yx4vTQLHh6FnInz3TAuu5xELkfa9FgNsAZTm3zKq+ofg1aQrRoFiew0l/9Q== 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=56Va3EDl1Vp30DLIU9d0p/XBWVa4baMi0ePKSchM47o=; b=ndkUylyAFxl5w7yvSzLORmmThPEuPT7wGbdbNkANGyBjPILWPwDEnV+KvEA0Vrt+VVniUQBgVTj7dGkmkPqDzCn2691Lo84q2ja6r/frd9t5HqABqgIc1spgDbZmJRXXJYpjix3j3xQ33/DA7lOjoqdwDG2O7nWrL3lI70RyBdInDo6Fcuxx7vTtMoiywfZNiIdAcsbNSJkQwInNCxLy4nhk5OrZViqcNqkoKZAcKNeMFMW99UzyXrTlHeaFVIJjdZ2kKYg5K5vQlPW8EXQgIcamh6Fb76sNEHV5PFnkS3DdnMhFmAVEr5XPuecNrYMDkKK44X611OorbYtsoLiiUg== 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:57:33 +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:57:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jun 2022 01:55:19 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [VbH0V7Jr+QRIb0wNA/cOO6E0tQtIOQ5Z] 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-37-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b5df39f3-4607-48b2-f0ec-08da4a73d1e6 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTijo6adWu98SHbtEySq1lKlUyWZ3/UssyWmvZ/CrdyhhwcijUPndPwrnDCx9pXZNAFgf0n+XSVhlfPS6hhLcpiveAbaxH0Gx2xDIsIXpylcnrG6luo7UGxjczRkTXbgpV82BAd4Y1KQLxc7DJxkNm09Y8vhs2tWyZ4UMzq0lgwb5zNFdJz5beXqfxBGd3WXNhQeWbc+eP7IWVhiOaP9hvixd37jElw0+7TC/UqxT4cC74/nbRJuWQuuTYgKWAli1WFRAEKT9+mDxog4xVMIwA3scNWnBD89ScGjByGAEP4dk5Pi4PrGh7gDl711tXEn9t2QEpzvR7az/S91WtgoN3WVh4QRMyiYeqWIRpwIwJZVHPklCQsKnheKqSOzYOQ/MpEvvNH15VPKFnHnxhuEyE0oSzKkOMND47HBLVYbIVzGLmADVGWVIvSearqlAP1ZZ5KDT0gdYT9I+jCAD8LMMbIkIVcLVSfI28nEZaUzGLYz2By7+wKtycq+uQIDHaMLlvxSM03HgS5oKRYdf0p/AjV22qhpjF/Kx9/EOoidla1kWj0M+6iK5qjngWfLP4+0YhxDcOZjlDzH9qTq7+HOIKQXyU5Tp0ex+Td2S+xuVV3OQGB8XGevRwgzwAfSv7Z7HjL7Ukf+XkzYrqvA/laTMUzL/CO3mzJ3s7uml2398RoCoXUC1zDI5HLOvUKCR7Xz32DtCuuuNqNxYq/qoL8mOPJzL3ObI95t+sxnZj55y63ZrTCo/opHcTV4Yyota+WhjM= X-MS-TrafficTypeDiagnostic: DB6PR01MB3862:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uT4CWezY9yQPDIsP/xwqjFYYSH1nuriOqVawReBPBTrmc1SDIlxPTxfF433GTASJYQH539K3FyHKwSEiZx6AgWO3Pnxh5TcB7J+iUfCtYqJnEdi3Y89SpPPXELEHkt60j5Rq/yPfm+AsreuWSAfd4A2wBULC9qbQsiFi3Gz2xqh4n1/Kxt4t3hQJfAyP1j8BS1bdncGhzuDOsATw5bRkE6oaBy8b8wpEEJhB3YuCsVckB0T6MUv4xlG4K6kz8fxvprILkXlJFzkhDbz4UAoiNCA6QntVB393JiLdF59YDchX26aIi9Db16MXz7WS6cyoM63wXdrMhCuogtaDFSCFQwDKNTF1mR5mRaUUHFWY654UKBLnN4a8d04i+Q42vOM14q4tzErVbVnde/DGOceS3BIPu2+N/Chffofp1ZhlRjqLNwtbjWM0jTKZvqT1xx6I0Zv7cBERjcOkNPUS8b+vn7SeoOiYGZ4xAJ10XOa4k6F52bmlPLZIPDLdZlDHlXudHTda4cVdRxAUE5yCeIFcEe3NISNU6ISiEfkj3WyhNofxFuprrvw0dfEBYw4tsdvxFPx4+HSp2w1pXezdYV48WA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Uc75eGMTO7uKREeWEDjyBFFk7aEjXeYZDdMQ2N/iJ+ESpnE/KCZUhBUc1V6dvpNCbVd6Gkj58YkuINr0re/XpjtuwmPn3qhvlvkQyowt4kRMSzhTzP/qkPOKOxwe0tgwimRezxMSIDJvNjQzL+37OqO4gCBvv28rx9Ms56Gw9zeH1jHZmlGCLilaEO9O0M/prORswoSgzXO0SMJG7QzTpj2NsLKdS1qd495tLH/39zd4YGm4DiQ49NX2qE20nZ1zo6Ld9MEpMtfvR9Wm/ghNl2BzLBx0MCcMR7DM0Cf2mnknwQKYmINQAKzrooRbTz9oZRXTHvCMEnLFvZ30TOsYd1FKvUSFZE1Khnpb2xofOLA5xYQgBgI80gh1wtL1Jb4wthlO578bzzDo+vP0bZN93+Xz1hmIrxtygxVmFd/H461yvZtPg3odNjmdlkiEqxBJC9PhZHA2MMzKmRq4ZJyK2ylbJzOMJ9OPlhM6Z9pKxSkvB8jedE1Ke24Yk5+3hEhoK9Hewy7KGgmKxE9iFE+AuqlKwcSIydgXJZ8h47aYXjbBLu3UQdc2uDk4d3KglGxcuY9uPePpa6qxEf/m9ZF5ULsjpGUbzgkEs9PAtotGi54BqigvtZfV9FnsJ3gr74VFE8v/A01GWGEnVlYuia5FSfrm98ZA8SJYhcmNL5R6ZycO6LVWGN0Eq3WUC7gmeBVfZFesaV0yfSHNgsN8PWtpYwscNY8DskzVGZxvgAuXpSbZIdXAg0e9+ON/YWSNiZ8vtGK0w5BjPmVJMr1COpKOIXS3Gml9qVCyopcenSl77LOhrLiMwmPmzXijGmXWniZAeeQxe1CEopYEOqop9nMXxcvmdUZ22qj8hS8d1tr2A3hLBEoIN+nvrBItTQ7AtHvNWh8po6f5tKGYbyFwYSUdGPZydTkPJioMn+zz0uzQNKvNiCTZ9+EAKoOltxQutMcAPWHayXp6EmMYxXcTPiIcMIDaI2DLuksz34khaA/7Qq6DlW5lAoY5pS1T494UpgN7Jfu0tLn4pXO9qJ/zewXk9QiUFObnczxd2OSQMu5K7IKsWd46DWLX5gtiuzVbSjAWxdxeiZRn245qnGn0stx024g4hQ0DqvN5hfjapYlf23N2bqIyN4sc6y8IFuKke4CeZOount4Cu93YPIMYEeTWkAV+mQl2iNOSkCIuLSjQswoYPVr0PMMxdKEwpyLkc0hFU+yh6qz/EYGQt0x81IELfpq+FpiOJvuBW7iY1a/QyQw20O/zwkyAe0NhVeLqLbafuts3IMEa7KfwJF92QrktL3uPpOpQ9RbR37CK2DcSgl5YGGW0OdyjZrYKkJSi5YKK9VIxotsmrVl4v3Ei8JMwRAxweL9NimTWuUap+IcuSkIwhEWHRLcVDrMq81/cGdFOdf2qCA8m/cZOza2lGbHB/FUlSu1t1hwC015d9kLdVTgRAjHDC9/CAgyqhjHoytpUFAesk8/dc5qSnCJIF6qdEQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b5df39f3-4607-48b2-f0ec-08da4a73d1e6 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:57:33.1801 (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 37/41] swscale/x86/rgb2rgb: 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: 6QK2/G5Pvg9i 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 and 3dnow implementations (overridden by MMXEXT) and a single MMXEXT function (overridden by SSE2) at compile-time for x64. Signed-off-by: Andreas Rheinhardt --- libswscale/x86/rgb2rgb.c | 6 ++++++ libswscale/x86/rgb2rgb_template.c | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libswscale/x86/rgb2rgb.c b/libswscale/x86/rgb2rgb.c index 0ab139aca4..d8dfbbca35 100644 --- a/libswscale/x86/rgb2rgb.c +++ b/libswscale/x86/rgb2rgb.c @@ -91,9 +91,11 @@ DECLARE_ALIGNED(8, extern const uint64_t, ff_bgr2UVOffset); #define COMPILE_TEMPLATE_AVX 0 //MMX versions +#if ARCH_X86_32 #undef RENAME #define RENAME(a) a ## _mmx #include "rgb2rgb_template.c" +#endif // MMXEXT versions #undef RENAME @@ -116,6 +118,7 @@ DECLARE_ALIGNED(8, extern const uint64_t, ff_bgr2UVOffset); #define RENAME(a) a ## _avx #include "rgb2rgb_template.c" +#if ARCH_X86_32 //3DNOW versions #undef RENAME #undef COMPILE_TEMPLATE_MMXEXT @@ -128,6 +131,7 @@ DECLARE_ALIGNED(8, extern const uint64_t, ff_bgr2UVOffset); #define COMPILE_TEMPLATE_AMD3DNOW 1 #define RENAME(a) a ## _3dnow #include "rgb2rgb_template.c" +#endif /* RGB15->RGB16 original by Strepto/Astral @@ -165,10 +169,12 @@ av_cold void rgb2rgb_init_x86(void) int cpu_flags = av_get_cpu_flags(); #if HAVE_INLINE_ASM +#if ARCH_X86_32 if (INLINE_MMX(cpu_flags)) rgb2rgb_init_mmx(); if (INLINE_AMD3DNOW(cpu_flags)) rgb2rgb_init_3dnow(); +#endif if (INLINE_MMXEXT(cpu_flags)) rgb2rgb_init_mmxext(); if (INLINE_SSE2(cpu_flags)) diff --git a/libswscale/x86/rgb2rgb_template.c b/libswscale/x86/rgb2rgb_template.c index ae2469e663..ae7af550e0 100644 --- a/libswscale/x86/rgb2rgb_template.c +++ b/libswscale/x86/rgb2rgb_template.c @@ -1822,7 +1822,7 @@ static inline void RENAME(rgb24toyv12)(const uint8_t *src, uint8_t *ydst, uint8_ #endif /* HAVE_7REGS */ #endif /* !COMPILE_TEMPLATE_SSE2 */ -#if !COMPILE_TEMPLATE_AMD3DNOW && !COMPILE_TEMPLATE_AVX +#if !COMPILE_TEMPLATE_AMD3DNOW && !COMPILE_TEMPLATE_AVX && (ARCH_X86_32 || COMPILE_TEMPLATE_SSE2) static void RENAME(interleaveBytes)(const uint8_t *src1, const uint8_t *src2, uint8_t *dest, int width, int height, int src1Stride, int src2Stride, int dstStride) @@ -2185,7 +2185,7 @@ static void RENAME(extract_odd)(const uint8_t *src, uint8_t *dst, x86_reg count) } } -#if !COMPILE_TEMPLATE_AMD3DNOW +#if !COMPILE_TEMPLATE_AMD3DNOW && ARCH_X86_32 static void RENAME(extract_even2)(const uint8_t *src, uint8_t *dst0, uint8_t *dst1, x86_reg count) { dst0+= count; @@ -2465,7 +2465,7 @@ static void RENAME(uyvytoyuv420)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, co ); } -#if !COMPILE_TEMPLATE_AMD3DNOW +#if !COMPILE_TEMPLATE_AMD3DNOW && ARCH_X86_32 static void RENAME(uyvytoyuv422)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, const uint8_t *src, int width, int height, int lumStride, int chromStride, int srcStride) @@ -2519,7 +2519,9 @@ static av_cold void RENAME(rgb2rgb_init)(void) yuy2toyv12 = RENAME(yuy2toyv12); vu9_to_vu12 = RENAME(vu9_to_vu12); yvu9_to_yuy2 = RENAME(yvu9_to_yuy2); +#if ARCH_X86_32 uyvytoyuv422 = RENAME(uyvytoyuv422); +#endif yuyvtoyuv422 = RENAME(yuyvtoyuv422); #endif /* !COMPILE_TEMPLATE_AMD3DNOW */ @@ -2534,7 +2536,7 @@ static av_cold void RENAME(rgb2rgb_init)(void) uyvytoyuv420 = RENAME(uyvytoyuv420); #endif /* !COMPILE_TEMPLATE_SSE2 */ -#if !COMPILE_TEMPLATE_AMD3DNOW && !COMPILE_TEMPLATE_AVX +#if !COMPILE_TEMPLATE_AMD3DNOW && !COMPILE_TEMPLATE_AVX && (ARCH_X86_32 || COMPILE_TEMPLATE_SSE2) interleaveBytes = RENAME(interleaveBytes); #endif /* !COMPILE_TEMPLATE_AMD3DNOW && !COMPILE_TEMPLATE_AVX */ #if !COMPILE_TEMPLATE_AVX || HAVE_AVX_EXTERNAL