subject:"\[PATCH\] D35854\: Fix double destruction of objects when OpenMP construct is canceled"

[PATCH] D35854: Fix double destruction of objects when OpenMP construct is canceled

2017-07-27 Thread Erich Keane via Phabricator via cfe-commits

This revision was automatically updated to reflect the committed changes.
Closed by commit rL309288: Fix double destruction of objects when OpenMP 
construct is canceled (authored by erichkeane).

Changed prior to commit:
  https://reviews.llvm.org/D35854?vs=108153=108489#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D35854

Files:
  cfe/trunk/lib/CodeGen/CodeGenFunction.h
  cfe/trunk/test/OpenMP/cancel_codegen_cleanup.cpp


Index: cfe/trunk/test/OpenMP/cancel_codegen_cleanup.cpp
===
--- cfe/trunk/test/OpenMP/cancel_codegen_cleanup.cpp
+++ cfe/trunk/test/OpenMP/cancel_codegen_cleanup.cpp
@@ -0,0 +1,46 @@
+// RUN: %clang_cc1 -std=c++11 -fopenmp -fopenmp-version=45 -triple 
x86_64-apple-darwin13.4.0 -emit-llvm -o - %s | FileCheck %s
+
+//CHECK: call i32 @__kmpc_cancel
+//CHECK: br {{.*}}label %[[EXIT:[^,].+]], label %[[CONTINUE:.+]]
+//CHECK: [[EXIT]]:
+//CHECK: store i32 [[EXIT_SLOT:[0-9]+]]
+//CHECK: br label %[[CLEANUP:.+]]
+//CHECK: [[CONTINUE]]:
+//CHECK: store i32 [[CONT_SLOT:[0-9]+]],
+//CHECK: br label %[[CLEANUP]]
+//CHECK: [[CLEANUP]]:
+//CHECK-NEXT: call void @_ZN3ObjD1Ev
+//CHECK: switch i32{{.*}}, label %[[UNREACHABLE:.+]] [
+//CHECK:   i32 [[CONT_SLOT]], label %[[CLEANUPCONT:.+]]
+//CHECK:   i32 [[EXIT_SLOT]], label %[[CANCELEXIT:.+]]
+//CHECK-NEXT: ]
+//CHECK: [[CLEANUPCONT]]:
+//CHECK: br label %[[CANCELCONT:.+]]
+//CHECK: [[CANCELCONT]]:
+//CHECK-NEXT: call void @__kmpc_barrier(
+//CHECK-NEXT: ret void
+//CHECK: [[UNREACHABLE]]:
+//CHECK-NEXT: unreachable
+//CHECK-NEXT: }
+
+struct Obj {
+  int a; Obj(); Obj(const Obj& r) = delete; Obj =(const Obj& r);
+  ~Obj();
+};
+ 
+void foo() {
+  int i,count = 0;
+  Obj obj;
+
+  #pragma omp parallel private(i) num_threads(1)
+  {
+  #pragma omp for reduction(+:count) lastprivate(obj)
+  for (i=0; i<1000; i++) {
+if(i==100) {
+obj.a = 100;
+#pragma omp cancel for
+}
+count++;
+}
+}
+}
Index: cfe/trunk/lib/CodeGen/CodeGenFunction.h
===
--- cfe/trunk/lib/CodeGen/CodeGenFunction.h
+++ cfe/trunk/lib/CodeGen/CodeGenFunction.h
@@ -1116,7 +1116,7 @@
 auto IP = CGF.Builder.saveAndClearIP();
 CGF.EmitBlock(Stack.back().ExitBlock.getBlock());
 CodeGen(CGF);
-CGF.EmitBranchThroughCleanup(Stack.back().ContBlock);
+CGF.EmitBranch(Stack.back().ContBlock.getBlock());
 CGF.Builder.restoreIP(IP);
 Stack.back().HasBeenEmitted = true;
   }


Index: cfe/trunk/test/OpenMP/cancel_codegen_cleanup.cpp
===
--- cfe/trunk/test/OpenMP/cancel_codegen_cleanup.cpp
+++ cfe/trunk/test/OpenMP/cancel_codegen_cleanup.cpp
@@ -0,0 +1,46 @@
+// RUN: %clang_cc1 -std=c++11 -fopenmp -fopenmp-version=45 -triple x86_64-apple-darwin13.4.0 -emit-llvm -o - %s | FileCheck %s
+
+//CHECK: call i32 @__kmpc_cancel
+//CHECK: br {{.*}}label %[[EXIT:[^,].+]], label %[[CONTINUE:.+]]
+//CHECK: [[EXIT]]:
+//CHECK: store i32 [[EXIT_SLOT:[0-9]+]]
+//CHECK: br label %[[CLEANUP:.+]]
+//CHECK: [[CONTINUE]]:
+//CHECK: store i32 [[CONT_SLOT:[0-9]+]],
+//CHECK: br label %[[CLEANUP]]
+//CHECK: [[CLEANUP]]:
+//CHECK-NEXT: call void @_ZN3ObjD1Ev
+//CHECK: switch i32{{.*}}, label %[[UNREACHABLE:.+]] [
+//CHECK:   i32 [[CONT_SLOT]], label %[[CLEANUPCONT:.+]]
+//CHECK:   i32 [[EXIT_SLOT]], label %[[CANCELEXIT:.+]]
+//CHECK-NEXT: ]
+//CHECK: [[CLEANUPCONT]]:
+//CHECK: br label %[[CANCELCONT:.+]]
+//CHECK: [[CANCELCONT]]:
+//CHECK-NEXT: call void @__kmpc_barrier(
+//CHECK-NEXT: ret void
+//CHECK: [[UNREACHABLE]]:
+//CHECK-NEXT: unreachable
+//CHECK-NEXT: }
+
+struct Obj {
+  int a; Obj(); Obj(const Obj& r) = delete; Obj =(const Obj& r);
+  ~Obj();
+};
+ 
+void foo() {
+  int i,count = 0;
+  Obj obj;
+
+  #pragma omp parallel private(i) num_threads(1)
+  {
+  #pragma omp for reduction(+:count) lastprivate(obj)
+  for (i=0; i<1000; i++) {
+if(i==100) {
+obj.a = 100;
+#pragma omp cancel for
+}
+count++;
+}
+}
+}
Index: cfe/trunk/lib/CodeGen/CodeGenFunction.h
===
--- cfe/trunk/lib/CodeGen/CodeGenFunction.h
+++ cfe/trunk/lib/CodeGen/CodeGenFunction.h
@@ -1116,7 +1116,7 @@
 auto IP = CGF.Builder.saveAndClearIP();
 CGF.EmitBlock(Stack.back().ExitBlock.getBlock());
 CodeGen(CGF);
-CGF.EmitBranchThroughCleanup(Stack.back().ContBlock);
+CGF.EmitBranch(Stack.back().ContBlock.getBlock());
 CGF.Builder.restoreIP(IP);
 Stack.back().HasBeenEmitted = true;
   }
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D35854: Fix double destruction of objects when OpenMP construct is canceled

2017-07-26 Thread Alexey Bataev via Phabricator via cfe-commits

ABataev accepted this revision.
ABataev added a comment.
This revision is now accepted and ready to land.

LG


https://reviews.llvm.org/D35854



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D35854: Fix double destruction of objects when OpenMP construct is canceled

2017-07-25 Thread Mike Rice via Phabricator via cfe-commits

mikerice created this revision.

When an omp for loop is canceled the constructed objects are being destructed 
twice.

It looks like the desired code is:

{

  Obj o;
  If (cancelled) branch-through-cleanups to cancel.exit.

}
[cleanups]
cancel.exit:

  __kmpc_for_static_fini
  br cancel.cont (*)

cancel.cont:

  __kmpc_barrier
  return

The problem seems to be the branch to cancel.cont is currently also going 
through the cleanups calling them again.  This change just does a direct branch 
instead.


https://reviews.llvm.org/D35854

Files:
  lib/CodeGen/CodeGenFunction.h
  test/OpenMP/cancel_codegen_cleanup.cpp


Index: lib/CodeGen/CodeGenFunction.h
===
--- lib/CodeGen/CodeGenFunction.h
+++ lib/CodeGen/CodeGenFunction.h
@@ -1116,7 +1116,7 @@
 auto IP = CGF.Builder.saveAndClearIP();
 CGF.EmitBlock(Stack.back().ExitBlock.getBlock());
 CodeGen(CGF);
-CGF.EmitBranchThroughCleanup(Stack.back().ContBlock);
+CGF.EmitBranch(Stack.back().ContBlock.getBlock());
 CGF.Builder.restoreIP(IP);
 Stack.back().HasBeenEmitted = true;
   }
Index: test/OpenMP/cancel_codegen_cleanup.cpp
===
--- test/OpenMP/cancel_codegen_cleanup.cpp
+++ test/OpenMP/cancel_codegen_cleanup.cpp
@@ -0,0 +1,46 @@
+// RUN: %clang_cc1 -std=c++11 -fopenmp -fopenmp-version=45 -triple 
x86_64-apple-darwin13.4.0 -emit-llvm -o - %s | FileCheck %s
+
+//CHECK: call i32 @__kmpc_cancel
+//CHECK: br {{.*}}label %[[EXIT:[^,].+]], label %[[CONTINUE:.+]]
+//CHECK: [[EXIT]]:
+//CHECK: store i32 [[EXIT_SLOT:[0-9]+]]
+//CHECK: br label %[[CLEANUP:.+]]
+//CHECK: [[CONTINUE]]:
+//CHECK: store i32 [[CONT_SLOT:[0-9]+]],
+//CHECK: br label %[[CLEANUP]]
+//CHECK: [[CLEANUP]]:
+//CHECK-NEXT: call void @_ZN3ObjD1Ev
+//CHECK: switch i32{{.*}}, label %[[UNREACHABLE:.+]] [
+//CHECK:   i32 [[CONT_SLOT]], label %[[CLEANUPCONT:.+]]
+//CHECK:   i32 [[EXIT_SLOT]], label %[[CANCELEXIT:.+]]
+//CHECK-NEXT: ]
+//CHECK: [[CLEANUPCONT]]:
+//CHECK: br label %[[CANCELCONT:.+]]
+//CHECK: [[CANCELCONT]]:
+//CHECK-NEXT: call void @__kmpc_barrier(
+//CHECK-NEXT: ret void
+//CHECK: [[UNREACHABLE]]:
+//CHECK-NEXT: unreachable
+//CHECK-NEXT: }
+
+struct Obj {
+  int a; Obj(); Obj(const Obj& r) = delete; Obj =(const Obj& r);
+  ~Obj();
+};
+ 
+void foo() {
+  int i,count = 0;
+  Obj obj;
+
+  #pragma omp parallel private(i) num_threads(1)
+  {
+  #pragma omp for reduction(+:count) lastprivate(obj)
+  for (i=0; i<1000; i++) {
+if(i==100) {
+obj.a = 100;
+#pragma omp cancel for
+}
+count++;
+}
+}
+}


Index: lib/CodeGen/CodeGenFunction.h
===
--- lib/CodeGen/CodeGenFunction.h
+++ lib/CodeGen/CodeGenFunction.h
@@ -1116,7 +1116,7 @@
 auto IP = CGF.Builder.saveAndClearIP();
 CGF.EmitBlock(Stack.back().ExitBlock.getBlock());
 CodeGen(CGF);
-CGF.EmitBranchThroughCleanup(Stack.back().ContBlock);
+CGF.EmitBranch(Stack.back().ContBlock.getBlock());
 CGF.Builder.restoreIP(IP);
 Stack.back().HasBeenEmitted = true;
   }
Index: test/OpenMP/cancel_codegen_cleanup.cpp
===
--- test/OpenMP/cancel_codegen_cleanup.cpp
+++ test/OpenMP/cancel_codegen_cleanup.cpp
@@ -0,0 +1,46 @@
+// RUN: %clang_cc1 -std=c++11 -fopenmp -fopenmp-version=45 -triple x86_64-apple-darwin13.4.0 -emit-llvm -o - %s | FileCheck %s
+
+//CHECK: call i32 @__kmpc_cancel
+//CHECK: br {{.*}}label %[[EXIT:[^,].+]], label %[[CONTINUE:.+]]
+//CHECK: [[EXIT]]:
+//CHECK: store i32 [[EXIT_SLOT:[0-9]+]]
+//CHECK: br label %[[CLEANUP:.+]]
+//CHECK: [[CONTINUE]]:
+//CHECK: store i32 [[CONT_SLOT:[0-9]+]],
+//CHECK: br label %[[CLEANUP]]
+//CHECK: [[CLEANUP]]:
+//CHECK-NEXT: call void @_ZN3ObjD1Ev
+//CHECK: switch i32{{.*}}, label %[[UNREACHABLE:.+]] [
+//CHECK:   i32 [[CONT_SLOT]], label %[[CLEANUPCONT:.+]]
+//CHECK:   i32 [[EXIT_SLOT]], label %[[CANCELEXIT:.+]]
+//CHECK-NEXT: ]
+//CHECK: [[CLEANUPCONT]]:
+//CHECK: br label %[[CANCELCONT:.+]]
+//CHECK: [[CANCELCONT]]:
+//CHECK-NEXT: call void @__kmpc_barrier(
+//CHECK-NEXT: ret void
+//CHECK: [[UNREACHABLE]]:
+//CHECK-NEXT: unreachable
+//CHECK-NEXT: }
+
+struct Obj {
+  int a; Obj(); Obj(const Obj& r) = delete; Obj =(const Obj& r);
+  ~Obj();
+};
+ 
+void foo() {
+  int i,count = 0;
+  Obj obj;
+
+  #pragma omp parallel private(i) num_threads(1)
+  {
+  #pragma omp for reduction(+:count) lastprivate(obj)
+  for (i=0; i<1000; i++) {
+if(i==100) {
+obj.a = 100;
+#pragma omp cancel for
+}
+count++;
+}
+}
+}
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D35854: Fix double destruction of objects when OpenMP construct is canceled

[PATCH] D35854: Fix double destruction of objects when OpenMP construct is canceled

[PATCH] D35854: Fix double destruction of objects when OpenMP construct is canceled

3 matches

Site Navigation

Mail list logo

Footer information