From patchwork Thu Jun 9 23:54:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36118 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp654724pzj; Thu, 9 Jun 2022 16:58:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzWqme8BGaV0SquyWO7UaVYzFciBsriM0S+Oe0ihYLbp4sqlgM/D7mN9Fv6f2nMwWYqS1tz X-Received: by 2002:a17:906:6a07:b0:6fe:ec47:b64d with SMTP id qw7-20020a1709066a0700b006feec47b64dmr37893497ejc.765.1654819083707; Thu, 09 Jun 2022 16:58:03 -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 ht12-20020a170907608c00b0071191fb96eesi17287485ejc.459.2022.06.09.16.58.03; Thu, 09 Jun 2022 16:58:03 -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=hT3HrtFX; 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 CC37168B883; Fri, 10 Jun 2022 02:56:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070066.outbound.protection.outlook.com [40.92.70.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5045968B882 for ; Fri, 10 Jun 2022 02:56:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j0VSS0TpNyd3VfuaeqlYYTGo3VN999PCRUFTJ5ByzhnObfpiwiifoDlElpZnC+wq90UjQv6jmEI53qw6UjZcgvu5pcXC4hNgVk9uxFRm3IxodDaPvs5fWEu/nDKau6aTBxrmHzZVAcNVF4rBx0xDk4fbsIx7f7rBKf2hxh8hAgK1ba8knVQYQ1NXuxeWHueQgOqmhi/MNOx/9o8ZMTsHfKCTNmbme0tOJn4+hvr5hDtop76SJSSFVFx/RoxOw4CS2eayqET1JHgvJ9IJFZOtV4bMUV/jiqdYXLmowoIz70b6tIDxbCMciMkp5jl/vwTJzSMWWUYTLCFqrBOPBGqKyQ== 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=NpVtCwI7zmpKF9yYpofvvs9OUUl9Fma2aYfK2HXWIrY=; b=Ti8TOlCDY4ro3Tkhv1vdQbydBSK2O0RuOrK5KzFal73MtHQOFzsyF0nRzJN+I/VhlCznkHhoFzwSmiX9kfaL/IrWc1SK0aCu5jUTEtKfrtDH3OdcqBk8mEPN5aNLb5XclD9zHJbET+qMADka7xYnqjziH+gXmlWwhrOu61YFcUa4bJNER4EMAAEGhFLl3zWwUYltyuuPv5b+UUrXaj0wNzYG96eiqVsBN2aaJJpiulAPO8nvaA/IGNvWdgD3BduvLiBFKmScOKD8n9dQ9COEM8lqTlp66noORG1Le4/7d3DV3FJO9AFySV1pog5LJHhvlLMoazGZjP7WOyQY6xP4XQ== 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=NpVtCwI7zmpKF9yYpofvvs9OUUl9Fma2aYfK2HXWIrY=; b=hT3HrtFXbgjk7BqC7Xtn0VNX7QawjnBdihNYhshV8vEzPrlo/jpSXdhFZQgD3eGoDK6sXToYNwehpClADPr8uaHoRhLFEbjByf8fPw8h6Pm/XvKOtHpXbkXtil/PgnfrKk2pHSldHFPL3Lj+/KjmLEYvQHw16kAvnClNmE9xMo4mdgOMVYC9Mn5ZAJHDxWk4wIGmHsQR5Bxxz5EZDNUFhT3UdBM4gO9g2p9xw8bFzp7SHfnc67vWxaFvhi9gG8wlzU/jUVkluUl+K4GGBky1EYg/pvYlYFt3elXaUr7xG64oNsghaCbHzN69rKja3AwWeksL4itUHYfjBgXbY8brLA== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM0PR01MB5809.eurprd01.prod.exchangelabs.com (2603:10a6:208:16f::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.12; Thu, 9 Jun 2022 23:56:20 +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:56:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jun 2022 01:54:56 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [rbqe8YvSJfjqmeKRevsqpeWitPGT/LD1] 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-14-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7e0a1342-389d-4101-cfb0-08da4a73a66f X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTijo6adWu98SHbtEySq1lKFxj+c9sj9FOuEXVGNB3DxFXMxoM1wWmD3+JPZqM6AxZn4Dx2vqtLuhRbAjBKXVDd/rkhaTQHr6Lo4/+Zen2ZaIgkHx4PKXz0U5+ftiMeLiOrLOzrRF0OyeHWM6ka8SeZwctI5aeWhuqIBgd5EsVSMu39stXdLmE5wrq/c15G7nXyFqCRlqg1lAjIFXtebvnE8i3/8iZShyW9QEbOcXq+VAcUwMYV8XYAe7ieMuKDRPkf4Hn3l6bOzNGZ+hmQOKmGL5xof4B3mhZvEuXFWuOwuxc6gTJ3Q2YCebGfK/ssJmHs5bmM0U1QKMFSjNm+6o0B1W3XvvFsBhFhHfTraYqIsC4KF2FD6SJB8njVt1njl/wWSyoxtoGocNOkGNixHcrLFh2kiiicu7SiKNZUA1sSOZn7J+X3J6jilI9os6jO+OfepuRToTNlTMvIpgAZiXnB3rmXGguk4Woz4+MiQtUfSk82eOFLDS41rXWsQgDTxt5TeZNpwrsgPG9xphUR9blkEoEpLdTx/6DCv9UCuacWRd57NfVmLeZg6BDv9iXRCDI5oQ4pLVZptsAG5nN0TNqjk6jhB6ohLh7iPF673jxIwaTGWcLgupwlbkvh+6IGVcMWGga1BMAr3wZt5XJ4Qha+MQCfXtGtc3npswKg5/qSYgSbTYKlicn5O2SHxCpvBaXg4soM+JXBBiFKvO5hypT4/ZCHQAg3Yr1y4Cl7HAZKyctJvlTQJZezy33j6rLOzrk= X-MS-TrafficTypeDiagnostic: AM0PR01MB5809:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gCNTLfnhKab6PbUrwoSXfbcwAi9+LwrNp72mX5uJa+/J6e1OoXY8L3Y4pec+kd6DBg1bks9T6/UEir08cWsFFnkZ0/xFSU2a7FmUga+mrvawQ9TgIZGOqRAwSi5cTjyEVvAS6bbGhqg6BwToYL2wGScJYLFDGSGF8+Yopa5RywnVzRkj0yU/eaObbOB5eS5zlMwSMJJ1ojkYqZE5xRnAKken6rCbcQ3fp3J+qK2My2xxPBcbKKFg9sNeigaNSCIAZ2GF62z+/nn8PUbdUEjoh0PRxzAx6DqY6UkMvjF1jLfZr2c/Orqs+X6tl8oVsAdz8QFhs2JFEJ2LBaja55iwk/10GaUDRL37bTuSHsjYNOnzn5ixmj4AX4DVl7JOaKqFOYb7W7pq1TTt9EwaJttmYAw0O5zl3KCjvZsJO5D2iDHR+IrK5a9FoMaFokr0qCWP3ptwQBd8dMsYrMyX4/+TQ0rXdWYC++Qsmcc96Itjrrw1Yr//+6QPDNsxMFdIw+vJVjxvJgw8Ezst56i3yAEaesrYeqzCzNeqF9DDO/xRShl9s5mPMXsPVgJU7IKVeO1b5xDcb4iserbB9s3OlDQQ8g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DOEiMVPcbh+CoExbjvXW0rln43pISvV1AkwquHQfXHmNIVC065TLgQ+FfzPkQ70cv9ApFkbNuKeeG2CAPWfNHtkt2re965mXaEPALy1WOGQ2VHhVHz+j4+1MWSxI0FXnBcdkB+8w3fQRO6+CP0p7yJM9/SVffDvuJrldZ2w5ZZS1VTcrJRoMqgLFsTPQqxjk4fzTv/Ugq7lN+zCCyjxAExx1Gxli1AYjDlRiqCC9ZySVseS/KQvhuyMAnAosuPJhOoJBbFM2WvNMb8aLxjUkkYkrHQDcDxH3zip/MboLOAanKaIem4jDbXDxQZtK+0X8l7hTXdpTXbwwXTyG+mqaq1eTi229rq5OSeohbtc7+3ts6y6o+DcPtVLF2HAW9YmtCRLZWBtHH3QTqtcgbsO+MI/Gr9EoksBFBYMa2fZdqW8UPQQ9CVYk6XjZPQginR2gSTk4IWRY5cmgMtc/d8fhAeRYEmaOL/QQZvL5awADkmj7wvAaKyju/jcxhh/Sh+vztgtop5evHps2N5bQVuUVn95GPboLMz/fviQbR8hhgm8ldcaLz0DmGHc/QqeOy6kwAHMXNIp7kg+iJX0gtNn5aXN71yHkOIVatlc5yexHKMf71xM5f9sp191P9IYKltY+jcJ8mubBfBedtt6kJ4xZTrW6SqLLUyqY0txN96otLsIba7xUlH1hPDXpQHXaayY77SyNUUnDsxxXcpR0RgFA789qWzXJ+YQ2hoGtsBi6Hs/m5r6K8dDonmCbZkZgUsQDqE3IKa0Xu8rMqTXVRgH80jryapWZNTkwjbQPS3GJjVh3W5+2PLh5N9uY6hBr4iK9BwuCIRr9jFJ1j4BtxnVAvYk1shOu/49DBQJo2WCJw1pCUHKRAIgEuQn6FXh6tSbMqN+0bP/urTxI+YxMbouG4mFyzvZTthBNeEkCvi00mMC4edaSNZMjXR27rz0Wu8cI+6tfq7kaetFJXbpOpu7f+uNvyyOhST7FvM1vQJkVIN4q7iCkUrMAHXmTI423VQ5wKQ/TBY74LJay4FQR8nQcKwtJr9jPYmdPSttxLHa2BDeITk+rp7W950sMrVqV6P8/HaBtmOq3S4Wi9CWwx+Uzhx5aZHDxTU0OPm9RdC7IFUo7vIkAm+KCp0LPIhUNJumxUnZSh6I5RprEm3OaFwja6Oh08pux1Jggb5IN3TsQxLqGmZnejm7X3vlCqlkGuEsOiwq1C9oPoTFaRLI5u5mKXdgpuXtvmi3mtG2hAM+Z6+PtN48VRTD/gFVJtyuU1D+PJPRegM1CmcSMihkyTKl1EMyOGAhtnm1H0t9CICYY+FALkH7LBEnRg7FDKRCnG0/rWWm/ZSxdKkQLf40aXfw6Ynk/N+K2riHnFk0ftz5q58tsO6u0+xZYjijPkXLh5rlfJAuPrTNSxAzV8MgPJs2yxHf+nFETsszJLFI10AlWM1i9BLgHt0hTgPJ1Catnw+An4LBd28qwn6p4c8U8TLjEqQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7e0a1342-389d-4101-cfb0-08da4a73a66f 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:56:20.3511 (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: AM0PR01MB5809 Subject: [FFmpeg-devel] [PATCH 14/41] avcodec/x86/fdct: 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: M8zQ7J8Qwspy 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 such mpegvideoenc functions at compile-time. Signed-off-by: Andreas Rheinhardt --- libavcodec/tests/x86/dct.c | 2 ++ libavcodec/x86/fdct.c | 12 ++++++++---- libavcodec/x86/fdctdsp_init.c | 2 ++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libavcodec/tests/x86/dct.c b/libavcodec/tests/x86/dct.c index b332c9642d..1eb9400567 100644 --- a/libavcodec/tests/x86/dct.c +++ b/libavcodec/tests/x86/dct.c @@ -58,12 +58,14 @@ PR_WRAP(avx) #endif static const struct algo fdct_tab_arch[] = { +#if ARCH_X86_32 #if HAVE_MMX_INLINE { "MMX", ff_fdct_mmx, FF_IDCT_PERM_NONE, AV_CPU_FLAG_MMX }, #endif #if HAVE_MMXEXT_INLINE { "MMXEXT", ff_fdct_mmxext, FF_IDCT_PERM_NONE, AV_CPU_FLAG_MMXEXT }, #endif +#endif #if HAVE_SSE2_INLINE { "SSE2", ff_fdct_sse2, FF_IDCT_PERM_NONE, AV_CPU_FLAG_SSE2 }, #endif diff --git a/libavcodec/x86/fdct.c b/libavcodec/x86/fdct.c index 835fcc2b28..5e00287764 100644 --- a/libavcodec/x86/fdct.c +++ b/libavcodec/x86/fdct.c @@ -71,8 +71,6 @@ DECLARE_ALIGNED(16, static const int16_t, ocos_4_16)[8] = { DECLARE_ALIGNED(16, static const int16_t, fdct_one_corr)[8] = { X8(1) }; -DECLARE_ALIGNED(8, static const int32_t, fdct_r_row)[2] = {RND_FRW_ROW, RND_FRW_ROW }; - static const struct { DECLARE_ALIGNED(16, const int32_t, fdct_r_row_sse2)[4]; @@ -375,7 +373,6 @@ static av_always_inline void fdct_col_##cpu(const int16_t *in, int16_t *out, int "r" (out + offset), "r" (ocos_4_16)); \ } -FDCT_COL(mmx, mm, movq) FDCT_COL(sse2, xmm, movdqa) static av_always_inline void fdct_row_sse2(const int16_t *in, int16_t *out) @@ -443,6 +440,12 @@ static av_always_inline void fdct_row_sse2(const int16_t *in, int16_t *out) ); } +#if ARCH_X86_32 + +DECLARE_ALIGNED(8, static const int32_t, fdct_r_row)[2] = { RND_FRW_ROW, RND_FRW_ROW }; + +FDCT_COL(mmx, mm, movq) + static av_always_inline void fdct_row_mmxext(const int16_t *in, int16_t *out, const int16_t *table) { @@ -559,9 +562,10 @@ void ff_fdct_mmx(int16_t *block) } } +#endif /* ARCH_X86_32 */ #endif /* HAVE_MMX_INLINE */ -#if HAVE_MMXEXT_INLINE +#if HAVE_MMXEXT_INLINE && ARCH_X86_32 void ff_fdct_mmxext(int16_t *block) { diff --git a/libavcodec/x86/fdctdsp_init.c b/libavcodec/x86/fdctdsp_init.c index 0cb5fd625b..b801e57701 100644 --- a/libavcodec/x86/fdctdsp_init.c +++ b/libavcodec/x86/fdctdsp_init.c @@ -31,11 +31,13 @@ av_cold void ff_fdctdsp_init_x86(FDCTDSPContext *c, AVCodecContext *avctx, if (!high_bit_depth) { if ((dct_algo == FF_DCT_AUTO || dct_algo == FF_DCT_MMX)) { +#if ARCH_X86_32 if (INLINE_MMX(cpu_flags)) c->fdct = ff_fdct_mmx; if (INLINE_MMXEXT(cpu_flags)) c->fdct = ff_fdct_mmxext; +#endif if (INLINE_SSE2(cpu_flags)) c->fdct = ff_fdct_sse2;