marfrit
eb5cfb34c4
Mirror the IDCT pattern (lazy pipeline + per-call SSBO alloc + dispatch + readback) for cycles 2 (LPF wd=4) and 4 (LPF wd=8). Important caught-empirically bug: the two LPF shaders disagree on push-constant slot order — wd=4 puts dst_stride_u8 at slot 1, wd=8 puts it at slot 2 (with unused blocks_per_row at slot 1). Initial single-struct attempt silently corrupted wd=8 output (1958/2048 = 95.6 % bit-exact on test_api_lpf). Fixed by keeping separate lpf4_pc and lpf8_pc struct definitions. dst-window calc handles both kernels (same -4..+3 byte footprint per row). test_api_lpf exercises both kernels in CPU / QPU / AUTO modes against the C reference. All 6 mode/kernel combinations pass 2048/2048 bit-exact (32 edges × 8 rows × 8 bytes/edge). Phase 8 status after this commit: 3 of 5 kernels wired through API for QPU dispatch (IDCT, LPF wd=4, LPF wd=8 — i.e., all 3 QPU-default kernels per recipe). Cycle 3 MC and cycle 5 CDEF still need wiring for opportunistic-override mode but aren't needed for recipe-AUTO path. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
382 lines
13 KiB
CMake
382 lines
13 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
|
|
)
|
|
|
|
set(CDEF_SPV ${CMAKE_BINARY_DIR}/v3d_cdef.spv)
|
|
add_custom_command(
|
|
OUTPUT ${CDEF_SPV}
|
|
COMMAND ${GLSLANG_VALIDATOR} -V --target-env vulkan1.3
|
|
-o ${CDEF_SPV}
|
|
${CMAKE_SOURCE_DIR}/src/v3d_cdef.comp
|
|
DEPENDS ${CMAKE_SOURCE_DIR}/src/v3d_cdef.comp
|
|
COMMENT "glslang: v3d_cdef.comp -> v3d_cdef.spv"
|
|
VERBATIM
|
|
)
|
|
|
|
add_custom_target(daedalus_shaders ALL DEPENDS ${NOOP_SPV} ${IDCT8_SPV} ${LPF_SPV} ${MC_SPV} ${LPF8_SPV} ${CDEF_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)
|
|
|
|
# Cycle 5 — QPU CDEF bench (3-way M1 against NEON + C ref).
|
|
add_executable(bench_v3d_cdef
|
|
tests/bench_v3d_cdef.c
|
|
tests/cdef_ref.c
|
|
${DAV1D_CDEF_ASM_SOURCES}
|
|
${DAV1D_CDEF_C_SOURCES}
|
|
)
|
|
add_dependencies(bench_v3d_cdef daedalus_shaders)
|
|
target_link_libraries(bench_v3d_cdef PRIVATE v3d_runner Vulkan::Vulkan)
|
|
target_compile_options(bench_v3d_cdef PRIVATE -O2)
|
|
endif()
|
|
|
|
# ---- Phase 8 — public C API library + smoke test ---------------------------
|
|
|
|
add_library(daedalus_core STATIC
|
|
src/daedalus_core.c
|
|
src/v3d_runner.c
|
|
${FFASM_SOURCES}
|
|
${FFASM_LPF_SOURCES}
|
|
${FFASM_MC_SOURCES}
|
|
${FFC_MC_SOURCES}
|
|
${DAV1D_CDEF_ASM_SOURCES}
|
|
${DAV1D_CDEF_C_SOURCES}
|
|
)
|
|
target_include_directories(daedalus_core PUBLIC include)
|
|
target_include_directories(daedalus_core PRIVATE src)
|
|
target_link_libraries(daedalus_core PUBLIC Vulkan::Vulkan)
|
|
target_compile_options(daedalus_core PRIVATE -O2)
|
|
if (DAEDALUS_BUILD_VULKAN)
|
|
add_dependencies(daedalus_core daedalus_shaders)
|
|
endif()
|
|
|
|
add_executable(test_api_idct
|
|
tests/test_api_idct.c
|
|
tests/vp9_idct8_ref.c
|
|
)
|
|
target_link_libraries(test_api_idct PRIVATE daedalus_core)
|
|
target_compile_options(test_api_idct PRIVATE -O2)
|
|
|
|
add_executable(test_api_lpf
|
|
tests/test_api_lpf.c
|
|
tests/vp9_lpf_ref.c
|
|
tests/vp9_lpf8_ref.c
|
|
)
|
|
target_link_libraries(test_api_lpf PRIVATE daedalus_core)
|
|
target_compile_options(test_api_lpf PRIVATE -O2)
|
|
|
|
if (DAEDALUS_BUILD_VULKAN)
|
|
# (re-open the conditional so the closing endif() below balances)
|
|
|
|
|
|
# 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)
|
|
|
|
# Issue 003 — mixed-kernel M4 bench (NEON-N kernel A + QPU kernel B).
|
|
# Links all FFmpeg + dav1d NEON sources we have.
|
|
add_executable(bench_concurrent_mixed
|
|
tests/bench_concurrent_mixed.c
|
|
${FFASM_SOURCES}
|
|
${FFASM_LPF_SOURCES}
|
|
${FFASM_MC_SOURCES}
|
|
${FFC_MC_SOURCES}
|
|
${DAV1D_CDEF_ASM_SOURCES}
|
|
${DAV1D_CDEF_C_SOURCES}
|
|
)
|
|
add_dependencies(bench_concurrent_mixed daedalus_shaders)
|
|
target_link_libraries(bench_concurrent_mixed PRIVATE v3d_runner Vulkan::Vulkan pthread)
|
|
target_compile_options(bench_concurrent_mixed 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>")
|