<div dir="ltr"> <div class="gmail_extra"> <div class="gmail_quote">On Sat, Sep 3, 2016 at 1:59 PM, Jason Ekstrand <<a href="mailto:jason@jlekstrand.net" target="_blank">jason@jlekstrand.net</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">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. </blockquote><div> </div><div>Fixes `make check` for me. </div><div>--Aaron </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> Signed-off-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>> Bugzilla: <a href="https://bugs.freedesktop.org/show_bug.cgi?id=97587" rel="noreferrer" target="_blank">https://bugs.freedesktop.org/show_bug.cgi?id=97587</a> --- src/compiler/nir/tests/control_flow_tests.cpp | 8 ++++---- 1 file 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 b9379ef..db660fd 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); -- 2.5.0.400.gff86faf _______________________________________________ mesa-dev mailing list <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div> </div></div>