From patchwork Thu Feb 29 01:22:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46633 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp294892pzb; Wed, 28 Feb 2024 17:20:27 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUo/ZIpNvix6STjiGDppWRRIbOzblDq9q+vHVX22D0ODlABKe199xo6kiZH+633yfThhf5wkiaIrEjDPkJbWQ5FSrnBqisbcdjq5g== X-Google-Smtp-Source: AGHT+IEcwWYTzJvTib2uaVvomxHQrTIgcftZkmH+CNCcD7U/XEBmdt+F9rLF8TnkdbGwYn22tOf1 X-Received: by 2002:a05:6512:481e:b0:512:e00b:8da4 with SMTP id eo30-20020a056512481e00b00512e00b8da4mr289673lfb.53.1709169627391; Wed, 28 Feb 2024 17:20:27 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dn5-20020a05640222e500b00565765b4bb8si93069edb.563.2024.02.28.17.20.26; Wed, 28 Feb 2024 17:20:27 -0800 (PST) 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="eQ2n9TO/"; 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 CCD7368CEC9; Thu, 29 Feb 2024 03:20:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2100.outbound.protection.outlook.com [40.92.89.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9F14168C18E for ; Thu, 29 Feb 2024 03:20:15 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UNdF7gXFiawUOaneOBxKUaXxfvyb5l2m2nP7q4AHcjtiZ40x6+cZDsTA5u4pwXcbhqatX1fip5InqrrvGBrSAzM0M6WZ+tFJqFZwTNVb44QT23CsUAh78fbV3iBGZW3jNWbZRbf3eZwTGqL++82LEtGi8sqekC2LFW4rHNFyfgRk58tqZLBqQkZsg8QPsfooCeOCdVJM0etfxLnm5sFLV1CPdsEYibjDgFr3RmvRVKZSBkXff5OtBIJeRJCykqxBxg2aNwB5jcRxRskR11Pvwo8Ho4M4E4MyHmYDsCaJQZ0XensBGqV3MRj7/QFdWlhXxfRB7pQ5gW4GD4sT5Q09uQ== 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=3qPhVGbKbA1WUu9ZEU0BCz9camazgWZN5FeyE4rPdm8=; b=awXZWMulcOCbY+3TmPLpIsSjVRN/qGyXuzOl5Vxs8JrrOCkZK/8EVbwnKKJgKYWYuvcYkKUJqh80NH4HLWPd6b1736+Ql9vaDRPywXLfUidQvuEEOh2fIepAjDwXWyjoLVpPKzT7flmH2uaBjM7AeD3zut3pLNLNELopNId8yo1K+HWFNALWXGa8bY9S8S3q+LPcyW36bxsJNXVr0VtUgUcH6J2Ynb1UfBSYg61r3bCZtz9SqrdZq43islXKkA1vFQ49S3eLRe8cRdfAt60rKwAqtaoFPko+qu17UH+mMjrDBP5w3R6D3icXhF0G4pHl5iW/dDg6a+LpRNAJsWhtTQ== 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=3qPhVGbKbA1WUu9ZEU0BCz9camazgWZN5FeyE4rPdm8=; b=eQ2n9TO/XJKAnFc3tannmElgV0hWMObf1B1OVxI0V4vMhUzx0DBkNZxkEnkgiqbAE9g72wl2p8vATjk7EUWqZEBuL9Gf0oPDnH8Ou02m+2ogW4kKaPcPf4Cgh4IIt0r9fbP8eany9O5ZuQaOC2yxTwkqqh1XHT/+gld3o+WlNyDCQscPCV56PsM+01gJrON7xphgTWuTpFWiTAs8ra9irCAZRsol7c1dUfQ89L9fUIXH7oHLiUEbxng3+fKHvGhW3uKVXzq2PdGszrvDZJaoYEqb4htDIxxkjEENiSu/Rp345/umo3V+VWfDyjcjt0fJsQzB+h4b8mimTtGyU7xG4g== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0025.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:2b6::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.41; Thu, 29 Feb 2024 01:20:13 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7316.023; Thu, 29 Feb 2024 01:20:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Feb 2024 02:22:05 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [lqjEITpgm1yFQLmr14RTknYB4fEDVRUgKwgmvwwLL+U=] X-ClientProxiedBy: ZR0P278CA0031.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240229012205.2229381-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0025:EE_ X-MS-Office365-Filtering-Correlation-Id: 7d655839-d261-441c-bcce-08dc38c493f3 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnpZN37i9hALhJo0+7iX4emKTaJzfhtO46zg8nm/41+tFjT8NLrZdyei4LwA//qHeSm4pwAeFwYkA6dyWGF/u5zsDt+irssMkZStaScYjne9FXeMQE3iuDjxlRCnvTJAsu8kVzRMKuyoOn6ObkLwVkO2WSujhUKghbi5vXFVOraN0u0ZFu35qRjE/D2zRjCXaPuqyrkyhoawHtCzB6725XW3KtimtVteGqs1RbNE8eRKTTyw4g3+hV3vTlA78T25ofh9GzM/DQ3Jv0o4FLeueE5M9fFBDw9Ivg6SvNX3wMCq8/QVAKZhT5aBfFOGdqpWshFjwzzRVa5isccY+wGg3pSnI5ba7Hfc6mpmES2CPrVNgv0r4Bs3ReBbuSVSs4E1ocQTM5dc1nw5q3S2l6RSrZAbYS2pmR6IqIuCUyRln6+rD0hTA1pLpDB0HmQbtGBlgcX786msdKw1+5MH0jmizWDmssdVeziNJj2DmMHa66dYE67HS6Ytu+JnlmqwXUJVtorS6uGanIALcxwDySUKNYpnY0j3mPg69GljBC8pjEY2avx68ia1ttVUwId6ssVHYVkwqlTk//UOoLh/qQq7Nk47gcw2xjw9eggd/rg9c3uVaZLkaFk+26mDVYyUe6B5Qkf3WIwnEMKb3sNym7mOWaI0E3TBZCufIhAQdKVIJ0ZqHHyhESwTxyCSPGRYFHwY4ROuN1ToK43U9k20R+Watx7EsUIaBRre98IJqIolrN2ZHF2z2w47a/y2ycYu6sGHYwQ= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dOjNwSA1PPX8J94gml6t/0cgR8xf8k1hNBdrqM6iECQcbwlcQi4nkBg5hTrcgmaVknz1eCDvR3zTpMTaDTrXixpgXDXpF5IcsbGE73niNXvVTxyhZwKp+rp9J5/AL0hsfA6uVN5WzIQKS+ZB7d1SR0Ke3XvNYCwnbA7HfVLEg2TviifRe4j67Z8L5amMj+eIbExaq8mksD727TG2A/DO1kXarO4SGYbJKyEWPmHiyE3zJHdXhW1+DN+E6g4B4cfPJQYRTQIFZq+oioAYiO51Y0K+NXMonUYoDD5fFZdmaGiw2Lz1wJUxO8klfAvDwZpE9PjI2qYWLekWZ93cWQqa1y0rY/UIyt4CjtTKK0J1guuFaCGyVFg0iHvK9HuAVj2ewP+Vya5O5GgO3sG+63FEbkju83mylEHm6579PKY5GCBaxrMP9o6H/4d+yXbIWIGCxEUCNH+rw8mFfCrxF4N0HWmQ0a3Qbiu4lwFFc8MeXvk3w5NzH/H1/mi52yY6uoPoo+d0MPGcDdeXEdYiKNZQDjkpmXDGcyEau0fJs3xpdQlQ0mMImaIaibkHT/ERzNG6mZLp0pPwqnocw+x8urcSrEXbhBF0+fHmxSGjLZQXGS7vkNZ7wed0bXOCCTuw36KY X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2fkYDEbpwXf3pJQiiNIZNsJXag383M3T82+P7FPA/yu2ybMNi2+p7fFpNng4TyTycvpUeCx+5kRnHZPSvuMkh+e8Spom+AM84MOHyqTkkuIJyjgLmUEjpQPQOA3LpW8vV3WtlW7O7vQ9JFK2PgV0RVsqJ1Wxn/6oz800PxEPePa7efQSMkyAkQ1dF8/E61f2RuOKmP3cD57yYZ5tR/7jJl0DXfdHJ2exmEEoZ4STTeXdapqfbFOfGw6nE+ABBSYm6LOv4Ddb63MwwiA0HcWcPs/toAegmFajaJb9ewKKlRmpjpuH0joI2wFCO8stwVguoBZd5VpquUGAAx+nUBAeQnq6UTm91DURyNMelS6gQg5oVfztWEzyuBNu6kMyYTYUDhMNesRlZG6W5H/kika7XqZh7qLD1fZxBefxL+j1gZwFRMSkrGpoyJyLgzs3zWnN6vi9GukmFd0FVMkVwUDQlhaN03QD7inr/FdhxN9fJeDvRb/QEOvFHH47kXSWzbwV++GT/fnkK74RqJ0lZkO1Gk+NyOyzGlb9+zLof9NiQ7eQAFtvUDXSu1K0jFZR4mCAfCK3IhIEOkQAqM2gWX4d+mLajz2dQXo9r2dAELfC6RKWZm9s1DfrDAts8BCJdw1Ut5A5NbLq160caUl4Rx0MUQho9bk24yKJzM4LeYE1ILNo6hk53Smv2GM/DVxgZsN5Q1mPU2RmD/dIfEhNVaoxg9IXcrxy9L0h2epjhJzWNmcPq5xCO4tT1qKYJJ0YbTjSPcZkYxmmadPyNX5eNYWbTEGMK89WcdeRrDrWsSw7ZJNqOmO/TE7rfjrOoR49+Y1L8tiL5tvlgiI7zRoAOYMR+kyFdWSnTp7JfU2vxofHViG/ogAUCu7uoMtqSvuj2TGxnERu5APCOcrpp4AVdipU+RL5j7aTrcpFP2uGygQVOjVyij5XvV/Ak+iYTNAJqBO0ZSf3njAV42Wt+boNdZ8PWLIGZMF6wy0QF3+dGL1AwTnZqzUyf8kxHmDDCM8Ao6S1HIQjpUr/tEApEvufyq+Oh7D9M+vBSf09mrT09AeEoDcPb050S6nSSnoRCHij4/bIjY8XsDZT4StLars87jG3xp8onPryAJLKgHvupcu47hzpXlxALpersc0WUdKLjXIassOLUicg4bZudxTtxexNrXsWhfF6UEYN6LuCj+d6nuRzQQ8MzyVgl6gLNpt6k1+2oWYN/BGaupcemcKIM417A5S0MCcysjkSSVOeZ4eeFe9eUscJgzHqjtlFFf7oQIXvOg/K5vFN1SY+icLo+XRqeA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7d655839-d261-441c-bcce-08dc38c493f3 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Feb 2024 01:20:12.8874 (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: DU2P250MB0025 Subject: [FFmpeg-devel] [PATCH] avcodec/x86/fpel: Remove remnants of MMX 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: /EjDUhFb4wNt Since 7cad4dba505f9ad0adf013dd5bdf02a57249eecc averaging functions only exist for MMXEXT and SSE2. Signed-off-by: Andreas Rheinhardt --- libavcodec/x86/fpel.asm | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/libavcodec/x86/fpel.asm b/libavcodec/x86/fpel.asm index 278d1410fc..b07b789074 100644 --- a/libavcodec/x86/fpel.asm +++ b/libavcodec/x86/fpel.asm @@ -25,16 +25,6 @@ SECTION .text -%macro PAVGB_MMX 4 - LOAD %3, %1 - por %3, %2 - pxor %2, %1 - pand %2, %4 - psrlq %2, 1 - psubb %3, %2 - SWAP %2, %3 -%endmacro - ; void ff_put/avg_pixels(uint8_t *block, const uint8_t *pixels, ; ptrdiff_t line_size, int h) %macro OP_PIXELS 2 @@ -49,12 +39,6 @@ SECTION .text %endif cglobal %1_pixels%2, 4,5,4 lea r4, [r2*3] -%ifidn %1, avg -%if notcpuflag(mmxext) - pcmpeqd m6, m6 - paddb m6, m6 -%endif -%endif .loop: %assign %%i 0 %rep LEN/mmsize @@ -63,17 +47,10 @@ cglobal %1_pixels%2, 4,5,4 LOAD m2, [r1+r2*2 + %%i] LOAD m3, [r1+r4 + %%i] %ifidn %1, avg -%if notcpuflag(mmxext) - PAVGB_MMX [r0 + %%i], m0, m4, m6 - PAVGB_MMX [r0+r2 + %%i], m1, m5, m6 - PAVGB_MMX [r0+r2*2 + %%i], m2, m4, m6 - PAVGB_MMX [r0+r4 + %%i], m3, m5, m6 -%else pavgb m0, [r0 + %%i] pavgb m1, [r0+r2 + %%i] pavgb m2, [r0+r2*2 + %%i] pavgb m3, [r0+r4 + %%i] -%endif %endif SAVE [r0 + %%i], m0 SAVE [r0+r2 + %%i], m1