Commit ad64c684 authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r295474: 

------------------------------------------------------------------------
r295474 | hahnfeld | 2017-02-17 10:32:58 -0800 (Fri, 17 Feb 2017) | 6 lines

[OpenMP] Fix cancellation point in task with no cancel

With tasks, the cancel may happen in another task. This has a different
region info which means that we can't find it here.

Differential Revision: https://reviews.llvm.org/D30091
------------------------------------------------------------------------

llvm-svn: 296151
parent 8e1284a2

clang/lib/CodeGen/CGOpenMPRuntime.cpp

+3 −1
Original line number Diff line number Diff line
@@ -4697,7 +4697,9 @@ void CGOpenMPRuntime::emitCancellationPointCall( 
  // global_tid, kmp_int32 cncl_kind);

  if (auto *OMPRegionInfo =

          dyn_cast_or_null<CGOpenMPRegionInfo>(CGF.CapturedStmtInfo)) {

    if (OMPRegionInfo->hasCancel()) {

    // For 'cancellation point taskgroup', the task region info may not have a

    // cancel. This may instead happen in another adjacent task.

    if (CancelRegion == OMPD_taskgroup || OMPRegionInfo->hasCancel()) {

      llvm::Value *Args[] = {

          emitUpdateLocation(CGF, Loc), getThreadID(CGF, Loc),

          CGF.Builder.getInt32(getCancellationKind(CancelRegion))};

clang/test/OpenMP/cancellation_point_codegen.cpp

+15 −0
Original line number Diff line number Diff line
@@ -78,6 +78,12 @@ for (int i = 0; i < argc; ++i) { 
}

// CHECK: call i8* @__kmpc_omp_task_alloc(

// CHECK: call i32 @__kmpc_omp_task(

#pragma omp task

{

#pragma omp cancellation point taskgroup

}

// CHECK: call i8* @__kmpc_omp_task_alloc(

// CHECK: call i32 @__kmpc_omp_task(

#pragma omp parallel sections

{

  {
@@ -125,6 +131,15 @@ for (int i = 0; i < argc; ++i) { 
// CHECK: [[RETURN]]

// CHECK: ret i32 0



// CHECK: define internal i32 @{{[^(]+}}(i32

// CHECK: [[RES:%.+]] = call i32 @__kmpc_cancellationpoint(%ident_t* {{[^,]+}}, i32 {{[^,]+}}, i32 4)

// CHECK: [[CMP:%.+]] = icmp ne i32 [[RES]], 0

// CHECK: br i1 [[CMP]], label %[[EXIT:[^,]+]],

// CHECK: [[EXIT]]

// CHECK: br label %[[RETURN:.+]]

// CHECK: [[RETURN]]

// CHECK: ret i32 0



// CHECK: define internal void @{{[^(]+}}(i32* {{[^,]+}}, i32* {{[^,]+}})

// CHECK: call void @__kmpc_for_static_init_4(

// CHECK: [[RES:%.+]] = call i32 @__kmpc_cancellationpoint(%ident_t* {{[^,]+}}, i32 [[GTID:%.+]], i32 3)