Introduce -finline-arg-packing.

2019-12-20  Thomas Koenig  <tkoenig@gcc.gnu.org>

    PR middle-end/91512
    PR fortran/92738
    * invoke.texi: Document -finline-arg-packing.
    * lang.opt: Add -finline-arg-packing.
    * options.c (gfc_post_options): Handle -finline-arg-packing.
    * trans-array.c (gfc_conv_array_parameter): Use
    flag_inline_arg_packing instead of checking for optimize and
    optimize_size.

2019-12-20  Thomas Koenig  <tkoenig@gcc.gnu.org>

    PR middle-end/91512
    PR fortran/92738
    * gfortran.dg/inline_pack_25.f90: New test.

From-SVN: r279639

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 8d480c5ce125204fd7dd0542af9e5ffed527da76..f1c71ba2d10ff97bad6a25dd13cf6d79fed69c8f 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2019-12-20  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+       PR middle-end/91512
+       PR fortran/92738
+       * gfortran.dg/inline_pack_25.f90: New test.
+
 2019-12-20  Tobias Burnus  <tobias@codesourcery.com>
 
        PR fortran/92996

diff --git a/gcc/fortran/invoke.texi b/gcc/fortran/invoke.texi
index 0bc054f01e548e79c1f0822e45b932803d85eefc..299fc9f8ff475a0cde29c0a3e2481831e1c3ea21 100644 (file)
--- a/gcc/fortran/invoke.texi
+++ b/gcc/fortran/invoke.texi
@@ -192,8 +192,9 @@ and warnings}.
 -ffrontend-loop-interchange -ffrontend-optimize @gol
 -finit-character=@var{n} -finit-integer=@var{n} -finit-local-zero @gol
 -finit-derived -finit-logical=@var{<true|false>} @gol
--finit-real=@var{<zero|inf|-inf|nan|snan>} @gol
--finline-matmul-limit=@var{n} -fmax-array-constructor=@var{n} @gol
+-finit-real=@var{<zero|inf|-inf|nan|snan>}
+-finline-matmul-limit=@var{n} @gol
+-finline-arg-packing -fmax-array-constructor=@var{n} @gol
 -fmax-stack-var-size=@var{n} -fno-align-commons -fno-automatic @gol
 -fno-protect-parens -fno-underscoring -fsecond-underscore @gol
 -fpack-derived -frealloc-lhs -frecursive -frepack-arrays @gol
@@ -1779,6 +1780,34 @@ compiled with the @option{-fshort-enums} option.  It will make
 GNU Fortran choose the smallest @code{INTEGER} kind a given
 enumerator set will fit in, and give all its enumerators this kind.
 
+@item -finline-arg-packing
+@opindex @code{finline-arg-packing}
+When passing an assumed-shape argument of a procedure as actual
+argument to an assumed-size or explicit size or as argument to a
+procedure that does not have an explicit interface, the argument may
+have to be packed, that is put into contiguous memory. An example is
+the call to @code{foo} in
+@smallexample
+  subroutine foo(a)
+     real, dimension(*) :: a
+  end subroutine foo
+  subroutine bar(b)
+     real, dimension(:) :: b
+     call foo(b)
+  end subroutine bar
+@end smallexample
+
+When @option{-finline-arg-packing} is in effect, this packing will be
+performed by inline code. This allows for more optimization while
+increasing code size.
+
+@option{-finline-arg-packing} is implied by any of the @option{-O} options
+except when optimizing for size via @option{-Os}.  If the code
+contains a very large number of argument that have to be packed, code
+size and also compilation time may become excessive.  If that is the
+case, it may be better to disable this option.  Instances of packing
+can be found by using by using @option{-Warray-temporaries}.
+
 @item -fexternal-blas
 @opindex @code{fexternal-blas}
 This option will make @command{gfortran} generate calls to BLAS functions

diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt
index 5fcd1ff907530ba1816cd3e80421bef6c5446e21..38c889191c8ca88a5ff347aa9c114a9788e9d3d8 100644 (file)
--- a/gcc/fortran/lang.opt
+++ b/gcc/fortran/lang.opt
@@ -647,6 +647,10 @@ Enum(gfc_init_local_real) String(inf) Value(GFC_INIT_REAL_INF)
 EnumValue
 Enum(gfc_init_local_real) String(-inf) Value(GFC_INIT_REAL_NEG_INF)
 
+finline-arg-packing
+Fortran  Var(flag_inline_arg_packing) Init(-1)
+-finline-arg-packing   Perform argument packing inline
+
 finline-matmul-limit=
 Fortran RejectNegative Joined UInteger Var(flag_inline_matmul_limit) Init(-1)
 -finline-matmul-limit=<n>      Specify the size of the largest matrix for which matmul will be inlined.

diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
index f7a5299c5e3a3aa7184b08ebb2e8ee1dcf4a686f..19e68d5086fd9f30919c77ac1c51c0d9504739dc 100644 (file)
--- a/gcc/fortran/options.c
+++ b/gcc/fortran/options.c
@@ -467,6 +467,11 @@ gfc_post_options (const char **pfilename)
   if (flag_frontend_loop_interchange == -1)
     flag_frontend_loop_interchange = optimize;
 
+  /* Do inline packing by default if optimizing, but not if
+     optimizing for size.  */
+  if (flag_inline_arg_packing == -1)
+    flag_inline_arg_packing = optimize && !optimize_size;
+
   if (flag_max_array_constructor < 65535)
     flag_max_array_constructor = 65535;
 

diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index e879ea12b5ccbdecf20d960826fa789f58e3f7db..226fc3ab4be76cee887c47740b27f244cb193a4c 100644 (file)
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -8139,7 +8139,7 @@ gfc_conv_array_parameter (gfc_se * se, gfc_expr * expr, bool g77,
         making the packing and unpacking operation visible to the
         optimizers.  */
 
-      if (g77 && optimize && !optimize_size && expr->expr_type == EXPR_VARIABLE
+      if (g77 && flag_inline_arg_packing && expr->expr_type == EXPR_VARIABLE
          && !is_pointer (expr) && ! gfc_has_dimen_vector_ref (expr)
          && !(expr->symtree->n.sym->as
               && expr->symtree->n.sym->as->type == AS_ASSUMED_RANK)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d5bd666eec3a9507a7432b547f82a771e470a7ee..957f62a2da39602b9a1de60d87175a7f8bea60d4 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2019-12-20  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+       PR middle-end/91512
+       PR fortran/92738
+       * invoke.texi: Document -finline-arg-packing.
+       * lang.opt: Add -finline-arg-packing.
+       * options.c (gfc_post_options): Handle -finline-arg-packing.
+       * trans-array.c (gfc_conv_array_parameter): Use
+       flag_inline_arg_packing instead of checking for optimize and
+       optimize_size.
+
 2019-12-20  Tobias Burnus  <tobias@codesourcery.com>
 
        PR fortran/92996

diff --git a/gcc/testsuite/gfortran.dg/internal_pack_25.f90 b/gcc/testsuite/gfortran.dg/internal_pack_25.f90
new file mode 100644 (file)
index 0000000..ac9f7e9
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/internal_pack_25.f90
@@ -0,0 +1,19 @@
+! { dg-do compile }
+! { dg-options "-fno-inline-arg-packing -O -fdump-tree-original" }
+! PR fortran/92738, middle-end/91512
+! Check that -fno-inline-pack does indeed suppress inline packing.
+module x
+  implicit none
+contains
+  subroutine foo(x)
+    real, dimension(:), intent(inout) :: x
+    call bar (x, size(x))
+  end subroutine foo
+  subroutine bar (x, n)
+    integer, intent(in) :: n
+    real, dimension(n) :: x
+    x = -x
+  end subroutine bar
+end module x
+! { dg-final { scan-tree-dump-times "_gfortran_internal_pack" 1 "original" } }
+! { dg-final { scan-tree-dump-times "_gfortran_internal_unpack" 1 "original" } }