This is an archive of the discontinued LLVM Phabricator instance.

Differential D128459

[flang] Fix forall issue with substring operation
ClosedPublic

Authored by clementval on Jun 23 2022, 12:55 PM.

Details

Reviewers
jeanPerier
PeteSteinfeld
schweitz
klausler
sscalpone
Commits
rG753b766deaa2: [flang] Fix forall issue with substring operation
Summary

When there is a substring operation on a scalar assignment in a FORALL
context, we have to lower the entire substring and not the entire
CHARACTER variable.

This patch is part of the upstreaming effort from fir-dev branch.

Co-authored-by: Eric Schweitz <eschweitz@nvidia.com>

Diff Detail

Event Timeline

clementval created this revision.Jun 23 2022, 12:55 PM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptJun 23 2022, 12:55 PM
Herald added a subscriber: mehdi_amini. · View Herald Transcript
clementval requested review of this revision.Jun 23 2022, 12:55 PM
Herald added a subscriber: jdoerfert. · View Herald TranscriptJun 23 2022, 12:55 PM
klausler accepted this revision.Jun 23 2022, 12:56 PM
This revision is now accepted and ready to land.Jun 23 2022, 12:56 PM
clementval updated this revision to Diff 439511.Jun 23 2022, 1:00 PM

Update test for upstream

Harbormaster completed remote builds in B171683: Diff 439511.Jun 23 2022, 1:19 PM
PeteSteinfeld accepted this revision.Jun 23 2022, 1:29 PM

All builds and tests correctly and looks good.

Closed by commit rG753b766deaa2: [flang] Fix forall issue with substring operation (authored by clementval). · Explain WhyJun 24 2022, 12:08 AM
This revision was automatically updated to reflect the committed changes.
clementval added a commit: rG753b766deaa2: [flang] Fix forall issue with substring operation.

Revision Contents

PathSize
flang/
lib/
Lower/
3 lines
test/
Lower/
forall/
81 lines

Diff 439644

flang/lib/Lower/ConvertExpr.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 7,006 Lines • ▼ Show 20 Lines if (explicitSpaceIsActive()) {
if (x.Rank() > 0 && !tailIsPointerInPointerAssignment(x, components)) if (x.Rank() > 0 && !tailIsPointerInPointerAssignment(x, components))
components.reversePath.push_back(ImplicitSubscripts{}); components.reversePath.push_back(ImplicitSubscripts{});
if (fir::ArrayLoadOp load = explicitSpace->findBinding(&x)) if (fir::ArrayLoadOp load = explicitSpace->findBinding(&x))
return applyPathToArrayLoad(load, components); return applyPathToArrayLoad(load, components);
} else { } else {
return genImplicitArrayAccess(x, components); return genImplicitArrayAccess(x, components);
} }
if (pathIsEmpty(components)) if (pathIsEmpty(components))
return genAsScalar(x); return components.substring ? genAsScalar(*components.substring)
: genAsScalar(x);
mlir::Location loc = getLoc(); mlir::Location loc = getLoc();
return [=](IterSpace) -> ExtValue { return [=](IterSpace) -> ExtValue {
fir::emitFatalError(loc, "reached symbol with path"); fir::emitFatalError(loc, "reached symbol with path");
}; };
} }
/// Lower a component path with or without rank. /// Lower a component path with or without rank.
/// Example: <code>array%baz%qux%waldo</code> /// Example: <code>array%baz%qux%waldo</code>
▲ Show 20 Lines • Show All 528 Lines • Show Last 20 Lines

flang/test/Lower/forall/scalar-substring.f90

  • This file was added.
! RUN: bbc -emit-fir %s -o - | FileCheck %s
subroutine s(ch)
character(10) :: ch
forall (i=1:4)
ch(i:i) = ch(i+1:i+1)
end forall
end subroutine s
! CHECK-LABEL: func @_QPs(
! CHECK-SAME: %[[VAL_0:.*]]: !fir.boxchar<1> {fir.bindc_name = "ch"}) {
! CHECK: %[[VAL_1:.*]] = fir.alloca i32 {adapt.valuebyref, bindc_name = "i"}
! CHECK: %[[VAL_2:.*]]:2 = fir.unboxchar %[[VAL_0]] : (!fir.boxchar<1>) -> (!fir.ref<!fir.char<1,?>>, index)
! CHECK: %[[VAL_3:.*]] = arith.constant 1 : i32
! CHECK: %[[VAL_4:.*]] = fir.convert %[[VAL_3]] : (i32) -> index
! CHECK: %[[VAL_5:.*]] = arith.constant 4 : i32
! CHECK: %[[VAL_6:.*]] = fir.convert %[[VAL_5]] : (i32) -> index
! CHECK: %[[VAL_7:.*]] = arith.constant 1 : index
! CHECK: fir.do_loop %[[VAL_8:.*]] = %[[VAL_4]] to %[[VAL_6]] step %[[VAL_7]] unordered {
! CHECK: %[[VAL_9:.*]] = fir.convert %[[VAL_8]] : (index) -> i32
! CHECK: fir.store %[[VAL_9]] to %[[VAL_1]] : !fir.ref<i32>
! CHECK: %[[VAL_10:.*]] = fir.load %[[VAL_1]] : !fir.ref<i32>
! CHECK: %[[VAL_11:.*]] = arith.constant 1 : i32
! CHECK: %[[VAL_12:.*]] = arith.addi %[[VAL_10]], %[[VAL_11]] : i32
! CHECK: %[[VAL_13:.*]] = fir.convert %[[VAL_12]] : (i32) -> i64
! CHECK: %[[VAL_14:.*]] = fir.load %[[VAL_1]] : !fir.ref<i32>
! CHECK: %[[VAL_15:.*]] = arith.constant 1 : i32
! CHECK: %[[VAL_16:.*]] = arith.addi %[[VAL_14]], %[[VAL_15]] : i32
! CHECK: %[[VAL_17:.*]] = fir.convert %[[VAL_16]] : (i32) -> i64
! CHECK: %[[VAL_18:.*]] = fir.convert %[[VAL_13]] : (i64) -> index
! CHECK: %[[VAL_19:.*]] = fir.convert %[[VAL_17]] : (i64) -> index
! CHECK: %[[VAL_20:.*]] = arith.constant 1 : index
! CHECK: %[[VAL_21:.*]] = arith.subi %[[VAL_18]], %[[VAL_20]] : index
! CHECK: %[[VAL_22:.*]] = fir.convert %[[VAL_2]]#0 : (!fir.ref<!fir.char<1,?>>) -> !fir.ref<!fir.array<?x!fir.char<1>>>
! CHECK: %[[VAL_23:.*]] = fir.coordinate_of %[[VAL_22]], %[[VAL_21]] : (!fir.ref<!fir.array<?x!fir.char<1>>>, index) -> !fir.ref<!fir.char<1>>
! CHECK: %[[VAL_24:.*]] = fir.convert %[[VAL_23]] : (!fir.ref<!fir.char<1>>) -> !fir.ref<!fir.char<1,?>>
! CHECK: %[[VAL_25:.*]] = arith.subi %[[VAL_19]], %[[VAL_18]] : index
! CHECK: %[[VAL_26:.*]] = arith.addi %[[VAL_25]], %[[VAL_20]] : index
! CHECK: %[[VAL_27:.*]] = arith.constant 0 : index
! CHECK: %[[VAL_28:.*]] = arith.cmpi slt, %[[VAL_26]], %[[VAL_27]] : index
! CHECK: %[[VAL_29:.*]] = arith.select %[[VAL_28]], %[[VAL_27]], %[[VAL_26]] : index
! CHECK: %[[VAL_30:.*]] = fir.load %[[VAL_1]] : !fir.ref<i32>
! CHECK: %[[VAL_31:.*]] = fir.convert %[[VAL_30]] : (i32) -> i64
! CHECK: %[[VAL_32:.*]] = fir.load %[[VAL_1]] : !fir.ref<i32>
! CHECK: %[[VAL_33:.*]] = fir.convert %[[VAL_32]] : (i32) -> i64
! CHECK: %[[VAL_34:.*]] = fir.convert %[[VAL_31]] : (i64) -> index
! CHECK: %[[VAL_35:.*]] = fir.convert %[[VAL_33]] : (i64) -> index
! CHECK: %[[VAL_36:.*]] = arith.constant 1 : index
! CHECK: %[[VAL_37:.*]] = arith.subi %[[VAL_34]], %[[VAL_36]] : index
! CHECK: %[[VAL_38:.*]] = fir.convert %[[VAL_2]]#0 : (!fir.ref<!fir.char<1,?>>) -> !fir.ref<!fir.array<?x!fir.char<1>>>
! CHECK: %[[VAL_39:.*]] = fir.coordinate_of %[[VAL_38]], %[[VAL_37]] : (!fir.ref<!fir.array<?x!fir.char<1>>>, index) -> !fir.ref<!fir.char<1>>
! CHECK: %[[VAL_40:.*]] = fir.convert %[[VAL_39]] : (!fir.ref<!fir.char<1>>) -> !fir.ref<!fir.char<1,?>>
! CHECK: %[[VAL_41:.*]] = arith.subi %[[VAL_35]], %[[VAL_34]] : index
! CHECK: %[[VAL_42:.*]] = arith.addi %[[VAL_41]], %[[VAL_36]] : index
! CHECK: %[[VAL_43:.*]] = arith.constant 0 : index
! CHECK: %[[VAL_44:.*]] = arith.cmpi slt, %[[VAL_42]], %[[VAL_43]] : index
! CHECK: %[[VAL_45:.*]] = arith.select %[[VAL_44]], %[[VAL_43]], %[[VAL_42]] : index
! CHECK: %[[VAL_46:.*]] = arith.cmpi slt, %[[VAL_45]], %[[VAL_29]] : index
! CHECK: %[[VAL_47:.*]] = arith.select %[[VAL_46]], %[[VAL_45]], %[[VAL_29]] : index
! CHECK: %[[VAL_48:.*]] = arith.constant 1 : i64
! CHECK: %[[VAL_49:.*]] = fir.convert %[[VAL_47]] : (index) -> i64
! CHECK: %[[VAL_50:.*]] = arith.muli %[[VAL_48]], %[[VAL_49]] : i64
! CHECK: %[[VAL_51:.*]] = arith.constant false
! CHECK: %[[VAL_52:.*]] = fir.convert %[[VAL_40]] : (!fir.ref<!fir.char<1,?>>) -> !fir.ref<i8>
! CHECK: %[[VAL_53:.*]] = fir.convert %[[VAL_24]] : (!fir.ref<!fir.char<1,?>>) -> !fir.ref<i8>
! CHECK: fir.call @llvm.memmove.p0.p0.i64(%[[VAL_52]], %[[VAL_53]], %[[VAL_50]], %[[VAL_51]]) : (!fir.ref<i8>, !fir.ref<i8>, i64, i1) -> ()
! CHECK: %[[VAL_54:.*]] = arith.constant 1 : index
! CHECK: %[[VAL_55:.*]] = arith.subi %[[VAL_45]], %[[VAL_54]] : index
! CHECK: %[[VAL_56:.*]] = arith.constant 32 : i8
! CHECK: %[[VAL_57:.*]] = fir.undefined !fir.char<1>
! CHECK: %[[VAL_58:.*]] = fir.insert_value %[[VAL_57]], %[[VAL_56]], [0 : index] : (!fir.char<1>, i8) -> !fir.char<1>
! CHECK: %[[VAL_59:.*]] = arith.constant 1 : index
! CHECK: fir.do_loop %[[VAL_60:.*]] = %[[VAL_47]] to %[[VAL_55]] step %[[VAL_59]] {
! CHECK: %[[VAL_61:.*]] = fir.convert %[[VAL_40]] : (!fir.ref<!fir.char<1,?>>) -> !fir.ref<!fir.array<?x!fir.char<1>>>
! CHECK: %[[VAL_62:.*]] = fir.coordinate_of %[[VAL_61]], %[[VAL_60]] : (!fir.ref<!fir.array<?x!fir.char<1>>>, index) -> !fir.ref<!fir.char<1>>
! CHECK: fir.store %[[VAL_58]] to %[[VAL_62]] : !fir.ref<!fir.char<1>>
! CHECK: }
! CHECK: }
! CHECK: return
! CHECK: }