encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-09 13:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

writer/hlsl: Inline fallthrough case statements

Browse Source 
FXC does not support fallthrough case statements (DXC does).

Fixed: tint:1082
Change-Id: I82e1add5455e438056259f773f34bf9db05970b4
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/60480
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Ben Clayton <bclayton@chromium.org>
Auto-Submit: Ben Clayton <bclayton@google.com>
Reviewed-by: David Neto <dneto@google.com>
This commit is contained in:
Ben Clayton
2021-08-02 12:58:19 +00:00
committed by Tint LUCI CQ
parent 8ebff3dc85
commit c0fbce65d8
43 changed files with 385 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/unittest/reader/spirv/SpvParserCFGTest_ClassifyCFGEdges_Fallthrough_CaseTailToCase.spvasm.expected.hlsl
View File

@@ -4,6 +4,9 @@ void main_1() {
switch(42u) {
case 20u: {
/* fallthrough */
{
}
break;
}
case 40u: {
break;

3
test/unittest/reader/spirv/SpvParserCFGTest_ClassifyCFGEdges_Fallthrough_CaseTailToDefaultNotMerge.spvasm.expected.hlsl
View File

@@ -4,6 +4,9 @@ void main_1() {
switch(42u) {
case 20u: {
/* fallthrough */
{
}
break;
}
default: {
break;

3
test/unittest/reader/spirv/SpvParserCFGTest_ClassifyCFGEdges_Fallthrough_DefaultToCase.spvasm.expected.hlsl
View File

@@ -4,6 +4,9 @@ void main_1() {
switch(42u) {
default: {
/* fallthrough */
{
}
break;
}
case 40u: {
break;

7
test/unittest/reader/spirv/SpvParserCFGTest_ComputeBlockOrder_Nest_IfBreak_In_SwitchCase.spvasm.expected.hlsl
View File

@@ -10,6 +10,13 @@ void main_1() {
}
default: {
/* fallthrough */
{
if (false) {
} else {
break;
}
}
break;
}
case 50u: {
if (false) {

13
test/unittest/reader/spirv/SpvParserCFGTest_ComputeBlockOrder_Nest_IfFallthrough_In_SwitchCase.spvasm.expected.hlsl
View File

@@ -9,9 +9,22 @@ void main_1() {
break;
}
/* fallthrough */
{
/* fallthrough */
}
{
if (false) {
}
}
break;
}
default: {
/* fallthrough */
{
if (false) {
}
}
break;
}
case 50u: {
if (false) {

5
test/unittest/reader/spirv/SpvParserCFGTest_ComputeBlockOrder_Nest_If_In_SwitchCase.spvasm.expected.hlsl
View File

@@ -9,6 +9,11 @@ void main_1() {
}
default: {
/* fallthrough */
{
if (false) {
}
}
break;
}
case 50u: {
if (false) {

6
test/unittest/reader/spirv/SpvParserCFGTest_ComputeBlockOrder_RespectSwitchCaseFallthrough.spvasm.expected.hlsl
View File

@@ -4,12 +4,18 @@ void main_1() {
switch(42u) {
case 30u: {
/* fallthrough */
{
}
break;
}
case 50u: {
break;
}
case 20u: {
/* fallthrough */
{
}
break;
}
case 40u: {
break;

9
test/unittest/reader/spirv/SpvParserCFGTest_ComputeBlockOrder_RespectSwitchCaseFallthrough_FromCaseToDefaultToCase.spvasm.expected.hlsl
View File

@@ -4,9 +4,18 @@ void main_1() {
switch(42u) {
case 20u: {
/* fallthrough */
{
/* fallthrough */
}
{
}
break;
}
default: {
/* fallthrough */
{
}
break;
}
case 30u: {
break;

9
test/unittest/reader/spirv/SpvParserCFGTest_ComputeBlockOrder_RespectSwitchCaseFallthrough_FromDefault.spvasm.expected.hlsl
View File

@@ -7,9 +7,18 @@ void main_1() {
}
default: {
/* fallthrough */
{
/* fallthrough */
}
{
}
break;
}
case 30u: {
/* fallthrough */
{
}
break;
}
case 40u: {
break;

6
test/unittest/reader/spirv/SpvParserCFGTest_ComputeBlockOrder_RespectSwitchCaseFallthrough_Interleaved.spvasm.expected.hlsl
View File

@@ -4,12 +4,18 @@ void main_1() {
switch(42u) {
case 30u: {
/* fallthrough */
{
}
break;
}
case 50u: {
break;
}
case 20u: {
/* fallthrough */
{
}
break;
}
case 40u: {
break;

3
test/unittest/reader/spirv/SpvParserCFGTest_ComputeBlockOrder_Switch_DefaultSameAsACase.spvasm.expected.hlsl
View File

@@ -10,6 +10,9 @@ void main_1() {
}
default: {
/* fallthrough */
{
}
break;
}
case 30u: {
break;

4
test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Fallthrough_Fallthrough_Same.spvasm.expected.hlsl
View File

@@ -6,6 +6,10 @@ void main_1() {
case 20u: {
var_1 = 20u;
/* fallthrough */
{
var_1 = 30u;
}
break;
}
case 30u: {
var_1 = 30u;

4
test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_SwitchBreak_Fallthrough_OnFalse.spvasm.expected.hlsl
View File

@@ -9,6 +9,10 @@ void main_1() {
break;
}
/* fallthrough */
{
var_1 = 30u;
}
break;
}
case 30u: {
var_1 = 30u;

4
test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_SwitchBreak_Fallthrough_OnTrue.spvasm.expected.hlsl
View File

@@ -10,6 +10,10 @@ void main_1() {
break;
}
/* fallthrough */
{
var_1 = 30u;
}
break;
}
case 30u: {
var_1 = 30u;

4
test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Branch_Fallthrough.spvasm.expected.hlsl
View File

@@ -6,6 +6,10 @@ void main_1() {
case 20u: {
var_1 = 20u;
/* fallthrough */
{
var_1 = 30u;
}
break;
}
case 30u: {
var_1 = 30u;

4
test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Switch_DefaultIsCase_WithDupCase.spvasm.expected.hlsl
View File

@@ -13,6 +13,10 @@ void main_1() {
}
default: {
/* fallthrough */
{
var_1 = 30u;
}
break;
}
case 30u: {
var_1 = 30u;

3
test/unittest/reader/spirv/SpvParserCFGTest_FindSwitchCaseHeaders_CaseIsDefault.spvasm.expected.hlsl
View File

@@ -4,6 +4,9 @@ void main_1() {
switch(42u) {
default: {
/* fallthrough */
{
}
break;
}
case 200u: {
break;

3
test/unittest/reader/spirv/SpvParserCFGTest_TerminatorsAreValid_Switch.spvasm.expected.hlsl
View File

@@ -4,6 +4,9 @@ void main_1() {
switch(42u) {
case 20u: {
/* fallthrough */
{
}
break;
}
case 30u: {
break;

21
test/unittest/reader/spirv/SpvParserFunctionVarTest_EmitStatement_Phi_InMerge_PredecessorsDominatdByNestedSwitchCase.spvasm.expected.hlsl
View File

@@ -7,9 +7,30 @@ void main_1() {
switch(1u) {
default: {
/* fallthrough */
{
/* fallthrough */
}
{
if (true) {
} else {
x_41_phi = 0u;
break;
}
x_41_phi = 1u;
}
break;
}
case 0u: {
/* fallthrough */
{
if (true) {
} else {
x_41_phi = 0u;
break;
}
x_41_phi = 1u;
}
break;
}
case 1u: {
if (true) {