-
Notifications
You must be signed in to change notification settings - Fork 11k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[flang][hlfir] Add hlfir.dot_product intrinsic
Adds a new HLFIR operation for the DOT_PRODUCT intrinsic according to the design set out in flang/docs/HighLevel.md. This patch includes all the necessary changes to create a new HLFIR operation and lower it into the fir runtime call. Differential Revision: https://reviews.llvm.org/D152252
- Loading branch information
1 parent
b05c63f
commit 9471637
Showing
8 changed files
with
333 additions
and
2 deletions.
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
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,80 @@ | ||
| // Test hlfir.matmul operation lowering to fir runtime call | ||
| // RUN: fir-opt %s -lower-hlfir-intrinsics | FileCheck %s | ||
|
|
||
| func.func @_QPdot_product1(%arg0: !fir.box<!fir.array<?xi32>> {fir.bindc_name = "lhs"}, %arg1: !fir.box<!fir.array<?xi32>> {fir.bindc_name = "rhs"}, %arg2: !fir.ref<i32> {fir.bindc_name = "res"}) { | ||
| %0:2 = hlfir.declare %arg0 {uniq_name = "_QFdot_product1Elhs"} : (!fir.box<!fir.array<?xi32>>) -> (!fir.box<!fir.array<?xi32>>, !fir.box<!fir.array<?xi32>>) | ||
| %1:2 = hlfir.declare %arg2 {uniq_name = "_QFdot_product1Eres"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>) | ||
| %2:2 = hlfir.declare %arg1 {uniq_name = "_QFdot_product1Erhs"} : (!fir.box<!fir.array<?xi32>>) -> (!fir.box<!fir.array<?xi32>>, !fir.box<!fir.array<?xi32>>) | ||
| %3 = hlfir.dot_product %0#0 %2#0 {fastmath = #arith.fastmath<contract>} : (!fir.box<!fir.array<?xi32>>, !fir.box<!fir.array<?xi32>>) -> i32 | ||
| hlfir.assign %3 to %1#0 : i32, !fir.ref<i32> | ||
| return | ||
| } | ||
| // CHECK-LABEL: func.func @_QPdot_product1( | ||
| // CHECK: %[[ARG0:.*]]: !fir.box<!fir.array<?xi32>> {fir.bindc_name = "lhs"} | ||
| // CHECK: %[[ARG1:.*]]: !fir.box<!fir.array<?xi32>> {fir.bindc_name = "rhs"} | ||
| // CHECK: %[[ARG2:.*]]: !fir.ref<i32> {fir.bindc_name = "res"} | ||
| // CHECK-DAG: %[[LHS_VAR:.*]]:2 = hlfir.declare %[[ARG0]] | ||
| // CHECK-DAG: %[[RHS_VAR:.*]]:2 = hlfir.declare %[[ARG1]] | ||
| // CHECK-DAG: %[[RES_VAR:.*]]:2 = hlfir.declare %[[ARG2]] | ||
|
|
||
| // CHECK-DAG: %[[LHS_ARG:.*]] = fir.convert %[[LHS_VAR]]#1 : (!fir.box<!fir.array<?xi32>>) -> !fir.box<none> | ||
| // CHECK-DAG: %[[RHS_ARG:.*]] = fir.convert %[[RHS_VAR]]#1 : (!fir.box<!fir.array<?xi32>>) -> !fir.box<none> | ||
|
|
||
| // CHECK: %[[NONE:.*]] = fir.call @_FortranADotProductInteger4(%[[LHS_ARG]], %[[RHS_ARG]], %[[LOC_STR:.*]], %[[LOC_N:.*]]) | ||
| // CHECK-NEXT: hlfir.assign %[[NONE]] to %[[RES_VAR]]#0 : i32, !fir.ref<i32> | ||
| // CHECK-NEXT: return | ||
| // CHECK-NEXT: } | ||
|
|
||
| func.func @_QPdot_product2(%arg0: !fir.box<!fir.array<?x!fir.logical<4>>> {fir.bindc_name = "lhs"}, %arg1: !fir.box<!fir.array<?x!fir.logical<4>>> {fir.bindc_name = "rhs"}, %arg2: !fir.ref<!fir.logical<4>> {fir.bindc_name = "res"}) { | ||
| %0:2 = hlfir.declare %arg0 {uniq_name = "_QFdot_product2Elhs"} : (!fir.box<!fir.array<?x!fir.logical<4>>>) -> (!fir.box<!fir.array<?x!fir.logical<4>>>, !fir.box<!fir.array<?x!fir.logical<4>>>) | ||
| %1:2 = hlfir.declare %arg2 {uniq_name = "_QFdot_product2Eres"} : (!fir.ref<!fir.logical<4>>) -> (!fir.ref<!fir.logical<4>>, !fir.ref<!fir.logical<4>>) | ||
| %2:2 = hlfir.declare %arg1 {uniq_name = "_QFdot_product2Erhs"} : (!fir.box<!fir.array<?x!fir.logical<4>>>) -> (!fir.box<!fir.array<?x!fir.logical<4>>>, !fir.box<!fir.array<?x!fir.logical<4>>>) | ||
| %3 = hlfir.dot_product %0#0 %2#0 {fastmath = #arith.fastmath<contract>} : (!fir.box<!fir.array<?x!fir.logical<4>>>, !fir.box<!fir.array<?x!fir.logical<4>>>) -> !fir.logical<4> | ||
| hlfir.assign %3 to %1#0 : !fir.logical<4>, !fir.ref<!fir.logical<4>> | ||
| return | ||
| } | ||
| // CHECK-LABEL: func.func @_QPdot_product2( | ||
| // CHECK: %[[ARG0:.*]]: !fir.box<!fir.array<?x!fir.logical<4>>> {fir.bindc_name = "lhs"} | ||
| // CHECK: %[[ARG1:.*]]: !fir.box<!fir.array<?x!fir.logical<4>>> {fir.bindc_name = "rhs"} | ||
| // CHECK: %[[ARG2:.*]]: !fir.ref<!fir.logical<4>> {fir.bindc_name = "res"} | ||
| // CHECK-DAG: %[[LHS_VAR:.*]]:2 = hlfir.declare %[[ARG0]] | ||
| // CHECK-DAG: %[[RHS_VAR:.*]]:2 = hlfir.declare %[[ARG1]] | ||
| // CHECK-DAG: %[[RES_VAR:.*]]:2 = hlfir.declare %[[ARG2]] | ||
|
|
||
| // CHECK-DAG: %[[LHS_ARG:.*]] = fir.convert %[[LHS_VAR]]#1 : (!fir.box<!fir.array<?x!fir.logical<4>>>) -> !fir.box<none> | ||
| // CHECK-DAG: %[[RHS_ARG:.*]] = fir.convert %[[RHS_VAR]]#1 : (!fir.box<!fir.array<?x!fir.logical<4>>>) -> !fir.box<none> | ||
|
|
||
| // CHECK: %[[NONE:.*]] = fir.call @_FortranADotProductLogical(%[[LHS_ARG]], %[[RHS_ARG]], %[[LOC_STR:.*]], %[[LOC_N:.*]]) | ||
| // CHECK-NEXT: hlfir.assign %[[NONE]] to %[[RES_VAR]]#0 : i1, !fir.ref<!fir.logical<4>> | ||
| // CHECK-NEXT: return | ||
| // CHECK-NEXT: } | ||
|
|
||
| func.func @_QPdot_product3(%arg0: !fir.ref<!fir.array<5xi32>> {fir.bindc_name = "lhs"}, %arg1: !fir.ref<!fir.array<5xi32>> {fir.bindc_name = "rhs"}, %arg2: !fir.ref<i32> {fir.bindc_name = "res"}) { | ||
| %c5 = arith.constant 5 : index | ||
| %0 = fir.shape %c5 : (index) -> !fir.shape<1> | ||
| %1:2 = hlfir.declare %arg0(%0) {uniq_name = "_QFdot_product3Elhs"} : (!fir.ref<!fir.array<5xi32>>, !fir.shape<1>) -> (!fir.ref<!fir.array<5xi32>>, !fir.ref<!fir.array<5xi32>>) | ||
| %2:2 = hlfir.declare %arg2 {uniq_name = "_QFdot_product3Eres"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>) | ||
| %c5_0 = arith.constant 5 : index | ||
| %3 = fir.shape %c5_0 : (index) -> !fir.shape<1> | ||
| %4:2 = hlfir.declare %arg1(%3) {uniq_name = "_QFdot_product3Erhs"} : (!fir.ref<!fir.array<5xi32>>, !fir.shape<1>) -> (!fir.ref<!fir.array<5xi32>>, !fir.ref<!fir.array<5xi32>>) | ||
| %5 = hlfir.dot_product %1#0 %4#0 {fastmath = #arith.fastmath<contract>} : (!fir.ref<!fir.array<5xi32>>, !fir.ref<!fir.array<5xi32>>) -> i32 | ||
| hlfir.assign %5 to %2#0 : i32, !fir.ref<i32> | ||
| return | ||
| } | ||
| // CHECK-LABEL: func.func @_QPdot_product3( | ||
| // CHECK: %[[ARG0:.*]]: !fir.ref<!fir.array<5xi32>> {fir.bindc_name = "lhs"} | ||
| // CHECK: %[[ARG1:.*]]: !fir.ref<!fir.array<5xi32>> {fir.bindc_name = "rhs"} | ||
| // CHECK: %[[ARG2:.*]]: !fir.ref<i32> {fir.bindc_name = "res"} | ||
| // CHECK-DAG: %[[LHS_VAR:.*]]:2 = hlfir.declare %[[ARG0]] | ||
| // CHECK-DAG: %[[RHS_VAR:.*]]:2 = hlfir.declare %[[ARG1]] | ||
| // CHECK-DAG: %[[RES_VAR:.*]]:2 = hlfir.declare %[[ARG2]] | ||
|
|
||
| // CHECK-DAG: %[[LHS_BOX:.*]] = fir.embox %[[LHS_VAR]]#1 | ||
| // CHECK-DAG: %[[RHS_BOX:.*]] = fir.embox %[[RHS_VAR]]#1 | ||
| // CHECK-DAG: %[[LHS_ARG:.*]] = fir.convert %[[LHS_BOX]] : (!fir.box<!fir.array<5xi32>>) -> !fir.box<none> | ||
| // CHECK-DAG: %[[RHS_ARG:.*]] = fir.convert %[[RHS_BOX]] : (!fir.box<!fir.array<5xi32>>) -> !fir.box<none> | ||
|
|
||
| // CHECK: %[[NONE:.*]] = fir.call @_FortranADotProductInteger4(%[[LHS_ARG]], %[[RHS_ARG]], %[[LOC_STR:.*]], %[[LOC_N:.*]]) | ||
| // CHECK-NEXT: hlfir.assign %[[NONE]] to %[[RES_VAR]]#0 : i32, !fir.ref<i32> | ||
| // CHECK-NEXT: return | ||
| // CHECK-NEXT: } |
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,51 @@ | ||
| // Test hlfir.dot_product operation parse, verify (no errors), and unparse | ||
|
|
||
| // RUN: fir-opt %s | fir-opt | FileCheck %s | ||
|
|
||
| // arguments are expressions of known shape | ||
| func.func @dot_product0(%arg0: !hlfir.expr<2xi32>, %arg1: !hlfir.expr<2xi32>) { | ||
| %res = hlfir.dot_product %arg0 %arg1 : (!hlfir.expr<2xi32>, !hlfir.expr<2xi32>) -> i32 | ||
| return | ||
| } | ||
| // CHECK-LABEL: func.func @dot_product0 | ||
| // CHECK: %[[ARG0:.*]]: !hlfir.expr<2xi32>, | ||
| // CHECK: %[[ARG1:.*]]: !hlfir.expr<2xi32> | ||
| // CHECK-NEXT: %[[RES:.*]] = hlfir.dot_product %[[ARG0]] %[[ARG1]] : (!hlfir.expr<2xi32>, !hlfir.expr<2xi32>) -> i32 | ||
| // CHECK-NEXT: return | ||
| // CHECK-NEXT: } | ||
|
|
||
| // arguments are expressions of assumed shape | ||
| func.func @dot_product1(%arg0: !hlfir.expr<?xi32>, %arg1: !hlfir.expr<?xi32>) { | ||
| %res = hlfir.dot_product %arg0 %arg1 : (!hlfir.expr<?xi32>, !hlfir.expr<?xi32>) -> i32 | ||
| return | ||
| } | ||
| // CHECK-LABEL: func.func @dot_product1 | ||
| // CHECK: %[[ARG0:.*]]: !hlfir.expr<?xi32>, | ||
| // CHECK: %[[ARG1:.*]]: !hlfir.expr<?xi32> | ||
| // CHECK-NEXT: %[[RES:.*]] = hlfir.dot_product %[[ARG0]] %[[ARG1]] : (!hlfir.expr<?xi32>, !hlfir.expr<?xi32>) -> i32 | ||
| // CHECK-NEXT: return | ||
| // CHECK-NEXT: } | ||
|
|
||
| // arguments are boxed arrays | ||
| func.func @dot_product2(%arg0: !fir.box<!fir.array<2xi32>>, %arg1: !fir.box<!fir.array<2xi32>>) { | ||
| %res = hlfir.dot_product %arg0 %arg1 : (!fir.box<!fir.array<2xi32>>, !fir.box<!fir.array<2xi32>>) -> i32 | ||
| return | ||
| } | ||
| // CHECK-LABEL: func.func @dot_product2 | ||
| // CHECK: %[[ARG0:.*]]: !fir.box<!fir.array<2xi32>>, | ||
| // CHECK: %[[ARG1:.*]]: !fir.box<!fir.array<2xi32>> | ||
| // CHECK-NEXT: %[[RES:.*]] = hlfir.dot_product %[[ARG0]] %[[ARG1]] : (!fir.box<!fir.array<2xi32>>, !fir.box<!fir.array<2xi32>>) -> i32 | ||
| // CHECK-NEXT: return | ||
| // CHECK-NEXT: } | ||
|
|
||
| // arguments are logical | ||
| func.func @dot_product3(%arg0: !fir.box<!fir.array<2x!fir.logical<4>>>, %arg1: !fir.box<!fir.array<2x!fir.logical<4>>>) { | ||
| %res = hlfir.dot_product %arg0 %arg1 : (!fir.box<!fir.array<2x!fir.logical<4>>>, !fir.box<!fir.array<2x!fir.logical<4>>>) -> !fir.logical<4> | ||
| return | ||
| } | ||
| // CHECK-LABEL: func.func @dot_product3 | ||
| // CHECK: %[[ARG0:.*]]: !fir.box<!fir.array<2x!fir.logical<4>>>, | ||
| // CHECK: %[[ARG1:.*]]: !fir.box<!fir.array<2x!fir.logical<4>>> | ||
| // CHECK-NEXT: %[[RES:.*]] = hlfir.dot_product %[[ARG0]] %[[ARG1]] : (!fir.box<!fir.array<2x!fir.logical<4>>>, !fir.box<!fir.array<2x!fir.logical<4>>>) -> !fir.logical<4> | ||
| // CHECK-NEXT: return | ||
| // CHECK-NEXT: } |
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,53 @@ | ||
| ! Test lowering of DOT_PRODUCT intrinsic to HLFIR | ||
| ! RUN: bbc -emit-hlfir -o - %s 2>&1 | FileCheck %s | ||
|
|
||
| ! dot product with numerical arguments | ||
| subroutine dot_product1(lhs, rhs, res) | ||
| integer lhs(:), rhs(:), res | ||
| res = DOT_PRODUCT(lhs,rhs) | ||
| end subroutine | ||
| ! CHECK-LABEL: func.func @_QPdot_product1 | ||
| ! CHECK: %[[LHS:.*]]: !fir.box<!fir.array<?xi32>> {fir.bindc_name = "lhs"} | ||
| ! CHECK: %[[RHS:.*]]: !fir.box<!fir.array<?xi32>> {fir.bindc_name = "rhs"} | ||
| ! CHECK: %[[RES:.*]]: !fir.ref<i32> {fir.bindc_name = "res"} | ||
| ! CHECK-DAG: %[[LHS_VAR:.*]]:2 = hlfir.declare %[[LHS]] | ||
| ! CHECK-DAG: %[[RHS_VAR:.*]]:2 = hlfir.declare %[[RHS]] | ||
| ! CHECK-DAG: %[[RES_VAR:.*]]:2 = hlfir.declare %[[RES]] | ||
| ! CHECK-NEXT: %[[EXPR:.*]] = hlfir.dot_product %[[LHS_VAR]]#0 %[[RHS_VAR]]#0 {fastmath = #arith.fastmath<contract>} : (!fir.box<!fir.array<?xi32>>, !fir.box<!fir.array<?xi32>>) -> i32 | ||
| ! CHECK-NEXT: hlfir.assign %[[EXPR]] to %[[RES_VAR]]#0 : i32, !fir.ref<i32> | ||
| ! CHECK-NEXT: return | ||
| ! CHECK-NEXT: } | ||
|
|
||
| ! dot product with logical arguments | ||
| subroutine dot_product2(lhs, rhs, res) | ||
| logical lhs(:), rhs(:), res | ||
| res = DOT_PRODUCT(lhs,rhs) | ||
| end subroutine | ||
| ! CHECK-LABEL: func.func @_QPdot_product2 | ||
| ! CHECK: %[[LHS:.*]]: !fir.box<!fir.array<?x!fir.logical<4>>> {fir.bindc_name = "lhs"} | ||
| ! CHECK: %[[RHS:.*]]: !fir.box<!fir.array<?x!fir.logical<4>>> {fir.bindc_name = "rhs"} | ||
| ! CHECK: %[[RES:.*]]: !fir.ref<!fir.logical<4>> {fir.bindc_name = "res"} | ||
| ! CHECK-DAG: %[[LHS_VAR:.*]]:2 = hlfir.declare %[[LHS]] | ||
| ! CHECK-DAG: %[[RHS_VAR:.*]]:2 = hlfir.declare %[[RHS]] | ||
| ! CHECK-DAG: %[[RES_VAR:.*]]:2 = hlfir.declare %[[RES]] | ||
| ! CHECK-NEXT: %[[EXPR:.*]] = hlfir.dot_product %[[LHS_VAR]]#0 %[[RHS_VAR]]#0 {fastmath = #arith.fastmath<contract>} : (!fir.box<!fir.array<?x!fir.logical<4>>>, !fir.box<!fir.array<?x!fir.logical<4>>>) -> !fir.logical<4> | ||
| ! CHECK-NEXT: hlfir.assign %[[EXPR]] to %[[RES_VAR]]#0 : !fir.logical<4>, !fir.ref<!fir.logical<4>> | ||
| ! CHECK-NEXT: return | ||
| ! CHECK-NEXT: } | ||
|
|
||
| ! arguments are of known shape | ||
| subroutine dot_product3(lhs, rhs, res) | ||
| integer lhs(5), rhs(5), res | ||
| res = DOT_PRODUCT(lhs,rhs) | ||
| end subroutine | ||
| ! CHECK-LABEL: func.func @_QPdot_product3 | ||
| ! CHECK: %[[LHS:.*]]: !fir.ref<!fir.array<5xi32>> {fir.bindc_name = "lhs"} | ||
| ! CHECK: %[[RHS:.*]]: !fir.ref<!fir.array<5xi32>> {fir.bindc_name = "rhs"} | ||
| ! CHECK: %[[RES:.*]]: !fir.ref<i32> {fir.bindc_name = "res"} | ||
| ! CHECK-DAG: %[[LHS_VAR:.*]]:2 = hlfir.declare %[[LHS]] | ||
| ! CHECK-DAG: %[[RHS_VAR:.*]]:2 = hlfir.declare %[[RHS]] | ||
| ! CHECK-DAG: %[[RES_VAR:.*]]:2 = hlfir.declare %[[RES]] | ||
| ! CHECK-NEXT: %[[EXPR:.*]] = hlfir.dot_product %[[LHS_VAR]]#0 %[[RHS_VAR]]#0 {fastmath = #arith.fastmath<contract>} : (!fir.ref<!fir.array<5xi32>>, !fir.ref<!fir.array<5xi32>>) -> i32 | ||
| ! CHECK-NEXT: hlfir.assign %[[EXPR]] to %[[RES_VAR]]#0 : i32, !fir.ref<i32> | ||
| ! CHECK-NEXT: return | ||
| ! CHECK-NEXT: } |