Fix PR 10153: tail recusion for vector types.

Message ID 1626818523-4848-1-git-send-email-apinski@marvell.com
State Superseded
Headers show
Series
  • Fix PR 10153: tail recusion for vector types.
Related show

Commit Message

Martin Sebor via Gcc-patches July 20, 2021, 10:02 p.m.
From: Andrew Pinski <apinski@marvell.com>


The problem here is we try to an initialized value
from a scalar constant. For vectors we need to do
a vect_dup instead.  This fixes that issue and we
get the correct code even and it does not crash.

OK? Bootstrapped and tested on aarch64-linux-gnu with no regressions.

gcc/ChangeLog:

	PR tree-optimize/10153
	* tree-tailcall.c (create_tailcall_accumulator):
	For vector types create a duplicated VECTOR_CST
	before calling fold_convert.

gcc/testsuite/ChangeLog:

	PR tree-optimize/10153
	* gcc.c-torture/compile/pr10153-1.c: New test.
	* gcc.c-torture/compile/pr10153-2.c: New test.
---
 gcc/testsuite/gcc.c-torture/compile/pr10153-1.c | 7 +++++++
 gcc/testsuite/gcc.c-torture/compile/pr10153-2.c | 9 +++++++++
 gcc/tree-tailcall.c                             | 3 +++
 3 files changed, 19 insertions(+)
 create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr10153-1.c
 create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr10153-2.c

-- 
2.27.0

Comments

Martin Sebor via Gcc-patches July 21, 2021, 2:12 p.m. | #1
On Wed, Jul 21, 2021 at 12:03 AM apinski--- via Gcc-patches
<gcc-patches@gcc.gnu.org> wrote:
>

> From: Andrew Pinski <apinski@marvell.com>

>

> The problem here is we try to an initialized value

> from a scalar constant. For vectors we need to do

> a vect_dup instead.  This fixes that issue and we

> get the correct code even and it does not crash.

>

> OK? Bootstrapped and tested on aarch64-linux-gnu with no regressions.


I think the create_tailcall_accumulators should simply
use build_{one,zero}_cst (type) instead of passing down
integer_{zero,one}_node.  Then we can even elide the fold_convert ...

> gcc/ChangeLog:

>

>         PR tree-optimize/10153

>         * tree-tailcall.c (create_tailcall_accumulator):

>         For vector types create a duplicated VECTOR_CST

>         before calling fold_convert.

>

> gcc/testsuite/ChangeLog:

>

>         PR tree-optimize/10153

>         * gcc.c-torture/compile/pr10153-1.c: New test.

>         * gcc.c-torture/compile/pr10153-2.c: New test.

> ---

>  gcc/testsuite/gcc.c-torture/compile/pr10153-1.c | 7 +++++++

>  gcc/testsuite/gcc.c-torture/compile/pr10153-2.c | 9 +++++++++

>  gcc/tree-tailcall.c                             | 3 +++

>  3 files changed, 19 insertions(+)

>  create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr10153-1.c

>  create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr10153-2.c

>

> diff --git a/gcc/testsuite/gcc.c-torture/compile/pr10153-1.c b/gcc/testsuite/gcc.c-torture/compile/pr10153-1.c

> new file mode 100644

> index 00000000000..3f2040f32a1

> --- /dev/null

> +++ b/gcc/testsuite/gcc.c-torture/compile/pr10153-1.c

> @@ -0,0 +1,7 @@

> +typedef int V __attribute__ ((vector_size (2 * sizeof (int))));

> +V

> +foo (void)

> +{

> +  V v = { };

> +  return v - foo();

> +}

> diff --git a/gcc/testsuite/gcc.c-torture/compile/pr10153-2.c b/gcc/testsuite/gcc.c-torture/compile/pr10153-2.c

> new file mode 100644

> index 00000000000..1af4c8e2a36

> --- /dev/null

> +++ b/gcc/testsuite/gcc.c-torture/compile/pr10153-2.c

> @@ -0,0 +1,9 @@

> +typedef int V __attribute__ ((vector_size (2 * sizeof (int))));

> +V

> +foo (int t)

> +{

> +  if (t < 10)

> +    return (V){1, 1};

> +  V v = { };

> +  return v - foo(t - 1);

> +}

> diff --git a/gcc/tree-tailcall.c b/gcc/tree-tailcall.c

> index a4d31c90c49..9d1a98b1cfd 100644

> --- a/gcc/tree-tailcall.c

> +++ b/gcc/tree-tailcall.c

> @@ -1080,6 +1080,9 @@ create_tailcall_accumulator (const char *label, basic_block bb, tree init)

>

>    phi = create_phi_node (tmp, bb);

>    /* RET_TYPE can be a float when -ffast-maths is enabled.  */

> +  /* For vectors create a dup. */

> +  if (VECTOR_TYPE_P (ret_type))

> +    init = build_vector_from_val (ret_type, fold_convert (TREE_TYPE (ret_type), init));

>    add_phi_arg (phi, fold_convert (ret_type, init), single_pred_edge (bb),

>                UNKNOWN_LOCATION);

>    return PHI_RESULT (phi);

> --

> 2.27.0

>

Patch

diff --git a/gcc/testsuite/gcc.c-torture/compile/pr10153-1.c b/gcc/testsuite/gcc.c-torture/compile/pr10153-1.c
new file mode 100644
index 00000000000..3f2040f32a1
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr10153-1.c
@@ -0,0 +1,7 @@ 
+typedef int V __attribute__ ((vector_size (2 * sizeof (int))));
+V
+foo (void)
+{
+  V v = { };
+  return v - foo();
+}
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr10153-2.c b/gcc/testsuite/gcc.c-torture/compile/pr10153-2.c
new file mode 100644
index 00000000000..1af4c8e2a36
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr10153-2.c
@@ -0,0 +1,9 @@ 
+typedef int V __attribute__ ((vector_size (2 * sizeof (int))));
+V
+foo (int t)
+{
+  if (t < 10)
+    return (V){1, 1};
+  V v = { };
+  return v - foo(t - 1);
+}
diff --git a/gcc/tree-tailcall.c b/gcc/tree-tailcall.c
index a4d31c90c49..9d1a98b1cfd 100644
--- a/gcc/tree-tailcall.c
+++ b/gcc/tree-tailcall.c
@@ -1080,6 +1080,9 @@  create_tailcall_accumulator (const char *label, basic_block bb, tree init)
 
   phi = create_phi_node (tmp, bb);
   /* RET_TYPE can be a float when -ffast-maths is enabled.  */
+  /* For vectors create a dup. */
+  if (VECTOR_TYPE_P (ret_type))
+    init = build_vector_from_val (ret_type, fold_convert (TREE_TYPE (ret_type), init));
   add_phi_arg (phi, fold_convert (ret_type, init), single_pred_edge (bb),
 	       UNKNOWN_LOCATION);
   return PHI_RESULT (phi);