Use line and column from node on DebugLexicalBlock.

* Fix bug in TestFixture.h, debug info gets enabled when nonsemantic debug info is requested.
This commit is contained in:
Sajjad Mirza 2024-10-04 11:11:27 -07:00 committed by GitHub
parent 48f63fe4b3
commit f69d2768e5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
21 changed files with 7746 additions and 6750 deletions

View file

@ -1,14 +1,14 @@
spv.debuginfo.implicit_br.glsl.frag
// Module Version 10000
// Generated by (magic number): 8000b
// Id's are bound by 194
// Id's are bound by 204
Capability Shader
Extension "SPV_KHR_non_semantic_info"
1: ExtInstImport "NonSemantic.Shader.DebugInfo.100"
3: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 14 "main" 186
EntryPoint Fragment 14 "main" 196
ExecutionMode 14 OriginUpperLeft
2: String "spv.debuginfo.implicit_br.glsl.frag"
8: String "uint"
@ -88,7 +88,7 @@ void main() {
50: String "int"
56: String "counter"
65: String "bool"
188: String "outx"
198: String "outx"
Name 14 "main"
Name 16 "test_if("
Name 26 "test_ifelse("
@ -96,8 +96,8 @@ void main() {
Name 36 "test_if_compound2("
Name 41 "test_switch("
Name 54 "counter"
Name 186 "outx"
Decorate 186(outx) Location 0
Name 196 "outx"
Decorate 196(outx) Location 0
4: TypeVoid
5: TypeFunction 4
7: TypeInt 32 0
@ -134,55 +134,65 @@ void main() {
64: TypeBool
66: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 65 10 25 12
67: 64(bool) ConstantFalse
70: 49(int) Constant 1
77: 7(int) Constant 10
71: 7(int) Constant 17
70: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 21(DebugLexicalBlock) 20 57 71 19
72: 49(int) Constant 1
79: 7(int) Constant 10
86: 7(int) Constant 14
89: 49(int) Constant 2
93: 7(int) Constant 17
97: 7(int) Constant 19
110: 7(int) Constant 24
114: 7(int) Constant 27
131: 7(int) Constant 35
135: 7(int) Constant 37
146: 7(int) Constant 42
151: 7(int) Constant 45
154: 7(int) Constant 46
156: 49(int) Constant 3
160: 7(int) Constant 48
165: 7(int) Constant 51
171: 7(int) Constant 54
174: 7(int) Constant 55
177: 7(int) Constant 56
180: 7(int) Constant 57
183: 7(int) Constant 58
184: TypePointer Output 49(int)
185: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 51 13 12
186(outx): 184(ptr) Variable Output
189: 7(int) Constant 59
187: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 188 51 20 189 12 22 188 186(outx) 57
193: 7(int) Constant 60
85: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 21(DebugLexicalBlock) 20 86 71 29
92: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 21(DebugLexicalBlock) 20 71 71 29
93: 49(int) Constant 2
100: 7(int) Constant 19
107: 7(int) Constant 23
108: 7(int) Constant 9
106: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 21(DebugLexicalBlock) 20 107 108 34
114: 7(int) Constant 24
113: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 21(DebugLexicalBlock) 20 114 35 106
121: 7(int) Constant 27
128: 7(int) Constant 31
127: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 21(DebugLexicalBlock) 20 128 108 39
133: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 21(DebugLexicalBlock) 20 10 35 127
141: 7(int) Constant 35
145: 7(int) Constant 37
156: 7(int) Constant 42
161: 7(int) Constant 45
164: 7(int) Constant 46
166: 49(int) Constant 3
170: 7(int) Constant 48
175: 7(int) Constant 51
181: 7(int) Constant 54
184: 7(int) Constant 55
187: 7(int) Constant 56
190: 7(int) Constant 57
193: 7(int) Constant 58
194: TypePointer Output 49(int)
195: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 51 13 12
196(outx): 194(ptr) Variable Output
199: 7(int) Constant 59
197: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 198 51 20 199 12 22 198 196(outx) 57
203: 7(int) Constant 60
14(main): 4 Function None 5
15: Label
59: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 22
60: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 24 24 12 12
Store 54(counter) 58
167: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 47
168: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 48 48 12 12
166: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 47 14(main)
170: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 171 171 12 12
169: 4 FunctionCall 16(test_if()
173: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 174 174 12 12
172: 4 FunctionCall 26(test_ifelse()
176: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 177 177 12 12
175: 4 FunctionCall 31(test_if_compound()
179: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 180 180 12 12
178: 4 FunctionCall 36(test_if_compound2()
182: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 183 183 12 12
181: 4 FunctionCall 41(test_switch()
191: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 189 189 12 12
190: 49(int) Load 54(counter)
Store 186(outx) 190
177: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 47
178: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 48 48 12 12
176: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 47 14(main)
180: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 181 181 12 12
179: 4 FunctionCall 16(test_if()
183: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 184 184 12 12
182: 4 FunctionCall 26(test_ifelse()
186: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 187 187 12 12
185: 4 FunctionCall 31(test_if_compound()
189: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 190 190 12 12
188: 4 FunctionCall 36(test_if_compound2()
192: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 193 193 12 12
191: 4 FunctionCall 41(test_switch()
201: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 199 199 12 12
200: 49(int) Load 54(counter)
Store 196(outx) 200
202: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 203 203 12 12
Return
FunctionEnd
16(test_if(): 4 Function None 5
@ -193,133 +203,133 @@ void main() {
SelectionMerge 69 None
BranchConditional 67 68 69
68: Label
72: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 19
73: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 57 57 12 12
71: 49(int) Load 54(counter)
74: 49(int) IAdd 71 70
Store 54(counter) 74
74: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 70
75: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 57 57 12 12
73: 49(int) Load 54(counter)
76: 49(int) IAdd 73 72
Store 54(counter) 76
Branch 69
69: Label
75: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 19
76: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 77 77 12 12
77: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 19
78: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 79 79 12 12
Return
FunctionEnd
26(test_ifelse(): 4 Function None 5
27: Label
79: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 29
80: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 30 30 12 12
78: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 29 26(test_ifelse()
SelectionMerge 82 None
BranchConditional 67 81 88
81: Label
84: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 29
85: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 86 86 12 12
83: 49(int) Load 54(counter)
87: 49(int) IAdd 83 70
Store 54(counter) 87
Branch 82
88: Label
91: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 29
92: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 93 93 12 12
90: 49(int) Load 54(counter)
94: 49(int) IAdd 90 89
Store 54(counter) 94
Branch 82
82: Label
95: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 29
96: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 97 97 12 12
81: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 29
82: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 30 30 12 12
80: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 29 26(test_ifelse()
SelectionMerge 84 None
BranchConditional 67 83 91
83: Label
88: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 85
89: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 86 86 12 12
87: 49(int) Load 54(counter)
90: 49(int) IAdd 87 72
Store 54(counter) 90
Branch 84
91: Label
95: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 92
96: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 71 71 12 12
94: 49(int) Load 54(counter)
97: 49(int) IAdd 94 93
Store 54(counter) 97
Branch 84
84: Label
98: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 29
99: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 100 100 12 12
Return
FunctionEnd
31(test_if_compound(): 4 Function None 5
32: Label
99: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 34
100: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 35 35 12 12
98: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 34 31(test_if_compound()
SelectionMerge 102 None
BranchConditional 67 101 102
101: Label
105: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 34
106: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 35 35 12 12
SelectionMerge 104 None
BranchConditional 67 103 104
103: Label
108: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 34
109: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 110 110 12 12
107: 49(int) Load 54(counter)
111: 49(int) IAdd 107 70
Store 54(counter) 111
Branch 104
102: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 34
103: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 35 35 12 12
101: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 34 31(test_if_compound()
SelectionMerge 105 None
BranchConditional 67 104 105
104: Label
Branch 102
102: Label
112: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 34
113: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 114 114 12 12
111: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 106
112: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 35 35 12 12
SelectionMerge 110 None
BranchConditional 67 109 110
109: Label
116: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 113
117: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 114 114 12 12
115: 49(int) Load 54(counter)
118: 49(int) IAdd 115 72
Store 54(counter) 118
Branch 110
110: Label
Branch 105
105: Label
119: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 34
120: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 121 121 12 12
Return
FunctionEnd
36(test_if_compound2(): 4 Function None 5
37: Label
116: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 39
117: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 40 40 12 12
115: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 39 36(test_if_compound2()
SelectionMerge 119 None
BranchConditional 67 118 119
118: Label
122: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 39
123: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 40 40 12 12
SelectionMerge 121 None
BranchConditional 67 120 121
120: Label
125: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 39
126: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 10 10 12 12
124: 49(int) Load 54(counter)
127: 49(int) IAdd 124 70
Store 54(counter) 127
Branch 121
121: Label
129: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 39
130: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 131 131 12 12
128: 49(int) Load 54(counter)
132: 49(int) IAdd 128 89
Store 54(counter) 132
Branch 119
119: Label
133: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 39
134: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 135 135 12 12
123: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 39
124: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 40 40 12 12
122: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 39 36(test_if_compound2()
SelectionMerge 126 None
BranchConditional 67 125 126
125: Label
131: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 127
132: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 40 40 12 12
SelectionMerge 130 None
BranchConditional 67 129 130
129: Label
135: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 133
136: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 10 10 12 12
134: 49(int) Load 54(counter)
137: 49(int) IAdd 134 72
Store 54(counter) 137
Branch 130
130: Label
139: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 127
140: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 141 141 12 12
138: 49(int) Load 54(counter)
142: 49(int) IAdd 138 93
Store 54(counter) 142
Branch 126
126: Label
143: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 39
144: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 145 145 12 12
Return
FunctionEnd
41(test_switch(): 4 Function None 5
42: Label
137: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 44
138: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 45 45 12 12
136: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 44 41(test_switch()
SelectionMerge 142 None
Switch 58 141
case 0: 139
case 1: 140
141: Label
158: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 44
159: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 160 160 12 12
157: 49(int) Load 54(counter)
161: 49(int) IAdd 157 156
Store 54(counter) 161
Branch 142
139: Label
144: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 44
145: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 146 146 12 12
143: 49(int) Load 54(counter)
147: 49(int) IAdd 143 70
Store 54(counter) 147
Branch 140
140: Label
149: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 44
150: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 151 151 12 12
148: 49(int) Load 54(counter)
152: 49(int) IAdd 148 89
Store 54(counter) 152
153: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 154 154 12 12
Branch 142
142: Label
163: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 44
164: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 165 165 12 12
147: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 44
148: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 45 45 12 12
146: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 44 41(test_switch()
SelectionMerge 152 None
Switch 58 151
case 0: 149
case 1: 150
151: Label
168: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 44
169: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 170 170 12 12
167: 49(int) Load 54(counter)
171: 49(int) IAdd 167 166
Store 54(counter) 171
Branch 152
149: Label
154: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 44
155: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 156 156 12 12
153: 49(int) Load 54(counter)
157: 49(int) IAdd 153 72
Store 54(counter) 157
Branch 150
150: Label
159: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 44
160: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 161 161 12 12
158: 49(int) Load 54(counter)
162: 49(int) IAdd 158 93
Store 54(counter) 162
163: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 164 164 12 12
Branch 152
152: Label
173: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 44
174: 4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 20 175 175 12 12
Return
FunctionEnd