From patchwork Tue Aug 16 12:20:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hubert Mazur X-Patchwork-Id: 37310 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp1829393pzi; Tue, 16 Aug 2022 05:21:31 -0700 (PDT) X-Google-Smtp-Source: AA6agR499SIV26f5IFx0A6OPjvrerFqCRrQbkS3tx2mT/8tJUFd+qFQh2ZTQmeD4JUg1b4rchvZ0 X-Received: by 2002:a05:6402:5203:b0:43d:444b:9f99 with SMTP id s3-20020a056402520300b0043d444b9f99mr19016240edd.343.1660652480855; Tue, 16 Aug 2022 05:21:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660652480; cv=none; d=google.com; s=arc-20160816; b=T7zSr0wjoX9aX6Nf/xzceGLqom1CaVvbsYvDepjXXbOKVoCtcONMIxYFEPCrvZEsbH EL6wU9/1vDzsCPoc2VWzZ17jjH/nnGyDljpRDBN5kKiURvI9edM0fFfdlfJdNQowKwHX mUOo9fdc4oUquNJWl46tV2XXMCQiGcmLHaEs99lfHVv9C7yLIr19tXt/slkdX8GZrpvO n1QseFj8nDGx5mGlrcOpKaRU6vVN22YrfY7GzDdCD+BfJelcP4cvnphlnPctkPXEFqv7 SFwTNAMsvrUxuczFniUiN5FtmgAVD97copIF5Bg1r0AxaE+aUAItVLaGFrbah1xVxbnG rWhw== 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=OQ+Z51WiLduPFeRp7if87fL97/JfKwEd9mZk3qnS4wE=; b=0wXPTP1aNEUroN4fDEwnZUzdXxVdh74gVUHEDiwUrd/U6Q85GC29HpqtM51qlbrmLV yKK2GXmTRWNh/GW0sf7Vk7kMoXu23LMhhll3jUnZnsyknZmjnIDLimz1ORFvcQVwmEzL 8EJ/u8dvz8kwsX2jPA2Nkvn8EedgfCg0VKmY+bEWVYhnQeFXS98MwDwImKz8vOKi2kw6 rDAwxSst2PGSvjJDjglCPBXVd2aHrEoE8pvMB6niDswFfjPITf+LKJf1qttcwULyKKmN /xLLjMSx5eFIlB17g+BGDcgL5/ihjL1y47ZEsn0C0Z/GqaOfIrWDIC6oK71ptB9bqCQs pwbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@semihalf.com header.s=google header.b=Qmh5gqsX; 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 jg21-20020a170907971500b00733002330edsi9911985ejc.342.2022.08.16.05.21.20; Tue, 16 Aug 2022 05:21:20 -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=Qmh5gqsX; 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 3E1EF68B92B; Tue, 16 Aug 2022 15:21:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2F9A868B8F0 for ; Tue, 16 Aug 2022 15:20:59 +0300 (EEST) Received: by mail-lf1-f49.google.com with SMTP id v2so14670112lfi.6 for ; Tue, 16 Aug 2022 05:20:59 -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=fUY7SGKEq38K8vvA4cdcrVp3TtbAL+6QhVSEp4yFh4I=; b=Qmh5gqsXEs0z+0os/3PIKP71Zdy/HFYLYuHOWAP844YzN6V5n21xhoD3PJgBCKVQv4 8+EBebjI7ug9B9iHSS/ABgKrpteTiX2zhtbkuqX+gVy96Bm5Y2VPFgU99ZKI8fPSrQrd 2BD5A8JzwEZEkuuCH6w5JUz9QeF5955eCcymZ0geeas2ZOj87undd5m9NXYsmOgVDY3V +p68I3Xym7/x7+ajyTJfSKob1rkS2wIG8u2x1jkQ6zSaQfTIDKOqtSJP4L+a0i2mAYRY ryXR7Lto1P6mvXhk/HbCa7wB4oJkrxkypPlI5kUZnix2pggx/IcDVzY/G69/hPF0LA01 sLxQ== 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=fUY7SGKEq38K8vvA4cdcrVp3TtbAL+6QhVSEp4yFh4I=; b=z2sGknjHUp2xjym+gwct8eVXtlcRcgKj8V/ASxkpjsuhGgz1YFzKFky6dU0XlMPVAL kCPZuDkn/iUted1lTl8/DbixDOGXk8AOEEJn5mYF1hMNAe+PnO7B88YH9k1NvBq9Qm9s ZnJ9a7L8jP/ok5/gXuooWcUB33zhXXeDDX8h3+Ind/unhDfzFtO7KJW+4Qfk4UvSjxsA UOTYmAbY468JzjvmFVjfqNT/sPmfAzg/7tJv53Fbpjm3gTADAExXcm9eyMtd9MyPnjFz C3lsTaKYmdVJvmwpN2kRr/LsS8GdLr8NboNy/3D/p0vJ1lKTuRNHFKj64O68ShdAfDR6 ExoQ== X-Gm-Message-State: ACgBeo2U8nH/78ADzfrKQOd7AYu3qTyWeZgRskHtIdCaYODzrVOjZDwH NS24cnjZTYbt2wjv8lcLMNe3LWLfp//tkLnk X-Received: by 2002:a05:6512:b85:b0:48c:db16:1b27 with SMTP id b5-20020a0565120b8500b0048cdb161b27mr7124306lfv.87.1660652458144; Tue, 16 Aug 2022 05:20:58 -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.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Aug 2022 05:20:57 -0700 (PDT) From: Hubert Mazur To: ffmpeg-devel@ffmpeg.org Date: Tue, 16 Aug 2022 14:20:13 +0200 Message-Id: <20220816122016.64929-3-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 2/5] lavc/aarch64: Add neon implementation for sse4 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: qEcUKkkCVA5F Provide neon implementation for sse4 function. Performance comparison tests are shown below. - sse_2_c: 80.7 - sse_2_neon: 31.0 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 | 58 ++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/libavcodec/aarch64/me_cmp_init_aarch64.c b/libavcodec/aarch64/me_cmp_init_aarch64.c index 7780009d41..955592625a 100644 --- a/libavcodec/aarch64/me_cmp_init_aarch64.c +++ b/libavcodec/aarch64/me_cmp_init_aarch64.c @@ -32,6 +32,8 @@ int ff_pix_abs16_x2_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 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) { @@ -44,5 +46,6 @@ 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[2] = sse4_neon; } } diff --git a/libavcodec/aarch64/me_cmp_neon.S b/libavcodec/aarch64/me_cmp_neon.S index 825ce45d13..367924b3c2 100644 --- a/libavcodec/aarch64/me_cmp_neon.S +++ b/libavcodec/aarch64/me_cmp_neon.S @@ -346,3 +346,61 @@ function sse16_neon, export=1 ret endfunc + +function sse4_neon, export=1 + // x0 - unused + // x1 - pix1 + // x2 - pix2 + // x3 - stride + // w4 - h + + movi d18, #0 + movi v16.4s, #0 // clear the result accumulator + cmp w4, #4 + b.le 2f + +// make 4 iterations at once +1: + + // res = abs(pix1[0] - pix2[0]) + // res * res + + ld1 {v0.s}[0], [x1], x3 // Load pix1, first iteration + ld1 {v1.s}[0], [x2], x3 // Load pix2, first iteration + ld1 {v2.s}[0], [x1], x3 // Load pix1, second iteration + ld1 {v3.s}[0], [x2], x3 // Load pix2, second iteration + uabdl v30.8h, v0.8b, v1.8b // Absolute difference, first iteration + ld1 {v4.s}[0], [x1], x3 // Load pix1, third iteration + ld1 {v5.s}[0], [x2], x3 // Load pix2, third iteration + uabdl v29.8h, v2.8b, v3.8b // Absolute difference, second iteration + umlal v16.4s, v30.4h, v30.4h // Multiply vectors, first iteration + ld1 {v6.s}[0], [x1], x3 // Load pix1, fourth iteration + ld1 {v7.s}[0], [x2], x3 // Load pix2, fourth iteration + uabdl v28.8h, v4.8b, v5.8b // Absolute difference, third iteration + umlal v16.4s, v29.4h, v29.4h // Multiply and accumulate, second iteration + sub w4, w4, #4 + uabdl v27.8h, v6.8b, v7.8b // Absolue difference, fourth iteration + umlal v16.4s, v28.4h, v28.4h // Multiply and accumulate, third iteration + cmp w4, #4 + umlal v16.4s, v27.4h, v27.4h // Multiply and accumulate, fourth iteration + b.ge 1b + + cbz w4, 3f + +// iterate by one +2: + ld1 {v0.s}[0], [x1], x3 // Load pix1 + ld1 {v1.s}[0], [x2], x3 // Load pix2 + uabdl v30.8h, v0.8b, v1.8b + subs w4, w4, #1 + umlal v16.4s, v30.4h, v30.4h + + b.ne 2b + +3: + uaddlv d17, v16.4s // Add vector + add d18, d18, d17 + fmov w0, s18 + + ret +endfunc