From patchwork Thu Apr 4 02:57:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47787 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp63551pzd; Wed, 3 Apr 2024 19:57:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVv06eC3E1b1hv3Bxj+dwCyzQbF/5wEQeshPySoZzHDq62PRZ59fuqftuJtOYtK5CrSf8CnTGC+JM/7p0pOOG97T8Uog3R9Hfkp1w== X-Google-Smtp-Source: AGHT+IGEOdppzA71GchVcOlL8P+FvlkvjE0DhFJDtOtWf5RbRbgNeoWbADqZPKA+NJQhO/ewNVtG X-Received: by 2002:a17:906:349b:b0:a4e:39f5:9bc7 with SMTP id g27-20020a170906349b00b00a4e39f59bc7mr642264ejb.1.1712199474841; Wed, 03 Apr 2024 19:57: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 o24-20020a1709061d5800b00a46cbcf6ca3si7358725ejh.944.2024.04.03.19.57.54; Wed, 03 Apr 2024 19:57: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=NaxwORWV; 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 8EDDD68D13B; Thu, 4 Apr 2024 05:57:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2074.outbound.protection.outlook.com [40.92.91.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CBB7268CF01 for ; Thu, 4 Apr 2024 05:57:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lTTfX6xb/0BnbOgEYpBlHB5877oWRiFO/VrnCtIyCd8hYqC76ZjYEAg5hP6glYUvlYAdkoEyRtIvOLiYIyHyukFr4sOcRKZ0wxZQ6/bRW5vum5iECzI+WrGBzpy/e/KmLXmsnjLOjaAM0kH48HXLzyEAoURZxK+M3lEwWbojTOKVyAk67SdIxvk24FsvfukvVB8BBNnVCLPow1dNgVKiZ1SJ8r6yp8jWv9K91rf8Mnd23Ug2za5out9NyLXmp6o0KlH4PxrY86V3LXz91XUDqa8qZsZiXOqVXFisTsXsv1opD6ZWRO2w8vx/fnkB5oLexjoLa4YoH6+nECNyt+0flA== 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=m+JYv8eZdXqqD5dyS7crAdysl1rYMIZt4kbYe0Y2di4=; b=FoWceKdaCbN3jDTOg5d0ONbPMvbWtc80rAMyO2Edi5iVuIwGuh4Z1a1ZK/IdfbEwTqo4usozJYc1LvLpjvGjLjt9E3epEaFCh2JfdVnYFjPEpP3W0CUKVKB04K/ND/PbHes5NuNG3REdX053T/ztcaWC5bk3wjW3zZ+DH0/NAt4Wt1/dwbPr09lGalE/mnGHh01+TjX4GkEa/ivNf66XmnoAftdoTogjzAD1c3GDQm5BOOwMmVKpaJZ6UGa9rLwsg+HWsxykqCtiAaaDSOf8DV750iocrpaDb8GXZK39NAJPRFyjEkvsD2r7xj1XFJWG0B/5fc2rXmSz8QBy8htvMA== 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=m+JYv8eZdXqqD5dyS7crAdysl1rYMIZt4kbYe0Y2di4=; b=NaxwORWVFEIaS6OEwA+FwLJF266MvEr29qgrb9NPmELuEkcHullbl4XRxwemgf0SDZLAgi2k8zZzwZqvjcNcOFXa+hSj4a4lmL4m4uXSVyGo5p3H4RbNajyyDVFt0gdF6uZy9ND571nUDgxo2QXYSjMsefWcC+/Xej3chvgqS678gsse0vyZMRr6Hc3/Tz2tvX2cYIzlkiAxD6ssKgu3qwbExzmnMBn94Q28wm0zgJGM1xufmyRo3DvSCYi3dGcne3o3Yok7E16bQGOIeGDfU6wnjmhsIb5uaDgrH1RNopcUYWZibj2i58LYcQoJRvfwe1W8IldzR8u0lBkj2zyJ9Q== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DB9P250MB0403.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:327::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Thu, 4 Apr 2024 02:57:41 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Thu, 4 Apr 2024 02:57:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Apr 2024 04:57:31 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [6yIkNU99ewKSleLBWBZGGUrmSsQKwHeo] X-ClientProxiedBy: ZR2P278CA0029.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::12) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240404025732.3279159-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DB9P250MB0403:EE_ X-MS-Office365-Filtering-Correlation-Id: e1cf88e9-44cc-40a2-5da6-08dc5452fe60 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OjxSjJgkjWwol20p4nWfnsoMiRonqNEbM7QgDOlCTiyoYbnbFUoZUNOAinNqKPnYj3h2c4/Gya8ZWUqTR4yBt1A7q2FBMZ1KkYlxYZYgcrEzEYqtwDTiq0nF/jjOQ3Xa+nriRXapcGvjZtHH7IMOwZ8sLQu5XAOadf5ggmI/L9kRpToXaDu10FE1ZJIG7AoIUFnPHkCV/Y8GiQ8vbS3D/QgJ8cAktYZuWGUxgOzC1I8GXQBR9QTJ9hZdh3pTvxaeu9VYmp3cskDPRrMwFbUgRwQG/XrBO5eGMUV6HB69Zb0yHGgSDLC3tMr4paea5n7GGv0DtO9fGOA2xYHb9JnrCF0tAy/Rjl7oVXjwskBjGiOk7K8NK0gd6A/NJiYR011Ys3pqdhGsQdjXxsdEa1Ti6jQvHC0M4D1D3QyySIvCJS0p/4X0J4LKhZArm+rBAyJjFnj1IcIfz8eZiyEzBmrBLnVogKN/6j2IWuvzKRsz/pBnZh8UNpM6HQJwuSunlm6mwoWviNrPpZ5n3ZZDts0CiUSLyXE0539TMI7JBEEZn+3T7j8XKMvkfGyZv/7wRljQGJNPo3aBZB5ONRv/xgUgGSuk6FHQvSWVYszXVS66p04ewDrnfXADq5UBeuybRWwr X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1uQE+FJF/LZatFHIrXafzqSnkMDJDZ+K5Y7qmy0JIvVP6bfLP0BnzJSjISrlUvQP66sADFv31ggegPJFoGm7Ck92pT0nC3fOJKsHkL2nWyW/nNXkapTByIYcksAO1XovSN9JkaGENmjCgPppkqoUI9S8iHX0PpOlyj3xwO2N0zTg2nsRjenW6F5LiYjoMpCj7yb+4ALZqFnZRFJnA2OW7xdLQXGDISY5AcQfg9zJ512MXFQiybc+vlBnvPtE7NdcAeMp/4Pd4Qs7u5of61XuCSbjKmPeRsNeXaFUkbQsPRQwQmBMFdKwdVX7Wf9cZS6ajIQu6qCUtFxhevj+kE0bKn/+cH/xZofBaicMnVZLSYk7cYRgg2fHy/JuTSkKJaD4sB6K4hFnwjXijAXnOFs7oJj8ZAkIp+llbv7/2ye5QaM1MNBz/mYReYTs9NtAKkCKHhy1JQeYv/pwkZtgCQHvAXhfYlHCSSNkeTi93qczzGl+pyj4lC55bOjjP4Ry7zXlSvBgQWdoWXPAN3gL5recfAC2cHELC7tnvjKpGTO4Mb64FAMyfkz+QxqGpsy2I2VXm/gq3FuSrwHT+v4dx3S/m5z4g/dVKicK5woHKCDf2UmCTrDcMxrDrU1jlG62wqGVcxcEEuwvG05sS//JtMx31YPDGWWsehHGAOAt4kFjolw8Nx+182eGGvIXBi5g+JdopuC3Ho5ENAJJzmYIXSvKTwTiOfDlaZIKb4CwPY6EWnavHH4cLEgaZ2Xd9P43J0HZcWiwrMdAZJWG2mUzpkIB4KC45RqUYqoIPMjgft+mAd/TKGTscIVEk5CqBFVqEYjAgMk2C9EXjfylrA3/ZfnyDEZCJ3bc1ASQ5rpXw8Nyi6WGpJOcGZGRaYuaZ9LLmzzhLaFCG5LwxH8zytMa+sL+wwNWcOwTkptObAwPvEtHY5ztfUK16eHPMxE/RByJM0VfNNm17Lkp7VpI8z9n+RE0+6TkX75BbLmbzknkoARllb3x3ximX1VqqRp/q/Rk+Xtt0clCU2A8mi1mwDtw+GA1aCbwvPMMuUGXlZoJNbz4ovYeT4q1Xp2IdN5d753pznd5Mr3UHzIOvtpYA2a1fnVihnM1hrw/74KxSRR/bFmjuIc0l+legPVCgWo5FDqe9XCbw6Zsy/qN34KKlB0C6LiN+bE0h+ATl75aIjxdwsss0DqySztwWEYB3xQrulwimBOvDOxbW++cMjcMq7dM8fxVyNl2Jh6mt5Bo1IafRDNKujdc1pTNnzQXY35BEtzzucIuLqvBfv2onVVAAzd37O3nnQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e1cf88e9-44cc-40a2-5da6-08dc5452fe60 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Apr 2024 02:57:41.4061 (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: DB9P250MB0403 Subject: [FFmpeg-devel] [PATCH 1/2] swscale/ppc/swscale_ppc_template: Remove code not passing checkasm 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: li7suG15JdDw Signed-off-by: Andreas Rheinhardt --- libswscale/ppc/swscale_ppc_template.c | 62 ++++----------------------- 1 file changed, 9 insertions(+), 53 deletions(-) diff --git a/libswscale/ppc/swscale_ppc_template.c b/libswscale/ppc/swscale_ppc_template.c index 84641f3a8b..e9abd33cbf 100644 --- a/libswscale/ppc/swscale_ppc_template.c +++ b/libswscale/ppc/swscale_ppc_template.c @@ -104,16 +104,6 @@ static void FUNC(hScale_real)(SwsContext *c, int16_t *dst, int dstW, register int i; LOCAL_ALIGNED(16, int, tempo, [4]); - if (filterSize % 4) { - for (i = 0; i < dstW; i++) { - register int j; - register int srcPos = filterPos[i]; - register int val = 0; - for (j = 0; j < filterSize; j++) - val += ((int)src[srcPos + j]) * filter[filterSize * i + j]; - dst[i] = FFMIN(val >> 7, (1 << 15) - 1); - } - } else switch (filterSize) { case 4: for (i = 0; i < dstW; i++) { @@ -175,48 +165,14 @@ static void FUNC(hScale_real)(SwsContext *c, int16_t *dst, int dstW, break; default: - for (i = 0; i < dstW; i++) { - register int j, av_unused offset = i * 2 * filterSize; - register int srcPos = filterPos[i]; - - vector signed int val_s, val_v = (vector signed int)vzero; - vector signed short av_unused filter_v0R; - vector unsigned char av_unused permF, av_unused src_v0, av_unused permS; - FIRST_LOAD(filter_v0R, offset, filter, permF); - FIRST_LOAD(src_v0, srcPos, src, permS); - - for (j = 0; j < filterSize - 15; j += 16) { - vector unsigned char av_unused src_v1, src_vF; - vector signed short av_unused filter_v1R, av_unused filter_v2R, - filter_v0, filter_v1, src_vA, src_vB; - vector signed int val_acc; - LOAD_SRCV(srcPos, j, src, permS, src_v0, src_v1, src_vF); - src_vA = // vec_unpackh sign-extends... - (vector signed short)(VEC_MERGEH((vector unsigned char)vzero, src_vF)); - src_vB = // vec_unpackh sign-extends... - (vector signed short)(VEC_MERGEL((vector unsigned char)vzero, src_vF)); - GET_VFD(i, j, filter, filter_v0R, filter_v1R, permF, filter_v0, 0); - GET_VFD(i, j, filter, filter_v1R, filter_v2R, permF, filter_v1, 16); - - val_acc = vec_msums(src_vA, filter_v0, val_v); - val_v = vec_msums(src_vB, filter_v1, val_acc); - UPDATE_PTR(filter_v2R, filter_v0R, src_v1, src_v0); - } - - if (j < filterSize - 7) { - // loading src_v0 is useless, it's already done above - vector unsigned char av_unused src_v1, src_vF; - vector signed short src_v, av_unused filter_v1R, filter_v; - LOAD_SRCV8(srcPos, j, src, permS, src_v0, src_v1, src_vF); - src_v = // vec_unpackh sign-extends... - (vector signed short)(VEC_MERGEH((vector unsigned char)vzero, src_vF)); - GET_VFD(i, j, filter, filter_v0R, filter_v1R, permF, filter_v, 0); - val_v = vec_msums(src_v, filter_v, val_v); - } - val_s = vec_sums(val_v, vzero); - - VEC_ST(val_s, 0, tempo); - dst[i] = FFMIN(tempo[3] >> 7, (1 << 15) - 1); - } + for (register int i = 0; i < dstW; i++) { + register int j; + register int srcPos = filterPos[i]; + register int val = 0; + for (j = 0; j < filterSize; j++) + val += ((int)src[srcPos + j]) * filter[filterSize * i + j]; + dst[i] = FFMIN(val >> 7, (1 << 15) - 1); + } + break; } } From patchwork Thu Apr 4 02:58:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47788 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp63700pzd; Wed, 3 Apr 2024 19:58:28 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUfDUWrF0r5Fr5qtCZ0RdZhlrM15TRRyvbOYD6SDJwaCwDgWuxAQGglCvIyp9rCG4o1SaFZymcy2DnnYfvfZyEYGjy33+x6E76T2A== X-Google-Smtp-Source: AGHT+IFOI7x+AUI/LCZn+sPBP/KDJmkBQu0CNkClniVwwgCG6Bbl/DltuD+eStm+eiMDI8QEoSFj X-Received: by 2002:a50:bb06:0:b0:56e:1dda:5c2a with SMTP id y6-20020a50bb06000000b0056e1dda5c2amr298141ede.16.1712199508605; Wed, 03 Apr 2024 19:58:28 -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 r10-20020a50d68a000000b0056c26034b0asi7369413edi.143.2024.04.03.19.58.28; Wed, 03 Apr 2024 19:58:28 -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=DWu0ER3r; 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 C8EE768D13D; Thu, 4 Apr 2024 05:58:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2037.outbound.protection.outlook.com [40.92.91.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 57C8768D13A for ; Thu, 4 Apr 2024 05:58:18 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UUOqi+zdAb2R4L+TAZjYfRmqmFVdgVPchMHgexAGYr0TlxRUs4XhyVq7znUH+BK30SGyfV4BtWC0UYTvX/kmupa05d4MPUpnkZr3xeGLXRd/eZPXsFtWFj+frOCrJX7CDnsAV/VEVG7hFcv9hAIkeIrpo8/FfTqFAFNZI0tuwKGuzRPjHQX+20HIOW/Cj7uSIUhVclJ31Bd0Sl54ccCjWRBr9J6WyNlSzqOJMqvRcML6NlGPe/ykmkVQ4vOD8OF+ZZv4wumioKK4ng4xs/yNd1b8mvTPKSHMdfcv1LI1MyliHRtFGGb05tyJmftCP9jpUCy2Tawsjv5uvfHoZQpcFA== 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=gFNYfLlmVkQ2dkVVVnnHsnJ7obGHamFAEZ2HBsS9gjg=; b=m/AMkEkkNaC+w2DApKbQh378/4hJvtyUsHft94299Z698zjqHMVCZB8uyp2vxUx35U+Ty0flCaCTCzohQ+euntdgKsnVCm85TlltO3xcbrRcmqzy3kkJtbDJs4scW4Q01USW6kfTAR8cUxFbGJdX2cecXN6l3vmU3xsF5E2W00ZHGmsqzBn+qAuE//L8nFe8SrsNXEE5oMDy5616atA2S3uPLZgtAMe3QV+/9PHdJxfOkcs9Ym/vqfU4R1ucDRtzhsiPi5JWciYGBQO+brPABOL1GCrpQIyc6WglJd2NTxMKDeia2uMP4Sw8dfZta24azvLgSoQuyh0NGBuE/cL/ng== 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=gFNYfLlmVkQ2dkVVVnnHsnJ7obGHamFAEZ2HBsS9gjg=; b=DWu0ER3rFK7iq72BZdMF+bpkVssRZfXQu1jgB9CmXS8e68bFbh5genqedsU8bghxkVZuTQaW4p5zHZhrEoj2ak8Pz01i6OEPAKKA91/197GBl/mj6bHNa1ZtBy3D00hxancLxpJZOAHQK9U2r8O0N9S9TSno4gy4/Sh9s8Xx2CkJpOtrBtGkBrjTXUQRPAijGHrSVDL82KXERDU7SMP9tvw8mABh3BHKvdV568jdWvxIgYbmpiZup571QeCJoLIW4LQpGmC1y4A4QZ/ikYYqUUg5010i1vOGK3Nqq10WtjTolklvwUdq07OIQrs/I+6/5i0OaUaaFDKD+wc7dGAV2A== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DB9P250MB0403.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:327::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Thu, 4 Apr 2024 02:58:16 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Thu, 4 Apr 2024 02:58:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Apr 2024 04:58:08 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [Aq3I9KuZO6qKe/TLYP4i88jouOmAW4I6tQFEs0I3tx8=] X-ClientProxiedBy: ZR2P278CA0034.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:47::15) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240404025808.3279353-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DB9P250MB0403:EE_ X-MS-Office365-Filtering-Correlation-Id: 624049c4-bbe7-4890-3ea5-08dc54531321 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mMrxmsOeoOcqjl89a8WQKtbuivJcW5lm7MlKgLtgXqyytSgx7gyQoBkbKED9jUCsbbrJHXPAV9W879uW7otCpcZYZlzD3eUsahGOPWAUhk9jgyFoRdhcySZ4GPm0LVEvfH+PTN+BPcZF2j3zUgyqCDw3Bxb4P6xuL85AljKDFC+UBHqhe2tu20LL24DUPgQQRLGPKFIPLhTTtjgm/uLzTQyaw2ItCOAziZkCAiXNGeQ2KNY9fd5XABi31RWRXyg1vMoY0R5Va59bcnY28Leb7QwBfjUusiL/yCFZ48tEdUPALtztfiKW0jo1iSUKnj0DyYA6LJ+u9gew7DS9+WEf6nND3rBGDPP+LD2Vm1PAsStZEP4lxUB9+p+Iyfn/e/StQamtkjolApChd1zkAvHOpJumXIe9Szjf5HqACYEMn2dZUkY5ZuinxkNy/lXbbYvHiv/lmx7jkDeSE5RakO+o8vbfn4U1q57g05NxnMzLH4vPerVl4ztykxRR5Cu/hRP5WVvbeAv/S3KHvJCzgqlKEe6+ac357xnsQohVr3agIdJAdFdqYs7vXHWCg7RUn1qWWh+JgzJVliZnKZsZ3lXV4RQD3/iU+HqUMJ16I65sAZ1SLeMUVTroX1yYnzrmxtn/ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: P3gw/sT1IslzXM1BvyTfCokSte4lLaxVyGSnV/qHv5iLmax7iRk4GQBUpvEjfNHfpUTgBUxx8jP5xzhLbXnFtlI1fLpjK76BnH6krEqYCzwwu/5PJN8h8bHqAaPuHFvnNOnJ2YFQ6YvnOpfsfzgZonTavugF0frKPmN5q2dc+DvrORTJOwp5ms/tFsq0p+vGHLEZLnKwJvRNGbKqhoeOPGYXKkfp/V0o88+uZjY7tIQVBcgLLYkKQRJYwWWmWrK8OVu1kkD9Iuhz/Fmu5NBAyAZRbLlsp4M3PUgZUzPJT+562C2X84SXusFN7qa3hww0NlDl9LwP7yip6adVuvXDWL8ZWfUoqIthZhgj5UlyVjiEIrluLj4dLYguBwOFqXtlfMvcdVD49plbHlAk1bJ9TPJCgRK4Xnrer8jOWgjNwlvz/+mVouLMv0+M3k+Zg/WhY2tvAL5BDHBsx4bR3a0asg5q0PVZNcEJzw/Vu9aMONzoZpmSpIQSRu8Z7I9M/73ibgyITsncyYRlTehOtcZDQcDW4aU0v3Y79MF2aZHbIS+FIQW+y4jnY7YyiqAwNyWkFeMN5gL85ttbLRfmb/WVnwwDP+bahpq9VkLDOnG4WelkYyDOlCKkLGYSdlMBKqtOJ4gvNx1QaW3HDPXJGA+hcwPsubmNm00y65DRHb6q7slW3PUCiP8sP2Sy04R4MHQAikwbTWiAKRw/6YCLI3vICZuK8ICp/t3CaecnoLEnJb1nP4wAR1U0EvHaBg2iJoXbFO6vmtz2oHm3jm7G/RHZYi/yLVZP9Wp9C49r2PH7CxPrXe3MB3okjc3MLR9KaBxXRwsZyfZ5SZ/J9X4D7WETgWzxluTe3Hvl7tbB4GkQTTR49UHRcY7RyzAGNdDTp7xDuKczr4SKIv2DJ3K8GoUK/kCHfb3CZd2K4m66L8yrY/eIyX9vHp5tqj7JMRxDU4ql0X1pIZYn+rjl1Nl3vGg5btwVigt3YLcLk0Uo7EBmzNTZpARRo2QVROHjBQAJqkfeaNReushfhmB7tAugu23cubKTLxeBNwFfRUSDKRgT9+n3E24niirvJ/eXZZWe6YsBqEOXWqIIHAYYXLHulgQhmUxQaEzpeFl7xGsX9n14VibAp7aga9c+qiLwBDzTNkHE+E599XDYwd0217Zn8nVS0B8dwRGQcZUvxaUwXCCgW/v9U3pceIa46Ukzvxq3BYH8OYmsfiq2/i9sLQh+v5dVxkFYa/9ckZP8cFOJXnErS1c4wDtR90Vrn+PlvicLEITHYOyZRCOr+bG2JvpIhNTh8g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 624049c4-bbe7-4890-3ea5-08dc54531321 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Apr 2024 02:58:16.1587 (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: DB9P250MB0403 Subject: [FFmpeg-devel] [PATCH 2/2] swscale/ppc/swscale_ppc_template: Reindent after the previous commit 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: WPYh7YmmpUrI Signed-off-by: Andreas Rheinhardt --- libswscale/ppc/swscale_ppc_template.c | 107 +++++++++++++------------- 1 file changed, 53 insertions(+), 54 deletions(-) diff --git a/libswscale/ppc/swscale_ppc_template.c b/libswscale/ppc/swscale_ppc_template.c index e9abd33cbf..3c2addd4a4 100644 --- a/libswscale/ppc/swscale_ppc_template.c +++ b/libswscale/ppc/swscale_ppc_template.c @@ -101,70 +101,69 @@ static void FUNC(hScale_real)(SwsContext *c, int16_t *dst, int dstW, const uint8_t *src, const int16_t *filter, const int32_t *filterPos, int filterSize) { - register int i; LOCAL_ALIGNED(16, int, tempo, [4]); - switch (filterSize) { - case 4: - for (i = 0; i < dstW; i++) { - register int srcPos = filterPos[i]; - - vector unsigned char src_vF = unaligned_load(srcPos, src); - vector signed short src_v, filter_v; - vector signed int val_vEven, val_s; - src_v = // vec_unpackh sign-extends... - (vector signed short)(VEC_MERGEH((vector unsigned char)vzero, src_vF)); - // now put our elements in the even slots - src_v = vec_mergeh(src_v, (vector signed short)vzero); - GET_VF4(i, filter_v, filter); - val_vEven = vec_mule(src_v, filter_v); - val_s = vec_sums(val_vEven, vzero); - vec_st(val_s, 0, tempo); - dst[i] = FFMIN(tempo[3] >> 7, (1 << 15) - 1); - } + switch (filterSize) { + case 4: + for (register int i = 0; i < dstW; i++) { + register int srcPos = filterPos[i]; + + vector unsigned char src_vF = unaligned_load(srcPos, src); + vector signed short src_v, filter_v; + vector signed int val_vEven, val_s; + src_v = // vec_unpackh sign-extends... + (vector signed short)(VEC_MERGEH((vector unsigned char)vzero, src_vF)); + // now put our elements in the even slots + src_v = vec_mergeh(src_v, (vector signed short)vzero); + GET_VF4(i, filter_v, filter); + val_vEven = vec_mule(src_v, filter_v); + val_s = vec_sums(val_vEven, vzero); + vec_st(val_s, 0, tempo); + dst[i] = FFMIN(tempo[3] >> 7, (1 << 15) - 1); + } break; - case 8: - for (i = 0; i < dstW; i++) { - register int srcPos = filterPos[i]; - vector unsigned char src_vF, av_unused src_v0, av_unused src_v1; - vector unsigned char av_unused permS; - vector signed short src_v, filter_v; - vector signed int val_v, val_s; - FIRST_LOAD(src_v0, srcPos, src, permS); - LOAD_SRCV8(srcPos, 0, src, permS, src_v0, src_v1, src_vF); - src_v = // vec_unpackh sign-extends... - (vector signed short)(VEC_MERGEH((vector unsigned char)vzero, src_vF)); - filter_v = vec_ld(i << 4, filter); - val_v = vec_msums(src_v, filter_v, (vector signed int)vzero); - val_s = vec_sums(val_v, vzero); - vec_st(val_s, 0, tempo); - dst[i] = FFMIN(tempo[3] >> 7, (1 << 15) - 1); - } + case 8: + for (register int i = 0; i < dstW; i++) { + register int srcPos = filterPos[i]; + vector unsigned char src_vF, av_unused src_v0, av_unused src_v1; + vector unsigned char av_unused permS; + vector signed short src_v, filter_v; + vector signed int val_v, val_s; + FIRST_LOAD(src_v0, srcPos, src, permS); + LOAD_SRCV8(srcPos, 0, src, permS, src_v0, src_v1, src_vF); + src_v = // vec_unpackh sign-extends... + (vector signed short)(VEC_MERGEH((vector unsigned char)vzero, src_vF)); + filter_v = vec_ld(i << 4, filter); + val_v = vec_msums(src_v, filter_v, (vector signed int)vzero); + val_s = vec_sums(val_v, vzero); + vec_st(val_s, 0, tempo); + dst[i] = FFMIN(tempo[3] >> 7, (1 << 15) - 1); + } break; - case 16: - for (i = 0; i < dstW; i++) { - register int srcPos = filterPos[i]; + case 16: + for (register int i = 0; i < dstW; i++) { + register int srcPos = filterPos[i]; - vector unsigned char src_vF = unaligned_load(srcPos, src); - vector signed short src_vA = // vec_unpackh sign-extends... - (vector signed short)(VEC_MERGEH((vector unsigned char)vzero, src_vF)); - vector signed short src_vB = // vec_unpackh sign-extends... - (vector signed short)(VEC_MERGEL((vector unsigned char)vzero, src_vF)); - vector signed short filter_v0 = vec_ld(i << 5, filter); - vector signed short filter_v1 = vec_ld((i << 5) + 16, filter); + vector unsigned char src_vF = unaligned_load(srcPos, src); + vector signed short src_vA = // vec_unpackh sign-extends... + (vector signed short)(VEC_MERGEH((vector unsigned char)vzero, src_vF)); + vector signed short src_vB = // vec_unpackh sign-extends... + (vector signed short)(VEC_MERGEL((vector unsigned char)vzero, src_vF)); + vector signed short filter_v0 = vec_ld(i << 5, filter); + vector signed short filter_v1 = vec_ld((i << 5) + 16, filter); - vector signed int val_acc = vec_msums(src_vA, filter_v0, (vector signed int)vzero); - vector signed int val_v = vec_msums(src_vB, filter_v1, val_acc); + vector signed int val_acc = vec_msums(src_vA, filter_v0, (vector signed int)vzero); + vector signed int val_v = vec_msums(src_vB, filter_v1, val_acc); - vector signed int val_s = vec_sums(val_v, vzero); + vector signed int val_s = vec_sums(val_v, vzero); - VEC_ST(val_s, 0, tempo); - dst[i] = FFMIN(tempo[3] >> 7, (1 << 15) - 1); - } + VEC_ST(val_s, 0, tempo); + dst[i] = FFMIN(tempo[3] >> 7, (1 << 15) - 1); + } break; - default: + default: for (register int i = 0; i < dstW; i++) { register int j; register int srcPos = filterPos[i]; @@ -174,5 +173,5 @@ static void FUNC(hScale_real)(SwsContext *c, int16_t *dst, int dstW, dst[i] = FFMIN(val >> 7, (1 << 15) - 1); } break; - } + } }