This is an archive of the discontinued LLVM Phabricator instance.

Differential D83983

[flang][OpenMP] Added support for lowering OpenMP taskwait construct
ClosedPublic

Authored by SouraVX on Jul 16 2020, 1:10 PM.

Details

Reviewers
kiranchandramohan
schweitz
jdoerfert
kiranktp
DavidTruby
clementval
Commits
rG079b49b3fb22: [flang][OpenMP] Added support for lowering OpenMP taskwait construct
Summary

This patch lower !OMP TASKWAIT construct from PFT to
OpenMPDialect operations.
Construct is lowered with conformance to OpenMP 4.5 spec.

Patch is carved out of following approved PR:
https://github.com/flang-compiler/f18-llvm-project/pull/280

Diff Detail

Event Timeline

SouraVX created this revision.Jul 16 2020, 1:10 PM
Herald added a reviewer: DavidTruby. · View Herald TranscriptJul 16 2020, 1:10 PM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: llvm-commits, sstefan1, guansong, yaxunl. · View Herald Transcript
Harbormaster completed remote builds in B64588: Diff 278590.Jul 16 2020, 1:42 PM
kiranchandramohan accepted this revision.Jul 16 2020, 3:27 PM

LGTM. Please wait for a day.

This revision is now accepted and ready to land.Jul 16 2020, 3:27 PM
SouraVX added a reviewer: clementval.Jul 16 2020, 11:01 PM
clementval accepted this revision.Jul 17 2020, 5:37 AM
Closed by commit rG079b49b3fb22: [flang][OpenMP] Added support for lowering OpenMP taskwait construct (authored by SouraVX). · Explain WhyJul 17 2020, 7:32 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
flang/
lib/
Lower/
4 lines
unittests/
Lower/
15 lines

Diff 278590

flang/lib/Lower/OpenMP.cpp

//===-- OpenMP.cpp -- Open MP directive lowering --------------------------===// //===-- OpenMP.cpp -- Open MP directive lowering --------------------------===//
Lint: Lint
Inline Actions

clang-format not found in user's PATH; not linting file.

Lint: Lint: clang-format not found in user's PATH; not linting file.
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
Show All 21 Linesstatic void genOMP(Fortran::lower::AbstractConverter &absConv,
switch (directive.v) { switch (directive.v) {
default: default:
break; break;
case llvm::omp::Directive::OMPD_barrier: case llvm::omp::Directive::OMPD_barrier:
absConv.getFirOpBuilder().create<mlir::omp::BarrierOp>( absConv.getFirOpBuilder().create<mlir::omp::BarrierOp>(
absConv.getCurrentLocation()); absConv.getCurrentLocation());
break; break;
case llvm::omp::Directive::OMPD_taskwait: case llvm::omp::Directive::OMPD_taskwait:
TODO(); absConv.getFirOpBuilder().create<mlir::omp::TaskwaitOp>(
absConv.getCurrentLocation());
break;
case llvm::omp::Directive::OMPD_taskyield: case llvm::omp::Directive::OMPD_taskyield:
TODO(); TODO();
case llvm::omp::Directive::OMPD_target_enter_data: case llvm::omp::Directive::OMPD_target_enter_data:
TODO(); TODO();
case llvm::omp::Directive::OMPD_target_exit_data: case llvm::omp::Directive::OMPD_target_exit_data:
TODO(); TODO();
case llvm::omp::Directive::OMPD_target_update: case llvm::omp::Directive::OMPD_target_update:
TODO(); TODO();
▲ Show 20 Lines • Show All 60 Lines • Show Last 20 Lines

flang/unittests/Lower/OpenMPLoweringTest.cpp

//===- OpenMPLoweringTest.cpp -- OpenMPLowering unit tests ----------------===// //===- OpenMPLoweringTest.cpp -- OpenMPLowering unit tests ----------------===//
Lint: Lint
Inline Actions

clang-format not found in user's PATH; not linting file.

Lint: Lint: clang-format not found in user's PATH; not linting file.
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
Show All 27 LinesTEST_F(OpenMPLoweringTest, Barrier) {
EXPECT_EQ(barrierDirective.v, llvm::omp::Directive::OMPD_barrier); EXPECT_EQ(barrierDirective.v, llvm::omp::Directive::OMPD_barrier);
auto barrierOp = mlirOpBuilder->create<mlir::omp::BarrierOp>( auto barrierOp = mlirOpBuilder->create<mlir::omp::BarrierOp>(
mlirOpBuilder->getUnknownLoc()); mlirOpBuilder->getUnknownLoc());
EXPECT_EQ(barrierOp.getOperationName(), "omp.barrier"); EXPECT_EQ(barrierOp.getOperationName(), "omp.barrier");
EXPECT_EQ(succeeded(barrierOp.verify()), true); EXPECT_EQ(succeeded(barrierOp.verify()), true);
} }
TEST_F(OpenMPLoweringTest, TaskWait) {
// Construct a dummy parse tree node for `!OMP taskwait`.
struct Fortran::parser::OmpSimpleStandaloneDirective taskWaitDirective(
llvm::omp::Directive::OMPD_taskwait);
// Check and lower the `!OMP taskwait` node to `TaskwaitOp` operation of
// OpenMPDialect.
EXPECT_EQ(taskWaitDirective.v, llvm::omp::Directive::OMPD_taskwait);
auto taskWaitOp = mlirOpBuilder->create<mlir::omp::TaskwaitOp>(
mlirOpBuilder->getUnknownLoc());
EXPECT_EQ(taskWaitOp.getOperationName(), "omp.taskwait");
EXPECT_EQ(succeeded(taskWaitOp.verify()), true);
}
// main() from gtest_main // main() from gtest_main