From patchwork Tue Sep 13 11:58:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hubert Mazur X-Patchwork-Id: 37897 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp639242pzh; Tue, 13 Sep 2022 04:59:15 -0700 (PDT) X-Google-Smtp-Source: AA6agR7+mcXtxd8C6xAoBckiCM9ucbqYSqm9ht++5dCNfoPOiHOYCCfl9jeZo+kSta7X58dsalqD X-Received: by 2002:a17:907:7ea0:b0:77f:ce8a:207a with SMTP id qb32-20020a1709077ea000b0077fce8a207amr2713798ejc.175.1663070355731; Tue, 13 Sep 2022 04:59:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663070355; cv=none; d=google.com; s=arc-20160816; b=k+LPei9bN6htmw040OuG8hn0a3Wim17e/2Tl64eV/CnI0efEdUrUpESO9CW0/hiSjs dOm51W8sPABmKU5NO2X+Mpohk0DpXEaFlVVHDOwulHmL6ql1bDRg4Th3h9Z1DVP1MpBZ bt/39pCLfmjZYT++X3z0f+8FKOTHE+9e83ePWoNV8VbaLWq9ecDFuKWVp+6hmQ7wUd3y NuR+y8vNe2BU32ABBAnMoQ8TscJjSxo80orZeLeRR+L7BjsFMbHb92P880VRyQ0e4LW4 c/0+1+yx3C9pn/aHg6f/cPz3wmnkKSyjWWoh0vtVMikwUi43ohvPOSFB7oNEI5/HPf4h WxYg== 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=w+OZbRvbImrT+V/bZDEswwjpszY2S3yaZmwPGzJAHDo=; b=T5mZhHjqxbl62nnI+Lm2LkMcDr3Q21sSjuQqxzv9IIsVjo8jAuNtlSN5HsSG299om/ X2ySOs62Yhho09Xvkdwru76N1u+K+41x+APaK0xkpGlwF5CwgiJy94GsZFL5S1r4suB3 I1ozOeH09/9oOyV2eMRONyIEGh7Tr8MNcNqpFExY4b+yqYrdtp8or5wYCRUJYw1Tv5ZW i8R13xz9lQ6w4IvkP4vgxmJQnrUR6LWq+WSJO++ILtd9qyHCvKF/4+PXaaNCz6U8njTZ nVWzJ5BMwBOXC2tZ1X4SihVawYnatjlVKmBd76U7Nnxq6kfsvlahSHo42by3UarS3aNm pjuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@semihalf.com header.s=google header.b=SjZVfgWe; 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 g11-20020a17090669cb00b0073db512d918si7714359ejs.765.2022.09.13.04.59.15; Tue, 13 Sep 2022 04:59:15 -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=SjZVfgWe; 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 499C868BB4C; Tue, 13 Sep 2022 14:59:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com [209.85.208.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B903C68BB05 for ; Tue, 13 Sep 2022 14:58:58 +0300 (EEST) Received: by mail-lj1-f174.google.com with SMTP id z20so14073399ljq.3 for ; Tue, 13 Sep 2022 04:58:58 -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:subject:date; bh=j6jOd0XW5oaEg4YbITnIZNI0UU4XWVVRe4kAbCHqDXs=; b=SjZVfgWesrjla3gRH8jJFTvFNOsfjuLF8zxR1dRWpcRT05ArfbZ+oDmkFaLlvilLWJ 0xmxkRuJRc2cLmRIbGFL6UtKkAUiHrMh3t4yrWMTQU4NrcPFy1yvBejD0CZGpwne0ufJ gtNfDQetNjCfvB3nfiqmoEwNwokdGKOkGwKI+6hSkXqPaU0TZ9lwKm7YlZgguBBec3CQ YP/+XW1j0X3K4SZ+eLERXAbcKPQyi+Nq7QH7mT9wMknyrX+0H3CW5x4F5Q2CehYHGDLj OVRoAS3fEFoAA0kCkYc+yEQH8GXzWZNXbmw717+zsdXITag78u7iT/DrfYm4z6bxqmPW T4lw== 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 :subject:date; bh=j6jOd0XW5oaEg4YbITnIZNI0UU4XWVVRe4kAbCHqDXs=; b=MwJ4ixYoShaVSwrWVP9otNEdHvLlTCeJrCa5JTBgUnCSPwVSNp/ase8YLKIGIiCnK+ WihmRQYscAkJLkOXJutbq6IgKKxkH0KqtjDGMLGvxQBGW0vmQhzmHMV/GajX8D1MS+r2 QuAD0yqsbCTQwuiwBApoQ87QQAdJPBb3s/HPmeey8VCSv/7k40ZJOU603euy9Kp5ZJZM U+cerLq2DkXN0QhXtnVAUFASH0+wHcfawJvLv/PXYe/0dC1acSVf3BUZwUbNSvcH8Imk kUjq6ruo2CZdMn+hmEorTAmU3LWKuMIWVfybFK8p3ru/1hYh490XucyQD5yxpF6QETbD 79QQ== X-Gm-Message-State: ACgBeo353kbs4SxnbBFHz36pfRDhnPXc0HHipGrIxDp/32+A6xOVsfjs UtGpcorXnIby2JzrTnB0xTOOHc4Ne/G2Cg== X-Received: by 2002:a2e:bf16:0:b0:25f:f90a:b856 with SMTP id c22-20020a2ebf16000000b0025ff90ab856mr9799272ljr.473.1663070337716; Tue, 13 Sep 2022 04:58:57 -0700 (PDT) Received: from hum-HP-ProBook-440-G7.semihalf.net ([83.142.187.84]) by smtp.gmail.com with ESMTPSA id f20-20020a05651232d400b0048a8586293asm580288lfg.48.2022.09.13.04.58.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Sep 2022 04:58:57 -0700 (PDT) From: Hubert Mazur To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Sep 2022 13:58:22 +0200 Message-Id: <20220913115824.60792-2-hum@semihalf.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220913115824.60792-1-hum@semihalf.com> References: <20220913115824.60792-1-hum@semihalf.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] lavc/aarch64: Add neon implementation for pix_median_abs16 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: D2lrG4Ot+Ec0 Provide optimized implementation for pix_median_abs16 function. Performance comparison tests are shown below. - median_sad_0_c: 722.0 - median_sad_0_neon: 144.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 | 81 ++++++++++++++++++++++++ libavcodec/me_cmp.c | 5 +- 3 files changed, 88 insertions(+), 2 deletions(-) diff --git a/libavcodec/aarch64/me_cmp_init_aarch64.c b/libavcodec/aarch64/me_cmp_init_aarch64.c index ade3e9a4c1..fb51a833be 100644 --- a/libavcodec/aarch64/me_cmp_init_aarch64.c +++ b/libavcodec/aarch64/me_cmp_init_aarch64.c @@ -53,6 +53,8 @@ int nsse16_neon(int multiplier, const uint8_t *s, const uint8_t *s2, ptrdiff_t stride, int h); int nsse16_neon_wrapper(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride, int h); +int pix_median_abs16_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) { @@ -78,6 +80,8 @@ av_cold void ff_me_cmp_init_aarch64(MECmpContext *c, AVCodecContext *avctx) c->vsse[4] = vsse_intra16_neon; c->nsse[0] = nsse16_neon_wrapper; + + c->median_sad[0] = pix_median_abs16_neon; } } diff --git a/libavcodec/aarch64/me_cmp_neon.S b/libavcodec/aarch64/me_cmp_neon.S index f8998749a5..a4a4344f42 100644 --- a/libavcodec/aarch64/me_cmp_neon.S +++ b/libavcodec/aarch64/me_cmp_neon.S @@ -969,3 +969,84 @@ function nsse16_neon, export=1 ret endfunc + +function pix_median_abs16_neon, export=1 + // x0 unused + // x1 uint8_t *pix1 + // x2 uint8_t *pix2 + // x3 ptrdiff_t stride + // w4 int h + + ld1 {v2.16b}, [x1], x3 + ld1 {v3.16b}, [x2], x3 + movi v31.8h, #0 + movi v16.8h, #0 + ext v0.16b, v2.16b, v2.16b, #1 + ext v1.16b, v3.16b, v3.16b, #1 + usubl v28.8h, v2.8b, v3.8b + usubl2 v27.8h, v2.16b, v3.16b + usubl v26.8h, v0.8b, v1.8b + usubl2 v25.8h, v0.16b, v1.16b + sub w4, w4, #1 // we need to make h-1 iterations + saba v31.8h, v26.8h, v28.8h + saba v16.8h, v25.8h, v27.8h + mov h18, v28.h[0] + cmp w4, #1 + sqabs h18, h18 + + b.lt 2f +1: + + ld1 {v6.16b}, [x1], x3 // pix1 vector for V(j-1) + ld1 {v7.16b}, [x2], x3 // pix2 vector for V(j-1) + subs w4, w4, #1 + mov v2.16b, v6.16b + mov v3.16b, v7.16b + ext v4.16b, v6.16b, v6.16b, #1 // pix1 vector for V(j) + ext v5.16b, v7.16b, v7.16b, #1 // pix2 vector for V(j) + + // protected registers: v30, v29, v28, v27, v26, v25, v24, v23 + // scratch registers: v22, v21, v20, v19, v17 + + // To find median of three values, calculate sum of them + // and subtract max and min value from it. + usubl v30.8h, v6.8b, v7.8b // V(j-1) + usubl2 v29.8h, v6.16b, v7.16b // V(j-1) + usubl v24.8h, v4.8b, v5.8b // V(j) + usubl2 v23.8h, v4.16b, v5.16b // V(j) + mov v0.16b, v4.16b + mov v1.16b, v5.16b + sabd v20.8h, v30.8h, v28.8h + mov h17, v20.h[0] + add d18, d18, d17 + add v22.8h, v26.8h, v30.8h + smin v20.8h, v26.8h, v30.8h + add v21.8h, v25.8h, v29.8h + smax v19.8h, v26.8h, v30.8h + sub v22.8h, v22.8h, v28.8h + sub v21.8h, v21.8h, v27.8h + smin v17.8h, v19.8h, v22.8h + smin v22.8h, v25.8h, v29.8h + mov v28.16b, v30.16b + smax v20.8h, v20.8h, v17.8h // median values lower half + smax v19.8h, v25.8h, v29.8h + saba v31.8h, v24.8h, v20.8h + mov v27.16b, v29.16b + smin v19.8h, v19.8h, v21.8h + mov v26.16b, v24.16b + smax v17.8h, v22.8h, v19.8h // median values upper half + mov v25.16b, v23.16b + saba v16.8h, v23.8h, v17.8h + + b.ne 1b + +2: + ins v16.h[7], wzr + add v31.8h, v31.8h, v16.8h + uaddlv s17, v31.8h + add d18, d18, d17 + fmov w0, s18 + + ret + +endfunc diff --git a/libavcodec/me_cmp.c b/libavcodec/me_cmp.c index 4242fbc6e4..230e7ea54a 100644 --- a/libavcodec/me_cmp.c +++ b/libavcodec/me_cmp.c @@ -1048,6 +1048,9 @@ av_cold void ff_me_cmp_init(MECmpContext *c, AVCodecContext *avctx) ff_dsputil_init_dwt(c); #endif +c->median_sad[0] = pix_median_abs16_c; +c->median_sad[1] = pix_median_abs8_c; + #if ARCH_AARCH64 ff_me_cmp_init_aarch64(c, avctx); #elif ARCH_ALPHA @@ -1062,6 +1065,4 @@ av_cold void ff_me_cmp_init(MECmpContext *c, AVCodecContext *avctx) ff_me_cmp_init_mips(c, avctx); #endif - c->median_sad[0] = pix_median_abs16_c; - c->median_sad[1] = pix_median_abs8_c; }