mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
11826 Commits
42 Branches
22 Tags
313 MiB
Tree: 942bebb664
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '942bebb664'
${ noResults }
devilutionX/CMake/Tests.cmake

188 lines
6.7 KiB
Raw Normal View History Unescape

Overhaul tests 1. Adds a `libdevilution_so` target when tests are enabled. 2. Each test file is now a separate binary target linked against `libdevilutionx_so` (can now run tests in parallel). 3. Tests are now defined in a separate `test/CMakeLists.txt` file. 4. Building the tests is now controlled by the standard `BUILD_TESTING` option (defined by CTest). 5. Tests are now built by default. 6. On CI, test errors are now reported. Also: * `.clang-format`: Enable SortIncludes in tests * `path_test.cpp`: Fix -Wsign-compare
4 years ago
include(GoogleTest)
CMake: Improve asset copying
7 months ago
include(functions/copy_files)
Overhaul tests 1. Adds a `libdevilution_so` target when tests are enabled. 2. Each test file is now a separate binary target linked against `libdevilutionx_so` (can now run tests in parallel). 3. Tests are now defined in a separate `test/CMakeLists.txt` file. 4. Building the tests is now controlled by the standard `BUILD_TESTING` option (defined by CTest). 5. Tests are now built by default. 6. On CI, test errors are now reported. Also: * `.clang-format`: Enable SortIncludes in tests * `path_test.cpp`: Fix -Wsign-compare
4 years ago
add_library(libdevilutionx_so SHARED)
Update CMakeLists.txt
3 years ago
set_target_properties(libdevilutionx_so PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
Split more things into libraries This does not fully address the issue of most everything being a giant library but it's a start. Note that the libraries are OBJECT libraries, so they may (and currently do) contain references to missing symbols. Also fixes the implementation of transitive dependency support for OBJECT libraries.
1 year ago
target_link_dependencies(libdevilutionx_so PUBLIC libdevilutionx)
Overhaul tests 1. Adds a `libdevilution_so` target when tests are enabled. 2. Each test file is now a separate binary target linked against `libdevilutionx_so` (can now run tests in parallel). 3. Tests are now defined in a separate `test/CMakeLists.txt` file. 4. Building the tests is now controlled by the standard `BUILD_TESTING` option (defined by CTest). 5. Tests are now built by default. 6. On CI, test errors are now reported. Also: * `.clang-format`: Enable SortIncludes in tests * `path_test.cpp`: Fix -Wsign-compare
4 years ago
set_target_properties(libdevilutionx_so PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
CMake: Fix text_render_integration_test with make Turns out, `add_custom_target`'s `DEPENDS` argument can only refer to outputs of custom commands in the same directory (i.e. the same CMakeLists.txt scope). Interestingly, this worked with all generators except parallel make, so perhaps there some ongoing work in CMake to allow cross-directory `DEPENDS`. Works around this limitation by moving tests to the same scope (`CMakeLists.txt` file) as assets.
6 months ago
add_library(test_main OBJECT test/main.cpp)
Split more things into libraries This does not fully address the issue of most everything being a giant library but it's a start. Note that the libraries are OBJECT libraries, so they may (and currently do) contain references to missing symbols. Also fixes the implementation of transitive dependency support for OBJECT libraries.
1 year ago
target_link_dependencies(test_main PUBLIC libdevilutionx_so GTest::gtest GTest::gmock)
Overhaul tests 1. Adds a `libdevilution_so` target when tests are enabled. 2. Each test file is now a separate binary target linked against `libdevilutionx_so` (can now run tests in parallel). 3. Tests are now defined in a separate `test/CMakeLists.txt` file. 4. Building the tests is now controlled by the standard `BUILD_TESTING` option (defined by CTest). 5. Tests are now built by default. 6. On CI, test errors are now reported. Also: * `.clang-format`: Enable SortIncludes in tests * `path_test.cpp`: Fix -Wsign-compare
4 years ago
set(tests
animationinfo_test
appfat_test
automap_test
cursor_test
dead_test
diablo_test
Add class to allow iterating over all points in a rectangle Co-authored-by: Gleb Mazovetskiy <glex.spb@gmail.com>
5 years ago
drlg_common_test
Overhaul tests 1. Adds a `libdevilution_so` target when tests are enabled. 2. Each test file is now a separate binary target linked against `libdevilutionx_so` (can now run tests in parallel). 3. Tests are now defined in a separate `test/CMakeLists.txt` file. 4. Building the tests is now controlled by the standard `BUILD_TESTING` option (defined by CTest). 5. Tests are now built by default. 6. On CI, test errors are now reported. Also: * `.clang-format`: Enable SortIncludes in tests * `path_test.cpp`: Fix -Wsign-compare
4 years ago
drlg_l1_test
Test Catacomb level generation (#4651)
4 years ago
drlg_l2_test
Test basic Caves and Nests levels
4 years ago
drlg_l3_test
Test basic Hell levels
4 years ago
drlg_l4_test
Overhaul tests 1. Adds a `libdevilution_so` target when tests are enabled. 2. Each test file is now a separate binary target linked against `libdevilutionx_so` (can now run tests in parallel). 3. Tests are now defined in a separate `test/CMakeLists.txt` file. 4. Building the tests is now controlled by the standard `BUILD_TESTING` option (defined by CTest). 5. Tests are now built by default. 6. On CI, test errors are now reported. Also: * `.clang-format`: Enable SortIncludes in tests * `path_test.cpp`: Fix -Wsign-compare
4 years ago
effects_test
inv_test
Fix infinite loop in unique item randomization
2 years ago
items_test
Simplify logic of UpdateMissilePos using helpers from 4620 (#4621)
4 years ago
math_test
Overhaul tests 1. Adds a `libdevilution_so` target when tests are enabled. 2. Each test file is now a separate binary target linked against `libdevilutionx_so` (can now run tests in parallel). 3. Tests are now defined in a separate `test/CMakeLists.txt` file. 4. Building the tests is now controlled by the standard `BUILD_TESTING` option (defined by CTest). 5. Tests are now built by default. 6. On CI, test errors are now reported. Also: * `.clang-format`: Enable SortIncludes in tests * `path_test.cpp`: Fix -Wsign-compare
4 years ago
missiles_test
pack_test
player_test
quests_test
scrollrt_test
stores_test
Untangle pathfinding dependencies 1. Makes `path.cpp` concerned solely with the pathfinding algorithm. 2. Turns `path_test` into a standalone test.
1 year ago
tile_properties_test
CMake: An option to disable demomode support Useful for targets with limited RAM. Reduces RG99 binary size by 8 KiB.
4 years ago
timedemo_test
Overhaul tests 1. Adds a `libdevilution_so` target when tests are enabled. 2. Each test file is now a separate binary target linked against `libdevilutionx_so` (can now run tests in parallel). 3. Tests are now defined in a separate `test/CMakeLists.txt` file. 4. Building the tests is now controlled by the standard `BUILD_TESTING` option (defined by CTest). 5. Tests are now built by default. 6. On CI, test errors are now reported. Also: * `.clang-format`: Enable SortIncludes in tests * `path_test.cpp`: Fix -Wsign-compare
4 years ago
writehero_test
)
Turn util/parse_int into a standalone library
2 years ago
set(standalone_tests
Turn codec into a standalone library
2 years ago
codec_test
Extract Crawl to a library Also adds a test and a benchmark
2 years ago
crawl_test
data_file_test: Make it a standalone test Finally!
1 year ago
data_file_test
Turn utils/file_util into a standalone library
2 years ago
file_util_test
Turn utils/format_int into a standalone library
2 years ago
format_int_test
Migrate from SimpleIni to our own implementation Our implementation has a more modern interface and only supports the features that we care about. It always outputs `\n` as newlines and does not output BOM. The modern interface eliminates awkward `c_str()/data()` conversions. This implementation preserves comments and the file order of sections and keys. New keys are written in insertion order. We now also support modifying and adding default comments, which may be a useful thing to do for the especially tricky ini options (this PR doesn't add any but adds the ability to do so). Sadly, this increases the RG99 binary size by 24 KiB. I'm guessing this is because the map implementation generates quite a bit of code. Note that while it might seem that using `std::string` for every key and value would do a lot of allocations, most of these strings are small and thus benefit from Small String Optimization (= no allocations).
1 year ago
ini_test
Palette blending: Add a test and a benchmark Extract palette blending into a library and adds a basic test and a basic benchmark.
11 months ago
palette_blending_test
Turn util/parse_int into a standalone library
2 years ago
parse_int_test
Untangle pathfinding dependencies 1. Makes `path.cpp` concerned solely with the pathfinding algorithm. 2. Turns `path_test` into a standalone test.
1 year ago
path_test
test: add `vision_test` This test covers a few vision bugs: 1. VisibilityInStraightLineOfSight - test case checks the visibility of objects in a straight line of sight parallel to the X or Y coordinate lines: https://github.com/diasurgical/DevilutionX/pull/7901 2. NoVisibilityThroughAdjacentTiles - test case checks that nothing is visible through the diagonally adjacent tiles: https://github.com/diasurgical/DevilutionX/pull/7920 3. VisibleObjects - generic test, which makes sure some objects are visible, but some - are not. Signed-off-by: Roman Penyaev <r.peniaev@gmail.com>
1 year ago
vision_test
More test untangling 1. Marks 3 more tests as standalone. 2. Renames `staticvector_test.cpp` to `static_vector_test.cpp`.
1 year ago
random_test
rectangle_test
static_vector_test
Turn util/str_* into a standalone library
2 years ago
str_cat_test
Turn utils/utf8 into a standalone library
2 years ago
utf8_test
Greatly simplify outline rendering The new algorithm is a lot less code, slightly faster, and results in a smaller binary (-40 KiB on rg99). The previous algorithm filled all the pixels around every solid pixel. The new algorithm only fills pixels that will be visible. We first collect the outline pixels into an array (which may contain a small amount of duplicates). Then, we render the entire array in a single loop. This turns out to be slightly faster than rendering inline, at the cost of ~4 KiB of stack (basically free). To collect the pixels, we go through the CLX sprite, keeping track of the solid runs in the current row, and the filled pixels on the line above and the line below. To be able to quickly test the pixels above and below, we introduce a new data structure, `StaticBitVector`. It is similar to a bitset, except the size is determined at runtime (capacity is fixed), and it supports quick updates of entire subspans.
2 years ago
)
text renderer: colors layout fix + improved tests 1. Fixes DrawStringwithColors kerning fit handling and newline handling. 2. Splits tests into one file per function call, making it easier to compare diffs and add new tests. Also adds `--update_expected` argument to update the expected files with actual results.
1 year ago
if(NOT USE_SDL1)
list(APPEND standalone_tests text_render_integration_test)
endif()
Extract Crawl to a library Also adds a test and a benchmark
2 years ago
set(benchmarks
Add a CLX rendering benchmark ``` ---------------------------------------------------------------------------- Benchmark Time CPU Iterations UserCounters... ---------------------------------------------------------------------------- BM_RenderSmallClx 868 ns 866 ns 802315 bytes_per_second=2.04538Gi/s items_per_second=6.92446M/s BM_RenderLargeClx 128208 ns 128032 ns 5434 bytes_per_second=716.703Mi/s items_per_second=7.81057k/s ```
2 years ago
clx_render_benchmark
Add dun_render_benchmark Results from a single run (a bit noisy) on my machine: ``` tools/build_and_run_benchmark.py dun_render_benchmark ``` ``` ------------------------------------------------------------------------------------------------------------------------ Benchmark Time CPU Iterations UserCounters... ------------------------------------------------------------------------------------------------------------------------ DunRenderBenchmark/LeftTriangle_Solid_FullyLit 98297 ns 98282 ns 8840 items_per_second=15.1096M/s DunRenderBenchmark/LeftTriangle_Solid_FullyDark 124727 ns 124701 ns 6973 items_per_second=11.9085M/s DunRenderBenchmark/LeftTriangle_Solid_PartiallyLit 514869 ns 514747 ns 1700 items_per_second=2.88491M/s DunRenderBenchmark/LeftTriangle_Transparent_FullyLit 520312 ns 520216 ns 1682 items_per_second=2.85458M/s DunRenderBenchmark/LeftTriangle_Transparent_FullyDark 524440 ns 524331 ns 1664 items_per_second=2.83218M/s DunRenderBenchmark/LeftTriangle_Transparent_PartiallyLit 532300 ns 532162 ns 1647 items_per_second=2.7905M/s DunRenderBenchmark/RightTriangle_Solid_FullyLit 92387 ns 92363 ns 8840 items_per_second=16.7275M/s DunRenderBenchmark/RightTriangle_Solid_FullyDark 85680 ns 85662 ns 9884 items_per_second=18.0361M/s DunRenderBenchmark/RightTriangle_Solid_PartiallyLit 538347 ns 538250 ns 1626 items_per_second=2.87041M/s DunRenderBenchmark/RightTriangle_Transparent_FullyLit 548800 ns 548760 ns 1598 items_per_second=2.81544M/s DunRenderBenchmark/RightTriangle_Transparent_FullyDark 540450 ns 540369 ns 1620 items_per_second=2.85916M/s DunRenderBenchmark/RightTriangle_Transparent_PartiallyLit 555061 ns 555003 ns 1575 items_per_second=2.78377M/s DunRenderBenchmark/TransparentSquare_Solid_FullyLit 700849 ns 700751 ns 1320 items_per_second=3.68176M/s DunRenderBenchmark/TransparentSquare_Solid_FullyDark 664927 ns 664872 ns 1389 items_per_second=3.88045M/s DunRenderBenchmark/TransparentSquare_Solid_PartiallyLit 1131702 ns 1131559 ns 822 items_per_second=2.28004M/s DunRenderBenchmark/TransparentSquare_Transparent_FullyLit 1022384 ns 1022267 ns 916 items_per_second=2.5238M/s DunRenderBenchmark/TransparentSquare_Transparent_FullyDark 1023193 ns 1023057 ns 900 items_per_second=2.52185M/s DunRenderBenchmark/TransparentSquare_Transparent_PartiallyLit 1033573 ns 1033496 ns 895 items_per_second=2.49638M/s DunRenderBenchmark/Square_Solid_FullyLit 53532 ns 53524 ns 10000 items_per_second=30.8272M/s DunRenderBenchmark/Square_Solid_FullyDark 41993 ns 41987 ns 19794 items_per_second=47.1573M/s DunRenderBenchmark/Square_Solid_PartiallyLit 842772 ns 842615 ns 1108 items_per_second=1.56655M/s DunRenderBenchmark/Square_Transparent_FullyLit 834105 ns 834026 ns 1119 items_per_second=1.58269M/s DunRenderBenchmark/Square_Transparent_FullyDark 831912 ns 831823 ns 1122 items_per_second=1.58688M/s DunRenderBenchmark/Square_Transparent_PartiallyLit 924638 ns 924536 ns 1010 items_per_second=1.42774M/s DunRenderBenchmark/LeftTrapezoid_Solid_FullyLit 33728 ns 33725 ns 24962 items_per_second=18.8583M/s DunRenderBenchmark/LeftTrapezoid_Solid_FullyDark 31088 ns 31085 ns 27444 items_per_second=20.4601M/s DunRenderBenchmark/LeftTrapezoid_Solid_PartiallyLit 268792 ns 268768 ns 3254 items_per_second=1.97196M/s DunRenderBenchmark/LeftTrapezoid_Transparent_FullyLit 277990 ns 277965 ns 3140 items_per_second=1.90672M/s DunRenderBenchmark/LeftTrapezoid_Transparent_FullyDark 268952 ns 268912 ns 3250 items_per_second=1.9709M/s DunRenderBenchmark/LeftTrapezoid_Transparent_PartiallyLit 288869 ns 288826 ns 3056 items_per_second=1.83501M/s DunRenderBenchmark/RightTrapezoid_Solid_FullyLit 29581 ns 29576 ns 28347 items_per_second=21.0984M/s DunRenderBenchmark/RightTrapezoid_Solid_FullyDark 25315 ns 25312 ns 32250 items_per_second=24.6523M/s DunRenderBenchmark/RightTrapezoid_Solid_PartiallyLit 259977 ns 259960 ns 3312 items_per_second=2.0003M/s DunRenderBenchmark/RightTrapezoid_Transparent_FullyLit 263079 ns 263056 ns 3322 items_per_second=1.97677M/s DunRenderBenchmark/RightTrapezoid_Transparent_FullyDark 259849 ns 259824 ns 3364 items_per_second=2.00136M/s DunRenderBenchmark/RightTrapezoid_Transparent_PartiallyLit 279623 ns 279594 ns 3127 items_per_second=1.85984M/s ```
2 years ago
crawl_benchmark
Add a pathfinding benchmark Example run: ``` $ tools/build_and_run_benchmark.py path_benchmark -------------------------------------------------------- Benchmark Time CPU Iterations -------------------------------------------------------- BM_SinglePath 2905 ns 2905 ns 241038 BM_Bridges 65951 ns 65948 ns 9785 BM_NoPath 131397 ns 131390 ns 5247 ```
1 year ago
dun_render_benchmark
Add benchmark for Lightmap::build()
10 months ago
light_render_benchmark
Palette blending: Add a test and a benchmark Extract palette blending into a library and adds a basic test and a basic benchmark.
11 months ago
palette_blending_benchmark
Add a pathfinding benchmark Example run: ``` $ tools/build_and_run_benchmark.py path_benchmark -------------------------------------------------------- Benchmark Time CPU Iterations -------------------------------------------------------- BM_SinglePath 2905 ns 2905 ns 241038 BM_Bridges 65951 ns 65948 ns 9785 BM_NoPath 131397 ns 131390 ns 5247 ```
1 year ago
path_benchmark
)
Overhaul tests 1. Adds a `libdevilution_so` target when tests are enabled. 2. Each test file is now a separate binary target linked against `libdevilutionx_so` (can now run tests in parallel). 3. Tests are now defined in a separate `test/CMakeLists.txt` file. 4. Building the tests is now controlled by the standard `BUILD_TESTING` option (defined by CTest). 5. Tests are now built by default. 6. On CI, test errors are now reported. Also: * `.clang-format`: Enable SortIncludes in tests * `path_test.cpp`: Fix -Wsign-compare
4 years ago
CMake: Fix text_render_integration_test with make Turns out, `add_custom_target`'s `DEPENDS` argument can only refer to outputs of custom commands in the same directory (i.e. the same CMakeLists.txt scope). Interestingly, this worked with all generators except parallel make, so perhaps there some ongoing work in CMake to allow cross-directory `DEPENDS`. Works around this limitation by moving tests to the same scope (`CMakeLists.txt` file) as assets.
6 months ago
include(test/Fixtures.cmake)
Copy test fixtures to build directory instead of trying to navigate back to the source directory. That's fragile and breaks if the build ends up one level deeper (e.g. MSVC with the default build/<config>/ structure)
4 years ago
Extract Crawl to a library Also adds a test and a benchmark
2 years ago
foreach(test_target ${tests} ${standalone_tests} ${benchmarks})
CMake: Fix text_render_integration_test with make Turns out, `add_custom_target`'s `DEPENDS` argument can only refer to outputs of custom commands in the same directory (i.e. the same CMakeLists.txt scope). Interestingly, this worked with all generators except parallel make, so perhaps there some ongoing work in CMake to allow cross-directory `DEPENDS`. Works around this limitation by moving tests to the same scope (`CMakeLists.txt` file) as assets.
6 months ago
add_executable(${test_target} "test/${test_target}.cpp")
Update CMakeLists.txt
3 years ago
set_target_properties(${test_target} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
CMake: Link gperftools directly to the binary Not sure why this is necessary but it fixes the gperf build
4 years ago
if(GPERF)
target_link_libraries(${test_target} PUBLIC ${GPERFTOOLS_LIBRARIES})
endif()
Overhaul tests 1. Adds a `libdevilution_so` target when tests are enabled. 2. Each test file is now a separate binary target linked against `libdevilutionx_so` (can now run tests in parallel). 3. Tests are now defined in a separate `test/CMakeLists.txt` file. 4. Building the tests is now controlled by the standard `BUILD_TESTING` option (defined by CTest). 5. Tests are now built by default. 6. On CI, test errors are now reported. Also: * `.clang-format`: Enable SortIncludes in tests * `path_test.cpp`: Fix -Wsign-compare
4 years ago
endforeach()
Extract Crawl to a library Also adds a test and a benchmark
2 years ago
foreach(test_target ${tests} ${standalone_tests})
gtest_discover_tests(${test_target})
endforeach()
Greatly simplify outline rendering The new algorithm is a lot less code, slightly faster, and results in a smaller binary (-40 KiB on rg99). The previous algorithm filled all the pixels around every solid pixel. The new algorithm only fills pixels that will be visible. We first collect the outline pixels into an array (which may contain a small amount of duplicates). Then, we render the entire array in a single loop. This turns out to be slightly faster than rendering inline, at the cost of ~4 KiB of stack (basically free). To collect the pixels, we go through the CLX sprite, keeping track of the solid runs in the current row, and the filled pixels on the line above and the line below. To be able to quickly test the pixels above and below, we introduce a new data structure, `StaticBitVector`. It is similar to a bitset, except the size is determined at runtime (capacity is fixed), and it supports quick updates of entire subspans.
2 years ago
foreach(test_target ${tests})
target_link_libraries(${test_target} PRIVATE test_main)
endforeach()
foreach(test_target ${standalone_tests})
Turn utils/utf8 into a standalone library
2 years ago
target_link_libraries(${test_target} PRIVATE GTest::gtest_main)
Greatly simplify outline rendering The new algorithm is a lot less code, slightly faster, and results in a smaller binary (-40 KiB on rg99). The previous algorithm filled all the pixels around every solid pixel. The new algorithm only fills pixels that will be visible. We first collect the outline pixels into an array (which may contain a small amount of duplicates). Then, we render the entire array in a single loop. This turns out to be slightly faster than rendering inline, at the cost of ~4 KiB of stack (basically free). To collect the pixels, we go through the CLX sprite, keeping track of the solid runs in the current row, and the filled pixels on the line above and the line below. To be able to quickly test the pixels above and below, we introduce a new data structure, `StaticBitVector`. It is similar to a bitset, except the size is determined at runtime (capacity is fixed), and it supports quick updates of entire subspans.
2 years ago
target_include_directories(${test_target} PRIVATE "${PROJECT_SOURCE_DIR}/Source")
endforeach()
Extract Crawl to a library Also adds a test and a benchmark
2 years ago
foreach(target ${benchmarks})
target_link_libraries(${target} PRIVATE benchmark::benchmark benchmark::benchmark_main)
target_include_directories(${target} PRIVATE "${PROJECT_SOURCE_DIR}/Source")
endforeach()
CMake: Fix text_render_integration_test with make Turns out, `add_custom_target`'s `DEPENDS` argument can only refer to outputs of custom commands in the same directory (i.e. the same CMakeLists.txt scope). Interestingly, this worked with all generators except parallel make, so perhaps there some ongoing work in CMake to allow cross-directory `DEPENDS`. Works around this limitation by moving tests to the same scope (`CMakeLists.txt` file) as assets.
6 months ago
add_library(app_fatal_for_testing OBJECT test/app_fatal_for_testing.cpp)
Turn utils/file_util into a standalone library
2 years ago
target_sources(app_fatal_for_testing INTERFACE $<TARGET_OBJECTS:app_fatal_for_testing>)
CMake: Fix text_render_integration_test with make Turns out, `add_custom_target`'s `DEPENDS` argument can only refer to outputs of custom commands in the same directory (i.e. the same CMakeLists.txt scope). Interestingly, this worked with all generators except parallel make, so perhaps there some ongoing work in CMake to allow cross-directory `DEPENDS`. Works around this limitation by moving tests to the same scope (`CMakeLists.txt` file) as assets.
6 months ago
add_library(language_for_testing OBJECT test/language_for_testing.cpp)
Turn utils/format_int into a standalone library
2 years ago
target_sources(language_for_testing INTERFACE $<TARGET_OBJECTS:language_for_testing>)
Split more things into libraries This does not fully address the issue of most everything being a giant library but it's a start. Note that the libraries are OBJECT libraries, so they may (and currently do) contain references to missing symbols. Also fixes the implementation of transitive dependency support for OBJECT libraries.
1 year ago
target_link_dependencies(codec_test PRIVATE libdevilutionx_codec app_fatal_for_testing)
Untangle more dependencies This allows us to make `clx_render_benchmark` and `text_render_integration_test` standalone.
9 months ago
target_link_dependencies(clx_render_benchmark
PRIVATE
DevilutionX::SDL
tl
app_fatal_for_testing
language_for_testing
libdevilutionx_clx_render
libdevilutionx_load_clx
libdevilutionx_log
libdevilutionx_surface
)
Split more things into libraries This does not fully address the issue of most everything being a giant library but it's a start. Note that the libraries are OBJECT libraries, so they may (and currently do) contain references to missing symbols. Also fixes the implementation of transitive dependency support for OBJECT libraries.
1 year ago
target_link_dependencies(crawl_test PRIVATE libdevilutionx_crawl)
target_link_dependencies(crawl_benchmark PRIVATE libdevilutionx_crawl)
data_file_test: Make it a standalone test Finally!
1 year ago
target_link_dependencies(data_file_test PRIVATE libdevilutionx_txtdata app_fatal_for_testing language_for_testing)
Split more things into libraries This does not fully address the issue of most everything being a giant library but it's a start. Note that the libraries are OBJECT libraries, so they may (and currently do) contain references to missing symbols. Also fixes the implementation of transitive dependency support for OBJECT libraries.
1 year ago
target_link_dependencies(dun_render_benchmark PRIVATE libdevilutionx_so)
target_link_dependencies(file_util_test PRIVATE libdevilutionx_file_util app_fatal_for_testing)
target_link_dependencies(format_int_test PRIVATE libdevilutionx_format_int language_for_testing)
target_link_dependencies(ini_test PRIVATE libdevilutionx_ini app_fatal_for_testing)
Make light render benchmark standalone
10 months ago
target_link_dependencies(light_render_benchmark PRIVATE libdevilutionx_light_render DevilutionX::SDL libdevilutionx_surface libdevilutionx_paths app_fatal_for_testing)
Use a k-d tree for palette blending Uses a k-d tree to quickly find the best match for a color when generating the palette blending lookup table. https://en.wikipedia.org/wiki/K-d_tree This is 3x faster than the previous naive approach: ``` Benchmark Time CPU Time Old Time New CPU Old CPU New ----------------------------------------------------------------------------------------------------------------------------------- BM_GenerateBlendedLookupTable_pvalue 0.0002 0.0002 U Test, Repetitions: 10 vs 10 BM_GenerateBlendedLookupTable_mean -0.7153 -0.7153 18402641 5239051 18399111 5238025 BM_GenerateBlendedLookupTable_median -0.7153 -0.7153 18403261 5239042 18398841 5237497 BM_GenerateBlendedLookupTable_stddev -0.2775 +0.3858 2257 1631 1347 1867 BM_GenerateBlendedLookupTable_cv +1.5379 +3.8677 0 0 0 0 OVERALL_GEOMEAN -0.7153 -0.7153 0 0 0 0 ``` The distribution is somewhat poor with just 3 levels, so this can be improved further. For example, here is the leaf size distribution in the cathedral: ``` r0.g0.b0: 88 r0.g0.b1: 10 r0.g1.b0: 2 r0.g1.b1: 32 r1.g0.b0: 27 r1.g0.b1: 4 r1.g1.b0: 12 r1.g1.b1: 81 ```
11 months ago
target_link_dependencies(palette_blending_test PRIVATE libdevilutionx_palette_blending DevilutionX::SDL libdevilutionx_strings GTest::gmock app_fatal_for_testing)
Palette KD-tree: Fix compilation speed Tricks the compiler into skipping expensive `uninit var analysis` (`-Wmaybe-uninitialized`) by using a struct with state rather than separate variables for `best` / `bestDiff`. This has no performance impact. Also optimizes lookup a bit further and moves some code that does not need to be inlined to the cpp file. ``` Benchmark Time CPU Time Old Time New CPU Old CPU New ----------------------------------------------------------------------------------------------------------------------------------- BM_GenerateBlendedLookupTable_pvalue 0.0002 0.0002 U Test, Repetitions: 10 vs 10 BM_GenerateBlendedLookupTable_mean +0.0237 +0.0237 2092090 2141601 2091732 2141291 BM_GenerateBlendedLookupTable_median +0.0237 +0.0237 2092104 2141662 2091669 2141319 BM_GenerateBlendedLookupTable_stddev -0.6414 -0.5834 664 238 538 224 BM_GenerateBlendedLookupTable_cv -0.6497 -0.5930 0 0 0 0 BM_BuildTree_pvalue 0.0002 0.0002 U Test, Repetitions: 10 vs 10 BM_BuildTree_mean +0.0410 +0.0410 4495 4679 4494 4678 BM_BuildTree_median +0.0403 +0.0402 4494 4675 4493 4674 BM_BuildTree_stddev +0.9515 +0.9359 7 14 7 14 BM_BuildTree_cv +0.8746 +0.8596 0 0 0 0 BM_FindNearestNeighbor_pvalue 0.0002 0.0002 U Test, Repetitions: 10 vs 10 BM_FindNearestNeighbor_mean -0.0399 -0.0398 1964257108 1885966812 1963954917 1885694336 BM_FindNearestNeighbor_median -0.0397 -0.0396 1963969748 1886074435 1963650984 1885803182 BM_FindNearestNeighbor_stddev -0.3380 -0.3443 1217360 805946 1225442 803469 BM_FindNearestNeighbor_cv -0.3105 -0.3171 0 0 0 0 OVERALL_GEOMEAN +0.0077 +0.0077 0 0 0 0 ```
8 months ago
target_link_dependencies(palette_blending_benchmark
PRIVATE
DevilutionX::SDL
libdevilutionx_palette_blending
libdevilutionx_palette_kd_tree
app_fatal_for_testing
)
Split more things into libraries This does not fully address the issue of most everything being a giant library but it's a start. Note that the libraries are OBJECT libraries, so they may (and currently do) contain references to missing symbols. Also fixes the implementation of transitive dependency support for OBJECT libraries.
1 year ago
target_link_dependencies(parse_int_test PRIVATE libdevilutionx_parse_int)
Untangle pathfinding dependencies 1. Makes `path.cpp` concerned solely with the pathfinding algorithm. 2. Turns `path_test` into a standalone test.
1 year ago
target_link_dependencies(path_test PRIVATE libdevilutionx_pathfinding libdevilutionx_direction app_fatal_for_testing)
Extract the vision algorithm to a separate library This allows us to test it without depending on all of DevilutionX. Also fixes all clang-tidy warnings in the algorithm.
1 year ago
target_link_dependencies(vision_test PRIVATE libdevilutionx_vision)
Add a pathfinding benchmark Example run: ``` $ tools/build_and_run_benchmark.py path_benchmark -------------------------------------------------------- Benchmark Time CPU Iterations -------------------------------------------------------- BM_SinglePath 2905 ns 2905 ns 241038 BM_Bridges 65951 ns 65948 ns 9785 BM_NoPath 131397 ns 131390 ns 5247 ```
1 year ago
target_link_dependencies(path_benchmark PRIVATE libdevilutionx_pathfinding app_fatal_for_testing)
More test untangling 1. Marks 3 more tests as standalone. 2. Renames `staticvector_test.cpp` to `static_vector_test.cpp`.
1 year ago
target_link_dependencies(random_test PRIVATE libdevilutionx_random)
target_link_dependencies(static_vector_test PRIVATE libdevilutionx_random app_fatal_for_testing)
Split more things into libraries This does not fully address the issue of most everything being a giant library but it's a start. Note that the libraries are OBJECT libraries, so they may (and currently do) contain references to missing symbols. Also fixes the implementation of transitive dependency support for OBJECT libraries.
1 year ago
target_link_dependencies(str_cat_test PRIVATE libdevilutionx_strings)
Untangle more dependencies This allows us to make `clx_render_benchmark` and `text_render_integration_test` standalone.
9 months ago
if(DEVILUTIONX_SCREENSHOT_FORMAT STREQUAL DEVILUTIONX_SCREENSHOT_FORMAT_PNG AND NOT USE_SDL1)
target_link_dependencies(text_render_integration_test
PRIVATE
DevilutionX::SDL
GTest::gmock
GTest::gtest
tl
app_fatal_for_testing
language_for_testing
libdevilutionx_primitive_render
libdevilutionx_strings
libdevilutionx_surface
libdevilutionx_surface_to_png
libdevilutionx_text_render
)
CMake: Improve asset copying
7 months ago
copy_files(
FILES
basic-colors.png
basic.png
horizontal_overflow.png
horizontal_overflow-colors.png
kerning_fit_spacing-colors.png
kerning_fit_spacing.png
kerning_fit_spacing__align_center-colors.png
kerning_fit_spacing__align_center.png
kerning_fit_spacing__align_center__newlines.png
kerning_fit_spacing__align_center__newlines_in_fmt-colors.png
kerning_fit_spacing__align_center__newlines_in_value-colors.png
kerning_fit_spacing__align_right-colors.png
kerning_fit_spacing__align_right.png
vertical_overflow.png
vertical_overflow-colors.png
CMake: Fix text_render_integration_test with make Turns out, `add_custom_target`'s `DEPENDS` argument can only refer to outputs of custom commands in the same directory (i.e. the same CMakeLists.txt scope). Interestingly, this worked with all generators except parallel make, so perhaps there some ongoing work in CMake to allow cross-directory `DEPENDS`. Works around this limitation by moving tests to the same scope (`CMakeLists.txt` file) as assets.
6 months ago
SRC_PREFIX test/fixtures/text_render_integration_test/
CMake: Improve asset copying
7 months ago
OUTPUT_DIR "${DEVILUTIONX_TEST_FIXTURES_OUTPUT_DIRECTORY}/text_render_integration_test"
OUTPUT_VARIABLE _text_render_integration_test_fixtures
)
add_custom_target(text_render_integration_test_resources
DEPENDS
"${DEVILUTIONX_ASSETS_OUTPUT_DIRECTORY}/fonts/12-00.clx"
"${DEVILUTIONX_ASSETS_OUTPUT_DIRECTORY}/fonts/goldui.trn"
"${DEVILUTIONX_ASSETS_OUTPUT_DIRECTORY}/fonts/golduis.trn"
"${DEVILUTIONX_ASSETS_OUTPUT_DIRECTORY}/fonts/grayuis.trn"
"${DEVILUTIONX_ASSETS_OUTPUT_DIRECTORY}/fonts/grayui.trn"
"${DEVILUTIONX_ASSETS_OUTPUT_DIRECTORY}/ui_art/diablo.pal"
${_text_render_integration_test_fixtures}
)
add_dependencies(text_render_integration_test text_render_integration_test_resources)
Fix compling tests with sdl1
11 months ago
endif()
Split more things into libraries This does not fully address the issue of most everything being a giant library but it's a start. Note that the libraries are OBJECT libraries, so they may (and currently do) contain references to missing symbols. Also fixes the implementation of transitive dependency support for OBJECT libraries.
1 year ago
target_link_dependencies(utf8_test PRIVATE libdevilutionx_utf8)
Turn utils/utf8 into a standalone library
2 years ago
CMake: Fix text_render_integration_test with make Turns out, `add_custom_target`'s `DEPENDS` argument can only refer to outputs of custom commands in the same directory (i.e. the same CMakeLists.txt scope). Interestingly, this worked with all generators except parallel make, so perhaps there some ongoing work in CMake to allow cross-directory `DEPENDS`. Works around this limitation by moving tests to the same scope (`CMakeLists.txt` file) as assets.
6 months ago
target_include_directories(writehero_test PRIVATE 3rdParty/PicoSHA2)