Skip to content

Revise the Generate Code Pass #229

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
tancheng merged 5 commits into from
Jan 5, 2026
Merged

Revise the Generate Code Pass #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bfbc9f4
update GenerateCodePass and tests
n0thingNoob Jan 4, 2026
297fb8e
update Generate code pass
n0thingNoob Jan 4, 2026
a78277a
update test
n0thingNoob Jan 4, 2026
0028887
update gencodepass
n0thingNoob Jan 4, 2026
73cd041
update GenerateCodePass.cpp
n0thingNoob Jan 4, 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
608 changes: 391 additions & 217 deletions lib/NeuraDialect/Transforms/GenerateCodePass.cpp
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 1 addition & 12 deletions test/code_gen/test_code_generate.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,16 +108,6 @@ func.func @loop_test() -> f32 {
// YAML-NEXT: dst_operands:
// YAML-NEXT: - operand: "$0"
// YAML-NEXT: color: "RED"
// YAML-NEXT: - opcode: "DATA_MOV"
// YAML-NEXT: id: 50
// YAML-NEXT: time_step: 5
// YAML-NEXT: invalid_iterations: 1
// YAML-NEXT: src_operands:
// YAML-NEXT: - operand: "EAST"
// YAML-NEXT: color: "RED"
// YAML-NEXT: dst_operands:
// YAML-NEXT: - operand: "$3"
// YAML-NEXT: color: "RED"

// ASM: # Compiled II: 5
// ASM: PE(1,0):
Expand All @@ -127,7 +117,6 @@ func.func @loop_test() -> f32 {
// ASM: PE(0,1):
// ASM-NEXT: {
// ASM-NEXT: DATA_MOV, [EAST, RED] -> [$0] (t=5, inv_iters=1)
// ASM-NEXT: DATA_MOV, [EAST, RED] -> [$3] (t=5, inv_iters=1)
// ASM-NEXT: } (idx_per_ii=0)
// ASM-NEXT: {
// ASM-NEXT: FADD, [NORTH, RED], [$0] -> [$1], [EAST, RED] (t=6, inv_iters=1)
Expand All @@ -139,7 +128,7 @@ func.func @loop_test() -> f32 {
// ASM-NEXT: GRANT_ONCE, [$0] -> [EAST, RED] (t=3, inv_iters=0)
// ASM-NEXT: } (idx_per_ii=3)
// ASM-NEXT: {
// ASM-NEXT: GRANT_PREDICATE, [$1], [$3] -> [NORTH, RED] (t=9, inv_iters=1)
// ASM-NEXT: GRANT_PREDICATE, [$1], [EAST, RED] -> [NORTH, RED] (t=9, inv_iters=1)
// ASM-NEXT: } (idx_per_ii=4)
// ASM: PE(1,1):
// ASM-NEXT: {
Expand Down
15 changes: 12 additions & 3 deletions test/e2e/bicg/bicg_kernel.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,16 @@
// YAML-NEXT: dst_operands:
// YAML-NEXT: - operand: "$0"
// YAML-NEXT: color: "RED"
// YAML-NEXT: - opcode: "DATA_MOV"
// YAML-NEXT: id: 700000
// YAML-NEXT: time_step: 13
// YAML-NEXT: invalid_iterations: 1
// YAML-NEXT: src_operands:
// YAML-NEXT: - operand: "$0"
// YAML-NEXT: color: "RED"
// YAML-NEXT: dst_operands:
// YAML-NEXT: - operand: "EAST"
// YAML-NEXT: color: "RED"
// YAML-NEXT: - index_per_ii: 1
// YAML-NEXT: operations:
// YAML-NEXT: - opcode: "ICMP_SGT"
Expand All @@ -207,6 +217,7 @@
// ASM: PE(0,0):
// ASM-NEXT: {
// ASM-NEXT: CONSTANT, [arg0] -> [$0] (t=0, inv_iters=0)
// ASM-NEXT: DATA_MOV, [$0] -> [EAST, RED] (t=13, inv_iters=1)
// ASM-NEXT: } (idx_per_ii=0)
// ASM-NEXT: {
// ASM-NEXT: ICMP_SGT, [$0], [#0] -> [NORTH, RED] (t=1, inv_iters=0)
Expand All @@ -233,6 +244,7 @@
// ASM-NEXT: {
// ASM-NEXT: GRANT_PREDICATE, [$0], [$1] -> [NORTH, RED] (t=14, inv_iters=1)
// ASM-NEXT: DATA_MOV, [EAST, RED] -> [$0] (t=14, inv_iters=1)
// ASM-NEXT: DATA_MOV, [WEST, RED] -> [$1] (t=14, inv_iters=1)
// ASM-NEXT: } (idx_per_ii=1)
// ASM-NEXT: {
// ASM-NEXT: GRANT_PREDICATE, [$0], [$1] -> [EAST, RED] (t=15, inv_iters=1)
Expand All @@ -241,9 +253,6 @@
// ASM-NEXT: DATA_MOV, [WEST, RED] -> [EAST, RED] (t=4, inv_iters=0)
// ASM-NEXT: } (idx_per_ii=4)
// ASM-NEXT: {
// ASM-NEXT: DATA_MOV, [WEST, RED] -> [$1] (t=11, inv_iters=0)
// ASM-NEXT: } (idx_per_ii=11)
// ASM-NEXT: {
// ASM-NEXT: NOT, [WEST, RED] -> [$0], [$1] (t=12, inv_iters=0)
// ASM-NEXT: DATA_MOV, [NORTH, RED] -> [EAST, RED] (t=12, inv_iters=0)
// ASM-NEXT: } (idx_per_ii=12)
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/fir/fir_kernel.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
// YAML-NEXT: src_operands:
// YAML-NEXT: - operand: "$0"
// YAML-NEXT: color: "RED"
// YAML-NEXT: - operand: "EAST"
// YAML-NEXT: - operand: "$1"
// YAML-NEXT: color: "RED"
// YAML-NEXT: dst_operands:
// YAML-NEXT: - operand: "EAST"
Expand All @@ -129,7 +129,7 @@
// ASM-NEXT: CTRL_MOV, [EAST, RED] -> [$1] (t=8, inv_iters=1)
// ASM-NEXT: } (idx_per_ii=3)
// ASM-NEXT: {
// ASM-NEXT: PHI_START, [$0], [EAST, RED] -> [EAST, RED] (t=4, inv_iters=0)
// ASM-NEXT: PHI_START, [$0], [$1] -> [EAST, RED] (t=4, inv_iters=0)
// ASM-NEXT: } (idx_per_ii=4)
// ASM: PE(1,1):
// ASM-NEXT: {
Expand All @@ -147,12 +147,12 @@
// ASM-NEXT: } (idx_per_ii=0)
// ASM-NEXT: {
// ASM-NEXT: ADD, [NORTH, RED], [SOUTH, RED] -> [SOUTH, RED], [$0] (t=6, inv_iters=1)
// ASM-NEXT: DATA_MOV, [EAST, RED] -> [$1] (t=6, inv_iters=1)
// ASM-NEXT: } (idx_per_ii=1)
// ASM-NEXT: {
// ASM-NEXT: GRANT_PREDICATE, [$0], [$1] -> [$0] (t=7, inv_iters=1)
// ASM-NEXT: } (idx_per_ii=2)
// ASM-NEXT: {
// ASM-NEXT: DATA_MOV, [EAST, RED] -> [$1] (t=3, inv_iters=0)
// ASM-NEXT: RETURN_VALUE, [$0] (t=8, inv_iters=1)
// ASM-NEXT: } (idx_per_ii=3)
// ASM: PE(2,2):
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/fir/fir_kernel_vec.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,12 @@
// ASM-NEXT: } (idx_per_ii=0)
// ASM-NEXT: {
// ASM-NEXT: VADD, [NORTH, RED], [SOUTH, RED] -> [SOUTH, RED], [$0] (t=6, inv_iters=1)
// ASM-NEXT: DATA_MOV, [EAST, RED] -> [$1] (t=6, inv_iters=1)
// ASM-NEXT: } (idx_per_ii=1)
// ASM-NEXT: {
// ASM-NEXT: GRANT_PREDICATE, [$0], [$1] -> [$0] (t=7, inv_iters=1)
// ASM-NEXT: } (idx_per_ii=2)
// ASM-NEXT: {
// ASM-NEXT: DATA_MOV, [EAST, RED] -> [$1] (t=3, inv_iters=0)
// ASM-NEXT: VECTOR.REDUCE.ADD, [$0] -> [$0] (t=8, inv_iters=1)
// ASM-NEXT: } (idx_per_ii=3)
// ASM-NEXT: {
Expand Down
29 changes: 13 additions & 16 deletions test/e2e/histogram/histogram_kernel.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,16 @@
// YAML-NEXT: instructions:
// YAML-NEXT: - index_per_ii: 0
// YAML-NEXT: operations:
// YAML-NEXT: - opcode: "DATA_MOV"
// YAML-NEXT: id: 15
// YAML-NEXT: time_step: 5
// YAML-NEXT: invalid_iterations: 1
// YAML-NEXT: src_operands:
// YAML-NEXT: - operand: "NORTH"
// YAML-NEXT: color: "RED"
// YAML-NEXT: dst_operands:
// YAML-NEXT: - operand: "$1"
// YAML-NEXT: color: "RED"
// YAML-NEXT: - opcode: "GRANT_PREDICATE"
// YAML-NEXT: id: 18
// YAML-NEXT: time_step: 10
Expand All @@ -108,18 +118,6 @@
// YAML-NEXT: src_operands:
// YAML-NEXT: - operand: "$2"
// YAML-NEXT: color: "RED"
// YAML-NEXT: - index_per_ii: 3
// YAML-NEXT: operations:
// YAML-NEXT: - opcode: "DATA_MOV"
// YAML-NEXT: id: 15
// YAML-NEXT: time_step: 3
// YAML-NEXT: invalid_iterations: 0
// YAML-NEXT: src_operands:
// YAML-NEXT: - operand: "NORTH"
// YAML-NEXT: color: "RED"
// YAML-NEXT: dst_operands:
// YAML-NEXT: - operand: "$1"
// YAML-NEXT: color: "RED"
// YAML-NEXT: - index_per_ii: 4
// YAML-NEXT: operations:
// YAML-NEXT: - opcode: "DATA_MOV"
Expand All @@ -136,15 +134,13 @@
// ASM: # Compiled II: 5
// ASM: PE(3,1):
// ASM-NEXT: {
// ASM-NEXT: DATA_MOV, [NORTH, RED] -> [$1] (t=5, inv_iters=1)
// ASM-NEXT: GRANT_PREDICATE, [$0], [$1] -> [$2] (t=10, inv_iters=2)
// ASM-NEXT: } (idx_per_ii=0)
// ASM-NEXT: {
// ASM-NEXT: RETURN_VOID, [$2] (t=11, inv_iters=2)
// ASM-NEXT: } (idx_per_ii=1)
// ASM-NEXT: {
// ASM-NEXT: DATA_MOV, [NORTH, RED] -> [$1] (t=3, inv_iters=0)
// ASM-NEXT: } (idx_per_ii=3)
// ASM-NEXT: {
// ASM-NEXT: DATA_MOV, [NORTH, RED] -> [$0] (t=4, inv_iters=0)
// ASM-NEXT: } (idx_per_ii=4)
// ASM: PE(2,2):
Expand Down Expand Up @@ -172,10 +168,11 @@
// ASM-NEXT: ADD, [$0], [#1] -> [$0], [WEST, RED] (t=2, inv_iters=0)
// ASM-NEXT: } (idx_per_ii=2)
// ASM-NEXT: {
// ASM-NEXT: ICMP_EQ, [$0], [#20] -> [WEST, RED], [SOUTH, RED] (t=3, inv_iters=0)
// ASM-NEXT: ICMP_EQ, [$0], [#20] -> [WEST, RED], [SOUTH, RED], [$0] (t=3, inv_iters=0)
// ASM-NEXT: } (idx_per_ii=3)
// ASM-NEXT: {
// ASM-NEXT: MUL, [WEST, RED], [#5] -> [NORTH, RED] (t=4, inv_iters=0)
// ASM-NEXT: DATA_MOV, [$0] -> [SOUTH, RED] (t=4, inv_iters=0)
// ASM-NEXT: } (idx_per_ii=4)

// RUN: mlir-neura-opt %t-kernel.mlir --view-op-graph 2>&1 | sed -n '/^digraph G {/,/^}$/p' > histogram_kernel_original.dot
Expand Down
5 changes: 1 addition & 4 deletions test/mapping_quality/branch_for.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,11 +276,8 @@ func.func @loop_test() -> f32 {
// ASM-NEXT: DATA_MOV, [NORTH, RED] -> [$0] (t=4, inv_iters=1)
// ASM-NEXT: } (idx_per_ii=0)
// ASM-NEXT: {
// ASM-NEXT: GRANT_PREDICATE, [$0], [$0] -> [NORTH, RED] (t=6, inv_iters=1)
// ASM-NEXT: GRANT_PREDICATE, [$0], [NORTH, RED] -> [NORTH, RED] (t=6, inv_iters=1)
// ASM-NEXT: } (idx_per_ii=2)
// ASM-NEXT: {
// ASM-NEXT: DATA_MOV, [NORTH, RED] -> [$0] (t=3, inv_iters=0)
// ASM-NEXT: } (idx_per_ii=3)
// ASM: PE(0,1):
// ASM-NEXT: {
// ASM-NEXT: GRANT_PREDICATE, [SOUTH, RED], [EAST, RED] -> [EAST, RED] (t=4, inv_iters=1)
Expand Down