[Prototype] Add frame looping and profiling capabilities to gfxr replay

olehkuznetsov · olehkuznetsov · commit 227b79cdd228 · 2026-01-27T15:26:54.000Z
diff --git a/android/layer/build.gradle b/android/layer/build.gradle
@@ -40,6 +40,13 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+        debug {
+            externalNativeBuild {
+                cmake {
+                    arguments "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
+                }
+            }
+        }
     }
     externalNativeBuild {
         cmake {
diff --git a/android/tools/replay/build.gradle b/android/tools/replay/build.gradle
@@ -35,6 +35,13 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+        debug {
+            externalNativeBuild {
+                cmake {
+                    arguments "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
+                }
+            }
+        }
     }
     externalNativeBuild {
         cmake {
diff --git a/framework/decode/file_processor.cpp b/framework/decode/file_processor.cpp
@@ -266,8 +266,6 @@ bool FileProcessor::ProcessBlocks()
     BlockBuffer         block_buffer;
     bool                success = true;
 
-    int64_t frame_begin_offset = util::platform::FileTell(active_files_.find(file_stack_.back().filename)->second.fd);
-    int64_t frame_begin_block_index = block_index_;
 
     auto        err_handler = [this](BlockIOError err, const char* message) { HandleBlockReadError(err, message); };
     BlockParser block_parser(BlockParser::ErrorHandler{ err_handler }, pool_, compressor_.get());
@@ -277,80 +275,94 @@ bool FileProcessor::ProcessBlocks()
     ProcessVisitor  process_visitor(*this);
     DispatchVisitor dispatch_visitor(decoders_, annotation_handler_);
 
-//    while (success)
-//    {
-//        PrintBlockInfo();
-//        success = ContinueDecoding();
-//    }
+    int64_t frame_begin_offset = -1;
+    if (!file_stack_.empty() && file_stack_.back().active_file) {
+        frame_begin_offset = file_stack_.back().active_file->GetCurrentPos();
+    }
+    int64_t frame_begin_block_index = block_index_;
 
-    for(int frame_repeat_n = 0; frame_repeat_n < repeat_frame_n_times_ + 1; ++frame_repeat_n) {
-        if(frame_repeat_n > 0) {
+    for (uint32_t frame_repeat_n = 0; frame_repeat_n < repeat_frame_n_times_ + 1; ++frame_repeat_n)
+    {
+        if (frame_repeat_n > 0)
+        {
             SeekActiveFile(frame_begin_offset, util::platform::FileSeekSet);
             block_index_ = frame_begin_block_index;
-            success = true;
+            success      = true;
         }
+
         while (success)
         {
-            success = GetBlockBuffer(block_parser, block_buffer);
-
-            for (auto decoder : decoders_)
-            {
-                decoder->SetCurrentBlockIndex(block_index_);
-            }
+            PrintBlockInfo();
+            success = ContinueDecoding();
 
             if (success)
             {
-                if (SkipBlockProcessing())
+                success = GetBlockBuffer(block_parser, block_buffer);
+
+                for (auto decoder : decoders_)
                 {
-                    GFXRECON_CHECK_CONVERSION_DATA_LOSS(size_t, block_buffer.Header().size);
+                    decoder->SetCurrentBlockIndex(block_index_);
                 }
 
-                else
+                if (success)
                 {
-                    block_parser.SetBlockIndex(block_index_);
-                    block_parser.SetFrameNumber(current_frame_number_);
-                    // NOTE: upon successful parsing, the block_buffer block data has been moved to the
-                    // parsed_block, though the block header is still valid.
-                    ParsedBlock parsed_block = block_parser.ParseBlock(block_buffer);
-
-                    // NOTE: Visitable is either Ready or DeferredDecompression,
-                    //       Invalid, Unknown, and Skip are not Visitable
-                    if (parsed_block.IsVisitable())
+                    if (SkipBlockProcessing())
                     {
-                        // Deferred decompress failure implies a late uncovering of an invalid block.
-                        success = parsed_block.Decompress(block_parser); // Safe without testing block state.
-                        if (success)
+                        GFXRECON_CHECK_CONVERSION_DATA_LOSS(size_t, block_buffer.Header().size);
+                    }
+                    else
+                    {
+                        block_parser.SetBlockIndex(block_index_);
+                        block_parser.SetFrameNumber(current_frame_number_);
+                        // NOTE: upon successful parsing, the block_buffer block data has been moved to the
+                        // parsed_block, though the block header is still valid.
+                        ParsedBlock parsed_block = block_parser.ParseBlock(block_buffer);
+
+                        if (parsed_block.Holds<FrameEndMarkerArgs>())
                         {
-                            std::visit(process_visitor, parsed_block.GetArgs());
-                            success = process_visitor.IsSuccess();
+                             frame_begin_offset = file_stack_.back().active_file->GetCurrentPos();
+                             frame_begin_block_index = block_index_ + 1;
+                        }
+
+                        // NOTE: Visitable is either Ready or DeferredDecompression,
+                        //       Invalid, Unknown, and Skip are not Visitable
+                        if (parsed_block.IsVisitable())
+                        {
+                            // Deferred decompress failure implies a late uncovering of an invalid block.
+                            success = parsed_block.Decompress(block_parser); // Safe without testing block state.
                             if (success)
                             {
-                                std::visit(dispatch_visitor, parsed_block.GetArgs());
+                                std::visit(process_visitor, parsed_block.GetArgs());
+                                success = process_visitor.IsSuccess();
+                                if (success)
+                                {
+                                    std::visit(dispatch_visitor, parsed_block.GetArgs());
+                                }
                             }
                         }
-                    }
 
-                    // NOTE: Warnings for unknown/invalid blocks are handled in the BlockParser
+                        // NOTE: Warnings for unknown/invalid blocks are handled in the BlockParser
 
-                    if (process_visitor.IsFrameDelimiter())
-                    {
-                        // The ProcessVisitor (pre-dispatch) is not the right place to update the frame state, so do it
-                        // here
-                        UpdateEndFrameState();
-                        break;
+                        if (process_visitor.IsFrameDelimiter())
+                        {
+                            // The ProcessVisitor (pre-dispatch) is not the right place to update the frame state, so do
+                            // it here
+                            UpdateEndFrameState();
+                            break;
+                        }
                     }
                 }
-            }
-            else
-            {
 
-                success = HandleBlockEof("read", true);
+                else
+                {
+                    success = HandleBlockEof("read", true);
+                }
             }
             ++block_index_;
-            DecrementRemainingCommands();
+            if (frame_repeat_n == repeat_frame_n_times_) {
+                DecrementRemainingCommands();
+            }
         }
-
-        DecrementRemainingCommands();
     }
     return success;
 }
diff --git a/framework/decode/vulkan_replay_consumer_base.cpp b/framework/decode/vulkan_replay_consumer_base.cpp
@@ -80,6 +80,7 @@ bool frame_first_queue_submit = false;
 
 const size_t kMaxEventStatusRetries      = 16;
 
+
 const char kUnknownDeviceLabel[]  = "<Unknown>";
 const char kValidationLayerName[] = "VK_LAYER_KHRONOS_validation";
 
diff --git a/framework/util/file_input_stream.h b/framework/util/file_input_stream.h
@@ -59,6 +59,8 @@ class FStreamFileInputStream
     bool     PeekBytes(void* buffer, size_t bytes);
     DataSpan ReadSpan(const size_t bytes);
 
+    int64_t GetCurrentPos() const { return util::platform::FileTell(fd_); }
+
     explicit operator bool() const { return IsOpen(); }
 
   protected:
diff --git a/tools/replay/replay_settings.h b/tools/replay/replay_settings.h
@@ -32,9 +32,12 @@ const char kOptions[] =
     "screenshot-all,--onhb|--omit-null-hardware-buffers,--qamr|--quit-after-measurement-range,--fmr|--flush-"
     "measurement-range,--flush-inside-measurement-range,--vssb|--virtual-swapchain-skip-blit,--use-captured-swapchain-"
     "indices,--dcp,--discard-cached-psos,--use-colorspace-fallback,--use-cached-psos,--dx12-override-object-names,--"
-    "dx12-ags-inject-markers,--offscreen-swapchain-frame-boundary,--wait-before-present,--dump-resources-before-draw,"
-    "--dump-resources-modifiable-state-only,--pbi-all,--preload-measurement-range,--add-new-pipeline-caches,--"
-    "screenshot-ignore-FrameBoundaryANDROID,--deduplicate-device,--log-timestamps,--capture";
+    "dx12-ags-inject-markers,--offscreen-swapchain-frame-boundary,--wait-before-present,--render-pass-barrier,--dump-resources-before-draw,"
+    "--dump-resources-dump-depth-attachment,--dump-resources-dump-vertex-index-buffers,"
+    "--dump-resources-json-output-per-command,--dump-resources-dump-immutable-resources,"
+    "--dump-resources-dump-all-image-subresources,--dump-resources-dump-raw-images,--dump-resources-dump-"
+    "separate-alpha,--dump-resources-modifiable-state-only,--pbi-all,--preload-measurement-range,"
+    "--add-new-pipeline-caches,--screenshot-ignore-FrameBoundaryANDROID,--deduplicate-device,--log-timestamps,--capture";
 const char kArguments[] =
     "--log-level,--log-file,--cpu-mask,--gpu,--gpu-group,--pause-frame,--frame-repeats,--wsi,--surface-index,-m|--memory-translation,"
     "--replace-shaders,--screenshots,--screenshot-interval,--denied-messages,--allowed-messages,--screenshot-format,--"
diff --git a/tools/tool_settings.h b/tools/tool_settings.h
@@ -82,8 +82,8 @@ const char kOverrideGpuArgument[]                = "--gpu";
 const char kOverrideGpuGroupArgument[]           = "--gpu-group";
 const char kPausedOption[]                       = "--paused";
 const char kPauseFrameArgument[]                 = "--pause-frame";
-const char kRepeatFrameNTimesArgument[]          = "--frame-repeats";
 const char kCaptureOption[]                      = "--capture";
+const char kRepeatFrameNTimesArgument[]          = "--frame-repeats";
 const char kSkipFailedAllocationShortOption[]    = "--sfa";
 const char kSkipFailedAllocationLongOption[]     = "--skip-failed-allocations";
 const char kDiscardCachedPsosShortOption[]       = "--dcp";

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,13 @@ android {`
`40`	`40`	`minifyEnabled false`
`41`	`41`	`proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'`
`42`	`42`	`}`
	`43`	`+ debug {`
	`44`	`+ externalNativeBuild {`
	`45`	`+ cmake {`
	`46`	`+ arguments "-DCMAKE_BUILD_TYPE=RelWithDebInfo"`
	`47`	`+ }`
	`48`	`+ }`
	`49`	`+ }`
`43`	`50`	`}`
`44`	`51`	`externalNativeBuild {`
`45`	`52`	`cmake {`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,13 @@ android {`
`35`	`35`	`minifyEnabled false`
`36`	`36`	`proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'`
`37`	`37`	`}`
	`38`	`+ debug {`
	`39`	`+ externalNativeBuild {`
	`40`	`+ cmake {`
	`41`	`+ arguments "-DCMAKE_BUILD_TYPE=RelWithDebInfo"`
	`42`	`+ }`
	`43`	`+ }`
	`44`	`+ }`
`38`	`45`	`}`
`39`	`46`	`externalNativeBuild {`
`40`	`47`	`cmake {`