Skip to content

fix: Fix inline_constant_functions pass #2135

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
merged 1 commit into from
May 7, 2025
+11 −4
Merged

fix: Fix inline_constant_functions pass #2135

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: 11 additions & 4 deletions hugr-llvm/src/utils/inline_constant_functions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use hugr_core::{
hugr::hugrmut::HugrMut,
hugr::{hugrmut::HugrMut, internal::HugrMutInternals},
ops::{FuncDefn, LoadFunction, Value},
types::PolyFuncType,
HugrView, Node, NodeIndex as _,
Expand Down Expand Up @@ -51,7 +51,7 @@ fn inline_constant_functions_impl(hugr: &mut impl HugrMut<Node = Node>) -> Resul

let mut any_changes = false;

for (konst_n, func_hugr, load_constant_ns) in const_funs {
for (konst_n, mut func_hugr, load_constant_ns) in const_funs {
if !load_constant_ns.is_empty() {
let polysignature: PolyFuncType = func_hugr
.inner_function_type()
Expand All @@ -65,11 +65,16 @@ fn inline_constant_functions_impl(hugr: &mut impl HugrMut<Node = Node>) -> Resul
name: const_fn_name(konst_n),
signature: polysignature.clone(),
};
let func_node = hugr.add_node_with_parent(hugr.root(), func_defn);
hugr.insert_hugr(func_node, func_hugr);
func_hugr.replace_op(func_hugr.root(), func_defn);
let func_node = hugr.insert_hugr(hugr.root(), func_hugr).new_root;
hugr.set_num_ports(func_node, 0, 1);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use add_ports here, and use the port it returns

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is about removing ports: If the inlined function value is a DFG, then it already has some inputs/outputs that we need to remove because it's now a FuncDefn


for lcn in load_constant_ns {
hugr.replace_op(lcn, LoadFunction::try_new(polysignature.clone(), [])?);

let src_port = hugr.node_outputs(func_node).next().unwrap();
let tgt_port = hugr.node_inputs(lcn).next().unwrap();
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be better to delegate to LoadConstant what the input is. You don't have one at hand, so maybe not worth it.

hugr.connect(func_node, src_port, lcn, tgt_port);
}
any_changes = true;
}
Expand Down Expand Up @@ -131,6 +136,7 @@ mod test {
};

inline_constant_functions(&mut hugr).unwrap();
hugr.validate().unwrap();

for n in hugr.nodes() {
if let Some(konst) = hugr.get_optype(n).as_const() {
Expand Down Expand Up @@ -180,6 +186,7 @@ mod test {
};

inline_constant_functions(&mut hugr).unwrap();
hugr.validate().unwrap();

for n in hugr.nodes() {
if let Some(konst) = hugr.get_optype(n).as_const() {
Expand Down