https://gcc.gnu.org/g:b37d0b2f6203ec3978459bc4cbce9bd9aa110025
commit r15-10002-gb37d0b2f6203ec3978459bc4cbce9bd9aa110025 Author: Richard Biener <rguent...@suse.de> Date: Mon Jul 14 14:09:28 2025 +0200 tree-optimization/121059 - fixup loop mask query When we opportunistically mask an operand of a AND with an already available loop mask we need to query that set with the correct number of masks we expect. PR tree-optimization/121059 * tree-vect-stmts.cc (vectorizable_operation): Query scalar_cond_masked_set with the correct number of masks. * gcc.dg/vect/pr121059.c: New testcase. Co-Authored-By: Richard Sandiford <richard.sandif...@arm.com> (cherry picked from commit 71be87055548cf942c7bc56d10ffd479db8569e4) Diff: --- gcc/testsuite/gcc.dg/vect/pr121059.c | 24 ++++++++++++++++++++++++ gcc/tree-vect-stmts.cc | 10 +++++----- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/gcc/testsuite/gcc.dg/vect/pr121059.c b/gcc/testsuite/gcc.dg/vect/pr121059.c new file mode 100644 index 000000000000..2bbfcead86da --- /dev/null +++ b/gcc/testsuite/gcc.dg/vect/pr121059.c @@ -0,0 +1,24 @@ +/* { dg-do compile } */ +/* { dg-additional-options "-O3 --param vect-partial-vector-usage=1" } */ +/* { dg-additional-options "-march=x86-64-v4" { target avx512f } } */ + +typedef struct { + long left, right, top, bottom; +} MngBox; +typedef struct { + MngBox object_clip[6]; + char exists[256], frozen[]; +} MngReadInfo; +MngReadInfo mng_info; + +long ReadMNGImage_i; + +void ReadMNGImage(int ReadMNGImage_i) +{ + for (; ReadMNGImage_i < 256; ReadMNGImage_i++) + if (mng_info.exists[ReadMNGImage_i] && mng_info.frozen[ReadMNGImage_i]) + mng_info.object_clip[ReadMNGImage_i].left = + mng_info.object_clip[ReadMNGImage_i].right = + mng_info.object_clip[ReadMNGImage_i].top = + mng_info.object_clip[ReadMNGImage_i].bottom = 0; +} diff --git a/gcc/tree-vect-stmts.cc b/gcc/tree-vect-stmts.cc index cba69ebadf0d..8df07616162e 100644 --- a/gcc/tree-vect-stmts.cc +++ b/gcc/tree-vect-stmts.cc @@ -6869,7 +6869,7 @@ vectorizable_operation (vec_info *vinfo, poly_uint64 nunits_out; tree vectype_out; unsigned int ncopies; - int vec_num; + unsigned vec_num; int i; vec<tree> vec_oprnds0 = vNULL; vec<tree> vec_oprnds1 = vNULL; @@ -7440,8 +7440,8 @@ vectorizable_operation (vec_info *vinfo, && code == BIT_AND_EXPR && VECTOR_BOOLEAN_TYPE_P (vectype)) { - if (loop_vinfo->scalar_cond_masked_set.contains ({ op0, - ncopies})) + if (loop_vinfo->scalar_cond_masked_set.contains + ({ op0, vec_num * ncopies})) { mask = vect_get_loop_mask (loop_vinfo, gsi, masks, vec_num * ncopies, vectype, i); @@ -7450,8 +7450,8 @@ vectorizable_operation (vec_info *vinfo, vop0, gsi); } - if (loop_vinfo->scalar_cond_masked_set.contains ({ op1, - ncopies })) + if (loop_vinfo->scalar_cond_masked_set.contains + ({ op1, vec_num * ncopies })) { mask = vect_get_loop_mask (loop_vinfo, gsi, masks, vec_num * ncopies, vectype, i);