Add a new set of GPU -> CPU replay test cases

We can now test traces generated on GPU on llvmpipe during our
test runs. This triggers some new and interesting errors,
fixing those later.

Author: per-mathisen-arm

CMakeLists.txt

@@ -269,11 +269,13 @@ endfunction()
 
 internal_test(tracing1)
 add_test(NAME trace_test_1_2 COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tracing1 1)
-add_test(NAME trace_test_1_0_replay COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -V tracing_1_2_0.vk)
-add_test(NAME trace_test_1_1_replay COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -V --no-dedicated tracing_1_2_1.vk)
-add_test(NAME trace_test_1_2_replay COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -V --heap 0 tracing_1_2_1.vk)
-add_test(NAME trace_test_2_1_replay COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -V -B tracing_1_2_0.vk)
-add_test(NAME trace_test_2_2_replay COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -V --no-multithreaded-io tracing_1_2_0.vk)
+add_test(NAME trace_test_1_0_replay_1 COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -V tracing_1_2_0.vk)
+add_test(NAME trace_test_1_0_replay_2 COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -V -B tracing_1_2_0.vk)
+add_test(NAME trace_test_1_0_replay_3 COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -V --no-multithreaded-io tracing_1_2_0.vk)
+add_test(NAME trace_test_1_0_replay_4 COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -C -V tracing_1_2_0.vk)
+add_test(NAME trace_test_1_1_replay_1 COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -V --no-dedicated tracing_1_2_1.vk)
+add_test(NAME trace_test_1_1_replay_2 COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -V --heap 0 tracing_1_2_1.vk)
+add_test(NAME trace_test_1_1_replay_3 COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -C -V tracing_1_2_1.vk)
 
 internal_test(tracing2)
 add_test(NAME trace_test_2_replay COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay --heap 0 tracing_2.vk)
@@ -292,6 +294,7 @@ set_tests_properties(trace_test_2_debug_log PROPERTIES ENVIRONMENT "LAVATUBE_DEB
 
 internal_test(tracing3)
 add_test(NAME trace_test_3_replay_mp COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -V tracing_3.vk)
+add_test(NAME trace_test_3_replay_mp_cpu COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -C -V tracing_3.vk)
 
 internal_test(tracing4)
 add_test(NAME trace_test_4_0_0 COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tracing4 -q 0 -m 0)
@@ -323,31 +326,38 @@ add_test(NAME trace_test_4_virtqueue_replay COMMAND ${CMAKE_CURRENT_BINARY_DIR}/
 
 internal_test(tracing5)
 add_test(NAME trace_test_5_replay COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -V tracing_5.vk)
+add_test(NAME trace_test_5_replay_cpu COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -C -V tracing_5.vk)
 
 internal_test(tracing6)
 add_test(NAME trace_test_6_replay COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -V tracing_6.vk)
+add_test(NAME trace_test_6_replay_cpu COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -C -V tracing_6.vk)
 
 internal_test(tracing7)
 add_test(NAME trace_test_7_replay COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -V tracing_7.vk)
+add_test(NAME trace_test_7_replay_cpu COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -C -V tracing_7.vk)
 
 internal_test(tracing_remap)
 add_test(NAME trace_test_remap_replay COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -V tracing_remap.vk)
+add_test(NAME trace_test_remap_replay_cpu COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -C -V tracing_remap.vk)
 add_test(NAME trace_test_remap_validate COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-tool -V tracing_remap.vk)
 add_test(NAME trace_test_remap_validate_remap COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-tool -V -r tracing_remap.vk)
 
 internal_test(tracing_remap_noncoherent)
 add_test(NAME trace_test_remap_noncoherent_replay COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -V tracing_remap_noncoherent.vk)
+add_test(NAME trace_test_remap_noncoherent_replay_cpu COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -C -V tracing_remap_noncoherent.vk)
 add_test(NAME trace_test_remap_noncoherent_validate COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-tool -V tracing_remap_noncoherent.vk)
 add_test(NAME trace_test_remap_noncoherent_validate_remap COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-tool -V -r tracing_remap_noncoherent.vk)
 
 internal_test(tracing_buffers)
 add_test(NAME trace_test_buffers_replay COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -V tracing_buffers.vk)
+add_test(NAME trace_test_buffers_replay_cpu COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -C -V tracing_buffers.vk)
 set_tests_properties(trace_test_buffers_replay PROPERTIES FIXTURES_REQUIRED tracing_buffers)
 add_test(NAME trace_test_buffers_validate COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-tool -V tracing_buffers.vk)
 set_tests_properties(trace_test_buffers_validate PROPERTIES FIXTURES_REQUIRED tracing_buffers)
 
 internal_test(tracing_alignment)
 add_test(NAME trace_test_alignment_replay COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -V tracing_alignment.vk)
+add_test(NAME trace_test_alignment_replay_cpu COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -C -V tracing_alignment.vk)
 set_tests_properties(trace_test_alignment_replay PROPERTIES FIXTURES_REQUIRED tracing_alignment)
 add_test(NAME trace_test_alignment_validate COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-tool -V tracing_alignment.vk)
 set_tests_properties(trace_test_alignment_validate PROPERTIES FIXTURES_REQUIRED tracing_alignment)
@@ -424,6 +434,10 @@ add_test(NAME replayer_vulkan_demo2 COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-rep
 add_test(NAME replayer_vkmark COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -B -w none -f 5 9 ${PROJECT_SOURCE_DIR}/traces/vkmark_cube.vk)
 add_test(NAME replayer_samples COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -B -w none -f 5 9 ${PROJECT_SOURCE_DIR}/traces/sample_hello_triangle.vk)
 add_test(NAME replayer_vkcube COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -B -w none -f 5 9 ${PROJECT_SOURCE_DIR}/traces/lunarg_vkcube.vk)
+add_test(NAME replayer_vulkan_demo_cpu COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -C -B -w none ${PROJECT_SOURCE_DIR}/traces/demo_computeraytracing.vk)
+add_test(NAME replayer_vkmark_cpu COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -C -B -w none ${PROJECT_SOURCE_DIR}/traces/vkmark_cube.vk)
+add_test(NAME replayer_samples_cpu COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -C -B -w none ${PROJECT_SOURCE_DIR}/traces/sample_hello_triangle.vk)
+add_test(NAME replayer_vkcube_cpu COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -C -B -w none ${PROJECT_SOURCE_DIR}/traces/lunarg_vkcube.vk)
 install(TARGETS lava-replay RUNTIME)
 
 # --- lava-tool ---
@@ -493,6 +507,8 @@ function(layer_test test_name test_exe)
 	set_tests_properties(layer_test_${ARGV0}_validate PROPERTIES FIXTURES_REQUIRED ${ARGV0})
 	add_test(NAME layer_test_${ARGV0}_replay COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -V vulkan_${ARGV0}.vk)
 	set_tests_properties(layer_test_${ARGV0}_replay PROPERTIES FIXTURES_REQUIRED ${ARGV0})
+	add_test(NAME layer_test_${ARGV0}_replay_cpu COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -C -V vulkan_${ARGV0}.vk)
+	set_tests_properties(layer_test_${ARGV0}_replay_cpu PROPERTIES FIXTURES_REQUIRED ${ARGV0})
 	add_test(NAME layer_test_${ARGV0}_replay_blackhole COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -V -B vulkan_${ARGV0}.vk)
 	set_tests_properties(layer_test_${ARGV0}_replay_blackhole PROPERTIES FIXTURES_REQUIRED ${ARGV0})
 	add_test(NAME layer_test_${ARGV0}_replay_blackhole_nonewsi COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lava-replay -V -B -w none vulkan_${ARGV0}.vk)