From patchwork Thu Jun 9 23:54:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36121 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp654848pzj; Thu, 9 Jun 2022 16:58:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxxN2PyoKf/qSZ/+Xw4B0NE58Lrz7CwHUGX0lkKTmRH63DvI3icpQC0vE9LcDTdPnM0nkp8 X-Received: by 2002:a05:6402:27cc:b0:42d:de10:4b6c with SMTP id c12-20020a05640227cc00b0042dde104b6cmr49206914ede.424.1654819113749; Thu, 09 Jun 2022 16:58:33 -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 r26-20020a056402035a00b00425e843eda1si4807842edw.72.2022.06.09.16.58.33; Thu, 09 Jun 2022 16:58:33 -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=dWWF+96A; 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 17AA568B8A5; Fri, 10 Jun 2022 02:56:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074079.outbound.protection.outlook.com [40.92.74.79]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DD07168B88C for ; Fri, 10 Jun 2022 02:56:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iN2lPsZjxrwixiOI1dhw1XvUAyS+qD+vCJak4UawdYzoBrrEo3g7ldo+HD+lmKnED71y3i1RC7Il+c/yOOfleX9GSqa+MdgPk23G4HAIQk3Hvc3Pg1rotOYn8rjLVEE9kmcdDCMXEpfo1nfbOFzxNesqWkAIfowcExiEA5OQKVUHxgjHOB3ROU1CuOhdlRdGXlqE5kNYYo4MtP9PlySubn9g96dwAczuKLG00N/CqfgWUz54i0pNovQ6j3i11iWKViuiBWpi5EkZGSQBbJgodCEH43GHADSBuuC5CCU/QF9B2NZjvs4OT7TkENGLgjSgHT0mHbmBtawHrHC+VJshVg== 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=5OKoMskQ0PooSlYvANJ9iNKyYNQj39j6x93H9AylMmY=; b=WJ1PGlryQ8aHpKq1qf8zEUBxwlLit3vFmnwHz/oWRJbZFpfwk0k8EaxOyQqrpWkVt6uIdKbiyrYOlVFafA65+oo2WTjdt1aZA5IoX4s9NmBk/2fkkDBY5wfZKdUV9/sCNbeYHQugjpy9J4xWiUbcFmeJc97wPzFdysJTzEiVqzWHwGYAI9MSgYoJ0st99YI1Gz7ATIQxPRM9SyekGjangeFywMe9E/e6UIlczxyIUpkSEQHNJe/HUyqPxL5mA6Ez+MngMoD1QbSo7Faeg2/nY1QWnGlplSBbP3NWnsaJSHdmUbUAiBXxOtEk7wYU9qvev8IBemIMSW0/0arGuvBNRg== 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=5OKoMskQ0PooSlYvANJ9iNKyYNQj39j6x93H9AylMmY=; b=dWWF+96AfrAfeCBG9qkAx05i6ujgCHzP6f295OmgazHTcmtHpHDwbe7dnwCblXGXrOdC2jLolNCFWwbhB+XcMoJFLacBbVs6MKUpMVmyHGbiRvDW1j2T6Y6OlAwHllTNuv96sW+aACMaX7VSPnzroARg5tfLYngVb+ZcSX8Jq4/00coPwWaOl9T+LHquBckOI7fLIQCszUE2RxjI18pT9xB5N0aVKnqDoMxZpuZA1YJ3n0Bzc4KQICkMuoRtzhCEOiGoCZY6KxT1ReHn+HFIv4aPQ+eIFEIsgvqCFivsN4tbuKsRaPZIk/E443ZqhAYSGC/VFypUUin7KJJVz34Ejw== 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:24 +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:24 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jun 2022 01:54:59 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [lQ4KbAcs3K1tD/WVg3iYWXKxzHdE5sPy] 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-17-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 15b55fcb-fd4b-42b6-6434-08da4a73a90b X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTijo6adWu98SHbtEySq1lKlUyWZ3/UssyWmvZ/CrdyhrXXz3rGuXXs3I1udnvHifyindXIh18K8vyiZ+36mSdYWUvdyY7pTfgcFc4P0zI/YqGA3VdMeZu4A+8gONftvNs8sRwchFbm4I+oosy5YSIzgMmD4MmOw45328mwdK+3MJE97yW/WdedzAYyqOrUXPq0hE/kh5YC1H05aY+yqgbTqMTk0/nh6vCTqxZKDnouoOZ2kULsZLpCUNilJ2ZzyGThf/xfxBtzSBdD+03TteCt+YYGwD5RBWgmc2Dushwl13nnRY0MIBEpY5zOjGUHiRbxfyuJBoRc3m75UJKe2CNbjfc26JZWrcfpm/vA/ixinMTCjYo8P5wE3JB/UdtkxeZD6NwfBcpwfLHoHWQv9/fwp2KNk4WA6SvQ9srH3nCs/u5Jp4lnNLHWuiYeIvOKFTu0irgShZyf12toQbOIIebp4XatG3MlUY6ikk8mUURa4cmkbKvLLuQvKrqrcKmFRe2CTntjXF8hKGDrtEAqgbF9dqnu2JWfNroL1HjVbjUee0kiqy86OIZ7nNqkrrmL8S+bznP/i6k9C7vMME4SXjQYgxDO84JxkefvcBh+DApFvyR8kBfMug4tosV2m/3AOf8Z8wJFFsLuCYI2i9xfvLgHPYz/huvnaWkBPgxIaECKW4txD2RM5OQY5tTYQt2D9rNhY32BLHrxKJvipCTda1NiCea1Sp9neL7BFtjLL989wNfApZYB1c/FwwnYSSoKuvw= X-MS-TrafficTypeDiagnostic: AM0PR01MB5809:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Spkp81vRFPkfQvMUlYhxDap8ez7Hd+hYEkE0IJGNkm4+x/vv/WW/x5Bw3fN+hLQAVafGC45CuuHCgvZI2SHrRNSUNBJ96GkqUwOo1uQDeOUXKsmaLd77YzBybfQeeCt26nh22DyTlV7XYe5yRB3ojw+432ZG7lMoPAPD/2/Q1eJEgS5DPdCl838QTSnxZtY+JEUFhfUTNInqoxDZjAeyqegPzBm1Xv7uN51MThkYdHtCg+DklgrJqUP8Rh4KGiTYtTjLPZGDFMzx/ogBUyvMvv4ksULbvRX+d7lCKawGFPwSAOMqmKatMboJXu6uRG5vPx168t1qZKUl5AKQcEke1xSFNYMkkQL66wSrxXr0R8A6u0JvnR10be8G3dkrZxu7sNqFMElcIJ6XYh3ZGdoOXvo2RPqoZ42AFTkNF1Tld2Qa/ZW+rCYsDRc0L+G25KT3Ru+H4eaTvAY2HaZSz6iuL+cPw4BJWigIYBQmTGa7szsJZEatsea4frN8DB30mAsoSQsFz2LR2A0MxoNqe8OTKya+Y6HO+yWSZTKW2oyOI0gVyYG6pw6oGdRbh7qUezMvbUDiWl21DqK7cwp0mDtWYw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1oywmggsrYQsMwP2aMVc9pJBOU8rAka3RigFy8h7rPyzi+zrh89G9hh5MM5rQ1ETPMo7RJzbZzyRb6nKjj1XMXlfIKbTXXz1nBS/e/IH+eUYyn/Hkk9UemfX4rsJNwqVRcZTa9MVbE3DqsptRv+Lmmclh43WPRYyT+Xzd58R6GLB1vYfB44f1+ZWcPQSJUofRbh5dOXxh06OTFm42oDNblqrUudvSnE0g6uAXMiTISohzUP9Rsl3Ht6m871gqRpSYXiJ7eLSWtsH09xyI9I10i1/SNEQAVogi0DAcxzRtj9LpGWYgP5ge3Huz/iq2k8m50/dphI78EkRFALtkFnoy8EeUnXGXyelahC6y2WXMdmVpFma42eYoZf1ym3ruJ65xIY1eYmTgjw5UI9gnCcMTScAdzpwMLjTsR7R3dd4Ucaq7b3EyalvU3I1F4/nrj2fCE8/3TOM9BT21lkhOA8jXc+w1zgwDGWkbshn7vh2djxhbzm4/XO5YumoH9fYabIPSpEEpTfW4MpwbeNSvm4U9Ojkt77a7YZb5HSYi65XoPGdXHOe287FaN9J90HWBSIQFDpawtbYIojkwwBL89/xn0iFtIUKJptvEEUHniOlRGaWsWNWe3YcEpbB0Cl6sz0FUG2F9tqtb97dgM0lKveCJtcQPUBznSNCEeBv5PtPoyCyWIOIkZrhH8paVxKOiMFmEXzToB2Td0nEA2j2zxMeGBofDNuOLsu46fS0XlAAMsU8mq8Oh/yf6H0jMvZGsmAHOtrOd0GAInhfrpj9Jz3c7jG+Pi+SI15DMAN3TdQ3uTZoQirnq+ZLSg5muPt0CmkZjzs50ewm4JYwLORD4mM9XQmTRpM0gCS/Rs1qtLjzUQwunZrG7heChZk6gy4j5A+NeUzK1abEK/Ya0iTerLGrOiWSlWorwRo64LjsM0PmAxioJGKwlsrrxVtHZrwzH2Yq4vlJ9Y7uzXuEHaVCjCdVw3WSp80504pOSQdkKabCI5IP/AWODTnqNHIpx8paYFUuVPeV2j2O5DKFWTdN86PTS9XnRWSfN/oGtG4b7oe5CQ732cFZZqFkYy5m2/c2k89+fQwFzfabFfI16TjcNMDGwJcP9ich8wsFJE15VMCtpLQcrPcvK90+6GA8nAg0+NmWVwjS/Hq323EUp2xIbMP38hSHVbwWUvwd8OYvWA8LhBjivdmRwtCs/iNmH8JPLfTj/5Xq8Xnp9VWyDlXVhlJsDHFigqjo8MiGUXVadvIVsp+ew7sYaR6mWOzSwBDDXp/EhOf6H+XVqNRRpFo+GxA4hwgVbzKggKmyYFszQObXTJyFsNE+tH6/m73UpXTTY/kP8bAyv9UzNmNw7jJ9r1jLCAJxnepTpP84WVr2ZWQoNbpQAU3bVROtQR268As4E8+b+ssKlD+FZhpj96ChMVz6D5ch5iDsw1Zfjpa7Of6hVh+rXbg6BZmLFxQ6tVD0WRDl63T8tepdp9+9g8FBtkMLBg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 15b55fcb-fd4b-42b6-6434-08da4a73a90b 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:24.6480 (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 17/41] avcodec/x86/cavsdsp: 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: m2IP1XDWzLxe 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 CAVS-dsp functions at compile-time. Signed-off-by: Andreas Rheinhardt --- libavcodec/x86/cavsdsp.c | 20 +++++++++++++++----- libavcodec/x86/cavsidct.asm | 2 ++ 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/libavcodec/x86/cavsdsp.c b/libavcodec/x86/cavsdsp.c index f974f93fc0..fea9daa0ff 100644 --- a/libavcodec/x86/cavsdsp.c +++ b/libavcodec/x86/cavsdsp.c @@ -38,6 +38,7 @@ #if HAVE_MMX_EXTERNAL +#if ARCH_X86_32 void ff_cavs_idct8_mmx(int16_t *out, const int16_t *in); static void cavs_idct8_add_mmx(uint8_t *dst, int16_t *block, ptrdiff_t stride) @@ -46,6 +47,7 @@ static void cavs_idct8_add_mmx(uint8_t *dst, int16_t *block, ptrdiff_t stride) ff_cavs_idct8_mmx(b2, block); ff_add_pixels_clamped_mmx(b2, dst, stride); } +#endif /* ARCH_X86_32 */ void ff_cavs_idct8_sse2(int16_t *out, const int16_t *in); @@ -335,11 +337,13 @@ static void put_cavs_qpel8_mc00_mmx(uint8_t *dst, const uint8_t *src, ff_put_pixels8_mmx(dst, src, stride, 8); } +#if ARCH_X86_32 static void avg_cavs_qpel8_mc00_mmx(uint8_t *dst, const uint8_t *src, ptrdiff_t stride) { ff_avg_pixels8_mmx(dst, src, stride, 8); } +#endif static void avg_cavs_qpel8_mc00_mmxext(uint8_t *dst, const uint8_t *src, ptrdiff_t stride) @@ -347,6 +351,7 @@ static void avg_cavs_qpel8_mc00_mmxext(uint8_t *dst, const uint8_t *src, ff_avg_pixels8_mmxext(dst, src, stride, 8); } +#if ARCH_X86_32 static void put_cavs_qpel16_mc00_mmx(uint8_t *dst, const uint8_t *src, ptrdiff_t stride) { @@ -364,6 +369,7 @@ static void avg_cavs_qpel16_mc00_mmxext(uint8_t *dst, const uint8_t *src, { ff_avg_pixels16_mmxext(dst, src, stride, 16); } +#endif static void put_cavs_qpel16_mc00_sse2(uint8_t *dst, const uint8_t *src, ptrdiff_t stride) @@ -382,13 +388,15 @@ static av_cold void cavsdsp_init_mmx(CAVSDSPContext *c, AVCodecContext *avctx) { #if HAVE_MMX_EXTERNAL - c->put_cavs_qpel_pixels_tab[0][0] = put_cavs_qpel16_mc00_mmx; c->put_cavs_qpel_pixels_tab[1][0] = put_cavs_qpel8_mc00_mmx; +#if ARCH_X86_32 + c->put_cavs_qpel_pixels_tab[0][0] = put_cavs_qpel16_mc00_mmx; c->avg_cavs_qpel_pixels_tab[0][0] = avg_cavs_qpel16_mc00_mmx; c->avg_cavs_qpel_pixels_tab[1][0] = avg_cavs_qpel8_mc00_mmx; c->cavs_idct8_add = cavs_idct8_add_mmx; c->idct_perm = FF_IDCT_PERM_TRANSPOSE; +#endif /* ARCH_X86_32 */ #endif /* HAVE_MMX_EXTERNAL */ } @@ -408,7 +416,7 @@ CAVS_MC(avg_, 8, mmxext) CAVS_MC(avg_, 16, mmxext) #endif /* HAVE_MMXEXT_INLINE */ -#if HAVE_AMD3DNOW_INLINE +#if ARCH_X86_32 && HAVE_AMD3DNOW_INLINE QPEL_CAVS(put_, PUT_OP, 3dnow) QPEL_CAVS(avg_, AVG_3DNOW_OP, 3dnow) @@ -425,7 +433,7 @@ static av_cold void cavsdsp_init_3dnow(CAVSDSPContext *c, DSPFUNC(avg, 0, 16, 3dnow); DSPFUNC(avg, 1, 8, 3dnow); } -#endif /* HAVE_AMD3DNOW_INLINE */ +#endif /* ARCH_X86_32 && HAVE_AMD3DNOW_INLINE */ av_cold void ff_cavsdsp_init_x86(CAVSDSPContext *c, AVCodecContext *avctx) { @@ -434,10 +442,10 @@ av_cold void ff_cavsdsp_init_x86(CAVSDSPContext *c, AVCodecContext *avctx) if (X86_MMX(cpu_flags)) cavsdsp_init_mmx(c, avctx); -#if HAVE_AMD3DNOW_INLINE +#if ARCH_X86_32 && HAVE_AMD3DNOW_INLINE if (INLINE_AMD3DNOW(cpu_flags)) cavsdsp_init_3dnow(c, avctx); -#endif /* HAVE_AMD3DNOW_INLINE */ +#endif /* ARCH_X86_32 && HAVE_AMD3DNOW_INLINE */ #if HAVE_MMXEXT_INLINE if (INLINE_MMXEXT(cpu_flags)) { DSPFUNC(put, 0, 16, mmxext); @@ -448,7 +456,9 @@ av_cold void ff_cavsdsp_init_x86(CAVSDSPContext *c, AVCodecContext *avctx) #endif #if HAVE_MMX_EXTERNAL if (EXTERNAL_MMXEXT(cpu_flags)) { +#if ARCH_X86_32 c->avg_cavs_qpel_pixels_tab[0][0] = avg_cavs_qpel16_mc00_mmxext; +#endif c->avg_cavs_qpel_pixels_tab[1][0] = avg_cavs_qpel8_mc00_mmxext; } #endif diff --git a/libavcodec/x86/cavsidct.asm b/libavcodec/x86/cavsidct.asm index 6c768c2646..070b46a6cc 100644 --- a/libavcodec/x86/cavsidct.asm +++ b/libavcodec/x86/cavsidct.asm @@ -107,6 +107,7 @@ SECTION .text SUMSUB_BA w, 1, 0 ; m1 = dst3, m0 = dst4 %endmacro +%if ARCH_X86_32 INIT_MMX mmx cglobal cavs_idct8, 2, 4, 8, 8 * 16, out, in, cnt, tmp mov cntd, 2 @@ -168,6 +169,7 @@ cglobal cavs_idct8, 2, 4, 8, 8 * 16, out, in, cnt, tmp jg .loop_2 RET +%endif INIT_XMM sse2 cglobal cavs_idct8, 2, 2, 8 + ARCH_X86_64, 0 - 8 * 16, out, in