VkPipeline: Add spirvopt MergeReturnPass

Fixes cases where functions were not being inlined. Tests: dEQP-VK.glsl.functions.control_flow.* Change-Id: Ia752517040f7529ec3b47adc75ec03646d183f6d Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/30214Tested-by: Ben Clayton <bclayton@google.com> Reviewed-by: Chris Forbes <chrisforbes@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com>

VkPipeline: Add spirvopt MergeReturnPass
139acaac · Ben Clayton · 05f27a34 · 139acaac
Commit 139acaac authored Apr 30, 2019 by Ben Clayton
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

VkPipeline.cpp src/Vulkan/VkPipeline.cpp +3 -0

No files found.
--- a/src/Vulkan/VkPipeline.cpp
+++ b/src/Vulkan/VkPipeline.cpp
@@ -174,6 +174,9 @@ std::vector<uint32_t> preprocessSpirv(
 		vk::trace("%s: %d:%d %s", category, int(p.line), int(p.column), m);
 	});

+
+	opt.RegisterPass(spvtools::CreateDeadBranchElimPass()); // Required for MergeReturnPass
+	opt.RegisterPass(spvtools::CreateMergeReturnPass());
 	opt.RegisterPass(spvtools::CreateInlineExhaustivePass());
 	opt.RegisterPass(spvtools::CreateEliminateDeadFunctionsPass());