From patchwork Thu Jun 9 23:55:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36123 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp655329pzj; Thu, 9 Jun 2022 16:59:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy5LRrRn59hHVvWsLuFrRdJsg1LkasyAg3OiDmtZLPb1e+mVXxodVJ8kjVobVhzeOlHbijj X-Received: by 2002:a17:906:824a:b0:70f:4c58:6ec6 with SMTP id f10-20020a170906824a00b0070f4c586ec6mr31158508ejx.648.1654819194514; Thu, 09 Jun 2022 16:59:54 -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 e1-20020a17090681c100b006fee9ca7540si8775835ejx.244.2022.06.09.16.59.54; Thu, 09 Jun 2022 16:59:54 -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=jeQWbEZj; 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 8FAFE68B872; Fri, 10 Jun 2022 02:56:59 +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-oln040092073045.outbound.protection.outlook.com [40.92.73.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0478768B872 for ; Fri, 10 Jun 2022 02:56:56 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VQ8TKZquIZ0OpH5FX3K3D+KJ+Xoo1LLJvuMpsruc+prKmCYoLwjKBmhp9TvID/va5bsf98vmtXKbdsjR0DGF+63vnQrBVc8Fld/7QKKaMZAzEsDtkxfy3qm1AUYhfTYX9a5fZ434C/3FqoxaibvTDwBDDJwwwFQcWDKHY4MkrcD4OMELt5QW5ctM3AaPMnDiQyUKEeLoFdPl4YYOKuZxlfdbHMqeKIKC+bCogxviWqYE3Nsq/UivYWkIFX7ufME4JvHQABXLq09Ry3VUgKBQLsyfyPJALsDPIh5S9xHABFrnbGVJL0LcARCFefz5WWbPjiUCvO4Z37Q5MPfi1St75g== 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=wn9HQJElAJYHaIbvyBaq0t5pV9dsk70uyXkk+fGZmJA=; b=jkjQfz7NVJfxXdxjXX0DGpd6llW1o1NBCHN7tMDGgFMzfhvmCySyttD+6Rqicb4Srg5jVn32DRQ1j7bw2kYAqaveI5v6Oo9vYt1c1SAxEXx7ojg4urB69INf0A+l5MjaIVbOHwiYqzmGw/MRmM0NqNUA/QyGV9zZLdtb/yar5YCEO3+JqkhbN2bgmg5EqT/uYi6Bm83gly26BMDG/EQRN1TvkAeZDlKYEM+b7EOEQsoiqXdGfdIdyqlKwAq6pBsLAXw/j311WrBKH0gjv+juZxW4pVlQ1MlsS0al72jzbOQQO4HGBG8YJvEwu+4a5YDKBQhLPh0T35RBeEPY+q0H7w== 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=wn9HQJElAJYHaIbvyBaq0t5pV9dsk70uyXkk+fGZmJA=; b=jeQWbEZjEUqfNJl90y7LywDsAqPch0jhuWfRFqZI8x+A7eWpgB99tVLpWMWM+pjnuS4/thDelcBVA8l/PzBPSnkfAHr8bwC8a7HhLBZ3pp3a3ibzX8N5XTxRHG/Zz8yTH3tvs2dosBPTRz7eX7VSn8csRpiqYgCP1/ncWdLZ9gIHEpHjZJnRitCFh6WStxo/IYHCIDN5WOYaiF6mlNvrwzZNxCnihaEmx0VcjtRTFGSDNNbeP/cV+KK32x7Kgg9NFBHv5sPMHaOcdH2sSHxDYANGrs2PX34fHK+CFpR3WsTvfII8UWfzUhDSon2GeOxkRh3HWiYhhrKw/jz10saxHg== 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:55 +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:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jun 2022 01:55:07 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [9pL19JNlBSLiYAQWzBtpSxTTawguILqK] 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-25-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 470c0dde-f08e-4047-d4c8-08da4a73bb6d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTijo6adWu98SHbtEySq1lKry91Qzc+7yrqqC4Hgj5YvLPWlq5XGOSNv47REEvgFpWaNYXgC8B/V3/RmugEYzPlbC43okKQ3tawO91w64scF/T+SItCl36DLSRKOXmoWG3LHWZH9Of3SOFUEC/auVJmR6z6s4wGmNCQ2onboeGI4jrtZRiy5RHqkal6om9IlEdRjOsQ/1jpvl40lfFFolfd8S85ivzQ+70ZwEws3mGRj7pJqemaQZ1q8RDY23lHq/B7MOs7ZP2u8zw+swIw2nmZ/0jtvQITFkAgKuaQi+18u0HnIDvXhIE7wlFIBtXXvyu0OmtNsiIsmqMzrFlLtgt9RnJBqD6tq4rofEHVc/QHu/9b/qdJDSsMZ3vtxs4lEI9uPtjAvHzHpp4ajj1zLTh+eS2EFFZuil8VOwg7Ez9R9uxfSBnZgb8wE9m1/nUNopq1EtbMhihT0MkY26neceAOo36lXLo7RSGDXUxQMXmdiHAruEHg8dl4h0zEwd8lJcXRCJPE6ND1F7vtbEDvqbDxkb9FxIqwi30Ww9LKeRJTSC7eC5Cujfwk6SpmemfZe95MrE3MPnIyYGnT0Vw92jXsFrK4i9O1QPJFa6o8yCZII9BK0ycjA/uOWrRS7vuT940W9TMxm0brS42Mx5OxEc4Hcn77b+12K2hqiKBopp8uKJk9Wm3o3jxpHZU1RxSDtR+7JnOLW+9Rtfznv3oj+j/zw4KsdcfGCh1vQVS5ojplmPY5nkwXD2ompkpT0tQ3qj8= X-MS-TrafficTypeDiagnostic: DB6PR01MB3862:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pWRu1fz7LU9lKzhicanshs7vRt0dp89HjK5/ej70xpuYhh7RuuAHtbRCU26U6DSGw5uKH+RChyiWnP5iP3aUKh+VpedApQ7u4icRU2pyDv3bdKfZIhnJOXMjXqrdW1DYIEtcbnlIbffS/lD7tPas7EatCIWT7qUqsyzW8Df+a5Z6NUI1gXFoGXzV280AJ7AAW1zd0oCaXMbhijK0hrreQxa/SM/qkU5tkJQowCQLueHmHVIBNOzL8Y5JKcD75z1SPCRcygGxVwUQvJ2GMsOo+48eaNIX8wN6e1keMG7PXWJdLiAlZ+DszSJW4UdMhm1ImxdyXhlTNKwPZiOSD0QrSqpKsUguM/E8bJS4fOihoHfZMW1ytZzjwLePkLw3CUNkSXym+zdzCnhLy4IdWdL8mbv6Pu7ZkRw9a2K2liRmdboaGejitDdn+X1LiUFJ7Fb/AMLHe0PArQhWVwVN7WGnJiMD+MC1gWpZarZlq4pYPIU9comow3ZoCLFlgH+aS1kYbACRWSqmd2EvgBv9feyoD1xAs9zdUFYmcAGtcTK1N2eafCd3g7pq3/haIK/bzKNS8ZuAV22brZek3rLTO4goNA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: p/xK/dd6zEhMAvgtv5LsrnOYNif5RVw9ZxUAtBZk2SAOkAcEd+6j5ehBU2AOAFyLVf5ptR/vZo9Caa+92GtjTZio9ENIjvBDHctXZ8URrxDzAyJSIEoOn8XcqThitUmyN9bLGdAMPLYQxkw0iMofg0OV6TNWmVP4Q4aW/e5xLD7Hfd03SYOIZIxEo6w8WnAIlToTrzZY2zV6yuK5/DCTTe9fKcyqlix5idlSTIakbdqroO8ZWHeft0FtzmCiQ6w45Er/F0Y/TlYsERw4h0rnHyZlikIiwOxg/5yDVdm6vGa6Zyh2/AnqvsmseDQOkMzkyURKEGYuY+0mn660V64z0sBeRnxNAUTjkN8HqXaaSdHVs4aCxC+xibQv6iiv5BbriFXZJ8K1+quASYJteomwRO5hupOR5DoP2h/AJOXxc4cgSq1sT7VYM0eTv2MbHulm2gEtoYiv2ZAoqWLh6rPveOr3x7w9r7oYqiHtaXFgOtYaMJfAaYRnRw4v8zL6Hpuy8XYbWkUnmTZTEKEgfR9HWmGLX0ch8WGcAM5F0EJaXubRX3xEKf7fwCUe9Qg/GO4TPvdT1SUXd2QM3rL9cVSQWWKq71G7/sFTrrby7DUEJgVQ657W0Gs/S5dga4P+L3nspcYnvWe+SOQhqV2Ey+pn3PLGWLZLQm/lHwrfOWkaWfrMLUvsasNdJnTBs0hH3phycRq//6yACmkRy8STBlA2PXZmhdK5BIoVF/xj3iWtskn6wT9o/VyFNLv5ugur32xbBSEYz3j1m+yfQLDq41HQ+05hUV4arz1Xkp9Ot9fO1vziPJjGoT5cYkaVR8TKtw8R8vldogPBjQps1W421EZQ0z6//8HFjR2U7WhRVWLyL7WUwq456OvlkxUlDyJkkg7GOdB9R130cyyqOoB2dfs1AqInTZo0z+odcOhEa+RurfEokXprq4TKJyrQfdg9biXfssaOFvB40fQYz16b9ktaGwVSi6myh7FcqTMpEX63cFiz4dVzu+iBrV5EX34OjW9IhsGgypTTaDl/zdSgbVNUpbP4G/hCU4d8+Y3vgz+g/fzmKo/Cf6GLhJkmT7QajjsB8m7fA1/IW1XT/W+9Wc6flknavvogRttrClDsKfQ8uEhFWCMIJ6e93klKnn+dkSQhrD2ceZfMDarVwYKHTrmbkzpLI2DYH+CLa9Wfppwv+3DgRd7vggtOBI6/2c8N2hNS9JpcUs97prJ3o3eh9WXYrjBqkDZNDtc5Y1EVMima8IW+cBJ6hHoDP1TN8hXvATQCV8yZO630aP05K1FBKrU79qO73Fa/g35LvPFO4sMO938LLlTmvC+Bck0LAGONlfdaKv4AAGnStIR/UHhkI/P/GzAS9zLO0+Wj4IOM4rSj60GMbnDsmgPa2LbGpDNSupsJUl62jmAJThGlkK8r57BD/rbfJEVU9URww5qD8BnR9MaPNb+cib9B1dchKyert7GGwk6a2P98wjqhjw8USyKZ5g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 470c0dde-f08e-4047-d4c8-08da4a73bb6d 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:55.4765 (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 25/41] avcodec/x86/blockdsp_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: HTqWvAqpa9/8 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 SSE specific implementation) at compile-time for x64. Signed-off-by: Andreas Rheinhardt --- libavcodec/x86/blockdsp.asm | 4 ++++ libavcodec/x86/blockdsp_init.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/libavcodec/x86/blockdsp.asm b/libavcodec/x86/blockdsp.asm index 9d203df8f5..dfa38f1d3d 100644 --- a/libavcodec/x86/blockdsp.asm +++ b/libavcodec/x86/blockdsp.asm @@ -46,9 +46,11 @@ cglobal clear_block, 1, 1, %1, blocks RET %endmacro +%if ARCH_X86_32 INIT_MMX mmx %define ZERO pxor CLEAR_BLOCK 0, 4 +%endif INIT_XMM sse %define ZERO xorps CLEAR_BLOCK 1, 2 @@ -78,9 +80,11 @@ cglobal clear_blocks, 1, 2, %1, blocks, len RET %endmacro +%if ARCH_X86_32 INIT_MMX mmx %define ZERO pxor CLEAR_BLOCKS 0 +%endif INIT_XMM sse %define ZERO xorps CLEAR_BLOCKS 1 diff --git a/libavcodec/x86/blockdsp_init.c b/libavcodec/x86/blockdsp_init.c index d7f8a8e508..3b857a51b6 100644 --- a/libavcodec/x86/blockdsp_init.c +++ b/libavcodec/x86/blockdsp_init.c @@ -37,10 +37,12 @@ av_cold void ff_blockdsp_init_x86(BlockDSPContext *c, #if HAVE_X86ASM int cpu_flags = av_get_cpu_flags(); +#if ARCH_X86_32 if (EXTERNAL_MMX(cpu_flags)) { c->clear_block = ff_clear_block_mmx; c->clear_blocks = ff_clear_blocks_mmx; } +#endif if (EXTERNAL_SSE(cpu_flags)) { c->clear_block = ff_clear_block_sse;