From patchwork Thu Apr 28 13:42:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Dekker" X-Patchwork-Id: 35472 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp3598017pzh; Thu, 28 Apr 2022 06:42:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw6b5TlwKuWTL+GXBb9MUhlRHwf27dgeWm2xmUiSPgQSrnpXzemMTk/uAd/uf6J8XL6glB4 X-Received: by 2002:a05:6402:84a:b0:426:262d:967e with SMTP id b10-20020a056402084a00b00426262d967emr4322709edz.286.1651153358785; Thu, 28 Apr 2022 06:42:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651153358; cv=none; d=google.com; s=arc-20160816; b=DcLdTkk+jl/MHwjtmkJtk25fhMjVeRmlaXUh/0o65+xG4Q6yALiU3rFcezqIIo/9Gi joLUeKeeLFEHu5auIroZHQHU0HktjkTMZQdgY7rAkCQbrtOSSQsJkysqQWaz+WMGIq2N mGVtwMc+iYjla7dE55skEo/JD6EJDRWWygOTMtoWQjzIoIiD00slFAg+N+/gXez6C7aZ Ssajhmu4PDuTWnkkdLH1MFmB1OBkFBXdPGFnf8IviKab9744RcM8fHE0W2dcPM7kEIsu axwhLkp/S/svo1Cjliv/qety7fkMrb8q3sJCllT//82jaug0mh7l4eL8zP+IObgcnM6n ZapA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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:dkim-signature:delivered-to; bh=ME4UeIWwZwPqQty99BogLxoSfkYSOiDPM/bFqa0rCgI=; b=I24RVpmOUzsZ+q6Hua5U+qE0h5AZeaapCBKorrzaPk0PY9aaZA9L31TIfmlodDQfYw behdwfuU8VTjelr+YoGlIqu/fcoJytiGYT9JMe5UfllfHBhmry8a+E+XRznalcy5UeMf wQMQrElCfSbmLdGVoVCYeOWhBkd2dj/mVZX+p3UPPPRg/G2Ehbepw6dX5C9aLG1jLq1G 5XQ0VXZXqeZyT/pNB7bMTwlLq5weoi5NM/bvFVoMvvhWO7C2oXcA6NkDvDBXL/7HgYIG w9/uyHRCPMZjzR/9lTjt39DByrBQtNklzF5XVrIc3QExN2WWWrxC4q7/mrIZD2in+ZBu tKbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=fm2 header.b=cJWVFDFT; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b=qOHwgDRB; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id yk8-20020a17090770c800b006f38bf1700fsi3838714ejb.585.2022.04.28.06.42.38; Thu, 28 Apr 2022 06:42:38 -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=@itanimul.li header.s=fm2 header.b=cJWVFDFT; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b=qOHwgDRB; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 564F968B40A; Thu, 28 Apr 2022 16:42:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A55B568B2BE for ; Thu, 28 Apr 2022 16:42:16 +0300 (EEST) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id C65955C00EC for ; Thu, 28 Apr 2022 09:42:15 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Thu, 28 Apr 2022 09:42:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=itanimul.li; h= cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm2; t=1651153335; x=1651239735; bh=ko WLtcd7Jtn0thzx/SPDcQ+cv8UoUoJxfl/ClCmPL/k=; b=cJWVFDFTFy9jFXAVgb xqFS39en0V8iM43zZs5AiYRZocmPnR324q+qBv5eU75P7gjfUD1cyFjSTlsbOyRB Vn/IeFklm3WLyyqcZgmw+VJX3QmlE0VZLNEbZ3Mu91pa/zydMMbCNHR1jIbjxmLc zpY7es+W/Dtp/Qo5KzFx3FMwrhinDkYqJzx6OgMQDv46Cf5rXyxJpAeyo4vQvEkg GCWTNXevsD9VeiQv2pYg47XJst+s6p8ubhyArGPLgcFMFKxDRHDg6b5YDELcosSB erTj5VZejOiKYIcwXjZ/Z/cOUNAhvPBfyAyRVJiKzHlvRKBkH/jgRADTqP/VCknt kSLA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t= 1651153335; x=1651239735; bh=koWLtcd7Jtn0thzx/SPDcQ+cv8UoUoJxfl/ ClCmPL/k=; b=qOHwgDRBoBDo1Z8LIQGFVmR72b8m5KNvo2RoXhCHEnxHNZQj+QV bkDQIa7CY9uraenk+bZljpg/hGqDxjz7z6AH00WyLF8Tentq6QEgqRORZuI3OMmD 3F729fHtFLpWMwkN+ZRDF6Sn5GGnY/mdx79IQ0Lirw9cDX6hU//4MCGivBS1QjJM rjoaZQulr4ZVN/EnqRWdlOxyceBqoTNOTK1D7VBIzdZHXCOeviiPr0TqaPlZN8sO hYqSr7yKBlR4//ejhnfsePvjKNT3HKzU2O8ofQ+Wdv2MrgMRd3oBobHygVBPYpsD oB2CYF81aqF3QEvH/pVTzEu5z8KtQaby+bA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrudejgdeikecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpedflfdrucffvghkkhgvrhdfuceojhguvghksehithgrnhhimhhu lhdrlhhiqeenucggtffrrghtthgvrhhnpefhvdefjeffgefffeeifeevgfehueduleehhf ffvedttdfhheduiedtteefheeiteenucffohhmrghinhepnhgvohhnrdhssgenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehjuggvkhesihhtrg hnihhmuhhlrdhlih X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Thu, 28 Apr 2022 09:42:15 -0400 (EDT) From: "J. Dekker" To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Apr 2022 15:42:10 +0200 Message-Id: <20220428134211.4786-2-jdek@itanimul.li> X-Mailer: git-send-email 2.32.0 (Apple Git-132) In-Reply-To: <20220428134211.4786-1-jdek@itanimul.li> References: <20220428134211.4786-1-jdek@itanimul.li> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] lavc/aarch64: add hevc sao edge 16x16 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: sRRost0vcVdO bench on AWS Graviton: hevc_sao_edge_16x16_8_c: 1857.0 hevc_sao_edge_16x16_8_neon: 211.0 hevc_sao_edge_32x32_8_c: 7802.2 hevc_sao_edge_32x32_8_neon: 808.2 hevc_sao_edge_48x48_8_c: 16764.2 hevc_sao_edge_48x48_8_neon: 1796.5 hevc_sao_edge_64x64_8_c: 32647.5 hevc_sao_edge_64x64_8_neon: 3118.5 Signed-off-by: J. Dekker --- libavcodec/aarch64/hevcdsp_init_aarch64.c | 8 ++- libavcodec/aarch64/hevcdsp_sao_neon.S | 66 +++++++++++++++++++++++ 2 files changed, 72 insertions(+), 2 deletions(-) diff --git a/libavcodec/aarch64/hevcdsp_init_aarch64.c b/libavcodec/aarch64/hevcdsp_init_aarch64.c index c8963e6104..df521bb083 100644 --- a/libavcodec/aarch64/hevcdsp_init_aarch64.c +++ b/libavcodec/aarch64/hevcdsp_init_aarch64.c @@ -57,8 +57,8 @@ void ff_hevc_sao_band_filter_8x8_8_neon(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int16_t *sao_offset_val, int sao_left_class, int width, int height); - - +void ff_hevc_sao_edge_filter_16x16_8_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride_dst, + int16_t *sao_offset_val, int eo, int width, int height); av_cold void ff_hevc_dsp_init_aarch64(HEVCDSPContext *c, const int bit_depth) { @@ -80,6 +80,10 @@ av_cold void ff_hevc_dsp_init_aarch64(HEVCDSPContext *c, const int bit_depth) c->sao_band_filter[2] = c->sao_band_filter[3] = c->sao_band_filter[4] = ff_hevc_sao_band_filter_8x8_8_neon; + c->sao_edge_filter[1] = + c->sao_edge_filter[2] = + c->sao_edge_filter[3] = + c->sao_edge_filter[4] = ff_hevc_sao_edge_filter_16x16_8_neon; } if (bit_depth == 10) { c->add_residual[0] = ff_hevc_add_residual_4x4_10_neon; diff --git a/libavcodec/aarch64/hevcdsp_sao_neon.S b/libavcodec/aarch64/hevcdsp_sao_neon.S index e07e0cea2d..0315c479df 100644 --- a/libavcodec/aarch64/hevcdsp_sao_neon.S +++ b/libavcodec/aarch64/hevcdsp_sao_neon.S @@ -74,3 +74,69 @@ function ff_hevc_sao_band_filter_8x8_8_neon, export=1 bne 1b ret endfunc + +// ASSUMES STRIDE_SRC = 192 +.Lsao_edge_pos: +.word 1 // horizontal +.word 192 // vertical +.word 192 + 1 // 45 degree +.word 192 - 1 // 135 degree + +// ff_hevc_sao_edge_filter_16x16_8_neon(char *dst, char *src, ptrdiff stride_dst, +// int16 *sao_offset_val, int eo, int width, int height) +function ff_hevc_sao_edge_filter_16x16_8_neon, export=1 + adr x7, .Lsao_edge_pos + ld1 {v3.8h}, [x3] // load sao_offset_val + add w5, w5, #0xF + bic w5, w5, #0xF + ldr w4, [x7, w4, uxtw #2] // stride_src + mov v3.h[7], v3.h[0] // reorder to [1,2,0,3,4] + mov v3.h[0], v3.h[1] + mov v3.h[1], v3.h[2] + mov v3.h[2], v3.h[7] + // split 16bit values into two tables + uzp2 v1.16b, v3.16b, v3.16b // sao_offset_val -> upper + uzp1 v0.16b, v3.16b, v3.16b // sao_offset_val -> lower + movi v2.16b, #2 + mov x15, #192 + // strides between end of line and next src/dst + sub x15, x15, x5 // stride_src - width + sub x16, x2, x5 // stride_dst - width + mov x11, x1 // copy base src +1: // new line + mov x14, x5 // copy width + sub x12, x11, x4 // src_a (prev) = src - sao_edge_pos + add x13, x11, x4 // src_b (next) = src + sao_edge_pos +2: // process 16 bytes + ld1 {v3.16b}, [x11], #16 // load src + ld1 {v4.16b}, [x12], #16 // load src_a (prev) + ld1 {v5.16b}, [x13], #16 // load src_b (next) + cmhi v16.16b, v4.16b, v3.16b // (prev > cur) + cmhi v17.16b, v3.16b, v4.16b // (cur > prev) + cmhi v18.16b, v5.16b, v3.16b // (next > cur) + cmhi v19.16b, v3.16b, v5.16b // (cur > next) + sub v20.16b, v16.16b, v17.16b // diff0 = CMP(cur, prev) = (cur > prev) - (cur < prev) + sub v21.16b, v18.16b, v19.16b // diff1 = CMP(cur, next) = (cur > next) - (cur < next) + add v20.16b, v20.16b, v21.16b // diff = diff0 + diff1 + add v20.16b, v20.16b, v2.16b // offset_val = diff + 2 + tbl v16.16b, {v0.16b}, v20.16b + tbl v17.16b, {v1.16b}, v20.16b + uxtl v20.8h, v3.8b // src[0:7] + uxtl2 v21.8h, v3.16b // src[7:15] + zip1 v18.16b, v16.16b, v17.16b // sao_offset_val lower -> + zip2 v19.16b, v16.16b, v17.16b // sao_offset_val upper -> + sqadd v20.8h, v18.8h, v20.8h // + sao_offset_val + sqadd v21.8h, v19.8h, v21.8h + sqxtun v3.8b, v20.8h + sqxtun2 v3.16b, v21.8h + st1 {v3.16b}, [x0], #16 + subs x14, x14, #16 // filtered 16 bytes + b.ne 2b // do we have width to filter? + // no width to filter, setup next line + add x11, x11, x15 // stride src to next line + add x0, x0, x16 // stride dst to next line + subs w6, w6, #1 // filtered line + b.ne 1b // do we have lines to process? + // no lines to filter + ret +endfunc