Test: Multiple epochs without intermediate tasks/commands have defined behavior

Author: fknorr

src/print_graph.cc

@@ -66,6 +66,8 @@ namespace detail {
 		std::string label = fmt::format("[{}] Node {}:\\n", cmd->get_cid(), cmd->get_nid());
 		if(const auto ecmd = dynamic_cast<const epoch_command*>(cmd)) {
 			label += "EPOCH";
+			if(ecmd->get_epoch_action() == epoch_action::barrier) { label += " (barrier)"; }
+			if(ecmd->get_epoch_action() == epoch_action::shutdown) { label += " (shutdown)"; }
 		} else if(const auto xcmd = dynamic_cast<const execution_command*>(cmd)) {
 			label += fmt::format("EXECUTION {}\\n{}", subrange_to_grid_box(xcmd->get_execution_range()), cmd->debug_label);
 		} else if(const auto pcmd = dynamic_cast<const push_command*>(cmd)) {

test/graph_generation_tests.cc

@@ -1662,6 +1662,31 @@ namespace detail {
 		maybe_print_graphs(ctx);
 	}
 
+	TEST_CASE("a sequence of epochs without intermediate commands has defined behavior", "[graph_generator][command-graph][epoch]") {
+		const size_t num_nodes = 2;
+		test_utils::cdag_test_context ctx(num_nodes);
+		auto& tm = ctx.get_task_manager();
+		auto& inspector = ctx.get_inspector();
+		auto& cdag = ctx.get_command_graph();
+
+		auto tid_before = task_manager::initial_epoch_task;
+		for(const auto action : {epoch_action::barrier, epoch_action::shutdown}) {
+			const auto tid = test_utils::build_and_flush(ctx, num_nodes, tm.finish_epoch(action));
+			CAPTURE(tid_before, tid);
+			for(const auto cid : inspector.get_commands(tid, std::nullopt, std::nullopt)) {
+				CAPTURE(cid);
+				const auto deps = cdag.get(cid)->get_dependencies();
+				CHECK(std::distance(deps.begin(), deps.end()) == 1);
+				for(const auto& d : deps) {
+					CHECK(d.kind == dependency_kind::TRUE_DEP);
+					CHECKED_IF(isa<task_command>(d.node)) { CHECK(static_cast<task_command*>(d.node)->get_tid() == tid_before); }
+				}
+			}
+			tid_before = tid;
+		}
+
+		maybe_print_graphs(ctx);
+	}
 
 } // namespace detail
 } // namespace celerity

test/task_graph_tests.cc

@@ -635,6 +635,7 @@ namespace detail {
 
 		maybe_print_graph(tm);
 	}
+
 	TEST_CASE("epochs create appropriate dependencies to predecessors and successors", "[task_manager][task-graph][epoch]") {
 		task_manager tm{1, nullptr, nullptr};
 		test_utils::mock_buffer_factory mbf(&tm);
@@ -668,7 +669,6 @@ namespace detail {
 		maybe_print_graph(tm);
 	}
 
-
 	TEST_CASE("inserting epochs resets the need for horizons", "[task_manager][task-graph][task-horizon][epoch]") {
 		task_manager tm{1, nullptr, nullptr};
 		tm.set_horizon_step(2);
@@ -685,5 +685,24 @@ namespace detail {
 		maybe_print_graph(tm);
 	}
 
+	TEST_CASE("a sequence of epochs without intermediate tasks has defined behavior", "[task_manager][task-graph][epoch]") {
+		task_manager tm{1, nullptr, nullptr};
+
+		auto tid_before = task_manager::initial_epoch_task;
+		for(const auto action : {epoch_action::barrier, epoch_action::shutdown}) {
+			const auto tid = tm.finish_epoch(action);
+			CAPTURE(tid_before, tid);
+			const auto deps = tm.get_task(tid)->get_dependencies();
+			CHECK(std::distance(deps.begin(), deps.end()) == 1);
+			for(const auto& d : deps) {
+				CHECK(d.kind == dependency_kind::TRUE_DEP);
+				CHECK(d.node->get_id() == tid_before);
+			}
+			tid_before = tid;
+		}
+
+		maybe_print_graph(tm);
+	}
+
 } // namespace detail
 } // namespace celerity