From: Jaebaek Seo Date: Thu, 14 May 2020 17:06:05 +0000 (-0400) Subject: Move to newer version of SPIRV-Tools X-Git-Tag: upstream/11.4.0~236 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=08a05bc2b9d10975a036d0c4d958cb55682f6322;p=platform%2Fupstream%2Fglslang.git Move to newer version of SPIRV-Tools * Update tests according to spirv-opt update We refactored function inlining pass of spirv-opt and it results in different numbering of result ids in SPIR-V code. This commit updates test cases to avoid a test failure according to the spirv-opt update. * Update known good --- diff --git a/Test/baseLegalResults/hlsl.aliasOpaque.frag.out b/Test/baseLegalResults/hlsl.aliasOpaque.frag.out index 887e4ac..41f0b09 100644 --- a/Test/baseLegalResults/hlsl.aliasOpaque.frag.out +++ b/Test/baseLegalResults/hlsl.aliasOpaque.frag.out @@ -1,7 +1,7 @@ hlsl.aliasOpaque.frag // Module Version 10000 // Generated by (magic number): 80008 -// Id's are bound by 87 +// Id's are bound by 89 Capability Shader 1: ExtInstImport "GLSL.std.450" @@ -38,11 +38,11 @@ hlsl.aliasOpaque.frag 62(@entryPointOutput): 61(ptr) Variable Output 4(main): 2 Function None 3 5: Label - 70: 6 Load 47(gss) - 72: 8 Load 51(gtex) - 84: 32 SampledImage 72 70 - 85: 11(fvec4) ImageSampleImplicitLod 84 37 - 86: 11(fvec4) VectorTimesScalar 85 54 - Store 62(@entryPointOutput) 86 + 71: 6 Load 47(gss) + 73: 8 Load 51(gtex) + 86: 32 SampledImage 73 71 + 87: 11(fvec4) ImageSampleImplicitLod 86 37 + 88: 11(fvec4) VectorTimesScalar 87 54 + Store 62(@entryPointOutput) 88 Return FunctionEnd diff --git a/Test/baseLegalResults/hlsl.flattenOpaque.frag.out b/Test/baseLegalResults/hlsl.flattenOpaque.frag.out index ad9e6c1..6b090b2 100644 --- a/Test/baseLegalResults/hlsl.flattenOpaque.frag.out +++ b/Test/baseLegalResults/hlsl.flattenOpaque.frag.out @@ -1,7 +1,7 @@ hlsl.flattenOpaque.frag // Module Version 10000 // Generated by (magic number): 80008 -// Id's are bound by 185 +// Id's are bound by 190 Capability Shader 1: ExtInstImport "GLSL.std.450" @@ -45,25 +45,25 @@ hlsl.flattenOpaque.frag 120(@entryPointOutput): 119(ptr) Variable Output 4(main): 2 Function None 3 5: Label - 134: 6 Load 82(s.s2D) - 158: 22 Load 38(tex) - 161: 45 SampledImage 158 134 - 162: 10(fvec4) ImageSampleImplicitLod 161 49 - 138: 6 Load 82(s.s2D) - 164: 22 Load 38(tex) - 167: 45 SampledImage 164 138 - 169: 10(fvec4) ImageSampleImplicitLod 167 49 - 142: 10(fvec4) FAdd 162 169 - 143: 6 Load 97(s2.s2D) - 145: 22 Load 100(s2.tex) - 175: 45 SampledImage 145 143 - 176: 10(fvec4) ImageSampleImplicitLod 175 49 - 149: 10(fvec4) FAdd 142 176 - 150: 6 Load 97(s2.s2D) - 152: 22 Load 100(s2.tex) - 182: 45 SampledImage 152 150 - 184: 10(fvec4) ImageSampleImplicitLod 182 49 - 156: 10(fvec4) FAdd 149 184 - Store 120(@entryPointOutput) 156 + 135: 6 Load 82(s.s2D) + 160: 22 Load 38(tex) + 163: 45 SampledImage 160 135 + 164: 10(fvec4) ImageSampleImplicitLod 163 49 + 139: 6 Load 82(s.s2D) + 167: 22 Load 38(tex) + 170: 45 SampledImage 167 139 + 172: 10(fvec4) ImageSampleImplicitLod 170 49 + 143: 10(fvec4) FAdd 164 172 + 144: 6 Load 97(s2.s2D) + 146: 22 Load 100(s2.tex) + 179: 45 SampledImage 146 144 + 180: 10(fvec4) ImageSampleImplicitLod 179 49 + 150: 10(fvec4) FAdd 143 180 + 151: 6 Load 97(s2.s2D) + 153: 22 Load 100(s2.tex) + 187: 45 SampledImage 153 151 + 189: 10(fvec4) ImageSampleImplicitLod 187 49 + 157: 10(fvec4) FAdd 150 189 + Store 120(@entryPointOutput) 157 Return FunctionEnd diff --git a/Test/baseLegalResults/hlsl.flattenOpaqueInit.vert.out b/Test/baseLegalResults/hlsl.flattenOpaqueInit.vert.out index 6ed8da2..126e13a 100644 --- a/Test/baseLegalResults/hlsl.flattenOpaqueInit.vert.out +++ b/Test/baseLegalResults/hlsl.flattenOpaqueInit.vert.out @@ -1,7 +1,7 @@ hlsl.flattenOpaqueInit.vert // Module Version 10000 // Generated by (magic number): 80008 -// Id's are bound by 134 +// Id's are bound by 139 Capability Shader 1: ExtInstImport "GLSL.std.450" @@ -37,18 +37,18 @@ hlsl.flattenOpaqueInit.vert 80(@entryPointOutput): 79(ptr) Variable Output 4(main): 2 Function None 3 5: Label - 90: 6 Load 43(g_tInputTexture_sampler) - 91: 8 Load 47(g_tInputTexture) - 111: 31 SampledImage 91 90 - 112: 11(fvec4) ImageSampleExplicitLod 111 36 Lod 37 - 115: 6 Load 43(g_tInputTexture_sampler) - 117: 8 Load 47(g_tInputTexture) - 125: 31 SampledImage 117 115 - 126: 11(fvec4) ImageSampleExplicitLod 125 36 Lod 37 - 99: 11(fvec4) FAdd 112 126 - 132: 31 SampledImage 91 90 - 133: 11(fvec4) ImageSampleExplicitLod 132 36 Lod 37 - 104: 11(fvec4) FAdd 99 133 - Store 80(@entryPointOutput) 104 + 91: 6 Load 43(g_tInputTexture_sampler) + 92: 8 Load 47(g_tInputTexture) + 113: 31 SampledImage 92 91 + 114: 11(fvec4) ImageSampleExplicitLod 113 36 Lod 37 + 118: 6 Load 43(g_tInputTexture_sampler) + 120: 8 Load 47(g_tInputTexture) + 129: 31 SampledImage 120 118 + 130: 11(fvec4) ImageSampleExplicitLod 129 36 Lod 37 + 100: 11(fvec4) FAdd 114 130 + 137: 31 SampledImage 92 91 + 138: 11(fvec4) ImageSampleExplicitLod 137 36 Lod 37 + 105: 11(fvec4) FAdd 100 138 + Store 80(@entryPointOutput) 105 Return FunctionEnd diff --git a/Test/baseLegalResults/hlsl.flattenOpaqueInitMix.vert.out b/Test/baseLegalResults/hlsl.flattenOpaqueInitMix.vert.out index 81ab5e6..03dc8dc 100644 --- a/Test/baseLegalResults/hlsl.flattenOpaqueInitMix.vert.out +++ b/Test/baseLegalResults/hlsl.flattenOpaqueInitMix.vert.out @@ -1,7 +1,7 @@ hlsl.flattenOpaqueInitMix.vert // Module Version 10000 // Generated by (magic number): 80008 -// Id's are bound by 97 +// Id's are bound by 99 Capability Shader 1: ExtInstImport "GLSL.std.450" @@ -33,13 +33,13 @@ hlsl.flattenOpaqueInitMix.vert 49: 7(float) Constant 1056964608 56: TypePointer Output 11(fvec4) 57(@entryPointOutput): 56(ptr) Variable Output - 96: 36(fvec2) ConstantComposite 49 49 + 98: 36(fvec2) ConstantComposite 49 49 4(main): 2 Function None 3 5: Label - 63: 6 Load 44(g_tInputTexture_sampler) - 64: 8 Load 47(g_tInputTexture) - 73: 28 SampledImage 64 63 - 79: 11(fvec4) ImageSampleExplicitLod 73 96 Lod 38 - Store 57(@entryPointOutput) 79 + 64: 6 Load 44(g_tInputTexture_sampler) + 65: 8 Load 47(g_tInputTexture) + 75: 28 SampledImage 65 64 + 81: 11(fvec4) ImageSampleExplicitLod 75 98 Lod 38 + Store 57(@entryPointOutput) 81 Return FunctionEnd diff --git a/Test/baseLegalResults/hlsl.flattenSubset.frag.out b/Test/baseLegalResults/hlsl.flattenSubset.frag.out index 562070d..68d1236 100644 --- a/Test/baseLegalResults/hlsl.flattenSubset.frag.out +++ b/Test/baseLegalResults/hlsl.flattenSubset.frag.out @@ -1,7 +1,7 @@ hlsl.flattenSubset.frag // Module Version 10000 // Generated by (magic number): 80008 -// Id's are bound by 66 +// Id's are bound by 67 Capability Shader 1: ExtInstImport "GLSL.std.450" @@ -40,10 +40,10 @@ hlsl.flattenSubset.frag 50(@entryPointOutput): 49(ptr) Variable Output 4(main): 2 Function None 3 5: Label - 57: 13 Load 21(samp) - 61: 31 Load 33(tex) - 64: 37 SampledImage 61 57 - 65: 7(fvec4) ImageSampleImplicitLod 64 41 - Store 50(@entryPointOutput) 65 + 58: 13 Load 21(samp) + 62: 31 Load 33(tex) + 65: 37 SampledImage 62 58 + 66: 7(fvec4) ImageSampleImplicitLod 65 41 + Store 50(@entryPointOutput) 66 Return FunctionEnd diff --git a/Test/baseLegalResults/hlsl.partialFlattenLocal.vert.out b/Test/baseLegalResults/hlsl.partialFlattenLocal.vert.out index f4c9c5a..75006da 100644 --- a/Test/baseLegalResults/hlsl.partialFlattenLocal.vert.out +++ b/Test/baseLegalResults/hlsl.partialFlattenLocal.vert.out @@ -1,7 +1,7 @@ hlsl.partialFlattenLocal.vert // Module Version 10000 // Generated by (magic number): 80008 -// Id's are bound by 158 +// Id's are bound by 159 Capability Shader 1: ExtInstImport "GLSL.std.450" @@ -38,44 +38,44 @@ hlsl.partialFlattenLocal.vert 83(pos): 82(ptr) Variable Input 85: TypePointer Output 7(fvec4) 86(@entryPointOutput): 85(ptr) Variable Output - 130: TypePointer Function 17 - 132: TypePointer Function 20 + 131: TypePointer Function 17 + 133: TypePointer Function 20 4(main): 2 Function None 3 5: Label - 133: 132(ptr) Variable Function - 131: 130(ptr) Variable Function + 134: 133(ptr) Variable Function + 132: 131(ptr) Variable Function 84: 7(fvec4) Load 83(pos) - 136: 34(ptr) AccessChain 131 25 - Store 136 33 - 137: 39(ptr) AccessChain 133 25 - Store 137 38 - Branch 100 - 100: Label - 157: 21(int) Phi 25 5 119 106 - 105: 54(bool) SLessThan 157 31 - LoopMerge 101 106 None - BranchConditional 105 106 101 - 106: Label - 138: 39(ptr) AccessChain 133 157 - 110: 18(fvec2) Load 138 - 139: 34(ptr) AccessChain 131 157 - 112: 14(fvec3) Load 139 - 113: 18(fvec2) VectorShuffle 112 112 0 1 - 114: 18(fvec2) FAdd 113 110 - 140: 34(ptr) AccessChain 131 157 - 116: 14(fvec3) Load 140 - 117: 14(fvec3) VectorShuffle 116 114 3 4 2 - Store 140 117 - 119: 21(int) IAdd 157 31 - Branch 100 + 137: 34(ptr) AccessChain 132 25 + Store 137 33 + 138: 39(ptr) AccessChain 134 25 + Store 138 38 + Branch 101 101: Label - 142: 17 Load 131 - 156: 14(fvec3) CompositeExtract 142 0 - 124: 6(float) CompositeExtract 156 0 - 125: 6(float) CompositeExtract 156 1 - 126: 6(float) CompositeExtract 156 2 - 127: 7(fvec4) CompositeConstruct 124 125 126 32 - 128: 7(fvec4) FAdd 84 127 - Store 86(@entryPointOutput) 128 + 158: 21(int) Phi 25 5 119 105 + 104: 54(bool) SLessThan 158 31 + LoopMerge 120 105 None + BranchConditional 104 105 120 + 105: Label + 139: 39(ptr) AccessChain 134 158 + 109: 18(fvec2) Load 139 + 140: 34(ptr) AccessChain 132 158 + 111: 14(fvec3) Load 140 + 112: 18(fvec2) VectorShuffle 111 111 0 1 + 113: 18(fvec2) FAdd 112 109 + 141: 34(ptr) AccessChain 132 158 + 115: 14(fvec3) Load 141 + 116: 14(fvec3) VectorShuffle 115 113 3 4 2 + Store 141 116 + 119: 21(int) IAdd 158 31 + Branch 101 + 120: Label + 143: 17 Load 132 + 157: 14(fvec3) CompositeExtract 143 0 + 125: 6(float) CompositeExtract 157 0 + 126: 6(float) CompositeExtract 157 1 + 127: 6(float) CompositeExtract 157 2 + 128: 7(fvec4) CompositeConstruct 125 126 127 32 + 129: 7(fvec4) FAdd 84 128 + Store 86(@entryPointOutput) 129 Return FunctionEnd diff --git a/Test/baseResults/hlsl.pp.line4.frag.out b/Test/baseResults/hlsl.pp.line4.frag.out index 1ddb98b..5531ac0 100644 --- a/Test/baseResults/hlsl.pp.line4.frag.out +++ b/Test/baseResults/hlsl.pp.line4.frag.out @@ -1,7 +1,7 @@ hlsl.pp.line4.frag // Module Version 10000 // Generated by (magic number): 80008 -// Id's are bound by 115 +// Id's are bound by 116 Capability Shader 2: ExtInstImport "GLSL.std.450" @@ -117,30 +117,30 @@ PS_OUTPUT MainPs ( PS_INPUT i ) Line 17 25 0 71: 8(fvec2) Load 70(i.vTextureCoords) Line 17 29 0 - 82: 24(ptr) AccessChain 21 23 - 83: 18(int) Load 82 - 84: 27(bool) INotEqual 83 28 - SelectionMerge 85 None - BranchConditional 84 86 87 + 83: 24(ptr) AccessChain 21 23 + 84: 18(int) Load 83 + 85: 27(bool) INotEqual 84 28 + SelectionMerge 92 None + BranchConditional 85 86 89 86: Label Line 32 1 0 - 88: 24(ptr) AccessChain 21 35 - 89: 18(int) Load 88 - Branch 85 - 87: Label + 87: 24(ptr) AccessChain 21 35 + 88: 18(int) Load 87 + Branch 92 + 89: Label Line 17 32 0 90: 24(ptr) AccessChain 21 39 91: 18(int) Load 90 - Branch 85 - 85: Label - 114: 18(int) Phi 89 86 91 87 + Branch 92 + 92: Label + 115: 18(int) Phi 88 86 91 89 Line 17 33 0 - 93: 50(ptr) AccessChain 48(g_tColor) 114 - 94: 44 Load 93 - 95: 53 Load 55(g_sAniso) - 96: 57 SampledImage 94 95 - 99: 11(fvec4) ImageSampleImplicitLod 96 71 + 94: 50(ptr) AccessChain 48(g_tColor) 115 + 95: 44 Load 94 + 96: 53 Load 55(g_sAniso) + 97: 57 SampledImage 95 96 + 100: 11(fvec4) ImageSampleImplicitLod 97 71 Line 17 25 0 - Store 74(@entryPointOutput.vColor) 99 + Store 74(@entryPointOutput.vColor) 100 Return FunctionEnd diff --git a/known_good.json b/known_good.json index 9cc8c44..0904252 100644 --- a/known_good.json +++ b/known_good.json @@ -5,7 +5,7 @@ "site" : "github", "subrepo" : "KhronosGroup/SPIRV-Tools", "subdir" : "External/spirv-tools", - "commit" : "fd8e130510a6b002b28eee5885a9505040a9bdc9" + "commit" : "bd0a2da946c3fb4c641acc4a0d53ee67653e200a" }, { "name" : "spirv-tools/external/spirv-headers",