From patchwork Mon May 20 00:42:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stone Chen X-Patchwork-Id: 49044 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp4140972pzb; Sun, 19 May 2024 17:46:28 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUq1VtUDD5lwvPzrrblMbt/qH7aODLg55xHzSpu3QJC7ERhk7+3fmvaPp1arhmb5IqJ98DvSzEKkuEedr9Y0oGKJBVKLeGGeASG6g== X-Google-Smtp-Source: AGHT+IHX3FBmlQR3QfP3DDPB0MHigKJPdGYQFRpThzczLL6nCVDTy7KDg6rqmRv0FiNoxyybLsbG X-Received: by 2002:adf:cd92:0:b0:34d:b5d6:fe4b with SMTP id ffacd0b85a97d-3504a957d9emr18236164f8f.4.1716165988405; Sun, 19 May 2024 17:46:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716165988; cv=none; d=google.com; s=arc-20160816; b=qsmYiRf78Lt/170pgAmUIsRxKpbQUTq/+cx2As7b7WhBssu+ubk0Xa+CycNJ5Sg2tS 0hVq6RoCS9hwO1yFXhOaqqHQWrYJzMDEEXxIPbEzQp7QFKAr5/qunzuv1tSDyorLIzG/ 6B0jgGBAGU5oobFP5vE6zL13u0+PsgUIz57RGVazQUlTKPom+uEgXXkee41uy8YKKhIu HWeg4Yf3ATjGDVstEdgyIP6ByzJ+L3oBM8RErpx3LPkBjb31/dIKrqdArjbBoIMDgV5r 2VV753LiYg2uNTxcdEUW/yK5HBgPy6fFL3wOknZgBj9/wnw+4BlqSjYh87mS88CVW+LZ UDvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=EfCIvuhRRdAUValFtiEWp1Yc0I39OSwXLsVqxvWvWxI=; fh=eXL0VfxTysmJvjluz5gzyadDwRdHpiPfPZqJ5KBw8Sc=; b=XaRfpP5hTJPqTTNWYvrYdli8uq91hKsgjOX50mf9mbdo3XkEvakZzsozN5oNfRduaS 0itYWVQz5ng4P53UK/VnYVpuYwOV8dKPBjLcJMmK21sQY70ZC4Gng2LHju95gryKWwPJ iWIOU0H4+MluhvVRrSBI8te11AaQYbt0ya6V5O7LBlWKjhgKVBWvwIogeP6OIhwhbtLg hxhThTIDvIvmMa/CjkdPItuvy1eUIpRhEZkUSJ49/FBAFyjxDmRl6y+1hWHc7RCXTNwU uzvxohdhGTOEZFsL6KXXvWpfA8NFSw4iOtcQp3Fhnqj59LS/4W0TbsakZx90evS5Z+1s rNEQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=ECWo4kEX; 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=QUARANTINE dis=NONE) header.from=gmail.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-a5a17c2be93si1211519666b.928.2024.05.19.17.46.28; Sun, 19 May 2024 17:46:28 -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=@gmail.com header.s=20230601 header.b=ECWo4kEX; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0FF4C68CF80; Mon, 20 May 2024 03:46:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f176.google.com (mail-oi1-f176.google.com [209.85.167.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E4C968C98F for ; Mon, 20 May 2024 03:46:18 +0300 (EEST) Received: by mail-oi1-f176.google.com with SMTP id 5614622812f47-3c9cc681e4fso1053378b6e.0 for ; Sun, 19 May 2024 17:46:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716165976; x=1716770776; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=2gXnO+6VrmdlPnM1xQhroQdqt3kAFbn/KGuPrROUldk=; b=ECWo4kEXXdB6L1q6OyG5gVItfnD67uQVdk5MOwyxATw5fXKoAqUUEXn9aJYBopwm4K VjqvVaOpPoER8eTbo4nRb7oe7HkxP6nc2+AZQVUS8Sjz55O0IyWCKoRbaxCUgdL30F/Q QANbys+87ThTNebOhzDS3baMVPx41xQk9C78hTedMHf4V2PhSZ3Rm5LOOvOs89kuySkT gjQnWMZIgRvCTtpqMzLPQqRU4wQ9CWLnOam9N8mpPz46WVTvD4jxUs6HNCcdHSJomP5t 0TEEl067zjOtga413OoQTtXRhdunSZNBxwTy/gzpsfN60Qalu7ASSxylaBqGovG2hP6E Fpsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716165976; x=1716770776; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=2gXnO+6VrmdlPnM1xQhroQdqt3kAFbn/KGuPrROUldk=; b=l4J+mSuW/KSKwRIPj/X3MAy0yI5J7+cJOXXCX7OVm2x9hrt3L2yKK5dDwAAo2CG8Uv ZH9ndUCYR2YHZhJNhIjLp0n8dGQ/43m6yjxg1lADHjthNGl3E0fD2Ex1zw8N329zB5TY Ccz2Pol+aMDuVaMJP29UstxD6JMrBlvTuJyNskm/ZQN7IGZZCcLvk2I/B70HTyAnTyIi Ur7mesCpTU93K7/Myqb7Oyp2jR8Dm5DkjExYR+9+PopY8/hg6sFQ0IKOar/YkdEzq5Th tzY4/dsJOxaw45XuVe19r9UKWFUBI8mNWzMxwsbtACOP3zYgGwkebyTXxueiNhz81Ij5 eLpA== X-Gm-Message-State: AOJu0Ywn6fFURCXtzd+L4s2SqR3NQmAZlHdjDW+m3U2ctGDfge/zWcXL iT2XtcZ1dnr+eW0Rn9yCeUrQ/vqmwvRcjIN3XXKJt3n41SG6skzx8EINJQlB X-Received: by 2002:a05:6808:6394:b0:3c9:5e47:65a4 with SMTP id 5614622812f47-3c997036504mr34794359b6e.5.1716165976182; Sun, 19 May 2024 17:46:16 -0700 (PDT) Received: from fedora.tailc94c2.ts.net (209-6-133-125.s1659.c3-0.bkl-cbr1.sbo-bkl.ma.cable.rcncustomer.com. [209.6.133.125]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-43df8308580sm138383581cf.66.2024.05.19.17.46.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 May 2024 17:46:15 -0700 (PDT) From: Stone Chen To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 May 2024 20:42:01 -0400 Message-ID: <20240520004210.11489-2-chen.stonechen@gmail.com> X-Mailer: git-send-email 2.45.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 1/2][GSoC 2024] libavcodec/x86/vvc: Add AVX2 DMVR SAD functions for VVC 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: Stone Chen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: HhqRoWoy4Xen Implements AVX2 DMVR (decoder-side motion vector refinement) SAD functions. DMVR SAD is only calculated if w >= 8, h >= 8, and w * h > 128. To reduce complexity, SAD is only calculated on even rows. This is calculated for all video bitdepths, but the values passed to the function are always 16bit (even if the original video bitdepth is 8). The AVX2 implementation uses min/max/sub. Benchmarks ( AMD 7940HS ) Before: BQTerrace_1920x1080_60_10_420_22_RA.vvc | 106.0 | Chimera_8bit_1080P_1000_frames.vvc | 204.3 | NovosobornayaSquare_1920x1080.bin | 197.3 | RitualDance_1920x1080_60_10_420_37_RA.266 | 174.0 | After: BQTerrace_1920x1080_60_10_420_22_RA.vvc | 109.3 | Chimera_8bit_1080P_1000_frames.vvc | 216.0 | NovosobornayaSquare_1920x1080.bin | 204.0| RitualDance_1920x1080_60_10_420_37_RA.266 | 181.7 | --- libavcodec/x86/vvc/Makefile | 3 +- libavcodec/x86/vvc/vvc_sad.asm | 138 +++++++++++++++++++++++++++++++ libavcodec/x86/vvc/vvcdsp_init.c | 6 ++ 3 files changed, 146 insertions(+), 1 deletion(-) create mode 100644 libavcodec/x86/vvc/vvc_sad.asm diff --git a/libavcodec/x86/vvc/Makefile b/libavcodec/x86/vvc/Makefile index d6a66f860a..7b2438ce17 100644 --- a/libavcodec/x86/vvc/Makefile +++ b/libavcodec/x86/vvc/Makefile @@ -5,4 +5,5 @@ OBJS-$(CONFIG_VVC_DECODER) += x86/vvc/vvcdsp_init.o \ x86/h26x/h2656dsp.o X86ASM-OBJS-$(CONFIG_VVC_DECODER) += x86/vvc/vvc_alf.o \ x86/vvc/vvc_mc.o \ - x86/h26x/h2656_inter.o + x86/vvc/vvc_sad.o \ + x86/h26x/h2656_inter.o diff --git a/libavcodec/x86/vvc/vvc_sad.asm b/libavcodec/x86/vvc/vvc_sad.asm new file mode 100644 index 0000000000..58a24635d2 --- /dev/null +++ b/libavcodec/x86/vvc/vvc_sad.asm @@ -0,0 +1,138 @@ +; /* +; * Provide SIMD DMVR SAD functions for VVC decoding +; * +; * Copyright (c) 2024 Stone Chen +; * +; * This file is part of FFmpeg. +; * +; * FFmpeg is free software; you can redistribute it and/or +; * modify it under the terms of the GNU Lesser General Public +; * License as published by the Free Software Foundation; either +; * version 2.1 of the License, or (at your option) any later version. +; * +; * FFmpeg is distributed in the hope that it will be useful, +; * but WITHOUT ANY WARRANTY; without even the implied warranty of +; * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +; * Lesser General Public License for more details. +; * +; * You should have received a copy of the GNU Lesser General Public +; * License along with FFmpeg; if not, write to the Free Software +; * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +; */ + +%include "libavutil/x86/x86util.asm" +%define MAX_PB_SIZE 128 +%define ROWS 2 + +SECTION_RODATA + +pw_1: dw 1 + +; DMVR SAD is only calculated on even rows to reduce complexity +SECTION .text + +%macro MIN_MAX_SAD 3 ; + pminuw %3, %2, %1 + pmaxuw %1, %2, %1 + psubusw %1, %1, %3 +%endmacro + +%macro HORIZ_ADD 3 ; xm0, xm1, m1 + vextracti128 %1, %3, q0001 ; 3 2 1 0 + paddd %1, %2 ; xm0 (7 + 3) (6 + 2) (5 + 1) (4 + 0) + pshufd %2, %1, q0032 ; xm1 - - (7 + 3) (6 + 2) + paddd %1, %1, %2 ; xm0 _ _ (5 1 7 3) (4 0 6 2) + pshufd %2, %1, q0001 ; xm1 _ _ (5 1 7 3) (5 1 7 3) + paddd %1, %1, %2 ; (01234567) +%endmacro + +%macro INIT_OFFSET 6 ; src1, src2, dxq, dyq, off1, off2 + sub %3, 2 + sub %4, 2 + + mov %5, 2 + mov %6, 2 + + add %5, %4 + sub %6, %4 + + imul %5, 128 + imul %6, 128 + + add %5, 2 + add %6, 2 + + add %5, %3 + sub %6, %3 + + lea %1, [%1 + %5 * 2] + lea %2, [%2 + %6 * 2] +%endmacro + +%if ARCH_X86_64 +%if HAVE_AVX2_EXTERNAL + +INIT_YMM avx2 + +cglobal vvc_sad, 6, 11, 5, src1, src2, dx, dy, block_w, block_h, off1, off2, row_idx, dx2, dy2 + movsxd dx2q, dxd + movsxd dy2q, dyd + INIT_OFFSET src1q, src2q, dx2q, dy2q, off1q, off2q + pxor m3, m3 + vpbroadcastw m4, [pw_1] + + cmp block_wd, 16 + jge vvc_sad_16_128 + + vvc_sad_8: + .loop_height: + movu xm0, [src1q] + vinserti128 m0, [src1q + MAX_PB_SIZE * ROWS * 2], 1 + movu xm1, [src2q] + vinserti128 m1, [src2q + MAX_PB_SIZE * ROWS * 2], 1 + + MIN_MAX_SAD m1, m0, m2 + pmaddwd m1, m4 + paddd m3, m1 + + add src1q, 2 * MAX_PB_SIZE * ROWS * 2 + add src2q, 2 * MAX_PB_SIZE * ROWS * 2 + + sub block_hd, 4 + jg .loop_height + + HORIZ_ADD xm0, xm3, m3 + movd eax, xm0 + RET + + vvc_sad_16_128: + .loop_height: + mov off1q, src1q + mov off2q, src2q + mov row_idxd, block_wd + sar row_idxd, 4 + + .loop_width: + movu m0, [src1q] + movu m1, [src2q] + MIN_MAX_SAD m1, m0, m2 + pmaddwd m1, m4 + paddd m3, m1 + + add src1q, 32 + add src2q, 32 + dec row_idxd + jg .loop_width + + lea src1q, [off1q + ROWS * MAX_PB_SIZE * 2] + lea src2q, [off2q + ROWS * MAX_PB_SIZE * 2] + + sub block_hd, 2 + jg .loop_height + + HORIZ_ADD xm0, xm3, m3 + movd eax, xm0 + RET + +%endif +%endif diff --git a/libavcodec/x86/vvc/vvcdsp_init.c b/libavcodec/x86/vvc/vvcdsp_init.c index 0e68971b2c..4b4a2aa937 100644 --- a/libavcodec/x86/vvc/vvcdsp_init.c +++ b/libavcodec/x86/vvc/vvcdsp_init.c @@ -311,6 +311,9 @@ ALF_FUNCS(16, 12, avx2) c->alf.filter[CHROMA] = ff_vvc_alf_filter_chroma_##bd##_avx2; \ c->alf.classify = ff_vvc_alf_classify_##bd##_avx2; \ } while (0) + +int ff_vvc_sad_avx2(const int16_t *src0, const int16_t *src1, int dx, int dy, int block_w, int block_h); +#define SAD_INIT() c->inter.sad = ff_vvc_sad_avx2 #endif void ff_vvc_dsp_init_x86(VVCDSPContext *const c, const int bd) @@ -327,6 +330,7 @@ void ff_vvc_dsp_init_x86(VVCDSPContext *const c, const int bd) ALF_INIT(8); AVG_INIT(8, avx2); MC_LINKS_AVX2(8); + SAD_INIT(); } break; case 10: @@ -338,6 +342,7 @@ void ff_vvc_dsp_init_x86(VVCDSPContext *const c, const int bd) AVG_INIT(10, avx2); MC_LINKS_AVX2(10); MC_LINKS_16BPC_AVX2(10); + SAD_INIT(); } break; case 12: @@ -349,6 +354,7 @@ void ff_vvc_dsp_init_x86(VVCDSPContext *const c, const int bd) AVG_INIT(12, avx2); MC_LINKS_AVX2(12); MC_LINKS_16BPC_AVX2(12); + SAD_INIT(); } break; default: