Skip to content

Commit 19991d0

Browse files
clementvalclementval
authored
[flang][openacc] Do not use special character in type string representation (#68158)
The representation produced by `getTypeAsString` is used by reduction, privatization and firstprivatization recipes. The name of the recipe is used as a symbol attribute. If the name has special symbol the symbol becomes quoted. This patch remove the special character from the representation so the representation is homogenous.
1 parent 344e735 commit 19991d0

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

‎flang/lib/Optimizer/Dialect/FIRType.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ std::string getTypeAsString(mlir::Type ty, const fir::KindMapping &kindMap,
539539
} else if (auto seqTy = mlir::dyn_cast_or_null<fir::SequenceType>(ty)) {
540540
for (auto extent : seqTy.getShape()) {
541541
if (extent == fir::SequenceType::getUnknownExtent())
542-
name << "?x";
542+
name << "Ux";
543543
else
544544
name << extent << 'x';
545545
}

‎flang/test/Lower/OpenACC/acc-private.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
! RUN: bbc -fopenacc -emit-fir %s -o - | FileCheck %s --check-prefixes=CHECK,FIR
44
! RUN: bbc -fopenacc -emit-hlfir %s -o - | FileCheck %s --check-prefixes=CHECK,HLFIR
55

6-
! CHECK-LABEL: acc.private.recipe @"privatization_box_?xi32" : !fir.box<!fir.array<?xi32>> init {
6+
! CHECK-LABEL: acc.private.recipe @privatization_box_Uxi32 : !fir.box<!fir.array<?xi32>> init {
77
! CHECK: ^bb0(%[[ARG0:.*]]: !fir.box<!fir.array<?xi32>>):
88
! HLFIR: %[[C0:.*]] = arith.constant 0 : index
99
! HLFIR: %[[BOX_DIMS:.*]]:3 = fir.box_dims %[[ARG0]], %[[C0]] : (!fir.box<!fir.array<?xi32>>, index) -> (index, index, index)
@@ -194,4 +194,4 @@ subroutine acc_private_assumed_shape(a, n)
194194
! HLFIR: %[[DECL_A:.*]]:2 = hlfir.declare %arg0 {uniq_name = "_QFacc_private_assumed_shapeEa"} : (!fir.box<!fir.array<?xi32>>) -> (!fir.box<!fir.array<?xi32>>, !fir.box<!fir.array<?xi32>>)
195195
! HLFIR: %[[ADDR:.*]] = fir.box_addr %[[DECL_A]]#1 : (!fir.box<!fir.array<?xi32>>) -> !fir.ref<!fir.array<?xi32>>
196196
! HLFIR: %[[PRIVATE:.*]] = acc.private varPtr(%[[ADDR]] : !fir.ref<!fir.array<?xi32>>) bounds(%{{.*}}) -> !fir.ref<!fir.array<?xi32>> {name = "a"}
197-
! HLFIR: acc.parallel private(@"privatization_box_?xi32" -> %[[PRIVATE]] : !fir.ref<!fir.array<?xi32>>) {
197+
! HLFIR: acc.parallel private(@privatization_box_Uxi32 -> %[[PRIVATE]] : !fir.ref<!fir.array<?xi32>>) {

‎flang/test/Lower/OpenACC/acc-reduction.f90

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
! RUN: bbc -fopenacc -emit-fir %s -o - | FileCheck %s --check-prefixes=CHECK,FIR
44
! RUN: bbc -fopenacc -emit-hlfir %s -o - | FileCheck %s --check-prefixes=CHECK,HLFIR
55

6-
! CHECK-LABEL: acc.reduction.recipe @"reduction_add_section_lb1.ub3_ref_?xi32" : !fir.box<!fir.array<?xi32>> reduction_operator <add> init {
6+
! CHECK-LABEL: acc.reduction.recipe @reduction_add_section_lb1.ub3_ref_Uxi32 : !fir.box<!fir.array<?xi32>> reduction_operator <add> init {
77
! CHECK: ^bb0(%[[ARG0:.*]]: !fir.box<!fir.array<?xi32>>):
88
! HLFIR: %[[BOX_DIMS:.*]]:3 = fir.box_dims %[[ARG0]], %c0{{.*}} : (!fir.box<!fir.array<?xi32>>, index) -> (index, index, index)
99
! HLFIR: %[[SHAPE:.*]] = fir.shape %[[BOX_DIMS]]#1 : (index) -> !fir.shape<1>
@@ -29,7 +29,7 @@
2929
! HLFIR: acc.yield %[[ARG0]] : !fir.box<!fir.array<?xi32>>
3030
! HLFIR: }
3131

32-
! CHECK-LABEL: acc.reduction.recipe @"reduction_max_ref_?xf32" : !fir.box<!fir.array<?xf32>> reduction_operator <max> init {
32+
! CHECK-LABEL: acc.reduction.recipe @reduction_max_ref_Uxf32 : !fir.box<!fir.array<?xf32>> reduction_operator <max> init {
3333
! CHECK: ^bb0(%[[ARG0:.*]]: !fir.box<!fir.array<?xf32>>):
3434
! CHECK: %[[INIT_VALUE:.*]] = arith.constant -1.401300e-45 : f32
3535
! HLFIR: %[[C0:.*]] = arith.constant 0 : index
@@ -57,7 +57,7 @@
5757
! CHECK: acc.yield %[[ARG0]] : !fir.box<!fir.array<?xf32>>
5858
! CHECK: }
5959

60-
! CHECK-LABEL: acc.reduction.recipe @"reduction_add_ref_?xi32" : !fir.box<!fir.array<?xi32>> reduction_operator <add> init {
60+
! CHECK-LABEL: acc.reduction.recipe @reduction_add_ref_Uxi32 : !fir.box<!fir.array<?xi32>> reduction_operator <add> init {
6161
! CHECK: ^bb0(%[[ARG0:.*]]: !fir.box<!fir.array<?xi32>>):
6262
! HLFIR: %[[INIT_VALUE:.*]] = arith.constant 0 : i32
6363
! HLFIR: %[[C0:.*]] = arith.constant 0 : index
@@ -1097,7 +1097,7 @@ subroutine acc_reduction_add_dynamic_extent_add(a)
10971097
! CHECK-SAME: %[[ARG0:.*]]: !fir.box<!fir.array<?xi32>> {fir.bindc_name = "a"})
10981098
! HLFIR: %[[DECLARG0:.*]]:2 = hlfir.declare %[[ARG0]]
10991099
! HLFIR: %[[RED:.*]] = acc.reduction varPtr(%{{.*}} : !fir.ref<!fir.array<?xi32>>) bounds(%{{.*}}) -> !fir.ref<!fir.array<?xi32>> {name = "a"}
1100-
! HLFIR: acc.parallel reduction(@"reduction_add_ref_?xi32" -> %[[RED:.*]] : !fir.ref<!fir.array<?xi32>>)
1100+
! HLFIR: acc.parallel reduction(@reduction_add_ref_Uxi32 -> %[[RED:.*]] : !fir.ref<!fir.array<?xi32>>)
11011101

11021102
subroutine acc_reduction_add_dynamic_extent_max(a)
11031103
real :: a(:)
@@ -1109,7 +1109,7 @@ subroutine acc_reduction_add_dynamic_extent_max(a)
11091109
! CHECK-SAME: %[[ARG0:.*]]: !fir.box<!fir.array<?xf32>> {fir.bindc_name = "a"})
11101110
! HLFIR: %[[DECLARG0:.*]]:2 = hlfir.declare %[[ARG0]]
11111111
! HLFIR: %[[RED:.*]] = acc.reduction varPtr(%{{.*}} : !fir.ref<!fir.array<?xf32>>) bounds(%{{.*}}) -> !fir.ref<!fir.array<?xf32>> {name = "a"}
1112-
! HLFIR: acc.parallel reduction(@"reduction_max_ref_?xf32" -> %[[RED]] : !fir.ref<!fir.array<?xf32>>) {
1112+
! HLFIR: acc.parallel reduction(@reduction_max_ref_Uxf32 -> %[[RED]] : !fir.ref<!fir.array<?xf32>>) {
11131113

11141114
subroutine acc_reduction_add_dynamic_extent_add_with_section(a)
11151115
integer :: a(:)
@@ -1123,4 +1123,4 @@ subroutine acc_reduction_add_dynamic_extent_add_with_section(a)
11231123
! HLFIR: %[[BOUND:.*]] = acc.bounds lowerbound(%c1{{.*}} : index) upperbound(%c3{{.*}} : index) stride(%{{.*}}#2 : index) startIdx(%{{.*}} : index) {strideInBytes = true}
11241124
! HLFIR: %[[BOX_ADDR:.*]] = fir.box_addr %[[DECL]]#1 : (!fir.box<!fir.array<?xi32>>) -> !fir.ref<!fir.array<?xi32>>
11251125
! HLFIR: %[[RED:.*]] = acc.reduction varPtr(%[[BOX_ADDR]] : !fir.ref<!fir.array<?xi32>>) bounds(%[[BOUND]]) -> !fir.ref<!fir.array<?xi32>> {name = "a(2:4)"}
1126-
! HLFIR: acc.parallel reduction(@"reduction_add_section_lb1.ub3_ref_?xi32" -> %[[RED]] : !fir.ref<!fir.array<?xi32>>)
1126+
! HLFIR: acc.parallel reduction(@reduction_add_section_lb1.ub3_ref_Uxi32 -> %[[RED]] : !fir.ref<!fir.array<?xi32>>)

‎flang/unittests/Optimizer/FIRTypesTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ TEST_F(FIRTypesTest, getTypeAsString) {
308308
fir::SequenceType::get({fir::SequenceType::getUnknownExtent(),
309309
fir::SequenceType::getUnknownExtent()},
310310
ty);
311-
EXPECT_EQ("?x?xi64", fir::getTypeAsString(dynArrTy, *kindMap));
311+
EXPECT_EQ("UxUxi64", fir::getTypeAsString(dynArrTy, *kindMap));
312312
EXPECT_EQ("llvmptr_i32",
313313
fir::getTypeAsString(
314314
fir::LLVMPointerType::get(mlir::IntegerType::get(&context, 32)),

0 commit comments

Comments
 (0)