From patchwork Thu Jun 9 23:55: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: 36127 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp655644pzj; Thu, 9 Jun 2022 17:00:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwZGJmwLnm/4KU/xZLsTauyS8gF1lYULStpEpKii+l74m4aw9VqzQ9jEG070bIV8PM/qOsw X-Received: by 2002:a17:907:1628:b0:711:e3fe:50a9 with SMTP id hb40-20020a170907162800b00711e3fe50a9mr13751832ejc.746.1654819239287; Thu, 09 Jun 2022 17:00:39 -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 l4-20020a50cbc4000000b0042dc3b66e0dsi7070466edi.357.2022.06.09.17.00.38; Thu, 09 Jun 2022 17:00:39 -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=sjR9dAUf; 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 4CBB468B903; Fri, 10 Jun 2022 02:57:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073108.outbound.protection.outlook.com [40.92.73.108]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 430B568B86F for ; Fri, 10 Jun 2022 02:57:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=klkSejXQxNtxS4RA3prThBYvjT6Mum8YH73nW45v/VSY7HJKtc0B4tTQ2CXET/nZARRUiWr1t+WSBDx3Zfy9pHUgZUjxsibiftRSc5xr9hqAw6BaYSYNvYjLfO56HJhw6G9VWYw68vCDlzCEzQIFk7wEDXAXAKGSA9Xn49p4kzkmf0jszfMibZ3qZpn/41uy3zs1nNOJXQJ6hn2AeTviTew3DPmHYOFSvy2K8kEqlBARnjmOD5KIGfQaq42jsdhGU2A9cYRQ4A/5hj7xQf2+oNZkBRkqhzW9zIjr9LKNDAE3wAcRIKKsFq+yhqhDLlft72iStiip5YGfe+HFQwu6bQ== 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=7aCg53R6HwUsT/IAB8gWcPkdLhHNgff6RSsqPllImp0=; b=mLU3ypGTyTAwQ+5w/JtZp/Bor4De/h1q1ChatOvShqVLkKlqrGdNRMVLFHnwC2L6T5RzRZV42FzvZJGxaMolubNwO7oKc6ogJVzb/0sR2raCaP0h/y5lubR8a+5M+eDb0AeAE5AZOCFXOTqRdlP1zrbJTaBUd141cSzfiL7pVXSDDs2lVjOxsHsDvsqfOUDusqNI3qh6iUQS5yUenJ5XVHhxMuq0Kkjq+V0xvqNU1SSh0R7FWwfBjMg6yKLVVFnqVXtS/w4enSJV4BYI4pIlvt+Rwz9bF6NQ7VN9YktqxYSKYWU4j1h7tsiwzZjaL7488W6YpiHQKtviUysGUiArYw== 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=7aCg53R6HwUsT/IAB8gWcPkdLhHNgff6RSsqPllImp0=; b=sjR9dAUf0OudBLPy4z58wf8wIK+OU0o99X+i3mcvhqVLAY+B+TvZy612YZgoFtRX5cQsR0VXMvhbLQajjOC/TyYuvK2Wv876cgiYmkAk5DNNur/ygZSlYxvus8RSZ6z6eCwv8KFH0qt74cWOLo75+2CTOfW/Ejk0cdiSVvc+4REx7951Q3+gPSMahXh+7AZnEA+g6OLk3DBOmJFFjYTNVT/1WTvHe932F6KuutZYbHbSXemud2jOwxyJzMnt5rPrcjAmB5h/QUrc5bEOFFpoqGKXluN7tV/8GRo8rN3FC/l3e0Il7VBy2CP0j/US68a01H0VJZjuqyAT7zUd8StwHw== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB6PR01MB3862.eurprd01.prod.exchangelabs.com (2603:10a6:6:48::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.15; Thu, 9 Jun 2022 23:57:04 +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:57:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jun 2022 01:55:11 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [dG45TJniPegwDCH7Id66xFg3k4Zxp2pL] 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-29-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f92326c0-f114-4ca1-be87-08da4a73c106 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTijo6adWu98SHbtEySq1lKLkAYCmHAduXdaKWs31JD+yskJEDZACCulrzUZPAXEA5kIzdwcxZUIUpRg0v/xAr0My3IaBTHYdLTL8P5Wa2KkvSfdDZZq3uJ0fJULjX9wLOIcxoyE2zMCZTP9p0t7bDuMGbNpnXZYRfqsOGhatCZMsaT4Mzmw4H7jtvKtYGxKIEeLCKL77O2o9odAHQBT4y9R695qYkD1lG72taHcrH2QARuBvZyEmq3XUDLoEhOqdSpzoidoAqTX9HrYRdfuTMg5ZtJQWcq0ONruIBj+oE5uMS5VQcFz75/4QJjEsayCyFtCKE2LnHOPyePjdKO0PbncQdBgKZF7XR7RPeBIqyqEbp05Lsvq+aVInqhnGNKkPgfV3C42sUkjbDjO/yZSqHEwheBNSbb3+JsitQ8cisdjf8RAkyvhXZ53gg8/Y8TE/Oi6WMdUsfRKT29obDRx5HIbbQhl3PqJhYxVkCBjR3Y5+MVzeU19Umhju9Pk8BgbkuO7sYYzdqM/GI+qsk5vGtfhjOM7hzxRNCFEMp3hcQjndpAntYyevGP/kDUFeZxGKxOg1FGdC2d8w4JY1705m6KUfMk4SsTcXnSrNMPoMb37+EXoR0LOZ27ebcO54+v+enH+IASHI3ZEtcmh6fXTL14/cslPnCT1zHTjBNiac76aq/UM7mSk8BuMTGzLV7F1rlyw26WPOaW6svr3HyXoYdzS9Fxprddy2/Mvjyr6Bv5788vOzJIoSF/gunGaycTaw4= X-MS-TrafficTypeDiagnostic: DB6PR01MB3862:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jDX1lCSfRrjptINkMpcdQy4nZfAdRkpz3AQuur1Pnu2g9SDqjwspJ/kKT+Rr0INEAAMRRM/PdsbkTuCRMcA7ajTmv8mgxwiiZPksjRnQoHZBM5pVMy9Mk6eL3Mnsr5n+pI4orHIHE9ixhCGGs3o/7ex9t8qbJ3pjlQgWIIUTi0N35b2LHKSdwz9geTxlV/0XXLmI7/KPHTJzkQnuCE/Z3+CdZLrZzhDPc5TrRiFSFdFiR/u43IWB1laW8qT4ybBmv5HkKCuyWLP5WfNvB42t6e5IKy61Wx70R59nJNxbAp3JaU8GdL0EeSBnJEkexxOm31UPs0yHNNsyle/O2idi+mkCKkJIb+m1mLhQnyHe0+9l/3xYXZtk40J/eLooE58nbGsk+DbPb4+baTlYWjVCo1dLHtIscMkjijZ6iUr3zEKUU49A2kfjxLmf6rX4JaRIQfelGsG47V4dySjqCmCf4NTLYhyx15hsjJ6T3sjNNrawTU1N9Lt0Y7RHEqkODZSIk3bHyXN7xsAnE2x8cA/emRZk0wP3/WNL0iaJh+A7m3GRkuCkDviKvolWS8mgAQNqYGrZXG87MjBVNuPhaOyiNA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CwNnsQE0h1/n2K+6Z+jtUUzt4v6bznsoHprksje9oKORMelwhwH3OUe7R1VOPzCLdWpziL6zyxGlFDFX/PkBGom5pFwbHxPDPwT6HHXpgPJfPRjBLmSE+UukDehoq6IEucMhjsz1oszcTXOXOxsQljdVZKNl4O7Xk7IsSiiEtcACLkHHMOuKBiB987GCo/osa0XhsJvAUcndBxrN2T+bQQboopgqbMfYSQw9uaFF2q0MDiwVvbsfFCEGwuit5lcFLl4MMY2BR/YEzKNGMZwlhCnBwILMaA65ZuAZJ0MNjn6g352gwChAvRXVQ1EnUX4fuvvc6ZK1RtUx8giYQg7WW1/ue1dQNpSlqbzrsbPa1pljzepeYutL+eNY/iYsDS7hQAxJu9lHelnfU+aqGEDfbTgkfDsGImlx84+bgDEEAhpKtoy5t9VCpU97QIYqiAGNs0d0OXEPxD2bzUtndj+pheBZst0UJskvdKq8JrJa3tkk+XBf4kUN2KYabirQFl9IxuK+WS6i76eMQcGUPsBn5TuwYpfiiO12GBIrm/yvjzWjMqDu6YtREZy74a39HHkfjqrxNvilD82peZLH7x+Adsr9uvQAOMId/nhSQVxI67NzfH1UTKxfw6nqipfoUY2Nga5dgF43ojVF+CvoWGSLRY/3LGzXGTaJDWnTujL6RY+uORI4y5dYxUUrksR9mXP/sW9WxsmZY+VlUQ0wKZzCxou916ow7xb5mHgiQ9zbtUrC+77XUAY0Cg7hZSfASao2VsKcjNOA7CgPkDqbd77rDi94P3A1bcxmwXuZF8eW5EeiyhxCCDtLrg7sKSuuFRjMM84XqwwBRr+pQFcqI0BrRmrdPR+hj41Y8gTxxifY/z2iMUeEV8nQc5G1Mpd7+25gHCoz9WmVwU/UjbT/BURmiowc0ePiOnBMjOiCYUskOzlvRJKsrWCgTZEOcxeqAPlNpefdMSEFw9KndULClJSGf2saJaqtxrp6ob8NuKg9fUSZA6dAnYSl6npHtVYmcAQ74emRu8fJaQDNlFzuL5lPTE8yDvasoCftPaybmhcXP97DgN29CSFo8DecZEYBGNBNfCSEq3z7zLcMYigtH36f7t3eGfTpq+UyRvM5yCvVNE4mm/moI9Z0mDFVqNZ25KYYn8+WHbP+imb+SW/3uWUDh+u9SAZqLey7A3h//6cU1AMrKmorswCyV1d5mfiMe8Df3kOrMdYRU7CKLk7vTeux90fAlNn320GOku+yHGg7lldFGfEi25BFKfBPppTH55aehDW/brCWMpNejCw7wAKS8XA2Z8N69bzdx4bP9aw+cf9UpIuZVS3axYeHlUFgFwTPybFT2HS85A9znMdZeMZt6nPzL6/D9fyUEW82mdE/vFCz9zHjTbZXrY+LPPKZ53gWuvtpfiHVLUKQVDYVDWKLxm8B9xmcO/eTZCdvOkZF+bbw7RskQ4z9lkyhFpFz2YyuxbgBwYOv7EXiU7yWaekoww== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f92326c0-f114-4ca1-be87-08da4a73c106 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:57:04.8985 (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: DB6PR01MB3862 Subject: [FFmpeg-devel] [PATCH 29/41] avcodec/x86/fmtconvert_init: 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: KFTAyhNUB5dt 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 the SSE implementation (which is overridden by the SSE2 specific implementation) at compile-time for x64. Signed-off-by: Andreas Rheinhardt --- libavcodec/x86/fmtconvert.asm | 4 ++++ libavcodec/x86/fmtconvert_init.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/libavcodec/x86/fmtconvert.asm b/libavcodec/x86/fmtconvert.asm index 8f62a0a093..5b7578825a 100644 --- a/libavcodec/x86/fmtconvert.asm +++ b/libavcodec/x86/fmtconvert.asm @@ -71,8 +71,10 @@ cglobal int32_to_float_fmul_scalar, 4, 4, %1, dst, src, mul, len RET %endmacro +%if ARCH_X86_32 INIT_XMM sse INT32_TO_FLOAT_FMUL_SCALAR 5 +%endif INIT_XMM sse2 INT32_TO_FLOAT_FMUL_SCALAR 3 @@ -117,8 +119,10 @@ cglobal int32_to_float_fmul_array8, 5, 5, 5, c, dst, src, mul, len RET %endmacro +%if ARCH_X86_32 INIT_XMM sse INT32_TO_FLOAT_FMUL_ARRAY8 +%endif INIT_XMM sse2 INT32_TO_FLOAT_FMUL_ARRAY8 diff --git a/libavcodec/x86/fmtconvert_init.c b/libavcodec/x86/fmtconvert_init.c index df097054e4..0883cd8a56 100644 --- a/libavcodec/x86/fmtconvert_init.c +++ b/libavcodec/x86/fmtconvert_init.c @@ -43,10 +43,12 @@ av_cold void ff_fmt_convert_init_x86(FmtConvertContext *c, AVCodecContext *avctx #if HAVE_X86ASM int cpu_flags = av_get_cpu_flags(); +#if ARCH_X86_32 if (EXTERNAL_SSE(cpu_flags)) { c->int32_to_float_fmul_scalar = ff_int32_to_float_fmul_scalar_sse; c->int32_to_float_fmul_array8 = ff_int32_to_float_fmul_array8_sse; } +#endif if (EXTERNAL_SSE2(cpu_flags)) { c->int32_to_float_fmul_scalar = ff_int32_to_float_fmul_scalar_sse2; c->int32_to_float_fmul_array8 = ff_int32_to_float_fmul_array8_sse2;