[PATCH] PR67518 and PR53852 -- add testcase.

[PATCH] PR67518 and PR53852 -- add testcase.

[VandeVondele Joost]

[-- Attachment #1: Type: text/plain, Size: 375 bytes --]

Attached testcases for two previously fixed PRs (and thanks to Dominique who was quicker for PR67982).

2015-11-03  Joost VandeVondele  <vondele@gnu.gcc.org>

       PR middle-end/53852
       PR middle-end/67518
       * gfortran.dg/PR67518.f90: New test.
       * gfortran.dg/PR53852.f90: New test.

OK for trunk after finished bootstrap and testing ?

Joost


[-- Attachment #2: patch.prs --]
[-- Type: application/octet-stream, Size: 3649 bytes --]

Index: gcc/testsuite/gfortran.dg/PR67518.f90
===================================================================
--- gcc/testsuite/gfortran.dg/PR67518.f90	(revision 0)
+++ gcc/testsuite/gfortran.dg/PR67518.f90	(revision 0)
@@ -0,0 +1,45 @@
+! { dg-do compile }
+! { dg-options "-floop-nest-optimize -O2 -ffast-math" }
+! PR67518 :  isl: position out of bounds
+MODULE ao_util
+    INTEGER, PARAMETER :: dp=8
+CONTAINS
+  FUNCTION exp_radius(l,alpha,threshold,prefactor,epsin) RESULT(radius)
+    REAL(KIND=dp), INTENT(IN)                :: alpha, threshold, prefactor
+    REAL(KIND=dp), INTENT(IN), OPTIONAL      :: epsin
+    DO
+       IF (iter.gt.maxiter) THEN
+          CALL stop_program(routineN,moduleN,1,"exceeded")
+       ENDIF
+    ENDDO
+    CALL stop_program(routineN,moduleN,1,"exceeded")
+  END FUNCTION exp_radius
+ FUNCTION exp_radius_very_extended(la_min,la_max,lb_min,lb_max,pab,o1,o2,ra,rb,rp,&
+                          zetp,eps,prefactor,cutoff,epsin) RESULT(radius)
+    REAL(KIND=dp), DIMENSION(:, :), &
+      OPTIONAL, POINTER                      :: pab
+    REAL(KIND=dp), INTENT(IN)                :: ra(3), rb(3), rp(3), zetp, &
+                                                eps, prefactor, cutoff
+    REAL(KIND=dp)                            :: bini, binj, coef(0:20), &
+                                                epsin_local, polycoef(0:60), &
+                                                rad_b, s1, s2
+    IF (PRESENT(pab)) THEN
+    ENDIF
+    DO lxa=0,la_max
+    DO lxb=0,lb_max
+       coef(0:la_max+lb_max)=0.0_dp
+       DO i=0,lxa
+          DO j=0,lxb
+             coef(lxa+lxb-i-j)=coef(lxa+lxb-i-j) + bini*binj*s1*s2
+          ENDDO
+       ENDDO
+       DO i=0,lxa+lxb
+          polycoef(i)=MAX(polycoef(i),coef(i))
+       ENDDO
+    ENDDO
+    ENDDO
+    DO i=0,la_max+lb_max
+          radius=MAX(radius,exp_radius(i,zetp,eps,polycoef(i),epsin_local) )
+    ENDDO
+  END FUNCTION exp_radius_very_extended
+END MODULE ao_util
Index: gcc/testsuite/gfortran.dg/PR53852.f90
===================================================================
--- gcc/testsuite/gfortran.dg/PR53852.f90	(revision 0)
+++ gcc/testsuite/gfortran.dg/PR53852.f90	(revision 0)
@@ -0,0 +1,37 @@
+! { dg-do compile }
+! { dg-options "-floop-nest-optimize -O2 -ffast-math" }
+! PR53852 : compile time / memory hog
+SUBROUTINE  build_d_tensor_gks(d5f,v,d5)
+    INTEGER, PARAMETER :: dp=8
+    REAL(KIND=dp),  DIMENSION(3, 3, 3, 3, 3), &
+      INTENT(OUT) :: d5f
+    REAL(KIND=dp), DIMENSION(3), INTENT(IN)  :: v
+    REAL(KIND=dp), INTENT(IN) :: d5
+    INTEGER       :: k1, k2, k3, k4, k5
+    REAL(KIND=dp) :: w
+
+    d5f = 0.0_dp
+    DO k1=1,3
+       DO k2=1,3
+          DO k3=1,3
+             DO k4=1,3
+                DO k5=1,3
+                   d5f(k5,k4,k3,k2,k1)=d5f(k5,k4,k3,k2,k1)+ &
+                          v(k1)*v(k2)*v(k3)*v(k4)*v(k5)*d5
+                ENDDO
+                w=v(k1)*v(k2)*v(k3)*d4
+                d5f(k1,k2,k3,k4,k4)=d5f(k1,k2,k3,k4,k4)+w
+                d5f(k1,k2,k4,k3,k4)=d5f(k1,k2,k4,k3,k4)+w
+                d5f(k1,k4,k2,k3,k4)=d5f(k1,k4,k2,k3,k4)+w
+                d5f(k4,k1,k2,k3,k4)=d5f(k4,k1,k2,k3,k4)+w
+                d5f(k1,k2,k4,k4,k3)=d5f(k1,k2,k4,k4,k3)+w
+                d5f(k1,k4,k2,k4,k3)=d5f(k1,k4,k2,k4,k3)+w
+                d5f(k4,k1,k2,k4,k3)=d5f(k4,k1,k2,k4,k3)+w
+                d5f(k1,k4,k4,k2,k3)=d5f(k1,k4,k4,k2,k3)+w
+                d5f(k4,k1,k4,k2,k3)=d5f(k4,k1,k4,k2,k3)+w
+                d5f(k4,k4,k1,k2,k3)=d5f(k4,k4,k1,k2,k3)+w
+             ENDDO
+          ENDDO
+       ENDDO
+    ENDDO
+END SUBROUTINE build_d_tensor_gks

RE: [PATCH] PR67518 and PR53852 -- add testcase.

[VandeVondele Joost]

> Attached testcases for two previously fixed PRs (and thanks to Dominique who was quicker for PR67982).
ping ?

Re: [PATCH] PR67518 and PR53852 -- add testcase.

[Paul Richard Thomas]

Dear Joost,

These two testcases look fine to me. PR53852 is marked as being a
4.9,5,6 regression. If I have understood correctly, it has only been
fixed on trunk. Do you know if there is any intention to fix it on the
other branches?

OK for trunk and, subject to the previous question being answered
affirmatively, for 4.9/5 branches.

Thanks

Paul

On 6 November 2015 at 08:04, VandeVondele  Joost
<joost.vandevondele@mat.ethz.ch> wrote:
>> Attached testcases for two previously fixed PRs (and thanks to Dominique who was quicker for PR67982).
> ping ?



-- 
Outside of a dog, a book is a man's best friend. Inside of a dog it's
too dark to read.

Groucho Marx

RE: [PATCH] PR67518 and PR53852 -- add testcase.

[VandeVondele Joost]

Thanks Paul. I believe PR53852 won't be fixed on 4.9/5 as it seems to depend on the recent graphite cleanup work and recent isl. As such I'll commit to trunk only.

Re: [PATCH] PR67518 and PR53852 -- add testcase.

[Paul Richard Thomas]

Dear Joost,

These cause regressions on my tree:
f951: sorry, unimplemented: Graphite loop optimizations cannot be used
(ISL is not available)(-fgraphite, -fgraphite-identity, -floop-block,
-floop-interchange, -floop-strip-mine, -floop-parallelize-all,
-floop-unroll-and-jam, and -ftree-loop-linear)

I suppose that I can deal with it. However, is there some way to
detect the presence of ISL? I'll try and figure out some dejagnu-ery
to pass the tests if this message comes up.

Cheers

Paul

On 6 November 2015 at 10:45, VandeVondele  Joost
<joost.vandevondele@mat.ethz.ch> wrote:
> Thanks Paul. I believe PR53852 won't be fixed on 4.9/5 as it seems to depend on the recent graphite cleanup work and recent isl. As such I'll commit to trunk only.



-- 
Outside of a dog, a book is a man's best friend. Inside of a dog it's
too dark to read.

Groucho Marx

Re: [PATCH] PR67518 and PR53852 -- add testcase.

[Andre Vehreschild]

Hi Paul,

I fell for the same issue. You need a more recent isl library then
0.14.2. I installed 0.12.something when I started gfortran hacking and
didn't upgrade since. 

You can get the ISL lib from:

ftp://gcc.gnu.org/pub/gcc/infrastructure/

or from your distribution (Fedora 21 is shipping 0.14.3, which is
sufficient to run the test.)

Regards,
	Andre

On Sun, 8 Nov 2015 18:02:15 +0100
Paul Richard Thomas <paul.richard.thomas@gmail.com> wrote:

> Dear Joost,
> 
> These cause regressions on my tree:
> f951: sorry, unimplemented: Graphite loop optimizations cannot be used
> (ISL is not available)(-fgraphite, -fgraphite-identity, -floop-block,
> -floop-interchange, -floop-strip-mine, -floop-parallelize-all,
> -floop-unroll-and-jam, and -ftree-loop-linear)
> 
> I suppose that I can deal with it. However, is there some way to
> detect the presence of ISL? I'll try and figure out some dejagnu-ery
> to pass the tests if this message comes up.
> 
> Cheers
> 
> Paul
> 
> On 6 November 2015 at 10:45, VandeVondele  Joost
> <joost.vandevondele@mat.ethz.ch> wrote:
> > Thanks Paul. I believe PR53852 won't be fixed on 4.9/5 as it seems to depend on the recent graphite cleanup work and recent isl. As such I'll commit to trunk only.
> 
> 
> 


-- 
Andre Vehreschild * Email: vehre ad gmx dot de 

RE: [PATCH] PR67518 and PR53852 -- add testcase.

[VandeVondele Joost]

I see, graphite is optional. Trying to find the dejagnu-ery, I think the obvious thing is to move the tests from gfortran.dg/ to gfortran.dg/graphite/ I'll do that under the obvious rule, unless this get's preapproved before that ...

RE: [PATCH] PR67518 and PR53852 -- add testcase.

[VandeVondele Joost]

r229967

2015-11-08  Joost VandeVondele <vondele@gcc.gnu.org>

	* gfortran.dg/PR67518.f90: move from here...
	* gfortran.dg/graphite/PR67518.f90: to here.
	* gfortran.dg/PR53852.f90: move from here...
	* gfortran.dg/graphite/PR53852.f90: to here.