From patchwork Mon Sep 26 09:15:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grzegorz Bernacki X-Patchwork-Id: 38327 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp2122627pzh; Mon, 26 Sep 2022 02:16:06 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5P9MR9yHVsQSRtlDW7LyXO0fuROSlMrnwirg60rtMl7aRXa8u4pMoaj6k9b4d1sxlF+Xem X-Received: by 2002:a05:6402:1e8d:b0:454:79a9:201f with SMTP id f13-20020a0564021e8d00b0045479a9201fmr21601114edf.176.1664183766350; Mon, 26 Sep 2022 02:16:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664183766; cv=none; d=google.com; s=arc-20160816; b=BH4ERTO7mBlGu4UP8yHO68GcDRRBfsOWmb99a/sbq8GcrwQRIuh5zPT8Y92hONmmxi YmoLPuiaQC4GjFo/xFE9WQIX1Q6RhGzCKOIZbPTxElDeojpJhjTHy6lDA4WrXU1L0scD V2QRySV52j0Hmm1hwlN/PQ76EGbGevjeanB0SZZEB7t+cQWHjc8BXUdXJ/DCJQ8R+DrN Vycj7Ut8CGC30ZJ5NuvDu1BBOiM7RSjyGOYQ9waYQmksR8WakzKUHlfunr+35FmY0XYi Cq6EivozmVNnTJUYlBrwBHjOf7quvvxlsXWbQPo2oeHpvHaEQDpcAzz3xsT5W+n6kNXL eDcQ== 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=3FrZO7OP++/aTeKDQTrfawgk/rJVZidKDXR7NW+jprs=; b=oQOaCer7oG9b6+MWNR1eRURqBGWPyxzlAEZQaFWUZLoxL9d9lDr98YCHaH43/4nXJP fV/iOCs5wpuBcxF86fPVjQREKG5U/5YSa6V7fZVCH07N+GiEJBUZs6cmzVI9fidSbyWP W/J0frLeFCJEo8SZIPcTSVx78GLb//6/7UammD8QPqMf4F40dUPOAmrhRhZ6n37Wl48I GR3KPa7LAQKUa2DYwU3FtsArBCbi5mJbwkSGzt8E83kFniLDdXuzBX0Y7u6T5N5n4kgj YagLDcn15UkWSJopIDhjbU/ZxzBncyFpavCccZj4A4wY2O3i/EFmD64GwsonrpDEr4wh vzcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@semihalf.com header.s=google header.b="DvE/yJM/"; 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 hr38-20020a1709073fa600b007824b85978asi12114277ejc.81.2022.09.26.02.16.05; Mon, 26 Sep 2022 02:16:06 -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="DvE/yJM/"; 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 348BA68BA89; Mon, 26 Sep 2022 12:15:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2DC5C680105 for ; Mon, 26 Sep 2022 12:15:30 +0300 (EEST) Received: by mail-lf1-f51.google.com with SMTP id a8so9780116lff.13 for ; Mon, 26 Sep 2022 02:15:30 -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=IU2SHa5I6ClTspEFUtyFpWXXN6Vl5g6893brwwXZTH4=; b=DvE/yJM/oRTL1mXb3+WHWdJiR51RdDQs6PJEDlbgPmddbrcMoE2El8sxptQmOaxpDg MqD96tCwNgadTqehwml5EwKk2umDvaSSQTP02tnJ8AnLgnNaqYEC7SyOHutNYWnSE3T/ /wzMWXZcqrl3FAr5qzxzPR212L1hfyLYQ8MlOtpWcBI0g/yxYD67urJV6D9CRXFKGkwR a72gqVTXpCTaFbdHGmOv+AjPybSWFyI90ZHxbuuKCA9Zm1gebUvGm30hmGV9ULdmK6HD 3/POjE4mG6+jFTn0jr1BMZ69JfTQIh35IoPftuOHFWY/Egtukwfy89iA6WuDznQlzsRr /BcQ== 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=IU2SHa5I6ClTspEFUtyFpWXXN6Vl5g6893brwwXZTH4=; b=8NjiACHAkogyV6HecfRpWXTXCg20tc+Finzin/wYBf2acFzZBBfIY+c2WbURMWeTRt hzzRqFfeJk02Ub2dY7ytCrnFwgUnzmkETTpj4UmYw6X4zXAkhOqzbJ7/kNLZs4AXg6FR YM+CBoKPgd3y67qgyE3aAr1pYmzJLkDYjjV0fUxQ8FgCTpON/76F70CFlAD1BsKVGRo0 1lCoGHl0an+CB2W/0dwN7u0YIp/2wCb6a+bxXdSPMt0iYGdEKuYX8XtX8IhaOXAKFhbu D5HPpMjLtOsHorTdY4qkAGktJKOoZy0do23yx/sj6+uyrlSGhlrya61i/4EH+e7S0oH1 FuYw== X-Gm-Message-State: ACrzQf0sa40y3eG87lANPnOB0tJPhQwqPfdqAui/ZZbTKB6vqvQX1WGH hFtjb0AMonfH30vPMuN/fFzJvk0hJBAshg== X-Received: by 2002:a05:6512:3d94:b0:49d:144c:9667 with SMTP id k20-20020a0565123d9400b0049d144c9667mr8614555lfv.50.1664183728601; Mon, 26 Sep 2022 02:15:28 -0700 (PDT) Received: from gilgamesh.lab.semihalf.net ([83.142.187.85]) by smtp.gmail.com with ESMTPSA id b14-20020a056512070e00b004949f7cbb6esm2472942lfs.79.2022.09.26.02.15.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 02:15:28 -0700 (PDT) From: Grzegorz Bernacki To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Sep 2022 11:15:04 +0200 Message-Id: <20220926091504.3459110-4-gjb@semihalf.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20220926091504.3459110-1-gjb@semihalf.com> References: <20220926091504.3459110-1-gjb@semihalf.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] lavc/aarch64: Add neon implementation for vsse_intra8 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, hum@semihalf.com, martin@martin.st, mw@semihalf.com, spop@amazon.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7ztG47Bqb+4w Provide optimized implementation for vsse_intra8 for arm64. Performance tests are shown below. - vsse_5_c: 87.7 - vsse_5_neon: 26.2 Benchmarks and tests are run with checkasm tool on AWS Graviton 3. --- libavcodec/aarch64/me_cmp_init_aarch64.c | 4 ++ libavcodec/aarch64/me_cmp_neon.S | 53 ++++++++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/libavcodec/aarch64/me_cmp_init_aarch64.c b/libavcodec/aarch64/me_cmp_init_aarch64.c index f247372c94..defec37478 100644 --- a/libavcodec/aarch64/me_cmp_init_aarch64.c +++ b/libavcodec/aarch64/me_cmp_init_aarch64.c @@ -74,6 +74,9 @@ int nsse8_neon_wrapper(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, int vsse8_neon(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride, int h); +int vsse_intra8_neon(MpegEncContext *c, const uint8_t *s, const uint8_t *dummy, + ptrdiff_t stride, int h); + av_cold void ff_me_cmp_init_aarch64(MECmpContext *c, AVCodecContext *avctx) { int cpu_flags = av_get_cpu_flags(); @@ -102,6 +105,7 @@ av_cold void ff_me_cmp_init_aarch64(MECmpContext *c, AVCodecContext *avctx) c->vsse[1] = vsse8_neon; c->vsse[4] = vsse_intra16_neon; + c->vsse[5] = vsse_intra8_neon; c->nsse[0] = nsse16_neon_wrapper; c->nsse[1] = nsse8_neon_wrapper; diff --git a/libavcodec/aarch64/me_cmp_neon.S b/libavcodec/aarch64/me_cmp_neon.S index 386d2de0c5..82ff05d3f0 100644 --- a/libavcodec/aarch64/me_cmp_neon.S +++ b/libavcodec/aarch64/me_cmp_neon.S @@ -1111,6 +1111,59 @@ function vsse_intra16_neon, export=1 ret endfunc +function vsse_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 + movi v16.4s, #0 + + sub w4, w4, #1 // we need to make h-1 iterations + cmp w4, #3 + b.lt 2f + +1: + // v = abs( pix1[0] - pix1[0 + stride] ) + // score = sum( v * v ) + ld1 {v1.8b}, [x1], x3 + ld1 {v2.8b}, [x1], x3 + uabd v30.8b, v0.8b, v1.8b + ld1 {v3.8b}, [x1], x3 + umull v29.8h, v30.8b, v30.8b + uabd v27.8b, v1.8b, v2.8b + uadalp v16.4s, v29.8h + umull v26.8h, v27.8b, v27.8b + uabd v25.8b, v2.8b, v3.8b + uadalp v16.4s, v26.8h + umull v24.8h, v25.8b, v25.8b + sub w4, w4, #3 + uadalp v16.4s, v24.8h + cmp w4, #3 + mov v0.8b, v3.8b + + b.ge 1b + cbz w4, 3f + +// iterate by one +2: + ld1 {v1.8b}, [x1], x3 + subs w4, w4, #1 + uabd v30.8b, v0.8b, v1.8b + mov v0.8b, v1.8b + umull v29.8h, v30.8b, v30.8b + uadalp v16.4s, v29.8h + cbnz w4, 2b + +3: + uaddlv d17, v16.4s + fmov w0, s17 + + ret +endfunc + function nsse16_neon, export=1 // x0 multiplier // x1 uint8_t *pix1