Skip to content

Commit 65091f5

Browse files
ergawyergawy
committed
[not-for-merge] Experiment with using alloc's first component
An experimental diff to discuss using only the first component of `hlfir.declare`'s result for allocatables. This is just to have a more informed discussion on llvm#84033. This is not meant to be merged, at least for now.
1 parent 7bad74e commit 65091f5

File tree

5 files changed

+40
-35
lines changed

5 files changed

+40
-35
lines changed

‎flang/include/flang/Optimizer/Builder/HLFIRTools.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ class Entity : public mlir::Value {
194194
// information, or has access to it in other ways. Its advantage is that
195195
// it will never be a fir.box for explicit shape arrays, leading to simpler
196196
// FIR code generation.
197-
mlir::Value getFirBase() const;
197+
mlir::Value getFirBase(bool forceDeclBaseHACK = false) const;
198198
};
199199

200200
/// Wrapper over an mlir::Value that can be viewed as a Fortran entity.
@@ -230,7 +230,8 @@ translateToExtendedValue(mlir::Location loc, fir::FirOpBuilder &builder,
230230
/// on the IR.
231231
fir::ExtendedValue
232232
translateToExtendedValue(mlir::Location loc, fir::FirOpBuilder &builder,
233-
fir::FortranVariableOpInterface fortranVariable);
233+
fir::FortranVariableOpInterface fortranVariable,
234+
bool forceDeclBaseHACK = false);
234235

235236
/// Generate declaration for a fir::ExtendedValue in memory.
236237
fir::FortranVariableOpInterface

‎flang/lib/Lower/Bridge.cpp‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ class FirConverter : public Fortran::lower::AbstractConverter {
618618
assert(details && "No host-association found");
619619
const Fortran::semantics::Symbol &hsym = details->symbol();
620620
mlir::Type hSymType = genType(hsym);
621-
Fortran::lower::SymbolBox hsb = lookupSymbol(hsym);
621+
Fortran::lower::SymbolBox hsb = lookupSymbol(hsym, nullptr, true);
622622

623623
auto allocate = [&](llvm::ArrayRef<mlir::Value> shape,
624624
llvm::ArrayRef<mlir::Value> typeParams) -> mlir::Value {
@@ -727,7 +727,7 @@ class FirConverter : public Fortran::lower::AbstractConverter {
727727
void createHostAssociateVarCloneDealloc(
728728
const Fortran::semantics::Symbol &sym) override final {
729729
mlir::Location loc = genLocation(sym.name());
730-
Fortran::lower::SymbolBox hsb = lookupSymbol(sym);
730+
Fortran::lower::SymbolBox hsb = lookupSymbol(sym, nullptr, true);
731731

732732
fir::ExtendedValue hexv = symBoxToExtendedValue(hsb);
733733
hexv.match(
@@ -960,13 +960,14 @@ class FirConverter : public Fortran::lower::AbstractConverter {
960960
/// Find the symbol in the local map or return null.
961961
Fortran::lower::SymbolBox
962962
lookupSymbol(const Fortran::semantics::Symbol &sym,
963-
Fortran::lower::SymMap *symMap = nullptr) {
963+
Fortran::lower::SymMap *symMap = nullptr,
964+
bool forceDeclBaseHACK = false) {
964965
symMap = symMap ? symMap : &localSymbols;
965966
if (lowerToHighLevelFIR()) {
966967
if (std::optional<fir::FortranVariableOpInterface> var =
967968
symMap->lookupVariableDefinition(sym)) {
968-
auto exv =
969-
hlfir::translateToExtendedValue(toLocation(), *builder, *var);
969+
auto exv = hlfir::translateToExtendedValue(toLocation(), *builder, *var,
970+
forceDeclBaseHACK);
970971
return exv.match(
971972
[](mlir::Value x) -> Fortran::lower::SymbolBox {
972973
return Fortran::lower::SymbolBox::Intrinsic{x};

‎flang/lib/Optimizer/Builder/HLFIRTools.cpp‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -183,11 +183,12 @@ static fir::CharBoxValue genUnboxChar(mlir::Location loc,
183183
return {addr, len};
184184
}
185185

186-
mlir::Value hlfir::Entity::getFirBase() const {
186+
mlir::Value hlfir::Entity::getFirBase(bool forceDeclBaseHACK) const {
187187
if (fir::FortranVariableOpInterface variable = getIfVariableInterface()) {
188188
if (auto declareOp =
189189
mlir::dyn_cast<hlfir::DeclareOp>(variable.getOperation()))
190-
return declareOp.getOriginalBase();
190+
return forceDeclBaseHACK ? declareOp.getBase()
191+
: declareOp.getOriginalBase();
191192
if (auto associateOp =
192193
mlir::dyn_cast<hlfir::AssociateOp>(variable.getOperation()))
193194
return associateOp.getFirBase();
@@ -848,11 +849,12 @@ hlfir::LoopNest hlfir::genLoopNest(mlir::Location loc,
848849

849850
static fir::ExtendedValue
850851
translateVariableToExtendedValue(mlir::Location loc, fir::FirOpBuilder &builder,
851-
hlfir::Entity variable) {
852+
hlfir::Entity variable,
853+
bool forceDeclBaseHACK = false) {
852854
assert(variable.isVariable() && "must be a variable");
853855
/// When going towards FIR, use the original base value to avoid
854856
/// introducing descriptors at runtime when they are not required.
855-
mlir::Value firBase = variable.getFirBase();
857+
mlir::Value firBase = variable.getFirBase(forceDeclBaseHACK);
856858
if (variable.isMutableBox())
857859
return fir::MutableBoxValue(firBase, getExplicitTypeParams(variable),
858860
fir::MutableProperties{});
@@ -900,8 +902,9 @@ translateVariableToExtendedValue(mlir::Location loc, fir::FirOpBuilder &builder,
900902

901903
fir::ExtendedValue
902904
hlfir::translateToExtendedValue(mlir::Location loc, fir::FirOpBuilder &builder,
903-
fir::FortranVariableOpInterface var) {
904-
return translateVariableToExtendedValue(loc, builder, var);
905+
fir::FortranVariableOpInterface var,
906+
bool forceDeclBaseHACK) {
907+
return translateVariableToExtendedValue(loc, builder, var, forceDeclBaseHACK);
905908
}
906909

907910
std::pair<fir::ExtendedValue, std::optional<hlfir::CleanupFunction>>

‎flang/test/Lower/OpenMP/parallel-private-clause-str.f90‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
!CHECK: %[[C_DECL:.*]]:2 = hlfir.declare %[[C_BOX_REF]] typeparams %{{.*}} {fortran_attrs = #fir.var_attrs<allocatable>, uniq_name = "_QFtest_allocatable_stringEc"} : (!fir.ref<!fir.box<!fir.heap<!fir.char<1,?>>>>, i32) -> (!fir.ref<!fir.box<!fir.heap<!fir.char<1,?>>>>, !fir.ref<!fir.box<!fir.heap<!fir.char<1,?>>>>)
1111
!CHECK: omp.parallel {
1212
!CHECK: %[[C_PVT_BOX_REF:.*]] = fir.alloca !fir.box<!fir.heap<!fir.char<1,?>>> {bindc_name = "c", pinned, uniq_name = "_QFtest_allocatable_stringEc"}
13-
!CHECK: %[[C_BOX:.*]] = fir.load %[[C_DECL]]#1 : !fir.ref<!fir.box<!fir.heap<!fir.char<1,?>>>>
13+
!CHECK: %[[C_BOX:.*]] = fir.load %[[C_DECL]]#0 : !fir.ref<!fir.box<!fir.heap<!fir.char<1,?>>>>
1414
!CHECK: fir.if %{{.*}} {
1515
!CHECK: %[[C_PVT_MEM:.*]] = fir.allocmem !fir.char<1,?>(%{{.*}} : index) {fir.must_be_heap = true, uniq_name = "_QFtest_allocatable_stringEc.alloc"}
1616
!CHECK: %[[C_PVT_BOX:.*]] = fir.embox %[[C_PVT_MEM]] typeparams %{{.*}} : (!fir.heap<!fir.char<1,?>>, index) -> !fir.box<!fir.heap<!fir.char<1,?>>>
1717
!CHECK: fir.store %[[C_PVT_BOX]] to %[[C_PVT_BOX_REF]] : !fir.ref<!fir.box<!fir.heap<!fir.char<1,?>>>>
1818
!CHECK: }
1919
!CHECK: %[[C_PVT_DECL:.*]]:2 = hlfir.declare %[[C_PVT_BOX_REF]] {fortran_attrs = #fir.var_attrs<allocatable>, uniq_name = "_QFtest_allocatable_stringEc"} : (!fir.ref<!fir.box<!fir.heap<!fir.char<1,?>>>>) -> (!fir.ref<!fir.box<!fir.heap<!fir.char<1,?>>>>, !fir.ref<!fir.box<!fir.heap<!fir.char<1,?>>>>)
2020
!CHECK: fir.if %{{.*}} {
21-
!CHECK: %[[C_PVT_BOX:.*]] = fir.load %[[C_PVT_DECL]]#1 : !fir.ref<!fir.box<!fir.heap<!fir.char<1,?>>>>
21+
!CHECK: %[[C_PVT_BOX:.*]] = fir.load %[[C_PVT_DECL]]#0 : !fir.ref<!fir.box<!fir.heap<!fir.char<1,?>>>>
2222
!CHECK: %[[C_PVT_BOX_ADDR:.*]] = fir.box_addr %[[C_PVT_BOX]] : (!fir.box<!fir.heap<!fir.char<1,?>>>) -> !fir.heap<!fir.char<1,?>>
2323
!CHECK: fir.freemem %[[C_PVT_BOX_ADDR]] : !fir.heap<!fir.char<1,?>>
2424
!CHECK: }
@@ -38,16 +38,16 @@ subroutine test_allocatable_string(n)
3838
!CHECK: %[[C_DECL:.*]]:2 = hlfir.declare %[[C_BOX_REF]] typeparams %{{.*}} {fortran_attrs = #fir.var_attrs<allocatable>, uniq_name = "_QFtest_allocatable_string_arrayEc"} : (!fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.char<1,?>>>>>, i32) -> (!fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.char<1,?>>>>>, !fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.char<1,?>>>>>)
3939
!CHECK: omp.parallel {
4040
!CHECK: %[[C_PVT_BOX_REF:.*]] = fir.alloca !fir.box<!fir.heap<!fir.array<?x!fir.char<1,?>>>> {bindc_name = "c", pinned, uniq_name = "_QFtest_allocatable_string_arrayEc"}
41-
!CHECK: %{{.*}} = fir.load %[[C_DECL]]#1 : !fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.char<1,?>>>>>
41+
!CHECK: %{{.*}} = fir.load %[[C_DECL]]#0 : !fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.char<1,?>>>>>
4242
!CHECK: fir.if %{{.*}} {
4343
!CHECK: %[[C_PVT_ALLOC:.*]] = fir.allocmem !fir.array<?x!fir.char<1,?>>(%{{.*}} : index), %{{.*}} {fir.must_be_heap = true, uniq_name = "_QFtest_allocatable_string_arrayEc.alloc"}
4444
!CHECK: %[[C_PVT_BOX:.*]] = fir.embox %[[C_PVT_ALLOC]](%{{.*}}) typeparams %{{.*}} : (!fir.heap<!fir.array<?x!fir.char<1,?>>>, !fir.shapeshift<1>, index) -> !fir.box<!fir.heap<!fir.array<?x!fir.char<1,?>>>>
4545
!CHECK: fir.store %[[C_PVT_BOX]] to %[[C_PVT_BOX_REF]] : !fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.char<1,?>>>>>
4646
!CHECK: }
4747
!CHECK: %[[C_PVT_DECL:.*]]:2 = hlfir.declare %[[C_PVT_BOX_REF]] {fortran_attrs = #fir.var_attrs<allocatable>, uniq_name = "_QFtest_allocatable_string_arrayEc"} : (!fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.char<1,?>>>>>) -> (!fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.char<1,?>>>>>, !fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.char<1,?>>>>>)
48-
!CHECK: %{{.*}} = fir.load %[[C_PVT_DECL]]#1 : !fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.char<1,?>>>>>
48+
!CHECK: %{{.*}} = fir.load %[[C_PVT_DECL]]#0 : !fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.char<1,?>>>>>
4949
!CHECK: fir.if %{{.*}} {
50-
!CHECK: %[[C_PVT_BOX:.*]] = fir.load %[[C_PVT_DECL]]#1 : !fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.char<1,?>>>>>
50+
!CHECK: %[[C_PVT_BOX:.*]] = fir.load %[[C_PVT_DECL]]#0 : !fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.char<1,?>>>>>
5151
!CHECK: %[[C_PVT_ADDR:.*]] = fir.box_addr %[[C_PVT_BOX]] : (!fir.box<!fir.heap<!fir.array<?x!fir.char<1,?>>>>) -> !fir.heap<!fir.array<?x!fir.char<1,?>>>
5252
!CHECK: fir.freemem %[[C_PVT_ADDR]] : !fir.heap<!fir.array<?x!fir.char<1,?>>>
5353
!CHECK: }

‎flang/test/Lower/OpenMP/parallel-private-clause.f90‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ subroutine private_clause_derived_type()
150150
!FIRDialect-DAG: %[[X4_PVT:.*]] = fir.alloca !fir.box<!fir.heap<!fir.array<?xi32>>> {bindc_name = "x4", pinned, uniq_name = "{{.*}}Ex4"}
151151
!FIRDialect-DAG: %[[X4_PVT_DECL:.*]]:2 = hlfir.declare %[[X4_PVT]] {fortran_attrs = #fir.var_attrs<allocatable>, uniq_name = "{{.*}}Ex4"} : (!fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>>) -> (!fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>>, !fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>>)
152152

153-
!FIRDialect-DAG: %[[TMP58:.*]] = fir.load %[[X4_DECL]]#1 : !fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>>
154-
!FIRDialect-DAG: %[[TMP97:.*]] = fir.load %[[X4_DECL]]#1 : !fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>>
153+
!FIRDialect-DAG: %[[TMP58:.*]] = fir.load %[[X4_DECL]]#0 : !fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>>
154+
!FIRDialect-DAG: %[[TMP97:.*]] = fir.load %[[X4_DECL]]#0 : !fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>>
155155
!FIRDialect-DAG: %[[TMP98:.*]]:3 = fir.box_dims %[[TMP97]], {{.*}} : (!fir.box<!fir.heap<!fir.array<?xi32>>>, index) -> (index, index, index)
156156

157157
!FIRDialect-DAG: %[[TMP101:.*]] = fir.allocmem !fir.array<?xi32>, {{.*}} {fir.must_be_heap = true, uniq_name = "{{.*}}Ex4.alloc"}
@@ -192,12 +192,12 @@ subroutine private_clause_allocatable()
192192
!FIRDialect-DAG: }
193193
!FIRDialect-DAG: %[[X5_PVT_DECL:.*]]:2 = hlfir.declare %[[X5_PVT]] {fortran_attrs = #fir.var_attrs<allocatable>, uniq_name = "_QFprivate_clause_real_call_allocatableEx5"} : (!fir.ref<!fir.box<!fir.heap<f32>>>) -> (!fir.ref<!fir.box<!fir.heap<f32>>>, !fir.ref<!fir.box<!fir.heap<f32>>>)
194194
!FIRDialect-DAG: fir.call @_QFprivate_clause_real_call_allocatablePhelper_private_clause_real_call_allocatable(%[[X5_PVT_DECL]]#0) fastmath<contract> : (!fir.ref<!fir.box<!fir.heap<f32>>>) -> ()
195-
!FIRDialect-DAG: %{{.*}} = fir.load %[[X5_PVT_DECL]]#1 : !fir.ref<!fir.box<!fir.heap<f32>>>
195+
!FIRDialect-DAG: %{{.*}} = fir.load %[[X5_PVT_DECL]]#0 : !fir.ref<!fir.box<!fir.heap<f32>>>
196196

197197
!FIRDialect-DAG: fir.if %{{.*}} {
198-
!FIRDialect-DAG: %{{.*}} = fir.load %[[X5_PVT_DECL]]#1 : !fir.ref<!fir.box<!fir.heap<f32>>>
198+
!FIRDialect-DAG: %{{.*}} = fir.load %[[X5_PVT_DECL]]#0 : !fir.ref<!fir.box<!fir.heap<f32>>>
199199

200-
!FIRDialect-DAG: fir.store %{{.*}} to %[[X5_PVT_DECL]]#1 : !fir.ref<!fir.box<!fir.heap<f32>>>
200+
!FIRDialect-DAG: fir.store %{{.*}} to %[[X5_PVT_DECL]]#0 : !fir.ref<!fir.box<!fir.heap<f32>>>
201201
!FIRDialect-DAG: }
202202
!FIRDialect-DAG: omp.terminator
203203
!FIRDialect-DAG: }
@@ -313,12 +313,12 @@ subroutine simple_loop_1
313313
print*, i
314314
end do
315315
! FIRDialect: omp.yield
316-
! FIRDialect: {{%.*}} = fir.load %[[R_DECL]]#1 : !fir.ref<!fir.box<!fir.heap<f32>>>
316+
! FIRDialect: {{%.*}} = fir.load %[[R_DECL]]#0 : !fir.ref<!fir.box<!fir.heap<f32>>>
317317
! FIRDialect: fir.if {{%.*}} {
318-
! FIRDialect: [[LD:%.*]] = fir.load %[[R_DECL]]#1 : !fir.ref<!fir.box<!fir.heap<f32>>>
318+
! FIRDialect: [[LD:%.*]] = fir.load %[[R_DECL]]#0 : !fir.ref<!fir.box<!fir.heap<f32>>>
319319
! FIRDialect: [[AD:%.*]] = fir.box_addr [[LD]] : (!fir.box<!fir.heap<f32>>) -> !fir.heap<f32>
320320
! FIRDialect: fir.freemem [[AD]] : !fir.heap<f32>
321-
! FIRDialect: fir.store {{%.*}} to %[[R_DECL]]#1 : !fir.ref<!fir.box<!fir.heap<f32>>>
321+
! FIRDialect: fir.store {{%.*}} to %[[R_DECL]]#0 : !fir.ref<!fir.box<!fir.heap<f32>>>
322322
!$OMP END DO
323323
! FIRDialect: omp.terminator
324324
!$OMP END PARALLEL
@@ -351,12 +351,12 @@ subroutine simple_loop_2
351351
print*, i
352352
end do
353353
! FIRDialect: omp.yield
354-
! FIRDialect: {{%.*}} = fir.load %[[R_DECL]]#1 : !fir.ref<!fir.box<!fir.heap<f32>>>
354+
! FIRDialect: {{%.*}} = fir.load %[[R_DECL]]#0 : !fir.ref<!fir.box<!fir.heap<f32>>>
355355
! FIRDialect: fir.if {{%.*}} {
356-
! FIRDialect: [[LD:%.*]] = fir.load %[[R_DECL]]#1 : !fir.ref<!fir.box<!fir.heap<f32>>>
356+
! FIRDialect: [[LD:%.*]] = fir.load %[[R_DECL]]#0 : !fir.ref<!fir.box<!fir.heap<f32>>>
357357
! FIRDialect: [[AD:%.*]] = fir.box_addr [[LD]] : (!fir.box<!fir.heap<f32>>) -> !fir.heap<f32>
358358
! FIRDialect: fir.freemem [[AD]] : !fir.heap<f32>
359-
! FIRDialect: fir.store {{%.*}} to %[[R_DECL]]#1 : !fir.ref<!fir.box<!fir.heap<f32>>>
359+
! FIRDialect: fir.store {{%.*}} to %[[R_DECL]]#0 : !fir.ref<!fir.box<!fir.heap<f32>>>
360360
!$OMP END DO
361361
! FIRDialect: omp.terminator
362362
!$OMP END PARALLEL
@@ -388,12 +388,12 @@ subroutine simple_loop_3
388388
print*, i
389389
end do
390390
! FIRDialect: omp.yield
391-
! FIRDialect: {{%.*}} = fir.load [[R_DECL]]#1 : !fir.ref<!fir.box<!fir.heap<f32>>>
391+
! FIRDialect: {{%.*}} = fir.load [[R_DECL]]#0 : !fir.ref<!fir.box<!fir.heap<f32>>>
392392
! FIRDialect: fir.if {{%.*}} {
393-
! FIRDialect: [[LD:%.*]] = fir.load [[R_DECL]]#1 : !fir.ref<!fir.box<!fir.heap<f32>>>
393+
! FIRDialect: [[LD:%.*]] = fir.load [[R_DECL]]#0 : !fir.ref<!fir.box<!fir.heap<f32>>>
394394
! FIRDialect: [[AD:%.*]] = fir.box_addr [[LD]] : (!fir.box<!fir.heap<f32>>) -> !fir.heap<f32>
395395
! FIRDialect: fir.freemem [[AD]] : !fir.heap<f32>
396-
! FIRDialect: fir.store {{%.*}} to [[R_DECL]]#1 : !fir.ref<!fir.box<!fir.heap<f32>>>
396+
! FIRDialect: fir.store {{%.*}} to [[R_DECL]]#0 : !fir.ref<!fir.box<!fir.heap<f32>>>
397397
!$OMP END PARALLEL DO
398398
! FIRDialect: omp.terminator
399399
end subroutine
@@ -421,10 +421,10 @@ subroutine simd_loop_1
421421
end do
422422
!$OMP END SIMD
423423
! FIRDialect: omp.yield
424-
! FIRDialect: {{%.*}} = fir.load [[R_DECL]]#1 : !fir.ref<!fir.box<!fir.heap<f32>>>
424+
! FIRDialect: {{%.*}} = fir.load [[R_DECL]]#0 : !fir.ref<!fir.box<!fir.heap<f32>>>
425425
! FIRDialect: fir.if {{%.*}} {
426-
! FIRDialect: [[LD:%.*]] = fir.load [[R_DECL]]#1 : !fir.ref<!fir.box<!fir.heap<f32>>>
426+
! FIRDialect: [[LD:%.*]] = fir.load [[R_DECL]]#0 : !fir.ref<!fir.box<!fir.heap<f32>>>
427427
! FIRDialect: [[AD:%.*]] = fir.box_addr [[LD]] : (!fir.box<!fir.heap<f32>>) -> !fir.heap<f32>
428428
! FIRDialect: fir.freemem [[AD]] : !fir.heap<f32>
429-
! FIRDialect: fir.store {{%.*}} to [[R_DECL]]#1 : !fir.ref<!fir.box<!fir.heap<f32>>>
429+
! FIRDialect: fir.store {{%.*}} to [[R_DECL]]#0 : !fir.ref<!fir.box<!fir.heap<f32>>>
430430
end subroutine

0 commit comments

Comments
 (0)