From patchwork Tue Aug 16 12:20:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hubert Mazur X-Patchwork-Id: 37308 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp1829249pzi; Tue, 16 Aug 2022 05:21:13 -0700 (PDT) X-Google-Smtp-Source: AA6agR6sOeVWTz5tiCJRIG422Nop7OGuBlQUtx5TkCRSw5NHJj5j744w6X4enQYYC333WV1yvLrL X-Received: by 2002:a17:907:7284:b0:731:82a3:16e3 with SMTP id dt4-20020a170907728400b0073182a316e3mr13636856ejc.30.1660652472967; Tue, 16 Aug 2022 05:21:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660652472; cv=none; d=google.com; s=arc-20160816; b=e1D+8HXPcZC4AJ1fNUQeiVOA1NjUvRm+E8u8/0dmruKEWxp6cLqtx/+kPbw4YabhpN ju8FBBqGfsmjFkepqG2ljbJrmJUbKRkYmsfMfPS8XB2Y+VE6ZDkyr04zAHBUr46zR1rC 5CK8i3l+AfJEG4+AznXSWYMVLc1cqL5OICWRk85AWZ6tQzSkTvPmjqKDc1ZNSNFkXNXT wRfZh+jf43of1qtLQEnnYda9DIXtnxmkIaoVME/MmTRAoqN5jZDkMpgTQzGzo5a6veF1 KLlzb1l7/6eYOKsT2x2fOKTbrwtSsU5b8IE87RVIoWFix92ksVjTg5Bc83HAba7+cIQZ d7rQ== 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=Ez+pIqD6gAD3F1VaypHFvZLGzOKKUzLOTNkDFQ6HA4w=; b=kCfJ4pGq64GHrlju3fmwR3dvtXbZhr6mhzFMnhavBPxK5NMMNW2LmJHkgx/f1J5ht/ Z7zFSCIaxz7fh5zdy0l9vLI/4oQJZmldtUDlrWuifSOfeXPq9H19cc6+JL/unPfF381C ohXws1dF9COMVt/AVA9vZnYpJ25DTSnUhdBYpW0PMK9pPW3qaZy3VUzqo26m/BS7ARY4 fB0qf2qi7RGRh8NQI+FInCKQ2GAPlTDQ2G18+PK6GvHueDJAYVUGxDHWyvmsIf0NrJoV 8f7M9Zl07Vj5jVtISmzHVYZ+53DPUb6b+5FKExXJK04id2ML13e+9rTqJD6jfNre4omJ FxkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@semihalf.com header.s=google header.b=pssuMzo0; 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 u8-20020a50eac8000000b0043e6a16bca1si9539898edp.475.2022.08.16.05.21.11; Tue, 16 Aug 2022 05:21:12 -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=pssuMzo0; 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 303BF68B8FD; Tue, 16 Aug 2022 15:21:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 27F2968B41C for ; Tue, 16 Aug 2022 15:20:56 +0300 (EEST) Received: by mail-lf1-f45.google.com with SMTP id c28so10614753lfh.3 for ; Tue, 16 Aug 2022 05:20:56 -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=VHOgVR5mQm9FMmGWvgy7zxQXWSDL5yO+yk9z1W9gNhk=; b=pssuMzo0Q6Ge9cb1fJmZ1nnqqcXFUmRxCEI1CnW0C2mS5wbIKNmiR7BeB5QV9xnwjJ gAPRfaRLWCZf6xTHfSfBa12Fc47OXm1NW3kecBq6KvPqyNhOGslt10xtCMYoIuamipgP 64AByoszHBafluwnrpYbNQsXoX9VHJaLoQDoMs0NFWTLg+xUzPqdNZpQ9PsN2oj0oiRm lpECeu9W1jbcCNkOfCMuAfYDuwxUAbn/UK7Oi6YoCfz4GM7HO+O30wSfO4++ygI5nygr 6baHxhMeK2ORpsgFPDhouiid5CFNyBSUUkAog58RT8k8HA9zWMz8zAu1/hKkYKxerUvJ HZuA== 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=VHOgVR5mQm9FMmGWvgy7zxQXWSDL5yO+yk9z1W9gNhk=; b=nvUR0uXJ9Tc2DiWxT3uFilE5PaG2+JBQyJL7wfPR/ntMUTPy69U/GfKJ2AE30H5Ib3 ZwXPUBLIBRRoJWFiC1VR5hopSbdbdq9lcVc6fQynTmG0Y0WHdH0Hvf43UR/dFBcztvMJ fuG+WtlQLMo/WvLqiVWchK3uj2j2Oh1qAJU19lwNsos5MIbOnC8BBXW+mQtB+DVgL3UW StFWmuZ29Dy/LyugULLTkBMflqj361+5wbzpFTEQxHL809PB5/hcQAsamTL+gk3DsPSY xGDI82I0bS4QXv/xtZdALwbMvIaLZNXPlK69910nC+ZEjpRGkNFy8TZr9DaO7TUuozlp TILw== X-Gm-Message-State: ACgBeo2563X6XCAj9Xvo221PgzaEgFU+hdzxXoNaCgjnQfPbSz1CWmn2 VrSbh/JYZUCvTgy17vnICVAqErYohhAb1eVt X-Received: by 2002:ac2:5bc4:0:b0:48b:1be:f02d with SMTP id u4-20020ac25bc4000000b0048b01bef02dmr7083289lfn.486.1660652455235; Tue, 16 Aug 2022 05:20:55 -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.20.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Aug 2022 05:20:54 -0700 (PDT) From: Hubert Mazur To: ffmpeg-devel@ffmpeg.org Date: Tue, 16 Aug 2022 14:20:12 +0200 Message-Id: <20220816122016.64929-2-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 1/5] lavc/aarch64: Add neon implementation for sse16 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: erYe3Hon+5Mn Provide neon implementation for sse16 function. Performance comparison tests are shown below. - sse_0_c: 268.2 - sse_0_neon: 43.5 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 | 76 ++++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/libavcodec/aarch64/me_cmp_init_aarch64.c b/libavcodec/aarch64/me_cmp_init_aarch64.c index 79c739914f..7780009d41 100644 --- a/libavcodec/aarch64/me_cmp_init_aarch64.c +++ b/libavcodec/aarch64/me_cmp_init_aarch64.c @@ -30,6 +30,9 @@ int ff_pix_abs16_xy2_neon(MpegEncContext *s, const uint8_t *blk1, const uint8_t int ff_pix_abs16_x2_neon(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, ptrdiff_t stride, int h); +int sse16_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(); @@ -40,5 +43,6 @@ av_cold void ff_me_cmp_init_aarch64(MECmpContext *c, AVCodecContext *avctx) c->pix_abs[0][3] = ff_pix_abs16_xy2_neon; c->sad[0] = ff_pix_abs16_neon; + c->sse[0] = sse16_neon; } } diff --git a/libavcodec/aarch64/me_cmp_neon.S b/libavcodec/aarch64/me_cmp_neon.S index cda7ce0408..825ce45d13 100644 --- a/libavcodec/aarch64/me_cmp_neon.S +++ b/libavcodec/aarch64/me_cmp_neon.S @@ -270,3 +270,79 @@ function ff_pix_abs16_x2_neon, export=1 ret endfunc + +function sse16_neon, export=1 + // x0 - unused + // x1 - pix1 + // x2 - pix2 + // x3 - stride + // w4 - h + + cmp w4, #4 + movi d18, #0 + movi v17.4s, #0 + b.lt 2f + +// Make 4 iterations at once +1: + + // res = abs(pix1[0] - pix2[0]) + // res * res + + ld1 {v0.16b}, [x1], x3 // Load pix1 vector for first iteration + ld1 {v1.16b}, [x2], x3 // Load pix2 vector for first iteration + ld1 {v2.16b}, [x1], x3 // Load pix1 vector for second iteration + uabd v30.16b, v0.16b, v1.16b // Absolute difference, first iteration + ld1 {v3.16b}, [x2], x3 // Load pix2 vector for second iteration + umull v29.8h, v30.8b, v30.8b // Multiply lower half of vectors, first iteration + umull2 v28.8h, v30.16b, v30.16b // Multiply upper half of vectors, first iteration + uabd v27.16b, v2.16b, v3.16b // Absolute difference, second iteration + uadalp v17.4s, v29.8h // Pairwise add, first iteration + ld1 {v4.16b}, [x1], x3 // Load pix1 for third iteration + umull v26.8h, v27.8b, v27.8b // Mulitply lower half, second iteration + umull2 v25.8h, v27.16b, v27.16b // Multiply upper half, second iteration + ld1 {v5.16b}, [x2], x3 // Load pix2 for third iteration + uadalp v17.4s, v26.8h // Pairwise add and accumulate, second iteration + uabd v24.16b, v4.16b, v5.16b // Absolute difference, third iteration + ld1 {v6.16b}, [x1], x3 // Load pix1 for fourth iteration + uadalp v17.4s, v25.8h // Pairwise add andd accumulate, second iteration + umull v23.8h, v24.8b, v24.8b // Multiply lower half, third iteration + umull2 v22.8h, v24.16b, v24.16b // Multiply upper half, third iteration + uadalp v17.4s, v23.8h // Pairwise add and accumulate, third iteration + ld1 {v7.16b}, [x2], x3 // Load pix2 for fouth iteration + uadalp v17.4s, v22.8h // Pairwise add and accumulate, third iteration + uabd v21.16b, v6.16b, v7.16b // Absolute difference, fourth iteration + uadalp v17.4s, v28.8h // Pairwise add and accumulate, first iteration + umull v20.8h, v21.8b, v21.8b // Multiply lower half, fourth iteration + sub w4, w4, #4 // h -= 4 + umull2 v19.8h, v21.16b, v21.16b // Multiply upper half, fourth iteration + uadalp v17.4s, v20.8h // Pairwise add and accumulate, fourth iteration + cmp w4, #4 + uadalp v17.4s, v19.8h // Pairwise add and accumulate, fourth iteration + b.ge 1b + + cbz w4, 3f + +// iterate by one +2: + + ld1 {v0.16b}, [x1], x3 // Load pix1 + ld1 {v1.16b}, [x2], x3 // Load pix2 + + uabd v30.16b, v0.16b, v1.16b + umull v29.8h, v30.8b, v30.8b + umull2 v28.8h, v30.16b, v30.16b + uadalp v17.4s, v29.8h + subs w4, w4, #1 + uadalp v17.4s, v28.8h + + b.ne 2b + +3: + uaddlv d16, v17.4s // add up accumulator vector + add d18, d18, d16 + + fmov w0, s18 + + ret +endfunc