Skip to content

rust test: Parallelize Slint compiler execution (and fix a stack usage hotspot) #12691

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
ogoffart merged 2 commits into from
Jul 29, 2026
+223 −186
Merged

rust test: Parallelize Slint compiler execution (and fix a stack usage hotspot) #12691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff59c10
test-driver-rust: run the Slint compiler on all cores in the build sc…
ogoffart Jul 29, 2026
64c4be3
compiler: reduce the stack usage of the remove_return pass
ogoffart Jul 29, 2026
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
221 changes: 123 additions & 98 deletions internal/compiler/passes/remove_return.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,111 +49,15 @@ fn process_expression(
process_codeblock(expr.into_iter().peekable(), toplevel, ty, ctx, symbol_counters)
}
Expression::Condition { condition, true_expr, false_expr } => {
let te = process_expression(*true_expr, false, ctx, ty, symbol_counters);
let fe = process_expression(*false_expr, false, ctx, ty, symbol_counters);
match (te, fe) {
(ExpressionResult::Just(te), ExpressionResult::Just(fe)) => {
Expression::Condition { condition, true_expr: te.into(), false_expr: fe.into() }
.into()
}
(ExpressionResult::Just(te), ExpressionResult::Return(fe)) => {
ExpressionResult::MaybeReturn {
pre_statements: Vec::new(),
condition: *condition,
returned_value: fe,
actual_value: cleanup_empty_block(te),
}
}
(ExpressionResult::Return(te), ExpressionResult::Just(fe)) => {
ExpressionResult::MaybeReturn {
pre_statements: Vec::new(),
condition: Expression::UnaryOp { sub: condition, op: '!' },
returned_value: te,
actual_value: cleanup_empty_block(fe),
}
}
(ExpressionResult::Return(te), ExpressionResult::Return(fe)) => {
ExpressionResult::Return(Some(Expression::Condition {
condition,
true_expr: te.unwrap_or(Expression::CodeBlock(Vec::new())).into(),
false_expr: fe.unwrap_or(Expression::CodeBlock(Vec::new())).into(),
}))
}
(te, fe) => {
let has_value = has_value(ty) && (te.has_value() || fe.has_value());
let ty = if has_value { ty } else { &Type::Void };
let te = te.into_return_object(ty, &ctx.ret_ty, symbol_counters);
let fe = fe.into_return_object(ty, &ctx.ret_ty, symbol_counters);
ExpressionResult::ReturnObject {
has_value,
has_return_value: self::has_value(&ctx.ret_ty),
value: Expression::Condition {
condition,
true_expr: te.into(),
false_expr: fe.into(),
},
}
}
}
process_condition(condition, true_expr, false_expr, ctx, ty, symbol_counters)
}
Expression::Cast { from, to } => {
let ty = if !has_value(ty) { ty.clone() } else { from.ty() };
process_expression(*from, toplevel, ctx, &ty, symbol_counters)
.map_value(symbol_counters, |e| Expression::Cast { from: e.into(), to })
}
Expression::StoreLocalVariable { name, value } => {
let inner_ty = value.ty();
match process_expression(*value, false, ctx, &inner_ty, symbol_counters) {
ExpressionResult::Just(e) => {
ExpressionResult::Just(Expression::StoreLocalVariable {
name,
value: Box::new(e),
})
}
ExpressionResult::Return(r) => ExpressionResult::Return(r),
ExpressionResult::MaybeReturn {
pre_statements,
condition,
returned_value,
actual_value,
} => ExpressionResult::MaybeReturn {
pre_statements,
condition,
returned_value,
actual_value: Some(Expression::StoreLocalVariable {
name,
value: Box::new(
actual_value.unwrap_or(Expression::default_value_for_type(&inner_ty)),
),
}),
},
ExpressionResult::ReturnObject { value, has_return_value, .. } => {
let tmp_name: SmolStr = symbol_counters.generate_name("return_check_store");
let value_ty = value.ty();
let load = |field: &str| Expression::StructFieldAccess {
base: Box::new(Expression::ReadLocalVariable {
name: tmp_name.clone(),
ty: value_ty.clone(),
}),
name: field.into(),
};
let condition = load(FIELD_CONDITION);
let returned_value = has_return_value.then(|| load(FIELD_RETURNED));
let actual_value = Some(Expression::StoreLocalVariable {
name,
value: Box::new(load(FIELD_ACTUAL)),
});
ExpressionResult::MaybeReturn {
pre_statements: vec![Expression::StoreLocalVariable {
name: tmp_name,
value: Box::new(value),
}],
condition,
returned_value,
actual_value,
}
}
}
process_store_local_variable(name, value, ctx, symbol_counters)
}
e => {
// Normally there shouldn't be any 'return' statements in there since return are not allowed in arbitrary expressions
Expand All @@ -166,6 +70,127 @@ fn process_expression(
}
}

fn process_condition(
condition: Box<Expression>,
true_expr: Box<Expression>,
false_expr: Box<Expression>,
ctx: &RemoveReturnContext,
ty: &Type,
symbol_counters: &SymbolCounters,
) -> ExpressionResult {
let te = process_expression(*true_expr, false, ctx, ty, symbol_counters);
let fe = process_expression(*false_expr, false, ctx, ty, symbol_counters);
merge_condition_branches(condition, te, fe, ctx, ty, symbol_counters)
}

fn merge_condition_branches(
condition: Box<Expression>,
te: ExpressionResult,
fe: ExpressionResult,
ctx: &RemoveReturnContext,
ty: &Type,
symbol_counters: &SymbolCounters,
) -> ExpressionResult {
match (te, fe) {
(ExpressionResult::Just(te), ExpressionResult::Just(fe)) => {
Expression::Condition { condition, true_expr: te.into(), false_expr: fe.into() }.into()
}
(ExpressionResult::Just(te), ExpressionResult::Return(fe)) => {
ExpressionResult::MaybeReturn {
pre_statements: Vec::new(),
condition: *condition,
returned_value: fe,
actual_value: cleanup_empty_block(te),
}
}
(ExpressionResult::Return(te), ExpressionResult::Just(fe)) => {
ExpressionResult::MaybeReturn {
pre_statements: Vec::new(),
condition: Expression::UnaryOp { sub: condition, op: '!' },
returned_value: te,
actual_value: cleanup_empty_block(fe),
}
}
(ExpressionResult::Return(te), ExpressionResult::Return(fe)) => {
ExpressionResult::Return(Some(Expression::Condition {
condition,
true_expr: te.unwrap_or(Expression::CodeBlock(Vec::new())).into(),
false_expr: fe.unwrap_or(Expression::CodeBlock(Vec::new())).into(),
}))
}
(te, fe) => {
let has_value = has_value(ty) && (te.has_value() || fe.has_value());
let ty = if has_value { ty } else { &Type::Void };
let te = te.into_return_object(ty, &ctx.ret_ty, symbol_counters);
let fe = fe.into_return_object(ty, &ctx.ret_ty, symbol_counters);
ExpressionResult::ReturnObject {
has_value,
has_return_value: self::has_value(&ctx.ret_ty),
value: Expression::Condition {
condition,
true_expr: te.into(),
false_expr: fe.into(),
},
}
}
}
}

fn process_store_local_variable(
name: SmolStr,
value: Box<Expression>,
ctx: &RemoveReturnContext,
symbol_counters: &SymbolCounters,
) -> ExpressionResult {
let inner_ty = value.ty();
match process_expression(*value, false, ctx, &inner_ty, symbol_counters) {
ExpressionResult::Just(e) => {
ExpressionResult::Just(Expression::StoreLocalVariable { name, value: Box::new(e) })
}
ExpressionResult::Return(r) => ExpressionResult::Return(r),
ExpressionResult::MaybeReturn {
pre_statements,
condition,
returned_value,
actual_value,
} => ExpressionResult::MaybeReturn {
pre_statements,
condition,
returned_value,
actual_value: Some(Expression::StoreLocalVariable {
name,
value: Box::new(
actual_value.unwrap_or(Expression::default_value_for_type(&inner_ty)),
),
}),
},
ExpressionResult::ReturnObject { value, has_return_value, .. } => {
let tmp_name: SmolStr = symbol_counters.generate_name("return_check_store");
let value_ty = value.ty();
let load = |field: &str| Expression::StructFieldAccess {
base: Box::new(Expression::ReadLocalVariable {
name: tmp_name.clone(),
ty: value_ty.clone(),
}),
name: field.into(),
};
let condition = load(FIELD_CONDITION);
let returned_value = has_return_value.then(|| load(FIELD_RETURNED));
let actual_value =
Some(Expression::StoreLocalVariable { name, value: Box::new(load(FIELD_ACTUAL)) });
ExpressionResult::MaybeReturn {
pre_statements: vec![Expression::StoreLocalVariable {
name: tmp_name,
value: Box::new(value),
}],
condition,
returned_value,
actual_value,
}
}
}
}

/// Return the expression, unless it is an empty codeblock, then return None
fn cleanup_empty_block(te: Expression) -> Option<Expression> {
if matches!(&te, Expression::CodeBlock(stmts) if stmts.is_empty()) { None } else { Some(te) }
Expand Down
1 change: 1 addition & 0 deletions tests/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ i-slint-renderer-skia = { version = "=1.18.0", path = "../internal/renderers/ski

image = { version = "0.25", default-features = false, features = ["png", "jpeg"] }
itertools = { version = "0.15" }
rayon = { version = "1.10", default-features = false }
spin_on = { version = "0.1" }

[profile.release]
Expand Down
1 change: 1 addition & 0 deletions tests/driver/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,6 @@ i-slint-backend-qt = { workspace = true }
[build-dependencies]
i-slint-compiler = { workspace = true, features = ["default", "rust", "display-diagnostics", "bundle-translations"], optional = true }

rayon = { workspace = true }
spin_on = { workspace = true, optional = true }
test_driver_lib = { path = "../driverlib" }
Loading