From patchwork Mon Aug 22 15:26:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hubert Mazur X-Patchwork-Id: 37400 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1361672pzh; Mon, 22 Aug 2022 08:27:25 -0700 (PDT) X-Google-Smtp-Source: AA6agR6x0KngcacQBn++HUZPdlYkX/dn66OtY1Pdpxn+GhCTq3LDF1eWjNpsg+6ug9SIGq8fcLLq X-Received: by 2002:a17:907:69b0:b0:73d:6cda:93ac with SMTP id ra48-20020a17090769b000b0073d6cda93acmr6088297ejc.226.1661182045224; Mon, 22 Aug 2022 08:27:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661182045; cv=none; d=google.com; s=arc-20160816; b=fw0EM6cZWKz40Vc4hqnNGcQivnYkcQo8J8Z/1Mgx+i4TjkgOuYrAuHKA1/Z6STHs+G DqHLIoqiyTAyKyPW8LHaZk3nUi78DLpfsEkM6oYIeDuPMilfLaayrZG5MQX1Disa2fj6 NnyZ6j+bmqN8AgnP5i9jwzwIJryBOI57XvHx1MiCZnoMiWsPNIUjFXgEXBxhrRUnGDFq 9le9CJAaZlmPYNRe37d96HBRQliGNrkBYIejVnw98PQsW9UyH/lk7yXgmbvKl1eRG+uX hiuZAexJilDWYooWCuW3cG1Q03vXD+LViQR4sh6/2ZQ2/5VhXJ97Us/ljcnDSRHcQ763 QdhA== 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=wviSH1A8befJlr/ZpGPHPxRL5lM4EeGntI0IDpzr8dI=; b=Rlhsj+KQaM0ZPmCA6FbLGU9q0kIHVDG/6/6a4EpfMhbBxAKuVE84FCtOH28oSlL3zX /X9tJu3EQRhCKY4JZgKdfG+g9YBuc+YE7HqIT9AiORNn647zPrcElKyjY7QSIagZ/dTn 7JqRxXmko3KqYIfHvhGwpS1U7R1Mr983DWmplwPf7kIbseENMwN7L36x5XrFXr5wA5Yc naDoxuM6cclCxtI+M50Dkl+3eFCRnz7J9L0IYF+XgXddUbTe9OczGPjuzJoMXwSlrkf3 1dPd7FgDmLXJryMTGNWupJJqRlP3Z5t1GUDLTi6giu54hKYFpII4j1raUFdd2sahuuk4 o3aQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@semihalf.com header.s=google header.b=infi28gR; 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 gb6-20020a170907960600b00734b96e0cbdsi1678949ejc.167.2022.08.22.08.27.24; Mon, 22 Aug 2022 08:27:25 -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=infi28gR; 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 0B11E68BA4D; Mon, 22 Aug 2022 18:26:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A993168B75A for ; Mon, 22 Aug 2022 18:26:45 +0300 (EEST) Received: by mail-lj1-f180.google.com with SMTP id x25so10935586ljm.5 for ; Mon, 22 Aug 2022 08:26:45 -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; bh=giiiwYOsrCuGx3N0Xls5tGAuY1W1s0VS+2iObUdWG7A=; b=infi28gRJqfOTDxJXnlg+3URX7B4LKM14RAnRFN2rcBLtyGphECXLzkIw6XJKcueBq CAy9/1s8w60E+PpTwvBpQcLKQ1a5Y+OoARgCqyOvK3pqQEXP7YXY9ryCMZaevMB7FXma KezCeK12l1LAqllaOLn6aaVYULA8cGYj/YUAfbGWShIvbRMdVFKVKj22G/x3kkS3BzqU EkXuyodyr3gQBJo0mQhEaudabIszsYW1I0J9XvE3A3sLn3ZqISEuj0dEpG6XA6QXcGtI RklXrx4ONaEXgSJVs7PwYb0GucrW5c0ERJaKqtaaEC5UJbWknT+ZX/B4HDObmNWuHoTW aAIQ== 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; bh=giiiwYOsrCuGx3N0Xls5tGAuY1W1s0VS+2iObUdWG7A=; b=IeW9iBcBvXWNlShrXY0LjLSvsSpF1tZ/aNrYVWENzFYqunq8EyhFLCq2FlBg2qDGJC 9QnHbJfOul0zmKLx0cqb4GFGbOFgF8JbsPFqPPUpjdlY95ToczIheQ1QObElG0Gip1BL d1PuGtLeyYL/oPajsyY8+xuiEBeLudOlDg+YlW8yZng0clfr1nJfBMj9u7QdZKrJJRnn uoeX0jSH3KWgBbu0G4DJCJbW22t9K+LrIIDGml0uEIYvqkgnoKiHz/NXpebdyCcwbFqN RfjaG4zRWvLFfBehfKtztofXvuF2eV/039gSPYdvrqrf90S6FGryBPcKCTHqn37TrQYd KwVQ== X-Gm-Message-State: ACgBeo1kprY6FdZYgBFwasutkJ75cuxoVcbA+6iHDkd2a4Ow/L9CW56H gP7+vw5Ab5747qxAJ7wzAg7bWPH8ozsfaw== X-Received: by 2002:a2e:9dc5:0:b0:25e:6fa0:1243 with SMTP id x5-20020a2e9dc5000000b0025e6fa01243mr6302679ljj.513.1661182004766; Mon, 22 Aug 2022 08:26:44 -0700 (PDT) Received: from hum-HP-ProBook-440-G7.office.semihalf.net ([83.142.187.84]) by smtp.gmail.com with ESMTPSA id z13-20020a056512370d00b00492f21c161esm2921lfr.123.2022.08.22.08.26.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Aug 2022 08:26:44 -0700 (PDT) From: Hubert Mazur To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Aug 2022 17:26:26 +0200 Message-Id: <20220822152627.1992008-5-hum@semihalf.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220822152627.1992008-1-hum@semihalf.com> References: <20220822152627.1992008-1-hum@semihalf.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/5] lavc/aarch64: Add neon implementation for vsse_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: y3emJsF6WFk4 Provide optimized implementation for vsse_intra16 for arm64. Performance tests are shown below. - vsse_4_c: 153.7 - vsse_4_neon: 34.2 Benchmarks and tests are 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 | 75 ++++++++++++++++++++++++ 2 files changed, 78 insertions(+) diff --git a/libavcodec/aarch64/me_cmp_init_aarch64.c b/libavcodec/aarch64/me_cmp_init_aarch64.c index af83f7ed1e..8c295d5457 100644 --- a/libavcodec/aarch64/me_cmp_init_aarch64.c +++ b/libavcodec/aarch64/me_cmp_init_aarch64.c @@ -47,6 +47,8 @@ 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); +int vsse_intra16_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) { @@ -69,5 +71,6 @@ av_cold void ff_me_cmp_init_aarch64(MECmpContext *c, AVCodecContext *avctx) c->vsad[4] = vsad_intra16_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 126e267fdc..46d4dade5d 100644 --- a/libavcodec/aarch64/me_cmp_neon.S +++ b/libavcodec/aarch64/me_cmp_neon.S @@ -814,3 +814,78 @@ function vsad_intra16_neon, export=1 ret endfunc + +function vsse_intra16_neon, export=1 + // x0 unused + // x1 uint8_t *pix1 + // x2 uint8_t *dummy + // x3 ptrdiff_t stride + // w4 int h + + add x5, x1, x3 // pix1 + stride + movi v16.4s, #0 + movi v17.4s, #0 + + sub w4, w4, #1 // we need to make h-1 iterations + cmp w4, #4 + b.lt 2f + +// make 4 iterations at once +1: + // v = abs( pix1[0] - pix1[0 + stride] ) + // score = sum( v * v ) + // abs(x) = ( (x > 0) ? (x) : (-x) ) + + ld1 {v0.16b}, [x1], x3 + ld1 {v1.16b}, [x5], x3 + ld1 {v2.16b}, [x1], x3 + uabd v30.16b, v0.16b, v1.16b + ld1 {v3.16b}, [x5], x3 + ld1 {v4.16b}, [x1], x3 + umull v29.8h, v30.8b, v30.8b + umull2 v28.8h, v30.16b, v30.16b + uabd v27.16b, v2.16b, v3.16b + uadalp v16.4s, v29.8h + ld1 {v5.16b}, [x5], x3 + umull v26.8h, v27.8b, v27.8b + uadalp v17.4s, v28.8h + ld1 {v6.16b}, [x1], x3 + umull2 v27.8h, v27.16b, v27.16b + uabd v25.16b, v4.16b, v5.16b + uadalp v16.4s, v26.8h + umull v24.8h, v25.8b, v25.8b + ld1 {v7.16b}, [x5], x3 + uadalp v17.4s, v27.8h + umull2 v25.8h, v25.16b, v25.16b + uabd v23.16b, v6.16b, v7.16b + uadalp v16.4s, v24.8h + umull v22.8h, v23.8b, v23.8b + uadalp v17.4s, v25.8h + umull2 v23.8h, v23.16b, v23.16b + sub w4, w4, #4 + uadalp v16.4s, v22.8h + cmp w4, #4 + uadalp v17.4s, v23.8h + + b.ge 1b + cbz w4, 3f + +// iterate by one +2: + ld1 {v0.16b}, [x1], x3 + ld1 {v1.16b}, [x5], x3 + subs w4, w4, #1 + uabd v30.16b, v0.16b, v1.16b + umull v29.8h, v30.8b, v30.8b + umull2 v30.8h, v30.16b, v30.16b + uadalp v16.4s, v29.8h + uadalp v17.4s, v30.8h + cbnz w4, 2b + +3: + add v16.4s, v16.4s, v17.4S + uaddlv d17, v16.4s + fmov w0, s17 + + ret +endfunc