Skip to content

Mark SCF operations as IsolatedFromAbove #22

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
denialhaag merged 1 commit into from
Jun 5, 2026
Merged

Mark SCF operations as IsolatedFromAbove #22

Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions include/jeff/IR/JeffOps.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1882,7 +1882,7 @@ def FloatArrayCreateOp : FloatArray_Op<"float_array_create", []> {

class SCF_Op<string mnemonic, list<Trait> traits = []> : Jeff_Op<mnemonic, traits # [SCFOperation]>;

def SwitchOp : SCF_Op<"switch", [SingleBlockImplicitTerminator<"jeff::YieldOp">]> {
def SwitchOp : SCF_Op<"switch", [IsolatedFromAbove, SingleBlockImplicitTerminator<"jeff::YieldOp">]> {
let summary = "Multi-way branch on an integer selector";
let description = [{
The `jeff.switch` operation dispatches on an integer selector to one of
Expand Down Expand Up @@ -1982,7 +1982,7 @@ def SwitchOp : SCF_Op<"switch", [SingleBlockImplicitTerminator<"jeff::YieldOp">]
let hasRegionVerifier = 1;
}

def ForOp : SCF_Op<"for", [SingleBlockImplicitTerminator<"jeff::YieldOp">]> {
def ForOp : SCF_Op<"for", [IsolatedFromAbove, SingleBlockImplicitTerminator<"jeff::YieldOp">]> {
let summary = "Counted for loop with iteration arguments";
let description = [{
The `jeff.for` operation represents a counted loop over a half-open
Expand Down Expand Up @@ -2079,7 +2079,7 @@ def ForOp : SCF_Op<"for", [SingleBlockImplicitTerminator<"jeff::YieldOp">]> {
let hasRegionVerifier = 1;
}

def WhileOp : SCF_Op<"while", [SingleBlockImplicitTerminator<"jeff::YieldOp">]> {
def WhileOp : SCF_Op<"while", [IsolatedFromAbove, SingleBlockImplicitTerminator<"jeff::YieldOp">]> {
let summary = "While loop with iteration arguments";
let description = [{
The `jeff.while` operation represents a loop that repeats while a
Expand Down Expand Up @@ -2182,7 +2182,7 @@ def WhileOp : SCF_Op<"while", [SingleBlockImplicitTerminator<"jeff::YieldOp">]>
let hasRegionVerifier = 1;
}

def DoWhileOp : SCF_Op<"doWhile", [SingleBlockImplicitTerminator<"jeff::YieldOp">]> {
def DoWhileOp : SCF_Op<"doWhile", [IsolatedFromAbove, SingleBlockImplicitTerminator<"jeff::YieldOp">]> {
let summary = "Do-while loop with iteration arguments";
let description = [{
The `jeff.doWhile` operation represents a loop that repeats while a
Expand Down
18 changes: 9 additions & 9 deletions unittests/IR/test_parse_switch_op.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,19 +120,19 @@ TEST_F(SwitchOpTest, DecoupledInValueAndResultTypes) {
TEST_F(SwitchOpTest, Nested) {
const std::string src = R"MLIR(
func.func @f(%sel: i32, %a: i32) -> i32 {
%r = jeff.switch (%sel, %a) : (i32, i32) -> (i32)
case 0 args(%x) {
%s = jeff.switch (%sel, %x) : (i32, i32) -> (i32)
case 0 args(%xx) {
jeff.yield %xx : i32
%r = jeff.switch (%sel, %sel, %a) : (i32, i32, i32) -> (i32)
case 0 args(%sel_arg, %a_arg) {
%s = jeff.switch (%sel_arg, %a_arg) : (i32, i32) -> (i32)
case 0 args(%a_arg_arg) {
jeff.yield %a_arg_arg : i32
}
default args(%xx) {
jeff.yield %xx : i32
default args(%a_arg_arg) {
jeff.yield %a_arg_arg : i32
}
jeff.yield %s : i32
}
default args(%x) {
jeff.yield %x : i32
default args(%sel_arg, %a_arg) {
jeff.yield %a_arg : i32
}
return %r : i32
}
Expand Down