From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1666) id 69B253858005; Mon, 31 Jan 2022 08:08:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 69B253858005 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Richard Biener To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-6936] Reduce multiple_of_p uses X-Act-Checkin: gcc X-Git-Author: Richard Biener X-Git-Refname: refs/heads/master X-Git-Oldrev: c67ffc256d01eeb293a7598ee553828a0b1e0a28 X-Git-Newrev: 3c7067cc92281dcbfeaf64116d8416f2092b4c10 Message-Id: <20220131080843.69B253858005@sourceware.org> Date: Mon, 31 Jan 2022 08:08:43 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jan 2022 08:08:43 -0000 https://gcc.gnu.org/g:3c7067cc92281dcbfeaf64116d8416f2092b4c10 commit r12-6936-g3c7067cc92281dcbfeaf64116d8416f2092b4c10 Author: Richard Biener Date: Mon Jan 24 14:49:20 2022 +0100 Reduce multiple_of_p uses There are a few cases where we know we're dealing with (poly-)integer constants, so remove the use of multiple_of_p in those cases to make the PR100499 fix less impactful. 2022-01-24 Richard Biener PR tree-optimization/100499 * tree-cfg.cc (verify_gimple_assign_ternary): Use multiple_p on poly-ints instead of multiple_of_p. * tree-ssa.cc (maybe_rewrite_mem_ref_base): Likewise. (non_rewritable_mem_ref_base): Likewise. (non_rewritable_lvalue_p): Likewise. (execute_update_addresses_taken): Likewise. Diff: --- gcc/tree-cfg.cc | 3 ++- gcc/tree-ssa.cc | 18 +++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/gcc/tree-cfg.cc b/gcc/tree-cfg.cc index efd10332c53..260a7fb97c6 100644 --- a/gcc/tree-cfg.cc +++ b/gcc/tree-cfg.cc @@ -4410,7 +4410,8 @@ verify_gimple_assign_ternary (gassign *stmt) TREE_TYPE (rhs2_type)) && multiple_p (TYPE_VECTOR_SUBPARTS (rhs1_type), TYPE_VECTOR_SUBPARTS (rhs2_type)) - && multiple_of_p (bitsizetype, rhs3, TYPE_SIZE (rhs2_type))))) + && multiple_p (wi::to_poly_offset (rhs3), + wi::to_poly_offset (TYPE_SIZE (rhs2_type)))))) { error ("not allowed type combination in %qs", code_name); debug_generic_expr (rhs1_type); diff --git a/gcc/tree-ssa.cc b/gcc/tree-ssa.cc index 613ab05d557..8fe0682981d 100644 --- a/gcc/tree-ssa.cc +++ b/gcc/tree-ssa.cc @@ -1417,8 +1417,8 @@ maybe_rewrite_mem_ref_base (tree *tp, bitmap suitable_for_renaming) if (TREE_CODE (TREE_TYPE (sym)) == VECTOR_TYPE && useless_type_conversion_p (TREE_TYPE (*tp), TREE_TYPE (TREE_TYPE (sym))) - && multiple_of_p (sizetype, TREE_OPERAND (*tp, 1), - TYPE_SIZE_UNIT (TREE_TYPE (*tp)))) + && multiple_p (mem_ref_offset (*tp), + wi::to_poly_offset (TYPE_SIZE_UNIT (TREE_TYPE (*tp))))) { *tp = build3 (BIT_FIELD_REF, TREE_TYPE (*tp), sym, TYPE_SIZE (TREE_TYPE (*tp)), @@ -1504,8 +1504,8 @@ non_rewritable_mem_ref_base (tree ref) && known_ge (mem_ref_offset (base), 0) && known_gt (wi::to_poly_offset (TYPE_SIZE_UNIT (TREE_TYPE (decl))), mem_ref_offset (base)) - && multiple_of_p (sizetype, TREE_OPERAND (base, 1), - TYPE_SIZE_UNIT (TREE_TYPE (base)))) + && multiple_p (mem_ref_offset (base), + wi::to_poly_offset (TYPE_SIZE_UNIT (TREE_TYPE (base))))) return NULL_TREE; /* For same sizes and zero offset we can use a VIEW_CONVERT_EXPR. */ if (integer_zerop (TREE_OPERAND (base, 1)) @@ -1596,8 +1596,8 @@ non_rewritable_lvalue_p (tree lhs) && known_ge (mem_ref_offset (lhs), 0) && known_gt (wi::to_poly_offset (TYPE_SIZE_UNIT (TREE_TYPE (decl))), mem_ref_offset (lhs)) - && multiple_of_p (sizetype, TREE_OPERAND (lhs, 1), - TYPE_SIZE_UNIT (TREE_TYPE (lhs))) + && multiple_p (mem_ref_offset (lhs), + wi::to_poly_offset (TYPE_SIZE_UNIT (TREE_TYPE (lhs)))) && known_ge (wi::to_poly_offset (TYPE_SIZE (TREE_TYPE (decl))), wi::to_poly_offset (TYPE_SIZE (TREE_TYPE (lhs))))) { @@ -1969,9 +1969,9 @@ execute_update_addresses_taken (void) && known_gt (wi::to_poly_offset (TYPE_SIZE_UNIT (TREE_TYPE (sym))), mem_ref_offset (lhs)) - && multiple_of_p (sizetype, - TREE_OPERAND (lhs, 1), - TYPE_SIZE_UNIT (TREE_TYPE (lhs)))) + && multiple_p (mem_ref_offset (lhs), + wi::to_poly_offset + (TYPE_SIZE_UNIT (TREE_TYPE (lhs))))) { tree val = gimple_assign_rhs1 (stmt); if (! types_compatible_p (TREE_TYPE (val),