Skip to content
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

transformations: Split varith into neighbour and own data across csl_stencil regions #3307

Merged
merged 12 commits into from
Oct 24, 2024
Merged

transformations: Split varith into neighbour and own data across csl_stencil regions #3307

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
cdeecca
transformations: (convert-stencil-to-csl-stencil) Support varith
n-io Oct 16, 2024
a342ed1
Merge branch 'main' into nicolai/csl-stencil-varith
n-io Oct 22, 2024
65dacb5
Merge branch 'main' into nicolai/csl-stencil-varith
n-io Oct 22, 2024
7a30c4e
transformations: (arith-to-varith) Support more cases
n-io Oct 22, 2024
c5a5610
remove unused code
n-io Oct 22, 2024
1e39e47
Merge branch 'nicolai/arith-to-varith-fix' into nicolai/csl-stencil-v…
n-io Oct 22, 2024
49e8088
use varith
n-io Oct 22, 2024
8708130
remove default value flag
n-io Oct 22, 2024
3eef80a
Merge branch 'main' into nicolai/csl-stencil-varith
n-io Oct 23, 2024
e7e23c9
fix filecheck
n-io Oct 23, 2024
f9a0f0d
fix filecheck
n-io Oct 23, 2024
b83551c
fixes
n-io Oct 24, 2024
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
46 changes: 43 additions & 3 deletions tests/filecheck/transforms/convert-arith-to-varith.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func.func @test_addi() {
// CHECK-NEXT: %a, %b, %c = "test.op"() : () -> (i32, i32, i32)
// CHECK-NEXT: %0, %1, %2 = "test.op"() : () -> (i32, i32, i32)
// CHECK-NEXT: %x2 = arith.addi %0, %1 : i32
// CHECK-NEXT: %r = varith.add %c, %a, %b, %2, %0, %1 : i32
// CHECK-NEXT: %r = varith.add %a, %b, %c, %0, %1, %2 : i32
// CHECK-NEXT: "test.op"(%r, %x2) : (i32, i32) -> ()
}

Expand All @@ -45,7 +45,7 @@ func.func @test_addf() {
// CHECK-NEXT: %a, %b, %c = "test.op"() : () -> (f32, f32, f32)
// CHECK-NEXT: %0, %1, %2 = "test.op"() : () -> (f32, f32, f32)
// CHECK-NEXT: %x2 = arith.addf %0, %1 : f32
// CHECK-NEXT: %r = varith.add %c, %a, %b, %2, %0, %1 : f32
// CHECK-NEXT: %r = varith.add %a, %b, %c, %0, %1, %2 : f32
// CHECK-NEXT: "test.op"(%r, %x2) : (f32, f32) -> ()
}

Expand All @@ -69,6 +69,46 @@ func.func @test_mulf() {
// CHECK-NEXT: %a, %b, %c = "test.op"() : () -> (f32, f32, f32)
// CHECK-NEXT: %0, %1, %2 = "test.op"() : () -> (f32, f32, f32)
// CHECK-NEXT: %x2 = arith.mulf %0, %1 : f32
// CHECK-NEXT: %r = varith.mul %c, %a, %b, %2, %0, %1 : f32
// CHECK-NEXT: %r = varith.mul %a, %b, %c, %0, %1, %2 : f32
// CHECK-NEXT: "test.op"(%r, %x2) : (f32, f32) -> ()
}

func.func @test() {
%0, %1, %2, %3, %4, %5 = "test.op"() : () -> (tensor<8xf32>, tensor<8xf32>, tensor<8xf32>, tensor<8xf32>, tensor<8xf32>, tensor<8xf32>)
%6 = arith.constant dense<1.234500e-01> : tensor<8xf32>
%a = arith.addf %5, %4 : tensor<8xf32>
%b = arith.addf %a, %3 : tensor<8xf32>
%c = arith.addf %b, %2 : tensor<8xf32>
%d = arith.addf %c, %1 : tensor<8xf32>
%e = arith.addf %d, %0 : tensor<8xf32>
%12 = arith.mulf %e, %6 : tensor<8xf32>
"test.op"(%12) : (tensor<8xf32>) -> ()
func.return

// CHECK-LABEL: @test
// CHECK-NEXT: %0, %1, %2, %3, %4, %5 = "test.op"() : () -> (tensor<8xf32>, tensor<8xf32>, tensor<8xf32>, tensor<8xf32>, tensor<8xf32>, tensor<8xf32>)
// CHECK-NEXT: %6 = arith.constant dense<1.234500e-01> : tensor<8xf32>
// CHECK-NEXT: %e = varith.add %5, %4, %3, %2, %1, %0 : tensor<8xf32>
// CHECK-NEXT: %7 = arith.mulf %e, %6 : tensor<8xf32>
// CHECK-NEXT: "test.op"(%7) : (tensor<8xf32>) -> ()
}

func.func @test2() {
%0, %1, %2, %3, %4, %5 = "test.op"() : () -> (tensor<8xf32>, tensor<8xf32>, tensor<8xf32>, tensor<8xf32>, tensor<8xf32>, tensor<8xf32>)
%6 = arith.constant dense<1.234500e-01> : tensor<8xf32>
%a = arith.addf %5, %4 : tensor<8xf32>
%b = arith.addf %3, %a : tensor<8xf32>
%c = arith.addf %2, %b : tensor<8xf32>
%d = arith.addf %1, %c : tensor<8xf32>
%e = arith.addf %0, %d : tensor<8xf32>
%12 = arith.mulf %e, %6 : tensor<8xf32>
"test.op"(%12) : (tensor<8xf32>) -> ()
func.return

// CHECK-LABEL: @test
// CHECK-NEXT: %0, %1, %2, %3, %4, %5 = "test.op"() : () -> (tensor<8xf32>, tensor<8xf32>, tensor<8xf32>, tensor<8xf32>, tensor<8xf32>, tensor<8xf32>)
// CHECK-NEXT: %6 = arith.constant dense<1.234500e-01> : tensor<8xf32>
// CHECK-NEXT: %e = varith.add %1, %2, %3, %5, %4, %0 : tensor<8xf32>
// CHECK-NEXT: %7 = arith.mulf %e, %6 : tensor<8xf32>
// CHECK-NEXT: "test.op"(%7) : (tensor<8xf32>) -> ()
}
Loading
Loading