From patchwork Fri Jul 15 08:02:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hubert Mazur X-Patchwork-Id: 36797 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:43a1:b0:8b:53c6:bec9 with SMTP id i33csp125163pzl; Fri, 15 Jul 2022 01:03:18 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sM3hTnCOyaaSlP2wMUuLziW04snpkpYZ53RPIdtvCHnGeZ9fgXnDZcKPD+vSoabzQxQAPz X-Received: by 2002:aa7:cc0b:0:b0:437:9c60:127b with SMTP id q11-20020aa7cc0b000000b004379c60127bmr16955221edt.320.1657872198677; Fri, 15 Jul 2022 01:03:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657872198; cv=none; d=google.com; s=arc-20160816; b=FO4RgJiA9IHKPfeCTunzSb5jAii6E+wVoXr7GZvYw1+8wloNyDCXS4xBpoFIjZpg2S GpYv/RrkmqB996gb4qcco0XI0hKrdMVgnud0Q0F/5ZhYHXpod5GfIrE4Rq8RfxYBkRpx KNAERxXoIbI1sGvKA8iy6EVODHi4xNbpXJxcFbAUZmRfIwKpWU/8ntViITbUeC53VztQ 27P5PFv8m2/gR/Tk+meMaUYELRMAIPojyK8VU07ciEdv4hzC30VLow6OsXbQj0hMib59 Je8+17JKGZfQdrC/tLvWLOk6hB770/cYSLCwACpkxr0GaAgeZET8muKizC8sLn+Y70aQ bG4Q== 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=WfUfVD/LNLA48izIi8AcZR9QqQrLd/WAhJ2DH/WjQxI=; b=z66ZySBaY9/N6glwS872RiOrkiPs8ASGRSmnnmUJ2TrHeWkZPJ4efpZ+jMIqPms2N4 aBunj7ARF4+Ycw5FcGaVcHIgbyP+/rjdVEDJej216XV+83ITCXH622eoD4ij/6noaPl7 A35ZBycLsTD9Ygcu+m4vX0gMIfNgBn9qSovVMXkTsg2yiYl0F2YAokt83ZfwDSEcyu44 fM4xdPtaPVaGCl+Gos0bOzTDYI+owyGBRzL70E+q5piQYkU9o7J1IVOr18gXQlQZcEZ8 lSM7EVTktlhDA+hmyGJtSIf9Z3j1Z5RCucDEspQTA5oAjvH3iCWU3WMoCxlr8gVnbL4r gZpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@semihalf.com header.s=google header.b=RElS4eh5; 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 sd19-20020a1709076e1300b0072af95f96dbsi4985705ejc.70.2022.07.15.01.03.18; Fri, 15 Jul 2022 01:03:18 -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=RElS4eh5; 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 E1A0068B75C; Fri, 15 Jul 2022 11:03:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 28F9A68B8B4 for ; Fri, 15 Jul 2022 11:02:59 +0300 (EEST) Received: by mail-lf1-f44.google.com with SMTP id bf9so6562649lfb.13 for ; Fri, 15 Jul 2022 01:02:59 -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=GtzCRjQ5NiO0sHFITcA3YlcNn5gMmT2hLxDgl/EiCeY=; b=RElS4eh5VQCEuOv9DTVM312lpbJS7djCdNDibmS/hSX41/FG5fKbBbuwqwtfTK9RwH /oodPCSbqctmw1W8/O9/FUi+q0A61APrO2fYqfgOMFFvh6512pzQib/nctV7g1FZXDQy tkQV8LHNzBK7Ri78D/WIGkF26pugmEYMvcQ2jUygvW9Et3f8swF7DPtlNdLhD+G4bxEp HOSmxOE8bsJFO0TLkxZhVZLSg/CMPG+PcHSY5A5iOlJm/eHO7ypFEsfrnrgJzUiRGxeS VTqX4YUdpQEGXKxySzfF2qYUdRvbfq46c+2IrW1lLBbzLeE8w3v0UwoItKQOOGDS8wpF Pydw== 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=GtzCRjQ5NiO0sHFITcA3YlcNn5gMmT2hLxDgl/EiCeY=; b=LAo9BuWZIRJb95b8MnJ7hEQsc4ITHW39Lg3fDaV3iWJS1Wtv79Fxa/8fPFYWWuEKEz ljzjaGmQ/zjTgXlVI/PUUTCezVuiqJqNJTz9bk9Wdd44YTiPXgqfbzg2Rtd+LbJFE3FO 5rcdP7j2MZ18oq3In5ZEA2juaWi+yOfWIzsCCY5e+nTALajjHoc5M7yPBkj30PYcHQWy GiO3HnXSLsEkHglbyExy1uI+5tbHdspMJH84KXDolcJf3AHK/G9yDTBtBiwwY4CLrPLZ w7q9jU/z6ohV9RRSeyG9sLyHAey34HtB3wY06zI3CddAwSi6r/3K52EtBaN7dFO5o28d QUXA== X-Gm-Message-State: AJIora9HUAnz+DL9cV3KQrlpd5yN8AgIL0CR07ei4ubjd95VdeV88OtM t+GDQu/HXmpumjrrpaBRKmzXauTjYSVOKIxs X-Received: by 2002:a05:6512:1153:b0:48a:2836:692f with SMTP id m19-20020a056512115300b0048a2836692fmr76410lfg.650.1657872178327; Fri, 15 Jul 2022 01:02:58 -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.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jul 2022 01:02:57 -0700 (PDT) From: Hubert Mazur To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Jul 2022 10:02:24 +0200 Message-Id: <20220715080228.686736-2-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 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: LCngYirzNyKZ Provide neon implementation for sse16 function. Performance comparison tests are shown below. - sse_0_c: 273.0 - sse_0_neon: 48.2 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 | 82 ++++++++++++++++++++++++ 2 files changed, 86 insertions(+) diff --git a/libavcodec/aarch64/me_cmp_init_aarch64.c b/libavcodec/aarch64/me_cmp_init_aarch64.c index 136b008eb7..3ff5767bd0 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, uint8_t *blk1, uint8_t *blk2, int ff_pix_abs16_x2_neon(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, ptrdiff_t stride, int h); +int sse16_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) { 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 e49d049fc2..88cd335443 100644 --- a/libavcodec/aarch64/me_cmp_neon.S +++ b/libavcodec/aarch64/me_cmp_neon.S @@ -278,3 +278,85 @@ 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 + b.lt 2f + +// make 4 iterations at once +1: + + // res = abs(pix1[0] - pix2[0]) + // res * res + + ld1 {v0.16b}, [x1], x3 + ld1 {v1.16b}, [x2], x3 + uabd v30.16b, v0.16b, v1.16b + ld1 {v2.16b}, [x1], x3 + umull v29.8h, v30.8b, v30.8b + ld1 {v3.16b}, [x2], x3 + umull2 v28.8h, v30.16b, v30.16b + uabd v27.16b, v2.16b, v3.16b + uaddlp v17.4s, v29.8h + umull v26.8h, v27.8b, v27.8b + umull2 v25.8h, v27.16b, v27.16b + ld1 {v4.16b}, [x1], x3 + uadalp v17.4s, v26.8h + ld1 {v5.16b}, [x2], x3 + uadalp v17.4s, v25.8h + uabd v24.16b, v4.16b, v5.16b + ld1 {v6.16b}, [x1], x3 + umull v23.8h, v24.8b, v24.8b + uadalp v17.4s, v23.8h + umull2 v22.8h, v24.16b, v24.16b + uadalp v17.4s, v22.8h + ld1 {v7.16b}, [x2], x3 + uadalp v17.4s, v28.8h + uabd v21.16b, v6.16b, v7.16b + umull v20.8h, v21.8b, v21.8b + uadalp v17.4s, v20.8h + umull2 v19.8h, v21.16b, v21.16b + uadalp v17.4s, v19.8h + + sub w4, w4, #4 + uaddlv d16, v17.4s + cmp w4, #4 + add d18, d18, d16 + + b.ge 1b + + cbnz w4, 2f + fmov w0, s18 + + ret + +// iterate by one +2: + + ld1 {v0.16b}, [x1], x3 + ld1 {v1.16b}, [x2], x3 + + uabd v30.16b, v0.16b, v1.16b + umull v29.8h, v0.8b, v1.8b + umull2 v28.8h, v0.16b, v1.16b + uaddlp v17.4s, v29.8h + uadalp v17.4s, v28.8h + + + subs w4, w4, #1 + uaddlv d16, v17.4s + add d18, d18, d16 + + b.ne 2b + fmov w0, s18 + + ret + +endfunc 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 From patchwork Fri Jul 15 08:02: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: 36799 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:43a1:b0:8b:53c6:bec9 with SMTP id i33csp125377pzl; Fri, 15 Jul 2022 01:03:43 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tAazegxettjcgzjRW0VXnXs6zyF2vu23rRX3GPJAWR3SC9GpvHfXx3uE23ZX3PV6ItBHyV X-Received: by 2002:a17:906:cc0e:b0:72b:311b:8ed9 with SMTP id ml14-20020a170906cc0e00b0072b311b8ed9mr12523374ejb.186.1657872223637; Fri, 15 Jul 2022 01:03:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657872223; cv=none; d=google.com; s=arc-20160816; b=TVn5XBRan/LG4aH1ofm60pwGZk5pEHFlCXZ3XRljgn40Z8zpQhcMtoH/M+wHVNT5Qh VfghUCLnJWuHLlpWJiq1g0usYTLsFn8YWN1IHslpxf06hNw4hLqR/UdgUMhe+UjF4P0C LRXon/LIST95ZdUmwedDRj8WY31Dzj/K0G5aNbD/TPJtEVgY9OyhpB2EtoFNSfUa/JzY Ms2+7IZ8dBilwVJDz1hHGBReJ96l4+kRi14sg7trbiegzFvjzPcYGA30dutYIVkRf+Vb iUmrHOMm7lISnhVRBEjLULozR+N1DboQ2gorWvjgvcUost8FEFZHumw7AKmgZ7HIU0Em oKUw== 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=hjEcwsqAaCfYYF4R4kboc/goTgYZQhCO5zW1xWOPhD0=; b=H9iugUy87KbBFwRq6AHLzbpU1CCNPnhOIowRCuxA3moaa7puyMV9DV801/hxXeD9zu K1w+uWj9LcxrfLp7VCBJq67pVO23W1ZJdP3m7ZIpHF7xox0jqPT71ktytQd+/qlGlCVE Iqf2yQBGvBu37oxJSzzNuqVZxtLi5uCG+yFXCPmFg0s4LRSoVPWatJxvwkVMaFUZ1oS2 PSSkGp7ttmzdw8iAdsSDt2SOTMkEO7NBHIvZeT1o2u3XB6R8or7fPDhgr4vQ2/vyadO/ N5EhhIl9XW9vGLBsbWU88nAp4/DXfPPWj+1rtA7djgb2Zsqbcju1HL5peU1rDa0MgSMj Bl+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@semihalf.com header.s=google header.b="d1u+g/du"; 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 i9-20020a0564020f0900b00435a9115e94si4805855eda.38.2022.07.15.01.03.42; Fri, 15 Jul 2022 01:03:43 -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="d1u+g/du"; 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 E0E1A68B98D; Fri, 15 Jul 2022 11:03:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8E83E68B9BF for ; Fri, 15 Jul 2022 11:03:04 +0300 (EEST) Received: by mail-lj1-f169.google.com with SMTP id p6so4863890ljc.8 for ; Fri, 15 Jul 2022 01:03:04 -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=J6EuxDY1SXY5APyH+DpJ8Q0rPOWudzi3L2/8LZuA2Ag=; b=d1u+g/duGYewl2+ahEE/3klL7nttYyGhhShBFS6q6G28Dz2cYrE2f/Zlb4XWsHmnbK 753+SQs6CIC6ggDzMLuSSdJrWGjKYGGfQoTyJn8fZiUUiKzH4z2n9HNXO6GJedXX9EwT Z+8fH6W1Gsw25qFKOXu0ekVcXfPMdvTp7V16tQ9gwOS1OdX6OIvpwqIle9XB/dWci6Dm 9brKh0q3Yok6K5btVQ6pDq3hb40oliUC+4K1SJWNaIELbX58qZ64UtU5Htb5Kz/5THjg andznbB3r8a6QRXnQDndzUojl1/WFb0MZTfeR+cojCq7wRc++AnUKByx4xeGs7+dcN5C 5p4A== 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=J6EuxDY1SXY5APyH+DpJ8Q0rPOWudzi3L2/8LZuA2Ag=; b=3FqAC8wPI5VI/EbsCK+3ZoEVALmqje7sdcdxjUbv3DweytKgwgaGRC3N3sq//48ECo pXULtHEMlZd3JWldASySO1u2RPwC4xIEPM2V3TV4ubyjhvcHlydJd+VfqQVPRxYffAPC XulJn/eg7TIW9kF3ckTKqiETwbSvZOTn0X++Qrig9KS5vei9kYRUJwC4pP584iw+Le8M HaRUsg6YztQI3C0945vxsLap7xI7YJut5BDv8OoQX29fRJ35rLwq0gyx1WRW3S4GaB10 EiRxoDY6sUqRYdnGyT0tfVZBfdJCzUTsUyULl9rhqXXpEMOwDWxgMAMTT8MNF7/WruUU YhHg== X-Gm-Message-State: AJIora9WznqCoz+PT1T1BAc4E2JtAdQ8fvQWe7bqRZO+4Uu29IkidKOQ Hd2ynDanhRd/XKkgn9g/VoPoB15ws/v1qu8W X-Received: by 2002:a2e:a9a6:0:b0:25d:601a:d3d8 with SMTP id x38-20020a2ea9a6000000b0025d601ad3d8mr6265059ljq.141.1657872183534; Fri, 15 Jul 2022 01:03:03 -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.03.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jul 2022 01:03:03 -0700 (PDT) From: Hubert Mazur To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Jul 2022 10:02:26 +0200 Message-Id: <20220715080228.686736-4-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 3/5] lavc/aarch64: Add neon implementation for pix_abs16_y2 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: 3wiWQYEIJxN/ Provide optimized implementation of pix_abs16_y2 function for arm64. Performance comparison tests are shown below. pix_abs_0_2_c: 308.5 pix_abs_0_2_neon: 39.2 Benchmarks and tests 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 | 74 ++++++++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/libavcodec/aarch64/me_cmp_init_aarch64.c b/libavcodec/aarch64/me_cmp_init_aarch64.c index 72a2062e7e..07d62cc1e5 100644 --- a/libavcodec/aarch64/me_cmp_init_aarch64.c +++ b/libavcodec/aarch64/me_cmp_init_aarch64.c @@ -29,6 +29,8 @@ int ff_pix_abs16_xy2_neon(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2, ptrdiff_t stride, int h); int ff_pix_abs16_x2_neon(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, ptrdiff_t stride, int h); +int ff_pix_abs16_y2_neon(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, + ptrdiff_t stride, int h); int sse16_neon(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, ptrdiff_t stride, int h); @@ -42,6 +44,7 @@ av_cold void ff_me_cmp_init_aarch64(MECmpContext *c, AVCodecContext *avctx) if (have_neon(cpu_flags)) { c->pix_abs[0][0] = ff_pix_abs16_neon; c->pix_abs[0][1] = ff_pix_abs16_x2_neon; + c->pix_abs[0][2] = ff_pix_abs16_y2_neon; c->pix_abs[0][3] = ff_pix_abs16_xy2_neon; c->sad[0] = ff_pix_abs16_neon; diff --git a/libavcodec/aarch64/me_cmp_neon.S b/libavcodec/aarch64/me_cmp_neon.S index bacf151314..858833b0ae 100644 --- a/libavcodec/aarch64/me_cmp_neon.S +++ b/libavcodec/aarch64/me_cmp_neon.S @@ -425,3 +425,77 @@ function sse4_neon, export=1 ret endfunc + +function ff_pix_abs16_y2_neon, export=1 + // x0 unused + // x1 uint8_t *pix1 + // x2 uint8_t *pix2 + // x3 ptrdiff_t stride + // x4 int h + // x5 uint8_t *pix2 + stride + + // initialize buffers + movi d18, #0 + add x5, x2, x3 + cmp w4, #4 + b.lt 2f + +// make 4 iterations at once +1: + + // abs(pix1[0], avg2(pix2[0], pix2[0 + stride])) + // avg2(a, b) = (((a) + (b) + 1) >> 1) + // abs(x) = (x < 0 ? (-x) : (x)) + + ld1 {v1.16b}, [x2], x3 + ld1 {v2.16b}, [x5], x3 + urhadd v30.16b, v1.16b, v2.16b + ld1 {v0.16b}, [x1], x3 + uabdl v29.8h, v0.8b, v30.8b + ld1 {v4.16b}, [x2], x3 + uabdl2 v28.8h, v0.16b, v30.16b + ld1 {v5.16b}, [x5], x3 + urhadd v27.16b, v4.16b, v5.16b + ld1 {v3.16b}, [x1], x3 + uabal v29.8h, v3.8b, v27.8b + ld1 {v7.16b}, [x2], x3 + uabal2 v28.8h, v3.16b, v27.16b + ld1 {v20.16b}, [x5], x3 + urhadd v26.16b, v7.16b, v20.16b + ld1 {v6.16b}, [x1], x3 + uabal v29.8h, v6.8b, v26.8b + ld1 {v22.16b}, [x2], x3 + uabal2 v28.8h, v6.16b, v26.16b + ld1 {v23.16b}, [x5], x3 + urhadd v25.16b, v22.16b, v23.16b + ld1 {v21.16b}, [x1], x3 + uabal v29.8h, v21.8b, v25.8b + uabal2 v28.8h, v21.16b, v25.16b + + add v29.8h, v29.8h, v28.8h + sub w4, w4, #4 + uaddlv s16, v29.8h + cmp w4, #4 + add d18, d18, d16 + b.ge 1b + cbz w4, 3f + +// iterate by one +2: + + ld1 {v0.16b}, [x1], x3 + ld1 {v1.16b}, [x2], x3 + urhadd v30.16b, v1.16b, v2.16b + ld1 {v2.16b}, [x5], x3 + uabd v30.16b, v30.16b, v30.16b + + uaddlv h17, v30.16b + subs w4, w4, #1 + add d18, d18, d17 + b.ne 2b + +3: + fmov w0, s18 + + ret +endfunc From patchwork Fri Jul 15 08:02:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hubert Mazur X-Patchwork-Id: 36800 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:43a1:b0:8b:53c6:bec9 with SMTP id i33csp125461pzl; Fri, 15 Jul 2022 01:03:54 -0700 (PDT) X-Google-Smtp-Source: AGRyM1ucD3fXk3uPjl/VLZTa5Wx85ifFnoArHXLYwRssxYiuVjRmsIxi7xFczPo+MFfR8sdjO7Ha X-Received: by 2002:a05:6402:5518:b0:43a:9e32:b6fc with SMTP id fi24-20020a056402551800b0043a9e32b6fcmr17761625edb.252.1657872234195; Fri, 15 Jul 2022 01:03:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657872234; cv=none; d=google.com; s=arc-20160816; b=Bonr6E4cZg6WXGtNbCLapS4fuXQRIyVuihAT5JPYEAj5C99zvqGHbeD1Vk9sCBRPtO rXKU7IhpcjzITxrU9eiZCP44BA400Gstk+MUuYcxihC2wt8szUgnknn/CqxZQDNowhPC pBLjEyZphcxsBIqiYKISegigPQYp23jnZ3qvYKKdCgU7wued53vUSGc9Gr88cEFa5i6+ duxkTshFvH4hq0SCBgGxHjgIPfmGmqen/fFp3XpvjFk5YqEoAlTgaqFdeBsAPkX5YOII dkGKqwZIHaW+XX7hV2z7zO5hZs/qdSDgyscM6NrrWJJBXloYUDC70VzDhSKE6KE7c5yE 2/pw== 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=oht7Ga6Pnt+51X8aqEdLeo8CHG0tC79N5zW6m+flKVs=; b=a4durrmQn+hORHaJsGvYCHpDPdaXa3/Nx0A3OE+SCmM+S+XnhzTS3ggcufm05gui7n jRlyLnJpPw2owOPDj2B8aMbLy3OVweyOWPkAVBXxlT7e54Phuwthj/MQunIof0sQui8A Fbagv2USGc8GQbBQCeN0criSm8wf/iZseTFw1WxjKu91nYB0gwH7N7BrqczKnXo3bNwQ +4DhRvtUcIM44E2mZzZWoeJ96toKkPEx3C4+hMW1+c+LJtnL/IHkNtXk6nlTPXIXGzPP GqgELPthZMWmGt5MF4ryBu4vE7gDS31l5tMFLXxSoQ2UZGaLYPnY3YxZtBkm0IFeA3Tq k+rQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@semihalf.com header.s=google header.b=ar8hlWAM; 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 nc32-20020a1709071c2000b0072b2fbd78bcsi5448739ejc.665.2022.07.15.01.03.53; Fri, 15 Jul 2022 01:03:54 -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=ar8hlWAM; 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 1860D68B99B; Fri, 15 Jul 2022 11:03:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AC9A268B9C5 for ; Fri, 15 Jul 2022 11:03:06 +0300 (EEST) Received: by mail-lj1-f172.google.com with SMTP id w17so4873554ljh.6 for ; Fri, 15 Jul 2022 01:03:06 -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=n6jw87FEiCsAYLGYWZOMEx4dHyRKN1RYEAHyzZFV/hg=; b=ar8hlWAMFvoRk1RMEXgyGTFgKULE716ijaxTFcTFAwqYkUi8aRuqutK9ILuXYtippR sx0K3bf67h4XS+SOqq2TMXi8MWX0CZszqhhOUDtl3sF6XpHKQaPkuLRwSYBiLSdVeJFV t0gWAj6heQfAmHBU/gk79LJRsQTQRXS7FMpVoLaoV7eAFOTQXgff3e89HswULWnhrs2u RQhPBzNSlQ4qqaM86Tom/Ed/zjp7tjZVqCHdy5yn7N55gx2/6np9VZe7ujbR5UukjQme pdQJ6J2ClC8LtQFnwmNbIUfSAuqdMg4M0s31Cs3yJFKdFwNvXIYvoccLL9eWVEhZpaB4 R/Gg== 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=n6jw87FEiCsAYLGYWZOMEx4dHyRKN1RYEAHyzZFV/hg=; b=L2NrHgzhrBMfyC7/AFJo8Zu1yAOVQsx8+hmw+zNsXUau5OKfVoBy2sLAc3d5B8GjZr PLnO7nBD2+ej3ocZkKCyOTnxqUsvD5CfUEtqSxFpd9wmuAJYBwvls8jbj434X9EsSqBl 2WroWF5LQp3CT0tfT5ijoV1ueVAYmnRKR+/fUFL2GOdvbe0qUwoCCtbW483cgoSY43Yb OLsfmKBDZcIhy+NCcrxPp0ds9YywpGLN5M+INnrkLOXyOx6WroedYzYA7Arq1Giw48sv JCNjGAhhku8GhI9YNC6y0+DoJIonT9OioPll4jagUjNCuuZTSV44/sfAJYXfqs8ux2PN 95lg== X-Gm-Message-State: AJIora8wT9LcLDiHk/GzbiIwt7Cf26YU/GcmPFjnW/Q3XViNl4J22ffK fyFVUCXuwqm4d+wU/8xlWx4VlasRORFI4g== X-Received: by 2002:a2e:be04:0:b0:25d:5e4c:9028 with SMTP id z4-20020a2ebe04000000b0025d5e4c9028mr6117114ljq.464.1657872185769; Fri, 15 Jul 2022 01:03:05 -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.03.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jul 2022 01:03:05 -0700 (PDT) From: Hubert Mazur To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Jul 2022 10:02:27 +0200 Message-Id: <20220715080228.686736-5-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 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: ADAeRJNHZkHs Provide optimized implementation of sse8 function for arm64. Performance comparison tests are shown below. - sse_1_c: 133.0 - sse_1_neon: 36.7 Benchmarks and tests 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 | 72 ++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/libavcodec/aarch64/me_cmp_init_aarch64.c b/libavcodec/aarch64/me_cmp_init_aarch64.c index 07d62cc1e5..89c817990c 100644 --- a/libavcodec/aarch64/me_cmp_init_aarch64.c +++ b/libavcodec/aarch64/me_cmp_init_aarch64.c @@ -34,6 +34,8 @@ int ff_pix_abs16_y2_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 sse8_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); @@ -49,6 +51,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 858833b0ae..c78e26df4b 100644 --- a/libavcodec/aarch64/me_cmp_neon.S +++ b/libavcodec/aarch64/me_cmp_neon.S @@ -361,6 +361,78 @@ function sse16_neon, export=1 endfunc +function sse8_neon, export=1 + // x0 - unused + // x1 - pix1 + // x2 - pix2 + // x3 - stride + // w4 - h + + movi d18, #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 + ld1 {v1.8b}, [x2], x3 + uabdl v30.8h, v0.8b, v1.8b + umull v21.4s, v30.4h, v30.4h + ld1 {v2.8b}, [x1], x3 + umull2 v20.4s, v30.8h, v30.8h + ld1 {v3.8b}, [x2], x3 + uabdl v29.8h, v2.8b, v3.8b + ld1 {v4.8b}, [x1], x3 + umlal v21.4s, v29.4h, v29.4h + ld1 {v5.8b}, [x2], x3 + umlal2 v20.4s, v29.8h, v29.8h + uabdl v28.8h, v4.8b, v5.8b + ld1 {v6.8b}, [x1], x3 + umlal v21.4s, v28.4h, v28.4h + ld1 {v7.8b}, [x2], x3 + umlal2 v20.4s, v28.8h, v28.8h + uabdl v27.8h, v6.8b, v7.8b + umlal v21.4s, v27.4h, v27.4h + umlal2 v20.4s, v27.8h, v27.8h + + add v21.4s, v21.4s, v20.4s + sub w4, w4, #4 + uaddlv d17, v21.4s + add d18, d18, d17 + cmp w4, #4 + b.ge 1b + + cbnz w4, 2f + fmov w0, s18 + + ret + +// iterate by one +2: + ld1 {v0.8b}, [x1], x3 + ld1 {v1.8b}, [x2], x3 + + uabdl v30.8h, v0.8b, v1.8b + umull v21.4s, v30.4h, v30.4h + umull2 v20.4s, v30.8h, v30.8h + + subs w4, w4, #1 + + uaddlv d17, v21.4s + add d18, d18, d17 + uaddlv d17, v20.4S + add d18, d18, d17 + + b.ne 2b + fmov w0, s18 + + ret +endfunc + function sse4_neon, export=1 // x0 - unused // x1 - pix1 From patchwork Fri Jul 15 08:02:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hubert Mazur X-Patchwork-Id: 36801 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:43a1:b0:8b:53c6:bec9 with SMTP id i33csp125566pzl; Fri, 15 Jul 2022 01:04:05 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vApb0++VMWqc9mT2MfZdFkeMF3BeD2v5pL3axMLVIdBvsroej8o5AppDAb+2HSyEDIf2Ol X-Received: by 2002:a05:6402:f08:b0:43a:b202:1f63 with SMTP id i8-20020a0564020f0800b0043ab2021f63mr17425615eda.207.1657872245408; Fri, 15 Jul 2022 01:04:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657872245; cv=none; d=google.com; s=arc-20160816; b=MNpTPbEolFfHt/ZU9wSxhHCi2ovu29YVYW0Hy8vxcQUzYooO3zcTbOFTdLag1wmgB1 LAZqh3eMH0aZ9wwc/AKUyIoOnbippoZLxWWxClgJPtr3gQrEnuhuxEfLoXCT4DgbgKV4 5CGKITPPAlODblZh9gFrR33YcFgK49L6piks8Xxee3k/Jev/9XURn04f1F4jfKUX5nNG /nsGk8Ui6DpgpAPoKX7X1o6RgSyKzLNth8msgCe6yTpmjHIxNrX7JYkHuZHQunGD7dgK Wb7nsqAQxw6umlYGvwj4Lo2oZYqw5Q+XBp5oa6MG/rynhdpDit43wksCqkhObffLOsb6 +7NA== 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=nUOY+BpAECxSFrLURGrFTaEuzC58SGNV7MxC4xT2d3Q=; b=RwUSkmvh1oUm6mGhyaG4zHxSLUSTjVD1UIAaE0Ty5SOhLiPkSDqtNBy0kMW4lvrXbJ j6VGLuq9VbxU9sQlyo6sogfZhOV8cGG8NdbiBCg8Ywlmkb1omCYk87w35a4pcimPWM3j FLi+/5m5TcyY6RBkGV9FbeKPx9GDVttmANW3yUoIzINfhuc43MvKVRb3ecKADVVdyY0l JSgnWozF+wn4kTfxXrM/debP5ZZWxA64P5dSDTqP22ECVH+hkkbjwg4OHihNVP3L//wu R+phc0/zyeVhjxCmq/qErZwQ185SSA/9TBbi1Wo6FmyW6DowS4pNigQY7TW4xFeHgLPo zKDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@semihalf.com header.s=google header.b="SAIkUAd/"; 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 z10-20020a50eb4a000000b0043b0a9cf8bfsi3544193edp.490.2022.07.15.01.04.05; Fri, 15 Jul 2022 01:04:05 -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="SAIkUAd/"; 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 2643F68B9C6; Fri, 15 Jul 2022 11:03:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C204068B9DF for ; Fri, 15 Jul 2022 11:03:08 +0300 (EEST) Received: by mail-lf1-f47.google.com with SMTP id t1so6602982lft.8 for ; Fri, 15 Jul 2022 01:03:08 -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=G6iEwayuwtln4UmeNbPI65lzlCz+aqtiOWl3UrR4wAo=; b=SAIkUAd/Yz28mfRH18IPbMxHcbTYYXEi++MdurP7TXsC2KCatPTKIoA47cfgPNBA/e Q/mDnxbRPOu1ClTTiSK8Rvvc06bBfswO3EwIYKZhljff5438jg8N+1NK+ea2qvmys2Y3 fiP3A+HlSugDKEhyOzvwEQylsMzZHBb1pnsyJiOry/zvpwSXntgKMwPb7pOY4YpFyhpp KJcg60dd8GVjHc4y6Dy4a2vPt8LfWDdXHuHWy+Nw6VD7PmJ86THM16ski7hf1l8vGM95 oNukaXMTnmCOeZSq5OOfhePBe8+On02bCy8cPc1t4M6cx8XASAs4LAApUhS3fNNT1q/R rImw== 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=G6iEwayuwtln4UmeNbPI65lzlCz+aqtiOWl3UrR4wAo=; b=2g9c/zse7vdRj4PL7W3HB2aDdybIp5jh4qHEgCRUjg0zxNlriIhlGYdow7uhd88AzT maFP+/zrfsLf8Nz8GCDT7DH6kYnE1GSHQ7A+prRlxR1uTQiiDOcRcE/futDOqnC379MV sPD+r49uqwLsCWoBVHEdsPGo9SYCe+mZORIBAiUoGAy0hDsvDmurxYfWPVHuPP7LjAmQ gSgD0xUGLhCu3d3ZBUCwzh3Mx8TC/LgRjkFNQ+wDKqb3eVAYl9Nd98sqAhfZT4IEXlHl RINsfe795qZpVGvyTdIJb/Xni4j5leuQc/eKocv+sQ8OlCDR6cqUcHDRcnC88UMWkShD JDcQ== X-Gm-Message-State: AJIora+R4BOm1AXymIhp7yEZPnBBPTl7oIMBC8mPCG9sh9j2KMK4b1i0 XSpG/0hOKU1wdnv40YpQ/tpYzs8D7IsdHQ== X-Received: by 2002:a05:6512:2588:b0:489:e8fe:5b91 with SMTP id bf8-20020a056512258800b00489e8fe5b91mr7280100lfb.336.1657872187833; Fri, 15 Jul 2022 01:03:07 -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.03.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jul 2022 01:03:07 -0700 (PDT) From: Hubert Mazur To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Jul 2022 10:02:28 +0200 Message-Id: <20220715080228.686736-6-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 5/5] lavc/aarch64: Add neon implementation for pix_abs8 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: Ly/DZiXpMWXg Provide optimized implementation of pix_abs8 function for arm64. Performance comparison tests are shown below. - pix_abs_1_0_c: 105.2 - pix_abs_1_0_neon: 21.4 - sad_1_c: 107.2 - sad_1_neon: 20.9 Benchmarks and tests are run with checkasm tool on AWS Graviton 3. --- libavcodec/aarch64/me_cmp_init_aarch64.c | 4 ++ libavcodec/aarch64/me_cmp_neon.S | 53 ++++++++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/libavcodec/aarch64/me_cmp_init_aarch64.c b/libavcodec/aarch64/me_cmp_init_aarch64.c index 89c817990c..7d7dc38754 100644 --- a/libavcodec/aarch64/me_cmp_init_aarch64.c +++ b/libavcodec/aarch64/me_cmp_init_aarch64.c @@ -31,6 +31,8 @@ int ff_pix_abs16_x2_neon(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, ptrdiff_t stride, int h); int ff_pix_abs16_y2_neon(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, ptrdiff_t stride, int h); +int ff_pix_abs8_neon(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2, + ptrdiff_t stride, int h); int sse16_neon(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, ptrdiff_t stride, int h); @@ -48,8 +50,10 @@ av_cold void ff_me_cmp_init_aarch64(MECmpContext *c, AVCodecContext *avctx) c->pix_abs[0][1] = ff_pix_abs16_x2_neon; c->pix_abs[0][2] = ff_pix_abs16_y2_neon; c->pix_abs[0][3] = ff_pix_abs16_xy2_neon; + c->pix_abs[1][0] = ff_pix_abs8_neon; c->sad[0] = ff_pix_abs16_neon; + c->sad[1] = ff_pix_abs8_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 c78e26df4b..383459d209 100644 --- a/libavcodec/aarch64/me_cmp_neon.S +++ b/libavcodec/aarch64/me_cmp_neon.S @@ -72,6 +72,59 @@ function ff_pix_abs16_neon, export=1 ret endfunc +function ff_pix_abs8_neon, export=1 + // x0 unused + // x1 uint8_t *pix1 + // x2 uint8_t *pix2 + // x3 ptrdiff_t stride + // x4 int h + + movi d18, #0 + cmp w4, #4 + b.lt 2f + +// make 4 iterations at once +1: + ld1 {v0.8b}, [x1], x3 + ld1 {v1.8b}, [x2], x3 + uabdl v30.8h, v0.8b, v1.8b + ld1 {v2.8b}, [x1], x3 + ld1 {v3.8b}, [x2], x3 + uabal v30.8h, v2.8b, v3.8b + ld1 {v4.8b}, [x1], x3 + ld1 {v5.8b}, [x2], x3 + uabal v30.8h, v4.8b, v5.8b + ld1 {v6.8b}, [x1], x3 + ld1 {v7.8b}, [x2], x3 + uabal v30.8h, v6.8b, v7.8b + + sub w4, w4, #4 + uaddlv s20, v30.8h + cmp w4, #4 + add d18, d18, d20 + b.ge 1b + cbnz w4, 2f + fmov w0, s18 + + ret + +// iterate by one +2: + ld1 {v0.8b}, [x1], x3 + ld1 {v1.8b}, [x2], x3 + + uabdl v16.8h, v0.8b, v1.8b + + uaddlv s17, v16.8h + add d18, d18, d17 + subs w4, w4, #1 + b.ne 2b + fmov w0, s18 + + ret + +endfunc + function ff_pix_abs16_xy2_neon, export=1 // x0 unused // x1 uint8_t *pix1