-
Notifications
You must be signed in to change notification settings - Fork 11.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[flang][hlfir] Fixed KindMapping for HLFIR intrinsics lowering.
hlfir.count lowering was using incorrect default integer kind by ignoring the kind specified in the ModuleOp. Reviewed By: tblah Differential Revision: https://reviews.llvm.org/D156017
- Loading branch information
Showing
10 changed files
with
95 additions
and
50 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
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,47 @@ | ||
| // Test hlfir.count operation lowering with different default integer kinds. | ||
| // RUN: fir-opt %s -lower-hlfir-intrinsics | FileCheck %s | ||
|
|
||
| module attributes {fir.defaultkind = "a1c4d8i8l4r4", fir.kindmap = ""} { | ||
| func.func @test_i8(%arg0: !fir.box<!fir.array<?x?x!fir.logical<4>>> {fir.bindc_name = "x"}, %arg1: i64) { | ||
| %4 = hlfir.count %arg0 dim %arg1 : (!fir.box<!fir.array<?x?x!fir.logical<4>>>, i64) -> !hlfir.expr<?xi64> | ||
| return | ||
| } | ||
| } | ||
| // CHECK-LABEL: func.func @test_i8 | ||
| // CHECK: %[[KIND:.*]] = arith.constant 8 : index | ||
| // CHECK: %[[KIND_ARG:.*]] = fir.convert %[[KIND]] : (index) -> i32 | ||
| // CHECK: fir.call @_FortranACountDim(%{{.*}}, %{{.*}}, %{{.*}}, %[[KIND_ARG]], %{{.*}}, %{{.*}}) : (!fir.ref<!fir.box<none>>, !fir.box<none>, i32, i32, !fir.ref<i8>, i32) -> none | ||
|
|
||
| module attributes {fir.defaultkind = "a1c4d8i4l4r4", fir.kindmap = ""} { | ||
| func.func @test_i4(%arg0: !fir.box<!fir.array<?x?x!fir.logical<4>>> {fir.bindc_name = "x"}, %arg1: i64) { | ||
| %4 = hlfir.count %arg0 dim %arg1 : (!fir.box<!fir.array<?x?x!fir.logical<4>>>, i64) -> !hlfir.expr<?xi32> | ||
| return | ||
| } | ||
| } | ||
| // CHECK-LABEL: func.func @test_i4 | ||
| // CHECK: %[[KIND:.*]] = arith.constant 4 : index | ||
| // CHECK: %[[KIND_ARG:.*]] = fir.convert %[[KIND]] : (index) -> i32 | ||
| // CHECK: fir.call @_FortranACountDim(%{{.*}}, %{{.*}}, %{{.*}}, %[[KIND_ARG]], %{{.*}}, %{{.*}}) : (!fir.ref<!fir.box<none>>, !fir.box<none>, i32, i32, !fir.ref<i8>, i32) -> none | ||
|
|
||
| module attributes {fir.defaultkind = "a1c4d8i2l4r4", fir.kindmap = ""} { | ||
| func.func @test_i2(%arg0: !fir.box<!fir.array<?x?x!fir.logical<4>>> {fir.bindc_name = "x"}, %arg1: i64) { | ||
| %4 = hlfir.count %arg0 dim %arg1 : (!fir.box<!fir.array<?x?x!fir.logical<4>>>, i64) -> !hlfir.expr<?xi16> | ||
| return | ||
| } | ||
| } | ||
| // CHECK-LABEL: func.func @test_i2 | ||
| // CHECK: %[[KIND:.*]] = arith.constant 2 : index | ||
| // CHECK: %[[KIND_ARG:.*]] = fir.convert %[[KIND]] : (index) -> i32 | ||
| // CHECK: fir.call @_FortranACountDim(%{{.*}}, %{{.*}}, %{{.*}}, %[[KIND_ARG]], %{{.*}}, %{{.*}}) : (!fir.ref<!fir.box<none>>, !fir.box<none>, i32, i32, !fir.ref<i8>, i32) -> none | ||
|
|
||
| module attributes {fir.defaultkind = "a1c4d8i1l4r4", fir.kindmap = ""} { | ||
| func.func @test_i1(%arg0: !fir.box<!fir.array<?x?x!fir.logical<4>>> {fir.bindc_name = "x"}, %arg1: i64) { | ||
| %4 = hlfir.count %arg0 dim %arg1 : (!fir.box<!fir.array<?x?x!fir.logical<4>>>, i64) -> !hlfir.expr<?xi8> | ||
| return | ||
| } | ||
| } | ||
| // CHECK-LABEL: func.func @test_i1 | ||
| // CHECK: arith.constant 1 : index | ||
| // CHECK: %[[KIND:.*]] = arith.constant 1 : index | ||
| // CHECK: %[[KIND_ARG:.*]] = fir.convert %[[KIND]] : (index) -> i32 | ||
| // CHECK: fir.call @_FortranACountDim(%{{.*}}, %{{.*}}, %{{.*}}, %[[KIND_ARG]], %{{.*}}, %{{.*}}) : (!fir.ref<!fir.box<none>>, !fir.box<none>, i32, i32, !fir.ref<i8>, i32) -> none |
Oops, something went wrong.