From patchwork Sun Jun 12 00:29:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36169 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp548120pzj; Sat, 11 Jun 2022 17:29:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzVFMHHD43iah1XPw+Jbs5Bms3B9nCjRgaNCLA1AlB1AhKKvxe4TJNv+TD3Y2b0lfn0mlGw X-Received: by 2002:a17:906:51c6:b0:712:2a1a:afc8 with SMTP id v6-20020a17090651c600b007122a1aafc8mr8232242ejk.649.1654993790908; Sat, 11 Jun 2022 17:29:50 -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 b11-20020a056402278b00b0042e2a928df9si4416001ede.287.2022.06.11.17.29.50; Sat, 11 Jun 2022 17:29:50 -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=DRPWI5fJ; 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 1273168B4DF; Sun, 12 Jun 2022 03:29:41 +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 690D968B345 for ; Sun, 12 Jun 2022 03:29:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nc6dIY29WOmfqxKgX8GpCgrgM1KG4ZoUX+0Szs+Ns3MW5Xb0W4mjDnSTQM1nPMpZHHVXsK9by9ImBFKG0qTlc+zV1hiHw/HcNTtIzRtwQtdc2IEbfrIR21IKdMCi34rXLajrF5rzc1pUiaTX9/HB3b2fVolFafOi6ASXjcGJ4lftJM6zNH+8iUps6/X08IqsyW+vP3kzBPrFzlpd+n2TTihTIgp2GfYot6gi6GTXpCgTlE/1TQPHUzel7VWlwUCrFax0r74qo3FOFP6qfVuSa69DM0EEHTWFp/b/oX/K/oFZPqOjLHdgegczwuuLypsjE5gKQ7ZFmUeBvbAP+pwojQ== 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=USTGY4MZaQhYXgoPm2jG1UHv9VWu8HqLT3qxZ6Zks2E=; b=K40QgNA184m5X4QuxaR6DjVL8htDtbBfWyT5nL1KZw2c7qAKuU6GZJHyEueTUSYSjJ8jCZ2Thp27f3xUK6allQ3etH9Jw+QtFfp4QPipBacbIMgplFhKp+Ws/tRT9F3usSTM/RVHb+tU5P5Z8nRhqeiq4toZFMH8PldT3BIpX/KlETI8XxsqQYcCyqE5SByGo4EeNGrsOyhgdMEMTTT3bKcq8fVA76ZXRAVklrqW0zsUbs1i/R3Y4DiD1ZkppF/b4+61rqo9uWUawXPeDjb6hbjDzjAZq7k9LBX+JqMeaouXv/dZPtGkVIZooFXZ5h5t+1Mi7VDXf6YGvFQj3A+UXw== 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=USTGY4MZaQhYXgoPm2jG1UHv9VWu8HqLT3qxZ6Zks2E=; b=DRPWI5fJA2XA4ayfWz6ZTkuDYQfgiiAxCX4WjvPbE0bzZRS6WYx2gkXGgPMNgSxHJwY4nidKgLjHqyZRJK7yTKN1hUcq+DVLFXHgtElbEwdWaZaO/EY/GTpyRX18BTOjRjukf3OZdXv5E4xqY/p+xLOmDanXmemniYCvUC496GZ0nKR1wqJSkEJ4+jb0YGDwy8YkZ2Ec8RkH45kx3BYvj0d9+wwIITfVNkmFUttZWCszSQ/8h4aNdzV9jTaaUSr0+VBT6doqm4O0IO1Ke5EEJzld29btTaTFZjDwABBnRDmY7N1trIkoaNEgpIlVsoFLVfI6hY8kyTJAhmyV59MjTA== 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:27 +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:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Jun 2022 02:29:11 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [HdJjOG8BTvjGQ7qN7tMIBvXbWE8JN2uI] 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-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 23d8fb84-a9de-4194-2c30-08da4c0a9bef X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQiOqKDs6sIqMRJcumZqmNKngEvVIzHpTaO/qdScYZhrqiRrq0DauxzL4oz0SMSFHCGpti3AnnsmcrU8hVULErFQ/ThJVzgL65Px4bFM29pXtjUdCvmsN+zFJJavunazgJT1TegMB3QvAszSJqcWPKwF1sBQ9/JZe6/AkDNtjrTabX72xiIvNevamAMUn/T05l/YyKXVs4GLxZSYghHprC7ZERKP2IzF0Sr38hdru9GwUOTeNK3m2NL6b0QRzcRMORq8Prr9OU2Jr6ubiMHAxJsEyDsiIf/vnI3gfu4zDkLtp7ZGnQvJpwFfEfxy3cr2pBhhSxD+M7nOsU/fygVTqoH8at4uoxRVSqZFiLqkpl4n4dztKbEQXR/5f9taIoVhrpZZTssHCU6btGAgZtEL8W08a0Zv0ieRqxsTvk2UE4iigZqXIiX++gjhc4K/UTAeRPYPbRefneQRspJ0MSEdzQOtt/zLoa8jvoxKQ3XesViSWf9EPCdV5L2Sf9QrkNsfzUpekSjk04UfHhDTxF697nHcHMDVAsSxyztyica8QP29Dw0Q+IzdcnxOqugZ9uPtagXtZMbuQhjs+zV00eYhoyTdN1a+4wEh12ndKRVVzVtTIq9BxVW7/ABwVzDCMcTGnBld2HoP+SikAQRJwn9g1bwq3CO8e0iVFK3Sa5yfNjcpLEyj4iVLGSPl/eZuW6yk8AhI4tLM6eC1xsgs/3jpCZ8MAXuae3RTAsrCBOaK52/UhBLYPqK/CM686BRK8Y4p+U= X-MS-TrafficTypeDiagnostic: AM6PR0102MB3413:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w4YSg4hbv/nSDfwZpEnMSTJ+YAqhvqw2+DWZ2wEYfqKowyASzJUo9ghPgQ5algE3xZyosCYInh9NFF9q4/y1SsGOSE+4q9Esc4/umfqmcr1AUimOTRw92uzX777yTe/390YyzXDKBvcTnoL/bF0NpAF+TU5ZCCtZkvUb9ZyrrNzwDV8lzh8bxM8dJC5NUlfUtUw2nbHZWySOBgdV8xNLCw2skjy9Nqi7JL4bW2GFk6FazjFSr4rZ9Nd2Y/TU8MAWQVR8NSLslyg2Cke5RjcNyNHK5420j5jLCx4AlJBvi/yHtxldnOIPFHLYPiphHO5HvLypVeCmVTbBtCTJ+4urELWXnkLwIC6PGRCn8CECr/Ec7k2oXPCGciXlekM55baDR66nupqwstXPKnMmrOaPhkxnkJ6XND+AoGVQyUVFu6+WXq4ofit7W4WRfToC/rzcBOUKfVjQ4C+x9qXuCKLPeDqcGXfcbBak+cYzE1DwSBckZHAc1u7R38EWdUOEjFAxeuDSrBDEEAtbRRmLX5cQ/G5HX02ObYlo5ttt3WIKFADaoWqoVe0PMTDXnGz/wVndNEF9+Jfj0VXOIROBcHrYBg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dYy8puPL0jyfBTqzm+TvPzjR+JCk0hty/ogmxyyRIjg7wQy5FLlFsmtN4yMWpKkD3qHgdm7tMaJrV+28xZo869pLbtn8SBUAdkZPG4dMaci1+AMwunTXTxtbqwvptnrrrXRRRs3nVRd/z63DlwassVZJkYpiSpwuJIKKQyxDLWSOHKV5YSQnkuTbsScphI6mcOeaqvF/eS95AhK8sxn9ECnl6TwgnxEVic7ot/SInEFWR72bgDrUrirnFKoT+8+hSeTPNnOylbwGiUUT0BiAQjA1PDyvjeYELaxZeUL0uo8qDjthCZEsO8t0S6fp5KmWHw9RXnHwJkkMGS3IuMNLGSoXXKr8LLaTnv2uY1Brk8MZ+XQqyQ3hAb7kEvvDVvOVPb7WMGht+qPLSYFHMXSce8TZRxSdec3SrUVzMyO6oUJ6duh9Ntq/RwPajI6V+zK18KnLBXLhrSHbG6MfmvjvaB8jRYKycZW+uEvI6KsS+Jhqwm8fYoou0nIp9dy9wwGP0fEL2klW5tr1jVIm7EccyiE7cS1UWZWqhwMNVqf1dsUPbloktu6/cq9q6OBm/hAVv8VlGUp8Kfe6g7uAicZJvMFNT9UaDne4Ijo1nNTJvHbug7aQ7e7Fqj6k3PLg80JPRQjJVV+thZX+ncZoCj3E2TqwrgYjhdceuH01vOcMp7OUN0jdXp6urhw5tgQrsrBGyp6O22jUFX4rJJ4ycWO8iyCaziGQ4giCecevFcWHoMScGxZW4saCxHitdEjdaDPVSNdhCZAtlyAAcRCv7Q6vkJIs3IqfTC7keOaaFr+vB1+AXtWUUKD+32dDwsH0oy3Dp0nlfO1/CVKPtG4v5SRXj4TC4n/eno2ZdgS2JbAgwBGkS9g0JJKTwwg1RF70phU0b/Cm1xDLg5Ktk7g972WraQKKiR2POP9DRrjw5I8uxQeyVks4yZ03umXLelY0X5Jd85nE45wTDFsgnFm3tGjqO4IWuOz4mkkjjZqJQ+tfs84SDj80Ri+ltVzNnOrJZCLy6FP201JT4960LhVSESBr2zZgd9AF2Ho/WbIpkeeg9f+lNSASZjf/+aWtOVZlWXRCOqwQsBBDHAWYnDXY+dy68JT1KSlsO1Fg86Ce1wBgeS+K9aUe5K8UQRcd1QKCooJ9NDiDwgR//i3ih/Y19+nl00/Kayqx3If2lNcyarf2Px8/WUNR03X4cWGnen8XGWO3wUtFGoeU49/lZog8AjKQGVoGhmYDuMiOf0/395kqCGpBxyRoIvDpJXKK+Z9497ToWZUeHT/u4tspwukQ/8ZsC4Yc96SdeFd4BiJaCDIzgDtnnPv0H0zfKPrcBJSfvmC6a+HFWg7s+uejASxhiQPZmPWmSd96Pq+VKf0YKDuOiPekDXXsiHZaquJTCT3KgpoOqut5GE6Wx+WxPgMthJ4ux1zRFowbkTC85X9WJ9XRjeXn8eXRtfHr6dCTEcHmwrntjFnpO8NMhMQ5Uxjoz+m+mw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 23d8fb84-a9de-4194-2c30-08da4c0a9bef 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:27.8529 (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 3/5] swresample/x86/rematrix: 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: mwyW+cg/GIhz 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/rematrix.asm | 6 ------ libswresample/x86/rematrix_init.c | 5 ----- 2 files changed, 11 deletions(-) diff --git a/libswresample/x86/rematrix.asm b/libswresample/x86/rematrix.asm index 7984b9a729..968010701e 100644 --- a/libswresample/x86/rematrix.asm +++ b/libswresample/x86/rematrix.asm @@ -223,12 +223,6 @@ mix_2_1_int16_u_int %+ SUFFIX: %endmacro -INIT_MMX mmx -MIX1_INT16 u -MIX1_INT16 a -MIX2_INT16 u -MIX2_INT16 a - INIT_XMM sse MIX2_FLT u MIX2_FLT a diff --git a/libswresample/x86/rematrix_init.c b/libswresample/x86/rematrix_init.c index 0608c74e7f..b6ed38bf67 100644 --- a/libswresample/x86/rematrix_init.c +++ b/libswresample/x86/rematrix_init.c @@ -28,7 +28,6 @@ mix_2_1_func_type ff_mix_2_1_a_## type ## _ ## simd; D(float, sse) D(float, avx) -D(int16, mmx) D(int16, sse2) av_cold int swri_rematrix_init_x86(struct SwrContext *s){ @@ -43,10 +42,6 @@ av_cold int swri_rematrix_init_x86(struct SwrContext *s){ s->mix_2_1_simd = NULL; if (s->midbuf.fmt == AV_SAMPLE_FMT_S16P){ - if(EXTERNAL_MMX(mm_flags)) { - s->mix_1_1_simd = ff_mix_1_1_a_int16_mmx; - s->mix_2_1_simd = ff_mix_2_1_a_int16_mmx; - } if(EXTERNAL_SSE2(mm_flags)) { s->mix_1_1_simd = ff_mix_1_1_a_int16_sse2; s->mix_2_1_simd = ff_mix_2_1_a_int16_sse2;