marfrit
2cd2258a7b
First AV1 kernel cycle and first dav1d-vendored sources. Phase 1+2
docs lay out the structural complexity (CDEF needs pre-padded 12x12
working buffer + external edge context + direction lookup +
constraint function — meaningfully more complex than cycles 1-4).
Phase 3+ deferred to next session — CDEF is the first cycle that
doesn't fit cleanly into a single autonomous run.
Vendored from dav1d 1.4.3 (BSD-2-Clause, cleaner license than
FFmpeg's LGPL-2.1+):
src/arm/64/cdef.S 520 lines — NEON impl
src/arm/64/util.S 278 lines — NEON helpers
src/arm/asm.S 335 lines — GAS preamble
src/cdef_tmpl.c 331 lines — C reference (templated)
include/common/intops.h 84 lines — utility helpers
src/tables_cdef_subset.c hand-extracted — dav1d_cdef_directions
only (avoids dragging full 1013-line
tables.c + transitive includes)
Discovery from Phase 2 analysis:
- Filter type and shape: dav1d_cdef_filter8_pri_sec_8bpc_neon takes
(dst, dst_stride, tmp, pri_strength, sec_strength, dir, damping, h).
The 'tmp' arg is the pre-padded 12x12 buffer constructed externally
by the dav1d C-side padding() function.
- Tap weights are inline-computed (not table): pri_tap = 4 or 3
(based on pri_strength bit), sec_tap = 2 or 1. Only
dav1d_cdef_directions[12][2] is an external table.
- Constraint function: constrain(diff, threshold, shift) =
apply_sign(min(abs(diff), max(0, threshold - (abs(diff) >> shift))),
diff)
Predicted R5 band: 0.15-0.30 (ORANGE). CDEF is compute-heavier than
LPF (per-pixel min/max conditional logic), so likely worse R than
cycle 2/4 but better than cycle 3 MC. M4 gate likely required.
What Phase 3+ needs (next session):
1. config.h shim for dav1d's asm preamble (defines TBD on first build)
2. Standalone C reference for cdef_filter_block_8x8_c
(cdef_tmpl.c references several dav1d private headers; cleaner to
transcribe to a self-contained tests/cdef_ref.c)
3. tests/bench_neon_cdef.c — M1+M3 bench
4. Phase 4 plan, Phase 5 review (mandatory), Phase 6 shader, Phase 7 measure
PROVENANCE.md documents pin + per-file role + re-vendoring procedure.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
332 lines
13 KiB
C
332 lines
13 KiB
C
/*
|
|
* Copyright © 2018, VideoLAN and dav1d authors
|
|
* Copyright © 2018, Two Orioles, LLC
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
* list of conditions and the following disclaimer.
|
|
*
|
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
* this list of conditions and the following disclaimer in the documentation
|
|
* and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include "common/intops.h"
|
|
|
|
#include "src/cdef.h"
|
|
#include "src/tables.h"
|
|
|
|
static inline int constrain(const int diff, const int threshold,
|
|
const int shift)
|
|
{
|
|
const int adiff = abs(diff);
|
|
return apply_sign(imin(adiff, imax(0, threshold - (adiff >> shift))), diff);
|
|
}
|
|
|
|
static inline void fill(int16_t *tmp, const ptrdiff_t stride,
|
|
const int w, const int h)
|
|
{
|
|
/* Use a value that's a large positive number when interpreted as unsigned,
|
|
* and a large negative number when interpreted as signed. */
|
|
for (int y = 0; y < h; y++) {
|
|
for (int x = 0; x < w; x++)
|
|
tmp[x] = INT16_MIN;
|
|
tmp += stride;
|
|
}
|
|
}
|
|
|
|
static void padding(int16_t *tmp, const ptrdiff_t tmp_stride,
|
|
const pixel *src, const ptrdiff_t src_stride,
|
|
const pixel (*left)[2],
|
|
const pixel *top, const pixel *bottom,
|
|
const int w, const int h, const enum CdefEdgeFlags edges)
|
|
{
|
|
// fill extended input buffer
|
|
int x_start = -2, x_end = w + 2, y_start = -2, y_end = h + 2;
|
|
if (!(edges & CDEF_HAVE_TOP)) {
|
|
fill(tmp - 2 - 2 * tmp_stride, tmp_stride, w + 4, 2);
|
|
y_start = 0;
|
|
}
|
|
if (!(edges & CDEF_HAVE_BOTTOM)) {
|
|
fill(tmp + h * tmp_stride - 2, tmp_stride, w + 4, 2);
|
|
y_end -= 2;
|
|
}
|
|
if (!(edges & CDEF_HAVE_LEFT)) {
|
|
fill(tmp + y_start * tmp_stride - 2, tmp_stride, 2, y_end - y_start);
|
|
x_start = 0;
|
|
}
|
|
if (!(edges & CDEF_HAVE_RIGHT)) {
|
|
fill(tmp + y_start * tmp_stride + w, tmp_stride, 2, y_end - y_start);
|
|
x_end -= 2;
|
|
}
|
|
|
|
for (int y = y_start; y < 0; y++) {
|
|
for (int x = x_start; x < x_end; x++)
|
|
tmp[x + y * tmp_stride] = top[x];
|
|
top += PXSTRIDE(src_stride);
|
|
}
|
|
for (int y = 0; y < h; y++)
|
|
for (int x = x_start; x < 0; x++)
|
|
tmp[x + y * tmp_stride] = left[y][2 + x];
|
|
for (int y = 0; y < h; y++) {
|
|
for (int x = (y < h) ? 0 : x_start; x < x_end; x++)
|
|
tmp[x] = src[x];
|
|
src += PXSTRIDE(src_stride);
|
|
tmp += tmp_stride;
|
|
}
|
|
for (int y = h; y < y_end; y++) {
|
|
for (int x = x_start; x < x_end; x++)
|
|
tmp[x] = bottom[x];
|
|
bottom += PXSTRIDE(src_stride);
|
|
tmp += tmp_stride;
|
|
}
|
|
|
|
}
|
|
|
|
static NOINLINE void
|
|
cdef_filter_block_c(pixel *dst, const ptrdiff_t dst_stride,
|
|
const pixel (*left)[2],
|
|
const pixel *const top, const pixel *const bottom,
|
|
const int pri_strength, const int sec_strength,
|
|
const int dir, const int damping, const int w, int h,
|
|
const enum CdefEdgeFlags edges HIGHBD_DECL_SUFFIX)
|
|
{
|
|
const ptrdiff_t tmp_stride = 12;
|
|
assert((w == 4 || w == 8) && (h == 4 || h == 8));
|
|
int16_t tmp_buf[144]; // 12*12 is the maximum value of tmp_stride * (h + 4)
|
|
int16_t *tmp = tmp_buf + 2 * tmp_stride + 2;
|
|
|
|
padding(tmp, tmp_stride, dst, dst_stride, left, top, bottom, w, h, edges);
|
|
|
|
if (pri_strength) {
|
|
const int bitdepth_min_8 = bitdepth_from_max(bitdepth_max) - 8;
|
|
const int pri_tap = 4 - ((pri_strength >> bitdepth_min_8) & 1);
|
|
const int pri_shift = imax(0, damping - ulog2(pri_strength));
|
|
if (sec_strength) {
|
|
const int sec_shift = damping - ulog2(sec_strength);
|
|
do {
|
|
for (int x = 0; x < w; x++) {
|
|
const int px = dst[x];
|
|
int sum = 0;
|
|
int max = px, min = px;
|
|
int pri_tap_k = pri_tap;
|
|
for (int k = 0; k < 2; k++) {
|
|
const int off1 = dav1d_cdef_directions[dir + 2][k]; // dir
|
|
const int p0 = tmp[x + off1];
|
|
const int p1 = tmp[x - off1];
|
|
sum += pri_tap_k * constrain(p0 - px, pri_strength, pri_shift);
|
|
sum += pri_tap_k * constrain(p1 - px, pri_strength, pri_shift);
|
|
// if pri_tap_k == 4 then it becomes 2 else it remains 3
|
|
pri_tap_k = (pri_tap_k & 3) | 2;
|
|
min = umin(p0, min);
|
|
max = imax(p0, max);
|
|
min = umin(p1, min);
|
|
max = imax(p1, max);
|
|
const int off2 = dav1d_cdef_directions[dir + 4][k]; // dir + 2
|
|
const int off3 = dav1d_cdef_directions[dir + 0][k]; // dir - 2
|
|
const int s0 = tmp[x + off2];
|
|
const int s1 = tmp[x - off2];
|
|
const int s2 = tmp[x + off3];
|
|
const int s3 = tmp[x - off3];
|
|
// sec_tap starts at 2 and becomes 1
|
|
const int sec_tap = 2 - k;
|
|
sum += sec_tap * constrain(s0 - px, sec_strength, sec_shift);
|
|
sum += sec_tap * constrain(s1 - px, sec_strength, sec_shift);
|
|
sum += sec_tap * constrain(s2 - px, sec_strength, sec_shift);
|
|
sum += sec_tap * constrain(s3 - px, sec_strength, sec_shift);
|
|
min = umin(s0, min);
|
|
max = imax(s0, max);
|
|
min = umin(s1, min);
|
|
max = imax(s1, max);
|
|
min = umin(s2, min);
|
|
max = imax(s2, max);
|
|
min = umin(s3, min);
|
|
max = imax(s3, max);
|
|
}
|
|
dst[x] = iclip(px + ((sum - (sum < 0) + 8) >> 4), min, max);
|
|
}
|
|
dst += PXSTRIDE(dst_stride);
|
|
tmp += tmp_stride;
|
|
} while (--h);
|
|
} else { // pri_strength only
|
|
do {
|
|
for (int x = 0; x < w; x++) {
|
|
const int px = dst[x];
|
|
int sum = 0;
|
|
int pri_tap_k = pri_tap;
|
|
for (int k = 0; k < 2; k++) {
|
|
const int off = dav1d_cdef_directions[dir + 2][k]; // dir
|
|
const int p0 = tmp[x + off];
|
|
const int p1 = tmp[x - off];
|
|
sum += pri_tap_k * constrain(p0 - px, pri_strength, pri_shift);
|
|
sum += pri_tap_k * constrain(p1 - px, pri_strength, pri_shift);
|
|
pri_tap_k = (pri_tap_k & 3) | 2;
|
|
}
|
|
dst[x] = px + ((sum - (sum < 0) + 8) >> 4);
|
|
}
|
|
dst += PXSTRIDE(dst_stride);
|
|
tmp += tmp_stride;
|
|
} while (--h);
|
|
}
|
|
} else { // sec_strength only
|
|
assert(sec_strength);
|
|
const int sec_shift = damping - ulog2(sec_strength);
|
|
do {
|
|
for (int x = 0; x < w; x++) {
|
|
const int px = dst[x];
|
|
int sum = 0;
|
|
for (int k = 0; k < 2; k++) {
|
|
const int off1 = dav1d_cdef_directions[dir + 4][k]; // dir + 2
|
|
const int off2 = dav1d_cdef_directions[dir + 0][k]; // dir - 2
|
|
const int s0 = tmp[x + off1];
|
|
const int s1 = tmp[x - off1];
|
|
const int s2 = tmp[x + off2];
|
|
const int s3 = tmp[x - off2];
|
|
const int sec_tap = 2 - k;
|
|
sum += sec_tap * constrain(s0 - px, sec_strength, sec_shift);
|
|
sum += sec_tap * constrain(s1 - px, sec_strength, sec_shift);
|
|
sum += sec_tap * constrain(s2 - px, sec_strength, sec_shift);
|
|
sum += sec_tap * constrain(s3 - px, sec_strength, sec_shift);
|
|
}
|
|
dst[x] = px + ((sum - (sum < 0) + 8) >> 4);
|
|
}
|
|
dst += PXSTRIDE(dst_stride);
|
|
tmp += tmp_stride;
|
|
} while (--h);
|
|
}
|
|
}
|
|
|
|
#define cdef_fn(w, h) \
|
|
static void cdef_filter_block_##w##x##h##_c(pixel *const dst, \
|
|
const ptrdiff_t stride, \
|
|
const pixel (*left)[2], \
|
|
const pixel *const top, \
|
|
const pixel *const bottom, \
|
|
const int pri_strength, \
|
|
const int sec_strength, \
|
|
const int dir, \
|
|
const int damping, \
|
|
const enum CdefEdgeFlags edges \
|
|
HIGHBD_DECL_SUFFIX) \
|
|
{ \
|
|
cdef_filter_block_c(dst, stride, left, top, bottom, \
|
|
pri_strength, sec_strength, dir, damping, w, h, edges HIGHBD_TAIL_SUFFIX); \
|
|
}
|
|
|
|
cdef_fn(4, 4);
|
|
cdef_fn(4, 8);
|
|
cdef_fn(8, 8);
|
|
|
|
static int cdef_find_dir_c(const pixel *img, const ptrdiff_t stride,
|
|
unsigned *const var HIGHBD_DECL_SUFFIX)
|
|
{
|
|
const int bitdepth_min_8 = bitdepth_from_max(bitdepth_max) - 8;
|
|
int partial_sum_hv[2][8] = { { 0 } };
|
|
int partial_sum_diag[2][15] = { { 0 } };
|
|
int partial_sum_alt[4][11] = { { 0 } };
|
|
|
|
for (int y = 0; y < 8; y++) {
|
|
for (int x = 0; x < 8; x++) {
|
|
const int px = (img[x] >> bitdepth_min_8) - 128;
|
|
|
|
partial_sum_diag[0][ y + x ] += px;
|
|
partial_sum_alt [0][ y + (x >> 1)] += px;
|
|
partial_sum_hv [0][ y ] += px;
|
|
partial_sum_alt [1][3 + y - (x >> 1)] += px;
|
|
partial_sum_diag[1][7 + y - x ] += px;
|
|
partial_sum_alt [2][3 - (y >> 1) + x ] += px;
|
|
partial_sum_hv [1][ x ] += px;
|
|
partial_sum_alt [3][ (y >> 1) + x ] += px;
|
|
}
|
|
img += PXSTRIDE(stride);
|
|
}
|
|
|
|
unsigned cost[8] = { 0 };
|
|
for (int n = 0; n < 8; n++) {
|
|
cost[2] += partial_sum_hv[0][n] * partial_sum_hv[0][n];
|
|
cost[6] += partial_sum_hv[1][n] * partial_sum_hv[1][n];
|
|
}
|
|
cost[2] *= 105;
|
|
cost[6] *= 105;
|
|
|
|
static const uint16_t div_table[7] = { 840, 420, 280, 210, 168, 140, 120 };
|
|
for (int n = 0; n < 7; n++) {
|
|
const int d = div_table[n];
|
|
cost[0] += (partial_sum_diag[0][n] * partial_sum_diag[0][n] +
|
|
partial_sum_diag[0][14 - n] * partial_sum_diag[0][14 - n]) * d;
|
|
cost[4] += (partial_sum_diag[1][n] * partial_sum_diag[1][n] +
|
|
partial_sum_diag[1][14 - n] * partial_sum_diag[1][14 - n]) * d;
|
|
}
|
|
cost[0] += partial_sum_diag[0][7] * partial_sum_diag[0][7] * 105;
|
|
cost[4] += partial_sum_diag[1][7] * partial_sum_diag[1][7] * 105;
|
|
|
|
for (int n = 0; n < 4; n++) {
|
|
unsigned *const cost_ptr = &cost[n * 2 + 1];
|
|
for (int m = 0; m < 5; m++)
|
|
*cost_ptr += partial_sum_alt[n][3 + m] * partial_sum_alt[n][3 + m];
|
|
*cost_ptr *= 105;
|
|
for (int m = 0; m < 3; m++) {
|
|
const int d = div_table[2 * m + 1];
|
|
*cost_ptr += (partial_sum_alt[n][m] * partial_sum_alt[n][m] +
|
|
partial_sum_alt[n][10 - m] * partial_sum_alt[n][10 - m]) * d;
|
|
}
|
|
}
|
|
|
|
int best_dir = 0;
|
|
unsigned best_cost = cost[0];
|
|
for (int n = 1; n < 8; n++) {
|
|
if (cost[n] > best_cost) {
|
|
best_cost = cost[n];
|
|
best_dir = n;
|
|
}
|
|
}
|
|
|
|
*var = (best_cost - (cost[best_dir ^ 4])) >> 10;
|
|
return best_dir;
|
|
}
|
|
|
|
#if HAVE_ASM
|
|
#if ARCH_AARCH64 || ARCH_ARM
|
|
#include "src/arm/cdef.h"
|
|
#elif ARCH_PPC64LE
|
|
#include "src/ppc/cdef.h"
|
|
#elif ARCH_X86
|
|
#include "src/x86/cdef.h"
|
|
#endif
|
|
#endif
|
|
|
|
COLD void bitfn(dav1d_cdef_dsp_init)(Dav1dCdefDSPContext *const c) {
|
|
c->dir = cdef_find_dir_c;
|
|
c->fb[0] = cdef_filter_block_8x8_c;
|
|
c->fb[1] = cdef_filter_block_4x8_c;
|
|
c->fb[2] = cdef_filter_block_4x4_c;
|
|
|
|
#if HAVE_ASM
|
|
#if ARCH_AARCH64 || ARCH_ARM
|
|
cdef_dsp_init_arm(c);
|
|
#elif ARCH_PPC64LE
|
|
cdef_dsp_init_ppc(c);
|
|
#elif ARCH_X86
|
|
cdef_dsp_init_x86(c);
|
|
#endif
|
|
#endif
|
|
}
|