From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 3A8004BB15 for ; Fri, 2 May 2025 07:49:16 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 85397687B2E; Fri, 2 May 2025 10:49:12 +0300 (EEST) Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 05D11687B2E for ; Fri, 2 May 2025 10:49:06 +0300 (EEST) Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-acbb48bad09so303488966b.0 for ; Fri, 02 May 2025 00:49:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20230601.gappssmtp.com; s=20230601; t=1746172145; x=1746776945; darn=ffmpeg.org; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:from:to:cc:subject:date:message-id:reply-to; bh=W+JoKP8KLm/yOUTywRVloy100AEDP1l041tng7JzTfc=; b=zVcnAmRcs6reUFW4kIELGoyKvi2rOge+Sg5pxAg5qDDGpBNWE5kMgqu57mHVu8cfbo jdQrZinFGt6CgcsTo/LJJjY7IwE5MKSDUlGTzk7POsXEny27pxUt757PZtayVfKVKTF6 AjUJQJKyS8z5UGVx81Y3bABEizoTFwW386QUXIJCG9OjxiKRwelOG59yDiEyw312fk1m +09tCnCivgpPAgKPBX/gKL+ei0CHxShzhAdD/8GNZYrUSgkzaLQqRR2J/u9eRsQv2CVV w46+JpCS1HZ5B6X4UhI2wzuKzhnwvmPSTLwOPpyXTClElQUdNLweLGMWlZqWeQFlTB/h IApg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746172145; x=1746776945; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=W+JoKP8KLm/yOUTywRVloy100AEDP1l041tng7JzTfc=; b=wqmZOXWlOOTX4o0Leb3/lSGtuDO5JcPEuTjoedM/afQqFqpADgpFry6IxYQ2zoOlCh faBiCHVhusGBHxuuLYHZDfW8lQp73zoCngIsDATIPW+SVXhja6H4jJSVQDV2xP67dRWt Zca3TO6VG41HQ7W5eK7wfIopVBEG31+pJxRzNGBovSdodHEUE2LO9bBNXyzzbXidhAoG f3GD8ENomwuBNJFaGyV+JJBM8M03fH8uFoIJKvfNKJhYJLm3whImA0JHpX7DtoaGGsy0 Csjy39Sv9N5ekefxJ9f6VxWSNO8U57l0o9VCNMO3Z23Lgn8y0jrG4Hd++XPl9rpTmxAp Kf/g== X-Gm-Message-State: AOJu0YzuV0U9KSdQdWt0c8ezodWRf17//rY9pKd65Mk2WBwK4dVx1+Ca nZLtJg7dKIayOygzboE5vOIM53O6LTK/fXfx1HTlA1MoG4rZLispgSmSWStTLHANMQtDuK0L25l IOA== X-Gm-Gg: ASbGncsLpxqBzHtUFPC/IG5sYL9G3l5TP6BLeEXfXpCTiqT7cV8eqe4MJoFWpl/OzGF pqVi1KsDzbCpgNzIzBoSM0YKjdLB9PYII2jXbhpTZl0XDEgKtJYf7I5C0tKx1sYPDXjoP+k2UlY APZtjm/W8wEhxJw6bekg9JoyS+IdnI3LTNOnoLhYi2O1akN1IxQybo5m2KtI8lCDD0M46VTXLmX xBrAtqnC8nR2U5I5VVVjG9bgzZOtFT9GEn762Yc/Fv2CVJwlfTtMl47LnSps/wJffQ3z/Z/7uh8 lXnqgKrYAxpxF6FwB/i1HTj7DNMS9Si1eabAKjbYgSEr7PkEC00FdOdE2jajeH0fSP97I6cwnqW ZJ5e2gggYnu/NIqIJsO057VKmH4W5C6xJ0yxT X-Google-Smtp-Source: AGHT+IF+tL6ebeZUTTImiQ959d5fWmwZJVU2Vnkm3W7OwAnru1Ij0V6v5BFvSJ16tooOZ+adrgO5Dw== X-Received: by 2002:a17:906:c148:b0:ac2:a473:4186 with SMTP id a640c23a62f3a-ad17adabf01mr151649966b.34.1746172145061; Fri, 02 May 2025 00:49:05 -0700 (PDT) Received: from tunnel335574-pt.tunnel.tserv24.sto1.ipv6.he.net (tunnel335574-pt.tunnel.tserv24.sto1.ipv6.he.net. [2001:470:27:11::2]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ad1891a6868sm9318366b.70.2025.05.02.00.49.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 May 2025 00:49:04 -0700 (PDT) Date: Fri, 2 May 2025 10:49:02 +0300 (EEST) From: =?ISO-8859-15?Q?Martin_Storsj=F6?= To: FFmpeg development discussions and patches In-Reply-To: <20250502074430.291561-5-nuomi2021@gmail.com> Message-ID: References: <20250502074430.291561-1-nuomi2021@gmail.com> <20250502074430.291561-5-nuomi2021@gmail.com> MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH 5/5] checkasm: add vvc_sao 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: Nuo Mi , Shaun Loo Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Fri, 2 May 2025, Nuo Mi wrote: > From: Shaun Loo > > This is a part of Google Summer of Code 2023 > > AVX2: > - vvc_sao.sao_band [OK] > - vvc_sao.sao_edge [OK] > > Co-authored-by: Nuo Mi > --- > tests/checkasm/Makefile | 2 +- > tests/checkasm/checkasm.c | 1 + > tests/checkasm/checkasm.h | 1 + > tests/checkasm/vvc_sao.c | 161 ++++++++++++++++++++++++++++++++++++++ > 4 files changed, 164 insertions(+), 1 deletion(-) > create mode 100644 tests/checkasm/vvc_sao.c > > diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile > index 193c1e4633..fabbf595b4 100644 > --- a/tests/checkasm/Makefile > +++ b/tests/checkasm/Makefile > @@ -47,7 +47,7 @@ AVCODECOBJS-$(CONFIG_V210_DECODER) += v210dec.o > AVCODECOBJS-$(CONFIG_V210_ENCODER) += v210enc.o > AVCODECOBJS-$(CONFIG_VORBIS_DECODER) += vorbisdsp.o > AVCODECOBJS-$(CONFIG_VP9_DECODER) += vp9dsp.o > -AVCODECOBJS-$(CONFIG_VVC_DECODER) += vvc_alf.o vvc_mc.o > +AVCODECOBJS-$(CONFIG_VVC_DECODER) += vvc_alf.o vvc_mc.o vvc_sao.o > > CHECKASMOBJS-$(CONFIG_AVCODEC) += $(AVCODECOBJS-yes) > > diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c > index 3bb82ed0e5..0734cd26bf 100644 > --- a/tests/checkasm/checkasm.c > +++ b/tests/checkasm/checkasm.c > @@ -256,6 +256,7 @@ static const struct { > #if CONFIG_VVC_DECODER > { "vvc_alf", checkasm_check_vvc_alf }, > { "vvc_mc", checkasm_check_vvc_mc }, > + { "vvc_sao", checkasm_check_vvc_sao }, > #endif > #endif > #if CONFIG_AVFILTER > diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h > index a6b5965e02..146bfdec35 100644 > --- a/tests/checkasm/checkasm.h > +++ b/tests/checkasm/checkasm.h > @@ -149,6 +149,7 @@ void checkasm_check_videodsp(void); > void checkasm_check_vorbisdsp(void); > void checkasm_check_vvc_alf(void); > void checkasm_check_vvc_mc(void); > +void checkasm_check_vvc_sao(void); > > struct CheckasmPerf; > > diff --git a/tests/checkasm/vvc_sao.c b/tests/checkasm/vvc_sao.c > new file mode 100644 > index 0000000000..026078ff02 > --- /dev/null > +++ b/tests/checkasm/vvc_sao.c > @@ -0,0 +1,161 @@ > +/* > + * Copyright (c) 2018 Yingming Fan > + * > + * This file is part of FFmpeg. > + * > + * FFmpeg is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 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 General Public License for more details. > + * > + * You should have received a copy of the GNU 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 > + > +#include "libavutil/intreadwrite.h" > +#include "libavutil/mem_internal.h" > + > +#include "libavcodec/vvc/dsp.h" > +#include "libavcodec/vvc/ctu.h" > + > +#include "checkasm.h" > + > +static const uint32_t pixel_mask[3] = { 0xffffffff, 0x03ff03ff, 0x0fff0fff }; > +static const uint32_t sao_size[] = {8, 16, 32, 48, 64, 80, 96, 112, 128}; > + > +#define SIZEOF_PIXEL ((bit_depth + 7) / 8) > +#define PIXEL_STRIDE (2*MAX_PB_SIZE + AV_INPUT_BUFFER_PADDING_SIZE) //same with sao_edge src_stride > +#define BUF_SIZE (PIXEL_STRIDE * (MAX_PB_SIZE+2) * 2) //+2 for top and bottom row, *2 for high bit depth > +#define OFFSET_THRESH (1 << (bit_depth - 5)) > +#define OFFSET_LENGTH 5 > + > +#define randomize_buffers(buf0, buf1, size) \ > + do { \ > + uint32_t mask = pixel_mask[(bit_depth - 8) >> 1]; \ > + int k; \ > + for (k = 0; k < size; k += 4) { \ > + uint32_t r = rnd() & mask; \ > + AV_WN32A(buf0 + k, r); \ > + AV_WN32A(buf1 + k, r); \ > + } \ > + } while (0) > + > +#define randomize_buffers2(buf, size) \ > + do { \ > + uint32_t max_offset = OFFSET_THRESH; \ > + int k; \ > + if (bit_depth == 8) { \ > + for (k = 0; k < size; k++) { \ > + uint8_t r = rnd() % max_offset; \ > + buf[k] = r; \ > + } \ > + } else { \ > + for (k = 0; k < size; k++) { \ > + uint16_t r = rnd() % max_offset; \ > + buf[k] = r; \ > + } \ > + } \ > + } while (0) > + > +static void check_sao_band(VVCDSPContext *h, int bit_depth) > +{ > + int i; > + LOCAL_ALIGNED_32(uint8_t, dst0, [BUF_SIZE]); > + LOCAL_ALIGNED_32(uint8_t, dst1, [BUF_SIZE]); > + LOCAL_ALIGNED_32(uint8_t, src0, [BUF_SIZE]); > + LOCAL_ALIGNED_32(uint8_t, src1, [BUF_SIZE]); > + int16_t offset_val[OFFSET_LENGTH]; > + int left_class = rnd()%32; > + > + for (i = 0; i < FF_ARRAY_ELEMS(sao_size); i++) { > + int block_size = sao_size[i]; > + int prev_size = i > 0 ? sao_size[i - 1] : 0; > + ptrdiff_t stride = PIXEL_STRIDE*SIZEOF_PIXEL; > + declare_func(void, uint8_t *dst, const uint8_t *src, ptrdiff_t dst_stride, ptrdiff_t src_stride, > + const int16_t *sao_offset_val, int sao_left_class, int width, int height); > + > + if (check_func(h->sao.band_filter[i], "vvc_sao_band_%d_%d", block_size, bit_depth)) { > + > + for (int w = prev_size + 4; w <= block_size; w += 4) { > + randomize_buffers(src0, src1, BUF_SIZE); > + randomize_buffers2(offset_val, OFFSET_LENGTH); > + memset(dst0, 0, BUF_SIZE); > + memset(dst1, 0, BUF_SIZE); > + > + call_ref(dst0, src0, stride, stride, offset_val, left_class, w, block_size); > + call_new(dst1, src1, stride, stride, offset_val, left_class, w, block_size); > + for (int j = 0; j < block_size; j++) { > + if (memcmp(dst0 + j*stride, dst1 + j*stride, w*SIZEOF_PIXEL)) > + fail(); > + } > + } For new checkasm tests, I would suggest trying to use the helpers for doing bounds checks automatically; see the recent commits 4d4b301e4a269adfabceaeca1a20c653bde47554 and c1a2da72cc27cf9b78a0cbea2f60265909d8b253 for how to use them. This will make sure that any new SIMD implementation doesn't accidentally write outside of the designated area, which previously could happen without noticing. // Martin _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".