From patchwork Wed Feb 28 18:10:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46627 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp97983pzb; Wed, 28 Feb 2024 10:08:26 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWG0yV+W/nwkErTbZGqY2k7/he8kaTmmLSnBWSf7skiRko+WI+EWlCzZ+pkBnqPfFHhp/KBoVrpZSirI178WH3ctdB6XeIlokyZhw== X-Google-Smtp-Source: AGHT+IGEeZrAaZDtiIpUM1uCbGG1y66gAQibk/RQGPxjpUrUX/uUX5BTR7SZRnqpRQ5CNOVsrx7p X-Received: by 2002:aa7:d616:0:b0:564:81c8:cf8a with SMTP id c22-20020aa7d616000000b0056481c8cf8amr121117edr.20.1709143706212; Wed, 28 Feb 2024 10:08:26 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p4-20020aa7cc84000000b00565b4b95cd3si1885741edt.459.2024.02.28.10.08.23; Wed, 28 Feb 2024 10:08:26 -0800 (PST) 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=PiMnlEa9; 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 2F67368CE11; Wed, 28 Feb 2024 20:08:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2067.outbound.protection.outlook.com [40.92.59.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 93D1C68CB2D for ; Wed, 28 Feb 2024 20:08:14 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BNKSkr+6v8od7Kn+Yc5x1V8OQHrTe+wfToGAb33E4ZOd+W3J4yGTdfK/aGK+Vmj6+sGIwgH+xAgMT1NT390GjtbO+4ZCE5NYb3enGLeSszpZujbgMUbekx+oh+O+k6IkRPnCNwhX98aCe8AszCjRYYsxNDr7AM2unx6hoM2r7Hlgsm+TQ5R4cDDjUK98a7ksgpLhSSIgL76U2HO41TeFXH/65jUM3mvqME2qZAUt/v/ONj9WJew0RvcZjYQbQEFnBLU5MJIJQGz40wYk1P5uGGrcsoMtdZ+kh1v6x0ybO+5gn9usGoqNJhkWKq2NLIhiGimXX2ikaNyIQ0IzWkjGrw== 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=C9BOe70RBpuI45+d13cQRBTiFtSxOqpzaRibtxYKfPk=; b=Nv01KKvgs2tJx1iBxLVdobyXyWK9GrVe4thKz0OK33hjcy5GPDzTbdZ2T++hnxIBokFkqcZ7+XzO/0bQfDw+ogMcVUneR6cLVCIV69TD1lYc0Ya9OxG/1nby9DuJ7oV/7YHUIG/ekZ+rtYKUQvocGjLDFAsf47bWbbjfQKrlTlXhm/A+rX+c/BTUO5LhHKt0Vimb9thL+XVJDlqKjto8kOhHced+AfcTd4ZzVuYQy0osH9FXBBZ7UesS7+aAI0BtulfbTVGci0UQO1NO8MGhI2+zmLHc7mU6c45XkO3544kmIsjhXO2ZYxscHLHWOtTlTdXmvhIzxonjuhkIZ6YcqQ== 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=C9BOe70RBpuI45+d13cQRBTiFtSxOqpzaRibtxYKfPk=; b=PiMnlEa9CTyiPq2XWYmq4IZYB1WcflIN/7eMf3ko+T0BOL8ojRWIZ3SwWUW7uEH69sdBoG3cJptQqDY3kEGQetoK+3/1CzbUEKbdBoj+hlJBPZZhxD0jIvGmj72x98J7lMT6DLYk5q2znJ2YFGSnO6QLZv9IViDbKzLAmResIhkpXGuYoSCLf/qiwhBBAGLUdBavGNnP4dfnyiG1Z/c/A8f9fQtSchHTF4OEv5hPISWqp1C3FrsAzr43c1uvfWk9xHFaWL4DGrfVQ0lbLET245WNjEUSkvfyFd+2Cf4yNx3H6nt/2vrelNVjnJWMN3Pk5kfVCXYCjZUh7ZjvF0zlcA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PRAP250MB0420.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:279::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.39; Wed, 28 Feb 2024 18:08:13 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7316.023; Wed, 28 Feb 2024 18:08:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Feb 2024 19:10:06 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [rZSr9FTvQQiorH/V+vfvYTuL+b/udb1J38VTliB1mGs=] X-ClientProxiedBy: ZR0P278CA0175.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240228181006.2203847-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PRAP250MB0420:EE_ X-MS-Office365-Filtering-Correlation-Id: 6ca759fc-8cb4-49b8-270f-08dc38883a84 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wIynG+zY8iMh23KoDzlcSjDc82Gs1nWjsL6iAgQ+UrADJt5WNRwdhSQ7yfQgVklcJ80/tORA+f4XG6ZjuCnK5YPyQPf9CGsuAsFlirli9ja2sUztElnnWRvrObjnRE5qpLsWTfgnjt+S9XT0osMKC2kKZUK51mviWHAQ4F+RaoW7i04CTHINNpTtUyzFd654KWLP6cINPPfNyc3ENFxVaktxmybfOEQQA2UwqCm9SJ0DEpYa/6sLHFSn+LWiUdFNI5uzIpDTw1BK3n4BdO6/TKWkvuwv88kE8e+W+ba3tEk0zZwhU71B14UHpQSxk+ysR92HMQQjr1PzhRUR7StpDCr34PNk3xLk0/jh5V32MwgOv1sp3hah1HhedLXCaGmjwJUq+FvB0mmxWWcXPObyuqZNPxBslyA+ky7/fTJ4zVssdW1XpEbLpIRtILdb5WGTWt910pss/Z4bta7iRdwejO3Z56WNoG5YVOFTa+mlRwj27P1tJIXkRFNQ9ev8tMoCKK52kJqZ5pFPOrYSRKv3gWiJ0kwLEB26ivq90zwMzNWTOnvAtDI/vwlVdVLe9qSxVZifSiARduxOw8t2VFLxiTEHyB82xQ4mx9RyUUmYFjAAuDvaqmIH63lULTBo/2NW X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: i4U0KJ69jIFunDLJcZmSsuQzpgQwfbgsbS8tJG/8ho0QxX5BIQewHhzwPkDMziv+SHM6cP+1pG79UALSklbzwVJ5KHzz1ly8N0uX6yGWwe9flZNucLrNahJa4GNCc64vifGeev/F4yqsiQj2BC6zL7QczGmHVOSJgrWwHjWqjZ5Xc21X3ZGWMqPOqCj7sj2ETRLDS0Zl1DjjRSphlgkFQp/wXBiul4tAw6IWTzraQaYPaGZ/t6jKzfCOq0B4cXCY5NiJCylbSr9pLam/US7ftW4YoNAe/llVXSIUGbUVqxKBCLLIVREFIMYdaG0U1FDGJY/fF7VMBu3xMi5Lmyw++asnZ9+AmoUngLWr6pvH9f9VvkNXYK3uc4uUrU4QJ/8qvZVtXx0C1seS/AI3m0wG91/Ffmnb0i4RR2TDPrTFqU/FIS984OaJWMcwhKMUUGrUxKxM5vLvyLcJ0UzGCPJ2ij9pkxriutl6Yfcqid4M5lSNMYSXzjIOQ8CKbLjMGv8PCm3V1Er/iT82nV1eahn7gANmlMYDxUYpMnTM60Sdfr3wsPJuYlT3tOCd24jZ4BdHwXgi2sQfAOiub5fGPN6SLQ05p5DV5wzeHD/xN9CjafKwbokqbsMrAMVallN7dciRT8n2Yop8RDNIXmzlj1O43lkWR67eWdPL/E9jAF+DWScreboD2Hb8+BGiOJUeAfvHSZ5UzOIt7v6K/+8iyz1+sNPE6NTWbCvLL1Q2JumRvWZ9qClkzewgFDVmLUlzdYaHsfJnkqM6HtTfGNa6nSBm9rvcYGMcr4hoERe0MZ9Y6twgXfO/+yMSWe1pPgDkFenn4jNhs2usbl7NVgyLfRaNLGG/A91AkVBgJynlqgdw4UgSrsKzZFxJ2AsHtA3N68qqtEIymVaJ/uN/J9IdZt6qeM/Y5HwDZRZhi6vW4WFyIA5cjS1JNL5RZHMKnUN6dwBYU1WBFsAHveu7pbP060kmBsa7sfOIla03tvjDNXVeYvHbeuAG4Ky/O5KZ3K7c9ch+f1jsEwhJRUkuV3F9m+5j/OkHmYXoCBJ7YxRMKnpaSFGXXuhzbTdvNjTR2VxTd38alJXuyGNHWOSMjxUhY3uMunM8ytaGElWukwJHbijjD8hYZOi8UQxBKuUjr9aXsJwgzPJiIjH+tHkAO+n9NHiInzLjHJAPYvNaDhYTzMlAq76xuGggcUYOeGGabCKXFMBBPn5c+9pc/t6EvGHFxCwcZ+XV+kjiHhK+G1mFjYYG2my/CWgX0TKBZ3RitGCKPBLimyEO/Is8uTNYL5oJrD43Mg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6ca759fc-8cb4-49b8-270f-08dc38883a84 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Feb 2024 18:08:13.0327 (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: PRAP250MB0420 Subject: [FFmpeg-devel] [PATCH] avcodec/x86/rv40dsp, simple_idct: Remove remnants of MMX 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: c4R2iz4iCfWQ Signed-off-by: Andreas Rheinhardt --- libavcodec/x86/rv40dsp.asm | 10 ---------- libavcodec/x86/simple_idct.asm | 36 ---------------------------------- 2 files changed, 46 deletions(-) diff --git a/libavcodec/x86/rv40dsp.asm b/libavcodec/x86/rv40dsp.asm index e02ad2c63f..e3c37dd297 100644 --- a/libavcodec/x86/rv40dsp.asm +++ b/libavcodec/x86/rv40dsp.asm @@ -401,15 +401,6 @@ FILTER_SSSE3 avg %macro MAIN_LOOP 2 -%if mmsize == 8 - RV40_WCORE %2, r0, r1, r2 -%if %1 == 16 - RV40_WCORE %2, r0 + 8, r1 + 8, r2 + 8 -%endif - - ; Prepare for next loop - add r6, r5 -%else %ifidn %1, 8 RV40_WCORE %2, r0, r1, r2, r5 ; Prepare 2 next lines @@ -419,7 +410,6 @@ FILTER_SSSE3 avg ; Prepare single next line add r6, r5 %endif -%endif %endmacro diff --git a/libavcodec/x86/simple_idct.asm b/libavcodec/x86/simple_idct.asm index 4139b6dab5..c79519372a 100644 --- a/libavcodec/x86/simple_idct.asm +++ b/libavcodec/x86/simple_idct.asm @@ -783,62 +783,26 @@ SECTION .text %macro PUT_PIXELS_CLAMPED_HALF 1 mova m0, [blockq+mmsize*0+%1] mova m1, [blockq+mmsize*2+%1] -%if mmsize == 8 - mova m2, [blockq+mmsize*4+%1] - mova m3, [blockq+mmsize*6+%1] -%endif packuswb m0, [blockq+mmsize*1+%1] packuswb m1, [blockq+mmsize*3+%1] -%if mmsize == 8 - packuswb m2, [blockq+mmsize*5+%1] - packuswb m3, [blockq+mmsize*7+%1] - movq [pixelsq], m0 - movq [lsizeq+pixelsq], m1 - movq [2*lsizeq+pixelsq], m2 - movq [lsize3q+pixelsq], m3 -%else movq [pixelsq], m0 movhps [lsizeq+pixelsq], m0 movq [2*lsizeq+pixelsq], m1 movhps [lsize3q+pixelsq], m1 -%endif %endmacro %macro ADD_PIXELS_CLAMPED 1 mova m0, [blockq+mmsize*0+%1] mova m1, [blockq+mmsize*1+%1] -%if mmsize == 8 - mova m5, [blockq+mmsize*2+%1] - mova m6, [blockq+mmsize*3+%1] -%endif movq m2, [pixelsq] movq m3, [pixelsq+lsizeq] -%if mmsize == 8 - mova m7, m2 - punpcklbw m2, m4 - punpckhbw m7, m4 - paddsw m0, m2 - paddsw m1, m7 - mova m7, m3 - punpcklbw m3, m4 - punpckhbw m7, m4 - paddsw m5, m3 - paddsw m6, m7 -%else punpcklbw m2, m4 punpcklbw m3, m4 paddsw m0, m2 paddsw m1, m3 -%endif packuswb m0, m1 -%if mmsize == 8 - packuswb m5, m6 - movq [pixelsq], m0 - movq [pixelsq+lsizeq], m5 -%else movq [pixelsq], m0 movhps [pixelsq+lsizeq], m0 -%endif %endmacro INIT_MMX mmx