From 3da44adaa016772c9be59d2addb18de87d4b687d Mon Sep 17 00:00:00 2001
From: Aaron Councilman <aaronjc4@illinois.edu>
Date: Sat, 22 Feb 2025 17:58:02 -0600
Subject: [PATCH] Format
---
juno_scheduler/src/compile.rs | 13 +-
juno_scheduler/src/pm.rs | 303 +++++++++++++++++++++-------------
2 files changed, 203 insertions(+), 113 deletions(-)
diff --git a/juno_scheduler/src/compile.rs b/juno_scheduler/src/compile.rs
index 86377241..13990ef9 100644
--- a/juno_scheduler/src/compile.rs
+++ b/juno_scheduler/src/compile.rs
@@ -473,10 +473,19 @@ fn compile_expr(
}
Ok(ExprResult::Expr(ir::ScheduleExp::Record { fields: result }))
}
- parser::Expr::SetOp { span: _, op, lhs, rhs } => {
+ parser::Expr::SetOp {
+ span: _,
+ op,
+ lhs,
+ rhs,
+ } => {
let lhs = compile_exp_as_expr(*lhs, lexer, macrostab, macros)?;
let rhs = compile_exp_as_expr(*rhs, lexer, macrostab, macros)?;
- Ok(ExprResult::Expr(ir::ScheduleExp::SetOp { op, lhs: Box::new(lhs), rhs: Box::new(rhs), }))
+ Ok(ExprResult::Expr(ir::ScheduleExp::SetOp {
+ op,
+ lhs: Box::new(lhs),
+ rhs: Box::new(rhs),
+ }))
}
}
}
diff --git a/juno_scheduler/src/pm.rs b/juno_scheduler/src/pm.rs
index 44777301..d5e280b4 100644
--- a/juno_scheduler/src/pm.rs
+++ b/juno_scheduler/src/pm.rs
@@ -73,18 +73,17 @@ impl FunctionSelection {
match &mut self.selection {
FunctionSelectionState::Nothing() => self.selection = other.selection,
FunctionSelectionState::Everything() => (),
- FunctionSelectionState::Selection(selection) =>
- match other.selection {
- FunctionSelectionState::Nothing() => (),
- FunctionSelectionState::Everything() => self.selection = other.selection,
- FunctionSelectionState::Selection(other) => {
- for idx in 0..self.num_nodes {
- if other[idx] {
- selection.set(idx, true);
- }
+ FunctionSelectionState::Selection(selection) => match other.selection {
+ FunctionSelectionState::Nothing() => (),
+ FunctionSelectionState::Everything() => self.selection = other.selection,
+ FunctionSelectionState::Selection(other) => {
+ for idx in 0..self.num_nodes {
+ if other[idx] {
+ selection.set(idx, true);
}
}
}
+ },
}
}
@@ -99,19 +98,24 @@ impl FunctionSelection {
match self.selection {
FunctionSelectionState::Nothing() => self,
FunctionSelectionState::Everything() => other,
- FunctionSelectionState::Selection(mut selection) =>
- match other.selection {
- FunctionSelectionState::Nothing() => other,
- FunctionSelectionState::Everything() => Self { num_nodes, selection: FunctionSelectionState::Selection(selection) },
- FunctionSelectionState::Selection(other) => {
- for idx in 0..num_nodes {
- if !other[idx] {
- selection.set(idx, false);
- }
+ FunctionSelectionState::Selection(mut selection) => match other.selection {
+ FunctionSelectionState::Nothing() => other,
+ FunctionSelectionState::Everything() => Self {
+ num_nodes,
+ selection: FunctionSelectionState::Selection(selection),
+ },
+ FunctionSelectionState::Selection(other) => {
+ for idx in 0..num_nodes {
+ if !other[idx] {
+ selection.set(idx, false);
}
- Self { num_nodes, selection: FunctionSelectionState::Selection(selection) }
+ }
+ Self {
+ num_nodes,
+ selection: FunctionSelectionState::Selection(selection),
}
}
+ },
}
}
@@ -120,31 +124,38 @@ impl FunctionSelection {
match self.selection {
FunctionSelectionState::Nothing() => self,
- FunctionSelectionState::Everything() =>
- match other.selection {
- FunctionSelectionState::Nothing() => self,
- FunctionSelectionState::Everything() => {
- Self { num_nodes, selection: FunctionSelectionState::Nothing() }
- }
- FunctionSelectionState::Selection(other) => {
- Self { num_nodes, selection: FunctionSelectionState::Selection(other.not()) }
- }
- }
- FunctionSelectionState::Selection(mut selection) =>
- match other.selection {
- FunctionSelectionState::Nothing() => Self { num_nodes, selection: FunctionSelectionState::Selection(selection) },
- FunctionSelectionState::Everything() => {
- Self { num_nodes, selection: FunctionSelectionState::Nothing() }
- }
- FunctionSelectionState::Selection(other) => {
- for idx in 0..num_nodes {
- if other[idx] {
- selection.set(idx, false);
- }
+ FunctionSelectionState::Everything() => match other.selection {
+ FunctionSelectionState::Nothing() => self,
+ FunctionSelectionState::Everything() => Self {
+ num_nodes,
+ selection: FunctionSelectionState::Nothing(),
+ },
+ FunctionSelectionState::Selection(other) => Self {
+ num_nodes,
+ selection: FunctionSelectionState::Selection(other.not()),
+ },
+ },
+ FunctionSelectionState::Selection(mut selection) => match other.selection {
+ FunctionSelectionState::Nothing() => Self {
+ num_nodes,
+ selection: FunctionSelectionState::Selection(selection),
+ },
+ FunctionSelectionState::Everything() => Self {
+ num_nodes,
+ selection: FunctionSelectionState::Nothing(),
+ },
+ FunctionSelectionState::Selection(other) => {
+ for idx in 0..num_nodes {
+ if other[idx] {
+ selection.set(idx, false);
}
- Self { num_nodes, selection: FunctionSelectionState::Selection(selection) }
+ }
+ Self {
+ num_nodes,
+ selection: FunctionSelectionState::Selection(selection),
}
}
+ },
}
}
@@ -152,8 +163,10 @@ impl FunctionSelection {
match &self.selection {
FunctionSelectionState::Nothing() => vec![],
FunctionSelectionState::Everything() => (0..self.num_nodes).map(NodeID::new).collect(),
- FunctionSelectionState::Selection(selection) =>
- (0..self.num_nodes).map(NodeID::new).filter(|node| selection[node.idx()]).collect(),
+ FunctionSelectionState::Selection(selection) => (0..self.num_nodes)
+ .map(NodeID::new)
+ .filter(|node| selection[node.idx()])
+ .collect(),
}
}
}
@@ -177,7 +190,9 @@ impl ModuleSelection {
}
pub fn add_everything(&mut self) {
- self.selection.iter_mut().for_each(|func| func.add_everything());
+ self.selection
+ .iter_mut()
+ .for_each(|func| func.add_everything());
}
pub fn add_function(&mut self, func: FunctionID) {
@@ -185,15 +200,22 @@ impl ModuleSelection {
}
pub fn add_label(&mut self, func: FunctionID, label: LabelID, pm: &PassManager) {
- pm.functions[func.idx()].labels.iter().enumerate()
- .for_each(|(node_idx, labels)| if labels.contains(&label) {
- self.selection[func.idx()].add_node(NodeID::new(node_idx));
- } else {
+ pm.functions[func.idx()]
+ .labels
+ .iter()
+ .enumerate()
+ .for_each(|(node_idx, labels)| {
+ if labels.contains(&label) {
+ self.selection[func.idx()].add_node(NodeID::new(node_idx));
+ } else {
+ }
});
}
pub fn add(&mut self, other: Self) {
- self.selection.iter_mut().zip(other.selection.into_iter())
+ self.selection
+ .iter_mut()
+ .zip(other.selection.into_iter())
.for_each(|(this, other)| this.add(other));
}
@@ -204,17 +226,23 @@ impl ModuleSelection {
pub fn intersection(self, other: Self) -> Self {
Self {
- selection: self.selection.into_iter().zip(other.selection.into_iter())
+ selection: self
+ .selection
+ .into_iter()
+ .zip(other.selection.into_iter())
.map(|(this, other)| this.intersection(other))
- .collect()
+ .collect(),
}
}
pub fn difference(self, other: Self) -> Self {
Self {
- selection: self.selection.into_iter().zip(other.selection.into_iter())
+ selection: self
+ .selection
+ .into_iter()
+ .zip(other.selection.into_iter())
.map(|(this, other)| this.difference(other))
- .collect()
+ .collect(),
}
}
@@ -224,9 +252,11 @@ impl ModuleSelection {
match func_selection.selection {
FunctionSelectionState::Nothing() => (),
FunctionSelectionState::Everything() => res.push(FunctionID::new(func_id)),
- _ => return Err(SchedulerError::SemanticError(
- "Expected selection of functions, found fine-grain selection".to_string()
- )),
+ _ => {
+ return Err(SchedulerError::SemanticError(
+ "Expected selection of functions, found fine-grain selection".to_string(),
+ ))
+ }
}
}
Ok(res)
@@ -243,22 +273,45 @@ impl ModuleSelection {
}
pub fn as_func_states(&self) -> Vec<&FunctionSelectionState> {
- self.selection.iter().map(|selection| &selection.selection).collect()
+ self.selection
+ .iter()
+ .map(|selection| &selection.selection)
+ .collect()
}
}
#[derive(Debug, Clone)]
pub enum Value {
- Label { labels: Vec<LabelInfo> },
- JunoFunction { func: JunoFunctionID },
- HerculesFunction { func: FunctionID },
- Record { fields: HashMap<String, Value> },
+ Label {
+ labels: Vec<LabelInfo>,
+ },
+ JunoFunction {
+ func: JunoFunctionID,
+ },
+ HerculesFunction {
+ func: FunctionID,
+ },
+ Record {
+ fields: HashMap<String, Value>,
+ },
Everything {},
- Selection { selection: Vec<Value> },
- SetOp { op: parser::SetOp, lhs: Box<Value>, rhs: Box<Value> },
- Integer { val: usize },
- Boolean { val: bool },
- String { val: String },
+ Selection {
+ selection: Vec<Value>,
+ },
+ SetOp {
+ op: parser::SetOp,
+ lhs: Box<Value>,
+ rhs: Box<Value>,
+ },
+ Integer {
+ val: usize,
+ },
+ Boolean {
+ val: bool,
+ },
+ String {
+ val: String,
+ },
}
impl Value {
@@ -269,15 +322,22 @@ impl Value {
}
}
- fn as_selection(&self, pm: &PassManager, funcs: &JunoFunctions)
- -> Result<ModuleSelection, SchedulerError>
- {
+ fn as_selection(
+ &self,
+ pm: &PassManager,
+ funcs: &JunoFunctions,
+ ) -> Result<ModuleSelection, SchedulerError> {
let mut selection = ModuleSelection::new(pm);
self.add_to_selection(pm, funcs, &mut selection)?;
Ok(selection)
}
- fn add_to_selection(&self, pm: &PassManager, funcs: &JunoFunctions, selection: &mut ModuleSelection) -> Result<(), SchedulerError> {
+ fn add_to_selection(
+ &self,
+ pm: &PassManager,
+ funcs: &JunoFunctions,
+ selection: &mut ModuleSelection,
+ ) -> Result<(), SchedulerError> {
match self {
Value::Label { labels } => {
for LabelInfo { func, label } in labels {
@@ -299,32 +359,31 @@ impl Value {
Value::SetOp { op, lhs, rhs } => {
let lhs = lhs.as_selection(pm, funcs)?;
let rhs = rhs.as_selection(pm, funcs)?;
- let res =
- match op {
- parser::SetOp::Union => lhs.union(rhs),
- parser::SetOp::Intersection => lhs.intersection(rhs),
- parser::SetOp::Difference => lhs.difference(rhs),
- };
+ let res = match op {
+ parser::SetOp::Union => lhs.union(rhs),
+ parser::SetOp::Intersection => lhs.intersection(rhs),
+ parser::SetOp::Difference => lhs.difference(rhs),
+ };
selection.add(res);
}
Value::Record { .. } => {
return Err(SchedulerError::SemanticError(
- "Expected code selection, found record".to_string()
+ "Expected code selection, found record".to_string(),
));
}
Value::Integer { .. } => {
return Err(SchedulerError::SemanticError(
- "Expected code selection, found integer".to_string()
+ "Expected code selection, found integer".to_string(),
));
}
Value::Boolean { .. } => {
return Err(SchedulerError::SemanticError(
- "Expected code selection, found boolean".to_string()
+ "Expected code selection, found boolean".to_string(),
));
}
Value::String { .. } => {
return Err(SchedulerError::SemanticError(
- "Expected code selection, found string".to_string()
+ "Expected code selection, found string".to_string(),
));
}
}
@@ -1179,7 +1238,11 @@ fn schedule_interpret(
for func in selection {
let (func, modified) = interp_expr(pm, func, stringtab, env, functions)?;
changed |= modified;
- add_device(pm, device.clone(), func.as_selection(pm, functions)?.as_funcs()?);
+ add_device(
+ pm,
+ device.clone(),
+ func.as_selection(pm, functions)?.as_funcs()?,
+ );
}
Ok(changed)
}
@@ -1208,7 +1271,14 @@ fn interp_expr(
ScheduleExp::SetOp { op, lhs, rhs } => {
let (lhs, lhs_mod) = interp_expr(pm, lhs, stringtab, env, functions)?;
let (rhs, rhs_mod) = interp_expr(pm, rhs, stringtab, env, functions)?;
- Ok((Value::SetOp { op: *op, lhs: Box::new(lhs), rhs: Box::new(rhs) }, lhs_mod || rhs_mod))
+ Ok((
+ Value::SetOp {
+ op: *op,
+ lhs: Box::new(lhs),
+ rhs: Box::new(rhs),
+ },
+ lhs_mod || rhs_mod,
+ ))
}
ScheduleExp::Field { collect, field } => {
let (lhs, changed) = interp_expr(pm, collect, stringtab, env, functions)?;
@@ -1268,7 +1338,7 @@ fn interp_expr(
}
let selection = match on {
- Selector::Everything() => Value::Everything{},
+ Selector::Everything() => Value::Everything {},
Selector::Selection(selection) => {
let mut vals = vec![];
for loc in selection {
@@ -1278,7 +1348,8 @@ fn interp_expr(
}
Value::Selection { selection: vals }
}
- }.as_selection(pm, functions)?;
+ }
+ .as_selection(pm, functions)?;
let (res, modified) = run_pass(pm, *pass, arg_vals, selection)?;
changed |= modified;
@@ -1465,7 +1536,11 @@ fn update_value(
Value::SetOp { op, lhs, rhs } => {
let lhs = update_value(*lhs, func_idx, juno_func_idx)?;
let rhs = update_value(*rhs, func_idx, juno_func_idx)?;
- Some(Value::SetOp { op, lhs: Box::new(lhs), rhs: Box::new(rhs) })
+ Some(Value::SetOp {
+ op,
+ lhs: Box::new(lhs),
+ rhs: Box::new(rhs),
+ })
}
Value::Everything {} => Some(Value::Everything {}),
Value::Integer { val } => Some(Value::Integer { val }),
@@ -1533,33 +1608,15 @@ fn build_selection<'a>(
pm.make_def_uses();
let def_uses = pm.def_uses.take().unwrap();
- selection.as_func_states()
+ selection
+ .as_func_states()
.into_iter()
.zip(pm.functions.iter_mut())
.zip(def_uses.iter())
.enumerate()
.map(|(idx, ((selection, func), def_use))| match selection {
- FunctionSelectionState::Nothing() if create_editors_for_nothing_functions =>
+ FunctionSelectionState::Nothing() if create_editors_for_nothing_functions => {
Some(FunctionEditor::new_immutable(
- func,
- FunctionID::new(idx),
- &pm.constants,
- &pm.dynamic_constants,
- &pm.types,
- &pm.labels,
- def_use,
- )),
- FunctionSelectionState::Nothing() => None,
- FunctionSelectionState::Everything() => Some(FunctionEditor::new(
- func,
- FunctionID::new(idx),
- &pm.constants,
- &pm.dynamic_constants,
- &pm.types,
- &pm.labels,
- def_use,
- )),
- FunctionSelectionState::Selection(mask) => Some(FunctionEditor::new_mask(
func,
FunctionID::new(idx),
&pm.constants,
@@ -1567,7 +1624,27 @@ fn build_selection<'a>(
&pm.types,
&pm.labels,
def_use,
- mask.clone(),
+ ))
+ }
+ FunctionSelectionState::Nothing() => None,
+ FunctionSelectionState::Everything() => Some(FunctionEditor::new(
+ func,
+ FunctionID::new(idx),
+ &pm.constants,
+ &pm.dynamic_constants,
+ &pm.types,
+ &pm.labels,
+ def_use,
+ )),
+ FunctionSelectionState::Selection(mask) => Some(FunctionEditor::new_mask(
+ func,
+ FunctionID::new(idx),
+ &pm.constants,
+ &pm.dynamic_constants,
+ &pm.types,
+ &pm.labels,
+ def_use,
+ mask.clone(),
)),
})
.collect()
@@ -2156,8 +2233,9 @@ fn run_pass(
None => false,
};
- let selection =
- selection.as_funcs().map_err(|_| SchedulerError::PassError {
+ let selection = selection
+ .as_funcs()
+ .map_err(|_| SchedulerError::PassError {
pass: "xdot".to_string(),
error: "expected coarse-grained selection (can't partially xdot a function)"
.to_string(),
@@ -2332,7 +2410,8 @@ fn run_pass(
});
}
- if let Some(funcs) = selection.as_funcs().ok() && funcs.len() == 1
+ if let Some(funcs) = selection.as_funcs().ok()
+ && funcs.len() == 1
{
let func = funcs[0];
pm.functions[func.idx()].name = new_name;
@@ -2801,7 +2880,9 @@ fn run_pass(
None => true,
};
- let selection = selection.as_funcs().map_err(|_| SchedulerError::PassError {
+ let selection = selection
+ .as_funcs()
+ .map_err(|_| SchedulerError::PassError {
pass: "xdot".to_string(),
error: "expected coarse-grained selection (can't partially xdot a function)"
.to_string(),
--
GitLab