Skip to content

Commit

Permalink
Add an initial unit test framework and add to CTest
Browse files Browse the repository at this point in the history
Add some initial files and CMake framework for unit testing of
individual SIMD kernels with specialized implementations.

For now this is just a simple main program that runs a range of random
inputs for two sets of interesting TCoeffOps kernels. By having two
instantiations of the TCoeffOps class and only calling
initTCoeffOps{ARM,X86} on one of the two class instances, we can
effectively compare the reference C/C++ implementation against any
optimized kernel if present.

One suggestion for future work may be to test all supported SIMD kernel
variants at once rather than just the single one currently selected by
run-time CPU feature detection. This would allow us to for instance test
both the SIMDe and Arm versions of a kernel without needing to maintain
multiple build directories.
  • Loading branch information
georges-arm committed Nov 5, 2024
1 parent da540e6 commit 17e0d9b
Show file tree
Hide file tree
Showing 4 changed files with 282 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -375,12 +375,14 @@ if( VVENC_ENABLE_INSTALL )
endif()
endif()

set( VVENC_LIB_DIR "${CMAKE_CURRENT_SOURCE_DIR}/source/Lib" )

add_subdirectory( "source/Lib/vvenc" )
add_subdirectory( "source/App/vvencapp" )
add_subdirectory( "source/App/vvencFFapp" )
add_subdirectory( "test/vvenclibtest" )
add_subdirectory( "test/vvencinterfacetest" )
add_subdirectory( "test/vvenc_unit_test" )

include( cmake/modules/vvencTests.cmake )

Expand Down
2 changes: 2 additions & 0 deletions cmake/modules/vvencTests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ add_test( NAME Test_vvenclibtest-sdk_default COMMAND vvenclibtest 4
add_test( NAME Test_vvenclibtest-sdk_stringapi_interface COMMAND vvenclibtest 5 )
add_test( NAME Test_vvenclibtest-timestamps COMMAND vvenclibtest 6 )

add_test( NAME Test_vvenc_unit_test COMMAND vvenc_unit_test )

set( CLEANUP_TEST_FILES "" )

function( add_vvenc_test NAME TIMEOUT OUT_OUTPUT REQUIRES )
Expand Down
26 changes: 26 additions & 0 deletions test/vvenc_unit_test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
set( EXE_NAME vvenc_unit_test )

file( GLOB SRC_FILES CONFIGURE_DEPENDS "*.cpp" )
file( GLOB INC_FILES CONFIGURE_DEPENDS "*.h" )

add_executable( ${EXE_NAME} ${SRC_FILES} ${INC_FILES} )
set_target_properties( ${EXE_NAME} PROPERTIES RELEASE_POSTFIX "${CMAKE_RELEASE_POSTFIX}" )
set_target_properties( ${EXE_NAME} PROPERTIES DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}" )
set_target_properties( ${EXE_NAME} PROPERTIES RELWITHDEBINFO_POSTFIX "${CMAKE_RELWITHDEBINFO_POSTFIX}" )
set_target_properties( ${EXE_NAME} PROPERTIES MINSIZEREL_POSTFIX "${CMAKE_MINSIZEREL_POSTFIX}" )
if( VVENC_LIBRARY_ONLY )
set_target_properties( ${EXE_NAME} PROPERTIES EXCLUDE_FROM_ALL TRUE )
endif()

target_compile_options( ${EXE_NAME} PRIVATE $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:-Wall>
$<$<CXX_COMPILER_ID:GNU>:-Wall -fdiagnostics-show-option>
$<$<CXX_COMPILER_ID:MSVC>:/W4 /WX /wd4244 /wd4251 /wd4996>)

target_include_directories( ${EXE_NAME} PRIVATE ${VVENC_LIB_DIR} )
target_link_libraries( ${EXE_NAME} Threads::Threads vvenc )

# Example: place header files in different folders
source_group( "Header Files" FILES ${INC_FILES} )

# Set the folder where to place the projects
set_target_properties( ${EXE_NAME} PROPERTIES FOLDER test )
252 changes: 252 additions & 0 deletions test/vvenc_unit_test/vvenc_unit_test.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,252 @@
/* -----------------------------------------------------------------------------
The copyright in this software is being made available under the Clear BSD
License, included below. No patent rights, trademark rights and/or
other Intellectual Property Rights other than the copyrights concerning
the Software are granted under this license.
The Clear BSD License
Copyright (c) 2024, Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. & The VVenC Authors.
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted (subject to the limitations in the disclaimer below) provided that
the following conditions are met:
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* 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.
* Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from this
software without specific prior written permission.
NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE GRANTED BY
THIS LICENSE. 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 HOLDER 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.
------------------------------------------------------------------------------------------- */

/**
\ingroup vvenclibtest
\file vvenclibtest.cpp
\brief This vvenclibtest.cpp file contains the main entry point of the test application.
*/

#include <iostream>
#include <stddef.h>
#include <stdio.h>
#include <vector>

#include "CommonLib/TrQuant_EMT.h"
#include "CommonLib/TypeDef.h"

using namespace vvenc;

#define NUM_CASES 100

static bool compare_values_2d( const std::string& context, const TCoeff* ref, const TCoeff* opt, unsigned rows,
unsigned cols, unsigned stride = 0 )
{
stride = stride != 0 ? stride : cols;

for( unsigned row = 0; row < rows; ++row )
{
for( unsigned col = 0; col < cols; ++col )
{
unsigned idx = row * stride + col;
if( ref[ idx ] != opt[ idx ] )
{
printf( "failed: %s\n", context.c_str() );
printf( " mismatch: ref[%u*%u+%u]=%d opt[%u*%u+%u]=%d\n", row, cols, col, ref[ idx ], row, cols, col,
opt[ idx ] );
return false;
}
}
}
return true;
}

template<typename T>
class InputGenerator
{
public:
explicit InputGenerator( unsigned bits ) : m_bits( bits )
{
}

T operator()() const
{
return rand() & ( ( 1 << m_bits ) - 1 );
}

private:
unsigned m_bits;
};

class DimensionGenerator
{
public:
unsigned get( unsigned min, unsigned max, unsigned mod = 1 ) const
{
unsigned ret = rand() % ( max - min + 1 ) + min;
ret -= ret % mod;
return ret;
}
};

template<typename G>
static bool check_one_fastInvCore( TCoeffOps* ref, TCoeffOps* opt, int idx, int trSize, unsigned lines,
unsigned reducedLines, unsigned rows, G input_generator )
{
CHECK( lines == 0, "Lines must be non-zero" );
CHECK( reducedLines > lines, "ReducedLines must be less than or equal to lines" );
CHECK( rows == 0, "Rows must be non-zero" );
CHECK( rows % 4, "Rows must be a multiple of four" );

std::ostringstream sstm;
sstm << "fastInvCore trSize=" << trSize << " lines=" << lines << " reducedLines=" << reducedLines << " rows=" << rows;

std::vector<TMatrixCoeff> it( rows * trSize );
std::vector<TCoeff> src( rows * lines );
std::vector<TCoeff> dst0( lines * trSize );
std::vector<TCoeff> dst1 = dst0;

// Initialize source buffers.
std::generate( it.begin(), it.end(), input_generator );
std::generate( src.begin(), src.end(), input_generator );

ref->fastInvCore[ idx ]( it.data(), src.data(), dst0.data(), lines, reducedLines, rows );
opt->fastInvCore[ idx ]( it.data(), src.data(), dst1.data(), lines, reducedLines, rows );
return compare_values_2d( sstm.str(), dst0.data(), dst1.data(), reducedLines, trSize );
}

template<typename G>
static bool check_one_fastFwdCore_2D( TCoeffOps* ref, TCoeffOps* opt, int idx, int trSize, unsigned line,
unsigned reducedLine, unsigned cutoff, unsigned shift, G input_generator )
{
CHECK( line == 0, "Line must be non-zero" );
CHECK( reducedLine > line, "ReducedLine must be less than or equal to line" );
CHECK( cutoff == 0, "Cutoff must be non-zero" );
CHECK( cutoff % 4, "Cutoff must be a multiple of four" );
CHECK( shift == 0, "Shift must be at least one" );

std::ostringstream sstm;
sstm << "fastFwdCore_2D trSize=" << trSize << " line=" << line << " reducedLine=" << reducedLine
<< " cutoff=" << cutoff << " shift=" << shift;

std::vector<TMatrixCoeff> tc( trSize * cutoff );
std::vector<TCoeff> src( trSize * reducedLine );
std::vector<TCoeff> dst0( line * cutoff );
std::vector<TCoeff> dst1 = dst0;

// Initialize source and destination buffers, make sure that destination
// buffers match in elements that are not written to by the kernel being
// tested.
std::generate( tc.begin(), tc.end(), input_generator );
std::generate( src.begin(), src.end(), input_generator );

ref->fastFwdCore_2D[ idx ]( tc.data(), src.data(), dst0.data(), line, reducedLine, cutoff, shift );
opt->fastFwdCore_2D[ idx ]( tc.data(), src.data(), dst1.data(), line, reducedLine, cutoff, shift );
// Don't check for over-writes past reducedLine columns here, since the
// existing x86 implementations would fail.
return compare_values_2d( sstm.str(), dst0.data(), dst1.data(), cutoff, reducedLine, line );
}

static bool check_fastInvCore( TCoeffOps* ref, TCoeffOps* opt, unsigned num_cases, int idx, int trSize )
{
printf( "Testing TCoeffOps::fastInvCore trSize=%d\n", trSize );
InputGenerator<TCoeff> g{ 10 };
DimensionGenerator rng;

for( unsigned i = 0; i < num_cases; ++i )
{
// Clamp lines down to the next multiple of four when generating
// reducedLines to avoid existing x86 implementations over-writing.
unsigned lines = rng.get( 4, 1024 );
unsigned reducedLines = rng.get( 4, lines & ~3U );
unsigned rows = rng.get( 4, 128, 4 ); // Rows must be a non-zero multiple of four.
if( !check_one_fastInvCore( ref, opt, idx, trSize, lines, reducedLines, rows, g ) )
{
return false;
}
}

return true;
}

static bool check_fastFwdCore_2D( TCoeffOps* ref, TCoeffOps* opt, unsigned num_cases, int idx, int trSize )
{
printf( "Testing TCoeffOps::fastFwdCore_2D trSize=%d\n", trSize );
InputGenerator<TCoeff> g{ 10 };
DimensionGenerator rng;

for( unsigned i = 0; i < num_cases; ++i )
{
// Clamp line down to the next multiple of four when generating reducedLine
// to avoid existing x86 implementations over-writing.
unsigned line = rng.get( 1, 1024 );
unsigned reducedLine = rng.get( 0, line & ~3U );
unsigned cutoff = rng.get( 4, 1024, 4 ); // Cutoff must be a non-zero multiple of four.
unsigned shift = rng.get( 1, 16 ); // Shift must be at least one to avoid UB.
if( !check_one_fastFwdCore_2D( ref, opt, idx, trSize, line, reducedLine, cutoff, shift, g ) )
{
return false;
}
}

return true;
}

static bool test_TCoeffOps()
{
TCoeffOps ref;
TCoeffOps opt;
#if defined( TARGET_SIMD_X86 )
opt.initTCoeffOpsX86();
#endif
#if defined( TARGET_SIMD_ARM )
opt.initTCoeffOpsARM();
#endif

unsigned num_cases = NUM_CASES;
bool passed = true;

passed = check_fastInvCore( &ref, &opt, num_cases, 0, 4 ) && passed;
passed = check_fastInvCore( &ref, &opt, num_cases, 1, 8 ) && passed;
passed = check_fastInvCore( &ref, &opt, num_cases, 2, 16 ) && passed;
passed = check_fastInvCore( &ref, &opt, num_cases, 3, 32 ) && passed;
passed = check_fastInvCore( &ref, &opt, num_cases, 4, 64 ) && passed;

passed = check_fastFwdCore_2D( &ref, &opt, num_cases, 0, 4 ) && passed;
passed = check_fastFwdCore_2D( &ref, &opt, num_cases, 1, 8 ) && passed;
passed = check_fastFwdCore_2D( &ref, &opt, num_cases, 2, 16 ) && passed;
passed = check_fastFwdCore_2D( &ref, &opt, num_cases, 3, 32 ) && passed;
passed = check_fastFwdCore_2D( &ref, &opt, num_cases, 4, 64 ) && passed;
return passed;
}

int main( int argc, char** argv )
{
bool passed = test_TCoeffOps();

if( !passed )
{
printf( "\nerror: some tests failed!\n\n" );
exit( EXIT_FAILURE );
}
printf( "\nsuccess: all tests passed!\n\n" );
}

0 comments on commit 17e0d9b

Please sign in to comment.