From patchwork Tue Sep 20 11:01:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hubert Mazur X-Patchwork-Id: 38073 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1849566pzh; Tue, 20 Sep 2022 04:02:58 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7RlZdv7oJgkTrBN31OIGv541jFmvy0gmZX2SlnJibmwgQZeIm/TR2aIsjZMuW+bXIeIuDC X-Received: by 2002:a05:6402:4511:b0:43b:a182:8a0a with SMTP id ez17-20020a056402451100b0043ba1828a0amr19344319edb.410.1663671778157; Tue, 20 Sep 2022 04:02:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663671778; cv=none; d=google.com; s=arc-20160816; b=fXNFV0pD7NLC32xx9pAtbQ0YOi30/94mh/lnsgSqvsJjPB6xJHjqhNwNGbr7W4BLvI W90gB8GNwg5HjDx/lJtSBmueyqcHfBsekoPdTb2fH0UkJ6RMHM8GbCruTyJoflZWgnSx kKzBgwH4IqqPGSzQQ525tlxeAN9+faVitIXn9eOBrRH6a7nTTQH7bUEny8XieBUCDLFc DrhksFvyR3UqP03WkyBo+/t83FwlMIA+sGZyVexaZY4JI42HO8U0v1nNZKcwMy3hnpH8 TUlObyCAk1eH/AjfXZX5ng9pDTUOktldFeGmjqLmpPyouL/dY+bjjQCz9nQHw9OD5z3H Uo+Q== 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=qWlTYECoODHFHx9inzBueMMnT5VGeEZ1bsr9YBrdb0o=; b=FlaGcRbchW+ud9OVTpbiPh+eGSu1Mh07okRxg5sjm9fusQfWklGZSMiiOC4goF7YZ/ qd0U+b/9jZpJOVcZuC4p5+o6x9l9gdAgeUsaJ706ezdU2YYqYqPq60JY7sOjGH1mmPlr tPuThwm3UzvTNeIEA0ZjMj5xAfo1uhDxVfLY+cGpW/e0yWUvuHpoRG1ORD8Ex9AGaJRp F8dBjK1US5OKS3g7PWYBczRfFsPX57FLrJJOndmK9dRztlQUzG7QDOXpMhNZq5rbSODA BddashxGYmLbodk9Z2EHL8VpstxwtqV4xhCJet0wAJZQ3d0WLAfmNVzVEFpcQ5iEBrDf JWHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@semihalf.com header.s=google header.b=mehaDam0; 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 h5-20020a1709070b0500b00730babc11e3si855283ejl.640.2022.09.20.04.02.49; Tue, 20 Sep 2022 04:02:58 -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=mehaDam0; 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 2C58C68BA3B; Tue, 20 Sep 2022 14:02:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E61B068B9C5 for ; Tue, 20 Sep 2022 14:02:18 +0300 (EEST) Received: by mail-lf1-f47.google.com with SMTP id w8so3078316lft.12 for ; Tue, 20 Sep 2022 04:02:18 -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=VHBzYjpVrHO4fjZ2qpt+/rzxVu4IkQd3a6djnQBs/YY=; b=mehaDam0zC1tYCZTJeNX5kV6vzKbBLAtyHah5sG+i2WDEGVFs7XT7O2DS/VAPULrXp 8EKNAcB5QGbl9+nIWn47fZpaWu1MVX/yk4zpvOZuttCugz2GNltlCWwjVB31LB5/P7u5 crJky6IQzN4mRBust5XCSEN2pV/2JnVcG/kI2z11uR41Uogqq3e9xyntkq8uSLj08nKs jFH9oTMIUK8G4leR8ngEvo2zirPE0iInY+7R538x126MH5GmN/5Sns8f6alHrgo6vVOZ 4EEOwCdYki0xf7JPwI4p7hVdoprIEeUNe+08Xlrmn1eTGZHi3dXfnkjDyGJFYPHdRVcO KLtA== 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=VHBzYjpVrHO4fjZ2qpt+/rzxVu4IkQd3a6djnQBs/YY=; b=djYVh9VgCk/RNTZgoIhiqPALQHy4u58bYZmonx9q4nHlCJQMMIgT2Nj+mP5SfAHEXH iL5LJoLdr1+tXfwt49ciQVGYQi/5DL8wJ7j+FEGvwXyGS+iV9UbcP4d4LcQf9nDNIx0d UVmWrD8nLmvsdE9EkJE5il7nvkJE+a8MfhMQc3XtnxOgMLxe+zFXoISbkgy9Jc/P4EQx MAQamN8/7H0JHKQqR/EvoFk4BS1jejVdvk3YPXshQLl3PwJbFPVfGA7SpuyFI86lKwKt J6IC2Q/UPRx+/avsvgkQQV7N170xPAZSHCN2Va3DRNewnY4q551uPN6JrdiDFcBKReQZ JqEw== X-Gm-Message-State: ACrzQf3aDcii2kGhg317JKlmjcGuy/ssXIultQ8LuyZsy5Cku1qJXeF9 PT7xe4XDtwQPIM9Tjj9mfj29X6ged5Wkzg== X-Received: by 2002:a05:6512:3e13:b0:499:1829:5181 with SMTP id i19-20020a0565123e1300b0049918295181mr8251449lfv.71.1663671737851; Tue, 20 Sep 2022 04:02:17 -0700 (PDT) Received: from hum-HP-ProBook-440-G7.office.semihalf.net ([83.142.187.84]) by smtp.gmail.com with ESMTPSA id d3-20020a19f243000000b00492f5ad0ae7sm265220lfk.43.2022.09.20.04.02.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 04:02:17 -0700 (PDT) From: Hubert Mazur To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Sep 2022 13:01:58 +0200 Message-Id: <20220920110158.15384-4-hum@semihalf.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920110158.15384-1-hum@semihalf.com> References: <20220920110158.15384-1-hum@semihalf.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] lavc/aarch64: Add neon implementation for pix_median_abs8 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: HAVeF00Gjk2a Provide optimized implementation for pix_median_abs8 function. Performance comparison tests are shown below. - median_sad_1_c: 277.0 - median_sad_1_neon: 82.0 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 | 62 ++++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/libavcodec/aarch64/me_cmp_init_aarch64.c b/libavcodec/aarch64/me_cmp_init_aarch64.c index d3fa047a86..e143f0816e 100644 --- a/libavcodec/aarch64/me_cmp_init_aarch64.c +++ b/libavcodec/aarch64/me_cmp_init_aarch64.c @@ -57,6 +57,8 @@ int nsse16_neon_wrapper(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride, int h); int pix_median_abs16_neon(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, ptrdiff_t stride, int h); +int pix_median_abs8_neon(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, + ptrdiff_t stride, int h); av_cold void ff_me_cmp_init_aarch64(MECmpContext *c, AVCodecContext *avctx) { @@ -85,6 +87,7 @@ av_cold void ff_me_cmp_init_aarch64(MECmpContext *c, AVCodecContext *avctx) c->nsse[0] = nsse16_neon_wrapper; c->median_sad[0] = pix_median_abs16_neon; + c->median_sad[1] = pix_median_abs8_neon; } } diff --git a/libavcodec/aarch64/me_cmp_neon.S b/libavcodec/aarch64/me_cmp_neon.S index 1587f2ea43..11af4849f9 100644 --- a/libavcodec/aarch64/me_cmp_neon.S +++ b/libavcodec/aarch64/me_cmp_neon.S @@ -1089,3 +1089,65 @@ function vsad_intra8_neon, export=1 ret endfunc + +function pix_median_abs8_neon, export=1 + // x0 unused + // x1 uint8_t *pix1 + // x2 uint8_t *pix2 + // x3 ptrdiff_t stride + // w4 int h + + ld1 {v2.8b}, [x1], x3 + ld1 {v3.8b}, [x2], x3 + movi v31.8h, #0 + ext v0.8b, v2.8b, v2.8b, #1 + ext v1.8b, v3.8b, v3.8b, #1 + usubl v28.8h, v2.8b, v3.8b + usubl v26.8h, v0.8b, v1.8b + sub w4, w4, #1 // we need to make h-1 iterations + saba v31.8h, v26.8h, v28.8h + mov h18, v28.h[0] + cmp w4, #1 + sqabs h18, h18 + movi v0.8h, #0 + + b.lt 2f +1: + ld1 {v6.8b}, [x1], x3 // pix1 vector for V(j-1) + ld1 {v7.8b}, [x2], x3 // pix2 vector for V(j-1) + subs w4, w4, #1 + ext v4.8b, v6.8b, v6.8b, #1 // pix1 vector for V(j) + ext v5.8b, v7.8b, v7.8b, #1 // pix2 vector for V(j) + + // protected registers: v30, v29, v28, v27, v26, v25, v24, v23 + // scratch registers: v22, v21, v20, v19, v17 + + // To find median of three values, calculate sum of them + // and subtract max and min value from it. + usubl v30.8h, v6.8b, v7.8b // V(j-1) + usubl v24.8h, v4.8b, v5.8b // V(j) + saba v0.8h, v30.8h, v28.8h + add v22.8h, v26.8h, v30.8h + smin v20.8h, v26.8h, v30.8h + smax v19.8h, v26.8h, v30.8h + sub v22.8h, v22.8h, v28.8h + smin v17.8h, v19.8h, v22.8h + mov v28.16b, v30.16b + smax v20.8h, v20.8h, v17.8h // median values lower half + smax v19.8h, v25.8h, v29.8h + saba v31.8h, v24.8h, v20.8h + mov v26.16b, v24.16b + smax v17.8h, v22.8h, v19.8h // median values upper half + + b.ne 1b +2: + mov h17, v0.h[0] + ins v31.h[7], wzr + add d18, d18, d17 + uaddlv s17, v31.8h + add d18, d18, d17 + fmov w0, s18 + + ret + +endfunc