diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-09-03 11:57:05 -0700 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-09-04 20:44:59 -0700 |
| commit | 821e36638531ddadb32d5bac633c0b21c73bea67 (patch) | |
| tree | 94e195d9d7ad22707735d5d1a035c28b1467f3a2 /src/compiler/nir | |
| parent | 61e978524a0e5de4f8570b44bcb9b907a9187684 (diff) | |
| download | external_mesa3d-821e36638531ddadb32d5bac633c0b21c73bea67.tar.gz external_mesa3d-821e36638531ddadb32d5bac633c0b21c73bea67.tar.bz2 external_mesa3d-821e36638531ddadb32d5bac633c0b21c73bea67.zip | |
nir/tests: Update the CF tests to not assume fake edges
In aad4f1550, we removed the concept of "fake" edges from NIR. Now, if you
have a block at the end of an infinite loop it really has no predecessors.
This updates the unit tests to match.
Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97587
Tested-by: Aaron Watry <awatry@gmail.com>
Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
Diffstat (limited to 'src/compiler/nir')
| -rw-r--r-- | src/compiler/nir/tests/control_flow_tests.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler/nir/tests/control_flow_tests.cpp b/src/compiler/nir/tests/control_flow_tests.cpp index b9379ef3b0..db660fd074 100644 --- a/src/compiler/nir/tests/control_flow_tests.cpp +++ b/src/compiler/nir/tests/control_flow_tests.cpp @@ -120,7 +120,7 @@ TEST_F(nir_cf_test, delete_break_in_loop) * // succs: block_1 * } * block block_2: - * // preds: block_1 + * // preds: * // succs: block_3 * block block_3: * } @@ -130,18 +130,18 @@ TEST_F(nir_cf_test, delete_break_in_loop) EXPECT_EQ(block_1, block_0->successors[0]); EXPECT_EQ(NULL, block_0->successors[1]); EXPECT_EQ(block_1, block_1->successors[0]); /* back to itself */ - EXPECT_EQ(block_2, block_1->successors[1]); /* fake successor */ + EXPECT_EQ(NULL, block_1->successors[1]); EXPECT_EQ(block_3, block_2->successors[0]); EXPECT_EQ(NULL, block_2->successors[1]); EXPECT_EQ(NULL, block_3->successors[0]); EXPECT_EQ(NULL, block_3->successors[1]); EXPECT_EQ(0, block_0->predecessors->entries); EXPECT_EQ(2, block_1->predecessors->entries); - EXPECT_EQ(1, block_2->predecessors->entries); + EXPECT_EQ(0, block_2->predecessors->entries); EXPECT_EQ(1, block_3->predecessors->entries); EXPECT_TRUE(_mesa_set_search(block_1->predecessors, block_0)); EXPECT_TRUE(_mesa_set_search(block_1->predecessors, block_1)); - EXPECT_TRUE(_mesa_set_search(block_2->predecessors, block_1)); + EXPECT_FALSE(_mesa_set_search(block_2->predecessors, block_1)); EXPECT_TRUE(_mesa_set_search(block_3->predecessors, block_2)); nir_metadata_require(b.impl, nir_metadata_dominance); |