From patchwork Mon Jul 25 03:43:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36937 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1806440pzb; Sun, 24 Jul 2022 20:43:36 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vhHgAKQbIKjW3lYspfXsHI+vRM1vvrFlPgHAHFkcb3aZuTWG8K9+wqUdgowxnXr/TKDCtO X-Received: by 2002:a17:907:75d7:b0:72b:307d:fb60 with SMTP id jl23-20020a17090775d700b0072b307dfb60mr8811206ejc.22.1658720616404; Sun, 24 Jul 2022 20:43:36 -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 y8-20020a17090629c800b00722fc5e328asi6393300eje.321.2022.07.24.20.43.35; Sun, 24 Jul 2022 20:43:36 -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="H/R8OLn7"; 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 D306068B736; Mon, 25 Jul 2022 06:43:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2102.outbound.protection.outlook.com [40.92.90.102]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E80AD68B31C for ; Mon, 25 Jul 2022 06:43:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Jr5dfr4Js4p+yYIMqPSyfeioRlUovYQM4BI2Lz7h9FZQfE9hS0sewpOC6zzPKRWNUzvsunATTBHjg2fn7O2jCEkqWz3Uw0DQYqO2AAqXNlWgxo5vvas9Yz70FIzL0mVR3Ys7uN8DS+Pw8pRrmBB2i1CP6pFDhrRFu/SMGhf17rMpycAV1EplPhUmzyhAAWkiI5uwYtGQW8pZpHiuI8XF8qqkUpXSfv1jkY+5ULlwISCFUXOYllt5kocpXMVXbpq/QwST9AFVf7GgOa6+1ymwqh825V9fwAqkQjHjv2tUOMxGMRFh1Tcp7bIxwS57JLLg96PNVzJb3ffsX9orF8+VGQ== 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=uSR+aEYs/aA7gMVnJGMednDwiMGdVJsGKy+wZhYp1gY=; b=W35iEeQ5m80Ily/qiMtOTub0o0+R2WGg9WbbAcejrcpyP6zruEkMeOqCmJ2upeWpAypBIjgNF53xNGlJhppKq59JzYep8iITfh/6K361lAJtEHJ+4oroAYvRTw4jlRoNfa8WyPugbqcb76d4ttSjH4trKI7QPS1kN/xqBoWTvS9yKqaRf+C8Hegrh3aJ0pxR2JvkMr/5VKde89iTPvynAe8gAR5YbRdVZ0FY31MgJxue0uRUdYrQGq8cqal3yAbflP2BJYh9saILFlN+uZ/e3lLQTkvzInqO1Db4sFVj+MAqIZsgQLbvRb03eqpO4so0At2enATCpK8g2tGIvxkkxw== 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=uSR+aEYs/aA7gMVnJGMednDwiMGdVJsGKy+wZhYp1gY=; b=H/R8OLn745x7S7J8kOztQxXE6Ps0T2D7UutWTLQlk4XRxGlzS/YdQ7SaUkVgqybjBiVFivvdhLrwL/EWotpou1/6XhMiQE6dwab4xkKFnGyoItE2YCuecO59bKaWdyDdO5u7wYkg2U5EIThvkBuN8Lk7HrJ+c/28q6S9f4+qVIl+zu/l6/FC6c+kI/w/sXiGygUsdl0a3VIQmz0ngvamNEuvOSWz5sEx6kbBzbQeMwBiTncg6VVXQ7xBs4qcVJA01YQF43naDE1DGDa401/9RI++DP/AdMMIEjOK3+lB6mZ3OcChpzRkU4Z/g5MGs6NhhaLTolYuUjkd/olKdj6X3A== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM6PR0102MB3560.eurprd01.prod.exchangelabs.com (2603:10a6:209:21::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.18; Mon, 25 Jul 2022 03:43:21 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5458.024; Mon, 25 Jul 2022 03:43:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Jul 2022 05:43:13 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [4UHDWqNBJuieIIhsTg89FlEaltRX/Ft4] X-ClientProxiedBy: ZRAP278CA0014.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::24) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220725034313.1919047-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 16816118-2933-4aa4-b16d-08da6defd165 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiToJ1zOhCTJMxCCEpyIerpRInziHVHwJWTvvtLhjwnbLuvi5y+MTEV/5UFlOVQxaWz3oEaic611cGj5/z/lczdlMtRMfodpqaB76dcKnnJ9jO2glcrKui9eR08Tbbn2Ndh75Z/3DXbJXCFisp55QL+Lq+jZP6FB/RXzT74C6X8MC14tXuKOYnuwJsX3TuTwczHhdhJoowNZ5fxa9SN3dT4t1dWbICMOY2wMd0vPlcaucgDgCrj1Ssj5J6H+1zQacLNH+Eox6dgZTdu1IKxHe6mubJgk8cCCrCksbGwyjQt1WZAkwJB3QSpXU/cz5n77QLOVAxlJfOnFcLKXdCJ5chwHWpzbA9t7VYxhT/e6av5lrtpytQm0v3/7TYv4Sq2LQDBKZnjptE0BMZi0BLHdYRBbRou2glGWhjoPPFG1B8dKwHkDpKHrkvMXdbyabpw3gcP2ol14D7eFpiB2+O8bq/A1QciXWsNVKVfTujRLqs9oAP1bb88x52/wC9V/4QE2noDnfUYDvD7WtuxjF5ysptaezHZj4ouA+pUVHfTPkQ7pYQzzRnkgeif84Bie75PeiCKAHSmG8D2Sxtzm+/XcAdnr4c7m+rQoGZdwAbkMEM+2qTcyG/yU5R9ta4ZqkdFpubsfGw30RyOmJDZydRSUjHTqs4UNMcnC2Ie/+56hHfG+akQSC6dp4ME0ncsuKeQKQzB5T9WaiKTna8LjOa0BzRsNQSgwwhlXExTgfru6DkfSJyvYu2Rmw0CmP4etbeJOLhs= X-MS-TrafficTypeDiagnostic: AM6PR0102MB3560:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LpqvzoXz76mlijvGBfdnjZ3SL8a7cKhxsHMONESE92LzPuH7gDspnlSnISQMNm1qzb6GVnLiu6/YgeC3t+CwSJ8kKsOF44jVBD3DxLl3RIx58V/HQLd6T6/QqACjZ8NsajrdqIE+lxJ0tttm9cmm4nxbaEvdJZ55gNnO/RXkmAaNDfZfllEjg+joaMYxDVO72hJT6Z/OPS4ssDO+NEGYZcnqy8j6eX6+uXbI3u2O23bxV7ogIMPK4vw6Q98gRqmkd9e42x/FVPm2Z7xLdZ5XcHqnqB5sQ5PH1DLH5pJ6TEVFV/GCG7/d0BChIR3ab1AdtGPJGYh3xDerm+5Csl/urBrmtvXcunwgOcvbRGWJeUDasjO5qTdHWZ9euH6V0ZiC6gJubWAn3ITjNQMSmJ1frGf68/NiSSlTPU5VapVgsx6V5HXAGdYweE5Ea8aKSmRdyr7Mj4ACmGoEqU2fE6UJCf2qnfCSSrMtjz++qJ5zHu4y/BDEvQYkfIAQ8GxZqwVkdP4E5nrrLIgnaQOVSSNzpZXwpjZwDvmT+HPVpPPXBTLfd+YT8iStZorUGLbGDqhFblf+wbnWBH+3XNB/5TyEbcISfDNJURIqSKut7F4W78JrqNAny4Q5YFQ6+H8fK4veeTpjZqVKc+G3koUX4+O4JQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Sq3etMk4KiLku2UdZZZWTy4dryGzLQuy54g2tkr3xWVQvKQZvjEl6rDC30bIHe5OoQiktcm/R7FzGwRCs/QSojXeNTw/dyN81KssnWlfA8yonNJ4NVI3Q4QU8lUhteqGnwldEE5BMjXUQS7eiJ4PsHcg7d4afskKbSx5hEUL0wzyXa3ed4ro1Z8+ieA0DEkNUIJdhj6X+g1SAM7F6QEiJDldOB474zw/IVFeo3vvcYputazKynzdfnO3Khq3jbOI683egqlWNSPnOgTAGmN6/emw6nGaQRBRt6WxgieGYCmumJXGR3owJiZK2PQSdZpABIafAihmgBQiAPUG6odULMneiqE9QFFS0VKCWtNdTJkGDqZYxpFyvYknYoeGnrkKoUQqc5qVeIki/3820cEXGwt9V4rha0gA+omdvWyZ/7VJT1P+ONryd0yDcuFJlHZswKkNsAv2R8XjoucEytR5lXti4fqx2R7lPFFbh/4aiT62GlNwsbMihSeatDD5GgCkF2/In6htVC+RJnRNj7f+OJHSCupCybhzu/rhhoWXRvLyERZdTuxfh/lNt09GeKirqDcgltcIbkfkF7RFTgqSafwNMMQoAYRFh12Wru3fJKZDhujldP9opCG5cfSW4n8pSwusvjmM21lcjSdoj1aQyo1pJI1A0gY2Xe46xsHaxtHH8T9N0Z0O+p+lJ7J9yIVL9n//RA83LjdVVihu8YO164ZU/dIBPOvoKNjGp5y4/FyzIdovZMqLqUXA/84QQMFb6zyEgHnA75ZaV/GfpvPYCGFhPrgJtFJAD0A0Y1pNC7rfXUJPdkvlKPKfdWpqENohxFlluzYrv9x5/Mp+glTEwOY06Ur3rR694IppVzZ+lvIxAaavoc1USrPqN/5SdMo0Fj5MsYn1ikswz+8wNE/InXoOh1HY9IOttvgYem87HkdhA5YnGIcft2CkbbG7rTmf0ah7JJuTH7J+xuLS1Wz973j3qm/xxL1R+8Y/r9rXWqpWJvhZPXxr14cUx/xEuWTMa4qBv4kLDi5r4RPTwclWlyVAD8b8rFBffpP8DUmXCBzyIQGPsK46MXwWi2IPOvk7aIQejayTB67pDDFvmtGAAPCk6BzIYOK7+kh5rbxOFpOCx6TBPbjKi5czTbKpgjmoGd3/stNFb321bqszvuEQ5gBVzSomFc6PkuxmXnt7OjwW0WRTy9eOzz2FQW++oydmHfTZ1fRfb8cSQ+IZPEDBuKRxOviATvlu7/0VArFf9Y5/xs6V0Vwtdgj09JRBbpvAnVib1Em4cBrcfqW6K67s/AVu2MTlkvYJEFqczSh1l8M= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 16816118-2933-4aa4-b16d-08da6defd165 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jul 2022 03:43:20.7497 (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: AM6PR0102MB3560 Subject: [FFmpeg-devel] [PATCH] avcodec/x86/pngdsp: Remove obsolete ff_add_bytes_l2_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: R06rBWJM0pM6 It is overridden by ff_add_bytes_l2_sse2() on any non-ancient CPU. Signed-off-by: Andreas Rheinhardt --- libavcodec/x86/pngdsp.asm | 16 ++-------------- libavcodec/x86/pngdsp_init.c | 7 ------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/libavcodec/x86/pngdsp.asm b/libavcodec/x86/pngdsp.asm index 50e4255dec..7bc43c79a0 100644 --- a/libavcodec/x86/pngdsp.asm +++ b/libavcodec/x86/pngdsp.asm @@ -29,9 +29,8 @@ cextern pw_255 SECTION .text -; %1 = nr. of xmm registers used -%macro ADD_BYTES_FN 1 -cglobal add_bytes_l2, 4, 6, %1, dst, src1, src2, wa, w, i +INIT_XMM sse2 +cglobal add_bytes_l2, 4, 6, 2, dst, src1, src2, wa, w, i %if ARCH_X86_64 movsxd waq, wad %endif @@ -53,7 +52,6 @@ cglobal add_bytes_l2, 4, 6, %1, dst, src1, src2, wa, w, i cmp iq, waq jl .loop_v -%if mmsize == 16 ; vector loop mov waq, wq and waq, ~7 @@ -66,7 +64,6 @@ cglobal add_bytes_l2, 4, 6, %1, dst, src1, src2, wa, w, i .end_l: cmp iq, waq jl .loop_l -%endif ; scalar loop for leftover jmp .end_s @@ -79,15 +76,6 @@ cglobal add_bytes_l2, 4, 6, %1, dst, src1, src2, wa, w, i cmp iq, wq jl .loop_s REP_RET -%endmacro - -%if ARCH_X86_32 -INIT_MMX mmx -ADD_BYTES_FN 0 -%endif - -INIT_XMM sse2 -ADD_BYTES_FN 2 %macro ADD_PAETH_PRED_FN 1 cglobal add_png_paeth_prediction, 5, 7, %1, dst, src, top, w, bpp, end, cntr diff --git a/libavcodec/x86/pngdsp_init.c b/libavcodec/x86/pngdsp_init.c index edbe866c22..e2cd5effe3 100644 --- a/libavcodec/x86/pngdsp_init.c +++ b/libavcodec/x86/pngdsp_init.c @@ -20,7 +20,6 @@ */ #include -#include "config.h" #include "libavutil/attributes.h" #include "libavutil/x86/cpu.h" #include "libavcodec/pngdsp.h" @@ -29,8 +28,6 @@ void ff_add_png_paeth_prediction_mmxext(uint8_t *dst, uint8_t *src, uint8_t *top, int w, int bpp); void ff_add_png_paeth_prediction_ssse3(uint8_t *dst, uint8_t *src, uint8_t *top, int w, int bpp); -void ff_add_bytes_l2_mmx (uint8_t *dst, uint8_t *src1, - uint8_t *src2, int w); void ff_add_bytes_l2_sse2(uint8_t *dst, uint8_t *src1, uint8_t *src2, int w); @@ -38,10 +35,6 @@ av_cold void ff_pngdsp_init_x86(PNGDSPContext *dsp) { int cpu_flags = av_get_cpu_flags(); -#if ARCH_X86_32 - if (EXTERNAL_MMX(cpu_flags)) - dsp->add_bytes_l2 = ff_add_bytes_l2_mmx; -#endif if (EXTERNAL_MMXEXT(cpu_flags)) dsp->add_paeth_prediction = ff_add_png_paeth_prediction_mmxext; if (EXTERNAL_SSE2(cpu_flags))