From patchwork Sun Sep 29 12:02:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 51931 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d8ca:0:b0:48e:c0f8:d0de with SMTP id dy10csp1384956vqb; Sun, 29 Sep 2024 05:03:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUI129/h+EwtvDGvAuN19FEltsPOE5FTcflO+OWx55Xld0s3dd2inHkD5UARPZF232zvQ2VlmDVvJdwo6OIHKXe@gmail.com X-Google-Smtp-Source: AGHT+IGEYzywNCWBI3hTZl+vic4mNRboj7tpm7gwZ0hzeaqlULcke9UZxd2wwBxDWC+VyM27Ni4E X-Received: by 2002:a17:907:9604:b0:a8a:906d:b485 with SMTP id a640c23a62f3a-a93c490e060mr1151465766b.26.1727611439126; Sun, 29 Sep 2024 05:03:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727611439; cv=none; d=google.com; s=arc-20240605; b=fCqpRWV2jr0rSWkkZ5yPwUHatpgkxLKY3+UmN7Uk/NOy4SMF27M1e2s2qytBMBmwHG ywK/+a0xTgtAnlPgkTZD7I7pkv4K4+IAe2Oc0tbkb4VlKg9FOTHsolu892NYsD98H7Gg hbwn5pKcPYii0Hk4MXmnj0mV+EtRQPUgqT2k8AOvulTx8taMMABd4tP2IY61kp0qj0wn I2hi0AHk5qp0RxFdOa54lg5rhVFEgSs3naVK9K4Sm5SV6e9BNb2F5EtB9JWHLFPU8nx9 0Izxcf/pRenJdI9cHDDqLc0Aw6M2p/UaEi7svR4EgLuZ1LkP2o5vB6RGH40rfSHg69kn ouDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:date:to:from:message-id :dkim-signature:delivered-to; bh=qJuJOqBQyMgE4YinpoqlKWTkxPcTPB8xiWqxu2kh9QM=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=iqK/6Qvf6S6lSoaITXIFq3039fihC2dPgb5l8fQ4T3F5xkGAfsQLPBanPqIs2CvxeX S3hkPMCitDxyz1mm0DTLRrRJ/04tX/nG0QKhGwaORbujYkyF4RmtIYmEW4RYnko6/aOJ qLpgxrrK1h69eYupPrMjwLK2Wy7Yb84hSdrvK1Wc/CU0th7sfXB6SPvGw2EvB5QMJATq LK5H8CGu0HjUM4/JsB2dQK9ustuRCaM04TsxPj8uqV5f5WzyhEzL8ONtLIRbB3hdRROy yfxlQQv6vKZM0YPIMXC3Nm+lAPj6bELc0nkAke3N0OAX/DRIE1FMz2/dR9E6/45qR3Nf T6Gg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=PjN+Haxv; 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=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a93c2a28653si442115166b.732.2024.09.29.05.03.58; Sun, 29 Sep 2024 05:03:59 -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=@foxmail.com header.s=s201512 header.b=PjN+Haxv; 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=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4FB8468DB29; Sun, 29 Sep 2024 15:03:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-233.mail.qq.com (out203-205-221-233.mail.qq.com [203.205.221.233]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E1AC468DAA6 for ; Sun, 29 Sep 2024 15:03:48 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1727611425; bh=eUAUBZ8QAyhbpMFgf8/QkYUlXTty7YIgqWr7uWLg8y4=; h=From:To:Cc:Subject:Date; b=PjN+HaxvixEKWSsf51/HAJJPLrcnIB0/RTjCKqdyskElHSWEv71zocPnyodiuS8Pu /jh3cNcj0b00hcUCcFDMF/PdRl7lWY1kaTb+AJdAi8GxPnv9YkLSG36UnIxn889T8o i2qtGTcIbsDIbyp52jHsabst0598mSuPIgPB21so= Received: from ZHILIZHAO-MB1.tencent.com ([119.147.10.196]) by newxmesmtplogicsvrszb9-0.qq.com (NewEsmtp) with SMTP id A12BEE2; Sun, 29 Sep 2024 20:02:33 +0800 X-QQ-mid: xmsmtpt1727611353tfqw5sizi Message-ID: X-QQ-XMAILINFO: NB2Y38G+/V2YwckhGIh7C/ox4kFfdlOWkZZieIiVTtQru8vJcteK1NSq7qkoY4 mMvSunF0vwImT2sBuXAjVOFfbTtKG1F2eY0VD782kYuc+3ZDwwqPTozOOt4fAHdn8jfHy/+b4rST wQZVDIkPlHGTgM83KdjSqdXrPyYmpu4fvhBcLlH+yS9998sHFsalfvqurb3C5I11vtVHk+yHM9/M YSnOhQ+hHe/x51lYz70USnpvUVuMgjC3fnVCrzgh5rQ0Xx/o+n+uNIatjuV3lPWMj+y/bVFDaa1I PGT96PAsZLOtAHXcK5l0QD1TYbNfZa747+ZIWqzGOc8dqOxRef9zSxPLlHEepU4RhmeIam6SH6F9 ge88S0JeMFHcGFOqOqXHDwIeWbMVNwW/XzAXz2NiBn3Eq4TP4p2tR8qdF3ZJvpD67CMdWQoMX4Dk pd/Dd57rmwTzmLCpttGY42Akd5oviYLJm+wZvIwvNAhgwtu0brJfS5/b78eEVcv1JWYfynZkC4FN J8wFlzq+irjqC0OCuCb5e/FOke5uHCStvN+zUCc374ehOsr9Ba4N55DXI5SuDDNL8qBg6hUD9UKm 5oBGclBWTHwsnKrYohI81xUE1OLJqk0Q2+4F+j0gL1fivYD+PRwB271Wp6BqvnhLpblUKLVhPqTZ QJU399EsOBIMS8K6rUsplu5T9nuSM3ngOUu3ut2qkDmVB/LFuyYaECNAdrraYt5pY4MDa2aZFIYF VwOYAqpTyuB2Nk0DOicvPlrQxmWtwN4IeNQTMMSAZDnKuwX5QaPNZ2oGPeSg3VrD6fX0uws1na/r JkcM0XlQvtPL627ZwbgwZMGBpdwza7U/bWG1eZ3ic3AtDOZvYpJ7xcdGuRkTOpryW97RF0FZ2K9+ RPM9dC8TCK/fcdio/bsWNxrqfB8KfmJ4GfCk7gxoU+WgpaBQlL1GFjz7bLSFz5KVeIg4unGJ8Tzy jGw8qi8yJTmQm5ifStkPF929pdQPh3qHrNH1zhQbSIXFFjnPXIAA38MVnsPM1M7DtKe2nr/TVO5r jj3S7f4Q== X-QQ-XMRINFO: Mp0Kj//9VHAxr69bL5MkOOs= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 Sep 2024 20:02:27 +0800 X-OQ-MSGID: <20240929120229.41608-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 1/3] aarch64/vvc: Add w_avg 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 2Mq87I4bRTqB From: Zhao Zhili w_avg_8_2x2_c: 0.0 ( 0.00x) w_avg_8_2x2_neon: 0.0 ( 0.00x) w_avg_8_4x4_c: 0.2 ( 1.00x) w_avg_8_4x4_neon: 0.0 ( 0.00x) w_avg_8_8x8_c: 1.2 ( 1.00x) w_avg_8_8x8_neon: 0.2 ( 5.00x) w_avg_8_16x16_c: 4.2 ( 1.00x) w_avg_8_16x16_neon: 0.8 ( 5.67x) w_avg_8_32x32_c: 16.2 ( 1.00x) w_avg_8_32x32_neon: 2.5 ( 6.50x) w_avg_8_64x64_c: 64.5 ( 1.00x) w_avg_8_64x64_neon: 9.0 ( 7.17x) w_avg_8_128x128_c: 269.5 ( 1.00x) w_avg_8_128x128_neon: 35.5 ( 7.59x) w_avg_10_2x2_c: 0.2 ( 1.00x) w_avg_10_2x2_neon: 0.2 ( 1.00x) w_avg_10_4x4_c: 0.2 ( 1.00x) w_avg_10_4x4_neon: 0.2 ( 1.00x) w_avg_10_8x8_c: 1.0 ( 1.00x) w_avg_10_8x8_neon: 0.2 ( 4.00x) w_avg_10_16x16_c: 4.2 ( 1.00x) w_avg_10_16x16_neon: 0.8 ( 5.67x) w_avg_10_32x32_c: 16.2 ( 1.00x) w_avg_10_32x32_neon: 2.5 ( 6.50x) w_avg_10_64x64_c: 66.2 ( 1.00x) w_avg_10_64x64_neon: 10.0 ( 6.62x) w_avg_10_128x128_c: 277.8 ( 1.00x) w_avg_10_128x128_neon: 39.8 ( 6.99x) w_avg_12_2x2_c: 0.0 ( 0.00x) w_avg_12_2x2_neon: 0.2 ( 0.00x) w_avg_12_4x4_c: 0.2 ( 1.00x) w_avg_12_4x4_neon: 0.0 ( 0.00x) w_avg_12_8x8_c: 1.2 ( 1.00x) w_avg_12_8x8_neon: 0.5 ( 2.50x) w_avg_12_16x16_c: 4.8 ( 1.00x) w_avg_12_16x16_neon: 0.8 ( 6.33x) w_avg_12_32x32_c: 17.0 ( 1.00x) w_avg_12_32x32_neon: 2.8 ( 6.18x) w_avg_12_64x64_c: 64.0 ( 1.00x) w_avg_12_64x64_neon: 10.0 ( 6.40x) w_avg_12_128x128_c: 269.2 ( 1.00x) w_avg_12_128x128_neon: 42.0 ( 6.41x) Signed-off-by: Zhao Zhili --- libavcodec/aarch64/vvc/dsp_init.c | 36 +++++++++++ libavcodec/aarch64/vvc/inter.S | 99 +++++++++++++++++++++++++------ 2 files changed, 118 insertions(+), 17 deletions(-) diff --git a/libavcodec/aarch64/vvc/dsp_init.c b/libavcodec/aarch64/vvc/dsp_init.c index ad767d17e2..ebe58a2ba5 100644 --- a/libavcodec/aarch64/vvc/dsp_init.c +++ b/libavcodec/aarch64/vvc/dsp_init.c @@ -52,6 +52,39 @@ void ff_vvc_avg_12_neon(uint8_t *dst, ptrdiff_t dst_stride, const int16_t *src0, const int16_t *src1, int width, int height); +void ff_vvc_w_avg_8_neon(uint8_t *_dst, ptrdiff_t _dst_stride, + const int16_t *src0, const int16_t *src1, + int width, int height, + uintptr_t w0_w1, uintptr_t offset_shift); +void ff_vvc_w_avg_10_neon(uint8_t *_dst, ptrdiff_t _dst_stride, + const int16_t *src0, const int16_t *src1, + int width, int height, + uintptr_t w0_w1, uintptr_t offset_shift); +void ff_vvc_w_avg_12_neon(uint8_t *_dst, ptrdiff_t _dst_stride, + const int16_t *src0, const int16_t *src1, + int width, int height, + uintptr_t w0_w1, uintptr_t offset_shift); +/* When passing arguments to functions, Apple platforms diverge from the ARM64 + * standard ABI for functions that require passing arguments on the stack. To + * simplify portability in the assembly function interface, use a different + * function signature that doesn't require passing arguments on the stack. + */ +#define W_AVG_FUN(bit_depth) \ +static void vvc_w_avg_ ## bit_depth(uint8_t *dst, ptrdiff_t dst_stride, \ + const int16_t *src0, const int16_t *src1, int width, int height, \ + int denom, int w0, int w1, int o0, int o1) \ +{ \ + int shift = denom + FFMAX(3, 15 - bit_depth); \ + int offset = ((o0 + o1) * (1 << (bit_depth - 8)) + 1) * (1 << (shift - 1)); \ + uintptr_t w0_w1 = ((uintptr_t)w0 << 32) | (uint32_t)w1; \ + uintptr_t offset_shift = ((uintptr_t)offset << 32) | (uint32_t)shift; \ + ff_vvc_w_avg_ ## bit_depth ## _neon(dst, dst_stride, src0, src1, width, height, w0_w1, offset_shift); \ +} + +W_AVG_FUN(8) +W_AVG_FUN(10) +W_AVG_FUN(12) + void ff_vvc_dsp_init_aarch64(VVCDSPContext *const c, const int bd) { int cpu_flags = av_get_cpu_flags(); @@ -123,6 +156,7 @@ void ff_vvc_dsp_init_aarch64(VVCDSPContext *const c, const int bd) c->inter.put_uni_w[0][6][0][0] = ff_vvc_put_pel_uni_w_pixels128_8_neon; c->inter.avg = ff_vvc_avg_8_neon; + c->inter.w_avg = vvc_w_avg_8; for (int i = 0; i < FF_ARRAY_ELEMS(c->sao.band_filter); i++) c->sao.band_filter[i] = ff_h26x_sao_band_filter_8x8_8_neon; @@ -163,11 +197,13 @@ void ff_vvc_dsp_init_aarch64(VVCDSPContext *const c, const int bd) } } else if (bd == 10) { c->inter.avg = ff_vvc_avg_10_neon; + c->inter.w_avg = vvc_w_avg_10; c->alf.filter[LUMA] = alf_filter_luma_10_neon; c->alf.filter[CHROMA] = alf_filter_chroma_10_neon; } else if (bd == 12) { c->inter.avg = ff_vvc_avg_12_neon; + c->inter.w_avg = vvc_w_avg_12; c->alf.filter[LUMA] = alf_filter_luma_12_neon; c->alf.filter[CHROMA] = alf_filter_chroma_12_neon; diff --git a/libavcodec/aarch64/vvc/inter.S b/libavcodec/aarch64/vvc/inter.S index 2f69274b86..c4c6ab1a72 100644 --- a/libavcodec/aarch64/vvc/inter.S +++ b/libavcodec/aarch64/vvc/inter.S @@ -22,9 +22,9 @@ #define VVC_MAX_PB_SIZE 128 -.macro vvc_avg, bit_depth +.macro vvc_avg type, bit_depth -.macro vvc_avg_\bit_depth\()_2_4, tap +.macro vvc_\type\()_\bit_depth\()_2_4 tap .if \tap == 2 ldr s0, [src0] ldr s2, [src1] @@ -32,9 +32,19 @@ ldr d0, [src0] ldr d2, [src1] .endif + +.ifc \type, avg saddl v4.4s, v0.4h, v2.4h add v4.4s, v4.4s, v16.4s sqshrn v4.4h, v4.4s, #(15 - \bit_depth) +.else + mov v4.16b, v16.16b + smlal v4.4s, v0.4h, v19.4h + smlal v4.4s, v2.4h, v20.4h + sqshl v4.4s, v4.4s, v22.4s + sqxtn v4.4h, v4.4s +.endif + .if \bit_depth == 8 sqxtun v4.8b, v4.8h .if \tap == 2 @@ -57,7 +67,7 @@ add dst, dst, dst_stride .endm -function ff_vvc_avg_\bit_depth\()_neon, export=1 +function ff_vvc_\type\()_\bit_depth\()_neon, export=1 dst .req x0 dst_stride .req x1 src0 .req x2 @@ -67,42 +77,64 @@ function ff_vvc_avg_\bit_depth\()_neon, export=1 mov x10, #(VVC_MAX_PB_SIZE * 2) cmp width, #8 -.if \bit_depth == 8 - movi v16.4s, #64 -.else -.if \bit_depth == 10 - mov w6, #1023 - movi v16.4s, #16 +.ifc \type, avg + movi v16.4s, #(1 << (14 - \bit_depth)) .else - mov w6, #4095 - movi v16.4s, #4 -.endif + lsr x11, x6, #32 // weight0 + mov w12, w6 // weight1 + lsr x13, x7, #32 // offset + mov w14, w7 // shift + + dup v19.8h, w11 + neg w14, w14 // so we can use sqshl + dup v20.8h, w12 + dup v16.4s, w13 + dup v22.4s, w14 +.endif // avg + + .if \bit_depth >= 10 + // clip pixel + mov w6, #((1 << \bit_depth) - 1) movi v18.8h, #0 dup v17.8h, w6 .endif + b.eq 8f b.hi 16f cmp width, #4 b.eq 4f 2: // width == 2 subs height, height, #1 - vvc_avg_\bit_depth\()_2_4 2 + vvc_\type\()_\bit_depth\()_2_4 2 b.ne 2b b 32f 4: // width == 4 subs height, height, #1 - vvc_avg_\bit_depth\()_2_4 4 + vvc_\type\()_\bit_depth\()_2_4 4 b.ne 4b b 32f 8: // width == 8 ld1 {v0.8h}, [src0], x10 ld1 {v2.8h}, [src1], x10 +.ifc \type, avg saddl v4.4s, v0.4h, v2.4h saddl2 v5.4s, v0.8h, v2.8h add v4.4s, v4.4s, v16.4s add v5.4s, v5.4s, v16.4s sqshrn v4.4h, v4.4s, #(15 - \bit_depth) sqshrn2 v4.8h, v5.4s, #(15 - \bit_depth) +.else + mov v4.16b, v16.16b + mov v5.16b, v16.16b + smlal v4.4s, v0.4h, v19.4h + smlal v4.4s, v2.4h, v20.4h + smlal2 v5.4s, v0.8h, v19.8h + smlal2 v5.4s, v2.8h, v20.8h + sqshl v4.4s, v4.4s, v22.4s + sqshl v5.4s, v5.4s, v22.4s + sqxtn v4.4h, v4.4s + sqxtn2 v4.8h, v5.4s +.endif subs height, height, #1 .if \bit_depth == 8 sqxtun v4.8b, v4.8h @@ -122,6 +154,7 @@ function ff_vvc_avg_\bit_depth\()_neon, export=1 17: ldp q0, q1, [x7], #32 ldp q2, q3, [x8], #32 +.ifc \type, avg saddl v4.4s, v0.4h, v2.4h saddl2 v5.4s, v0.8h, v2.8h saddl v6.4s, v1.4h, v3.4h @@ -134,6 +167,28 @@ function ff_vvc_avg_\bit_depth\()_neon, export=1 sqshrn2 v4.8h, v5.4s, #(15 - \bit_depth) sqshrn v6.4h, v6.4s, #(15 - \bit_depth) sqshrn2 v6.8h, v7.4s, #(15 - \bit_depth) +.else // avg + mov v4.16b, v16.16b + mov v5.16b, v16.16b + mov v6.16b, v16.16b + mov v7.16b, v16.16b + smlal v4.4s, v0.4h, v19.4h + smlal v4.4s, v2.4h, v20.4h + smlal2 v5.4s, v0.8h, v19.8h + smlal2 v5.4s, v2.8h, v20.8h + smlal v6.4s, v1.4h, v19.4h + smlal v6.4s, v3.4h, v20.4h + smlal2 v7.4s, v1.8h, v19.8h + smlal2 v7.4s, v3.8h, v20.8h + sqshl v4.4s, v4.4s, v22.4s + sqshl v5.4s, v5.4s, v22.4s + sqshl v6.4s, v6.4s, v22.4s + sqshl v7.4s, v7.4s, v22.4s + sqxtn v4.4h, v4.4s + sqxtn v6.4h, v6.4s + sqxtn2 v4.8h, v5.4s + sqxtn2 v6.8h, v7.4s +.endif // w_avg subs w6, w6, #16 .if \bit_depth == 8 sqxtun v4.8b, v4.8h @@ -155,9 +210,19 @@ function ff_vvc_avg_\bit_depth\()_neon, export=1 b.ne 16b 32: ret + +.unreq dst +.unreq dst_stride +.unreq src0 +.unreq src1 +.unreq width +.unreq height endfunc .endm -vvc_avg 8 -vvc_avg 10 -vvc_avg 12 +vvc_avg avg, 8 +vvc_avg avg, 10 +vvc_avg avg, 12 +vvc_avg w_avg, 8 +vvc_avg w_avg, 10 +vvc_avg w_avg, 12 From patchwork Sun Sep 29 12:02:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 51929 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d8ca:0:b0:48e:c0f8:d0de with SMTP id dy10csp1384438vqb; Sun, 29 Sep 2024 05:03:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXEdILE9EQT2V2c2jICmhg9Sy3sdoVAoyJrXEp8Y/7IWvdp9wQKfg5ZXphEhEFx4qPMMtYAIHV4GXx56e7db1Wv@gmail.com X-Google-Smtp-Source: AGHT+IFtYukCM+ZyTe/odp39PeRaWdiJEoWYdvp+0lgtfZwPY28qYl6asDPExltJCH4q6tNJYLMP X-Received: by 2002:a17:906:730e:b0:a8d:61ca:271e with SMTP id a640c23a62f3a-a93c48f8591mr917006466b.6.1727611385388; Sun, 29 Sep 2024 05:03:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727611385; cv=none; d=google.com; s=arc-20240605; b=TeXlPU6NB15ZCxOyp44/0joq1lrtbQqKjMPNzkoJWIV+86vHIv2uh1y41IPPuVjARL 8Ln9IivCm93blTk6Yq5iFco7NFPOIUMIG9/DJG4/EnPcyTJc5PxjjzdnmCxqCTjlGv6R XeaTpmr/Xk1V5N+6OrHsipVmoYZKETFjeOW1xR2+85KrrTFenD1NbVFnC8kCJJJ71KEy 4TQ5Fc+GYexPQQjq7DeWYxNbQDcfcpMgcGx8ARCvrVdKkL+DKIpmMj4nzHuioyoHr7FV kcxxEl/WwT157WVF29UWqRCquMSJf4WeAJKMvh69YJ/6gOkH2HR4n+J/aIaFO4JeV2/G GHbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:date:to:from:message-id :dkim-signature:delivered-to; bh=Z4s9SlHlGKTWaB4QWJk/DO39WzpNvbauFKVEx0gm3QA=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=ateaX5VJbxOS+cNAVEqin1LwUGCg8VEdyVsUO0D8M0kFxLOROkxHaWheNaZafY4IgL dcgYWenI2P34DM+VUKL43qZ/37pgLytt2ZLbvv7FJQPXuDrRQ52vjibIArJ6gECNQu3O 3gGKMzTdOGnTk9cnVnGvOuV5RyRI45RLFpP9J9zcMRWBScWdzxyd2K0iqZq6SAYEOGoT jX8sevciuijq0Ogu17U/gvlg/baig0nDNfiKrjb1G1d5eZJhr652+JS7nxksLw9xJ09o VCJ1XMBCRsNbxUxODTCb94GRxSRsYtBye0HZlc4pwW2iOKPCnL8Yis9ZVG9A4IDZDRve i/rQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=degbwLPr; 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=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a93c2ab0194si458094866b.995.2024.09.29.05.03.04; Sun, 29 Sep 2024 05:03: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=@foxmail.com header.s=s201512 header.b=degbwLPr; 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=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2CD3168D7A9; Sun, 29 Sep 2024 15:03:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-58-216.mail.qq.com (out162-62-58-216.mail.qq.com [162.62.58.216]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9635E68D7A9 for ; Sun, 29 Sep 2024 15:02:54 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1727611366; bh=U2SQZQ1mhPcw5IkP6Rhv938poLxViAtOOap+JJcT1FY=; h=From:To:Cc:Subject:Date; b=degbwLPrZvo0xpEVOZ7ldFkocU1WCJmxLiqreKNt9NR5LkqLoAPPXSfd/jeWPMxjU UNhvo/qD1FA+hvy07cDeykFRaIsrIPJUaoJJ/5ySPuSRR05duqCOSJxmXJmgSKBKRw 4qfpmA5pI5VPYs9eugPVy9/Ohb43yXpUhtodmAWI= Received: from ZHILIZHAO-MB1.tencent.com ([119.147.10.196]) by newxmesmtplogicsvrsza15-1.qq.com (NewEsmtp) with SMTP id AC97C2D; Sun, 29 Sep 2024 20:02:44 +0800 X-QQ-mid: xmsmtpt1727611364t6hkhqk22 Message-ID: X-QQ-XMAILINFO: MDbayGdXPuoedlRM6D42y7P82k0IuKGZ+GxjLfWooMt5MMkRQAkoJ8BxGu6LIK FRThPXS+AvECCZkfG+LzvkiPmeZYbYOHkBvK0x2lLJHVMTeS7kS353JUFx3670lf90xikhrqB9/a 2aKaDIHXtWmaQFVNqmBgp06vI+q3pWAP8pQ6HaoPCPqfjq2uBENc1QOp/ZLKyZaBKWUSHVYsT8oB 7vnSEE9U39RAKSPpj9h0/fR6UWb/i2Ib4W60wXoQia6XsEgl8XIlArVU//rfnbr74wmwcEtqRHE8 QOmlD/l6PmFLy128hlbpUQdP2/hEac4p3hkWg6jcUfq/GFyOp25OwWY0+f4bRUn6FCgpm17NH2AZ QKZr37hITqbTee0Hzb0jRtl7Y2P+aHUE5SJiLHX4Bf6+WIwPfj+sExkxffysvHCTtllOl31JmtcQ WjL6mbOG8MoUOE2SsqNgb9GlPapzc6qVLdFRPidv3stJWDv1mZzXpZ7TFWn/iQ4o9fVodZhM/BRE fo+9f3tiqallePf101Xiu4YXAWwiSFBIuavjipiHp2Xr1iiKflDrX6BTzAA6cvFvN723ntiIzizc 4QbgZhhsA1T1+y7s4qWUMdW5zl3bf9Llun1YAF77aOewy5wFPdaJmyOfTuxCK1Kpa40hG36xe9z+ fDFGAe47qGyT0V156mdXcfnRTwL0WFkrZLTnHb3tERgKd5QdvLcJ5TaQ+unKOnxGpsX3ZSunmaDx jfulT9a+8FZXGAqZOwg90Q0GB9dY7lrYhcnizPxkwmClHyVRsJp7TykkJQruegIx/ypiy+YpbBoJ d7jdVQpirZi42nM1VWyrV7DnShhi2fHykuK4kwb4MXDurMIGPSFX8h03u6JnFcocRIYbEtTAqstW ZQgwKBUgcXJTVDE2Lbp6XWUnGfpxIzdJrlNGyKAVkR8e2Me9fbXsmhy2wfV/KOLBsRklvqO9IQRM 477EHDMeNEzSVSneV+aGWMnAdnsUNE03XRtdgOCete2ArSFPMoPA2SkHDVppElqmKL8CubjFcueI O3bwjJNc8o8e/I0vXN X-QQ-XMRINFO: Nq+8W0+stu50PRdwbJxPCL0= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 Sep 2024 20:02:43 +0800 X-OQ-MSGID: <20240929120243.41715-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 2/3] aarch64/vvc: Add dmvr_hv 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 29xOF180tMiS From: Zhao Zhili dmvr_hv_8_12x20_c: 8.0 ( 1.00x) dmvr_hv_8_12x20_neon: 1.2 ( 6.62x) dmvr_hv_8_20x12_c: 8.0 ( 1.00x) dmvr_hv_8_20x12_neon: 0.9 ( 8.37x) dmvr_hv_8_20x20_c: 12.9 ( 1.00x) dmvr_hv_8_20x20_neon: 1.7 ( 7.62x) dmvr_hv_10_12x20_c: 7.0 ( 1.00x) dmvr_hv_10_12x20_neon: 1.7 ( 4.09x) dmvr_hv_10_20x12_c: 7.0 ( 1.00x) dmvr_hv_10_20x12_neon: 1.7 ( 4.09x) dmvr_hv_10_20x20_c: 11.2 ( 1.00x) dmvr_hv_10_20x20_neon: 2.7 ( 4.15x) dmvr_hv_12_12x20_c: 6.5 ( 1.00x) dmvr_hv_12_12x20_neon: 1.7 ( 3.79x) dmvr_hv_12_20x12_c: 6.5 ( 1.00x) dmvr_hv_12_20x12_neon: 1.7 ( 3.79x) dmvr_hv_12_20x20_c: 10.2 ( 1.00x) dmvr_hv_12_20x20_neon: 2.2 ( 4.64x) Signed-off-by: Zhao Zhili --- libavcodec/aarch64/vvc/dsp_init.c | 12 ++ libavcodec/aarch64/vvc/inter.S | 307 ++++++++++++++++++++++++++++++ 2 files changed, 319 insertions(+) diff --git a/libavcodec/aarch64/vvc/dsp_init.c b/libavcodec/aarch64/vvc/dsp_init.c index ebe58a2ba5..b5f6f6da93 100644 --- a/libavcodec/aarch64/vvc/dsp_init.c +++ b/libavcodec/aarch64/vvc/dsp_init.c @@ -85,6 +85,15 @@ W_AVG_FUN(8) W_AVG_FUN(10) W_AVG_FUN(12) +#define DMVR_FUN(fn, bd) \ + void ff_vvc_dmvr_ ## fn ## bd ## _neon(int16_t *dst, \ + const uint8_t *_src, ptrdiff_t _src_stride, int height, \ + intptr_t mx, intptr_t my, int width); + +DMVR_FUN(hv_, 8) +DMVR_FUN(hv_, 10) +DMVR_FUN(hv_, 12) + void ff_vvc_dsp_init_aarch64(VVCDSPContext *const c, const int bd) { int cpu_flags = av_get_cpu_flags(); @@ -157,6 +166,7 @@ void ff_vvc_dsp_init_aarch64(VVCDSPContext *const c, const int bd) c->inter.avg = ff_vvc_avg_8_neon; c->inter.w_avg = vvc_w_avg_8; + c->inter.dmvr[1][1] = ff_vvc_dmvr_hv_8_neon; for (int i = 0; i < FF_ARRAY_ELEMS(c->sao.band_filter); i++) c->sao.band_filter[i] = ff_h26x_sao_band_filter_8x8_8_neon; @@ -198,12 +208,14 @@ void ff_vvc_dsp_init_aarch64(VVCDSPContext *const c, const int bd) } else if (bd == 10) { c->inter.avg = ff_vvc_avg_10_neon; c->inter.w_avg = vvc_w_avg_10; + c->inter.dmvr[1][1] = ff_vvc_dmvr_hv_10_neon; c->alf.filter[LUMA] = alf_filter_luma_10_neon; c->alf.filter[CHROMA] = alf_filter_chroma_10_neon; } else if (bd == 12) { c->inter.avg = ff_vvc_avg_12_neon; c->inter.w_avg = vvc_w_avg_12; + c->inter.dmvr[1][1] = ff_vvc_dmvr_hv_12_neon; c->alf.filter[LUMA] = alf_filter_luma_12_neon; c->alf.filter[CHROMA] = alf_filter_chroma_12_neon; diff --git a/libavcodec/aarch64/vvc/inter.S b/libavcodec/aarch64/vvc/inter.S index c4c6ab1a72..4fc8def133 100644 --- a/libavcodec/aarch64/vvc/inter.S +++ b/libavcodec/aarch64/vvc/inter.S @@ -226,3 +226,310 @@ vvc_avg avg, 12 vvc_avg w_avg, 8 vvc_avg w_avg, 10 vvc_avg w_avg, 12 + +/* x0: int16_t *dst + * x1: const uint8_t *_src + * x2: ptrdiff_t _src_stride + * w3: int height + * x4: intptr_t mx + * x5: intptr_t my + * w6: int width + */ +function ff_vvc_dmvr_hv_8_neon, export=1 + dst .req x0 + src .req x1 + src_stride .req x2 + height .req w3 + mx .req x4 + my .req x5 + width .req w6 + tmp0 .req x7 + tmp1 .req x8 + + sub sp, sp, #(VVC_MAX_PB_SIZE * 4) + + movrel x9, X(ff_vvc_inter_luma_dmvr_filters) + add x12, x9, mx, lsl #1 + ldrb w10, [x12] + ldrb w11, [x12, #1] + mov tmp0, sp + add tmp1, tmp0, #(VVC_MAX_PB_SIZE * 2) + // We know the value are positive + dup v0.8h, w10 // filter_x[0] + dup v1.8h, w11 // filter_x[1] + + add x12, x9, my, lsl #1 + ldrb w10, [x12] + ldrb w11, [x12, #1] + sxtw x6, w6 + movi v30.8h, #(1 << (8 - 7)) // offset1 + movi v31.8h, #8 // offset2 + dup v2.8h, w10 // filter_y[0] + dup v3.8h, w11 // filter_y[1] + + // Valid value for width can only be 8 + 4, 16 + 4 + cmp width, #16 + mov w10, #0 // start filter_y or not + add height, height, #1 + sub dst, dst, #(VVC_MAX_PB_SIZE * 2) + sub src_stride, src_stride, x6 + cset w15, gt // width > 16 +1: + mov x12, tmp0 + mov x13, tmp1 + mov x14, dst + cbz w15, 2f + + // width > 16 + ldur q5, [src, #1] + ldr q4, [src], #16 + uxtl v7.8h, v5.8b + uxtl2 v17.8h, v5.16b + uxtl v6.8h, v4.8b + uxtl2 v16.8h, v4.16b + mul v6.8h, v6.8h, v0.8h + mul v16.8h, v16.8h, v0.8h + mla v6.8h, v7.8h, v1.8h + mla v16.8h, v17.8h, v1.8h + add v6.8h, v6.8h, v30.8h + add v16.8h, v16.8h, v30.8h + ushr v6.8h, v6.8h, #(8 - 6) + ushr v7.8h, v16.8h, #(8 - 6) + stp q6, q7, [x13], #32 + + cbz w10, 3f + + ldp q16, q17, [x12], #32 + mul v16.8h, v16.8h, v2.8h + mul v17.8h, v17.8h, v2.8h + mla v16.8h, v6.8h, v3.8h + mla v17.8h, v7.8h, v3.8h + add v16.8h, v16.8h, v31.8h + add v17.8h, v17.8h, v31.8h + ushr v16.8h, v16.8h, #4 + ushr v17.8h, v17.8h, #4 + stp q16, q17, [x14], #32 + b 3f +2: + // width > 8 + ldur d5, [src, #1] + ldr d4, [src], #8 + uxtl v7.8h, v5.8b + uxtl v6.8h, v4.8b + mul v6.8h, v6.8h, v0.8h + mla v6.8h, v7.8h, v1.8h + add v6.8h, v6.8h, v30.8h + ushr v6.8h, v6.8h, #(8 - 6) + str q6, [x13], #16 + + cbz w10, 3f + + ldr q16, [x12], #16 + mul v16.8h, v16.8h, v2.8h + mla v16.8h, v6.8h, v3.8h + add v16.8h, v16.8h, v31.8h + ushr v16.8h, v16.8h, #4 + str q16, [x14], #16 +3: + ldr s5, [src, #1] + ldr s4, [src], #4 + uxtl v7.8h, v5.8b + uxtl v6.8h, v4.8b + mul v6.4h, v6.4h, v0.4h + mla v6.4h, v7.4h, v1.4h + add v6.4h, v6.4h, v30.4h + ushr v6.4h, v6.4h, #(8 - 6) + str d6, [x13], #8 + + cbz w10, 4f + + ldr d16, [x12], #8 + mul v16.4h, v16.4h, v2.4h + mla v16.4h, v6.4h, v3.4h + add v16.4h, v16.4h, v31.4h + ushr v16.4h, v16.4h, #4 + str d16, [x14], #8 +4: + subs height, height, #1 + mov w10, #1 + add src, src, src_stride + add dst, dst, #(VVC_MAX_PB_SIZE * 2) + eor tmp0, tmp0, tmp1 + eor tmp1, tmp0, tmp1 + eor tmp0, tmp0, tmp1 + b.ne 1b + + add sp, sp, #(VVC_MAX_PB_SIZE * 4) + ret +endfunc + +function ff_vvc_dmvr_hv_12_neon, export=1 + movi v29.4s, #(12 - 6) + movi v30.4s, #(1 << (12 - 7)) // offset1 + b 0f +endfunc + +function ff_vvc_dmvr_hv_10_neon, export=1 + movi v29.4s, #(10 - 6) + movi v30.4s, #(1 << (10 - 7)) // offset1 +0: + movi v31.4s, #8 // offset2 + neg v29.4s, v29.4s + + sub sp, sp, #(VVC_MAX_PB_SIZE * 4) + + movrel x9, X(ff_vvc_inter_luma_dmvr_filters) + add x12, x9, mx, lsl #1 + ldrb w10, [x12] + ldrb w11, [x12, #1] + mov tmp0, sp + add tmp1, tmp0, #(VVC_MAX_PB_SIZE * 2) + // We know the value are positive + dup v0.8h, w10 // filter_x[0] + dup v1.8h, w11 // filter_x[1] + + add x12, x9, my, lsl #1 + ldrb w10, [x12] + ldrb w11, [x12, #1] + sxtw x6, w6 + dup v2.8h, w10 // filter_y[0] + dup v3.8h, w11 // filter_y[1] + + // Valid value for width can only be 8 + 4, 16 + 4 + cmp width, #16 + mov w10, #0 // start filter_y or not + add height, height, #1 + sub dst, dst, #(VVC_MAX_PB_SIZE * 2) + sub src_stride, src_stride, x6, lsl #1 + cset w15, gt // width > 16 +1: + mov x12, tmp0 + mov x13, tmp1 + mov x14, dst + cbz w15, 2f + + // width > 16 + add x16, src, #2 + ldp q6, q16, [src], #32 + ldp q7, q17, [x16] + umull v4.4s, v6.4h, v0.4h + umull2 v5.4s, v6.8h, v0.8h + umull v18.4s, v16.4h, v0.4h + umull2 v19.4s, v16.8h, v0.8h + umlal v4.4s, v7.4h, v1.4h + umlal2 v5.4s, v7.8h, v1.8h + umlal v18.4s, v17.4h, v1.4h + umlal2 v19.4s, v17.8h, v1.8h + + add v4.4s, v4.4s, v30.4s + add v5.4s, v5.4s, v30.4s + add v18.4s, v18.4s, v30.4s + add v19.4s, v19.4s, v30.4s + ushl v4.4s, v4.4s, v29.4s + ushl v5.4s, v5.4s, v29.4s + ushl v18.4s, v18.4s, v29.4s + ushl v19.4s, v19.4s, v29.4s + uqxtn v6.4h, v4.4s + uqxtn2 v6.8h, v5.4s + uqxtn v7.4h, v18.4s + uqxtn2 v7.8h, v19.4s + stp q6, q7, [x13], #32 + + cbz w10, 3f + + ldp q4, q5, [x12], #32 + umull v17.4s, v4.4h, v2.4h + umull2 v18.4s, v4.8h, v2.8h + umull v19.4s, v5.4h, v2.4h + umull2 v20.4s, v5.8h, v2.8h + umlal v17.4s, v6.4h, v3.4h + umlal2 v18.4s, v6.8h, v3.8h + umlal v19.4s, v7.4h, v3.4h + umlal2 v20.4s, v7.8h, v3.8h + add v17.4s, v17.4s, v31.4s + add v18.4s, v18.4s, v31.4s + add v19.4s, v19.4s, v31.4s + add v20.4s, v20.4s, v31.4s + ushr v17.4s, v17.4s, #4 + ushr v18.4s, v18.4s, #4 + ushr v19.4s, v19.4s, #4 + ushr v20.4s, v20.4s, #4 + uqxtn v6.4h, v17.4s + uqxtn2 v6.8h, v18.4s + uqxtn v7.4h, v19.4s + uqxtn2 v7.8h, v20.4s + stp q6, q7, [x14], #32 + b 3f +2: + // width > 8 + ldur q7, [src, #2] + ldr q6, [src], #16 + umull v4.4s, v6.4h, v0.4h + umull2 v5.4s, v6.8h, v0.8h + umlal v4.4s, v7.4h, v1.4h + umlal2 v5.4s, v7.8h, v1.8h + + add v4.4s, v4.4s, v30.4s + add v5.4s, v5.4s, v30.4s + ushl v4.4s, v4.4s, v29.4s + ushl v5.4s, v5.4s, v29.4s + uqxtn v6.4h, v4.4s + uqxtn2 v6.8h, v5.4s + str q6, [x13], #16 + + cbz w10, 3f + + ldr q16, [x12], #16 + umull v17.4s, v16.4h, v2.4h + umull2 v18.4s, v16.8h, v2.8h + umlal v17.4s, v6.4h, v3.4h + umlal2 v18.4s, v6.8h, v3.8h + add v17.4s, v17.4s, v31.4s + add v18.4s, v18.4s, v31.4s + ushr v17.4s, v17.4s, #4 + ushr v18.4s, v18.4s, #4 + uqxtn v16.4h, v17.4s + uqxtn2 v16.8h, v18.4s + str q16, [x14], #16 +3: + ldr d7, [src, #2] + ldr d6, [src], #8 + umull v4.4s, v7.4h, v1.4h + umlal v4.4s, v6.4h, v0.4h + add v4.4s, v4.4s, v30.4s + ushl v4.4s, v4.4s, v29.4s + uqxtn v6.4h, v4.4s + str d6, [x13], #8 + + cbz w10, 4f + + ldr d16, [x12], #8 + umull v17.4s, v16.4h, v2.4h + umlal v17.4s, v6.4h, v3.4h + add v17.4s, v17.4s, v31.4s + ushr v17.4s, v17.4s, #4 + uqxtn v16.4h, v17.4s + str d16, [x14], #8 +4: + subs height, height, #1 + mov w10, #1 + add src, src, src_stride + add dst, dst, #(VVC_MAX_PB_SIZE * 2) + eor tmp0, tmp0, tmp1 + eor tmp1, tmp0, tmp1 + eor tmp0, tmp0, tmp1 + b.ne 1b + + add sp, sp, #(VVC_MAX_PB_SIZE * 4) + ret + +.unreq dst +.unreq src +.unreq src_stride +.unreq height +.unreq mx +.unreq my +.unreq width +.unreq tmp0 +.unreq tmp1 +endfunc From patchwork Sun Sep 29 12:02:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 51930 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d8ca:0:b0:48e:c0f8:d0de with SMTP id dy10csp1384518vqb; Sun, 29 Sep 2024 05:03:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVZOrWqRuGqMaFJ3pAjkahLihFqZ6RGokOs1SFosyIBFgMMitlJtDbbdjHG3vG8/qJ8gilky9O3G+Ur7rNQh/6V@gmail.com X-Google-Smtp-Source: AGHT+IGq2F7DOwr0YneHS5IbHGuB1wxBwAm5FaRdc0+aDKjH4EaRZ24cC/xiLnpwTCj5evhcLjMa X-Received: by 2002:adf:ea10:0:b0:37c:cd8a:50dd with SMTP id ffacd0b85a97d-37cd5a87fafmr8318811f8f.13.1727611395160; Sun, 29 Sep 2024 05:03:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727611395; cv=none; d=google.com; s=arc-20240605; b=RV5TNakb6ZmxY+D5J1dmQ9zIP1tyl5NEQhIAsQGz5zx4hINcytc7+t/52JYAeWW01h Vr+qqpC9UyvHacrcJPnVxiDo8tszIbSOM2MuckDaAXnvJa4r7YjZlgxsguoCPHTMfC/Q LFpWJ/L+YI2CXpnlp0+2agUdRV0mTZEt6sRhUuTvuXJ8r/EtiZrki/1kgLIFCGQhXhFP QRxkAVx6ZsUoqL4YaNYB/fZw7RzS/blk9uDwGpL9wv1XZ3N2Dbyy5GXBD6Q1N7SkAXzC LnvmMtzOYCCiK1A2ybAlmtcEX3+c8/OK1nD3mrb/CiZgtD3llgPcRUUj+cO5vXA4hkwc CqqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:date:to:from:message-id :dkim-signature:delivered-to; bh=eFldakHEcFOyGyerU5p1i4XQLSRjMEkp52jiDKXNlgc=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=L6+ZloFqbRNOAUwRdsIlo4Rn9hcmBbavoQI6A/u7bsbQp7HS/ZsPZbiSqegiJtlQgz OgPPi0PcSFlUAh6si3ELku8UkxmNpN3LvYazunAhRcnp4TsHvPD626jMcD79APfqi7DA QzPoxWE9iRPCUr3pumhrDhOci42wRWeghit4i/i0Y6YmapWFk/NKLbx+R1fiYLLy7/1A StCIOlneuawDRkZdnnwNMZMlTRNtlYvjDkC3uj/pherb4QNg7ESyt77LmMQ9zqGo3ilt G399kR8SGgzJ9WJZGWqskBOXhyeIDvrbcYjgMfEE7uVf37H4wu0wvJWCK/ZOcF/eVsjW U2FA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=EjICa4XP; 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=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a93c29e7c2esi442432466b.581.2024.09.29.05.03.14; Sun, 29 Sep 2024 05:03: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=@foxmail.com header.s=s201512 header.b=EjICa4XP; 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=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4A98068DB31; Sun, 29 Sep 2024 15:03:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-58-211.mail.qq.com (out162-62-58-211.mail.qq.com [162.62.58.211]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DF29668DB18 for ; Sun, 29 Sep 2024 15:02:58 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1727611370; bh=3t8OEJXZ7YdauUWlzME01Mnuu3KmmpvDE2GS/MEKkNg=; h=From:To:Cc:Subject:Date; b=EjICa4XP7YWZkCmSJ/Fb7fGcSHCtniwVZVyFj8F8fmBZLZaFzgMKlUAZdUbWk/0xV Qj+HcCuB0rmDeziUbBNdrWPBH4tHNxJqATRphnRHv13UI2fdAHSTeN/nqhHa8FE23h 95coUxlNPmzy1sxutbtx5Xd6yd6B4VaFiPsS8Vvs= Received: from ZHILIZHAO-MB1.tencent.com ([119.147.10.196]) by newxmesmtplogicsvrszc13-0.qq.com (NewEsmtp) with SMTP id B1810A3; Sun, 29 Sep 2024 20:02:49 +0800 X-QQ-mid: xmsmtpt1727611369tv5sb0p2v Message-ID: X-QQ-XMAILINFO: NnA3IMNPwBd+a0gd7QvtdJaXlu97RwMETJGk9mjUm1IilyEZPRawxFjWZ00wPt EcHPydp9L3VWlnY5NWqMIfZyjozGHgm3R3rPq92zAoXvNC542xvOIvBXRJwF3N7nJSAeDTURth5l XtWAQvRNwO0+bogU6lcpwuvKxbVAdPY7PZdlUA5pAheFre+jTNhyUTA9ldk0pHMUowPCawpvBXDp +5bke5oJrXFlN2gAZqYC8UDUWcsNzYCJ+fNqnH8ihvd7IbXfKx1kAt0fuSA26fNeSQMYLGfAQLX2 KP6p7vBTevsWQRxEkH5fWY7kWBrL8iY8gxmHr4YHCUF3O82lYiJvHb8exrXpEQGZASqggZIjJWQ7 x/kojFnEjt0cqBTXYCoBhYIlX5JhzFrN8dVvTm2bmjAL5+a7Jk2S1khjq9MTBrIYdzLI30lZB4XK i8j1PvsOluSB7SiTscShBnShFTIZQbi/0W+w36hU6HSK+XeNmGvBngGITGff5kDt7527oJsBWIo1 0Y/cAephfN2JeAmXvYaZlzrq9ceG+Kl/TZPxQP5Bugw6HsnMRLB1ddalC4REKv6XCPFuovCVxVP1 63ayzzol+hBhtvjZVCQEArKBEXJcHaIJGC0YjB8eoqRs/1FMbpT3CN+8tEccvRw/M9RHg3GWtERl R1ui3ImnMAjGrooRg9D2/z9OGM/c45QqbvAwLo3jyq40PtJh7cXLPyvsPKliu+ZYNR3R0XOjiGnu ooZjEOzXtlWkBbpBsKgdXanhZsakXY2KLL6txEBYMfq6YnsktONrtbs3UUhPoAk4jc/fhy63quNT DAxjBAKsnhSvtCUIaOnZ5liHmWo3ljtwvvFSWIsRLO1+g3uYo4zAQoi1XAQ1IMTuTj4cuk7tDH95 HX0G5cwwWt/Oap/EIIwjgle+g9ZLjOqwL6NB4SkiPRbVd/GkRZfZPESBy1xZZP5qQD3mcqftxGad 8drYTTRD0J56Le+nvd1wYHSadUGZYGQX9BtZlr0SjSnWUUMe+vzDtSpfICsPRcJfF8P3DBwgTTae 0emwbAN07D13euaxYT6qQtUKEnDRwaT5KPh6CjBhKZErnmX/4P X-QQ-XMRINFO: Nq+8W0+stu50PRdwbJxPCL0= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 Sep 2024 20:02:48 +0800 X-OQ-MSGID: <20240929120248.41763-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 3/3] aarch64/vvc: Add dmvr 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: MPyuKRlWo2ND From: Zhao Zhili dmvr_8_12x20_c: 1.5 ( 1.00x) dmvr_8_12x20_neon: 0.2 ( 6.56x) dmvr_8_20x12_c: 1.0 ( 1.00x) dmvr_8_20x12_neon: 0.2 ( 4.33x) dmvr_8_20x20_c: 1.7 ( 1.00x) dmvr_8_20x20_neon: 0.5 ( 3.63x) dmvr_12_12x20_c: 2.2 ( 1.00x) dmvr_12_12x20_neon: 0.5 ( 4.68x) dmvr_12_20x12_c: 2.0 ( 1.00x) dmvr_12_20x12_neon: 0.5 ( 4.16x) dmvr_12_20x20_c: 3.7 ( 1.00x) dmvr_12_20x20_neon: 0.7 ( 5.14x) Signed-off-by: Zhao Zhili --- libavcodec/aarch64/vvc/dsp_init.c | 4 ++ libavcodec/aarch64/vvc/inter.S | 87 ++++++++++++++++++++++++++++++- 2 files changed, 90 insertions(+), 1 deletion(-) diff --git a/libavcodec/aarch64/vvc/dsp_init.c b/libavcodec/aarch64/vvc/dsp_init.c index b5f6f6da93..e47f1ab4cc 100644 --- a/libavcodec/aarch64/vvc/dsp_init.c +++ b/libavcodec/aarch64/vvc/dsp_init.c @@ -90,6 +90,8 @@ W_AVG_FUN(12) const uint8_t *_src, ptrdiff_t _src_stride, int height, \ intptr_t mx, intptr_t my, int width); +DMVR_FUN(, 8) +DMVR_FUN(, 12) DMVR_FUN(hv_, 8) DMVR_FUN(hv_, 10) DMVR_FUN(hv_, 12) @@ -166,6 +168,7 @@ void ff_vvc_dsp_init_aarch64(VVCDSPContext *const c, const int bd) c->inter.avg = ff_vvc_avg_8_neon; c->inter.w_avg = vvc_w_avg_8; + c->inter.dmvr[0][0] = ff_vvc_dmvr_8_neon; c->inter.dmvr[1][1] = ff_vvc_dmvr_hv_8_neon; for (int i = 0; i < FF_ARRAY_ELEMS(c->sao.band_filter); i++) @@ -215,6 +218,7 @@ void ff_vvc_dsp_init_aarch64(VVCDSPContext *const c, const int bd) } else if (bd == 12) { c->inter.avg = ff_vvc_avg_12_neon; c->inter.w_avg = vvc_w_avg_12; + c->inter.dmvr[0][0] = ff_vvc_dmvr_12_neon; c->inter.dmvr[1][1] = ff_vvc_dmvr_hv_12_neon; c->alf.filter[LUMA] = alf_filter_luma_12_neon; diff --git a/libavcodec/aarch64/vvc/inter.S b/libavcodec/aarch64/vvc/inter.S index 4fc8def133..b6b079b569 100644 --- a/libavcodec/aarch64/vvc/inter.S +++ b/libavcodec/aarch64/vvc/inter.S @@ -235,7 +235,7 @@ vvc_avg w_avg, 12 * x5: intptr_t my * w6: int width */ -function ff_vvc_dmvr_hv_8_neon, export=1 +function ff_vvc_dmvr_8_neon, export=1 dst .req x0 src .req x1 src_stride .req x2 @@ -243,6 +243,91 @@ function ff_vvc_dmvr_hv_8_neon, export=1 mx .req x4 my .req x5 width .req w6 + + sxtw x6, w6 + mov x7, #(VVC_MAX_PB_SIZE * 2 + 8) + cmp width, #16 + sub src_stride, src_stride, x6 + cset w15, gt // width > 16 + movi v16.8h, #2 // DMVR_SHIFT + sub x7, x7, x6, lsl #1 +1: + cbz w15, 2f + ldr q0, [src], #16 + uxtl v1.8h, v0.8b + uxtl2 v2.8h, v0.16b + ushl v1.8h, v1.8h, v16.8h + ushl v2.8h, v2.8h, v16.8h + stp q1, q2, [dst], #32 + b 3f +2: + ldr d0, [src], #8 + uxtl v1.8h, v0.8b + ushl v1.8h, v1.8h, v16.8h + str q1, [dst], #16 +3: + subs height, height, #1 + ldr s3, [src], #4 + uxtl v4.8h, v3.8b + ushl v4.4h, v4.4h, v16.4h + st1 {v4.4h}, [dst], x7 + + add src, src, src_stride + b.ne 1b + + ret +endfunc + +function ff_vvc_dmvr_12_neon, export=1 + sxtw x6, w6 + mov x7, #(VVC_MAX_PB_SIZE * 2 + 8) + cmp width, #16 + sub src_stride, src_stride, x6, lsl #1 + cset w15, gt // width > 16 + movi v16.8h, #2 // offset4 + sub x7, x7, x6, lsl #1 +1: + cbz w15, 2f + ldp q0, q1, [src], #32 + uaddl v2.4s, v0.4h, v16.4h + uaddl2 v3.4s, v0.8h, v16.8h + uaddl v4.4s, v1.4h, v16.4h + uaddl2 v5.4s, v1.8h, v16.8h + ushr v2.4s, v2.4s, #2 + ushr v3.4s, v3.4s, #2 + ushr v4.4s, v4.4s, #2 + ushr v5.4s, v5.4s, #2 + uqxtn v2.4h, v2.4s + uqxtn2 v2.8h, v3.4s + uqxtn v4.4h, v4.4s + uqxtn2 v4.8h, v5.4s + + stp q2, q4, [dst], #32 + b 3f +2: + ldr q0, [src], #16 + uaddl v2.4s, v0.4h, v16.4h + uaddl2 v3.4s, v0.8h, v16.8h + ushr v2.4s, v2.4s, #2 + ushr v3.4s, v3.4s, #2 + uqxtn v2.4h, v2.4s + uqxtn2 v2.8h, v3.4s + str q2, [dst], #16 +3: + subs height, height, #1 + ldr d0, [src], #8 + uaddl v3.4s, v0.4h, v16.4h + ushr v3.4s, v3.4s, #2 + uqxtn v3.4h, v3.4s + st1 {v3.4h}, [dst], x7 + + add src, src, src_stride + b.ne 1b + + ret +endfunc + +function ff_vvc_dmvr_hv_8_neon, export=1 tmp0 .req x7 tmp1 .req x8