Re: [Patch, Fortran testsuite, committed] Add/fix dg-final cleanup-module

[Mikael Morin]

On Wednesday 03 August 2011 18:22:55 Tobias Burnus wrote:
> > --- pr32921.f       (révision 177274)
> > +++ pr32921.f       (copie de travail)
> > @@ -46,5 +46,5 @@
> > 
> >         RETURN
> >         END
> >   
> >   ! { dg-final { scan-tree-dump-times "stride" 4 "lim1" } }
> > 
> > -! { dg-final { cleanup-tree-dump "lim1" } }
> > +! { dg-final { cleanup-tree-dump "lim\[1-3\]" } }
> 
> I wonder why you see other files than pr32921.f.095t.lim1; I had
> expected that -fdump-tree-lim1 would only dump that file - and I also do
> not see other files.

Right, I got the merge wrong; it was changed recently:

r176978 | uros | 2011-07-31 19:33:29 +0200 (dim 31 jul 2011) | 29 lignes

        * gcc.dg/tree-ssa/20050314-1.c: Dump and cleanup lim1 pass only.
        [...]
        * gfortran.dg/pr32921.f: Ditto.


Index: pr32921.f
===================================================================
--- pr32921.f   (révision 176977)
+++ pr32921.f   (révision 176978)
@@ -1,5 +1,5 @@
 ! { dg-do compile }
-! { dg-options "-O2 -fdump-tree-lim" }
+! { dg-options "-O2 -fdump-tree-lim1" }
 ! gfortran -c -m32 -O2 -S junk.f
 !
       MODULE LES3D_DATA
@@ -46,5 +46,5 @@
       RETURN
       END
 ! { dg-final { scan-tree-dump-times "stride" 4 "lim1" } }
-! { dg-final { cleanup-tree-dump "lim\[1-2\]" } }
+! { dg-final { cleanup-tree-dump "lim1" } }
 ! { dg-final { cleanup-modules "LES3D_DATA" } }


Patch updated.

2011-08-03  Mikael Morin  <mikael.mo...@sfr.fr>

        * gfortran.dg/dependency_26.f90: Add a module to the cleanup directive.
        * gfortran.dg/trim_optimize_2.f90: Add a module cleanup directive.
        * gfortran.dg/ldist-pr43023.f90: Ditto.
        * gfortran.dg/namelist_52.f90: Ditto.
        * gfortran.dg/interface_proc_end.f90: Ditto.
        * gfortran.dg/vector_subscript_bound_1.f90: Ditto.
        * gfortran.dg/generic_typebound_operator_1.f90: Ditto.

Index: trim_optimize_2.f90
===================================================================
--- trim_optimize_2.f90	(révision 177274)
+++ trim_optimize_2.f90	(copie de travail)
@@ -35,3 +35,4 @@
 ! { dg-final { scan-tree-dump-times "memmove" 4 "original" } }
 ! { dg-final { scan-tree-dump-times "string_trim" 0 "original" } }
 ! { dg-final { cleanup-tree-dump "original" } }
+! { dg-final { cleanup-modules "faz" } }
Index: dependency_26.f90
===================================================================
--- dependency_26.f90	(révision 177274)
+++ dependency_26.f90	(copie de travail)
@@ -47,7 +47,7 @@
   cell%h = reshape ([(real(i), i = 1, 9)], [3, 3])
   call s1 (cell)
 end
-! { dg-final { cleanup-modules "m1" } }
+! { dg-final { cleanup-modules "m1 m2" } }
 ! { dg-final { scan-tree-dump-times "&a" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "pack" 0 "original" } }
 ! { dg-final { cleanup-tree-dump "original" } }
Index: ldist-pr43023.f90
===================================================================
--- ldist-pr43023.f90	(révision 177274)
+++ ldist-pr43023.f90	(copie de travail)
@@ -29,3 +29,5 @@
 END SUBROUTINE NFT_Init
 
 END MODULE NFT_mod
+
+! { dg-final { cleanup-modules "nft_mod" } }
Index: namelist_52.f90
===================================================================
--- namelist_52.f90	(révision 177274)
+++ namelist_52.f90	(copie de travail)
@@ -30,3 +30,5 @@
 if (adjoint%solver_type /= 'direct') call abort
 if (adjoint%screen_io_fs_ntime%begin /= 42) call abort
 end program gfortran_error_2
+
+! { dg-final { cleanup-modules "mod1" } }
Index: interface_proc_end.f90
===================================================================
--- interface_proc_end.f90	(révision 177274)
+++ interface_proc_end.f90	(copie de travail)
@@ -16,3 +16,5 @@
       END INTERFACE
       end subroutine
       end module
+
+! { dg-final { cleanup-modules "n" } }
Index: vector_subscript_bound_1.f90
===================================================================
--- vector_subscript_bound_1.f90	(révision 177274)
+++ vector_subscript_bound_1.f90	(copie de travail)
@@ -17,3 +17,5 @@
     PRINT *, pw%cr(UBOUND(pw%cr))
   END SUBROUTINE pw_write
 END MODULE
+
+! { dg-final { cleanup-modules "pw_types" } }
Index: generic_typebound_operator_1.f90
===================================================================
--- generic_typebound_operator_1.f90	(révision 177274)
+++ generic_typebound_operator_1.f90	(copie de travail)
@@ -17,3 +17,5 @@
     end function gt_cmp
   end interface
 end module m_sort
+
+! { dg-final { cleanup-modules "m_sort" } }