20b59cd6a5
CDEF is the most compute-intensive kernel measured so far —
254.9 ns/block (2x IDCT, 5x MC). 30fps@1080p floor margin: 4x
even on single NEON core in isolation.
M3 captured cleanly via dav1d_cdef_filter8_8bpc_neon. M1 bit-exact
gate failing due to tmp-layout mismatch between my standalone C
reference and dav1d's NEON expectation. The smoking gun: NEON output
appears at (+2 rows, -2 cols) shifted positions vs C ref output —
suggests NEON's padding-function output has a different convention
than my manual tmp construction.
Untangled in setup work:
- dav1d has TWO directions tables: stride-12 in src/tables.c
(C-side), stride-16 in src/arm/64/cdef_tmpl.S (NEON-side).
Initially vendored the C-side; should have used the NEON-side.
- dav1d's NEON expects tmp built by dav1d_cdef_padding8_8bpc_neon
(a separate function with its own conventions), not the C-side
padding() function from cdef_tmpl.c.
- Updated cdef_ref.c to use NEON-layout (stride 16) with table
transcribed from cdef_tmpl.S. Algorithm matches — but bench's
manual tmp construction doesn't match what NEON expects.
Resolution paths for next session (documented in
docs/k5_cdef_phase3_partial.md §'Resolution paths'):
1. Use dav1d_cdef_padding8_8bpc_neon to construct tmp (simplest)
2. Vendor dav1d's full C reference (most rigorous)
3. Reverse-engineer dav1d's padding output layout (hackiest)
Predicted R5 if/when QPU shader implemented: 0.02-0.05 (RED).
CDEF likely stays on CPU per cycle 3 lesson 7 (compute-bound
kernels don't benefit from QPU offload). 30fps floor still
passes regardless.
New artifacts:
- external/dav1d-snapshot/src/arm/64/cdef_tmpl.S (additional vendored)
- external/dav1d-snapshot/config.h — 14-define asm preamble shim
- tests/cdef_ref.c — standalone C ref (algorithmically correct,
layout mismatch with NEON known)
- tests/bench_neon_cdef.c — bench (M1 made warning, M3 captured)
- docs/k5_cdef_phase3_partial.md — phase 3 partial closure +
resumption checklist
dav1d snapshot in PROVENANCE.md should be updated next session
with the new cdef_tmpl.S entry.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
305 lines
11 KiB
CMake
305 lines
11 KiB
CMake
# daedalus-fourier — Phase 3 baseline + (later) Phase 6 implementation.
|
|
#
|
|
# Builds:
|
|
# bench_neon_idct — NEON throughput baseline (Phase 3 M3) +
|
|
# bit-exact correctness gate (Phase 1 M1).
|
|
# bench_vulkan_dispatch — Vulkan compute dispatch-overhead baseline (M5).
|
|
#
|
|
# Linkage note: bench_neon_idct statically links the vendored
|
|
# FFmpeg n7.1.3 NEON snapshot (LGPL-2.1+); see
|
|
# external/ffmpeg-snapshot/PROVENANCE.md.
|
|
|
|
cmake_minimum_required(VERSION 3.20)
|
|
project(daedalus-fourier C ASM)
|
|
|
|
set(CMAKE_C_STANDARD 11)
|
|
set(CMAKE_C_STANDARD_REQUIRED ON)
|
|
|
|
if (NOT CMAKE_BUILD_TYPE)
|
|
set(CMAKE_BUILD_TYPE Release)
|
|
endif()
|
|
|
|
if (NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
|
|
message(FATAL_ERROR
|
|
"daedalus-fourier targets aarch64 (Pi 5 / BCM2712). "
|
|
"Cross-compile not yet wired.")
|
|
endif()
|
|
|
|
add_compile_options(-Wall -Wextra -Wno-unused-parameter)
|
|
|
|
# ---- Vendored FFmpeg snapshot (LGPL-2.1+) -----------------------------------
|
|
|
|
set(FFSNAP ${CMAKE_SOURCE_DIR}/external/ffmpeg-snapshot)
|
|
|
|
# Assembly preamble (config.h shim + FFmpeg's asm helpers) used by the
|
|
# vendored .S file. -I flags expose:
|
|
# - FFSNAP/ so `#include "config.h"` finds our shim
|
|
# - FFSNAP/libavcodec/aarch64/ so `#include "neon.S"` finds the helper
|
|
# - FFSNAP/ so `#include "libavutil/aarch64/asm.S"`
|
|
# resolves against the vendored copy
|
|
set(FFASM_FLAGS
|
|
-I${FFSNAP}
|
|
-I${FFSNAP}/libavcodec/aarch64
|
|
-I${FFSNAP}
|
|
)
|
|
|
|
# ---- Vendored dav1d snapshot (BSD-2-Clause) — cycle 5+ ----------------------
|
|
|
|
set(DAV1DSNAP ${CMAKE_SOURCE_DIR}/external/dav1d-snapshot)
|
|
|
|
# dav1d's asm preamble expects "src/arm/asm.S" and "cdef_tmpl.S" / "util.S"
|
|
# (the latter two as bare basenames from within src/arm/64/). Include paths:
|
|
set(DAV1D_ASM_FLAGS
|
|
-I${DAV1DSNAP} # for config.h shim + src/arm/asm.S
|
|
-I${DAV1DSNAP}/src/arm/64 # for util.S, cdef_tmpl.S
|
|
)
|
|
|
|
set(DAV1D_CDEF_ASM_SOURCES
|
|
${DAV1DSNAP}/src/arm/64/cdef.S
|
|
)
|
|
set(DAV1D_CDEF_C_SOURCES
|
|
${DAV1DSNAP}/src/tables_cdef_subset.c
|
|
)
|
|
set_source_files_properties(${DAV1D_CDEF_ASM_SOURCES} PROPERTIES
|
|
COMPILE_OPTIONS "${DAV1D_ASM_FLAGS}"
|
|
LANGUAGE ASM)
|
|
|
|
set(FFASM_SOURCES
|
|
${FFSNAP}/libavcodec/aarch64/vp9itxfm_neon.S
|
|
)
|
|
|
|
# Cycle 2 — VP9 loop filter NEON source (vendored 2026-05-18).
|
|
set(FFASM_LPF_SOURCES
|
|
${FFSNAP}/libavcodec/aarch64/vp9lpf_neon.S
|
|
)
|
|
set_source_files_properties(${FFASM_LPF_SOURCES} PROPERTIES
|
|
COMPILE_OPTIONS "${FFASM_FLAGS}"
|
|
LANGUAGE ASM)
|
|
|
|
# Cycle 3 — VP9 MC interpolation NEON source + filter coefficient table
|
|
# (vendored 2026-05-18). The .c table provides ff_vp9_subpel_filters
|
|
# symbol which vp9mc_neon.S references via movrel.
|
|
set(FFASM_MC_SOURCES
|
|
${FFSNAP}/libavcodec/aarch64/vp9mc_neon.S
|
|
)
|
|
set(FFC_MC_SOURCES
|
|
${FFSNAP}/libavcodec/vp9_subpel_filters_table.c
|
|
)
|
|
set_source_files_properties(${FFASM_MC_SOURCES} PROPERTIES
|
|
COMPILE_OPTIONS "${FFASM_FLAGS}"
|
|
LANGUAGE ASM)
|
|
|
|
# Tell CMake/gas to preprocess .S sources.
|
|
set_source_files_properties(${FFASM_SOURCES} PROPERTIES
|
|
COMPILE_OPTIONS "${FFASM_FLAGS}"
|
|
LANGUAGE ASM)
|
|
|
|
# ---- NEON baseline microbenches --------------------------------------------
|
|
|
|
add_executable(bench_neon_idct
|
|
tests/bench_neon_idct.c
|
|
tests/vp9_idct8_ref.c
|
|
${FFASM_SOURCES}
|
|
)
|
|
target_compile_options(bench_neon_idct PRIVATE -O3 -march=armv8-a+simd)
|
|
|
|
# Cycle 2 — VP9 loop filter NEON baseline.
|
|
add_executable(bench_neon_lpf
|
|
tests/bench_neon_lpf.c
|
|
tests/vp9_lpf_ref.c
|
|
${FFASM_LPF_SOURCES}
|
|
)
|
|
target_compile_options(bench_neon_lpf PRIVATE -O3 -march=armv8-a+simd)
|
|
|
|
# Cycle 3 — VP9 MC interpolation NEON baseline.
|
|
add_executable(bench_neon_mc
|
|
tests/bench_neon_mc.c
|
|
tests/vp9_mc_ref.c
|
|
${FFASM_MC_SOURCES}
|
|
${FFC_MC_SOURCES}
|
|
)
|
|
target_compile_options(bench_neon_mc PRIVATE -O3 -march=armv8-a+simd)
|
|
|
|
# Cycle 4 — VP9 LPF wd=8 NEON baseline (same vendored .S as cycle 2).
|
|
add_executable(bench_neon_lpf8
|
|
tests/bench_neon_lpf8.c
|
|
tests/vp9_lpf8_ref.c
|
|
${FFASM_LPF_SOURCES}
|
|
)
|
|
target_compile_options(bench_neon_lpf8 PRIVATE -O3 -march=armv8-a+simd)
|
|
|
|
# Cycle 5 — AV1 CDEF NEON baseline (dav1d snapshot).
|
|
add_executable(bench_neon_cdef
|
|
tests/bench_neon_cdef.c
|
|
tests/cdef_ref.c
|
|
${DAV1D_CDEF_ASM_SOURCES}
|
|
${DAV1D_CDEF_C_SOURCES}
|
|
)
|
|
target_compile_options(bench_neon_cdef PRIVATE -O3 -march=armv8-a+simd)
|
|
# bench_neon_idct doesn't need vulkan/drm — pure CPU baseline.
|
|
|
|
# ---- Vulkan dispatch-overhead microbench (next chunk) ----------------------
|
|
# Stub: written in a follow-up step. Toggle ON with -DDAEDALUS_BUILD_VULKAN=ON
|
|
# once tests/bench_vulkan_dispatch.c exists.
|
|
|
|
option(DAEDALUS_BUILD_VULKAN "Build Vulkan compute-dispatch microbench" ON)
|
|
|
|
if (DAEDALUS_BUILD_VULKAN)
|
|
find_package(Vulkan REQUIRED)
|
|
|
|
# Compile GLSL compute shaders to SPIR-V via glslangValidator.
|
|
# The binary loads them at runtime from the build dir (cwd-relative).
|
|
find_program(GLSLANG_VALIDATOR
|
|
NAMES glslangValidator glslang
|
|
REQUIRED)
|
|
|
|
set(NOOP_SPV ${CMAKE_BINARY_DIR}/noop.spv)
|
|
add_custom_command(
|
|
OUTPUT ${NOOP_SPV}
|
|
COMMAND ${GLSLANG_VALIDATOR} -V -o ${NOOP_SPV}
|
|
${CMAKE_SOURCE_DIR}/tests/shaders/noop.comp
|
|
DEPENDS ${CMAKE_SOURCE_DIR}/tests/shaders/noop.comp
|
|
COMMENT "glslang: noop.comp -> noop.spv"
|
|
VERBATIM
|
|
)
|
|
|
|
set(IDCT8_SPV ${CMAKE_BINARY_DIR}/v3d_idct8.spv)
|
|
add_custom_command(
|
|
OUTPUT ${IDCT8_SPV}
|
|
COMMAND ${GLSLANG_VALIDATOR} -V --target-env vulkan1.3
|
|
-o ${IDCT8_SPV}
|
|
${CMAKE_SOURCE_DIR}/src/v3d_idct8.comp
|
|
DEPENDS ${CMAKE_SOURCE_DIR}/src/v3d_idct8.comp
|
|
COMMENT "glslang: v3d_idct8.comp -> v3d_idct8.spv"
|
|
VERBATIM
|
|
)
|
|
|
|
set(LPF_SPV ${CMAKE_BINARY_DIR}/v3d_lpf_h_4_8.spv)
|
|
add_custom_command(
|
|
OUTPUT ${LPF_SPV}
|
|
COMMAND ${GLSLANG_VALIDATOR} -V --target-env vulkan1.3
|
|
-o ${LPF_SPV}
|
|
${CMAKE_SOURCE_DIR}/src/v3d_lpf_h_4_8.comp
|
|
DEPENDS ${CMAKE_SOURCE_DIR}/src/v3d_lpf_h_4_8.comp
|
|
COMMENT "glslang: v3d_lpf_h_4_8.comp -> v3d_lpf_h_4_8.spv"
|
|
VERBATIM
|
|
)
|
|
|
|
set(MC_SPV ${CMAKE_BINARY_DIR}/v3d_mc_8h.spv)
|
|
add_custom_command(
|
|
OUTPUT ${MC_SPV}
|
|
COMMAND ${GLSLANG_VALIDATOR} -V --target-env vulkan1.3
|
|
-o ${MC_SPV}
|
|
${CMAKE_SOURCE_DIR}/src/v3d_mc_8h.comp
|
|
DEPENDS ${CMAKE_SOURCE_DIR}/src/v3d_mc_8h.comp
|
|
COMMENT "glslang: v3d_mc_8h.comp -> v3d_mc_8h.spv"
|
|
VERBATIM
|
|
)
|
|
|
|
set(LPF8_SPV ${CMAKE_BINARY_DIR}/v3d_lpf_h_8_8.spv)
|
|
add_custom_command(
|
|
OUTPUT ${LPF8_SPV}
|
|
COMMAND ${GLSLANG_VALIDATOR} -V --target-env vulkan1.3
|
|
-o ${LPF8_SPV}
|
|
${CMAKE_SOURCE_DIR}/src/v3d_lpf_h_8_8.comp
|
|
DEPENDS ${CMAKE_SOURCE_DIR}/src/v3d_lpf_h_8_8.comp
|
|
COMMENT "glslang: v3d_lpf_h_8_8.comp -> v3d_lpf_h_8_8.spv"
|
|
VERBATIM
|
|
)
|
|
|
|
add_custom_target(daedalus_shaders ALL DEPENDS ${NOOP_SPV} ${IDCT8_SPV} ${LPF_SPV} ${MC_SPV} ${LPF8_SPV})
|
|
|
|
# v3d_runner — reusable Vulkan plumbing.
|
|
add_library(v3d_runner STATIC src/v3d_runner.c)
|
|
target_include_directories(v3d_runner PUBLIC src)
|
|
target_link_libraries(v3d_runner PUBLIC Vulkan::Vulkan)
|
|
target_compile_options(v3d_runner PRIVATE -O2)
|
|
|
|
add_executable(bench_vulkan_dispatch tests/bench_vulkan_dispatch.c)
|
|
add_dependencies(bench_vulkan_dispatch daedalus_shaders)
|
|
target_link_libraries(bench_vulkan_dispatch PRIVATE Vulkan::Vulkan)
|
|
target_compile_options(bench_vulkan_dispatch PRIVATE -O2)
|
|
|
|
add_executable(bench_v3d_idct
|
|
tests/bench_v3d_idct.c
|
|
tests/vp9_idct8_ref.c
|
|
)
|
|
add_dependencies(bench_v3d_idct daedalus_shaders)
|
|
target_link_libraries(bench_v3d_idct PRIVATE v3d_runner Vulkan::Vulkan)
|
|
target_compile_options(bench_v3d_idct PRIVATE -O2)
|
|
|
|
# Cycle 2 — QPU LPF bench.
|
|
add_executable(bench_v3d_lpf
|
|
tests/bench_v3d_lpf.c
|
|
tests/vp9_lpf_ref.c
|
|
)
|
|
add_dependencies(bench_v3d_lpf daedalus_shaders)
|
|
target_link_libraries(bench_v3d_lpf PRIVATE v3d_runner Vulkan::Vulkan)
|
|
target_compile_options(bench_v3d_lpf PRIVATE -O2)
|
|
|
|
# Cycle 3 — QPU MC bench.
|
|
add_executable(bench_v3d_mc
|
|
tests/bench_v3d_mc.c
|
|
tests/vp9_mc_ref.c
|
|
)
|
|
add_dependencies(bench_v3d_mc daedalus_shaders)
|
|
target_link_libraries(bench_v3d_mc PRIVATE v3d_runner Vulkan::Vulkan)
|
|
target_compile_options(bench_v3d_mc PRIVATE -O2)
|
|
|
|
# Cycle 4 — QPU LPF wd=8 bench.
|
|
add_executable(bench_v3d_lpf8
|
|
tests/bench_v3d_lpf8.c
|
|
tests/vp9_lpf8_ref.c
|
|
)
|
|
add_dependencies(bench_v3d_lpf8 daedalus_shaders)
|
|
target_link_libraries(bench_v3d_lpf8 PRIVATE v3d_runner Vulkan::Vulkan)
|
|
target_compile_options(bench_v3d_lpf8 PRIVATE -O2)
|
|
|
|
# M4 — concurrent CPU(NEON) + QPU bench. Links the FFmpeg NEON
|
|
# snapshot so we can run real NEON kernels on pinned CPU cores
|
|
# while the QPU runs its dispatch loop concurrently.
|
|
add_executable(bench_concurrent
|
|
tests/bench_concurrent.c
|
|
${FFASM_SOURCES}
|
|
)
|
|
add_dependencies(bench_concurrent daedalus_shaders)
|
|
target_link_libraries(bench_concurrent PRIVATE v3d_runner Vulkan::Vulkan pthread)
|
|
target_compile_options(bench_concurrent PRIVATE -O3 -march=armv8-a+simd)
|
|
|
|
# Cycle 2 M4'' — concurrent LPF.
|
|
add_executable(bench_concurrent_lpf
|
|
tests/bench_concurrent_lpf.c
|
|
${FFASM_LPF_SOURCES}
|
|
)
|
|
add_dependencies(bench_concurrent_lpf daedalus_shaders)
|
|
target_link_libraries(bench_concurrent_lpf PRIVATE v3d_runner Vulkan::Vulkan pthread)
|
|
target_compile_options(bench_concurrent_lpf PRIVATE -O3 -march=armv8-a+simd)
|
|
|
|
# Cycle 3 M4''' — concurrent MC.
|
|
add_executable(bench_concurrent_mc
|
|
tests/bench_concurrent_mc.c
|
|
${FFASM_MC_SOURCES}
|
|
${FFC_MC_SOURCES}
|
|
)
|
|
add_dependencies(bench_concurrent_mc daedalus_shaders)
|
|
target_link_libraries(bench_concurrent_mc PRIVATE v3d_runner Vulkan::Vulkan pthread)
|
|
target_compile_options(bench_concurrent_mc PRIVATE -O3 -march=armv8-a+simd)
|
|
|
|
# Cycle 4 M4'''' — concurrent LPF wd=8.
|
|
add_executable(bench_concurrent_lpf8
|
|
tests/bench_concurrent_lpf8.c
|
|
${FFASM_LPF_SOURCES}
|
|
)
|
|
add_dependencies(bench_concurrent_lpf8 daedalus_shaders)
|
|
target_link_libraries(bench_concurrent_lpf8 PRIVATE v3d_runner Vulkan::Vulkan pthread)
|
|
target_compile_options(bench_concurrent_lpf8 PRIVATE -O3 -march=armv8-a+simd)
|
|
endif()
|
|
|
|
# ---- Summary ----------------------------------------------------------------
|
|
|
|
message(STATUS "daedalus-fourier build configured for ${CMAKE_SYSTEM_PROCESSOR}")
|
|
message(STATUS " FFmpeg snapshot: ${FFSNAP}")
|
|
message(STATUS " Build type: ${CMAKE_BUILD_TYPE}")
|
|
message(STATUS " Targets: bench_neon_idct"
|
|
"$<$<BOOL:${DAEDALUS_BUILD_VULKAN}>:; bench_vulkan_dispatch>")
|