Skip to content

Allow consecutive loops #1943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
caleridas wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow consecutive loops #1943

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions jlm/hls/backend/rvsdg2rhls/mem-conv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,10 @@ TraceEdgeToMerge(rvsdg::Input * state_edge)
}
else if (rvsdg::TryGetOwnerNode<LoopNode>(*state_edge))
{
JLM_UNREACHABLE("there should be no new loops");
// If a loop follows before encountering a merge,
// then there is no merge node requiring any replacement
// on this path.
return { nullptr, encountered_muxes };
}
auto si = state_edge;
auto sn = &rvsdg::AssertGetOwnerNode<rvsdg::SimpleNode>(*si);
Expand Down Expand Up @@ -103,7 +106,8 @@ OptimizeResMemState(rvsdg::Output * res_mem_state)
{
// replace other branches with undefs, so the stateedge before the res can be killed.
auto [merge_in, encountered_muxes] = TraceEdgeToMerge(get_mem_state_user(res_mem_state));
JLM_ASSERT(merge_in);
if (!merge_in)
return;
for (auto si : encountered_muxes)
{
auto & sn = rvsdg::AssertGetOwnerNode<rvsdg::SimpleNode>(*si);
Expand All @@ -124,7 +128,8 @@ OptimizeReqMemState(rvsdg::Output * req_mem_state)
// there is no reason to wait for requests, if we already wait for responses, so we kill the rest
// of this state edge
auto [merge_in, _] = TraceEdgeToMerge(get_mem_state_user(req_mem_state));
JLM_ASSERT(merge_in);
if (!merge_in)
return;
auto & merge_node = rvsdg::AssertGetOwnerNode<rvsdg::SimpleNode>(*merge_in);
std::vector<rvsdg::Output *> merge_origins;
for (size_t i = 0; i < merge_node.ninputs(); ++i)
Expand Down
Loading