From patchwork Sun Jun 12 00:29:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36168 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp548079pzj; Sat, 11 Jun 2022 17:29:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwbmiqLqPIQmqhUf0wNt1/ORkV5TfEWrrkkYIl2JJByQabiGqax5z9lEZ2t2S+fS3skLZxg X-Received: by 2002:a05:6402:4241:b0:431:574a:d74b with SMTP id g1-20020a056402424100b00431574ad74bmr38364059edb.374.1654993780940; Sat, 11 Jun 2022 17:29:40 -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 s11-20020a056402520b00b00431fd4040basi4118455edd.105.2022.06.11.17.29.40; Sat, 11 Jun 2022 17:29:40 -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=pUMnG1YR; 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 08DB168B3DB; Sun, 12 Jun 2022 03:29:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2021.outbound.protection.outlook.com [40.92.91.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 54ECE68B235 for ; Sun, 12 Jun 2022 03:29:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ocR/u5Or7EtF7oXe248oOWWP/ar7UXqDuZawQ8XpF/5Hyyq7uhbgkMtMJO58jKJ1ZG2ORQDp26zhk0lrnkBVqrC2d+E3xWqQdNiO/h8SaCYfYuHQVWbOE6CLFf2oO7IUMB+GPXL8YX1BBQ6Yd0ys9SUwlJ8QHt6/NUJt0H13A3j5V5W9aLaN0KUOGkxw6vi1M9+q6l3DcpGxr8K1EjRtYITuXvhdPHh1Ijy7J9JT+pb4JHXjSVNO6Uxj5v9uHgES+UW2qMbIKKpYJDDfB46DrbTMLOhgnQERthLkfWP+3GljgsFvb6fo8AbMW1WrjxecvcLO02j5hp0MOpJqorWobA== 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=FWSYo81s3E5s6aqgU+8PwJmAj011fyLfN8nlVwQlrVc=; b=cWbUYnReYAX4+TIk2s9KVXAmHLz0I3p+BOOrqiQsKWAKNazB8BfK3qNZlMpxF1eUS9J9yEKi2MxsvdkrEhmOQM++Bm39xKrUFRbFLrvEkoi5zmFydyTQ4ogEClkt6HkjmwmeVNca8MODZUA2Px8VPgiIyn7WGXplnd8bnqOBigJRNQLOr8iINEV8xPIvmLqofQDK1KKdDvev19XT7Y24KwEH0pMwd3Fy/YnvpW/ouVGq3Lt07SoAWVT9oQfKszvpMzW3p2Dv3DPc0WIFv63lMweFT2PaBgkZ3RiG5uccJTAn1uqBoCTXETa0ugrTJFxAQXI2hz+nsUTJCGmwgnlmgA== 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=FWSYo81s3E5s6aqgU+8PwJmAj011fyLfN8nlVwQlrVc=; b=pUMnG1YRyXHjN865moHLgk6ur6Pk+vFL7j8aEaUnGt55yDtiMmJvLCdhkS7XFRaF3uJ1d1GdLtGuW7Jubpg7Cgcj4853tpHytr70NBWjperBTBBd69RGVU3LLnQlDCCpM985exAeI41hPIESuklcGB/bfOYNcwRMfzq1vdFjUQJ+pwVa/fDjaaolpgWg3A9yrU3xEIsew5miDT7UsoXPXuwSoxP1NDPCn15DGFGiPXFT6ci8Xt+1nXahDxD2YD/AKCjc3gSGtUcpUJxyjv0sWBxAf0+AIapTOmc77kf/sDKkFyUlOlpDCXUO+hEgxX6BDwXocukrEa81DmC7zBBIBw== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM6PR0102MB3413.eurprd01.prod.exchangelabs.com (2603:10a6:209:22::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.17; Sun, 12 Jun 2022 00:29:26 +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.016; Sun, 12 Jun 2022 00:29:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Jun 2022 02:29:10 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [srP2je24vMKN9MBWpaqbtj5za/PhZ3Dx] X-ClientProxiedBy: ZR0P278CA0097.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::12) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220612002913.198265-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 47cb0def-a358-4424-49c9-08da4c0a9b0a X-MS-Exchange-SLBlob-MailProps: EpEO96k6WolZyfHRr8+buHtGic1GeA1D/QudRl5eSRhMDnQUVHVAZmiy6uUD3foP/PqFeTWAVN+HtbRS3urwxwK+GN9FvmkgjfaBiYPXcdWLai0W3WXLYY9YS585NTevYIn23CJJ1kWrcrYtDKN5XTp4UJlSdoRrysHFgYpSgCi2CpU5bw+YoHPn6jgjhCZaYrIMPEW8Ao/oO42IM8itJ8orcb9mfddTBifMdxfknUfaJx3Olz8s8DSp7M+wpIO1rL/mzQO1PRyUBvEJ3wT0g16DdcGOiRoPwo8lMVryV7Rgzzn+NnQHsE1t4CNKWB2TuogOrqIqnLv9CoztOzLC+egRPBq+XvFQ54RBjUav9CCb+RuUZKfpRVBGVmtTbemHrU1/6j5v1NEj8N6T8OLilh7envt4xZRBennCN7wBLkred3zn5/Ot7XU5u/F7yA+hbv55WcSmqdJgQYkS7ocJmGADy+CYFo4Dy7/o/oi+gttlE0A6EJK0szTC3C6kuX68FZ9v5IZtmiS/bWY5nGgH8667qneRUvkM8mhCaOSDLsVe8Sb8d6pETGFimzmc2WrwsbwwABtqRTwaLL6Fc2eoHQTJmHcfkZO76EL9q3V/V8Ehkq6xHFA8bSnKOmIB4nM4Yklk6sxNQbkDqLBi7bJOunf/YxPuTS/f+IQdRfE91LJ3vt9OqIoI1WmhSrfaj7s/dbBShXXGOpJ8iAi50I3HfG/K/rW3n1P1g9Zp7CdfVMwNPL5Eqt1AJAZdvXGaxt55Ixq9E7DPDV8= X-MS-TrafficTypeDiagnostic: AM6PR0102MB3413:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TizE332PgiExpy0zevFHfr6p5R/64BYFF1cfIfmBFs7eXPU01B0LSIpK4EtzivaGQO08conZN0mihcmzbC/8ZyEnnPcaleoVQdBEo3RrNpjM/v7iMjf7tzwT/OPqTu/PqeZvONhEjteLymScxdUf3JXmks8v4SX8pY8508nsvogarnBNjBBowjkSMjI2IEb1vSCPF1AJriQ/NLyERVKNSV4jt97fC6nRtnuW7WdMiXU30VPFUM173Fzij8A/NE7tqP9tSTJNNb9AdX77F3bl4f0FpB1fpsiSenFtFwsOZLNNvroG/wPt30CILCdcLCfPRFq0b8g0T24PXGMnpSY/kIB0/+6cenaubd0olGHXuFG+2iybt7DieJuz1+t2uQzFoONeLRSabILd/NHp4uP8zwnZyw0qJRhKXAasSY2r2Febf+0y9OLs3x3Vs81LOcHJwJPJZtB6/G6EIeCEQxc5/VfeEzusEdjfJbzysQUvNZPNDh6YHgsWFFodGuJCK3NZBLlhGEWoBdu5Bx5qQJYM+2/2TTJTrhoyMOPuMmdknYmZJUlhjwk6wG98WpSPdU7DqdwHW1olSVjBh2PFstltcA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: G8+5HMv88Y8iVqwG3gcfeZ7Ew65J+2eG0JsVAr8gnn0Tm5NhViMzb9Ugue9zcF7Kdd9Z9zgsf4jAi+XWf4FShAyv6c7lqyVZpG3ME2ReQ5qmFmi4cdut/4hr6PfYFyf/QME1muqLd5nxWSVZw7DB5g70xl0uxLO309mlCc+XGYKAzHaCORsgJEK4FvxdqHLAGPCDiGH97O6QMMBl2YNAOnyeILlC4sT9cYT1LzIp6QZkGAZmFvzi3OgGsS+L8Jwbng6cuKN7MSbQkmJq8Fi74l+AxhEJjOdxHSQXMXAUDZ9/tI/ttMSGNpOsN79US3tYB2glMweDk61cBa1lFqIACTvkEG8B/s9QK4tnHUrk0uGgU8RY7ZT5NLetcgdafAyNvvppjGLmGRVz0bTh9pXA6CZhWkErunb53GQteAabTo2WTJmTBy2BcEI0DedguWh3NdVN3WtJLkGH09VrSHtu/BolB+Yqcgmr2NTwcR5WvYhUo5Qmw2vJBw9a1O6inM5WuXhAjRKq9F65mjKkINZ7t1O+bPRmQUWQ2G4W7cKJwvgH6BRS6Ark74HK1E08/CQHHISczQ3DHK24UR4bkjfvh2VRXXGsPbeNRcrpRauaR1nL6De+wVnTus3zmOGwZyfHsWjoHYuFgHEN3wBRJVyvAB+juHr1ivyf5BZFwROoAoWVA0TCKcI+afEn7UuQDKgT6YiKnyO2ZTJefY5vg5UVxqQ4RXPnC45T6kUSGZ5DoOmZhIDQmr1gdkC22bdtT2UGJvkyMFa1dNLNJ/oSa1cEuGNkNsxftNhjwmCsrxe2eSM+p/h3QVP8TejobLolHzCgaZdrzDNDKxEcxv10TgMg2S89okbI5kAOzkNnXNSuXOfleotUG77YuyIU1mWYUMmXX3pzZg+LtjhQ+W59Y8z84ymwDWVKOKWdlf0Umds6sO57ht1byL+6GWMa7JIZMsgwM+z7W3NWamS+sLevgz0TzLnisAE4Ot8W3+QpJPqJJtj+96Ljtj8wfwGUvcyLp/34TKRL1MUasrQM/uxm8s4LLfkZPHsJhi5lkRVUFvOKDz+qCPyCxdxQBd38a+9NNpX4hj2zTqLD5jRKen+JY44YfCTmvrmoEpYjtDh/+ReDMVVhzPyiCPsB90/6E7KxDi9/pJROzUja/TMOzeHJG/S7k35mkwfASDlSudxhYgbxwit/EBFW+LaOZmYB3i6QuRHjqglEfyHVVl3Fz7I9X8vkn9w6QYoeSXWxg1Nqd6+kdEckYqz4D+I6dO9ql78D59wG6wQ+WrEtK/j+y/nE11XM9+moaQnnAH6h4iFv8WRz4ZnnPMyzymVrevCN6KDQnaNCvBV12VRYqdhWwIB/dMdoruQXyDEb5Jh+1K6pGsJxf11UYWF1RqZt9e/n05YyITXHLdR8MOtSSxJX8cNhN51sdXlAgwBxYA1rAERKiLjPoLOrDIyCJp0v1/IH6jnlwYk4dzSt3nd56fdIxSfJDpSXYg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 47cb0def-a358-4424-49c9-08da4c0a9b0a X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2022 00:29:26.4154 (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: AM6PR0102MB3413 Subject: [FFmpeg-devel] [PATCH 2/5] swresample/x86/audio_convert: Remove obsolete MMX functions 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: Py64CLaZObY3 x64 always has MMX, MMXEXT, SSE and SSE2 and this means that some functions for MMX, MMXEXT and 3dnow are always overridden by other functions (unless one e.g. explicitly disables SSE2) for x64. So given that the only systems that benefit from these functions are truely ancient 32bit x86s they are removed. Signed-off-by: Andreas Rheinhardt --- libswresample/x86/audio_convert.asm | 9 --------- libswresample/x86/audio_convert_init.c | 9 +-------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/libswresample/x86/audio_convert.asm b/libswresample/x86/audio_convert.asm index d441636d3c..d6d6a81495 100644 --- a/libswresample/x86/audio_convert.asm +++ b/libswresample/x86/audio_convert.asm @@ -608,15 +608,6 @@ pack_8ch_%2_to_%1_u_int %+ SUFFIX: %macro NOP_N 0-6 %endmacro -INIT_MMX mmx -CONV int32, int16, u, 2, 1, INT16_TO_INT32_N, NOP_N -CONV int32, int16, a, 2, 1, INT16_TO_INT32_N, NOP_N -CONV int16, int32, u, 1, 2, INT32_TO_INT16_N, NOP_N -CONV int16, int32, a, 1, 2, INT32_TO_INT16_N, NOP_N - -PACK_6CH float, float, u, 2, 2, 0, NOP_N, NOP_N -PACK_6CH float, float, a, 2, 2, 0, NOP_N, NOP_N - INIT_XMM sse PACK_6CH float, float, u, 2, 2, 7, NOP_N, NOP_N PACK_6CH float, float, a, 2, 2, 7, NOP_N, NOP_N diff --git a/libswresample/x86/audio_convert_init.c b/libswresample/x86/audio_convert_init.c index a7d5ab89f8..f6d36f9ca6 100644 --- a/libswresample/x86/audio_convert_init.c +++ b/libswresample/x86/audio_convert_init.c @@ -26,7 +26,7 @@ #define PROTO(pre, in, out, cap) void ff ## pre ## in## _to_ ##out## _a_ ##cap(uint8_t **dst, const uint8_t **src, int len); #define PROTO2(pre, out, cap) PROTO(pre, int16, out, cap) PROTO(pre, int32, out, cap) PROTO(pre, float, out, cap) #define PROTO3(pre, cap) PROTO2(pre, int16, cap) PROTO2(pre, int32, cap) PROTO2(pre, float, cap) -#define PROTO4(pre) PROTO3(pre, mmx) PROTO3(pre, sse) PROTO3(pre, sse2) PROTO3(pre, ssse3) PROTO3(pre, sse4) PROTO3(pre, avx) PROTO3(pre, avx2) +#define PROTO4(pre) PROTO3(pre, sse) PROTO3(pre, sse2) PROTO3(pre, ssse3) PROTO3(pre, sse4) PROTO3(pre, avx) PROTO3(pre, avx2) PROTO4(_) PROTO4(_pack_2ch_) PROTO4(_pack_6ch_) @@ -52,15 +52,8 @@ av_cold void swri_audio_convert_init_x86(struct AudioConvert *ac, ac->simd_f = ff_int32_to_int16_a_ ## cap;\ } -MULTI_CAPS_FUNC(MMX, mmx) MULTI_CAPS_FUNC(SSE2, sse2) - if(EXTERNAL_MMX(mm_flags)) { - if(channels == 6) { - if( out_fmt == AV_SAMPLE_FMT_FLT && in_fmt == AV_SAMPLE_FMT_FLTP || out_fmt == AV_SAMPLE_FMT_S32 && in_fmt == AV_SAMPLE_FMT_S32P) - ac->simd_f = ff_pack_6ch_float_to_float_a_mmx; - } - } if(EXTERNAL_SSE(mm_flags)) { if(channels == 6) { if( out_fmt == AV_SAMPLE_FMT_FLT && in_fmt == AV_SAMPLE_FMT_FLTP || out_fmt == AV_SAMPLE_FMT_S32 && in_fmt == AV_SAMPLE_FMT_S32P)