From patchwork Tue Sep 20 11:01:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hubert Mazur X-Patchwork-Id: 38072 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1849428pzh; Tue, 20 Sep 2022 04:02:48 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5NVtfc+HgPHuJDJylG/ZupZDEWkcC+NjzOhGmQp52bKT4s+uiihh0FBf0psn70qq9KABWA X-Received: by 2002:a05:6402:5188:b0:452:5395:a271 with SMTP id q8-20020a056402518800b004525395a271mr19629714edd.383.1663671768081; Tue, 20 Sep 2022 04:02:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663671768; cv=none; d=google.com; s=arc-20160816; b=Zh7B8s3yEDCLTCe2fHt2mPwemCnYte2zxaS7hzfkTcWoMSMd1eFb8kWg1xjk+/bDsm fUmLhdRsVI2pLvdcxDuBS6oIgTzJiVOr6qB9TH+pF+WGNCxIB3KGcs2ISPITyMpRpE/A 0glJ4U0BoalTeaVHFPoRt03giqoFRloUT37fNK/ySs8zP4YgJXDj8PZM4fWrUnBCFFzN kTveQVfQcHJkhhq+h3kiCoIKUuGr/9EBCNua+i7cjqLOITPPjqQvJQcLlOWe+pZPZq21 c8ktHDhlcO5Y0GrToJq2BQ/sI+sIoTq3eQ6Q+Rd0WavediK4nM8xgDUikIQ6G/3Ytp+Q Bm8Q== 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=MDS1F2tsBProb54qFBKrOBOwwtGW/345EOjX4PASMsc=; b=aBfqwelZHV/lw1Toj7d9TzS2mGNvjMS/No35UuUbK89xnsRO0EB/1nFOKCWtAGcReX ENaHx2veclQyu8p0AjhSwgycOLuu2mFm3Kl74p9/KisB7jAAFcFj2gCv1X8z/Lp//8j3 XOwpHdM6et5jkdvEnBQesHJ7Cn00G0UsRVB7OEJw8UyWsypZCZairCs+BY2I5hdxpIJT O4qAR8XthKsbCuvx7+n85Or9G8UnEbx0XqA52rt/olH/K9vzq01aDzXlNIAzsuGMCgQI xVbcCfail92PE7VjXvZZvE2X1VkGFgipDdQEMYceGGC/0RHoxt5WEjgY2Wc5dF7Rna6I fh+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@semihalf.com header.s=google header.b=nh6S0Kgh; 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 ds18-20020a170907725200b0073d61fab74bsi1207628ejc.249.2022.09.20.04.02.39; Tue, 20 Sep 2022 04:02:48 -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=nh6S0Kgh; 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 2BF8768BA2B; Tue, 20 Sep 2022 14:02:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9F72C68B9C5 for ; Tue, 20 Sep 2022 14:02:16 +0300 (EEST) Received: by mail-lj1-f178.google.com with SMTP id z20so2545946ljq.3 for ; Tue, 20 Sep 2022 04:02:16 -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=SKD+LkvGvSwxBZ3iz+uldiDa316RN866K3okk7enPpg=; b=nh6S0KghyNepi7Bw1EfohN06GuYRyBNwvMXTrxBDMDk2P9JVPN30RvH+L4OGPOKUL1 J5J3vf19fx6uD7Gd+0sfyrE2QHxZxY9cc0P03YNPeTpEbloZ52d+SdOi9DXZvK+CJreU E19jnn5QVbjl7qu/qOMFXgmwExtr9tOrJRSKdIKKm6s+AdO1aMOU5fQdjC2m8okHLQPW t9NYvgIVXDuJ7V1l+SdlmcXj6Ee7BATbxTPt5t69kiuAwcZB5eYIKdRnWwZsrzkdvdPb R13vP9r4hgbr/hBoz47KJIV3ceQ+gfmr2GaDBg0RAEo8yiZu/XcDbvu01T1vWxARuyvK cFgw== 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=SKD+LkvGvSwxBZ3iz+uldiDa316RN866K3okk7enPpg=; b=IENEc5oz0w/cleQYAXra/gAokvVWB24XfyN9Ls/X6aMWQqxHl30iKdvj2VrJ8HC9wo SVWsr4gATcNfTiRmFm/fZCgwXkwcYbsHnnqZjj3/pO7ELKXwyglS4d6Pm2qiBByfpfyU Dh6t9MUKtaUJV1R2RF/SwRPDcy5ScJpJFlyRy/USIWPSSdZA2Nl0DzZtRkMmjYFk0JIp gHGWZpVvBYh3SZ5BLXLuH6/I5oqFZSXitg/HHoAbGmc/7eVJMFldDqnPTijVipsyvRRp hEoaDrHwlzpG1T6Adf7UukjU7O0jqunSe+Gau4S4mghJd4AC3P/ZjmnbPB6m/s5S/qe/ xlWQ== X-Gm-Message-State: ACrzQf2WmSeSK6rvp1MohuyqXrHX59Xbv+1ImbacbTbBH/T24Ez809NJ xrjEhVD1PfMYZVh8PG76M0CvAjqxxsabAQ== X-Received: by 2002:a2e:a4b1:0:b0:26c:521:76b5 with SMTP id g17-20020a2ea4b1000000b0026c052176b5mr6793783ljm.258.1663671735606; Tue, 20 Sep 2022 04:02:15 -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.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 04:02:15 -0700 (PDT) From: Hubert Mazur To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Sep 2022 13:01:57 +0200 Message-Id: <20220920110158.15384-3-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 2/3] lavc/aarch64: Add neon implementation for vsad8_intra 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: Hh7k1jVI4oUR Provide optimized implementation for vsad8_intra function. Performance comparison tests are shown below. - vsad_5_c: 94.7 - vsad_5_neon: 20.7 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 | 42 ++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/libavcodec/aarch64/me_cmp_init_aarch64.c b/libavcodec/aarch64/me_cmp_init_aarch64.c index fb51a833be..d3fa047a86 100644 --- a/libavcodec/aarch64/me_cmp_init_aarch64.c +++ b/libavcodec/aarch64/me_cmp_init_aarch64.c @@ -45,6 +45,8 @@ 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 vsad_intra8_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); int vsse_intra16_neon(MpegEncContext *c, const uint8_t *s, const uint8_t *dummy, @@ -75,6 +77,7 @@ av_cold void ff_me_cmp_init_aarch64(MECmpContext *c, AVCodecContext *avctx) c->vsad[0] = vsad16_neon; c->vsad[4] = vsad_intra16_neon; + c->vsad[5] = vsad_intra8_neon; c->vsse[0] = vsse16_neon; c->vsse[4] = vsse_intra16_neon; diff --git a/libavcodec/aarch64/me_cmp_neon.S b/libavcodec/aarch64/me_cmp_neon.S index 1e08d04869..1587f2ea43 100644 --- a/libavcodec/aarch64/me_cmp_neon.S +++ b/libavcodec/aarch64/me_cmp_neon.S @@ -1047,3 +1047,45 @@ function pix_median_abs16_neon, export=1 ret endfunc + +function vsad_intra8_neon, export=1 + // x0 unused + // x1 uint8_t *pix1 + // x2 uint8_t *dummy + // x3 ptrdiff_t stride + // w4 int h + + ld1 {v0.8b}, [x1], x3 + sub w4, w4, #1 // we need to make h-1 iterations + cmp w4, #3 + movi v16.8h, #0 + b.lt 2f + +1: + // v = abs( pix1[0] - pix1[0 + stride] ) + // score = sum(v) + ld1 {v1.8b}, [x1], x3 + sub w4, w4, #3 + ld1 {v2.8b}, [x1], x3 + uabal v16.8h, v0.8b, v1.8b + ld1 {v3.8b}, [x1], x3 + uabal v16.8h, v1.8b, v2.8b + cmp w4, #3 + mov v0.8b, v3.8b + uabal v16.8h, v2.8b, v3.8b + b.ge 1b + cbz w4, 3f + +2: + ld1 {v1.8b}, [x1], x3 + subs w4, w4, #1 + uabal v16.8h, v0.8b, v1.8b + mov v0.8b, v1.8b + cbnz w4, 2b + +3: + uaddlv s17, v16.8h + fmov w0, s17 + + ret +endfunc