From patchwork Thu Sep 8 09:25:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hubert Mazur X-Patchwork-Id: 37759 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp164417pzh; Thu, 8 Sep 2022 02:26:33 -0700 (PDT) X-Google-Smtp-Source: AA6agR53iU+/fMpGzKRbWvjHLlD4vPx5/3VOYNn1pBdhVjWa2VldijiJL1L5c2xLIl0drkmOHXf1 X-Received: by 2002:a05:6402:3552:b0:448:e395:dc06 with SMTP id f18-20020a056402355200b00448e395dc06mr6369603edd.136.1662629193273; Thu, 08 Sep 2022 02:26:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662629193; cv=none; d=google.com; s=arc-20160816; b=yVKrTDk142wg5QcHFD6/mcwLj2OBhxqmlb39bxQx9zFvn9NWnpMy7zFWaL6qqGnBLd zLk3LOIWRmz4Ke+pRQaNUvxKpLkFrNLtxbo+IBMuj5aOjotRp57QSuIVCS9bh1rDmmc2 bUw4/2VR4Jw2s4NrSV2hikv7TPPD7HiFh818rhmK7rzo2SCSUSmvH+0UCrU2ivXTvPlE b5a/X68g5XAfGrgNsPuQ718NRe4vsTv2GGEfuo3y3eKK2O/VSWMIqHP7CPKk2ppsKgLw yYPUtozRI7fmO4FsFEDtRpPhnMhqyWKYPBWIGakSL4ATZTpni96YrBJek8FcwsWfJfmp 46AQ== 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=n8B2MRNdk9OCOF/KulXoVJ7BxwptCNHqsb70uktmF3o=; b=o0Ee+sIV4hVz2m/3pQlhC60I45ItUIm8Faly6VUDWQwqw8gy3JwxNeJo9eziQUe4Xj MkRsOsziQPhsj+taYX3Anmif5Tg+Oeq+epLxne3dwcZLxl2l+ZdrIjPWGbAe8p+DiVj9 p+UFhruX11rWCsYUCBNl6iKSBfndsGWChaxveqLbO8bn9xj4yyn0uiPx39GLRe1fFOXf aOu9oqIkxRWaDtVUL8QrDFbJVuluB+20bQJY7Aff34oKz21fBwYo9erUDewK6c3NdJMg lAk6uLcwzRWWRncHNe8pme0GtCn0V0bHLmjlCxswKq6Ldu73lEprGl6rWRtXZ0NHMV9t 5Zyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@semihalf.com header.s=google header.b=WJkwJO3i; 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 jg32-20020a170907972000b007420947aa83si1603887ejc.193.2022.09.08.02.26.32; Thu, 08 Sep 2022 02:26:33 -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=WJkwJO3i; 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 A777568BAA0; Thu, 8 Sep 2022 12:25:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B667D68BA91 for ; Thu, 8 Sep 2022 12:25:44 +0300 (EEST) Received: by mail-lj1-f181.google.com with SMTP id y18so4400171ljh.12 for ; Thu, 08 Sep 2022 02:25:44 -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:subject:date; bh=dIPGEg4kjgmxvuPmr4mYJjLBvOEFwogUCzIVnJMuyfs=; b=WJkwJO3ib6KDhLIQ875T/mqmxBb8DCfqr0+CBezq8FAe+4lfogqfyvB9n5MOWUMz1u UsgjpehD49YHyiUuLHdr2tvPYgR9x8K5ufpOJFqqMXBiA9Ov2Fb3hSCQ3+56thRJuIav rkRfyyKAkJ6JaX9WKpMaiKT8x0vMKahcIVg41oz3/PAzeHVOWN7ywxWRWYXjOzYLbRjp SMhtjNQKw+OqTA63xHSXwmaG0i6NxB4g+Rnnd5RA+fDCADZ36YV/CIVMJBsE583oBs2d sTv3jmXMF66+cM3i5rMYve1Ehup6rPQAjGFLriRfK25/wxpXfpuawId0oFZ7D2j1uj/L 19cQ== 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 :subject:date; bh=dIPGEg4kjgmxvuPmr4mYJjLBvOEFwogUCzIVnJMuyfs=; b=bODsffuOqVqPjOZkWaFgWHUn2RFOKsmx7HuCQo+k2FhjDuElSCEcIOJOXn0hhQMiQ5 KnSGLK71V6xuGRxoYjTzKQ0rWGjn/GkY1KxhRyL60uIQu04qimGKsPJXe6NyeIe4/qES xrBY1P3/Spk3McbIX9vyU3SIE1w/WCzUF/6MhHsVtFKeBwL0QYOQz8clMDZeWlYf1PV6 4awKkbJxF+BvjyjWh4cu500+v2rfVrVwpMCA/oJx6J3d9BfORd8HneKqSNNqy2NR9TEI fWgK8IHh6FJgHJNHAWMU7yhz8C6JNUNLdmzYu8Asg7v8NsyYjruPtEwlhRIj70QF4MD6 ZU/w== X-Gm-Message-State: ACgBeo3+WC8l4H2vaUvS9iUYh+OFyV36ci6zunASyFEE6Crm0VAFtdz9 M4H/zVjKxzywQKq0QNgHILUTRu4ChFGxsQ== X-Received: by 2002:a2e:a812:0:b0:261:8f2d:9530 with SMTP id l18-20020a2ea812000000b002618f2d9530mr2049734ljq.251.1662629143710; Thu, 08 Sep 2022 02:25:43 -0700 (PDT) Received: from hum-HP-ProBook-440-G7.semihalf.net (apn-46-169-39-115.dynamic.gprs.plus.pl. [46.169.39.115]) by smtp.gmail.com with ESMTPSA id k20-20020a2ea274000000b00261e8e4e381sm3103998ljm.2.2022.09.08.02.25.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Sep 2022 02:25:43 -0700 (PDT) From: Hubert Mazur To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Sep 2022 11:25:07 +0200 Message-Id: <20220908092507.63319-6-hum@semihalf.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220908092507.63319-1-hum@semihalf.com> References: <20220908092507.63319-1-hum@semihalf.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] lavc/aarch64: Provide neon implementation of nsse16 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: RfkiZSWilXdW Add vectorized implementation of nsse16 function. Performance comparison tests are shown below. - nsse_0_c: 682.2 - nsse_0_neon: 116.5 Benchmarks and tests run with checkasm tool on AWS Graviton 3. Co-authored-by: Martin Storsjö Signed-off-by: Hubert Mazur --- libavcodec/aarch64/me_cmp_init_aarch64.c | 15 +++ libavcodec/aarch64/me_cmp_neon.S | 122 +++++++++++++++++++++++ 2 files changed, 137 insertions(+) diff --git a/libavcodec/aarch64/me_cmp_init_aarch64.c b/libavcodec/aarch64/me_cmp_init_aarch64.c index 8c295d5457..ade3e9a4c1 100644 --- a/libavcodec/aarch64/me_cmp_init_aarch64.c +++ b/libavcodec/aarch64/me_cmp_init_aarch64.c @@ -49,6 +49,10 @@ int vsse16_neon(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride, int h); int vsse_intra16_neon(MpegEncContext *c, const uint8_t *s, const uint8_t *dummy, ptrdiff_t stride, int h); +int nsse16_neon(int multiplier, const uint8_t *s, const uint8_t *s2, + ptrdiff_t stride, int h); +int nsse16_neon_wrapper(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, + ptrdiff_t stride, int h); av_cold void ff_me_cmp_init_aarch64(MECmpContext *c, AVCodecContext *avctx) { @@ -72,5 +76,16 @@ av_cold void ff_me_cmp_init_aarch64(MECmpContext *c, AVCodecContext *avctx) c->vsse[0] = vsse16_neon; c->vsse[4] = vsse_intra16_neon; + + c->nsse[0] = nsse16_neon_wrapper; } } + +int nsse16_neon_wrapper(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, + ptrdiff_t stride, int h) +{ + if (c) + return nsse16_neon(c->avctx->nsse_weight, s1, s2, stride, h); + else + return nsse16_neon(8, s1, s2, stride, h); +} diff --git a/libavcodec/aarch64/me_cmp_neon.S b/libavcodec/aarch64/me_cmp_neon.S index cf2b8da425..f8998749a5 100644 --- a/libavcodec/aarch64/me_cmp_neon.S +++ b/libavcodec/aarch64/me_cmp_neon.S @@ -847,3 +847,125 @@ function vsse_intra16_neon, export=1 ret endfunc + +function nsse16_neon, export=1 + // x0 multiplier + // x1 uint8_t *pix1 + // x2 uint8_t *pix2 + // x3 ptrdiff_t stride + // w4 int h + + str x0, [sp, #-0x40]! + stp x1, x2, [sp, #0x10] + stp x3, x4, [sp, #0x20] + str x30, [sp, #0x30] + bl X(sse16_neon) + ldr x30, [sp, #0x30] + mov w9, w0 // here we store score1 + ldr x5, [sp] + ldp x1, x2, [sp, #0x10] + ldp x3, x4, [sp, #0x20] + add sp, sp, #0x40 + + movi v16.8h, #0 + movi v17.8h, #0 + movi v18.8h, #0 + movi v19.8h, #0 + + ld1 {v0.16b}, [x1], x3 + subs w4, w4, #1 // we need to make h-1 iterations + ld1 {v2.16b}, [x2], x3 + ext v1.16b, v0.16b, v0.16b, #1 // x1 + 1 + cmp w4, #2 + ext v3.16b, v2.16b, v2.16b, #1 // x2 + 1 + + b.lt 2f + +// make 2 iterations at once +1: + ld1 {v4.16b}, [x1], x3 + ld1 {v6.16b}, [x2], x3 + ld1 {v20.16b}, [x1], x3 + ext v5.16b, v4.16b, v4.16b, #1 // x1 + stride + 1 + usubl v31.8h, v0.8b, v4.8b + usubl2 v30.8h, v0.16b, v4.16b + ld1 {v22.16b}, [x2], x3 + usubl v29.8h, v1.8b, v5.8b + usubl2 v28.8h, v1.16b, v5.16b + ext v7.16b, v6.16b, v6.16b, #1 // x2 + stride + 1 + saba v16.8h, v31.8h, v29.8h + ext v21.16b, v20.16b, v20.16b, #1 + saba v17.8h, v30.8h, v28.8h + usubl v27.8h, v2.8b, v6.8b + usubl2 v26.8h, v2.16b, v6.16b + ext v23.16b, v22.16b, v22.16b, #1 + usubl v25.8h, v3.8b, v7.8b + usubl2 v24.8h, v3.16b, v7.16b + saba v18.8h, v27.8h, v25.8h + saba v19.8h, v26.8h, v24.8h + + usubl v31.8h, v4.8b, v20.8b + usubl2 v30.8h, v4.16b, v20.16b + usubl v29.8h, v5.8b, v21.8b + usubl2 v28.8h, v5.16b, v21.16b + saba v16.8h, v31.8h, v29.8h + saba v17.8h, v30.8h, v28.8h + usubl v27.8h, v6.8b, v22.8b + usubl2 v26.8h, v6.16b, v22.16b + usubl v25.8h, v7.8b, v23.8b + usubl2 v24.8h, v7.16b, v23.16b + saba v18.8h, v27.8h, v25.8h + saba v19.8h, v26.8h, v24.8h + sub w4, w4, #2 + + mov v0.16b, v20.16b + mov v1.16b, v21.16b + cmp w4, #2 + mov v2.16b, v22.16b + mov v3.16b, v23.16b + + b.ge 1b + cbz w4, 3f + +// iterate by one +2: + ld1 {v4.16b}, [x1], x3 + subs w4, w4, #1 + ld1 {v6.16b}, [x2], x3 + ext v5.16b, v4.16b, v4.16b, #1 // x1 + stride + 1 + usubl v31.8h, v0.8b, v4.8b + ext v7.16b, v6.16b, v6.16b, #1 // x2 + stride + 1 + + usubl2 v30.8h, v0.16b, v4.16b + usubl v29.8h, v1.8b, v5.8b + usubl2 v28.8h, v1.16b, v5.16b + saba v16.8h, v31.8h, v29.8h + saba v17.8h, v30.8h, v28.8h + usubl v27.8h, v2.8b, v6.8b + usubl2 v26.8h, v2.16b, v6.16b + usubl v25.8h, v3.8b, v7.8b + usubl2 v24.8h, v3.16b, v7.16b + saba v18.8h, v27.8h, v25.8h + saba v19.8h, v26.8h, v24.8h + + mov v0.16b, v4.16b + mov v1.16b, v5.16b + mov v2.16b, v6.16b + mov v3.16b, v7.16b + + cbnz w4, 2b + +3: + sqsub v17.8h, v17.8h, v19.8h + sqsub v16.8h, v16.8h, v18.8h + ins v17.h[7], wzr + sqadd v16.8h, v16.8h, v17.8h + saddlv s16, v16.8h + sqabs s16, s16 + fmov w0, s16 + + mul w0, w0, w5 + add w0, w0, w9 + + ret +endfunc