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

Update SPIRV-Tools known good.

Browse Source 
Also update spirv-opt recipes.
This commit is contained in:
GregF 2018-03-26 12:11:55 -06:00
parent 845860d565
commit eecb874c35
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SPIRV/GlslangToSpv.cpp
View File

@ -6725,19 +6725,24 @@ void GlslangToSpv(const glslang::TIntermediate& intermediate, std::vector<unsign
<< std::endl; << std::endl;
}); });
optimizer.RegisterPass(CreateMergeReturnPass());
optimizer.RegisterPass(CreateInlineExhaustivePass()); optimizer.RegisterPass(CreateInlineExhaustivePass());
optimizer.RegisterPass(CreateEliminateDeadFunctionsPass()); optimizer.RegisterPass(CreateEliminateDeadFunctionsPass());
optimizer.RegisterPass(CreateScalarReplacementPass()); optimizer.RegisterPass(CreateScalarReplacementPass());
optimizer.RegisterPass(CreateLocalAccessChainConvertPass()); optimizer.RegisterPass(CreateLocalAccessChainConvertPass());
optimizer.RegisterPass(CreateLocalSingleBlockLoadStoreElimPass()); optimizer.RegisterPass(CreateLocalSingleBlockLoadStoreElimPass());
optimizer.RegisterPass(CreateLocalSingleStoreElimPass()); optimizer.RegisterPass(CreateLocalSingleStoreElimPass());
optimizer.RegisterPass(CreateAggressiveDCEPass());
optimizer.RegisterPass(CreateInsertExtractElimPass()); optimizer.RegisterPass(CreateInsertExtractElimPass());
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(CreateCFGCleanupPass());
optimizer.RegisterPass(CreateBlockMergePass()); optimizer.RegisterPass(CreateBlockMergePass());
optimizer.RegisterPass(CreateLocalMultiStoreElimPass()); optimizer.RegisterPass(CreateLocalMultiStoreElimPass());
optimizer.RegisterPass(CreateAggressiveDCEPass());
optimizer.RegisterPass(CreateInsertExtractElimPass()); optimizer.RegisterPass(CreateInsertExtractElimPass());
optimizer.RegisterPass(CreateDeadInsertElimPass()); optimizer.RegisterPass(CreateDeadInsertElimPass());
if (options->optimizeSize) { if (options->optimizeSize) {

6
Test/baseLegalResults/hlsl.flattenOpaqueInitMix.vert.out
View File

@ -2,7 +2,7 @@ hlsl.flattenOpaqueInitMix.vert
WARNING: AST will form illegal SPIR-V; need to transform to legalize WARNING: AST will form illegal SPIR-V; need to transform to legalize
// Module Version 10000 // Module Version 10000
// Generated by (magic number): 80006 // Generated by (magic number): 80006
// Id's are bound by 80 // Id's are bound by 97
Capability Shader Capability Shader
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
@ -32,13 +32,13 @@ WARNING: AST will form illegal SPIR-V; need to transform to legalize
49: 7(float) Constant 1056964608 49: 7(float) Constant 1056964608
56: TypePointer Output 11(fvec4) 56: TypePointer Output 11(fvec4)
57(@entryPointOutput): 56(ptr) Variable Output 57(@entryPointOutput): 56(ptr) Variable Output
96: 36(fvec2) ConstantComposite 49 49
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
63: 6 Load 44(g_tInputTexture_sampler) 63: 6 Load 44(g_tInputTexture_sampler)
64: 8 Load 47(g_tInputTexture) 64: 8 Load 47(g_tInputTexture)
73: 28 SampledImage 64 63 73: 28 SampledImage 64 63
78: 36(fvec2) CompositeConstruct 49 49 79: 11(fvec4) ImageSampleExplicitLod 73 96 Lod 38
79: 11(fvec4) ImageSampleExplicitLod 73 78 Lod 38
Store 57(@entryPointOutput) 79 Store 57(@entryPointOutput) 79
Return Return
FunctionEnd FunctionEnd

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" : "46a9ec9d2312bc8f2a87810614d06c721ea3121c" "commit" : "2e644e45785bb221294c32bf02a4ac867de49dc4"
}, },
{ {
"name" : "spirv-tools/external/spirv-headers", "name" : "spirv-tools/external/spirv-headers",