Skip to content

Commit 60cf2c5

Browse files
clementvalschweitzpgi
authored andcommitted
[flang][openacc] Fix acc.loop lowering + re-activate tests
1 parent 480d413 commit 60cf2c5

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

flang/lib/Lower/OpenACC.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ static void genACC(Fortran::lower::AbstractConverter &absConv,
3636
llvm::ArrayRef<mlir::Type> argTy;
3737
mlir::ValueRange range;
3838
// Temporarly set to default 0 as operands are not generated yet.
39-
llvm::SmallVector<int32_t, 2> operandSegmentSizes(/*Size=*/2,
39+
llvm::SmallVector<int32_t, 2> operandSegmentSizes(/*Size=*/7,
4040
/*Value=*/0);
4141
auto loopOp =
4242
firOpBuilder.create<mlir::acc::LoopOp>(currentLocation, argTy, range);
@@ -52,7 +52,6 @@ static void genACC(Fortran::lower::AbstractConverter &absConv,
5252
const auto &accClauseList =
5353
std::get<Fortran::parser::AccClauseList>(beginLoopDirective.t);
5454

55-
//
5655
for (const auto &clause : accClauseList.v) {
5756
if (const auto *collapseClause =
5857
std::get_if<Fortran::parser::AccClause::Collapse>(&clause.u)) {

flang/test/Lower/OpenACC/acc-loop.f90

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
! This test checks lowering of OpenACC loop directive.
22

33
! RUN: bbc -fopenacc -emit-fir %s -o - | FileCheck %s
4-
! XFAIL: *
54

65
program acc_loop
76

flang/test/Lower/pre-fir-tree05.f90

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
! RUN: bbc -fdebug-pre-fir-tree -fparse-only -fopenacc %s | FileCheck %s
2-
! XFAIL: *
1+
! RUN: bbc -I %moddir -pft-test -fopenacc -o %t %s | FileCheck %s
32

43
! Test structure of the Pre-FIR tree with OpenACC construct
54

0 commit comments

Comments
 (0)