Skip to content

fix: check well-definedness of DFG wires in validate #2221

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

Merged
lmondada merged 1 commit into from
May 15, 2025
Merged

fix: check well-definedness of DFG wires in validate #2221

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
15 changes: 12 additions & 3 deletions hugr-core/src/hugr/validate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,9 @@ impl<'a, H: HugrView> ValidationContext<'a, H> {

let mut links = self.hugr.linked_ports(node, port).peekable();
// Linear dataflow values must be used, and control must have somewhere to flow.
let outgoing_is_linear = port_kind.is_linear() || port_kind == EdgeKind::ControlFlow;
let outgoing_is_unique = port_kind.is_linear() || port_kind == EdgeKind::ControlFlow;
// All dataflow wires must have a unique source.
let incoming_is_unique = port_kind.is_value() || port_kind.is_const();
let must_be_connected = match dir {
// Incoming ports must be connected, except for state order ports, branch case nodes,
// and CFG nodes.
Expand All @@ -192,7 +194,7 @@ impl<'a, H: HugrView> ValidationContext<'a, H> {
&& port_kind != EdgeKind::ControlFlow
&& op_type.tag() != OpTag::Case
}
Direction::Outgoing => outgoing_is_linear,
Direction::Outgoing => outgoing_is_unique,
};
if must_be_connected && links.peek().is_none() {
return Err(ValidationError::UnconnectedPort {
Expand All @@ -204,6 +206,13 @@ impl<'a, H: HugrView> ValidationContext<'a, H> {

// Avoid double checking connected port types.
if dir == Direction::Incoming {
if incoming_is_unique && links.nth(1).is_some() {
return Err(ValidationError::TooManyConnections {
node,
port,
port_kind,
});
}
return Ok(());
}

Expand All @@ -217,7 +226,7 @@ impl<'a, H: HugrView> ValidationContext<'a, H> {
let mut link_cnt = 0;
for (other_node, other_offset) in links {
link_cnt += 1;
if outgoing_is_linear && link_cnt > 1 {
if outgoing_is_unique && link_cnt > 1 {
return Err(ValidationError::TooManyConnections {
node,
port,
Expand Down
Loading