"Kewen.Lin" <li...@linux.ibm.com> writes:
> Hi,
>
> As Richard S. suggested in the review of vector with length patch
> series, we can use one message on "partial vectors" instead of
> "fully with masking". This patch is to update the dumping string
> and related test cases.
>
> Bootstrapped/regtested on aarch64-linux-gnu.
>
> Is it ok for trunk?
>
> BR,
> Kewen
> -----
> gcc/ChangeLog:
>
> * tree-vect-loop.c (vect_analyze_loop_2): Update dumping string
> for fully masking to be more common.
>
> gcc/testsuite/ChangeLog:
>
> * gcc.target/aarch64/sve/clastb_1.c: Update dumping string.
> * gcc.target/aarch64/sve/clastb_2.c: Likewise.
> * gcc.target/aarch64/sve/clastb_3.c: Likewise.
> * gcc.target/aarch64/sve/clastb_4.c: Likewise.
> * gcc.target/aarch64/sve/clastb_5.c: Likewise.
> * gcc.target/aarch64/sve/clastb_6.c: Likewise.
> * gcc.target/aarch64/sve/clastb_7.c: Likewise.
OK, thanks.
Richard
>
> diff --git a/gcc/testsuite/gcc.target/aarch64/sve/clastb_1.c
> b/gcc/testsuite/gcc.target/aarch64/sve/clastb_1.c
> index d3ea52dea47..f4445d443ac 100644
> --- a/gcc/testsuite/gcc.target/aarch64/sve/clastb_1.c
> +++ b/gcc/testsuite/gcc.target/aarch64/sve/clastb_1.c
> @@ -17,5 +17,5 @@ condition_reduction (int *a, int min_v)
> return last;
> }
>
> -/* { dg-final { scan-tree-dump "using a fully-masked loop." "vect" } } */
> +/* { dg-final { scan-tree-dump "operating on partial vectors." "vect" } } */
> /* { dg-final { scan-assembler {\tclastb\ts[0-9]+, p[0-7], s[0-9]+,
> z[0-9]+\.s} } } */
> diff --git a/gcc/testsuite/gcc.target/aarch64/sve/clastb_2.c
> b/gcc/testsuite/gcc.target/aarch64/sve/clastb_2.c
> index c222b707912..27d4cd94a3c 100644
> --- a/gcc/testsuite/gcc.target/aarch64/sve/clastb_2.c
> +++ b/gcc/testsuite/gcc.target/aarch64/sve/clastb_2.c
> @@ -23,5 +23,5 @@ condition_reduction (TYPE *a, TYPE min_v)
> return last;
> }
>
> -/* { dg-final { scan-tree-dump "using a fully-masked loop." "vect" } } */
> +/* { dg-final { scan-tree-dump "operating on partial vectors." "vect" } } */
> /* { dg-final { scan-assembler {\tclastb\ts[0-9]+, p[0-7], s[0-9]+,
> z[0-9]+\.s} } } */
> diff --git a/gcc/testsuite/gcc.target/aarch64/sve/clastb_3.c
> b/gcc/testsuite/gcc.target/aarch64/sve/clastb_3.c
> index 5aaa71f948d..597f8268413 100644
> --- a/gcc/testsuite/gcc.target/aarch64/sve/clastb_3.c
> +++ b/gcc/testsuite/gcc.target/aarch64/sve/clastb_3.c
> @@ -5,5 +5,5 @@
>
> #include "clastb_2.c"
>
> -/* { dg-final { scan-tree-dump "using a fully-masked loop." "vect" } } */
> +/* { dg-final { scan-tree-dump "operating on partial vectors." "vect" } } */
> /* { dg-final { scan-assembler {\tclastb\tb[0-9]+, p[0-7], b[0-9]+,
> z[0-9]+\.b} } } */
> diff --git a/gcc/testsuite/gcc.target/aarch64/sve/clastb_4.c
> b/gcc/testsuite/gcc.target/aarch64/sve/clastb_4.c
> index b4db170ea06..788e29fe982 100644
> --- a/gcc/testsuite/gcc.target/aarch64/sve/clastb_4.c
> +++ b/gcc/testsuite/gcc.target/aarch64/sve/clastb_4.c
> @@ -5,5 +5,5 @@
>
> #include "clastb_2.c"
>
> -/* { dg-final { scan-tree-dump "using a fully-masked loop." "vect" } } */
> +/* { dg-final { scan-tree-dump "operating on partial vectors." "vect" } } */
> /* { dg-final { scan-assembler {\tclastb\tw[0-9]+, p[0-7], w[0-9]+,
> z[0-9]+\.h} } } */
> diff --git a/gcc/testsuite/gcc.target/aarch64/sve/clastb_5.c
> b/gcc/testsuite/gcc.target/aarch64/sve/clastb_5.c
> index 28d40a01f93..0e7e20b69ec 100644
> --- a/gcc/testsuite/gcc.target/aarch64/sve/clastb_5.c
> +++ b/gcc/testsuite/gcc.target/aarch64/sve/clastb_5.c
> @@ -5,5 +5,5 @@
>
> #include "clastb_2.c"
>
> -/* { dg-final { scan-tree-dump "using a fully-masked loop." "vect" } } */
> +/* { dg-final { scan-tree-dump "operating on partial vectors." "vect" } } */
> /* { dg-final { scan-assembler {\tclastb\td[0-9]+, p[0-7], d[0-9]+,
> z[0-9]+\.d} } } */
> diff --git a/gcc/testsuite/gcc.target/aarch64/sve/clastb_6.c
> b/gcc/testsuite/gcc.target/aarch64/sve/clastb_6.c
> index 38632a21be1..b9d687e0597 100644
> --- a/gcc/testsuite/gcc.target/aarch64/sve/clastb_6.c
> +++ b/gcc/testsuite/gcc.target/aarch64/sve/clastb_6.c
> @@ -21,5 +21,5 @@ condition_reduction (TYPE *a, TYPE min_v)
> return last;
> }
>
> -/* { dg-final { scan-tree-dump "using a fully-masked loop." "vect" } } */
> +/* { dg-final { scan-tree-dump "operating on partial vectors." "vect" } } */
> /* { dg-final { scan-assembler {\tclastb\ts[0-9]+, p[0-7], s[0-9]+,
> z[0-9]+\.s} } } */
> diff --git a/gcc/testsuite/gcc.target/aarch64/sve/clastb_7.c
> b/gcc/testsuite/gcc.target/aarch64/sve/clastb_7.c
> index e5307d2edc8..a9f1a6aea98 100644
> --- a/gcc/testsuite/gcc.target/aarch64/sve/clastb_7.c
> +++ b/gcc/testsuite/gcc.target/aarch64/sve/clastb_7.c
> @@ -4,5 +4,5 @@
> #define TYPE double
> #include "clastb_6.c"
>
> -/* { dg-final { scan-tree-dump "using a fully-masked loop." "vect" } } */
> +/* { dg-final { scan-tree-dump "operating on partial vectors." "vect" } } */
> /* { dg-final { scan-assembler {\tclastb\td[0-9]+, p[0-7], d[0-9]+,
> z[0-9]+\.d} } } */
> diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
> index 6311e795204..6e527cd232d 100644
> --- a/gcc/tree-vect-loop.c
> +++ b/gcc/tree-vect-loop.c
> @@ -2177,12 +2177,12 @@ start_over:
> && vect_verify_full_masking (loop_vinfo));
> if (dump_enabled_p ())
> {
> - if (LOOP_VINFO_FULLY_MASKED_P (loop_vinfo))
> + if (LOOP_VINFO_USING_PARTIAL_VECTORS_P (loop_vinfo))
> dump_printf_loc (MSG_NOTE, vect_location,
> - "using a fully-masked loop.\n");
> + "operating on partial vectors.\n");
> else
> dump_printf_loc (MSG_NOTE, vect_location,
> - "not using a fully-masked loop.\n");
> + "operating only on full vectors.\n");
> }
>
> /* If epilog loop is required because of data accesses with gaps,
