replay: Serialize compute and transfer operations (#3058)

USAGE_android.md

@@ -800,6 +800,8 @@ usage: gfxrecon.py replay [-h] [-p LOCAL_FILE] [--version] [--log-level LEVEL]
                           [--serialize-queue-submissions]
                           [--replay-event-plugin-path PATH]
                           [--replay-event-plugin-params PARAMS]
+                          [--isolate-render-passes]
+                          [--serialize-compute-and-transfer]
                           [file]
 
 Launch the replay tool.
@@ -1043,6 +1045,11 @@ options:
                         Parameters to forward to the replay event plugin. The format
                         of the parameters is determined by the plugin and is not
                         interpreted by the replay tool. (forwarded to replay tool)
+  --isolate-render-passes
+                        Isolate render passes by splitting the command buffer into multiple submits.
+  --serialize-compute-and-transfer
+                        Prevent compute dispatches from overlapping adjacent transfer work by injecting a barrier before
+                        and after each dispatch. (forwarded to replay tool)
 ```
 
 The command will force-stop an active replay process before starting the replay

USAGE_desktop_Vulkan.md

@@ -639,6 +639,8 @@ gfxrecon-replay         [-h | --help] [--version] [--cpu-mask <binary-mask>] [--
                         [--wait-before-frame MILLISECONDS]
                         [--serialize-queue-submissions]
                         [--replay-event-plugin-path <path>] [--replay-event-plugin-params <params>]
+                        [--isolate-render-passes]
+                        [--serialize-compute-and-transfer]
 
 
 Required arguments:
@@ -904,6 +906,11 @@ Optional arguments:
               Parameters to forward to the replay event plugin. The format
               of the parameters is determined by the plugin and is not
               interpreted by the replay tool. (forwarded to replay tool)
+  --isolate-render-passes
+              Isolate render passes by splitting the command buffer into multiple submits.
+  --serialize-compute-and-transfer
+              Prevent compute dispatches from overlapping adjacent transfer work by injecting a barrier before and after
+              each dispatch.
 ```
 
 ### Frame Warm-Up

android/scripts/gfxrecon.py

@@ -155,6 +155,8 @@ def CreateReplayParser():
     parser.add_argument('--serialize-queue-submissions', action='store_true', default=False, help='Serialize submit entries within one vkQueueSubmit or vkQueueSubmit2 call by adding semaphores between consecutive submits during replay. (forwarded to replay tool)')
     parser.add_argument('--replay-event-plugin-path', metavar='PATH', help='Path to a replay event plugin library. If specified, the plugin will be loaded and used to process replay events. (forwarded to replay tool)')
     parser.add_argument('--replay-event-plugin-params', metavar='PARAMS', help='Parameters to forward to the replay event plugin. The format of the parameters is determined by the plugin and is not interpreted by the replay tool. (forwarded to replay tool)')
+    parser.add_argument('--isolate-render-passes', action='store_true', default=False, help='Isolate render passes by splitting the command buffer into multiple submits. (forwarded to replay tool)')
+    parser.add_argument('--serialize-compute-and-transfer', action='store_true', default=False, help='Prevent compute dispatches from overlapping adjacent transfer work by injecting a barrier before and after each dispatch. (forwarded to replay tool)')
 
     return parser
 
@@ -375,6 +377,12 @@ def MakeExtrasString(args):
         arg_list.append('--replay-event-plugin-params')
         arg_list.append('{}'.format(args.replay_event_plugin_params))
 
+    if args.isolate_render_passes:
+        arg_list.append('--isolate-render-passes')
+
+    if args.serialize_compute_and_transfer:
+        arg_list.append('--serialize-compute-and-transfer')
+
     if args.file:
         arg_list.append(args.file)
     elif not args.version:

android/test/test_apps/common/CMakeLists.txt

@@ -61,11 +61,13 @@ add_test_app(debug-utils)
 add_test_app(external-memory-fd-export)
 add_test_app(external-memory-fd-import)
 add_test_app(host-image-copy)
+add_test_app(isolate-render-passes)
 add_test_app(multisample-depth)
 add_test_app(pipeline-binaries)
 add_test_app(triangle)
 add_test_app(triangle-extra-device)
 add_test_app(shader-objects)
+add_test_app(serialize-compute-and-transfer)
 add_test_app(sparse-resources)
 add_test_app(wait-for-present)
 add_test_app(trigger-trimming)

android/test/test_apps/launcher/CMakeLists.txt

@@ -52,9 +52,11 @@ set(GFXRECON_TEST_LAUNCHER_LINK_LIBRARIES
     gfxrecon-testapp-acquired-image
     gfxrecon-testapp-debug-utils
     gfxrecon-testapp-host-image-copy
+    gfxrecon-testapp-isolate-render-passes
     gfxrecon-testapp-multisample-depth
     gfxrecon-testapp-pipeline-binaries
     gfxrecon-testapp-shader-objects
+    gfxrecon-testapp-serialize-compute-and-transfer
     gfxrecon-testapp-sparse-resources
     gfxrecon-testapp-triangle
     gfxrecon-testapp-triangle-extra-device

framework/decode/CMakeLists.txt

@@ -238,6 +238,8 @@ target_sources(gfxrecon_decode
                     ${CMAKE_CURRENT_LIST_DIR}/vulkan_referenced_block_consumer_base.cpp
                     ${CMAKE_CURRENT_LIST_DIR}/vulkan_remap_allocator.h
                     ${CMAKE_CURRENT_LIST_DIR}/vulkan_remap_allocator.cpp
+                    ${CMAKE_CURRENT_LIST_DIR}/vulkan_command_splitter.h
+                    ${CMAKE_CURRENT_LIST_DIR}/vulkan_command_splitter.cpp
                     ${CMAKE_CURRENT_LIST_DIR}/vulkan_replay_consumer_base.h
                     ${CMAKE_CURRENT_LIST_DIR}/vulkan_replay_consumer_base.cpp
                     ${CMAKE_CURRENT_LIST_DIR}/vulkan_replay_options.h