From patchwork Thu Jun 9 23:55:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36136 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp656446pzj; Thu, 9 Jun 2022 17:02:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzJS0476jONOtudnCuJ2PM57TP+EaOHwcAv5+EhXXe56K2kxgGK+z9UlWuJ6R2y3EfPRrW/ X-Received: by 2002:a17:906:3bd2:b0:711:ce53:5d5f with SMTP id v18-20020a1709063bd200b00711ce535d5fmr22118566ejf.500.1654819346411; Thu, 09 Jun 2022 17:02:26 -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 w8-20020a05640234c800b0042b6e025f01si24693063edc.29.2022.06.09.17.02.25; Thu, 09 Jun 2022 17:02:26 -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=cqAxzoMc; 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 3652968B931; Fri, 10 Jun 2022 02:57:41 +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 1A01368B820 for ; Fri, 10 Jun 2022 02:57:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n/0RJlhVugpUSoTF7YBlwDRlssUHavyRUzRtgNwJQR75t09BJkmvJ/o/QiGZ8V0HAdbOwB5S9WY3TlWPPpIKRkmNsDmXWGYnZLckXxVlgsD6rZjopQqoCrGC8ivE9kRIEOQx1kr/bQCoeAelmDgleif785Z2vgQmrnYuwrQRuYbgLVjAvjfgpvUW5e4eLc4PnjUls8TQPx+mXRRuAEzp4Tif6UZt2AbH9rdWEa6hOSOiTmadYzp8KEu1NxSOVRLMRQuVFk9t6jmOAH4lLvLb9glifWeu4dvTcFK6wOCmQ3eBpiBgWRNbykuoJj24T2GnpbtfRmHddaSPFUBu3+XUaQ== 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=OvS+I/OZXMteGULQqZWE3qBzOP/fzOLDZgZSogkX3Ak=; b=EhDTLIvkGZSmYH1d8IzLl37kTlKI9+TzlHjJTBaqs/FbZt9nF4tq4Ubw7OvbeoB7bI0WHVU1iPJLzTvu50TCjhxMEwUMAzePCZBClvi3Irik3ud7jo9LJinrz+0R+k+HclmDfy61ykTswXvhRYgRP2WkwBRYyaQhlgn0pZEftYipTjOPagKSvy4blaLw4zTqItE2zJapExJe5oWWWlMYCMuUZhP4/pskgbmbL0fVNu8adzKZ4QZTJnVSb9CdLEbXOnbNJCU3mVuEd2o/assSX8KrbnUji+eLgmKN9j4I15XYpGuZTHyobKgur6YvfJrMZd5vqmwt+Ps6MyY0lEty+w== 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=OvS+I/OZXMteGULQqZWE3qBzOP/fzOLDZgZSogkX3Ak=; b=cqAxzoMcW4r+lVFYvHPxzA4LW1EiI4ceBP+hQWPY/Jlfa/RHRKn2nu6IR8GsuYiKrQSIx7dQAFq5cuqGjG1ejXLD8eEHXfgHVydkutc9okVIcDPU5wLX/aQrka1L/F0cEZzs7XOWL6Q12BeB9JsOfJ/aCq2ek1S8GhzbnpzLdj2FmQqPnfeqRMl3fYE4u8rDTe6y3+QzxRdatVHkYIzOMhqVpj1nfa/lvLO4Nn67Or7ETldkJWiqkYpurDSYuSKYAH0aw7/i76YsJF+3C+4VjxWuIteFMvbIoniModSD3o0KRbHYWZmc2Fc4P+gdAq3G1PTMuwOIQBtuX39+vaSpfA== 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:34 +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:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jun 2022 01:55:20 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [CVNJv707IPUDPcys2o6/hfz8kfzuqnU1] 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-38-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1ed01510-482d-447e-e8eb-08da4a73d2a0 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTijo6adWu98SHbtEySq1lKlUyWZ3/UssyWmvZ/CrdyhrEv8C1Plir70mH4ll73KFFIjKkp5G+SYM1kIdUtduLOjUjbNrupiM0o4xxzhU/UQUD4t5vel+F24XyPh7uD9lfn9Mz/S+85qsVC35wRX83bNnC5jYQua764UJEg24BTJmfBbnPzYwii0fFxmfX2OUGblj9li5x3h3rNooGD6HhMDSPCpSDjJfqBEq0jnygdQp7+gpdEHxTIN+4OAufA00gAlmB128HAzzHSIek7z6yTwx2e/eF6YwLttOjK21OPPK1o32KGRpoII8X52nBfu4aQ/EbYEybpKmoEusCoBrpXiOMTmZ6jP0xJscgawpYR7LcEDaVVAY/7dMlTnbesIYmHR3cQ9i74TZJ/XIPU1G4kY+Y5JBRzZJuPdlpnO2libKCmx/LPcfm9k6ClIDSAHG2MYfc3Kb7kyQEWUsBCBumit9PlcVqnZ+KI4p22OHwz679V6CmKexp6/uV0aT9ZTBTOTUkDwCJ8oT3s21qNrSIXaAalDXxW9TBFL194Gerne2+zbjOTE2O9B+ZjWZPGHgXsDikC9DzwjMEIQqYrvfDS8xDdTasS7QB3chmn3c8xvRFipmzPtRVLHC93kYAoLBKZTETWg7JarYtcbfhD06V5fP3rbci14CVQmmKuVjjGUu+x9z7ObUnOKfKJf+EYaYlqzAqRVP3zGmg3S3lqGtQQ6HkfFh2efDrBmy3Gh9P6zpKJK9ekTZsRgF43U+HCSm8= X-MS-TrafficTypeDiagnostic: DB6PR01MB3862:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1vTd4JdrmADGcZlzKE6QzVVXbiZ1cQjD4+INiJ0RHW3UzdAH8IU1OCIJf24uHUCdOlXt0GuoQVVRE8q1U91MnkP721ZPJQpf4D7A7oh8ECe6WsRpOJt4uNRnwkLCet45FP3sthyx9tZZBbn1AeCfZZj+ncgIEugF5tPCWXeGujaYo6O8A4JLp/vEItMlwMKnVIgGmoAVz+sLNjKzmBDXcYP3vMWQHUT5kfkout46JB8dJn6Ax0Bi2ttrUY5NTsHAZDyMZ2kT4pPiR8ay3FLF0UD1nsEGyIhQGJdviiZlcAvToqZhSUYl4L77KMLgCo6jG8AyO5VcDnhAwIOkJUDNGUiGh/cOYdzUUjVX3IevEaDVOJS7+AcRH5pI9whE/9HbzbVQCeQQg1thiEfBHGmxfpvlKAEdBbVVQN6a4LSn/R+ni+CjMl4iybkYNuIR/8GqKDY/VRZbNFf/HGwRsmG9k/pn/ZW3u72xnXv8jnW18hzohn1gGtclXRf1DoQDz9nnpNCldlM6d5ErmDpY0VZchKtmH3/DSirIdJLXLFWo6wgaLC7BV0Bhm45f3YTIXKGNfeLA7/fyjDhRCxohXbSFag== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KNXrR9b1kPLdd87vQ+cMv2Wl3SEgxjt9MYxqyfs2YMqYRV+6eMaDdP+HUYYD0E7NHqMWHnmd2stjG0PcETTE7Ash44iBuXfSDjbFNe9q3ZSyyqsIz3fxEASDVGD1DF9BAO6cAyjVbi6eygUDM5NUmJGJvcDqCmmSbrpdTNHe4bRbGs/ddNzzsfVVvWtOgDA0YEPmwPLx+oD0oRUuiCIiqAaIFBzXU8QeZ0b4YIKiNh3cotjFq165hHl38iRsD9udxSf0mGW9gJ/qIuGjIIRpNHtglr3tW2SF6f5i4tyGDW3NrUDOt0cqoTl7l/TRT3FQYfslThWCBBZB3O7gRtGj/1QpEtIfozvml+cDSQ/4qPCFzNXz9Y7yZeSnuaptJsAlcccVadze0DkdRVlgTxSWCU55/RIhUVU6KkfBrhNBzktOaGhurj1FYTV4VHp9F5bA+XQBs8WmEkSeUxUCBweLr4bKn1gD3J+BPQTAILN04LPV46iiqPuWJoxWHOFCofVwBPjJfCoBsscXWk9PjKvuL8g3g2gEO9JuKJAgwDsjMElzxMoMph5dnCZDnfIAjnTUZEVLJKRg2b81Tk9j2RQqE4Se+/TlS9uOg25s10OZrae89V4LR/Ymr8K6TCHWPBZvTY39YNZ/de7NeJoVDLk12kAon7/5hFihg+edbmNtpoUy+i4rDmWRGcWEoWbB7HUs+S3mL4jI5PooiViZ1QJi/hHf3sE2HuDNgEom5eqT7vFjRjZqJOPd5/noyZqE+vaBphTW9apI7WjMKjsm2w8W9ls1fC64GtK1d70bBjfVV2y49rGeEXA8YDqQzT9z6RuCV4DuuJqcB5J4g9QVOPcuyHQNy/K5llfpm4L2o6k7+7S5MtDVh8m1OOcPwqcXgM6QQnbMZPqp67Y7OQga5cNwYLGVn3h1Uhzy0gvteub+Ok5G0HfZUoTLBS/xwqkBJsgL0stkfbF7AFbBAaIpE/T8pD5TLU4ivRmJlLGWveNRoCtYMIhPM6ZOxjxa6hnDRgTk7CyJFlso47G+F5FZdElAo28pU+gKPNWEzZUimO92QW01VOy6Ru9aHi3stI9uB0ACtX2GrS/BEyBc0WUTHiJKQv1idmvGZxKWdnWAX4QJTTeRuQNPtYUFP5qwpII/lif8gouQAJSwkkjp3GXp9bHNEEQymXOsWEJjIGKrYVaWVh9lzT2zLGyQN3qs+6C4763BbpBrJZilz0l7rs/GBQ+sxZq2fvCSdImNQUuGvhi1nvUanTp53LJBEMKe3/j0kO7n05GizbtgVc5ongvjCzxgtXqxTSN7hCZ1DO0n//iD7Od19NRMGh8Hg4xdSNejCy4DnZrFSfiLkBrAisAAXv0C5wQO4DQyqVRHKVxeUn+3G0378zBGvsD0aF4KqKsh/jSgodCGBpSeouDoDZo0pFCi2A3Xmb22SWhGlFW83oNfl3igPzwfQOUTeidN49IDq+n6tYxcNYVlF0wK+8q/+Sx76Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1ed01510-482d-447e-e8eb-08da4a73d2a0 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:34.4145 (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 38/41] swscale/x86/yuv2rgb: 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: eL7lGjDc/gN6 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 some MMX functions that are overridden by MMXEXT at compile-time for x64. Signed-off-by: Andreas Rheinhardt --- libswscale/x86/yuv2rgb.c | 13 +++++++------ libswscale/x86/yuv2rgb_template.c | 5 +++-- libswscale/x86/yuv_2_rgb.asm | 5 +++++ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/libswscale/x86/yuv2rgb.c b/libswscale/x86/yuv2rgb.c index 47f45bd7c2..60dcb4b7be 100644 --- a/libswscale/x86/yuv2rgb.c +++ b/libswscale/x86/yuv2rgb.c @@ -44,23 +44,22 @@ //MMX versions #if HAVE_MMX #undef RENAME -#undef COMPILE_TEMPLATE_MMXEXT -#define COMPILE_TEMPLATE_MMXEXT 0 +#define COMPILE_TEMPLATE_MMX #define RENAME(a) a ## _mmx #include "yuv2rgb_template.c" +#undef COMPILE_TEMPLATE_MMX #endif /* HAVE_MMX */ // MMXEXT versions #undef RENAME -#undef COMPILE_TEMPLATE_MMXEXT -#define COMPILE_TEMPLATE_MMXEXT 1 +#define COMPILE_TEMPLATE_MMXEXT #define RENAME(a) a ## _mmxext #include "yuv2rgb_template.c" +#undef COMPILE_TEMPLATE_MMXEXT //SSSE3 versions #undef RENAME -#undef COMPILE_TEMPLATE_MMXEXT -#define COMPILE_TEMPLATE_MMXEXT 0 +#define COMPILE_TEMPLATE_SSSE3 #define RENAME(a) a ## _ssse3 #include "yuv2rgb_template.c" @@ -127,10 +126,12 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c) break; } else return yuv420_bgr32_mmx; +#if ARCH_X86_32 case AV_PIX_FMT_RGB24: return yuv420_rgb24_mmx; case AV_PIX_FMT_BGR24: return yuv420_bgr24_mmx; +#endif case AV_PIX_FMT_RGB565: return yuv420_rgb16_mmx; case AV_PIX_FMT_RGB555: diff --git a/libswscale/x86/yuv2rgb_template.c b/libswscale/x86/yuv2rgb_template.c index d506f75e15..b60567b8f6 100644 --- a/libswscale/x86/yuv2rgb_template.c +++ b/libswscale/x86/yuv2rgb_template.c @@ -47,7 +47,7 @@ extern void RENAME(ff_yuv_420_bgr24)(x86_reg index, uint8_t *image, const uint8_ const uint8_t *pv_index, const uint64_t *pointer_c_dither, const uint8_t *py_2index); -#if !COMPILE_TEMPLATE_MMXEXT +#ifndef COMPILE_TEMPLATE_MMXEXT extern void RENAME(ff_yuv_420_rgb15)(x86_reg index, uint8_t *image, const uint8_t *pu_index, const uint8_t *pv_index, const uint64_t *pointer_c_dither, const uint8_t *py_2index); @@ -165,6 +165,7 @@ static inline int RENAME(yuva420_bgr32)(SwsContext *c, const uint8_t *src[], } #endif +#if ARCH_X86_32 || !defined(COMPILE_TEMPLATE_MMX) static inline int RENAME(yuv420_rgb24)(SwsContext *c, const uint8_t *src[], int srcStride[], int srcSliceY, int srcSliceH, @@ -192,4 +193,4 @@ static inline int RENAME(yuv420_bgr24)(SwsContext *c, const uint8_t *src[], } return srcSliceH; } - +#endif diff --git a/libswscale/x86/yuv_2_rgb.asm b/libswscale/x86/yuv_2_rgb.asm index f968b3a0a2..542e3cb1ab 100644 --- a/libswscale/x86/yuv_2_rgb.asm +++ b/libswscale/x86/yuv_2_rgb.asm @@ -69,6 +69,9 @@ SECTION .text %ifidn %1, yuva %define parameters index, image, pu_index, pv_index, pointer_c_dither, py_2index, pa_2index %define GPR_num 7 + %else + %define parameters index, image, pu_index, pv_index, pointer_c_dither, py_2index + %define GPR_num 6 %endif %else %define parameters index, image, pu_index, pv_index, pointer_c_dither, py_2index @@ -356,8 +359,10 @@ REP_RET %endmacro INIT_MMX mmx +%if ARCH_X86_32 yuv2rgb_fn yuv, rgb, 24 yuv2rgb_fn yuv, bgr, 24 +%endif yuv2rgb_fn yuv, rgb, 32 yuv2rgb_fn yuv, bgr, 32 yuv2rgb_fn yuva, rgb, 32