[CIR][ThroughMLIR] Support lowering cir.condition and cir.while to scf.condition, scf.while #636
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| // RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fclangir -fno-clangir-direct-lowering -emit-mlir %s -o %t.mlir | ||
| // RUN: FileCheck --input-file=%t.mlir %s | ||
|
|
||
| void foo() { | ||
| int a = 0; | ||
| while(a < 2) { | ||
| a++; | ||
| } | ||
| } | ||
|
|
||
| //CHECK: func.func @foo() { | ||
| //CHECK: %alloca = memref.alloca() {alignment = 4 : i64} : memref<i32> | ||
| //CHECK: %c0_i32 = arith.constant 0 : i32 | ||
| //CHECK: memref.store %c0_i32, %alloca[] : memref<i32> | ||
| //CHECK: memref.alloca_scope { | ||
| //CHECK: scf.while : () -> () { | ||
| //CHECK: %0 = memref.load %alloca[] : memref<i32> | ||
| //CHECK: %c2_i32 = arith.constant 2 : i32 | ||
| //CHECK: %1 = arith.cmpi ult, %0, %c2_i32 : i32 | ||
| //CHECK: %2 = arith.extui %1 : i1 to i32 | ||
| //CHECK: %c0_i32_0 = arith.constant 0 : i32 | ||
| //CHECK: %3 = arith.cmpi ne, %2, %c0_i32_0 : i32 | ||
| //CHECK: %4 = arith.extui %3 : i1 to i8 | ||
| //CHECK: %5 = arith.trunci %4 : i8 to i1 | ||
| //CHECK: scf.condition(%5) | ||
| //CHECK: } do { | ||
| //CHECK: %0 = memref.load %alloca[] : memref<i32> | ||
| //CHECK: %c1_i32 = arith.constant 1 : i32 | ||
| //CHECK: %1 = arith.addi %0, %c1_i32 : i32 | ||
| //CHECK: memref.store %1, %alloca[] : memref<i32> | ||
| //CHECK: scf.yield | ||
| //CHECK: } | ||
| //CHECK: } | ||
| //CHECK: return | ||
| //CHECK: } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| // RUN: cir-opt %s -cir-to-mlir -o %t.mlir | ||
| // RUN: FileCheck %s --input-file %t.mlir | ||
|
|
||
| !s32i = !cir.int<s, 32> | ||
| module { | ||
|
There was a problem hiding this comment. Please either add a comment with the C/C++ code we could use to regen this test in case CIR changes significantly or add a test coming from C/C++ source. There was a problem hiding this comment. Ok, I will add some comment and test case There was a problem hiding this comment. Hello, I add a test coming from C source , can you review it? |
||
| cir.func @foo() { | ||
| %0 = cir.alloca !s32i, !cir.ptr<!s32i>, ["__retval"] {alignment = 4 : i64} | ||
| %1 = cir.alloca !s32i, !cir.ptr<!s32i>, ["a", init] {alignment = 4 : i64} | ||
| %2 = cir.const #cir.int<0> : !s32i | ||
| cir.store %2, %1 : !s32i, !cir.ptr<!s32i> | ||
| cir.while { | ||
| %3 = cir.load %1 : !cir.ptr<!s32i>, !s32i | ||
| %4 = cir.const #cir.int<2> : !s32i | ||
| %5 = cir.cmp(lt, %3, %4) : !s32i, !cir.bool | ||
| cir.condition(%5) | ||
| } do { | ||
| %3 = cir.load %1 : !cir.ptr<!s32i>, !s32i | ||
| %4 = cir.unary(inc, %3) : !s32i, !s32i | ||
| cir.store %4, %1 : !s32i, !cir.ptr<!s32i> | ||
| cir.yield | ||
| } | ||
| cir.return | ||
| } | ||
| } | ||
|
|
||
| //CHECK: module { | ||
| //CHECK-NEXT: func.func @foo() { | ||
| //CHECK-NEXT: %alloca = memref.alloca() {alignment = 4 : i64} : memref<i32> | ||
| //CHECK-NEXT: %alloca_0 = memref.alloca() {alignment = 4 : i64} : memref<i32> | ||
| //CHECK-NEXT: %c0_i32 = arith.constant 0 : i32 | ||
| //CHECK-NEXT: memref.store %c0_i32, %alloca_0[] : memref<i32> | ||
| //CHECK-NEXT: scf.while : () -> () { | ||
| //CHECK-NEXT: %0 = memref.load %alloca_0[] : memref<i32> | ||
| //CHECK-NEXT: %c2_i32 = arith.constant 2 : i32 | ||
| //CHECK-NEXT: %1 = arith.cmpi ult, %0, %c2_i32 : i32 | ||
| //CHECK-NEXT: %2 = arith.extui %1 : i1 to i8 | ||
| //CHECK-NEXT: %3 = arith.trunci %2 : i8 to i1 | ||
| //CHECK-NEXT: scf.condition(%3) | ||
| //CHECK-NEXT: } do { | ||
| //CHECK-NEXT: %0 = memref.load %alloca_0[] : memref<i32> | ||
| //CHECK-NEXT: %c1_i32 = arith.constant 1 : i32 | ||
| //CHECK-NEXT: %1 = arith.addi %0, %c1_i32 : i32 | ||
| //CHECK-NEXT: memref.store %1, %alloca_0[] : memref<i32> | ||
| //CHECK-NEXT: scf.yield | ||
| //CHECK-NEXT: } | ||
| //CHECK-NEXT: return | ||
| //CHECK-NEXT: } | ||
| //CHECK-NEXT:} | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: does the new adding include lines are required?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These files are generated by clangd’s auto-completion, and I believe they are not necessary
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hello, I have moved the CIRWhileOpLowering to LoweringSCFLoop.cpp , can you review it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could we remove the un-required including lines?