mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1394 from greg-lunarg/kg20

Browse Source 
Update spirv-tools known-good.
This commit is contained in:
John Kessenich 2018-05-31 18:31:18 -06:00 committed by GitHub
commit 32d3ec3199
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
SPIRV/GlslangToSpv.cpp
View File

@ -7024,18 +7024,18 @@ void GlslangToSpv(const glslang::TIntermediate& intermediate, std::vector<unsign
optimizer.RegisterPass(CreateLocalAccessChainConvertPass()); optimizer.RegisterPass(CreateLocalAccessChainConvertPass());
optimizer.RegisterPass(CreateLocalSingleBlockLoadStoreElimPass()); optimizer.RegisterPass(CreateLocalSingleBlockLoadStoreElimPass());
optimizer.RegisterPass(CreateLocalSingleStoreElimPass()); optimizer.RegisterPass(CreateLocalSingleStoreElimPass());
optimizer.RegisterPass(CreateSimplificationPass());
optimizer.RegisterPass(CreateAggressiveDCEPass()); optimizer.RegisterPass(CreateAggressiveDCEPass());
optimizer.RegisterPass(CreateInsertExtractElimPass()); optimizer.RegisterPass(CreateVectorDCEPass());
optimizer.RegisterPass(CreateDeadInsertElimPass()); optimizer.RegisterPass(CreateDeadInsertElimPass());
optimizer.RegisterPass(CreateAggressiveDCEPass()); optimizer.RegisterPass(CreateAggressiveDCEPass());
optimizer.RegisterPass(CreateCCPPass());
optimizer.RegisterPass(CreateSimplificationPass());
optimizer.RegisterPass(CreateDeadBranchElimPass()); optimizer.RegisterPass(CreateDeadBranchElimPass());
optimizer.RegisterPass(CreateCFGCleanupPass());
optimizer.RegisterPass(CreateBlockMergePass()); optimizer.RegisterPass(CreateBlockMergePass());
optimizer.RegisterPass(CreateLocalMultiStoreElimPass()); optimizer.RegisterPass(CreateLocalMultiStoreElimPass());
optimizer.RegisterPass(CreateIfConversionPass());
optimizer.RegisterPass(CreateSimplificationPass());
optimizer.RegisterPass(CreateAggressiveDCEPass()); optimizer.RegisterPass(CreateAggressiveDCEPass());
optimizer.RegisterPass(CreateInsertExtractElimPass()); optimizer.RegisterPass(CreateVectorDCEPass());
optimizer.RegisterPass(CreateDeadInsertElimPass()); optimizer.RegisterPass(CreateDeadInsertElimPass());
if (options->optimizeSize) { if (options->optimizeSize) {
optimizer.RegisterPass(CreateRedundancyEliminationPass()); optimizer.RegisterPass(CreateRedundancyEliminationPass());
@ -7043,6 +7043,7 @@ void GlslangToSpv(const glslang::TIntermediate& intermediate, std::vector<unsign
// optimizer.RegisterPass(CreateCommonUniformElimPass()); // optimizer.RegisterPass(CreateCommonUniformElimPass());
} }
optimizer.RegisterPass(CreateAggressiveDCEPass()); optimizer.RegisterPass(CreateAggressiveDCEPass());
optimizer.RegisterPass(CreateCFGCleanupPass());
if (!optimizer.Run(spirv.data(), spirv.size(), &spirv)) if (!optimizer.Run(spirv.data(), spirv.size(), &spirv))
return; return;

2
known_good.json
View File

@ -5,7 +5,7 @@
"site" : "github", "site" : "github",
"subrepo" : "KhronosGroup/SPIRV-Tools", "subrepo" : "KhronosGroup/SPIRV-Tools",
"subdir" : "External/spirv-tools", "subdir" : "External/spirv-tools",
"commit" : "a579e720a8d7805ec9ebf657a4c6fa67ec268f7e" "commit" : "545d6ca26d3beddcb8dc5dc363deb1544a2eeb87"
}, },
{ {
"name" : "spirv-tools/external/spirv-headers", "name" : "spirv-tools/external/spirv-headers",