From patchwork Tue Aug 16 12:20:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hubert Mazur X-Patchwork-Id: 37311 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp1829506pzi; Tue, 16 Aug 2022 05:21:40 -0700 (PDT) X-Google-Smtp-Source: AA6agR5rhXCYNBxqLwcrSYUiu7nwfH+9SqCspzNuTOsP8sV/WUtiLG2TKCbbAxn1Oek44IPGvUm2 X-Received: by 2002:a17:906:4787:b0:737:2a03:6dd6 with SMTP id cw7-20020a170906478700b007372a036dd6mr9492457ejc.476.1660652500401; Tue, 16 Aug 2022 05:21:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660652500; cv=none; d=google.com; s=arc-20160816; b=piX9HBTW1dfWjK3A5ZmnDKpj49Wwefs2xAkpHHXG14n8OyftYWWYqO++s8nOWYR2Z+ LDaE/1aczxjEou7oyjoz3a5x/SsJmtUm/DTObiYTOOOrmTNFnmhSNiZ5ZpNBHiBfzvwh clKBTHZm62HpLwD/mhMu2oEi3Fn79taGdylebdHNk2hT6b3TTuUHkvhnMJC/QvP9Zfl7 0F9MxwAQs8ceSuhX/q8ehB7hYlz+qcEV4sf1fGhWp1LVAD4MWbbzAQBIo/IKfb4YEajM X6IwLrAA+KihqLoiqYhL6VhjgRVR072yamNEOANyhum+ZQr5d55BdiZcbgbJqIDrHgyg KzWg== 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=jcE+PW7lxLEeGPS3rf0sBs8Df3bRjj/NHiEC0QLRCBw=; b=d0Ok9HJizid+CLkzdjUjzM4tppfBlbIv3uN92h1TpC/vm7oEXpbUhNHkGkUlpmMsW4 v7bQx56mjCDc45wnV3nvJmnJARIUEI8d7Gc3jB6z8I18p2qkvs4klPb2LzDvxl4AI35V LiU60weQ85iWtDjWqllI67QlzbsIUhVsxeCxgdbKCR618jKa5dnaYVjhS9iNdYY3sVTT xk9OawSISTD06AsyOXcrAc9TzK97eQmPWT81L+D6/NfT+dhLXDQ04E0cO1KxxOm+pADw LuT4/Iyei8VW2lv1mpEc2b+bWrl9a8dZG8bXPAon3e+ENV4mI+j8t0IpVWU7qduqqsJ7 pvYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@semihalf.com header.s=google header.b=l2PzeD61; 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 15-20020a170906208f00b00732fa13e848si7837523ejq.597.2022.08.16.05.21.39; Tue, 16 Aug 2022 05:21:40 -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=l2PzeD61; 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 4249168B900; Tue, 16 Aug 2022 15:21:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f176.google.com (mail-lj1-f176.google.com [209.85.208.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AA37E68B945 for ; Tue, 16 Aug 2022 15:21:02 +0300 (EEST) Received: by mail-lj1-f176.google.com with SMTP id x10so10342844ljq.4 for ; Tue, 16 Aug 2022 05:21:02 -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=SmMZFii3d3EQIhkoH12Err/nmwGBYbli+L7MX3q9rjo=; b=l2PzeD61YytcYO25mVx2DF67w4E0V3NdeFw/GO6g/xCalrho/1BjA2ZxBtziC9wovn QuvT2kXiUc1H+2ggozfH97jpJuZJ04dLEFOKr6hji6WwkxcKMZ29UU0APtz9oExbscUb EiXZnhuztuCJ5W9Aol4p3oTK4f0aX38ZgYBbMchd3YBEwvOEuDhMgt+BcCMsxSiuZVhy 2VsblXxK7IFLu3ziQljfqbCGdc2RK4XL9XmzptxW/AUSwwgjYVuUn451+HMjFS3HkaMY ZH9EIDyCjz43OFyVL9a2VC6r2vWbYhVMUPx8jpz0qwdNyt/H5Z/2U7MUOL+7TH5pLOfn DCdQ== 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=SmMZFii3d3EQIhkoH12Err/nmwGBYbli+L7MX3q9rjo=; b=8Icz7kriHUaOaWDs2iD+55I88hik+RMROsgD2U4hM8y/PDFTMT1QmI8XywEVc/RYr9 bauyTdYj+Bu5gPDg4WY2weyPWk/QMkVsAlL5325poaopdHxaoHXthtY2yH7fqPKroI2E fYaFo2JF7QuFb5ufi38q7oiLyIvz1iETCdF54/Gd712qSFnj1jZRwFDs0C2NbV1C+4lw 8HH2CtTLE+844DJjr/EOKByYlEScjh/26sw0A6EQ2zSMwQh97N6Qy9UCVtiDQfAaFkMi z3A/tA9auGS1LEsHJfflxObD+RwpDDoZC6NVy+yT0MbQBhQCbl+Bu64Neo3TBGCwaQgb olAw== X-Gm-Message-State: ACgBeo0CkjrPDqUf4CZOgxQgxOe59UuQR+81otJ3cYZTJMa/fu3XOazJ V+wvPXVk7c6S3PXM1VIAsKwek86VsBnJi3Ax X-Received: by 2002:a2e:b01a:0:b0:25e:5a3f:ecd6 with SMTP id y26-20020a2eb01a000000b0025e5a3fecd6mr6727774ljk.209.1660652461722; Tue, 16 Aug 2022 05:21:01 -0700 (PDT) Received: from hum-HP-ProBook-440-G7.office.semihalf.net ([83.142.187.84]) by smtp.gmail.com with ESMTPSA id p20-20020ac24ed4000000b0048b998be041sm1365707lfr.309.2022.08.16.05.21.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Aug 2022 05:21:01 -0700 (PDT) From: Hubert Mazur To: ffmpeg-devel@ffmpeg.org Date: Tue, 16 Aug 2022 14:20:15 +0200 Message-Id: <20220816122016.64929-5-hum@semihalf.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220816122016.64929-1-hum@semihalf.com> References: <20220816122016.64929-1-hum@semihalf.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/5] lavc/aarch64: Add neon implementation for sse8 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: GhOW+h6jSEjm Provide optimized implementation of sse8 function for arm64. Performance comparison tests are shown below. - sse_1_c: 130.7 - sse_1_neon: 29.7 Benchmarks and tests run with checkasm tool on AWS Graviton 3. Signed-off-by: Hubert Mazur --- libavcodec/aarch64/me_cmp_init_aarch64.c | 4 ++ libavcodec/aarch64/me_cmp_neon.S | 66 ++++++++++++++++++++++++ 2 files changed, 70 insertions(+) diff --git a/libavcodec/aarch64/me_cmp_init_aarch64.c b/libavcodec/aarch64/me_cmp_init_aarch64.c index 1c36d3d7cb..2f51f0497e 100644 --- a/libavcodec/aarch64/me_cmp_init_aarch64.c +++ b/libavcodec/aarch64/me_cmp_init_aarch64.c @@ -34,9 +34,12 @@ int ff_pix_abs16_y2_neon(MpegEncContext *v, const uint8_t *pix1, const uint8_t * int sse16_neon(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, ptrdiff_t stride, int h); +int sse8_neon(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, + ptrdiff_t stride, int h); int sse4_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) { int cpu_flags = av_get_cpu_flags(); @@ -49,6 +52,7 @@ av_cold void ff_me_cmp_init_aarch64(MECmpContext *c, AVCodecContext *avctx) c->sad[0] = ff_pix_abs16_neon; c->sse[0] = sse16_neon; + c->sse[1] = sse8_neon; c->sse[2] = sse4_neon; } } diff --git a/libavcodec/aarch64/me_cmp_neon.S b/libavcodec/aarch64/me_cmp_neon.S index 0ec9c0465b..3f4266d4d5 100644 --- a/libavcodec/aarch64/me_cmp_neon.S +++ b/libavcodec/aarch64/me_cmp_neon.S @@ -347,6 +347,72 @@ function sse16_neon, export=1 ret endfunc +function sse8_neon, export=1 + // x0 - unused + // x1 - pix1 + // x2 - pix2 + // x3 - stride + // w4 - h + + movi d18, #0 + movi v21.4s, #0 + movi v20.4s, #0 + cmp w4, #4 + b.le 2f + +// make 4 iterations at once +1: + + // res = abs(pix1[0] - pix2[0]) + // res * res + + ld1 {v0.8b}, [x1], x3 // Load pix1 for first iteration + ld1 {v1.8b}, [x2], x3 // Load pix2 for second iteration + ld1 {v2.8b}, [x1], x3 // Load pix1 for second iteration + ld1 {v3.8b}, [x2], x3 // Load pix2 for second iteration + uabdl v30.8h, v0.8b, v1.8b // Absolute difference, first iteration + ld1 {v4.8b}, [x1], x3 // Load pix1 for third iteration + ld1 {v5.8b}, [x2], x3 // Load pix2 for third iteration + uabdl v29.8h, v2.8b, v3.8b // Absolute difference, second iteration + umlal v21.4s, v30.4h, v30.4h // Multiply lower half, first iteration + ld1 {v6.8b}, [x1], x3 // Load pix1 for fourth iteration + ld1 {v7.8b}, [x2], x3 // Load pix2 for fourth iteration + uabdl v28.8h, v4.8b, v5.8b // Absolute difference, third iteration + umlal v21.4s, v29.4h, v29.4h // Multiply lower half, second iteration + umlal2 v20.4s, v30.8h, v30.8h // Multiply upper half, second iteration + uabdl v27.8h, v6.8b, v7.8b // Absolute difference, fourth iteration + umlal v21.4s, v28.4h, v28.4h // Multiply lower half, third iteration + umlal2 v20.4s, v29.8h, v29.8h // Multiply upper half, second iteration + sub w4, w4, #4 // h -= 4 + umlal2 v20.4s, v28.8h, v28.8h // Multiply upper half, third iteration + umlal v21.4s, v27.4h, v27.4h // Multiply lower half, fourth iteration + cmp w4, #4 + umlal2 v20.4s, v27.8h, v27.8h // Multiply upper half, fourth iteration + b.ge 1b + + cbz w4, 3f + +// iterate by one +2: + ld1 {v0.8b}, [x1], x3 // Load pix1 + ld1 {v1.8b}, [x2], x3 // Load pix2 + subs w4, w4, #1 + uabdl v30.8h, v0.8b, v1.8b + umlal v21.4s, v30.4h, v30.4h + umlal2 v20.4s, v30.8h, v30.8h + + b.ne 2b + +3: + add v21.4s, v21.4s, v20.4s // Add accumulator vectors together + uaddlv d17, v21.4s // Add up vector + add d18, d18, d17 + + fmov w0, s18 + ret + +endfunc + function sse4_neon, export=1 // x0 - unused // x1 - pix1