From patchwork Thu Oct 7 14:30:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Dekker" X-Patchwork-Id: 30972 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1549643iob; Thu, 7 Oct 2021 07:31:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwRt5zqIdiCuGEYyfrY+TKuoohZHRmcXlpp0H3B+sNjCVohyanbPqCYhwHCEfYlJgKQHrEX X-Received: by 2002:a17:906:7091:: with SMTP id b17mr5979186ejk.395.1633617083650; Thu, 07 Oct 2021 07:31:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633617083; cv=none; d=google.com; s=arc-20160816; b=hAIUumuPvWr11YodOzTjvDbjZ90bi2L4g6nPuWSzEjnRVQ6oHy0hoXGMgpIWLRuXbm ou0ER/GKNUQ0BlGDGviuLdRmzTyN3YhcRzeR9aaSKcGWXtEU4gqi6gjncg8fm2kSODmk Ik3GuWzgc9o4JoBkd4EisIVvzh5wZhpQJ/1KgRFRCnKNLRQ/bt6qouzBWVGYC/P7zCF9 S/T/b0/dVTLXjzliDvd9DemAUd2zVkRNBMHsFGTrG5vj4y8MsY0yrVHxRCrVREWUxF1X aVIKrCwsZB7+dSCeE+d2/gG5Hdq/nXWWCWHHrCGQSUJp2ZbpGoIIMnFqvlLwhYQI7LfE 98Aw== 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:message-id:date:to:from :dkim-signature:dkim-signature:delivered-to; bh=i4NENQX15vOuLK8Q4gACXtmyk0Nbxen5PKKYr+lM/3I=; b=T9385otVGZScotUuJXVL61AZLBGQDIQuVB0SLMKFe751xWHpiiLeD47d+s4mMu7hjQ diw20J+70bZSUAyhek8mhI8Bo0Fhzt1rQe25exEF5SG9S0YY0H3LKWc+QnDFHCvI/EYV PgaKhL/NHIjptDm/jXaUFCVI9BiK+2qdz62Fq0OeXD2Y3DQHb/zvn4SES/gu7k7vfaCZ bizLrKlSoeiQqSQad4ahHS9NJAXFYRuUSAaVhcd0OR6EI1q6Z8zrYhL6K3mVLb7PFAIi clVeSws8znN9Cf84Ip24s6oB9hCBWejh0+4QUvgFG78TVXOEy6JxM26FazjyaCAFbTee /6ag== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=fm3 header.b=VaeC4oNR; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b=BjoAlg+A; 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 f10si9294522ejf.597.2021.10.07.07.31.23; Thu, 07 Oct 2021 07:31:23 -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=fm3 header.b=VaeC4oNR; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b=BjoAlg+A; 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 A398168A6F9; Thu, 7 Oct 2021 17:31:10 +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 3C1E268A5FC for ; Thu, 7 Oct 2021 17:31:02 +0300 (EEST) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id 703705C0076 for ; Thu, 7 Oct 2021 10:31:00 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Thu, 07 Oct 2021 10:31:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=itanimul.li; h= from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=fm3; bh=kBytZMDLvMmcI/UYJ+mMT+1Fs5 jDLYxr0pZTxBeS3Fs=; b=VaeC4oNRJQ6rFEu2fhZCKf3HrWAlEBC1eXeIxIaASP qHOKkVaz20kDzE4tv9zyyDvrOkhjyyEwRQB+YkIccsAMMxenYmHuRfZI9ANcLZKj W+IE/tyK4xv+cUSCvt42mR6q0C9+EP2+hpcDMViehGlrkUU3ZIY/Dx5xhqQ8trpP OnHQskA5L6OFc8qbSTzLkDxTflX7g/116r/AQpTINfwGgYZOu6wQol0crTwTlmrD 10qPngZJFi4cdWpgZ7iHR7g+iX7+HfJDEYuIMHyCxOmexYCdAEP13iBLDn0zFJfQ rDU9xeADBZ7Kt3j/EIyDSSdHDBKxlWG29kRIfdtHAekQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=kBytZMDLvMmcI/UYJ +mMT+1Fs5jDLYxr0pZTxBeS3Fs=; b=BjoAlg+AGJvTT9EAMo+iCa54awhQ5e7bU spnMqXkBCP/wvcl76zUqrutFV6T/Ry2fAh2s5OOOq03MXgeM+/U8DslZgmYOLX5W iGpNjnnMrOM8CLPYB0qxAA0KOFmrGyzo+bV2Q/nNenmOYSK/QH1kSELtwRpaF+sh 9mrP0LXbyAl2dHBHENUNNv9G8i9+qx9/hPj+X25tf/WrMIQjnNVQ7M4VHh4Zv/gZ MJG8lS2rXKm6D8L3aAfqDPOR2hJ16FwAjjbVlEEgOeCGfNsmk55x6dI72Phf3dvX vwNQAccJKfOoyhO5pREbGy/wGe01KnY2H7iZTUNG5UnFaBxYmiJZw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrudelkedgjeehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomhepfdflrdcuffgvkhhkvghrfdcuoehjuggvkhesihhtrghnihhmuhhl rdhliheqnecuggftrfgrthhtvghrnhephfeftdeiteeijeeigeevfeevheduleevveetje ekveeiueekjeevhffhteejtefhnecuffhomhgrihhnpehnvghonhdrshgsnecuvehluhhs thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepjhguvghksehithgrnh himhhulhdrlhhi X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Thu, 7 Oct 2021 10:30:59 -0400 (EDT) From: "J. Dekker" To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Oct 2021 16:30:54 +0200 Message-Id: <20211007143057.17870-1-jdek@itanimul.li> X-Mailer: git-send-email 2.30.1 (Apple Git-130) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] 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: sGiMdBkWRJDQ --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 c785e46f79..747ff0412d 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) { @@ -76,6 +76,10 @@ av_cold void ff_hevc_dsp_init_aarch64(HEVCDSPContext *c, const int bit_depth) c->idct_dc[2] = ff_hevc_idct_16x16_dc_8_neon; c->idct_dc[3] = ff_hevc_idct_32x32_dc_8_neon; c->sao_band_filter[0] = 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 f9fed8345b..a7f054c075 100644 --- a/libavcodec/aarch64/hevcdsp_sao_neon.S +++ b/libavcodec/aarch64/hevcdsp_sao_neon.S @@ -85,3 +85,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 + lsl w4, w4, #2 + adr x7, .Lsao_edge_pos + ld1 {v3.8h}, [x3] // load sao_offset_val + sxtw x5, w5 + ldr w4, [x7, x4] // 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 + zip1 v18.16b, v16.16b, v17.16b // sao_offset_val lower -> + zip2 v19.16b, v16.16b, v17.16b // sao_offset_val upper -> + uxtl v20.8h, v3.8b // src[0:7] + uxtl2 v21.8h, v3.16b // src[7:15] + 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 From patchwork Thu Oct 7 14:30:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Dekker" X-Patchwork-Id: 30971 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1549428iob; Thu, 7 Oct 2021 07:31:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwYQI5S8AHTQ15BmRMYtRw9ovXI+F7dNF38nDAO7MwlWTsqFza+doNoggR/P+zaGdUO+dcf X-Received: by 2002:a17:906:2bdb:: with SMTP id n27mr6148744ejg.86.1633617073758; Thu, 07 Oct 2021 07:31:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633617073; cv=none; d=google.com; s=arc-20160816; b=dGTi/OeJHUK/Lwh091U4kB2aXV0q/XdGfhx+7IiQhoyAD9qwIUVAbWQHC3vgCb/ah/ NZcOkXx+VnidNOQx41IVoEyZE/soUQul16dcCdhMueYiPneCSOr8euD7/sLepSjd/DoI ggp/ZNTCsCWmbG4yByz7ypGfqB24U5NCH+ecwvFciJCYyc+z78bg9Am+N2q/ua6wCeL8 mKWgXnp3qbpVLSQ383nCoKBvlr79F1XSZZ+0WdpgzkqxlhnJl4XFnYukgsIyxs5Z3lNY N5HH9icBDAzR2odL4Opv8X3le4ZGIonafrjAlMl3AecLf18DRwfwEngZCfSv5xCB08XA W3lw== 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=zVemQbCesBQOnAF7NuGp9wbGRwXtGhnai63dg8nou0c=; b=q4e8sWrwQ/byGNvDG/gyLCKIwM19iR4NiGkKCdkJY2dYzsPz77IYUulY26XJ16n0ow wiVprli6URDjLO4v5F8mKjz/mjiMHD/pVhSArNmYUt+GOi5JUeAG1pq128Z0tpG/IFSz Eu3jPOZtMnUoLn96QmyEHSKfdoPBSmt7rDwcS65FnEEzcFQF8SF9fBaBNYPvas55DVOt eGj8aWPEVOGut3BqtmJEUnIid2W/khRBD/tLUrunxrfMbRhlipgYlIMsUJ97iWwZ2i/j ewUbMRe1DlTmOKiVyDReQBf3g/ZQR8VnIMCGUhFGKn9PVoRNEBVMKUtamGhv98ScxcWK ODrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=fm3 header.b=e92IG59i; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b=dzecG9vh; 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 nd19si11055358ejc.48.2021.10.07.07.31.13; Thu, 07 Oct 2021 07:31:13 -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=fm3 header.b=e92IG59i; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b=dzecG9vh; 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 984E168A6B6; Thu, 7 Oct 2021 17:31:09 +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 394B768A4A4 for ; Thu, 7 Oct 2021 17:31:02 +0300 (EEST) Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 3B3E75C00BE for ; Thu, 7 Oct 2021 10:31:01 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Thu, 07 Oct 2021 10:31:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=itanimul.li; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm3; bh=BrHjCgTyCym+n RYEtE53DukZ02RZdMeSp34YUYug2Go=; b=e92IG59iSKclGcYOoNAj2jvg6xaph C9HN8hSGUI3LJGyi+juM1X3XPZn8PO2fL6FpRTt0o+m1kMJ9UEg9HdaP9K7lYRs+ +55BmlyOfxrce2WxK7au9s81FmrRqh2UAOJJ5Mq3Twf0GLvzchzUsl0F+vXsD2c6 btFr4eGjgVSMlW4HwwpYqgWVkgVqWtrU8DI3uvemD/FTpq9UnJxavnandu8ymxhn XBX/QUR2jDnSOOQwk2/uiz/XKLOqIu+QIq/yGp/fbQ+DAsElPZdd8wCKUZvPiecK fITBoJomflvimUwjPGuEeJbZxLHYbhrSCkeTQEOFLM9I9Ww9W5VwB0kLw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=BrHjCgTyCym+nRYEtE53DukZ02RZdMeSp34YUYug2Go=; b=dzecG9vh KAVedCaZK+LpTuY2lcz7ZrBvkxHyVvGF/Qwp+MU67UeflktShZFeqs7gaA4ishuY cL8ZIoQh+thNQ3Bc+6P9+98IAKQlqwM1V0LwQYCwWZSly1s0CjXGbM9cv7OYCJ/7 rWLEcnhuck7Po5Zc413JHr0GTxHm0a/IVuNn1oOOfJVBSu25L0syKkO1yaV7hyrZ Ijy/oKwOcHZLd4JwSGyil5A07JHfFwU1v4yAx1if5ShXnYxKtLQiwLW8gaxyHeAY CZhDws1NeTlUU9MYsZyav0tgDA5IFMYiUbAl88u8DJtGpOmmaaBen1Df5nmm01ej jkPbEKeDwDrY2A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrudelkedgjeeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepfdflrdcuffgvkhhkvghrfdcuoehjuggvkhesihhtrghnihhm uhhlrdhliheqnecuggftrfgrthhtvghrnhephfdvfeejffegffefieefvefgheeuudelhe fhffevtddthfehudeitdetfeehieetnecuffhomhgrihhnpehnvghonhdrshgsnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepjhguvghksehith grnhhimhhulhdrlhhi X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Thu, 7 Oct 2021 10:31:00 -0400 (EDT) From: "J. Dekker" To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Oct 2021 16:30:55 +0200 Message-Id: <20211007143057.17870-2-jdek@itanimul.li> X-Mailer: git-send-email 2.30.1 (Apple Git-130) In-Reply-To: <20211007143057.17870-1-jdek@itanimul.li> References: <20211007143057.17870-1-jdek@itanimul.li> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] lavc/aarch64: add hevc sao edge 8x8 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: tZxvrA3gxYFP --bench on AWS Graviton: hevc_sao_edge_8x8_8_c: 516.0 hevc_sao_edge_8x8_8_neon: 81.0 Signed-off-by: J. Dekker --- libavcodec/aarch64/hevcdsp_init_aarch64.c | 3 ++ libavcodec/aarch64/hevcdsp_sao_neon.S | 52 +++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/libavcodec/aarch64/hevcdsp_init_aarch64.c b/libavcodec/aarch64/hevcdsp_init_aarch64.c index 747ff0412d..b93cec9e44 100644 --- a/libavcodec/aarch64/hevcdsp_init_aarch64.c +++ b/libavcodec/aarch64/hevcdsp_init_aarch64.c @@ -59,6 +59,8 @@ void ff_hevc_sao_band_filter_8x8_8_neon(uint8_t *_dst, uint8_t *_src, 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); +void ff_hevc_sao_edge_filter_8x8_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) { @@ -76,6 +78,7 @@ av_cold void ff_hevc_dsp_init_aarch64(HEVCDSPContext *c, const int bit_depth) c->idct_dc[2] = ff_hevc_idct_16x16_dc_8_neon; c->idct_dc[3] = ff_hevc_idct_32x32_dc_8_neon; c->sao_band_filter[0] = ff_hevc_sao_band_filter_8x8_8_neon; + c->sao_edge_filter[0] = ff_hevc_sao_edge_filter_8x8_8_neon; c->sao_edge_filter[1] = c->sao_edge_filter[2] = c->sao_edge_filter[3] = diff --git a/libavcodec/aarch64/hevcdsp_sao_neon.S b/libavcodec/aarch64/hevcdsp_sao_neon.S index a7f054c075..c4b931aab7 100644 --- a/libavcodec/aarch64/hevcdsp_sao_neon.S +++ b/libavcodec/aarch64/hevcdsp_sao_neon.S @@ -151,3 +151,55 @@ function ff_hevc_sao_edge_filter_16x16_8_neon, export=1 // no lines to filter ret endfunc + +// ff_hevc_sao_edge_filter_8x8_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_8x8_8_neon, export=1 + lsl w4, w4, #2 + adr x7, .Lsao_edge_pos + ldr w4, [x7, x4] + ld1 {v3.8h}, [x3] + mov v3.h[7], v3.h[0] + mov v3.h[0], v3.h[1] + mov v3.h[1], v3.h[2] + mov v3.h[2], v3.h[7] + uzp2 v1.16b, v3.16b, v3.16b + uzp1 v0.16b, v3.16b, v3.16b + movi v2.16b, #2 + add x16, x0, x2 + lsl x2, x2, #1 + mov x15, #192 + mov x8, x1 + sub x9, x1, x4 + add x10, x1, x4 + mov x17, #4 +1: ld1 {v3.d}[0], [ x8], x15 + ld1 {v4.d}[0], [ x9], x15 + ld1 {v5.d}[0], [x10], x15 + ld1 {v3.d}[1], [ x8], x15 + ld1 {v4.d}[1], [ x9], x15 + ld1 {v5.d}[1], [x10], x15 + cmhi v16.16b, v4.16b, v3.16b + cmhi v17.16b, v3.16b, v4.16b + cmhi v18.16b, v5.16b, v3.16b + cmhi v19.16b, v3.16b, v5.16b + sub v20.16b, v16.16b, v17.16b + sub v21.16b, v18.16b, v19.16b + add v20.16b, v20.16b, v21.16b + add v20.16b, v20.16b, v2.16b + tbl v16.16b, {v0.16b}, v20.16b + tbl v17.16b, {v1.16b}, v20.16b + zip1 v18.16b, v16.16b, v17.16b + zip2 v19.16b, v16.16b, v17.16b + uxtl v20.8h, v3.8b + uxtl2 v21.8h, v3.16b + sqadd v20.8h, v18.8h, v20.8h + sqadd v21.8h, v19.8h, v21.8h + sqxtun v6.8b, v20.8h + sqxtun v7.8b, v21.8h + st1 {v6.8b}, [ x0], x2 + st1 {v7.8b}, [x16], x2 + subs x17, x17, #1 + b.ne 1b + ret +endfunc From patchwork Thu Oct 7 14:30:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Dekker" X-Patchwork-Id: 30973 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1549867iob; Thu, 7 Oct 2021 07:31:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx5WLg8yzOTy3BWEDDe7Kqmmr25L6CYHnTcht5zBr20pGcksKM+e6x6tSHPwfMUzTwSmF7g X-Received: by 2002:a50:d94f:: with SMTP id u15mr6602449edj.140.1633617095289; Thu, 07 Oct 2021 07:31:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633617095; cv=none; d=google.com; s=arc-20160816; b=mxmwHht3SvEAf29lZfzHqt+YTxhmPGr8uTLJnYWMSgGHsIJlVbhE4M4ouIYWGVXytA j17q76HFHL0xIFjVd1l3Luc9HxBaXdM3mgTJE2tuEFUWvYMXCWRpbpebDhslw+QR3t5+ N6g9O6TL/43MU+JHB+bxz2LakR7nibVyZQa6VzBz8Wt45Sqd0chQzg1TJDZm7lk57X/7 L7Worzcl6AJOVQAZ8IrkOAzmjeqk6JsD/bmgTvaAKfZztUA5RcsBhJRu3b0Bd2KtFkfX zlA+VxtG6z+d/UNraIFOY0h43e1XJCWZh0tUi1EXmASlbxrPF01b9cycjua+5zoyAEN7 rvKQ== 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=rAQOduUA/TsmxOdSNTmLpMifxROHExHWfWo4rL5RXaU=; b=L56LKl+7YqAmKkoPaGeRLFHapKejrmg34tU1Ss1s2WhTdDwrakNbXVHC7AjpHP+BaC /8Wb14ZSqhSvzA4nyGjSNKmVj3KK2XoCBFrsOvC0lgx5kPzCQY1E0Gh3V+zpe4tuAqpQ lbJQnnJoXo7GUdz6oo2rW9duutptF409OppAEG5dPby+7Zly1I6ebGSad1VD+HOpH7wa IGxR7BfK6VTrSJxiHxSRo7R9spPLlrQSeF02u0h431HIHSX7vID+YnkS2WicrFXMaxXH eRGXUI/+tfkC161X9uphbOeGGTqpC7Yj76Maet44k3rFWgg2ACiUZaA5EKCopIbARc74 tm0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=fm3 header.b=P2B3xS3m; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b=Hy1wugEG; 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 gn9si34934286ejc.136.2021.10.07.07.31.34; Thu, 07 Oct 2021 07:31:35 -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=fm3 header.b=P2B3xS3m; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b=Hy1wugEG; 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 A331468A71D; Thu, 7 Oct 2021 17:31:11 +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 098AF68A5FC for ; Thu, 7 Oct 2021 17:31:03 +0300 (EEST) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 24EB55C0080 for ; Thu, 7 Oct 2021 10:31:02 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Thu, 07 Oct 2021 10:31:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=itanimul.li; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm3; bh=CtOp59BR6TZF+ KHu61VIBAp9Mocvc7DCfQ5+0NpAEhI=; b=P2B3xS3m9jEjJNAYa+aTSIu4Y6c/j U/HgSq0C3wvWqghx/lO3fi3oqmuCRTz2i7r9Vzfg761ECdUUTDb42mO5i/LCRVjQ 0/W0M7kRvrKsyzRXW6FjWJ5bLgG/3y4/3XhJmbgaHb8wyliEIm2mCwx9rJFRCifw yUyQ2+thyHkQ48ASSbfs5X01eDP7KvCQerM0vzsggAMXhoEIMynoeW60nbzjWcIp pkWIyGnWHrPp4N9GG7tnIgF4P8IV/JxwkMIYkMm0HV5Kgc9UDpZW0bGvbOr5TGRw r+hL1yXQCf8ZXgouFILrzJ+51jF2jzkldb+oPmsM6U4mRwVZ+3hmS0kcA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=CtOp59BR6TZF+KHu61VIBAp9Mocvc7DCfQ5+0NpAEhI=; b=Hy1wugEG XBkbQghusapryDZtQ2Y4IEAHE+Yp0gmx9B570gY3AY99SOrKME3DCIli4bZBsXUY Pbx0mVFYJxLfKUhe7rkVB1dCCau419SE9/af2Edfxkj1fDTp+sXItGHkzazFFkEV 1OxQH77FBBl1xTdlQB5tGbvZzLAx4praiQgDAOvsbKN0s1IkYg9+RgF7gheVCRi5 4ALr0o+/Orijm4/3I6Kls56vGJ3N28Hst7jqjCJOzhEkZpzW7ivksEMivCeY/a09 PqQYEx+5apId79dk8LITHUwGdS0hI7IINYXcqUawJdutTts4C5u9owJCznLlJIK/ wQ1AqudNMwhy1Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrudelkedgjeehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepfdflrdcuffgvkhhkvghrfdcuoehjuggvkhesihhtrghnihhm uhhlrdhliheqnecuggftrfgrthhtvghrnhephfdvfeejffegffefieefvefgheeuudelhe fhffevtddthfehudeitdetfeehieetnecuffhomhgrihhnpehnvghonhdrshgsnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepjhguvghksehith grnhhimhhulhdrlhhi X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Thu, 7 Oct 2021 10:31:01 -0400 (EDT) From: "J. Dekker" To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Oct 2021 16:30:56 +0200 Message-Id: <20211007143057.17870-3-jdek@itanimul.li> X-Mailer: git-send-email 2.30.1 (Apple Git-130) In-Reply-To: <20211007143057.17870-1-jdek@itanimul.li> References: <20211007143057.17870-1-jdek@itanimul.li> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] lavc/aarch64: add hevc sao band 8x8 tiling 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: 3eE9UeThxgTX --bench on AWS Graviton: hevc_sao_band_8x8_8_c: 317.5 hevc_sao_band_8x8_8_neon: 97.5 hevc_sao_band_16x16_8_c: 1115.0 hevc_sao_band_16x16_8_neon: 322.7 hevc_sao_band_32x32_8_c: 4599.2 hevc_sao_band_32x32_8_neon: 1246.2 hevc_sao_band_48x48_8_c: 10021.7 hevc_sao_band_48x48_8_neon: 2740.5 hevc_sao_band_64x64_8_c: 17635.0 hevc_sao_band_64x64_8_neon: 4875.7 Signed-off-by: J. Dekker --- libavcodec/aarch64/hevcdsp_init_aarch64.c | 6 +++++- libavcodec/aarch64/hevcdsp_sao_neon.S | 9 ++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/libavcodec/aarch64/hevcdsp_init_aarch64.c b/libavcodec/aarch64/hevcdsp_init_aarch64.c index b93cec9e44..2002530266 100644 --- a/libavcodec/aarch64/hevcdsp_init_aarch64.c +++ b/libavcodec/aarch64/hevcdsp_init_aarch64.c @@ -77,7 +77,11 @@ av_cold void ff_hevc_dsp_init_aarch64(HEVCDSPContext *c, const int bit_depth) c->idct_dc[1] = ff_hevc_idct_8x8_dc_8_neon; c->idct_dc[2] = ff_hevc_idct_16x16_dc_8_neon; c->idct_dc[3] = ff_hevc_idct_32x32_dc_8_neon; - c->sao_band_filter[0] = ff_hevc_sao_band_filter_8x8_8_neon; + c->sao_band_filter[0] = + c->sao_band_filter[1] = + 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[0] = ff_hevc_sao_edge_filter_8x8_8_neon; c->sao_edge_filter[1] = c->sao_edge_filter[2] = diff --git a/libavcodec/aarch64/hevcdsp_sao_neon.S b/libavcodec/aarch64/hevcdsp_sao_neon.S index c4b931aab7..263747149f 100644 --- a/libavcodec/aarch64/hevcdsp_sao_neon.S +++ b/libavcodec/aarch64/hevcdsp_sao_neon.S @@ -35,6 +35,7 @@ function ff_hevc_sao_band_filter_8x8_8_neon, export=1 stp xzr, xzr, [sp, #32] stp xzr, xzr, [sp, #48] mov w8, #4 + sxtw x6, w6 0: ldrsh x9, [x4, x8, lsl #1] // x9 = sao_offset_val[k+1] subs w8, w8, #1 @@ -44,8 +45,10 @@ function ff_hevc_sao_band_filter_8x8_8_neon, export=1 bne 0b ld1 {v16.16b-v19.16b}, [sp], #64 movi v20.8h, #1 + sub x2, x2, x6 // stride_dst - width + sub x3, x3, x6 // stride_src - width 1: // beginning of line - mov w8, w6 + mov x8, x6 2: // Simple layout for accessing 16bit values // with 8bit LUT. @@ -56,7 +59,7 @@ function ff_hevc_sao_band_filter_8x8_8_neon, export=1 // +-----------------------------------> // i-0 i-1 i-2 i-3 // dst[x] = av_clip_pixel(src[x] + offset_table[src[x] >> shift]); - ld1 {v2.8b}, [x1] + ld1 {v2.8b}, [x1], #8 // load src[x] uxtl v0.8h, v2.8b // >> shift @@ -74,7 +77,7 @@ function ff_hevc_sao_band_filter_8x8_8_neon, export=1 // clip + narrow sqxtun v4.8b, v1.8h // store - st1 {v4.8b}, [x0] + st1 {v4.8b}, [x0], #8 // done 8 pixels subs w8, w8, #8 bne 2b From patchwork Thu Oct 7 14:30:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Dekker" X-Patchwork-Id: 30974 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1550112iob; Thu, 7 Oct 2021 07:31:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx3+GhBkYOvth/6XHzoeCyCBMUWxq+llnywUfaA652cfCWoDtYojv3pZQk1KYCmBvGhY+qA X-Received: by 2002:a17:906:3fc8:: with SMTP id k8mr5894280ejj.217.1633617106517; Thu, 07 Oct 2021 07:31:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633617106; cv=none; d=google.com; s=arc-20160816; b=WQzoGyUWhLRJ9fZfvHNpOlcvSarl6LbH5KRBhpY0eD1kH9DrTGXQ5hmLr1ky9gUM9T fIdAAt+hdzSM92swijuoIzQ5rZ7S36ezQYzAx21kZheztiCJSHsFnJQWzu7UMZrvCn0z nsMjG51Trp3xVb2JVKC6UUWxFkfP59hlHUJmebHRvvQ7K9FK/LBY4zOsBwk5zRfSwulm +oLmU5bKswojvGc0SNA4CQDCOxfzWMDkCccw7lXHlz+BWV3j6KpgAHQ+q7X+wSGpO1fl KBET6IaagpW7I4ZOhkztrh02AL+XZmbNfgeUcEffzu7KeDjBsxVIg3HuEY6Z93Yltqg+ UmSw== 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=XPHUaw44S9JD47ej3WtCWTXzu9k68wKzymCtjNhvJe4=; b=xLF5mOtz4vM3VmvZxRRSUquFLxE6Irgx4gXBPQs7as6NeA2a/gulLNs2CVveDJMAxm 4ktCbnFfp81WpdB2rn+gxe2JRGOiYwtlBfnLIrBK8IOfeokRKKTqho5UhgUvLIiLZxuw 1/psgE0v/iD167br9pKlep5WZ4/ATC2iQs+DMYrrODfXkdare9E0LBU00xaslRaxWBF2 4Wb7zdhaa799SNXYqEL4qfeXGX5sCwEzPoxyvmEvl6NaFtedbDyM6aMx8JkPmCCPa7os XHY6NcPL2zZW9UoWDPbeTzPYgESVSQm4bWGpBb06dm5+OCfgNtQwiR1s5KSmzsBbuBAV BPxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=fm3 header.b=hiojzZpx; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b="ku/8pcjU"; 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 n22si8299955ejk.189.2021.10.07.07.31.46; Thu, 07 Oct 2021 07:31:46 -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=fm3 header.b=hiojzZpx; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b="ku/8pcjU"; 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 9E48368A72C; Thu, 7 Oct 2021 17:31:12 +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 CBAFA68A4A4 for ; Thu, 7 Oct 2021 17:31:03 +0300 (EEST) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id E75245C0077 for ; Thu, 7 Oct 2021 10:31:02 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Thu, 07 Oct 2021 10:31:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=itanimul.li; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm3; bh=qUI8gfSI1tPYd BvruEmZWLUDqchwUeY5WHlukRAMpyk=; b=hiojzZpxrgkUEiod7S+igXkw7XJkl DCDE370a6XTBYc0MCpGE/y2WCfjXzWJaYpRDT7eAk3wKvoQpChncLmoPFk6GZ/TU M3adon8EG+YODtijGq1/wA28ccakMldGpSoWjUpblz4Uvw8YhwXS5Cq47MbaXoVL hFueC/1PNRaXeVemUyhJl2Tsv1rVoBLkNZb2AtHE6kFXFP5T7Kd95IDlWhK8UN2j uuny4AOROEVZDu5sP0EYYehEKElABghJxiSm6kKeDsEAuWuy/6x1jySTZehm83Qc RL0vaQJiAlyePR1uL8tMz6OacgvRqYZ9PihLEtHol1gasg0dLZNmB6LHQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=qUI8gfSI1tPYdBvruEmZWLUDqchwUeY5WHlukRAMpyk=; b=ku/8pcjU s271WnmQV4KcjSsdLzsXxAxF3nUBc8RJeM7U5mtnErLN7gbAyk7DQSQPZdvMYbCU OzyBOVfUjTz7cbj9OP7zVPmXQIDMxD00zxAkopZ7OZ81HJUmsZkfKrfCacyKfuUl LZixpVLN8BQ+/SS1UcsUI4JK+y2Mg5R4K9gp3vuOrgV4lOBZ0kinCQgE3IuMPoy9 YgVYvkMbncKq2diX+w+l8vIfQmdCKx5eFbXO9/WoYyKCwmVCP17yZ2Mg+SYCzQCa /Jx0mIUTJbmV4EmI4hKgncXGjl1RZi5brG7PfqeP+jN0QHM3135tU6+nX8hx6CiB pUul77Ffu/Os0w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrudelkedgjeeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepfdflrdcuffgvkhhkvghrfdcuoehjuggvkhesihhtrghnihhm uhhlrdhliheqnecuggftrfgrthhtvghrnhephfdvfeejffegffefieefvefgheeuudelhe fhffevtddthfehudeitdetfeehieetnecuffhomhgrihhnpehnvghonhdrshgsnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepjhguvghksehith grnhhimhhulhdrlhhi X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Thu, 7 Oct 2021 10:31:02 -0400 (EDT) From: "J. Dekker" To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Oct 2021 16:30:57 +0200 Message-Id: <20211007143057.17870-4-jdek@itanimul.li> X-Mailer: git-send-email 2.30.1 (Apple Git-130) In-Reply-To: <20211007143057.17870-1-jdek@itanimul.li> References: <20211007143057.17870-1-jdek@itanimul.li> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] lavc/aarch64: clean-up sao band 8x8 function formatting 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: 1dR1bqSTeD/1 Signed-off-by: J. Dekker --- libavcodec/aarch64/hevcdsp_sao_neon.S | 103 +++++++++++--------------- 1 file changed, 44 insertions(+), 59 deletions(-) diff --git a/libavcodec/aarch64/hevcdsp_sao_neon.S b/libavcodec/aarch64/hevcdsp_sao_neon.S index 263747149f..c2519da7f5 100644 --- a/libavcodec/aarch64/hevcdsp_sao_neon.S +++ b/libavcodec/aarch64/hevcdsp_sao_neon.S @@ -3,7 +3,7 @@ * * AArch64 NEON optimised SAO functions for HEVC decoding * - * Copyright (c) 2020 Josh Dekker + * Copyright (c) 2020-2021 J. Dekker * * This file is part of FFmpeg. * @@ -29,64 +29,49 @@ // int16_t *sao_offset_val, int sao_left_class, // int width, int height) function ff_hevc_sao_band_filter_8x8_8_neon, export=1 - sub sp, sp, #64 - stp xzr, xzr, [sp] - stp xzr, xzr, [sp, #16] - stp xzr, xzr, [sp, #32] - stp xzr, xzr, [sp, #48] - mov w8, #4 - sxtw x6, w6 -0: - ldrsh x9, [x4, x8, lsl #1] // x9 = sao_offset_val[k+1] - subs w8, w8, #1 - add w10, w8, w5 // x10 = k + sao_left_class - and w10, w10, #0x1F - strh w9, [sp, x10, lsl #1] - bne 0b - ld1 {v16.16b-v19.16b}, [sp], #64 - movi v20.8h, #1 - sub x2, x2, x6 // stride_dst - width - sub x3, x3, x6 // stride_src - width -1: // beginning of line - mov x8, x6 -2: - // Simple layout for accessing 16bit values - // with 8bit LUT. - // - // 00 01 02 03 04 05 06 07 - // +-----------------------------------> - // |xDE#xAD|xCA#xFE|xBE#xEF|xFE#xED|.... - // +-----------------------------------> - // i-0 i-1 i-2 i-3 - // dst[x] = av_clip_pixel(src[x] + offset_table[src[x] >> shift]); - ld1 {v2.8b}, [x1], #8 - // load src[x] - uxtl v0.8h, v2.8b - // >> shift - ushr v2.8h, v0.8h, #3 // BIT_DEPTH - 3 - // x2 (access lower short) - shl v1.8h, v2.8h, #1 // low (x2, accessing short) - // +1 access upper short - add v3.8h, v1.8h, v20.8h - // shift insert index to upper byte - sli v1.8h, v3.8h, #8 - // table - tbx v2.16b, {v16.16b-v19.16b}, v1.16b - // src[x] + table - add v1.8h, v0.8h, v2.8h - // clip + narrow - sqxtun v4.8b, v1.8h - // store - st1 {v4.8b}, [x0], #8 - // done 8 pixels - subs w8, w8, #8 - bne 2b - // finished line - subs w7, w7, #1 - add x0, x0, x2 // dst += stride_dst - add x1, x1, x3 // src += stride_src - bne 1b - ret + sub sp, sp, #64 + stp xzr, xzr, [sp] + stp xzr, xzr, [sp, #16] + stp xzr, xzr, [sp, #32] + stp xzr, xzr, [sp, #48] + mov w8, #4 + sxtw x6, w6 +0: ldrsh x9, [x4, x8, lsl #1] // sao_offset_val[k+1] + subs w8, w8, #1 + add w10, w8, w5 // k + sao_left_class + and w10, w10, #0x1F + strh w9, [sp, x10, lsl #1] + bne 0b + ld1 {v16.16b-v19.16b}, [sp], #64 + movi v20.8h, #1 + sub x2, x2, x6 // stride_dst - width + sub x3, x3, x6 // stride_src - width +1: mov x8, x6 // beginning of line +2: // Simple layout for accessing 16bit values + // with 8bit LUT. + // + // 00 01 02 03 04 05 06 07 + // +-----------------------------------> + // |xDE#xAD|xCA#xFE|xBE#xEF|xFE#xED|.... + // +-----------------------------------> + // i-0 i-1 i-2 i-3 + ld1 {v2.8b}, [x1], #8 // dst[x] = av_clip_pixel(src[x] + offset_table[src[x] >> shift]); + uxtl v0.8h, v2.8b // load src[x] + ushr v2.8h, v0.8h, #3 // >> BIT_DEPTH - 3 + shl v1.8h, v2.8h, #1 // low (x2, accessing short) + add v3.8h, v1.8h, v20.8h // +1 access upper short + sli v1.8h, v3.8h, #8 // shift insert index to upper byte + tbx v2.16b, {v16.16b-v19.16b}, v1.16b // table + add v1.8h, v0.8h, v2.8h // src[x] + table + sqxtun v4.8b, v1.8h // clip + narrow + st1 {v4.8b}, [x0], #8 // store + subs w8, w8, #8 // done 8 pixels + bne 2b + subs w7, w7, #1 // finished line, prep. new + add x0, x0, x2 // dst += stride_dst + add x1, x1, x3 // src += stride_src + bne 1b + ret endfunc // ASSUMES STRIDE_SRC = 192