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