From patchwork Thu Jun 9 23:55:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36133 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp656164pzj; Thu, 9 Jun 2022 17:01:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxb5OGW2dD3ZxKzEgSrL/C1ShDfr/HYBc5+sTdx6DzwoHBUrONVjN5zqJtMiBF4rbsfvheh X-Received: by 2002:aa7:ce96:0:b0:42d:e1ae:6815 with SMTP id y22-20020aa7ce96000000b0042de1ae6815mr47939147edv.109.1654819312812; Thu, 09 Jun 2022 17:01:52 -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 du14-20020a17090772ce00b00707e0e3cd7csi28291105ejc.359.2022.06.09.17.01.52; Thu, 09 Jun 2022 17:01:52 -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=UmYbAplx; 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 28C1268B92A; Fri, 10 Jun 2022 02:57:25 +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-oln040092073025.outbound.protection.outlook.com [40.92.73.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3A7C368B83C for ; Fri, 10 Jun 2022 02:57:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BgU7KjfM+azWHqhgNuoFeOg9vGGgk5fI1jdI/q+ek7CF6HkRBU4Bl7oPN0zA8Gjhzo87WDdT9sqgt6h1GbWoextvaG4HVjuTNwYckaMg8xa/l0eJAoJf7yv1U7DW6RfBdNjpzaS03OhhRrtV7CmUspNPUR6yjZ+pGFXvzb+vqvgIEYG2mQwiHu6cZVrfpXnVkz/ishaGU3uwqW8sC1ySwLG60iu7e5caXYDtjjwvFvSSae9RJD/tOnUqzcq8SW99cnL/nN5dFNAQJGwSRuZ9pWvCgL+/DmkR9UyY+4PyJU5SGCd33FTdYrYbAQew5uNn6gHaAVJQXyvLOFWd3V5PlA== 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=2MFknlYTAnsXE1XeYKgstMLf8pnSf/q86Sc4FpA0uqs=; b=huqu/Oom3TkzJUCd/7zc4KDFOwWe+QgkFvDBlrm8slKBXArKERa2JeoQQvIsojr60yOpxuEDEq/G1D8dusyvUz3T91mYhzzRgP2mPbpyrxWM6hBaNAzprXkKpXbeo+HJDm8b+ERnUn029ssVx+N+E7KdZSOUOolFq59BFWP63WmPnvXpCjqAOwRfuEeVhV/7ZVqeJZ4KIP5X1Z6uopBgH8cjHMpucQnA8AUqS9r32FgQ/So5p/l7enYJFrrw6e1ye+FR4gNSWOF4xv/3oche/S6zOQkANPy/Cjt5RMZwX3j4r16nSLPu+YZreWTNK71xuj5k6eZj+uSrypNv+5KtSw== 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=2MFknlYTAnsXE1XeYKgstMLf8pnSf/q86Sc4FpA0uqs=; b=UmYbAplxl1iZHzAd7ZhJ368L5PHUxr08ynhmvkdVvC3+VD2rMOt5zRs7oPehbUvh9NpIl/1eDBpBcDgjz5eZXJVFOwz6TEYHbjWsPgfkMKvQiMF0fHSU2ww9XcnNUSv5nBY9ma3+DloKbHW2nVXeCnymf49ILpGnuJEzIjmV5ts4hKG++7OLYaoNcwI2TDJcjS4YXfWik0qXWy5351CLM15TTKN3xT5n1dqs4+wvlr1QtExTUmsvQuZASX/s4z6nMhXqvjtPwD5vM3Aw7HgTNaRB61+wAvqhASnw/e631M4AObaS/URrm0GV9zgKVsBMrtYVBjPa45LvAJfmYfBqig== 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:22 +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:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jun 2022 01:55:17 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [229aARcGDWCqKRy9lp9zbGQLeMYaJ27O] 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-35-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5d4d3d66-7cf2-4e8e-3642-08da4a73cb9b X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTijo6adWu98SHbtEySq1lKoG+8R97yWywWP82rv3sd0TcZk9hIJ84VGxT44JwbcY2YaUjDUzek7ig6LPMZTMfkxuEIj/LqClZTAudcs1nxrdaSSRPnlR8ZP/7qDkfwzBABKKHWz6fVUXKL7yKqNPj0Z5k//Hdqoionro8N7pGsBxTMTvXGereKgCyt3Nn6iqqgSB21/yVpqWy7cUPsIbtsilmeleF7RIjwF/YWKxBGzpcwc0BuSy+B7NWQKbSuoj3xbvCsezQZdYOa+3xwJd/Fsvkp/XT+6UTCex9fU0qK6FJxluAnqoUrbNatgJQIwDViVEfn4gGISM8Y1slZGaeXbN42h+cjb/SEc1Y1xkgaZ88AGXtT9539G1KyqhcjiLEiLPrJcNJEab5ixXPMuZ90ltBRUA6isj8hFZyWXelqeI0Bz9cV8Fs4ZciRmAy2X32M+qSxHZsmUvlWPyHuDwDLzknIaTuS2xn8bLtyM6kKQFMnN0DQJnVDWbObjMy0RY+IyC4MEO8kWpNWx1nJqauY9Sw2XhMUUVLE+2TK+NmVDvP7ayRVR6ucmsefB+krEf0NKzZYbbaJ+Tv+vpz2kh3Fh9lzW6dOr03xIStREZ7uig1ubE9Z14a5zO943Dg6HpR3WnfRcQDbKU+MKEdtiRwhF6mZX17bBCW8PpaFA/Ym7Dtjr70XkFkMhLycmKw4PB4z5eeae0SJ419AcG2nLLQ5cJmNxFppbsIHJ7IbaWchvcFuq3YuoTX1mBkh6QHVeak= X-MS-TrafficTypeDiagnostic: DB6PR01MB3862:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7UY/bOL3RpjVY/U7xs9Nwok5xLYyx0R/AgBnfyx+PWpFelTR30Oyp262XV/U+EN6Fu8BtIRoyHj1vOjYB77l7OAPYSzkIgO2MAGyN48ow25eCOQKXb/Gha7kEibg/7ofknK3FpEo8GuEDIyyQIdOE0RJxRtCSEr2O0VmELX1uc73Lj4yLM3NorU23sej4Oxrs4XJKNf1OW7uUadwGcRpUQ9w0okOqBCPEmr5fDOdG4j39C9Z5IhttvedwL8+sfN77/hd/KEnqI4BVQ0F6pcvW+nE42+tHB9sNDQqPQjC7X0l63ShwLvTdv3eOd7tKUsIIzaKWytZI+JMTXOqUHXvgRb7c7raDjeKOHMDH8fxy/hq4ShnXCzHakq2Cz2+FyeKWO4qMKbOP5mssCnPiUDvCbDfzhfRzHFD30RSUV/TURY6USnP5aUJmTfFLycuZJJhMxk9LLqnOJdU5Fc5Gai/arKlvUckTGmEVAXsHql4C9Kvo/f/3hUnIcYDEBf5XYG+AygkoTBBuPkF2ylJsvqZqk0zauVPQZ4JpCA+5QzGR7C0kokxKKUz0Eb6Z2hYvrOUn4bZTAf2E1/H+mGkG+6P0w== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: SdxUW9nc0uhE3Yoe9+RiIymGybucq6PCFhyLeRT+cBM55KP2X3Kg08IJ1Dp4A3Xnq9lcAPJjNaTE4khl97gThUgkModHFtNCd76bnYg1X8hXUAVWg9rc0w0Lx/RfLb3xargGudByv8ECCdJfjxQm2Rd+sbf8C5BtNppbPXV91kh1tQekBsPtbDOcYt9WuQKFQVaV4vylY+CphIuNfFwNnVI76x7o1flk6oTr3bL2nRwqDwXMuCTgxz3UcXNb8g22ePU91Xxwar5RoxHQB3PNA8v69C8eVRlyqoxWmo5ckYxI61ZQNbIQw47b2LV1MSs8dI/t2cVAqtrlAZF6MFRhjVUxd7RBGuP3sw5+nGuBqpwEu43mBP4VGnhGdJ+fYnmtR60GSve4pBqKMcDiMFVQ7U+k4enqLdU20ESkeIi/YfLuknoDb0sxRjks6FjgPW10oRcXrZgfB6U6obuVfhZ2E2nL+J4l5VLGsHdglbyvebWPq2lmGsOKhZfAteaqkiUfvOmQSLNyGlfjaLJiZQN9Z+gIaYDxCc0SqJcRlYfDq6x/4yQzW1HtnplIfG2ygAhC9i0WrIQ751z8HOjifXFQsBPNzMWBUw2grTI5uLPl7Hr5mpALxBKNiz9XxYOBADHMWMoMolWUyfhfgla6NM+7Jcd/1X93qrHffMGYSXi5kdlUzaJGMkV37dZ0zb17mSPaJ2AaNVPL4FAjZV1wgfee2u4s7+uga6ZoOp34H19tdwOUioErUEowE8xJGzMBqflozHueCB61iPcN+qR5/5UyEJUbbLZSD0PLzrl8V/ekvNPlYRlIp80GMakWyP7P/cx5JACm/ZWB7gvPy7fl6cfROut6jWt6eLufyiIUlcKF/+6VIamObfcFYZYSkjMBEwbDfInpB2BjhejW/SBfsJDh0rvzaLRqeNuWU5Fa0yU4hFotqpPYyDey4C/PVk04xwQNplkyM+7AsqAuJVKhyUNAhraUIGlvtIbpKDrGEyva7ry3CriSBzxIdkczm9SO8BQl88XDhwf+xWRMSmmf57Xhg7KFSHRCKJHOMvpHfNs/Xz40Qk0QjpO1dXWedjMF9t6oiA433NffvIrIOuU4LItJTe5T4s5YKob+Q81H/pc9W9nSJ4DC/l9OBkuIHVtrl7W7kCVDNMjD+8hCfTFZu8YnBgODO6YdmXllFQ+EQYJpKGQdo+AwNZQfC69tEAqxDzAvxQvaYhSHuDmOvtTXm7E81LoI1+akyUlssRLI2yXqHnv9K82qTi5PT6iS2WwdPV0APOSmADXSf/7S7BLu22Ce8IOZhmMypeM2h96vexqIb8yhSpFKPw/VGKyUd3peb1PEfkdvQ6tcAbhQ/QqSfjy/Ath4LWwGOaSFve2aLb6oODMTo4BjV27y2y00xyCw6iqOkCjXbhohoUSqnG5PFivgZNAVgF0io8utxWRWvGMWuvgm5VJ1Lhax/e7R6p2qMtPG X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5d4d3d66-7cf2-4e8e-3642-08da4a73cb9b 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:22.6331 (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 35/41] swresample/x86/audio_convert_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: 4xwB62vSU2aa 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 --- libswresample/x86/audio_convert.asm | 2 ++ libswresample/x86/audio_convert_init.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/libswresample/x86/audio_convert.asm b/libswresample/x86/audio_convert.asm index d441636d3c..d2413f9f04 100644 --- a/libswresample/x86/audio_convert.asm +++ b/libswresample/x86/audio_convert.asm @@ -608,6 +608,7 @@ pack_8ch_%2_to_%1_u_int %+ SUFFIX: %macro NOP_N 0-6 %endmacro +%if ARCH_X86_32 INIT_MMX mmx CONV int32, int16, u, 2, 1, INT16_TO_INT32_N, NOP_N CONV int32, int16, a, 2, 1, INT16_TO_INT32_N, NOP_N @@ -616,6 +617,7 @@ CONV int16, int32, a, 1, 2, INT32_TO_INT16_N, NOP_N PACK_6CH float, float, u, 2, 2, 0, NOP_N, NOP_N PACK_6CH float, float, a, 2, 2, 0, NOP_N, NOP_N +%endif INIT_XMM sse PACK_6CH float, float, u, 2, 2, 7, NOP_N, NOP_N diff --git a/libswresample/x86/audio_convert_init.c b/libswresample/x86/audio_convert_init.c index a7d5ab89f8..7728c9ae00 100644 --- a/libswresample/x86/audio_convert_init.c +++ b/libswresample/x86/audio_convert_init.c @@ -52,15 +52,19 @@ av_cold void swri_audio_convert_init_x86(struct AudioConvert *ac, ac->simd_f = ff_int32_to_int16_a_ ## cap;\ } +#if ARCH_X86_32 MULTI_CAPS_FUNC(MMX, mmx) +#endif MULTI_CAPS_FUNC(SSE2, sse2) +#if ARCH_X86_32 if(EXTERNAL_MMX(mm_flags)) { if(channels == 6) { if( out_fmt == AV_SAMPLE_FMT_FLT && in_fmt == AV_SAMPLE_FMT_FLTP || out_fmt == AV_SAMPLE_FMT_S32 && in_fmt == AV_SAMPLE_FMT_S32P) ac->simd_f = ff_pack_6ch_float_to_float_a_mmx; } } +#endif if(EXTERNAL_SSE(mm_flags)) { if(channels == 6) { if( out_fmt == AV_SAMPLE_FMT_FLT && in_fmt == AV_SAMPLE_FMT_FLTP || out_fmt == AV_SAMPLE_FMT_S32 && in_fmt == AV_SAMPLE_FMT_S32P)