2018-03-12 Cesar Philippidis <cesar@codesourcery.com>
Backport from trunk:
2018-01-25 Tom de Vries <tom@codesourcery.com>
PR target/84028
gcc/
* config/nvptx/nvptx.c (nvptx_single): Add exit insn after noreturn call
for neutered workers.
* testsuite/libgomp.oacc-fortran/pr84028.f90: New test.
2018-01-24 Tom de Vries <tom@codesourcery.com>
PR target/81352
gcc/
* config/nvptx/nvptx.c (nvptx_single): Add exit insn after noreturn call
for neutered threads in warp.
* config/nvptx/nvptx.md (define_insn "exit"): New insn.
* testsuite/libgomp.oacc-fortran/pr81352.f90: New test.
@@ -4128,7 +4128,12 @@ nvptx_single (unsigned mask, basic_block from, basic_block to)
if (tail_branch)
before = emit_label_before (label, before);
else
- emit_label_after (label, tail);
+ {
+ rtx_insn *label_insn = emit_label_after (label, tail);
+ if ((mode == GOMP_DIM_VECTOR || mode == GOMP_DIM_WORKER)
+ && CALL_P (tail) && find_reg_note (tail, REG_NORETURN, NULL))
+ emit_insn_after (gen_exit (), label_insn);
+ }
}
/* Now deal with propagating the branch condition. */
@@ -972,6 +972,11 @@
""
"")
+(define_insn "exit"
+ [(const_int 1)]
+ ""
+ "exit;")
+
(define_insn "return"
[(return)]
""
new file mode 100644
@@ -0,0 +1,20 @@
+! { dg-do run }
+
+program foo
+ integer :: a(3,3), l, ll
+ a = 0
+
+ !$acc parallel num_gangs (1) num_workers(1)
+
+ do l=1,3
+ !$acc loop vector
+ do ll=1,3
+ a(l,ll) = 2
+ enddo
+ enddo
+
+ if (any(a(1:3,1:3).ne.2)) call abort
+
+ !$acc end parallel
+
+end program foo
new file mode 100644
@@ -0,0 +1,25 @@
+! { dg-do run }
+
+program foo
+ integer :: a(3,3,3), ll, lll
+
+ a = 1
+
+ !$acc parallel num_gangs(1) num_workers(2) ! { dg-warning "region is worker partitioned" }
+
+ if (any(a(1:3,1:3,1:3).ne.1)) call abort
+
+ do ll=1,3
+
+ !$acc loop vector
+ do lll=1,3
+ a(1,ll,lll) = 2
+ enddo
+
+ enddo
+
+ if (a(1,1,1).ne.2) call abort
+
+ !$acc end parallel
+
+end program foo