Skip to content
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

fix: inline_constant_functions not connecting LoadFunction #110

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

fix: inline_constant_functions not connecting LoadFunction #110

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c50bf6e
fix: inline_constant_functions not connecting LoadFunction
doug-q Sep 23, 2024
60f608e
fix
doug-q Sep 23, 2024
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
46 changes: 24 additions & 22 deletions src/utils/inline_constant_functions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
use hugr::{
builder::{Dataflow, DataflowHugr, FunctionBuilder},
extension::ExtensionRegistry,
hugr::hugrmut::HugrMut,
ops::{FuncDefn, LoadFunction, Value},
types::PolyFuncType,
HugrView, Node, NodeIndex as _,
ops::{DataflowParent, FuncDefn, LoadFunction, Value},
types::{PolyFuncType, Signature},
HugrView, IncomingPort, Node, NodeIndex as _,
};

use anyhow::{anyhow, bail, Result};
Expand All @@ -27,21 +28,32 @@ fn inline_constant_functions_impl(
let mut const_funs = vec![];

for n in hugr.nodes() {
let konst_hugr = {
let (konst_hugr, sig) = {
let Some(konst) = hugr.get_optype(n).as_const() else {
continue;
};
let Value::Function { hugr } = konst.value() else {
continue;
};
let optype = hugr.get_optype(hugr.root());
if !optype.is_dfg() && !optype.is_func_defn() {
if let Some(func) = optype.as_func_defn() {
(hugr.as_ref().clone(), func.inner_signature())
} else if let Some(dfg) = optype.as_dfg() {
let signature: Signature = dfg.inner_signature();
let mut builder = FunctionBuilder::new(const_fn_name(n), signature.clone())?;
let outputs = builder
.add_hugr_view_with_wires(hugr, builder.input_wires())?
.outputs();
(
builder.finish_hugr_with_outputs(outputs, registry)?,
signature,
)
} else {
bail!(
"Constant function has unsupported root: {:?}",
hugr.get_optype(hugr.root())
)
}
hugr.clone()
};
let mut lcs = vec![];
for load_constant in hugr.output_neighbours(n) {
Expand All @@ -53,32 +65,22 @@ fn inline_constant_functions_impl(
}
lcs.push(load_constant);
}
const_funs.push((n, konst_hugr.as_ref().clone(), lcs));
const_funs.push((n, konst_hugr.as_ref().clone(), sig, lcs));
}

let mut any_changes = false;

for (konst_n, func_hugr, load_constant_ns) in const_funs {
for (konst_n, func_hugr, sig, load_constant_ns) in const_funs {
if !load_constant_ns.is_empty() {
let polysignature: PolyFuncType = func_hugr
.inner_function_type()
.ok_or(anyhow!(
"Constant function hugr has no inner_func_type: {}",
konst_n.index()
))?
.into();
let func_defn = FuncDefn {
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);
let func_node = hugr.insert_hugr(hugr.root(), func_hugr).new_root;

for lcn in load_constant_ns {
hugr.disconnect(lcn, IncomingPort::from(0));
hugr.replace_op(
lcn,
LoadFunction::try_new(polysignature.clone(), [], registry)?,
LoadFunction::try_new(sig.clone().into(), [], registry)?,
)?;
hugr.connect(func_node, 0, lcn, 0);
}
any_changes = true;
}
Expand Down
Loading