From patchwork Tue Aug 16 12:20:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hubert Mazur X-Patchwork-Id: 37309 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp1829390pzi; Tue, 16 Aug 2022 05:21:30 -0700 (PDT) X-Google-Smtp-Source: AA6agR7XI/f4eZ8U3NNzrzfd3fXCqXb1i+pXGP3TSERQiw5oNZFzwyiLTIvCclWtZ8JVh+uZOuNV X-Received: by 2002:a17:907:2da6:b0:730:8b30:e517 with SMTP id gt38-20020a1709072da600b007308b30e517mr13443277ejc.291.1660652490252; Tue, 16 Aug 2022 05:21:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660652490; cv=none; d=google.com; s=arc-20160816; b=ERTrj3t7MLrogbD8GazK/VGjDObqySYTn5Xz9FgpAUwgwAMgGj+PaReB71I2TsbhZp 6ckYW92BcAXJ2sRABYMcAPa5WtxG+CPVwH/b8/PQMAOX8NGTAzSZXXOEvesXcnCOiV2y QifYhCyIacu8o988Ylklv1en3C189uoCEPiBkYlNjIglgz/5J5vYH2naHsloIe34JUdy cero9zs7IK7IOpck5ImEbDT9OWBRwXm6oxMh+Y6S9T4V+ivAFhS0BxYI42hyFHpmmKSC qbSOQk7U2WfLdQtE9Wq3jZu+KF2O0XvER16IRb/tehjd8eeYVGAenehXjzjxt+IKfUJf gdhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=tE1jCLSFpGvObBSRszYoFxQQot+BLz/fkRt9fg1ue1M=; b=L483ZNpkjADP0PvJ/Wp6JIS0Qde2QExUTcOkFVTvm4HU4Rrhs9KGweB9HNfYsHV12I vncK42ocx0ePjGAVV2GJayY6ucwbauERfd/WJd2wZbSvYWfSfAXSOp122dJ/PLuGCre8 4/H0xNeFR0xroV6ZLHbb39wDqX5SJuvmcMoDXt0pjVdXULgHIPd9qyiRVAKT8m+1Nl88 5PcsQmrWX46guTWl0oJwdg7xDEJfQUBhU6FYovKSTCtNS7Q3DkJfdTtleOHquD8ElHSV dEshlE1lw0DJaVcJjeCQa2pv7TlXBBWUe1uAnb8tynZ6A+Bfntefr8Uj6eoTGblFU5Rn iXag== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@semihalf.com header.s=google header.b=mU4MkueU; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=semihalf.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f19-20020a170906139300b007303646197csi7880194ejc.596.2022.08.16.05.21.29; Tue, 16 Aug 2022 05:21:30 -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=@semihalf.com header.s=google header.b=mU4MkueU; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=semihalf.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3F2D668B913; Tue, 16 Aug 2022 15:21:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0823F68B900 for ; Tue, 16 Aug 2022 15:21:01 +0300 (EEST) Received: by mail-lf1-f54.google.com with SMTP id z25so14673930lfr.2 for ; Tue, 16 Aug 2022 05:21:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=Jyf3BnAxmt3GS20+5LX75T5kI6P/GR6SZahTzjlpTdU=; b=mU4MkueU1t7XUX5UrBdoGeU1sWT9rYlJQdX5rEyxvyJYwGdnF9N4G93pHeKP1mjymx XYe0QC7nR0Uzzr98BP/hHVCgrDa4h3pcbFeVOwahnbhCTS8y6HU3BAoPMk5Yhl5LRQLI yz4sm3H9k96KA1IIEWMbZfretNkWObZRkC25UGE77Nijgg2bgGukoPgJsljMuF/mm4MV Ae6G+7pL+EU2mA/JM7cuezPYQZjyCfaX6Vsaus3iEHmrmIXj/sb7zM7YouuQBGsXIIqQ 1xM4m9hyTFghtdc+dywDCUZ9WzVj6kCDhOtshawEjsaBpg5uCuHjt/QZfbqKPk1gFVEP GUnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=Jyf3BnAxmt3GS20+5LX75T5kI6P/GR6SZahTzjlpTdU=; b=dY7Xcp+Trw8TStjOgB360b4yB19MwJzIVL0vUp2iz2ZbjpAR4E+Ej8Mi67JJbVGaTy 1A9nVbBDTcWa6jiwsJ3UPG+hC8fG8YPnzSTLkpVrXMPaZNrlyVFj1DFjTyYHuK9RU5LD n6O4Klkt/W5ekrv6GpwtxvSGZMvX1volyOhiNGwAJ60/O1XZLcgRzGxkDhr/ifzP/W49 DePYsGxAnROZLmb//G/NNLheudg96T6u1NeSR8B8QH3j4C5FQc2+aa6Dth8e5Tj2fXQY /h8jadUc39Ci/MmfZK0OReuKFfqNVXrJFEZE2pdQglu2o2Yc/YuVSQGcEn7H9FrV6MWH hyiA== X-Gm-Message-State: ACgBeo0vfPP44WbU0SUP+TEbpcZAGaiO0NQkdcZ9sLVMJ0vNkn8fYZio LyfiS6I+9y5vpdRWz8LfVNLPhhR9/2e1mK7n X-Received: by 2002:a05:6512:3c82:b0:48b:1844:2840 with SMTP id h2-20020a0565123c8200b0048b18442840mr6925897lfv.406.1660652460028; Tue, 16 Aug 2022 05:21:00 -0700 (PDT) Received: from hum-HP-ProBook-440-G7.office.semihalf.net ([83.142.187.84]) by smtp.gmail.com with ESMTPSA id p20-20020ac24ed4000000b0048b998be041sm1365707lfr.309.2022.08.16.05.20.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Aug 2022 05:20:59 -0700 (PDT) From: Hubert Mazur To: ffmpeg-devel@ffmpeg.org Date: Tue, 16 Aug 2022 14:20:14 +0200 Message-Id: <20220816122016.64929-4-hum@semihalf.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220816122016.64929-1-hum@semihalf.com> References: <20220816122016.64929-1-hum@semihalf.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/5] lavc/aarch64: Add neon implementation for pix_abs16_y2 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: gjb@semihalf.com, upstream@semihalf.com, jswinney@amazon.com, Hubert Mazur , martin@martin.st, mw@semihalf.com, spop@amazon.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: rSYSca0yNsOM Provide optimized implementation of pix_abs16_y2 function for arm64. Performance comparison tests are shown below. pix_abs_0_2_c: 317.2 pix_abs_0_2_neon: 37.5 Benchmarks and tests run with checkasm tool on AWS Graviton 3. Signed-off-by: Hubert Mazur --- libavcodec/aarch64/me_cmp_init_aarch64.c | 3 + libavcodec/aarch64/me_cmp_neon.S | 75 ++++++++++++++++++++++++ 2 files changed, 78 insertions(+) diff --git a/libavcodec/aarch64/me_cmp_init_aarch64.c b/libavcodec/aarch64/me_cmp_init_aarch64.c index 955592625a..1c36d3d7cb 100644 --- a/libavcodec/aarch64/me_cmp_init_aarch64.c +++ b/libavcodec/aarch64/me_cmp_init_aarch64.c @@ -29,6 +29,8 @@ int ff_pix_abs16_xy2_neon(MpegEncContext *s, const uint8_t *blk1, const uint8_t ptrdiff_t stride, int h); int ff_pix_abs16_x2_neon(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, ptrdiff_t stride, int h); +int ff_pix_abs16_y2_neon(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, + ptrdiff_t stride, int h); int sse16_neon(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, ptrdiff_t stride, int h); @@ -42,6 +44,7 @@ av_cold void ff_me_cmp_init_aarch64(MECmpContext *c, AVCodecContext *avctx) if (have_neon(cpu_flags)) { c->pix_abs[0][0] = ff_pix_abs16_neon; c->pix_abs[0][1] = ff_pix_abs16_x2_neon; + c->pix_abs[0][2] = ff_pix_abs16_y2_neon; c->pix_abs[0][3] = ff_pix_abs16_xy2_neon; c->sad[0] = ff_pix_abs16_neon; diff --git a/libavcodec/aarch64/me_cmp_neon.S b/libavcodec/aarch64/me_cmp_neon.S index 367924b3c2..0ec9c0465b 100644 --- a/libavcodec/aarch64/me_cmp_neon.S +++ b/libavcodec/aarch64/me_cmp_neon.S @@ -404,3 +404,78 @@ function sse4_neon, export=1 ret endfunc + +function ff_pix_abs16_y2_neon, export=1 + // x0 unused + // x1 uint8_t *pix1 + // x2 uint8_t *pix2 + // x3 ptrdiff_t stride + // x4 int h + + // initialize buffers + movi v29.8h, #0 // clear the accumulator + movi v28.8h, #0 // clear the accumulator + movi d18, #0 + add x5, x2, x3 // pix2 + stride + cmp w4, #4 + b.lt 2f + +// make 4 iterations at once +1: + + // abs(pix1[0], avg2(pix2[0], pix2[0 + stride])) + // avg2(a, b) = (((a) + (b) + 1) >> 1) + // abs(x) = (x < 0 ? (-x) : (x)) + + ld1 {v1.16b}, [x2], x3 // Load pix2 for first iteration + ld1 {v2.16b}, [x5], x3 // Load pix3 for first iteration + urhadd v30.16b, v1.16b, v2.16b // Rounding halving add, first iteration + ld1 {v0.16b}, [x1], x3 // Load pix1 for first iteration + uabal v29.8h, v0.8b, v30.8b // Absolute difference of lower half, first iteration + ld1 {v4.16b}, [x2], x3 // Load pix2 for second iteration + uabal2 v28.8h, v0.16b, v30.16b // Absolute difference of upper half, first iteration + ld1 {v5.16b}, [x5], x3 // Load pix3 for second iteartion + urhadd v27.16b, v4.16b, v5.16b // Rounding halving add, second iteration + ld1 {v3.16b}, [x1], x3 // Load pix1 for second iteration + uabal v29.8h, v3.8b, v27.8b // Absolute difference of lower half for second iteration + ld1 {v7.16b}, [x2], x3 // Load pix2 for third iteration + ld1 {v20.16b}, [x5], x3 // Load pix3 for third iteration + uabal2 v28.8h, v3.16b, v27.16b // Absolute difference of upper half for second iteration + ld1 {v6.16b}, [x1], x3 // Load pix1 for third iteration + urhadd v26.16b, v7.16b, v20.16b // Rounding halving add, third iteration + uabal v29.8h, v6.8b, v26.8b // Absolute difference of lower half for third iteration + ld1 {v22.16b}, [x2], x3 // Load pix2 for fourth iteration + uabal2 v28.8h, v6.16b, v26.16b // Absolute difference of upper half for third iteration + ld1 {v23.16b}, [x5], x3 // Load pix3 for fourth iteration + sub w4, w4, #4 // h-= 4 + urhadd v25.16b, v22.16b, v23.16b // Rounding halving add + ld1 {v21.16b}, [x1], x3 // Load pix1 for fourth iteration + cmp w4, #4 + uabal v29.8h, v21.8b, v25.8b // Absolute difference of lower half for fourth iteration + uabal2 v28.8h, v21.16b, v25.16b // Absolute difference of upper half for fourth iteration + + b.ge 1b + cbz w4, 3f + +// iterate by one +2: + + ld1 {v1.16b}, [x2], x3 // Load pix2 + ld1 {v2.16b}, [x5], x3 // Load pix3 + subs w4, w4, #1 + urhadd v30.16b, v1.16b, v2.16b // Rounding halving add + ld1 {v0.16b}, [x1], x3 // Load pix1 + uabal v29.8h, v30.8b, v0.8b + uabal2 v28.8h, v30.16b, v0.16b + + b.ne 2b + +3: + add v29.8h, v29.8h, v28.8h // Add vectors together + uaddlv s16, v29.8h // Add up vector values + add d18, d18, d16 + + fmov w0, s18 + + ret +endfunc