SpirvShaderDebugger: Add flag for printing opcodes as they're executed

The `PRINT_EACH_EXECUTED_INSTRUCTION` preprocessor flag complements the existing `PRINT_EACH_PROCESSED_INSTRUCTION` flag to print each instruction before they are executed. This is exceptionally helpful when debugging the debugger. Bug: b/148401179 Change-Id: If35728f115d664c1dba63e625eefccac9d3140ce Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/42249 Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Tested-by: Ben Clayton <bclayton@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com>

SpirvShaderDebugger: Add flag for printing opcodes as they're executed
b8bae186 · Ben Clayton · b2d7dfff · b8bae186
Commit b8bae186 authored Mar 12, 2020 by Ben Clayton
Hide whitespace changes
Inline Side-by-side

Showing with 25 additions and 8 deletions

SpirvShaderDebugger.cpp src/Pipeline/SpirvShaderDebugger.cpp +25 -8

No files found.
--- a/src/Pipeline/SpirvShaderDebugger.cpp
+++ b/src/Pipeline/SpirvShaderDebugger.cpp
@@ -16,6 +16,8 @@
 // If enabled, each instruction will be printed before processing.
 #define PRINT_EACH_PROCESSED_INSTRUCTION 0
+// If enabled, each instruction will be printed before executing.
+#define PRINT_EACH_EXECUTED_INSTRUCTION 0
 #ifdef ENABLE_VK_DEBUGGER
@@ -1452,16 +1454,31 @@ void SpirvShader::dbgEndEmit(EmitState *state) const
 void SpirvShader::dbgBeginEmitInstruction(InsnIterator insn, EmitState *state) const
 {
 #	if PRINT_EACH_PROCESSED_INSTRUCTION
-	auto instruction = spvtools::spvInstructionBinaryToText(
+	{
-	    SPV_ENV_VULKAN_1_1,
+		auto instruction = spvtools::spvInstructionBinaryToText(
-	    insn.wordPointer(0),
+		    SPV_ENV_VULKAN_1_1,
-	    insn.wordCount(),
+		    insn.wordPointer(0),
-	    insns.data(),
+		    insn.wordCount(),
-	    insns.size(),
+		    insns.data(),
-	    SPV_BINARY_TO_TEXT_OPTION_NO_HEADER);
+		    insns.size(),
-	printf("%s\n", instruction.c_str());
+		    SPV_BINARY_TO_TEXT_OPTION_NO_HEADER);
+		printf("%s\n", instruction.c_str());
+	}
 #	endif  // PRINT_EACH_PROCESSED_INSTRUCTION
+#	if PRINT_EACH_EXECUTED_INSTRUCTION
+	{
+		auto instruction = spvtools::spvInstructionBinaryToText(
+		    SPV_ENV_VULKAN_1_1,
+		    insn.wordPointer(0),
+		    insn.wordCount(),
+		    insns.data(),
+		    insns.size(),
+		    SPV_BINARY_TO_TEXT_OPTION_NO_HEADER);
+		rr::Print("{0}\n", instruction);
+	}
+#	endif  // PRINT_EACH_EXECUTED_INSTRUCTION
 	if(extensionsImported.count(Extension::OpenCLDebugInfo100) == 0)
 	{
 		// We're emitting debugger logic for SPIR-V.