From patchwork Thu Sep 8 09:25:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hubert Mazur X-Patchwork-Id: 37757 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp164304pzh; Thu, 8 Sep 2022 02:26:13 -0700 (PDT) X-Google-Smtp-Source: AA6agR7TofkJYxka4rvfpga0pY8Ej0+3TJEtmNHXJEg3zLg5I41B8rad7ofiSgcMCjo14TDRO9OL X-Received: by 2002:a17:906:dd4:b0:741:9901:abb5 with SMTP id p20-20020a1709060dd400b007419901abb5mr5304973eji.321.1662629173495; Thu, 08 Sep 2022 02:26:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662629173; cv=none; d=google.com; s=arc-20160816; b=1I6hl+PetfPHz5HV7ZCO10N8TddGpue2l+i1PKaybhZKGmYsB0PHguMKZ7QbCXXxAx sSnGBUz5+rV7l/Rhr0mUgOiDMgkFHpbos01rkRG0mXPyClVRxnJrZfVe89Mp5zzlnHs2 fgXpTy5qP99LvsK8hH0PwQv/v33dK3Yf/PoyiJR/d2wxQ45lNwFbzQWYefQn8914rEyM Sy50b6nnTDvcx9s6RW+u4l8oadjithAWyaP7Wni6TMf5t5Ox7vWGE/+G0BNccrvJAZJF wiHltrK4Z+AseuCmslEHZregcz7Q/kjk2achfnpg9Zmbbm2gT50JsJ9htLasw9zNwnhL mLEw== 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=kozZFl6xxOsV5c3Yzv5/hE3WOl2DBAVtDngM03kxDYI=; b=u5RKU0OCoUTNjqnTuPw42iY7FxSPJofGpHbeQSssFMPkrC0WL4cgv7ltNITWngP4Rx DFkmImrGvEKjHLY/nLqrjH0tB5eFuO39PfZ3oS2/PRkdVR06K3g6hqPheBq51J5TDLio hT+ser8zRErxx8GEh27juZwJSaptAE9FWpAWY21yD+Mvu85mXUk6Y2tvmp/yZLI/lsFt TFUbvobBYh9Gl2uujTRhIITq4VldOK2GURpghsGlXk33tsoQ85sMvtCRcjRl0WbbsYE2 kVSNj+g6WIkbHSt090OowSU2dZxdrY1pQwArJjqRQE1fMJo8Lr0R7fvrsH/XWk2imjom g6lg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@semihalf.com header.s=google header.b=kSgtOZrw; 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 x2-20020a05640225c200b00447cff2e436si11104881edb.200.2022.09.08.02.26.13; Thu, 08 Sep 2022 02:26:13 -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=kSgtOZrw; 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 5D14368BA8D; Thu, 8 Sep 2022 12:25:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 40D3668BA7A for ; Thu, 8 Sep 2022 12:25:40 +0300 (EEST) Received: by mail-lf1-f42.google.com with SMTP id i26so10973943lfp.11 for ; Thu, 08 Sep 2022 02:25:40 -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=ELuepA24jL+85cNqfGsFQviKg6JRDAMybUX1LhsA2vo=; b=kSgtOZrw3KxWZfJD9Ao6l0pOD7fcPmlrctzeNQ1/DTYTaL5QnZnjQHLssmIfjqdc/P v4+vJJu9ZL2+FnoFuQ4GDnqJncbALuJNbjfUir3zEbGSoMScbvFi7poL9mN4uMmEijmy ogf0/aDnuaSuvYbkZnLBfy+E14V4t7XQxyti/zJ2x3Zhy9dbdGRo9B6J74cjsvZSXpy9 DOv+WjEilEeW8j0JuBub9enl0pPnPoHTnSQ/4lntf0IreZIZkjSKNqhLoae3sA3xuoF9 aZWGYuO4C+yroO+bFv2WubTBVrlF78icWPOL6gceylK6s2Omx6zgWtI8U2WTsMmNhEuG gASw== 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=ELuepA24jL+85cNqfGsFQviKg6JRDAMybUX1LhsA2vo=; b=UQ9aYNfmW9ibCp0MpqvB1mo6aNBCFQ74we+k43VXxvRm9s4KXi+vl8mWDbhRrGepE3 Rj9QvKggsyUvspXX2fzutweRgsnAIg9km4D/uZluQHVPJOmTbNSbTI5mv5wYClb3mrtl UKiKlellNED3LvV9q+ZPblVdd4MRpL/3hBfdxgSw4wAoFfN1sf87a5O+6tr1NItjBCbO 0zPN/bbfgnTxs5jpOEE3XvULtcURwj0J0yoV8UuDcLJgi0PSbWMvL4PY1D/4FHWl/sn1 sxO17SWzF0+4+X8gdK7YfuWr93f3G6eiCC0xAbgnep08mNKMZQc9L6jdj2+LdMPkWXFa 0pmA== X-Gm-Message-State: ACgBeo0zo50nf/yznsTqa9Qv80D5XUa+WBhrb74lOc7RJJ06H8GtM9PK fcBLpJW7Hy1smK+tcdtr0V/DiHWZBtgVgw== X-Received: by 2002:a05:6512:689:b0:496:ff8e:9fdc with SMTP id t9-20020a056512068900b00496ff8e9fdcmr2325955lfe.177.1662629139276; Thu, 08 Sep 2022 02:25:39 -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.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Sep 2022 02:25:38 -0700 (PDT) From: Hubert Mazur To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Sep 2022 11:25:05 +0200 Message-Id: <20220908092507.63319-4-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 3/5] lavc/aarch64: Add neon implementation for vsad_intra16 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: ooyLU1WUQXdz Provide optimized implementation for vsad_intra16 function for arm64. Performance comparison tests are shown below. - vsad_4_c: 177.5 - vsad_4_neon: 23.5 Benchmarks and tests are run with checkasm tool on AWS Gravtion 3. Signed-off-by: Hubert Mazur --- libavcodec/aarch64/me_cmp_init_aarch64.c | 3 ++ libavcodec/aarch64/me_cmp_neon.S | 48 ++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/libavcodec/aarch64/me_cmp_init_aarch64.c b/libavcodec/aarch64/me_cmp_init_aarch64.c index 7b81e48d16..af83f7ed1e 100644 --- a/libavcodec/aarch64/me_cmp_init_aarch64.c +++ b/libavcodec/aarch64/me_cmp_init_aarch64.c @@ -43,6 +43,8 @@ int sse4_neon(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, int vsad16_neon(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride, int h); +int vsad_intra16_neon(MpegEncContext *c, const uint8_t *s, const uint8_t *dummy, + ptrdiff_t stride, int h) ; int vsse16_neon(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride, int h); @@ -64,6 +66,7 @@ av_cold void ff_me_cmp_init_aarch64(MECmpContext *c, AVCodecContext *avctx) c->sse[2] = sse4_neon; c->vsad[0] = vsad16_neon; + c->vsad[4] = vsad_intra16_neon; c->vsse[0] = vsse16_neon; } diff --git a/libavcodec/aarch64/me_cmp_neon.S b/libavcodec/aarch64/me_cmp_neon.S index b3f376aa60..ce198ea227 100644 --- a/libavcodec/aarch64/me_cmp_neon.S +++ b/libavcodec/aarch64/me_cmp_neon.S @@ -736,3 +736,51 @@ function vsse16_neon, export=1 ret endfunc + +function vsad_intra16_neon, export=1 + // x0 unused + // x1 uint8_t *pix1 + // x2 uint8_t *dummy + // x3 ptrdiff_t stride + // w4 int h + + ld1 {v0.16b}, [x1], x3 + sub w4, w4, #1 // we need to make h-1 iterations + cmp w4, #3 + movi v16.8h, #0 + b.lt 2f + +// make 4 iterations at once +1: + // v = abs( pix1[0] - pix1[0 + stride] ) + // score = sum(v) + ld1 {v1.16b}, [x1], x3 + ld1 {v2.16b}, [x1], x3 + uabal v16.8h, v0.8b, v1.8b + ld1 {v3.16b}, [x1], x3 + uabal2 v16.8h, v0.16b, v1.16b + sub w4, w4, #3 + uabal v16.8h, v1.8b, v2.8b + cmp w4, #3 + uabal2 v16.8h, v1.16b, v2.16b + mov v0.16b, v3.16b + uabal v16.8h, v2.8b, v3.8b + uabal2 v16.8h, v2.16b, v3.16b + b.ge 1b + cbz w4, 3f + +// iterate by one +2: + ld1 {v1.16b}, [x1], x3 + subs w4, w4, #1 + uabal v16.8h, v0.8b, v1.8b + uabal2 v16.8h, v0.16b, v1.16b + mov v0.16b, v1.16b + cbnz w4, 2b + +3: + uaddlv s17, v16.8h + fmov w0, s17 + + ret +endfunc