| 1 |
diff --git a/src/Vulkan/VkPipeline.cpp b/src/Vulkan/VkPipeline.cpp |
| 2 |
index 86913ec72..3b35345af 100644 |
| 3 |
--- a/src/Vulkan/VkPipeline.cpp |
| 4 |
+++ b/src/Vulkan/VkPipeline.cpp |
| 5 |
@@ -71,7 +71,56 @@ std::vector<uint32_t> preprocessSpirv( |
| 6 |
if(optimize) |
| 7 |
{ |
| 8 |
// Full optimization list taken from spirv-opt. |
| 9 |
- opt.RegisterPerformancePasses(); |
| 10 |
+ |
| 11 |
+ // We have removed CreateRedundancyEliminationPass because it segfaults when encountering: |
| 12 |
+ // %389 = OpCompositeConstruct %7 %386 %387 %388 %86 |
| 13 |
+ // When inserting an entry into instruction_to_value_ (which is an unordered_map) |
| 14 |
+ // This could perhaps be investigated further with help from asan. |
| 15 |
+ |
| 16 |
+ using namespace spvtools; |
| 17 |
+ opt.RegisterPass(CreateWrapOpKillPass()) |
| 18 |
+ .RegisterPass(CreateDeadBranchElimPass()) |
| 19 |
+ .RegisterPass(CreateMergeReturnPass()) |
| 20 |
+ .RegisterPass(CreateInlineExhaustivePass()) |
| 21 |
+ .RegisterPass(CreateAggressiveDCEPass()) |
| 22 |
+ .RegisterPass(CreatePrivateToLocalPass()) |
| 23 |
+ .RegisterPass(CreateLocalSingleBlockLoadStoreElimPass()) |
| 24 |
+ .RegisterPass(CreateLocalSingleStoreElimPass()) |
| 25 |
+ .RegisterPass(CreateAggressiveDCEPass()) |
| 26 |
+ .RegisterPass(CreateScalarReplacementPass()) |
| 27 |
+ .RegisterPass(CreateLocalAccessChainConvertPass()) |
| 28 |
+ .RegisterPass(CreateLocalSingleBlockLoadStoreElimPass()) |
| 29 |
+ .RegisterPass(CreateLocalSingleStoreElimPass()) |
| 30 |
+ .RegisterPass(CreateAggressiveDCEPass()) |
| 31 |
+ .RegisterPass(CreateLocalMultiStoreElimPass()) |
| 32 |
+ .RegisterPass(CreateAggressiveDCEPass()) |
| 33 |
+ .RegisterPass(CreateCCPPass()) |
| 34 |
+ .RegisterPass(CreateAggressiveDCEPass()) |
| 35 |
+ .RegisterPass(CreateLoopUnrollPass(true)) |
| 36 |
+ .RegisterPass(CreateDeadBranchElimPass()) |
| 37 |
+ .RegisterPass(CreateRedundancyEliminationPass()) // workaround for SEGFAULT |
| 38 |
+ .RegisterPass(CreateCombineAccessChainsPass()) |
| 39 |
+ .RegisterPass(CreateSimplificationPass()) |
| 40 |
+ .RegisterPass(CreateScalarReplacementPass()) |
| 41 |
+ .RegisterPass(CreateLocalAccessChainConvertPass()) |
| 42 |
+ .RegisterPass(CreateLocalSingleBlockLoadStoreElimPass()) |
| 43 |
+ .RegisterPass(CreateLocalSingleStoreElimPass()) |
| 44 |
+ .RegisterPass(CreateAggressiveDCEPass()) |
| 45 |
+ .RegisterPass(CreateSSARewritePass()) |
| 46 |
+ .RegisterPass(CreateAggressiveDCEPass()) |
| 47 |
+ .RegisterPass(CreateVectorDCEPass()) |
| 48 |
+ .RegisterPass(CreateDeadInsertElimPass()) |
| 49 |
+ .RegisterPass(CreateDeadBranchElimPass()) |
| 50 |
+ .RegisterPass(CreateSimplificationPass()) |
| 51 |
+ .RegisterPass(CreateIfConversionPass()) |
| 52 |
+ .RegisterPass(CreateCopyPropagateArraysPass()) |
| 53 |
+ .RegisterPass(CreateReduceLoadSizePass()) |
| 54 |
+ .RegisterPass(CreateAggressiveDCEPass()) |
| 55 |
+ .RegisterPass(CreateBlockMergePass()) |
| 56 |
+ .RegisterPass(CreateRedundancyEliminationPass()) // workaround for SEGFAULT |
| 57 |
+ .RegisterPass(CreateDeadBranchElimPass()) |
| 58 |
+ .RegisterPass(CreateBlockMergePass()) |
| 59 |
+ .RegisterPass(CreateSimplificationPass()); |
| 60 |
} |
| 61 |
|
| 62 |
std::vector<uint32_t> optimized; |