commit b64fbfec4dcd3f81c776198641b1fc71ac8d64a4
author Ben Clayton <bclayton@google.com> Wed Nov 20 14:29:15 2019 +0000
committer Ben Clayton <bclayton@google.com> Sat Nov 30 22:55:02 2019 +0000
tree 7ffe2806f04e6cd58e165c22ba436f96e518d4f1
parent 6e2ff45fa936ff77087852d22b1c910d2b3ab487

VkPipeline: Replace spirv-opt list with RegisterPerformancePasses()

The full list of optimization passes was taken from RegisterPerformancePasses().
Let's just call that instead of copying the list.
This way, we'll keep track of new optimization passes, or re-orderings that are deemed 'better' when updating SPIRV-Tools.

Bug: b/144832356
Change-Id: I90c69131b5e55c185892cefc2e5de8180b44ce9d
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/38454
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Chris Forbes <chrisforbes@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Ben Clayton <bclayton@google.com>

src/Vulkan/VkPipeline.cpp

diff --git a/src/Vulkan/VkPipeline.cpp b/src/Vulkan/VkPipeline.cpp
index 9a4f34f..9bd188b 100644
--- a/src/Vulkan/VkPipeline.cpp
+++ b/src/Vulkan/VkPipeline.cpp
@@ -194,40 +194,7 @@
 	}
 
 	// Full optimization list taken from spirv-opt.
-	opt.RegisterPass(spvtools::CreateWrapOpKillPass())
-		.RegisterPass(spvtools::CreateDeadBranchElimPass())
-		.RegisterPass(spvtools::CreateMergeReturnPass())
-		.RegisterPass(spvtools::CreateInlineExhaustivePass())
-		.RegisterPass(spvtools::CreateAggressiveDCEPass())
-		.RegisterPass(spvtools::CreatePrivateToLocalPass())
-		.RegisterPass(spvtools::CreateLocalSingleBlockLoadStoreElimPass())
-		.RegisterPass(spvtools::CreateLocalSingleStoreElimPass())
-		.RegisterPass(spvtools::CreateAggressiveDCEPass())
-		.RegisterPass(spvtools::CreateScalarReplacementPass())
-		.RegisterPass(spvtools::CreateLocalAccessChainConvertPass())
-		.RegisterPass(spvtools::CreateLocalSingleBlockLoadStoreElimPass())
-		.RegisterPass(spvtools::CreateLocalSingleStoreElimPass())
-		.RegisterPass(spvtools::CreateAggressiveDCEPass())
-		.RegisterPass(spvtools::CreateLocalMultiStoreElimPass())
-		.RegisterPass(spvtools::CreateAggressiveDCEPass())
-		.RegisterPass(spvtools::CreateCCPPass())
-		.RegisterPass(spvtools::CreateAggressiveDCEPass())
-		.RegisterPass(spvtools::CreateRedundancyEliminationPass())
-		.RegisterPass(spvtools::CreateCombineAccessChainsPass())
-		.RegisterPass(spvtools::CreateSimplificationPass())
-		.RegisterPass(spvtools::CreateVectorDCEPass())
-		.RegisterPass(spvtools::CreateDeadInsertElimPass())
-		.RegisterPass(spvtools::CreateDeadBranchElimPass())
-		.RegisterPass(spvtools::CreateSimplificationPass())
-		.RegisterPass(spvtools::CreateIfConversionPass())
-		.RegisterPass(spvtools::CreateCopyPropagateArraysPass())
-		.RegisterPass(spvtools::CreateReduceLoadSizePass())
-		.RegisterPass(spvtools::CreateAggressiveDCEPass())
-		.RegisterPass(spvtools::CreateBlockMergePass())
-		.RegisterPass(spvtools::CreateRedundancyEliminationPass())
-		.RegisterPass(spvtools::CreateDeadBranchElimPass())
-		.RegisterPass(spvtools::CreateBlockMergePass())
-		.RegisterPass(spvtools::CreateSimplificationPass());
+	opt.RegisterPerformancePasses();
 
 	std::vector<uint32_t> optimized;
 	opt.Run(code.data(), code.size(), &optimized);