encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[spirv-reader] remove exclusive_false_head_for 

Code cleanup

Bug: tint:3
Change-Id: I8d1c4e8a486b3c3cccb13e0a265269606278fb97
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/23080
Reviewed-by: dan sinclair <dsinclair@google.com>
This commit is contained in:
David Neto 2020-06-11 14:19:07 +00:00 committed by dan sinclair
parent 3f3483be14
commit 046c2b7c4c
3 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/reader/spirv/function.cc
View File

@ -1343,9 +1343,6 @@ bool FunctionEmitter::FindIfSelectionInternalHeaders() {
false_head_info->false_head_for = construct.get(); false_head_info->false_head_for = construct.get();
if_header_info->false_head = false_head_info; if_header_info->false_head = false_head_info;
} }
if ((!contains_true) && contains_false) {
false_head_info->exclusive_false_head_for = construct.get();
}
if ((true_head_info->header_for_merge != 0) && if ((true_head_info->header_for_merge != 0) &&
(true_head_info->header_for_merge != construct->begin_id)) { (true_head_info->header_for_merge != construct->begin_id)) {

4
src/reader/spirv/function.h
View File

@ -149,10 +149,6 @@ struct BlockInfo {
/// control reconverges between the "then" and "else" clauses, but before /// control reconverges between the "then" and "else" clauses, but before
/// the merge block for that selection. /// the merge block for that selection.
const Construct* premerge_head_for = nullptr; const Construct* premerge_head_for = nullptr;
/// The construct for which this block is the false head, and that construct
/// does not have a true head.
/// TODO(dneto): I think we can remove |exclusive_false_head_for|
const Construct* exclusive_false_head_for = nullptr;
/// If not null, then this block is an if-selection header, and |true_head| is /// If not null, then this block is an if-selection header, and |true_head| is
/// the target of the true branch on the OpBranchConditional. /// the target of the true branch on the OpBranchConditional.
/// In particular, true_head->true_head_for == this /// In particular, true_head->true_head_for == this

15
src/reader/spirv/function_cfg_test.cc
View File

@ -6687,7 +6687,6 @@ TEST_F(SpvParserTest, FindIfSelectionInternalHeaders_NoIf) {
EXPECT_EQ(bi->false_head_for, nullptr); EXPECT_EQ(bi->false_head_for, nullptr);
EXPECT_EQ(bi->premerge_head_for, nullptr); EXPECT_EQ(bi->premerge_head_for, nullptr);
EXPECT_EQ(bi->premerge_head_for, nullptr); EXPECT_EQ(bi->premerge_head_for, nullptr);
EXPECT_EQ(bi->exclusive_false_head_for, nullptr);
} }
TEST_F(SpvParserTest, FindIfSelectionInternalHeaders_ThenElse) { TEST_F(SpvParserTest, FindIfSelectionInternalHeaders_ThenElse) {
@ -6718,7 +6717,6 @@ TEST_F(SpvParserTest, FindIfSelectionInternalHeaders_ThenElse) {
EXPECT_EQ(bi20->true_head_for->begin_id, 10u); EXPECT_EQ(bi20->true_head_for->begin_id, 10u);
EXPECT_EQ(bi20->false_head_for, nullptr); EXPECT_EQ(bi20->false_head_for, nullptr);
EXPECT_EQ(bi20->premerge_head_for, nullptr); EXPECT_EQ(bi20->premerge_head_for, nullptr);
EXPECT_EQ(bi20->exclusive_false_head_for, nullptr);
auto* bi30 = fe.GetBlockInfo(30); auto* bi30 = fe.GetBlockInfo(30);
ASSERT_NE(bi30, nullptr); ASSERT_NE(bi30, nullptr);
@ -6726,7 +6724,6 @@ TEST_F(SpvParserTest, FindIfSelectionInternalHeaders_ThenElse) {
ASSERT_NE(bi30->false_head_for, nullptr); ASSERT_NE(bi30->false_head_for, nullptr);
EXPECT_EQ(bi30->false_head_for->begin_id, 10u); EXPECT_EQ(bi30->false_head_for->begin_id, 10u);
EXPECT_EQ(bi30->premerge_head_for, nullptr); EXPECT_EQ(bi30->premerge_head_for, nullptr);
EXPECT_EQ(bi30->exclusive_false_head_for, nullptr);
} }
TEST_F(SpvParserTest, FindIfSelectionInternalHeaders_IfOnly) { TEST_F(SpvParserTest, FindIfSelectionInternalHeaders_IfOnly) {
@ -6754,7 +6751,6 @@ TEST_F(SpvParserTest, FindIfSelectionInternalHeaders_IfOnly) {
EXPECT_EQ(bi30->true_head_for->begin_id, 10u); EXPECT_EQ(bi30->true_head_for->begin_id, 10u);
EXPECT_EQ(bi30->false_head_for, nullptr); EXPECT_EQ(bi30->false_head_for, nullptr);
EXPECT_EQ(bi30->premerge_head_for, nullptr); EXPECT_EQ(bi30->premerge_head_for, nullptr);
EXPECT_EQ(bi30->exclusive_false_head_for, nullptr);
} }
TEST_F(SpvParserTest, FindIfSelectionInternalHeaders_ElseOnly) { TEST_F(SpvParserTest, FindIfSelectionInternalHeaders_ElseOnly) {
@ -6782,8 +6778,6 @@ TEST_F(SpvParserTest, FindIfSelectionInternalHeaders_ElseOnly) {
ASSERT_NE(bi30->false_head_for, nullptr); ASSERT_NE(bi30->false_head_for, nullptr);
EXPECT_EQ(bi30->false_head_for->begin_id, 10u); EXPECT_EQ(bi30->false_head_for->begin_id, 10u);
EXPECT_EQ(bi30->premerge_head_for, nullptr); EXPECT_EQ(bi30->premerge_head_for, nullptr);
ASSERT_NE(bi30->exclusive_false_head_for, nullptr);
EXPECT_EQ(bi30->exclusive_false_head_for->begin_id, 10u);
} }
TEST_F(SpvParserTest, FindIfSelectionInternalHeaders_Regardless) { TEST_F(SpvParserTest, FindIfSelectionInternalHeaders_Regardless) {
@ -6817,14 +6811,12 @@ TEST_F(SpvParserTest, FindIfSelectionInternalHeaders_Regardless) {
ASSERT_NE(bi20->false_head_for, nullptr); ASSERT_NE(bi20->false_head_for, nullptr);
EXPECT_EQ(bi20->false_head_for->begin_id, 10u); EXPECT_EQ(bi20->false_head_for->begin_id, 10u);
EXPECT_EQ(bi20->premerge_head_for, nullptr); EXPECT_EQ(bi20->premerge_head_for, nullptr);
EXPECT_EQ(bi20->exclusive_false_head_for, nullptr);
auto* bi80 = fe.GetBlockInfo(80); auto* bi80 = fe.GetBlockInfo(80);
ASSERT_NE(bi80, nullptr); ASSERT_NE(bi80, nullptr);
EXPECT_EQ(bi80->true_head_for, nullptr); EXPECT_EQ(bi80->true_head_for, nullptr);
EXPECT_EQ(bi80->false_head_for, nullptr); EXPECT_EQ(bi80->false_head_for, nullptr);
EXPECT_EQ(bi80->premerge_head_for, nullptr); EXPECT_EQ(bi80->premerge_head_for, nullptr);
EXPECT_EQ(bi80->exclusive_false_head_for, nullptr);
} }
TEST_F(SpvParserTest, FindIfSelectionInternalHeaders_Premerge_Simple) { TEST_F(SpvParserTest, FindIfSelectionInternalHeaders_Premerge_Simple) {
@ -6860,7 +6852,6 @@ TEST_F(SpvParserTest, FindIfSelectionInternalHeaders_Premerge_Simple) {
EXPECT_EQ(bi80->false_head_for, nullptr); EXPECT_EQ(bi80->false_head_for, nullptr);
ASSERT_NE(bi80->premerge_head_for, nullptr); ASSERT_NE(bi80->premerge_head_for, nullptr);
EXPECT_EQ(bi80->premerge_head_for->begin_id, 10u); EXPECT_EQ(bi80->premerge_head_for->begin_id, 10u);
EXPECT_EQ(bi80->exclusive_false_head_for, nullptr);
} }
TEST_F(SpvParserTest, TEST_F(SpvParserTest,
@ -6897,7 +6888,6 @@ TEST_F(SpvParserTest,
EXPECT_EQ(bi20->true_head_for->begin_id, 10u); EXPECT_EQ(bi20->true_head_for->begin_id, 10u);
EXPECT_EQ(bi20->false_head_for, nullptr); EXPECT_EQ(bi20->false_head_for, nullptr);
EXPECT_EQ(bi20->premerge_head_for, nullptr); EXPECT_EQ(bi20->premerge_head_for, nullptr);
EXPECT_EQ(bi20->exclusive_false_head_for, nullptr);
auto* bi30 = fe.GetBlockInfo(30); auto* bi30 = fe.GetBlockInfo(30);
ASSERT_NE(bi30, nullptr); ASSERT_NE(bi30, nullptr);
@ -6906,14 +6896,12 @@ TEST_F(SpvParserTest,
EXPECT_EQ(bi30->false_head_for->begin_id, 10u); EXPECT_EQ(bi30->false_head_for->begin_id, 10u);
ASSERT_NE(bi30->premerge_head_for, nullptr); ASSERT_NE(bi30->premerge_head_for, nullptr);
EXPECT_EQ(bi30->premerge_head_for->begin_id, 10u); EXPECT_EQ(bi30->premerge_head_for->begin_id, 10u);
EXPECT_EQ(bi30->exclusive_false_head_for, nullptr);
auto* bi80 = fe.GetBlockInfo(80); auto* bi80 = fe.GetBlockInfo(80);
ASSERT_NE(bi80, nullptr); ASSERT_NE(bi80, nullptr);
EXPECT_EQ(bi80->true_head_for, nullptr); EXPECT_EQ(bi80->true_head_for, nullptr);
EXPECT_EQ(bi80->false_head_for, nullptr); EXPECT_EQ(bi80->false_head_for, nullptr);
EXPECT_EQ(bi80->premerge_head_for, nullptr); EXPECT_EQ(bi80->premerge_head_for, nullptr);
EXPECT_EQ(bi80->exclusive_false_head_for, nullptr);
} }
TEST_F(SpvParserTest, TEST_F(SpvParserTest,
@ -6951,7 +6939,6 @@ TEST_F(SpvParserTest,
EXPECT_EQ(bi20->false_head_for, nullptr); EXPECT_EQ(bi20->false_head_for, nullptr);
ASSERT_NE(bi20->premerge_head_for, nullptr); ASSERT_NE(bi20->premerge_head_for, nullptr);
EXPECT_EQ(bi20->premerge_head_for->begin_id, 10u); EXPECT_EQ(bi20->premerge_head_for->begin_id, 10u);
EXPECT_EQ(bi20->exclusive_false_head_for, nullptr);
auto* bi30 = fe.GetBlockInfo(30); auto* bi30 = fe.GetBlockInfo(30);
ASSERT_NE(bi30, nullptr); ASSERT_NE(bi30, nullptr);
@ -6959,14 +6946,12 @@ TEST_F(SpvParserTest,
ASSERT_NE(bi30->false_head_for, nullptr); ASSERT_NE(bi30->false_head_for, nullptr);
EXPECT_EQ(bi30->false_head_for->begin_id, 10u); EXPECT_EQ(bi30->false_head_for->begin_id, 10u);
EXPECT_EQ(bi30->premerge_head_for, nullptr); EXPECT_EQ(bi30->premerge_head_for, nullptr);
EXPECT_EQ(bi30->exclusive_false_head_for, nullptr);
auto* bi80 = fe.GetBlockInfo(80); auto* bi80 = fe.GetBlockInfo(80);
ASSERT_NE(bi80, nullptr); ASSERT_NE(bi80, nullptr);
EXPECT_EQ(bi80->true_head_for, nullptr); EXPECT_EQ(bi80->true_head_for, nullptr);
EXPECT_EQ(bi80->false_head_for, nullptr); EXPECT_EQ(bi80->false_head_for, nullptr);
EXPECT_EQ(bi80->premerge_head_for, nullptr); EXPECT_EQ(bi80->premerge_head_for, nullptr);
EXPECT_EQ(bi80->exclusive_false_head_for, nullptr);
} }
TEST_F(SpvParserTest, TEST_F(SpvParserTest,