From patchwork Thu Jun 9 23:55:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36125 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp655458pzj; Thu, 9 Jun 2022 17:00:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwH1pDV7S0OXWGmZtqlXLghuZ0uSmaiNXl3gXxjHQp8rd+L3GEg3NROgfyBW5uP2J8N+f8W X-Received: by 2002:a17:906:1f07:b0:710:2911:378c with SMTP id w7-20020a1709061f0700b007102911378cmr30449248ejj.8.1654819216164; Thu, 09 Jun 2022 17:00:16 -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 hr35-20020a1709073fa300b006fcad948d58si18893209ejc.822.2022.06.09.17.00.15; Thu, 09 Jun 2022 17:00:16 -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=RykoJFSy; 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 6A1BF68B8FC; Fri, 10 Jun 2022 02:57:01 +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-oln040092073036.outbound.protection.outlook.com [40.92.73.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ADB2F68B8F6 for ; Fri, 10 Jun 2022 02:57:00 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fIbHeqqPELwtog2LYd+JYXUoEmss4iy2qK4+q5mK/DbtQ9EAi8Wc5w+sK8m1ARBJvxkEaViy9d5YRQ/wxPRuZ0l9A9eKLjjLUB80eEdG3z80xCwA/kcVV5A5uuM7w22S92LTDIArJ45QTMO8XTkswgG3iiCqAFYuzUS/u7pnx0gvjqYYFq2Tz/E26WIteU9hqFB6fvJMuw4ZV7dkSNatMj7e8JIlbmJcwIgqJCeW+O5KIxJTA2PXJU7dohxl/3KALEC50P204SCDgiDExoPIc8zr1WTStjVqfR3a98mdzuubyx9n6X0tIReKBzUMqiFZXob2K75QF9PHqxlSP/2Baw== 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=E8zxnKGD+6EIPmHJc6txSd3F1DlfJkZkBoUq6f4J9W8=; b=EDzdthpvyhzR+nYzklqQRRQZ4kEViayGz8FZOpnlhrVTaaxb/uconD0iRQ6qhaYMVfwGBvhZ/oJqCO8FB2WRntIdKSWgF1pi5MT7te95J25QInEvdgVgwdaywcnx5u4qVkbHz3RPv09TSjl3+aK7r5B8iludI/yHqgviPQsC957brykvvosi0V2ZiTKFJ+eboP2Km8k3IdsMV64drmMFHU74/1oIJmstRomo4m56emq0Ui6gQ76mrGfIKrDZfaXpkZtr0rOYF+Va6eeNtmLWUWR61Ik5BA5x13fi2X4v6K+2YF/l08m438BG2VdP1dM/YKcRVaN2nrdWXLemYtcXkQ== 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=E8zxnKGD+6EIPmHJc6txSd3F1DlfJkZkBoUq6f4J9W8=; b=RykoJFSyBMD1t+YEAmN3r69YK2gVX2iUreXiLIp5JAWwLNUUy725oqoj3rkl0/nRfCFAXWL4hwkx9xCfjNBGyA4V5nDI6kRF53J1Zpwr2qYcCZguyWpGwOWh3KiaYbd9O5fPsTy3eIAUwmEzqk8hzZ6FVGPKDJj5dYIrCQSESo68JpUw6k/aNitOZPMKyouHBDLJGGfA1Vu/ech1O/P5jUa46lBVQOl6qs0JpOw7YkZg7DH96udxL33QsLEabHYyN6fCdpweRFUvqoFLdxdiOcgWYhQ22jLmtDSwTyuaXWeSNl27GSpU9T+Ud4l11x9DMtd31KOz+SlX8G9Nu0SNHg== 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:56:59 +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:59 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jun 2022 01:55:09 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [J8CIGmwUFvWWYCw/k/MjyqURX12RT9X+] 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-27-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 715393bb-2234-401e-463a-08da4a73bda5 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTijo6adWu98SHbtEySq1lKoG+8R97yWywWP82rv3sd0Tp8WY2AHLWcv8RxYlxlXpbnYNGLYxWZz4iPJBtSm9/Bo/Oj+JThySg9yamSskZU9edcSeDxYNwWxujg0wfrXAFh5cPpuOouSxz4zKU5WNwejxrtuiwH6TLXU/fwdI+8y678OGBACRiozNSM3NU0t+OxmEw2mSNyk5JTPqP8U0iWVLUZKJeszDdAzPG/XVDJOAeln3ZFwPiaJru2zlr03tlJyZoP+mBHdWKarN2Z4r7kzlkY5jkNRckd4IkJdnpq3Ppr3HmPKKI898m1OPugAvG/TrDcCwP8WKbB1qhCitBOUqbWryMDTEi3Fxk4Klhz2AqBCp3OnOO8JPmS15U7Ks8jMHDk+ztJN+Nv3GY5QkQYGt51QxXghYN24nSpkndt7oTucCdFsgJdfFZsS4RNzgQSrqrxj1ksST9Kff3j1T5RIrPnRcVbEbusLgfMyqy7NNYjetrb2psuUuCKhhNc/pqQLvTvUMsLqm55MDEPmu9dfiQJ2BQpwsryrV1kExVRv2sgNptun4Y5dCAFydUC3wpKk/O1JXOJFgmn/HCsuDuhaKlnxU+DjJthLDFXzUYx2Gr4QYpLKA7xy2kYUFdpAg1NhUgFbBvwY4zf0g6/kzzOGS51wlDg6PZSEAXPGuehLV//f90AhGX1Tl6gYrlRI5qWDZyXwYB359xJa3m5Hm/YGBvuJ64QwUwN8vF8zLpuKcwPgmA0RvaOMlAbIMmd8Po= X-MS-TrafficTypeDiagnostic: DB6PR01MB3862:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qbIL9liU+e/1t5ndz9kjUPh6p1KCeVWzpPsnflptx6+bbL54p5R2LZMz7AJVK6lifKbH7AVXEVllv3RS+ZFh4dNiJ7bO17DbnIqhSS8RBvR55qoSgcpJ0Y55aM1vpbGPRhhw0+SKmxTK6pYrbS8XxTZlFAPPFiMLK2xnzAwqCjZ37RZ1WHEmQH+oLQhGz4+NlyVXAiC0Ui24iLWFGc5EQ8Q19PTRMhpue49sShGcFQ6ied3TG2JL6YwvunWP+lMeqFUtKNBctUIh+ErWlVRuS0+ck527JTyHlPhnuldvROmR16tzusRTOhh9Dxb2LHn9HVnbuhzdf6vcjXZGqR2uQKTSQi9ZMjANGXXuT9COnmcF/tWIltW/J/L1PGVN+OjPI5UZCV+bwwiNN3KJ4P8ts9kpq8226YCInkpDClbBbXYG+4i3nwe/7PmOJQBJYeb9lfWedU/IOPE68E5YYhBMMjHx7JbbwTyOpF5rHHj1qWmRCFKetfXcyMk57nbykLv+QZYNp8ufWimBzVauaY0ZUuW61BRKJtKorrbYBvH4CkFH+z2+GiJEZMYu8zidk1/5Z0P5tU6sVStq6PgXJhOJrw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: spPhAtqUtmfOU/jrZZuV8teC80RwXC18ChMIPrZFJo+XkS1Wc7iFE1V/cf9+i8pqs+S8Qzzo84RJXBoeqsIHq8rgXM5uVoxLXOviyif0tmzqHo5Y7o8FBi04fIoKb8rmyeaqECoSjTYnWKtQD31dZ1RKScg1tJGfdUOrwpl3DATmYbTja5NjME8yPigRMWoFAZrKAxHdnnlX3XJCvnjNSJgxQTgdQZrVGi0/aFUlRItGrbEtGn9pM1sCbxLw+TprXxdvU+CxVuibm6HfnfKDfzU26+/yDhKJMcgyzqA7iQzORinVodzzyKuUvwRxUcRfYlynmxou7azTF7YwlUGBT8vxkE0YInaqCKvbi1BdhfectgHQ/R4RXuxQgqgWbeNKOn4v4kNg7qKe+7goEyAPbV/+1cJs3Bu8iLqOY3GN5Jb//UQ+/3j/oAafpGfi29NVeYiNNJNKKRJIK7irBagdvQMivdEvFeUyRNyPsjIatGU7HoHqalc+qbfObCm+X/KsRTKb7bGdhCXN+uT+K1plyQmfbRyfGW2nuz1CBurUYWYqXKd7uV52BvkTOFBhyNk5F/d+b66ZUfKSSMRG5p1RcRELfe9gynbNEl3ocdMxR5hh22WRBPoAywfUpp4a62o/qNnedXHzYIdM6ZQU9/rcwYAWEXGB5ZZNbDLCsdMSRzoXHVtwkq8jDwP+4/qHWxcRjdUSBTZSaXIdNOYH0yi6QM8LMhFt0b+bIJOQfj/cL0Fa37+M0EDnqF2bVZbu1lXQQKYx1jvWBk63J5tDlVQdq3lKioj5Rv2D0wFHiBiF9Kk/gwoW+zozedG+t9Qs8lqUP+lt6R1X3TgvlkV4niwS0e8GWk01RRmVQ4EbOpgj6lYnaVtrG8suJpFfddv5opC+iEdgApETccWNuCLh55QE/sd/eed6PUYeA7wGvk14mMWnbHthMyDGFS/KwRAyqE9rNuHSuYSrY0/p2tNQDuD/8YWaJCVWuPVspQUNYwnx4fjg1HcoSEr9W0vtw8CM6a9UV+Za4NM+x/P4SNNS2UygS04ZxGRiScrEPKJBEs9UrFssrheOa4hsB+liLirwW2UMgvpaO0E9tC74hRzGNX/MXjKCuBghTHJmB7/nQLDsZ4qetAST5ezjd0Hex5QMW7/vIi4OKNd2EY85jJRbCwffAXX4XHkJNsjy5kYkCxUXtHGDnIqFkhzRz09+bKGNiCtKkcYcjrylx42hZhrr8XvgB3YdehrB5tEbXDFASr9h2QPI4sxMYjUITBB2uThmVePth4/BMMDvxtTSqPnvavDOp6SJhf9wA1MJhOBzvwOy3bCsfHfSu1/hE5LsE3LZYVdljoFKNCPKjbf84n9Rs5GcyBwSMMnI2/bMjAHSoYJVu7J+J58lOLV6sZUYNnbZ0507jkUbUOGHF0TxGdi0NQxNIMhhZ7G5U6PXqt3DJyGFjuKfbTlhibDS7k+csxWtKhqr X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 715393bb-2234-401e-463a-08da4a73bda5 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:59.2109 (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 27/41] avcodec/x86/lossless_audiodsp_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: DlSUlDyeZ4gF 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 MMX implementation (which is overridden by the SSE2 specific implementation) at compile-time for x64. Signed-off-by: Andreas Rheinhardt --- libavcodec/x86/lossless_audiodsp.asm | 2 ++ libavcodec/x86/lossless_audiodsp_init.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/libavcodec/x86/lossless_audiodsp.asm b/libavcodec/x86/lossless_audiodsp.asm index 063d7b41af..ad8a34531a 100644 --- a/libavcodec/x86/lossless_audiodsp.asm +++ b/libavcodec/x86/lossless_audiodsp.asm @@ -63,8 +63,10 @@ cglobal scalarproduct_and_madd_int16, 4,4,8, v1, v2, v3, order, mul RET %endmacro +%if ARCH_X86_32 INIT_MMX mmxext SCALARPRODUCT +%endif INIT_XMM sse2 SCALARPRODUCT diff --git a/libavcodec/x86/lossless_audiodsp_init.c b/libavcodec/x86/lossless_audiodsp_init.c index f74c7e4361..f90cab55d3 100644 --- a/libavcodec/x86/lossless_audiodsp_init.c +++ b/libavcodec/x86/lossless_audiodsp_init.c @@ -40,8 +40,10 @@ av_cold void ff_llauddsp_init_x86(LLAudDSPContext *c) #if HAVE_X86ASM int cpu_flags = av_get_cpu_flags(); +#if ARCH_X86_32 if (EXTERNAL_MMXEXT(cpu_flags)) c->scalarproduct_and_madd_int16 = ff_scalarproduct_and_madd_int16_mmxext; +#endif if (EXTERNAL_SSE2(cpu_flags)) c->scalarproduct_and_madd_int16 = ff_scalarproduct_and_madd_int16_sse2;