Unverified Commit 0f8615f4 authored by Valentin Clement (バレンタイン クレメン)'s avatar Valentin Clement (バレンタイン クレメン) Committed by GitHub
Browse files

[flang][openacc][openmp] Set correct location on atomic operations (#70680) 

The location set on atomic operations in both OpenMP and OpenACC was
completly off. The real location needs to be created from the source
CharBlock of the parse tree node of the respective atomic statement.
This patch updates locations in lowering for atomic operations.
parent e46dd6fb

flang/lib/Lower/DirectivesCommon.h

+29 −36
Original line number Diff line number Diff line
@@ -132,10 +132,9 @@ static inline void genOmpAccAtomicCaptureStatement( 
    mlir::Value toAddress,

    [[maybe_unused]] const AtomicListT *leftHandClauseList,

    [[maybe_unused]] const AtomicListT *rightHandClauseList,

    mlir::Type elementType) {

    mlir::Type elementType, mlir::Location loc) {

  // Generate `atomic.read` operation for atomic assigment statements

  fir::FirOpBuilder &firOpBuilder = converter.getFirOpBuilder();

  mlir::Location currentLocation = converter.getCurrentLocation();



  if constexpr (std::is_same<AtomicListT,

                             Fortran::parser::OmpAtomicClauseList>()) {
@@ -151,12 +150,11 @@ static inline void genOmpAccAtomicCaptureStatement( 
      genOmpAtomicHintAndMemoryOrderClauses(converter, *rightHandClauseList,

                                            hint, memoryOrder);

    firOpBuilder.create<mlir::omp::AtomicReadOp>(

        currentLocation, fromAddress, toAddress,

        mlir::TypeAttr::get(elementType), hint, memoryOrder);

        loc, fromAddress, toAddress, mlir::TypeAttr::get(elementType), hint,

        memoryOrder);

  } else {

    firOpBuilder.create<mlir::acc::AtomicReadOp>(

        currentLocation, fromAddress, toAddress,

        mlir::TypeAttr::get(elementType));

        loc, fromAddress, toAddress, mlir::TypeAttr::get(elementType));

  }

}
@@ -166,11 +164,10 @@ template <typename AtomicListT> 
static inline void genOmpAccAtomicWriteStatement(

    Fortran::lower::AbstractConverter &converter, mlir::Value lhsAddr,

    mlir::Value rhsExpr, [[maybe_unused]] const AtomicListT *leftHandClauseList,

    [[maybe_unused]] const AtomicListT *rightHandClauseList,

    [[maybe_unused]] const AtomicListT *rightHandClauseList, mlir::Location loc,

    mlir::Value *evaluatedExprValue = nullptr) {

  // Generate `atomic.write` operation for atomic assignment statements

  fir::FirOpBuilder &firOpBuilder = converter.getFirOpBuilder();

  mlir::Location currentLocation = converter.getCurrentLocation();



  if constexpr (std::is_same<AtomicListT,

                             Fortran::parser::OmpAtomicClauseList>()) {
@@ -184,11 +181,10 @@ static inline void genOmpAccAtomicWriteStatement( 
    if (rightHandClauseList)

      genOmpAtomicHintAndMemoryOrderClauses(converter, *rightHandClauseList,

                                            hint, memoryOrder);

    firOpBuilder.create<mlir::omp::AtomicWriteOp>(currentLocation, lhsAddr,

                                                  rhsExpr, hint, memoryOrder);

    firOpBuilder.create<mlir::omp::AtomicWriteOp>(loc, lhsAddr, rhsExpr, hint,

                                                  memoryOrder);

  } else {

    firOpBuilder.create<mlir::acc::AtomicWriteOp>(currentLocation, lhsAddr,

                                                  rhsExpr);

    firOpBuilder.create<mlir::acc::AtomicWriteOp>(loc, lhsAddr, rhsExpr);

  }

}
@@ -200,7 +196,7 @@ static inline void genOmpAccAtomicUpdateStatement( 
    mlir::Type varType, const Fortran::parser::Variable &assignmentStmtVariable,

    const Fortran::parser::Expr &assignmentStmtExpr,

    [[maybe_unused]] const AtomicListT *leftHandClauseList,

    [[maybe_unused]] const AtomicListT *rightHandClauseList,

    [[maybe_unused]] const AtomicListT *rightHandClauseList, mlir::Location loc,

    mlir::Operation *atomicCaptureOp = nullptr) {

  // Generate `atomic.update` operation for atomic assignment statements

  fir::FirOpBuilder &firOpBuilder = converter.getFirOpBuilder();
@@ -302,7 +298,7 @@ static inline void genOmpAccAtomicUpdateStatement( 
/// Processes an atomic construct with write clause.

template <typename AtomicT, typename AtomicListT>

void genOmpAccAtomicWrite(Fortran::lower::AbstractConverter &converter,

                          const AtomicT &atomicWrite) {

                          const AtomicT &atomicWrite, mlir::Location loc) {

  const AtomicListT *rightHandClauseList = nullptr;

  const AtomicListT *leftHandClauseList = nullptr;

  if constexpr (std::is_same<AtomicListT,
@@ -324,13 +320,13 @@ void genOmpAccAtomicWrite(Fortran::lower::AbstractConverter &converter, 
  mlir::Value lhsAddr =

      fir::getBase(converter.genExprAddr(assign.lhs, stmtCtx));

  genOmpAccAtomicWriteStatement(converter, lhsAddr, rhsExpr, leftHandClauseList,

                                rightHandClauseList);

                                rightHandClauseList, loc);

}



/// Processes an atomic construct with read clause.

template <typename AtomicT, typename AtomicListT>

void genOmpAccAtomicRead(Fortran::lower::AbstractConverter &converter,

                         const AtomicT &atomicRead) {

                         const AtomicT &atomicRead, mlir::Location loc) {

  const AtomicListT *rightHandClauseList = nullptr;

  const AtomicListT *leftHandClauseList = nullptr;

  if constexpr (std::is_same<AtomicListT,
@@ -357,20 +353,19 @@ void genOmpAccAtomicRead(Fortran::lower::AbstractConverter &converter, 
      fir::getBase(converter.genExprAddr(fromExpr, stmtCtx));

  mlir::Value toAddress = fir::getBase(converter.genExprAddr(

      *Fortran::semantics::GetExpr(assignmentStmtVariable), stmtCtx));

  mlir::Location loc = converter.getCurrentLocation();

  fir::FirOpBuilder &builder = converter.getFirOpBuilder();

  if (fromAddress.getType() != toAddress.getType())

    fromAddress =

        builder.create<fir::ConvertOp>(loc, toAddress.getType(), fromAddress);

  genOmpAccAtomicCaptureStatement(converter, fromAddress, toAddress,

                                  leftHandClauseList, rightHandClauseList,

                                  elementType);

                                  elementType, loc);

}



/// Processes an atomic construct with update clause.

template <typename AtomicT, typename AtomicListT>

void genOmpAccAtomicUpdate(Fortran::lower::AbstractConverter &converter,

                           const AtomicT &atomicUpdate) {

                           const AtomicT &atomicUpdate, mlir::Location loc) {

  const AtomicListT *rightHandClauseList = nullptr;

  const AtomicListT *leftHandClauseList = nullptr;

  if constexpr (std::is_same<AtomicListT,
@@ -395,13 +390,13 @@ void genOmpAccAtomicUpdate(Fortran::lower::AbstractConverter &converter, 
  mlir::Type varType = fir::unwrapRefType(lhsAddr.getType());

  genOmpAccAtomicUpdateStatement<AtomicListT>(

      converter, lhsAddr, varType, assignmentStmtVariable, assignmentStmtExpr,

      leftHandClauseList, rightHandClauseList);

      leftHandClauseList, rightHandClauseList, loc);

}



/// Processes an atomic construct with no clause - which implies update clause.

template <typename AtomicT, typename AtomicListT>

void genOmpAtomic(Fortran::lower::AbstractConverter &converter,

                  const AtomicT &atomicConstruct) {

                  const AtomicT &atomicConstruct, mlir::Location loc) {

  const AtomicListT &atomicClauseList =

      std::get<AtomicListT>(atomicConstruct.t);

  const auto &assignmentStmtExpr = std::get<Fortran::parser::Expr>(
@@ -420,15 +415,14 @@ void genOmpAtomic(Fortran::lower::AbstractConverter &converter, 
  // the update clause is specified (for both OpenMP and OpenACC).

  genOmpAccAtomicUpdateStatement<AtomicListT>(

      converter, lhsAddr, varType, assignmentStmtVariable, assignmentStmtExpr,

      &atomicClauseList, nullptr);

      &atomicClauseList, nullptr, loc);

}



/// Processes an atomic construct with capture clause.

template <typename AtomicT, typename AtomicListT>

void genOmpAccAtomicCapture(Fortran::lower::AbstractConverter &converter,

                            const AtomicT &atomicCapture) {

                            const AtomicT &atomicCapture, mlir::Location loc) {

  fir::FirOpBuilder &firOpBuilder = converter.getFirOpBuilder();

  mlir::Location currentLocation = converter.getCurrentLocation();



  const Fortran::parser::AssignmentStmt &stmt1 =

      std::get<typename AtomicT::Stmt1>(atomicCapture.t).v.statement;
@@ -480,11 +474,10 @@ void genOmpAccAtomicCapture(Fortran::lower::AbstractConverter &converter, 
                                          memoryOrder);

    genOmpAtomicHintAndMemoryOrderClauses(converter, rightHandClauseList, hint,

                                          memoryOrder);

    atomicCaptureOp = firOpBuilder.create<mlir::omp::AtomicCaptureOp>(

        currentLocation, hint, memoryOrder);

  } else {

    atomicCaptureOp =

        firOpBuilder.create<mlir::acc::AtomicCaptureOp>(currentLocation);

        firOpBuilder.create<mlir::omp::AtomicCaptureOp>(loc, hint, memoryOrder);

  } else {

    atomicCaptureOp = firOpBuilder.create<mlir::acc::AtomicCaptureOp>(loc);

  }



  firOpBuilder.createBlock(&(atomicCaptureOp->getRegion(0)));
@@ -499,11 +492,11 @@ void genOmpAccAtomicCapture(Fortran::lower::AbstractConverter &converter, 
      genOmpAccAtomicCaptureStatement<AtomicListT>(

          converter, stmt1RHSArg, stmt1LHSArg,

          /*leftHandClauseList=*/nullptr,

          /*rightHandClauseList=*/nullptr, elementType);

          /*rightHandClauseList=*/nullptr, elementType, loc);

      genOmpAccAtomicUpdateStatement<AtomicListT>(

          converter, stmt1RHSArg, stmt2VarType, stmt2Var, stmt2Expr,

          /*leftHandClauseList=*/nullptr,

          /*rightHandClauseList=*/nullptr, atomicCaptureOp);

          /*rightHandClauseList=*/nullptr, loc, atomicCaptureOp);

    } else {

      // Atomic capture construct is of the form [capture-stmt, write-stmt]

      const Fortran::semantics::SomeExpr &fromExpr =
@@ -512,11 +505,11 @@ void genOmpAccAtomicCapture(Fortran::lower::AbstractConverter &converter, 
      genOmpAccAtomicCaptureStatement<AtomicListT>(

          converter, stmt1RHSArg, stmt1LHSArg,

          /*leftHandClauseList=*/nullptr,

          /*rightHandClauseList=*/nullptr, elementType);

          /*rightHandClauseList=*/nullptr, elementType, loc);

      genOmpAccAtomicWriteStatement<AtomicListT>(

          converter, stmt1RHSArg, stmt2RHSArg,

          /*leftHandClauseList=*/nullptr,

          /*rightHandClauseList=*/nullptr);

          /*rightHandClauseList=*/nullptr, loc);

    }

  } else {

    // Atomic capture construct is of the form [update-stmt, capture-stmt]
@@ -527,19 +520,19 @@ void genOmpAccAtomicCapture(Fortran::lower::AbstractConverter &converter, 
    genOmpAccAtomicCaptureStatement<AtomicListT>(

        converter, stmt1LHSArg, stmt2LHSArg,

        /*leftHandClauseList=*/nullptr,

        /*rightHandClauseList=*/nullptr, elementType);

        /*rightHandClauseList=*/nullptr, elementType, loc);

    firOpBuilder.setInsertionPointToStart(&block);

    genOmpAccAtomicUpdateStatement<AtomicListT>(

        converter, stmt1LHSArg, stmt1VarType, stmt1Var, stmt1Expr,

        /*leftHandClauseList=*/nullptr,

        /*rightHandClauseList=*/nullptr, atomicCaptureOp);

        /*rightHandClauseList=*/nullptr, loc, atomicCaptureOp);

  }

  firOpBuilder.setInsertionPointToEnd(&block);

  if constexpr (std::is_same<AtomicListT,

                             Fortran::parser::OmpAtomicClauseList>()) {

    firOpBuilder.create<mlir::omp::TerminatorOp>(currentLocation);

    firOpBuilder.create<mlir::omp::TerminatorOp>(loc);

  } else {

    firOpBuilder.create<mlir::acc::TerminatorOp>(currentLocation);

    firOpBuilder.create<mlir::acc::TerminatorOp>(loc);

  }

  firOpBuilder.setInsertionPointToStart(&block);

}

flang/lib/Lower/OpenACC.cpp

+9 −5
Original line number Diff line number Diff line
@@ -3306,25 +3306,29 @@ static void 
genACC(Fortran::lower::AbstractConverter &converter,

       Fortran::lower::pft::Evaluation &eval,

       const Fortran::parser::OpenACCAtomicConstruct &atomicConstruct) {



  mlir::Location loc = converter.genLocation(atomicConstruct.source);

  std::visit(

      Fortran::common::visitors{

          [&](const Fortran::parser::AccAtomicRead &atomicRead) {

            Fortran::lower::genOmpAccAtomicRead<Fortran::parser::AccAtomicRead,

                                                void>(converter, atomicRead);

                                                void>(converter, atomicRead,

                                                      loc);

          },

          [&](const Fortran::parser::AccAtomicWrite &atomicWrite) {

            Fortran::lower::genOmpAccAtomicWrite<

                Fortran::parser::AccAtomicWrite, void>(converter, atomicWrite);

                Fortran::parser::AccAtomicWrite, void>(converter, atomicWrite,

                                                       loc);

          },

          [&](const Fortran::parser::AccAtomicUpdate &atomicUpdate) {

            Fortran::lower::genOmpAccAtomicUpdate<

                Fortran::parser::AccAtomicUpdate, void>(converter,

                                                        atomicUpdate);

                Fortran::parser::AccAtomicUpdate, void>(converter, atomicUpdate,

                                                        loc);

          },

          [&](const Fortran::parser::AccAtomicCapture &atomicCapture) {

            Fortran::lower::genOmpAccAtomicCapture<

                Fortran::parser::AccAtomicCapture, void>(converter,

                                                         atomicCapture);

                                                         atomicCapture, loc);

          },

      },

      atomicConstruct.u);

flang/lib/Lower/OpenMP.cpp

+14 −5
Original line number Diff line number Diff line
@@ -3060,29 +3060,38 @@ genOMP(Fortran::lower::AbstractConverter &converter, 
  std::visit(

      Fortran::common::visitors{

          [&](const Fortran::parser::OmpAtomicRead &atomicRead) {

            mlir::Location loc = converter.genLocation(atomicRead.source);

            Fortran::lower::genOmpAccAtomicRead<

                Fortran::parser::OmpAtomicRead,

                Fortran::parser::OmpAtomicClauseList>(converter, atomicRead);

                Fortran::parser::OmpAtomicClauseList>(converter, atomicRead,

                                                      loc);

          },

          [&](const Fortran::parser::OmpAtomicWrite &atomicWrite) {

            mlir::Location loc = converter.genLocation(atomicWrite.source);

            Fortran::lower::genOmpAccAtomicWrite<

                Fortran::parser::OmpAtomicWrite,

                Fortran::parser::OmpAtomicClauseList>(converter, atomicWrite);

                Fortran::parser::OmpAtomicClauseList>(converter, atomicWrite,

                                                      loc);

          },

          [&](const Fortran::parser::OmpAtomic &atomicConstruct) {

            mlir::Location loc = converter.genLocation(atomicConstruct.source);

            Fortran::lower::genOmpAtomic<Fortran::parser::OmpAtomic,

                                         Fortran::parser::OmpAtomicClauseList>(

                converter, atomicConstruct);

                converter, atomicConstruct, loc);

          },

          [&](const Fortran::parser::OmpAtomicUpdate &atomicUpdate) {

            mlir::Location loc = converter.genLocation(atomicUpdate.source);

            Fortran::lower::genOmpAccAtomicUpdate<

                Fortran::parser::OmpAtomicUpdate,

                Fortran::parser::OmpAtomicClauseList>(converter, atomicUpdate);

                Fortran::parser::OmpAtomicClauseList>(converter, atomicUpdate,

                                                      loc);

          },

          [&](const Fortran::parser::OmpAtomicCapture &atomicCapture) {

            mlir::Location loc = converter.genLocation(atomicCapture.source);

            Fortran::lower::genOmpAccAtomicCapture<

                Fortran::parser::OmpAtomicCapture,

                Fortran::parser::OmpAtomicClauseList>(converter, atomicCapture);

                Fortran::parser::OmpAtomicClauseList>(converter, atomicCapture,

                                                      loc);

          },

      },

      atomicConstruct.u);

flang/test/Lower/OpenACC/locations.f90

+52 −0
Original line number Diff line number Diff line
@@ -111,4 +111,56 @@ module acc_locations 
    !CHECK-NEXT: } loc("{{.*}}locations.f90":99:11)

  end subroutine



  subroutine atomic_read_loc()

    integer(4) :: x

    integer(8) :: y

  

    !$acc atomic read

    y = x

  end

  !CHECK: acc.atomic.read {{.*}} loc("{{.*}}locations.f90":118:11)



  subroutine atomic_capture_loc()

    implicit none

    integer :: k, v, i

  

    k = 1

    v = 0

  

    !$acc atomic capture

    v = k

    k = (i + 1) * 3.14

    !$acc end atomic



! CHECK: acc.atomic.capture {

! CHECK:   acc.atomic.read {{.*}} loc("{{.*}}locations.f90":130:11)

! CHECK:   acc.atomic.write {{.*}} loc("{{.*}}locations.f90":130:11)

! CHECK: } loc("{{.*}}locations.f90":130:11)



  end subroutine



  subroutine atomic_update_loc()

    implicit none

    integer :: x, y, z

    

    !$acc atomic 

    y = y + 1

! CHECK: acc.atomic.update %{{.*}} : !fir.ref<i32> {

! CHECK: ^bb0(%{{.*}}: i32 loc("{{.*}}locations.f90":142:3)):

! CHECK: } loc("{{.*}}locations.f90":142:3)

    

    !$acc atomic update

    z = x * z 



    ! %3 = fir.load %0 : !fir.ref<i32> loc("/local/home/vclement/llvm-project/flang/test/Lower/OpenACC/locations.f90":142:3)

    ! acc.atomic.update %2 : !fir.ref<i32> {

    ! ^bb0(%arg0: i32 loc("/local/home/vclement/llvm-project/flang/test/Lower/OpenACC/locations.f90":142:3)):

    !   %4 = arith.muli %3, %arg0 : i32 loc("/local/home/vclement/llvm-project/flang/test/Lower/OpenACC/locations.f90":142:3)

    !   acc.yield %4 : i32 loc("/local/home/vclement/llvm-project/flang/test/Lower/OpenACC/locations.f90":142:3)

    ! } loc("/local/home/vclement/llvm-project/flang/test/Lower/OpenACC/locations.f90":142:3)

  end subroutine





end module