do not insert code outside the generated region

on the testcase we used to generate code in the function entry bb_0,
and that choked the cfg verifier.

	* graphite-isl-ast-to-gimple.c (copy_bb_and_scalar_dependences): Check
	that insertion point is still in the region.

	* gfortran.dg/graphite/id-26.f03: New.

Co-Authored-By: Sebastian Pop <s.pop@samsung.com>
From-SVN: r231211

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7fa28913165b5b27a1186316daf6bf44c21ad3f7..d6ba2e83f78a12b77aba0ee1776525a8a50ff176 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-12-02  Aditya Kumar  <aditya.k7@samsung.com>
+           Sebastian Pop  <s.pop@samsung.com>
+
+       * graphite-isl-ast-to-gimple.c (copy_bb_and_scalar_dependences): Check
+       that insertion point is still in the region.
+
 2015-12-02  Aditya Kumar  <aditya.k7@samsung.com>
            Sebastian Pop  <s.pop@samsung.com>
 

diff --git a/gcc/graphite-isl-ast-to-gimple.c b/gcc/graphite-isl-ast-to-gimple.c
index 3139f302ff06af1cf3577903c44a11385f370c0f..497b200f55a788a05697ae5c8952004819b34e08 100644 (file)
--- a/gcc/graphite-isl-ast-to-gimple.c
+++ b/gcc/graphite-isl-ast-to-gimple.c
@@ -2944,6 +2944,7 @@ translate_isl_ast_to_gimple::copy_bb_and_scalar_dependences (basic_block bb,
 
          /* If a corresponding merge-point was not found, then abort codegen.  */
          if (phi_bb->loop_father != loop_father
+             || !bb_in_sese_p (phi_bb, region->if_region->true_region->region)
              || !copy_cond_phi_nodes (bb, phi_bb, iv_map))
            {
              codegen_error = true;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 299250b89aebe4fa70582100f27987fdfa52da71..328f1ec27e0af4558de55c9d5e65c68fd7dfe439 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-02  Aditya Kumar  <aditya.k7@samsung.com>
+           Sebastian Pop  <s.pop@samsung.com>
+
+       * gfortran.dg/graphite/id-26.f03: New.
+
 2015-12-02  Jason Merrill  <jason@redhat.com>
 
        * lib/g++.exp: Handle --stds= option.

diff --git a/gcc/testsuite/gfortran.dg/graphite/id-26.f03 b/gcc/testsuite/gfortran.dg/graphite/id-26.f03
new file mode 100644 (file)
index 0000000..c22cb16
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/graphite/id-26.f03
@@ -0,0 +1,132 @@
+! { dg-options "-fcray-pointer -floop-nest-optimize" }
+
+  use iso_c_binding, only : c_ptr, c_ptrdiff_t, c_loc
+  interface
+    subroutine foo (x, y, z, w)
+      use iso_c_binding, only : c_ptr
+      real, pointer :: x(:), y(:), w(:)
+      type(c_ptr) :: z
+    end subroutine
+    subroutine bar (x, y, z, w)
+      use iso_c_binding, only : c_ptr
+      real, pointer :: x(:), y(:), w(:)
+      type(c_ptr) :: z
+    end subroutine
+    subroutine baz (x, c)
+      real, pointer :: x(:)
+      real, allocatable :: c(:)
+    end subroutine
+  end interface
+  type dt
+    real, allocatable :: a(:)
+  end type
+  type (dt) :: b(64)
+  real, target :: a(4096+63)
+  real, pointer :: p(:), q(:), r(:), s(:)
+  real, allocatable :: c(:)
+  integer(c_ptrdiff_t) :: o
+  integer :: i
+  o = 64 - mod (loc (a), 64)
+  if (o == 64) o = 0
+  o = o / sizeof(0.0)
+  p => a(o + 1:o + 1024)
+  q => a(o + 1025:o + 2048)
+  r => a(o + 2049:o + 3072)
+  s => a(o + 3073:o + 4096)
+  do i = 1, 1024
+    p(i) = i
+    q(i) = i
+    r(i) = i
+    s(i) = i
+  end do
+  call foo (p, q, c_loc (r(1)), s)
+  do i = 1, 1024
+    if (p(i) /= i * i + 3 * i + 2) call abort
+    p(i) = i
+  end do
+  call bar (p, q, c_loc (r(1)), s)
+  do i = 1, 1024
+    if (p(i) /= i * i + 3 * i + 2) call abort
+  end do
+  ! Attempt to create 64-byte aligned allocatable
+  do i = 1, 64
+    allocate (c(1023 + i))
+    if (iand (loc (c(1)), 63) == 0) exit
+    deallocate (c)
+    allocate (b(i)%a(1023 + i))
+    allocate (c(1023 + i))
+    if (iand (loc (c(1)), 63) == 0) exit
+    deallocate (c)
+  end do
+  if (allocated (c)) then
+    do i = 1, 1024
+      c(i) = 2 * i
+    end do
+    call baz (p, c)
+    do i = 1, 1024
+      if (p(i) /= i * i + 5 * i + 2) call abort
+    end do
+  end if
+end
+subroutine foo (x, y, z, w)
+  use iso_c_binding, only : c_ptr, c_f_pointer
+  real, pointer :: x(:), y(:), w(:), p(:)
+  type(c_ptr) :: z
+  integer :: i
+  real :: pt(1024)
+  pointer (ip, pt)
+  ip = loc (w)
+!$omp simd aligned (x, y : 64)
+  do i = 1, 1024
+    x(i) = x(i) * y(i) + 2.0
+  end do
+!$omp simd aligned (x, z : 64) private (p)
+  do i = 1, 1024
+    call c_f_pointer (z, p, shape=[1024])
+    x(i) = x(i) + p(i)
+  end do
+!$omp simd aligned (x, ip : 64)
+  do i = 1, 1024
+    x(i) = x(i) + 2 * pt(i)
+  end do
+!$omp end simd
+end subroutine
+subroutine bar (x, y, z, w)
+  use iso_c_binding, only : c_ptr, c_f_pointer
+  real, pointer :: x(:), y(:), w(:), a(:), b(:)
+  type(c_ptr) :: z, c
+  integer :: i
+  real :: pt(1024)
+  pointer (ip, pt)
+  ip = loc (w)
+  a => x
+  b => y
+  c = z
+!$omp simd aligned (a, b : 64)
+  do i = 1, 1024
+    a(i) = a(i) * b(i) + 2.0
+  end do
+!$omp simd aligned (a, c : 64)
+  do i = 1, 1024
+    block
+      real, pointer :: p(:)
+      call c_f_pointer (c, p, shape=[1024])
+      a(i) = a(i) + p(i)
+    end block
+  end do
+!$omp simd aligned (a, ip : 64)
+  do i = 1, 1024
+    a(i) = a(i) + 2 * pt(i)
+  end do
+!$omp end simd
+end subroutine
+subroutine baz (x, c)
+  real, pointer :: x(:)
+  real, allocatable :: c(:)
+  integer :: i
+!$omp simd aligned (x, c : 64)
+  do i = 1, 1024
+    x(i) = x(i) + c(i)
+  end do
+!$omp end simd
+end subroutine baz