From 9c6bb4feb946c4117fc36470951bcf77e855eeec Mon Sep 17 00:00:00 2001
From: Aaron Councilman <aaronjc4@illinois.edu>
Date: Sun, 2 Mar 2025 13:27:25 -0600
Subject: [PATCH] Conditionals in scheduling language
---
juno_scheduler/src/compile.rs | 29 +++++++++++++++++++++++++++++
juno_scheduler/src/ir.rs | 5 +++++
juno_scheduler/src/lang.l | 3 +++
juno_scheduler/src/lang.y | 5 +++++
juno_scheduler/src/pm.rs | 17 +++++++++++++++++
5 files changed, 59 insertions(+)
diff --git a/juno_scheduler/src/compile.rs b/juno_scheduler/src/compile.rs
index 9d020c64..0db32bda 100644
--- a/juno_scheduler/src/compile.rs
+++ b/juno_scheduler/src/compile.rs
@@ -275,6 +275,35 @@ fn compile_stmt(
limit,
}])
}
+ parser::Stmt::IfThenElse {
+ span: _,
+ cond,
+ thn,
+ els,
+ } => {
+ let cond = compile_exp_as_expr(cond, lexer, macrostab, macros)?;
+
+ macros.open_scope();
+ let thn = ir::ScheduleStmt::Block {
+ body: compile_ops_as_block(*thn, lexer, macrostab, macros)?,
+ };
+ macros.close_scope();
+
+ macros.open_scope();
+ let els = match els {
+ Some(els) => ir::ScheduleStmt::Block {
+ body: compile_ops_as_block(*els, lexer, macrostab, macros)?,
+ },
+ None => ir::ScheduleStmt::Block { body: vec![] },
+ };
+ macros.close_scope();
+
+ Ok(vec![ir::ScheduleStmt::IfThenElse {
+ cond,
+ thn: Box::new(thn),
+ els: Box::new(els),
+ }])
+ }
parser::Stmt::MacroDecl { span: _, def } => {
let parser::MacroDecl {
name,
diff --git a/juno_scheduler/src/ir.rs b/juno_scheduler/src/ir.rs
index ab1495b8..98f8050f 100644
--- a/juno_scheduler/src/ir.rs
+++ b/juno_scheduler/src/ir.rs
@@ -180,4 +180,9 @@ pub enum ScheduleStmt {
device: Device,
on: Selector,
},
+ IfThenElse {
+ cond: ScheduleExp,
+ thn: Box<ScheduleStmt>,
+ els: Box<ScheduleStmt>,
+ },
}
diff --git a/juno_scheduler/src/lang.l b/juno_scheduler/src/lang.l
index af154fce..1f4f8723 100644
--- a/juno_scheduler/src/lang.l
+++ b/juno_scheduler/src/lang.l
@@ -20,12 +20,15 @@
\. "."
apply "apply"
+else "else"
fixpoint "fixpoint"
+if "if"
let "let"
macro "macro_keyword"
on "on"
set "set"
target "target"
+then "then"
true "true"
false "false"
diff --git a/juno_scheduler/src/lang.y b/juno_scheduler/src/lang.y
index 451f035b..55c82b9d 100644
--- a/juno_scheduler/src/lang.y
+++ b/juno_scheduler/src/lang.y
@@ -27,6 +27,10 @@ Stmt -> Stmt
{ Stmt::ExprStmt { span: $span, exp: $1 } }
| 'fixpoint' FixpointLimit '{' Schedule '}'
{ Stmt::Fixpoint { span: $span, limit: $2, body: Box::new($4) } }
+ | 'if' Expr '{' Schedule '}'
+ { Stmt::IfThenElse { span: $span, cond: $2, thn: Box::new($4), els: None } }
+ | 'if' Expr '{' Schedule '}' 'else' '{' Schedule '}'
+ { Stmt::IfThenElse { span: $span, cond: $2, thn: Box::new($4), els: Some(Box::new($8)) } }
| MacroDecl
{ Stmt::MacroDecl { span: $span, def: $1 } }
;
@@ -163,6 +167,7 @@ pub enum Stmt {
AssignStmt { span: Span, var: Span, rhs: Expr },
ExprStmt { span: Span, exp: Expr },
Fixpoint { span: Span, limit: FixpointLimit, body: Box<OperationList> },
+ IfThenElse { span: Span, cond: Expr, thn: Box<OperationList>, els: Option<Box<OperationList>> },
MacroDecl { span: Span, def: MacroDecl },
}
diff --git a/juno_scheduler/src/pm.rs b/juno_scheduler/src/pm.rs
index 62bdaf73..db1dfc9a 100644
--- a/juno_scheduler/src/pm.rs
+++ b/juno_scheduler/src/pm.rs
@@ -1199,6 +1199,23 @@ fn schedule_interpret(
// were made
Ok(i > 1)
}
+ ScheduleStmt::IfThenElse { cond, thn, els } => {
+ let (cond, modified) = interp_expr(pm, cond, stringtab, env, functions)?;
+ let Value::Boolean { val: cond } = cond else {
+ return Err(SchedulerError::SemanticError(
+ "Condition must be a boolean value".to_string(),
+ ));
+ };
+ let changed = schedule_interpret(
+ pm,
+ if cond { &*thn } else { &*els },
+ stringtab,
+ env,
+ functions,
+ )?;
+
+ Ok(modified || changed)
+ }
ScheduleStmt::Block { body } => {
let mut modified = false;
env.open_scope();
--
GitLab