From patchwork Fri Jul 15 08:02:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hubert Mazur X-Patchwork-Id: 36798 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:43a1:b0:8b:53c6:bec9 with SMTP id i33csp125264pzl; Fri, 15 Jul 2022 01:03:30 -0700 (PDT) X-Google-Smtp-Source: AGRyM1t5JpJk9gfkOI9MZYwQtOmmSJEsIhUp+wV3Yr+Ls8nZyWkUATx4zilD3AEz6J316cw7yqmI X-Received: by 2002:a17:907:778a:b0:70c:d67:578e with SMTP id ky10-20020a170907778a00b0070c0d67578emr12338312ejc.696.1657872209882; Fri, 15 Jul 2022 01:03:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657872209; cv=none; d=google.com; s=arc-20160816; b=OB/cCCq9NLIxjLrKog/9iBJtG8hEltunw7OoETH6a4m7aBOaB9JQl9FZr7RnU+3qgM hqGkGZsY6oUXRLePB7G+nitesqyiBl755XdKXBeM3mLLsRwFyRFbrFeBb3YbFzMTPY5Q jzyDhhr6yLPyvMZQcQgypq7WvLjvLXoLFq2aPlaSpZ3G6eDjFb16Yvfr1euSAoNRlQjF rUErgvvu2EprWQ6Lz4V/g4Z89Xlo+8qwxdGvBwUum1wh9rDLrVHDi+adfFCMj3jilSzv 9bjfy7ueXJeZP40DAg17WJPPze4z3DKiSC2b3uG7RX+Wsl6XvgbsVTd+L3IZmPUgcKx4 JBSg== 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=ySXJpVKSqHWrN6t5ATxMQGGIEiKvOn9n+gQS9oak65k=; b=KxD7Y8NaAtmVXDxHxZtImq79Q863SxDATUfNereUALB0+nC8/nneBRLJynTztz83xB dlL5UuQ2Z3ASYlHFzpDqAemF4p9eg5gin4e148kjhNtJeyogt2IhVDGQqBEC2T3JlBSy f7HXVXg+gY7qOnbFYLur7X5bL00QLfWu4jywLjeOqoMjja4E5EmNtsR/8eh5fxB8JAGg pnim9/jAvh6yW6TSC8lOLneUnIEul0Ci31F3tkbDIKemHNcyoVtyKMfJ14XZZDE1eaWY 4KMSnisHKiDqSyNj5VamABldgi92oRpf4xxRCOi7drqN8ee/083MPXb4rawfp/5rqeUF 8otg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@semihalf.com header.s=google header.b=HG7sOfi+; 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 a10-20020a1709065f8a00b0072e6774afc6si4566121eju.366.2022.07.15.01.03.29; Fri, 15 Jul 2022 01:03:29 -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=HG7sOfi+; 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 D09C968B9B7; Fri, 15 Jul 2022 11:03:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2767568B980 for ; Fri, 15 Jul 2022 11:03:02 +0300 (EEST) Received: by mail-lj1-f175.google.com with SMTP id u14so4887261ljh.2 for ; Fri, 15 Jul 2022 01:03:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3gTC+xsHB45ejkET/bI9KWU/ba4G+dd+U2Q3p8NBMz4=; b=HG7sOfi+s2/gdDhiqNq3c6hNHSjUPUSTEbrCE1ScMbCNddIssvinQUw10xCz/7n/JA F+EYJMz+yz7U3WFNVHxf5d9qD3qapQz51jCUtzoqOjef6uNu4o62jCUka8QmzylpTfW4 p3Aw9sn1cKyXR8REHjioBNMWppTmZBba91iQ4xYomUMpPtvCUfu1Ac6WjIVsExnMxZ8v StDaVDM9yO+nseWytY41AsIa4fOTbgJPKkl9ljTEsTImldD8m+6MKKm2IkTT1ScJHeXw l6rXgjGOFrNrEat6WanHrfLnTetZHlTJ4w7JmIduNyNFvHbdeWv0PvYrg7Ou4LDR/fLG oJ1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3gTC+xsHB45ejkET/bI9KWU/ba4G+dd+U2Q3p8NBMz4=; b=CRPL0bTHgFHe04ZpMqYHhJ6hT2PaV/TyVKOi+33TR31LUe8VJ6yXr0OwY0TDaKhkuC G5XHam9OjXSRu7EgpDpUXbJCMOBZbO2jWDk4ut57+4t3Wq5C4JmKk1ZfofOTkUJINjlh MwIJJGtT7QkW0yH0evLIUa0VFu1HVfTeUcYcWTnfLdtJg/5XpbYVAp3PIx4XHKCvN8NM +icdeE/4uegwnMnRdSdS5ugdk5iP9PuqTTnZyW7vr3vWCTuFv8ramSqWs6NR1DrqK1jU iyG0X63a+Ye4y04WnafPKvKzR3BBYpV0W+dl7tMOaVy1sE0U99wqygBi4H94YdhV8pJG 5vtA== X-Gm-Message-State: AJIora/LS75l89FW318GZfNkAVz4ODQiWDRfRJHJ6XC/Dz/qdaK/emXo nTlBzcwx76LbPCWGidaja3XuSuQDPYBz7TVQ X-Received: by 2002:a2e:131a:0:b0:25d:68eb:cf6 with SMTP id 26-20020a2e131a000000b0025d68eb0cf6mr6129297ljt.267.1657872181067; Fri, 15 Jul 2022 01:03:01 -0700 (PDT) Received: from hum-HP-ProBook-440-G7.semihalf.net (adrf243.neoplus.adsl.tpnet.pl. [79.185.165.243]) by smtp.gmail.com with ESMTPSA id k1-20020a2eb741000000b0025d542731ffsm645548ljo.5.2022.07.15.01.02.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jul 2022 01:03:00 -0700 (PDT) From: Hubert Mazur To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Jul 2022 10:02:25 +0200 Message-Id: <20220715080228.686736-3-hum@semihalf.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220715080228.686736-1-hum@semihalf.com> References: <20220715080228.686736-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: ruKHrbE3tU5I Provide neon implementation for sse4 function. Performance comparison tests are shown below. - sse_2_c: 74.0 - sse_2_neon: 24.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 | 65 ++++++++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/libavcodec/aarch64/me_cmp_init_aarch64.c b/libavcodec/aarch64/me_cmp_init_aarch64.c index 3ff5767bd0..72a2062e7e 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, uint8_t *pix1, uint8_t *pix2, int sse16_neon(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, ptrdiff_t stride, int h); +int sse4_neon(MpegEncContext *v, uint8_t *pix1, 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 88cd335443..bacf151314 100644 --- a/libavcodec/aarch64/me_cmp_neon.S +++ b/libavcodec/aarch64/me_cmp_neon.S @@ -360,3 +360,68 @@ 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 d17, #0 + cmp w4, #4 + b.le 2f + +// make 4 iterations at once +1: + + // res = abs(pix1[0] - pix2[0]) + // res * res + + ld1 {v0.4b}, [x1], x3 + ld1 {v1.4b}, [x2], x3 + uabdl v30.8h, v0.4b, v1.4b + ld1 {v2.4b}, [x1], x3 + ld1 {v3.4b}, [x2], x3 + umull v16.4s, v30.4h, v30.4h + uabdl v29.8h, v2.4b, v3.4b + ld1 {v4.4b}, [x1], x3 + ld1 {v5.4b}, [x2], x3 + umlal v16.4s, v29.4h, v29.4h + uabdl v28.8h, v4.4b, v5.4b + ld1 {v6.4b}, [x1], x3 + ld1 {v7.4b}, [x2], x3 + umlal v16.4s, v28.4h, v28.4h + uabdl v27.8h, v6.4b, v7.4b + umlal v16.4s, v27.4h, v27.4h + + uaddlv d17, v16.4s + add d18, d18, d17 + + sub w4, w4, #4 + cmp w4, #4 + b.ge 1b + + cbnz w4, 2f + fmov w0, s18 + + ret + +// iterate by one +2: + ld1 {v0.4b}, [x1], x3 + ld1 {v1.4b}, [x2], x3 + uabdl v30.8h, v0.4b, v1.4b + umull v16.4s, v30.4h, v30.4h + + uaddlv d17, v16.4s + add d18, d18, d17 + + subs w4, w4, #1 + b.ne 2b + fmov w0, s18 + + ret + +endfunc