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

AST: dump attributes along with control flow.

Browse Source
This commit is contained in:
John Kessenich 2018-01-31 08:23:01 -07:00
parent a2858d9bdd
commit 304765681b
10 changed files with 48 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Test/baseResults/460.frag.out
View File

@ -38,7 +38,7 @@ ERROR: node is still EOpNull!
0:22 'i' ( temp int) 0:22 'i' ( temp int)
0:22 Constant: 0:22 Constant:
0:22 0 (const int) 0:22 0 (const int)
0:22 Loop with condition tested first 0:22 Loop with condition tested first: Dependency 4
0:22 Loop Condition 0:22 Loop Condition
0:22 Compare Less Than ( temp bool) 0:22 Compare Less Than ( temp bool)
0:22 'i' ( temp int) 0:22 'i' ( temp int)
@ -48,7 +48,7 @@ ERROR: node is still EOpNull!
0:22 Loop Terminal Expression 0:22 Loop Terminal Expression
0:22 Pre-Increment ( temp int) 0:22 Pre-Increment ( temp int)
0:22 'i' ( temp int) 0:22 'i' ( temp int)
0:23 Test condition and select ( temp void) 0:23 Test condition and select ( temp void): Flatten
0:23 Condition 0:23 Condition
0:23 Constant: 0:23 Constant:
0:23 true (const bool) 0:23 true (const bool)
@ -56,7 +56,7 @@ ERROR: node is still EOpNull!
0:28 Function Definition: attExt( ( global void) 0:28 Function Definition: attExt( ( global void)
0:28 Function Parameters: 0:28 Function Parameters:
0:30 Sequence 0:30 Sequence
0:30 Loop with condition not tested first 0:30 Loop with condition not tested first: Dependency -3
0:30 Loop Condition 0:30 Loop Condition
0:30 Constant: 0:30 Constant:
0:30 true (const bool) 0:30 true (const bool)

4
Test/baseResults/hlsl.attribute.expression.comp.out
View File

@ -10,7 +10,7 @@ local_size = (4, 6, 8)
0:11 'x' ( temp int) 0:11 'x' ( temp int)
0:11 Constant: 0:11 Constant:
0:11 0 (const int) 0:11 0 (const int)
0:11 Loop with condition tested first 0:11 Loop with condition tested first: Unroll
0:11 Loop Condition 0:11 Loop Condition
0:11 Compare Less Than ( temp bool) 0:11 Compare Less Than ( temp bool)
0:11 'x' ( temp int) 0:11 'x' ( temp int)
@ -53,7 +53,7 @@ local_size = (4, 6, 8)
0:11 'x' ( temp int) 0:11 'x' ( temp int)
0:11 Constant: 0:11 Constant:
0:11 0 (const int) 0:11 0 (const int)
0:11 Loop with condition tested first 0:11 Loop with condition tested first: Unroll
0:11 Loop Condition 0:11 Loop Condition
0:11 Compare Less Than ( temp bool) 0:11 Compare Less Than ( temp bool)
0:11 'x' ( temp int) 0:11 'x' ( temp int)

4
Test/baseResults/hlsl.attribute.frag.out
View File

@ -6,7 +6,7 @@ gl_FragCoord origin is upper left
0:2 Function Parameters: 0:2 Function Parameters:
0:2 'input' ( in 4-component vector of float) 0:2 'input' ( in 4-component vector of float)
0:? Sequence 0:? Sequence
0:11 Test condition and select ( temp void) 0:11 Test condition and select ( temp void): DontFlatten
0:11 Condition 0:11 Condition
0:11 Constant: 0:11 Constant:
0:11 false (const bool) 0:11 false (const bool)
@ -33,7 +33,7 @@ gl_FragCoord origin is upper left
0:2 Function Parameters: 0:2 Function Parameters:
0:2 'input' ( in 4-component vector of float) 0:2 'input' ( in 4-component vector of float)
0:? Sequence 0:? Sequence
0:11 Test condition and select ( temp void) 0:11 Test condition and select ( temp void): DontFlatten
0:11 Condition 0:11 Condition
0:11 Constant: 0:11 Constant:
0:11 false (const bool) 0:11 false (const bool)

8
Test/baseResults/hlsl.doLoop.frag.out
View File

@ -6,12 +6,12 @@ gl_FragCoord origin is upper left
0:2 Function Parameters: 0:2 Function Parameters:
0:2 'input' ( in float) 0:2 'input' ( in float)
0:? Sequence 0:? Sequence
0:3 Loop with condition not tested first 0:3 Loop with condition not tested first: Unroll
0:3 Loop Condition 0:3 Loop Condition
0:3 Constant: 0:3 Constant:
0:3 false (const bool) 0:3 false (const bool)
0:3 No loop body 0:3 No loop body
0:4 Loop with condition not tested first 0:4 Loop with condition not tested first: Unroll
0:4 Loop Condition 0:4 Loop Condition
0:4 Constant: 0:4 Constant:
0:4 false (const bool) 0:4 false (const bool)
@ -80,12 +80,12 @@ gl_FragCoord origin is upper left
0:2 Function Parameters: 0:2 Function Parameters:
0:2 'input' ( in float) 0:2 'input' ( in float)
0:? Sequence 0:? Sequence
0:3 Loop with condition not tested first 0:3 Loop with condition not tested first: Unroll
0:3 Loop Condition 0:3 Loop Condition
0:3 Constant: 0:3 Constant:
0:3 false (const bool) 0:3 false (const bool)
0:3 No loop body 0:3 No loop body
0:4 Loop with condition not tested first 0:4 Loop with condition not tested first: Unroll
0:4 Loop Condition 0:4 Loop Condition
0:4 Constant: 0:4 Constant:
0:4 false (const bool) 0:4 false (const bool)

4
Test/baseResults/hlsl.forLoop.frag.out
View File

@ -17,7 +17,7 @@ gl_FragCoord origin is upper left
0:4 No loop condition 0:4 No loop condition
0:4 No loop body 0:4 No loop body
0:? Sequence 0:? Sequence
0:5 Loop with condition tested first 0:5 Loop with condition tested first: Unroll
0:5 Loop Condition 0:5 Loop Condition
0:5 any ( temp bool) 0:5 any ( temp bool)
0:5 NotEqual ( temp 4-component vector of bool) 0:5 NotEqual ( temp 4-component vector of bool)
@ -220,7 +220,7 @@ gl_FragCoord origin is upper left
0:4 No loop condition 0:4 No loop condition
0:4 No loop body 0:4 No loop body
0:? Sequence 0:? Sequence
0:5 Loop with condition tested first 0:5 Loop with condition tested first: Unroll
0:5 Loop Condition 0:5 Loop Condition
0:5 any ( temp bool) 0:5 any ( temp bool)
0:5 NotEqual ( temp 4-component vector of bool) 0:5 NotEqual ( temp 4-component vector of bool)

4
Test/baseResults/hlsl.if.frag.out
View File

@ -42,7 +42,7 @@ gl_FragCoord origin is upper left
0:14 'input' ( in 4-component vector of float) 0:14 'input' ( in 4-component vector of float)
0:14 'input' ( in 4-component vector of float) 0:14 'input' ( in 4-component vector of float)
0:14 true case is null 0:14 true case is null
0:19 Test condition and select ( temp void) 0:19 Test condition and select ( temp void): Flatten
0:19 Condition 0:19 Condition
0:19 all ( temp bool) 0:19 all ( temp bool)
0:19 Equal ( temp 4-component vector of bool) 0:19 Equal ( temp 4-component vector of bool)
@ -152,7 +152,7 @@ gl_FragCoord origin is upper left
0:14 'input' ( in 4-component vector of float) 0:14 'input' ( in 4-component vector of float)
0:14 'input' ( in 4-component vector of float) 0:14 'input' ( in 4-component vector of float)
0:14 true case is null 0:14 true case is null
0:19 Test condition and select ( temp void) 0:19 Test condition and select ( temp void): Flatten
0:19 Condition 0:19 Condition
0:19 all ( temp bool) 0:19 all ( temp bool)
0:19 Equal ( temp 4-component vector of bool) 0:19 Equal ( temp 4-component vector of bool)

8
Test/baseResults/hlsl.loopattr.frag.out
View File

@ -10,7 +10,7 @@ gl_FragCoord origin is upper left
0:5 'x' ( temp int) 0:5 'x' ( temp int)
0:5 Constant: 0:5 Constant:
0:5 0 (const int) 0:5 0 (const int)
0:5 Loop with condition tested first 0:5 Loop with condition tested first: Unroll
0:5 Loop Condition 0:5 Loop Condition
0:5 Compare Less Than ( temp bool) 0:5 Compare Less Than ( temp bool)
0:5 'x' ( temp int) 0:5 'x' ( temp int)
@ -25,7 +25,7 @@ gl_FragCoord origin is upper left
0:8 'y' ( temp int) 0:8 'y' ( temp int)
0:8 Constant: 0:8 Constant:
0:8 0 (const int) 0:8 0 (const int)
0:8 Loop with condition tested first 0:8 Loop with condition tested first: DontUnroll
0:8 Loop Condition 0:8 Loop Condition
0:8 Compare Less Than ( temp bool) 0:8 Compare Less Than ( temp bool)
0:8 'y' ( temp int) 0:8 'y' ( temp int)
@ -80,7 +80,7 @@ gl_FragCoord origin is upper left
0:5 'x' ( temp int) 0:5 'x' ( temp int)
0:5 Constant: 0:5 Constant:
0:5 0 (const int) 0:5 0 (const int)
0:5 Loop with condition tested first 0:5 Loop with condition tested first: Unroll
0:5 Loop Condition 0:5 Loop Condition
0:5 Compare Less Than ( temp bool) 0:5 Compare Less Than ( temp bool)
0:5 'x' ( temp int) 0:5 'x' ( temp int)
@ -95,7 +95,7 @@ gl_FragCoord origin is upper left
0:8 'y' ( temp int) 0:8 'y' ( temp int)
0:8 Constant: 0:8 Constant:
0:8 0 (const int) 0:8 0 (const int)
0:8 Loop with condition tested first 0:8 Loop with condition tested first: DontUnroll
0:8 Loop Condition 0:8 Loop Condition
0:8 Compare Less Than ( temp bool) 0:8 Compare Less Than ( temp bool)
0:8 'y' ( temp int) 0:8 'y' ( temp int)

4
Test/baseResults/hlsl.switch.frag.out
View File

@ -36,7 +36,7 @@ gl_FragCoord origin is upper left
0:17 Pre-Decrement ( temp 4-component vector of float) 0:17 Pre-Decrement ( temp 4-component vector of float)
0:17 'input' ( in 4-component vector of float) 0:17 'input' ( in 4-component vector of float)
0:18 Branch: Break 0:18 Branch: Break
0:21 switch 0:21 switch: DontFlatten
0:21 condition 0:21 condition
0:21 'c' ( in int) 0:21 'c' ( in int)
0:21 body 0:21 body
@ -186,7 +186,7 @@ gl_FragCoord origin is upper left
0:17 Pre-Decrement ( temp 4-component vector of float) 0:17 Pre-Decrement ( temp 4-component vector of float)
0:17 'input' ( in 4-component vector of float) 0:17 'input' ( in 4-component vector of float)
0:18 Branch: Break 0:18 Branch: Break
0:21 switch 0:21 switch: DontFlatten
0:21 condition 0:21 condition
0:21 'c' ( in int) 0:21 'c' ( in int)
0:21 body 0:21 body

4
Test/baseResults/hlsl.whileLoop.frag.out
View File

@ -21,7 +21,7 @@ gl_FragCoord origin is upper left
0:4 Constant: 0:4 Constant:
0:4 false (const bool) 0:4 false (const bool)
0:4 No loop body 0:4 No loop body
0:5 Loop with condition tested first 0:5 Loop with condition tested first: Unroll
0:5 Loop Condition 0:5 Loop Condition
0:5 Constant: 0:5 Constant:
0:5 false (const bool) 0:5 false (const bool)
@ -71,7 +71,7 @@ gl_FragCoord origin is upper left
0:4 Constant: 0:4 Constant:
0:4 false (const bool) 0:4 false (const bool)
0:4 No loop body 0:4 No loop body
0:5 Loop with condition tested first 0:5 Loop with condition tested first: Unroll
0:5 Loop Condition 0:5 Loop Condition
0:5 Constant: 0:5 Constant:
0:5 false (const bool) 0:5 false (const bool)

28
glslang/MachineIndependent/intermOut.cpp
View File

@ -817,7 +817,13 @@ bool TOutputTraverser::visitSelection(TVisit /* visit */, TIntermSelection* node
OutputTreeText(out, node, depth); OutputTreeText(out, node, depth);
out.debug << "Test condition and select"; out.debug << "Test condition and select";
out.debug << " (" << node->getCompleteString() << ")\n"; out.debug << " (" << node->getCompleteString() << ")";
if (node->getFlatten())
out.debug << ": Flatten";
if (node->getDontFlatten())
out.debug << ": DontFlatten";
out.debug << "\n";
++depth; ++depth;
@ -979,7 +985,17 @@ bool TOutputTraverser::visitLoop(TVisit /* visit */, TIntermLoop* node)
out.debug << "Loop with condition "; out.debug << "Loop with condition ";
if (! node->testFirst()) if (! node->testFirst())
out.debug << "not "; out.debug << "not ";
out.debug << "tested first\n"; out.debug << "tested first";
if (node->getUnroll())
out.debug << ": Unroll";
if (node->getDontUnroll())
out.debug << ": DontUnroll";
if (node->getLoopDependency()) {
out.debug << ": Dependency ";
out.debug << node->getLoopDependency();
}
out.debug << "\n";
++depth; ++depth;
@ -1040,7 +1056,13 @@ bool TOutputTraverser::visitSwitch(TVisit /* visit */, TIntermSwitch* node)
TInfoSink& out = infoSink; TInfoSink& out = infoSink;
OutputTreeText(out, node, depth); OutputTreeText(out, node, depth);
out.debug << "switch\n"; out.debug << "switch";
if (node->getFlatten())
out.debug << ": Flatten";
if (node->getDontFlatten())
out.debug << ": DontFlatten";
out.debug << "\n";
OutputTreeText(out, node, depth); OutputTreeText(out, node, depth);
out.debug << "condition\n"; out.debug << "condition\n";