Re: [PATCH 2/4][ranger]: Add range-ops for widen addition and widen multiplication [PR108583]
> Am 10.03.2023 um 15:12 schrieb Tamar Christina via Gcc-patches > : > > >> As Andrew has been advising on this one, I'd prefer for him to review it. However, he's on vacation this week. FYI... Aldy On Mon, Mar 6, 2023 at 12:22 PM Tamar Christina wrote: > Ping. > > And updated the patch to reject cases that we don't expect or can > handle cleanly for now. >> Its OK by me... but i think a release managers haa to sign off on it for >> this >> stage. Next stage 1 I will formalize the process a bit more for nonstandard >> rangeops >> > > Thanks! > > Richi is this change OK with you? Yes. Richard > Thanks, > Tamar >> Andrew >
RE: [PATCH 2/4][ranger]: Add range-ops for widen addition and widen multiplication [PR108583]
> >> As Andrew has been advising on this one, I'd prefer for him to review it. > >> However, he's on vacation this week. FYI... > >> > >> Aldy > >> > >> On Mon, Mar 6, 2023 at 12:22 PM Tamar Christina > >> wrote: > >>> Ping. > >>> > >>> And updated the patch to reject cases that we don't expect or can > >>> handle > >> cleanly for now. > >> > Its OK by me... but i think a release managers haa to sign off on it for this > stage. Next stage 1 I will formalize the process a bit more for nonstandard > rangeops > Thanks! Richi is this change OK with you? Thanks, Tamar > Andrew
Re: [PATCH 2/4][ranger]: Add range-ops for widen addition and widen multiplication [PR108583]
On 3/9/23 14:37, Tamar Christina wrote: Cheers, Thanks! I'll way for him to come back then 😊 Thanks, Tamar -Original Message- From: Aldy Hernandez Sent: Wednesday, March 8, 2023 8:57 AM To: Tamar Christina Cc: gcc-patches@gcc.gnu.org; nd ; amacl...@redhat.com Subject: Re: [PATCH 2/4][ranger]: Add range-ops for widen addition and widen multiplication [PR108583] As Andrew has been advising on this one, I'd prefer for him to review it. However, he's on vacation this week. FYI... Aldy On Mon, Mar 6, 2023 at 12:22 PM Tamar Christina wrote: Ping. And updated the patch to reject cases that we don't expect or can handle cleanly for now. Its OK by me... but i think a release managers haa to sign off on it for this stage. Next stage 1 I will formalize the process a bit more for nonstandard rangeops Andrew
RE: [PATCH 2/4][ranger]: Add range-ops for widen addition and widen multiplication [PR108583]
Cheers, Thanks! I'll way for him to come back then 😊 Thanks, Tamar > -Original Message- > From: Aldy Hernandez > Sent: Wednesday, March 8, 2023 8:57 AM > To: Tamar Christina > Cc: gcc-patches@gcc.gnu.org; nd ; amacl...@redhat.com > Subject: Re: [PATCH 2/4][ranger]: Add range-ops for widen addition and > widen multiplication [PR108583] > > As Andrew has been advising on this one, I'd prefer for him to review it. > However, he's on vacation this week. FYI... > > Aldy > > On Mon, Mar 6, 2023 at 12:22 PM Tamar Christina > wrote: > > > > Ping. > > > > And updated the patch to reject cases that we don't expect or can handle > cleanly for now. > > > > Bootstrapped Regtested on aarch64-none-linux-gnu and no issues. > > > > Ok for master? > > > > Thanks, > > Tamar > > > > gcc/ChangeLog: > > > > PR target/108583 > > * gimple-range-op.h (gimple_range_op_handler): Add > maybe_non_standard. > > * gimple-range-op.cc > (gimple_range_op_handler::gimple_range_op_handler): > > Use it. > > (gimple_range_op_handler::maybe_non_standard): New. > > * range-op.cc (class operator_widen_plus_signed, > > operator_widen_plus_signed::wi_fold, class > operator_widen_plus_unsigned, > > operator_widen_plus_unsigned::wi_fold, class > operator_widen_mult_signed, > > operator_widen_mult_signed::wi_fold, class > operator_widen_mult_unsigned, > > operator_widen_mult_unsigned::wi_fold, > > ptr_op_widen_mult_signed, ptr_op_widen_mult_unsigned, > > ptr_op_widen_plus_signed, ptr_op_widen_plus_unsigned): New. > > * range-op.h (ptr_op_widen_mult_signed, > ptr_op_widen_mult_unsigned, > > ptr_op_widen_plus_signed, ptr_op_widen_plus_unsigned): New > > > > Co-Authored-By: Andrew MacLeod > > > > --- Inline copy of patch --- > > > > diff --git a/gcc/gimple-range-op.h b/gcc/gimple-range-op.h index > > > 743b858126e333ea9590c0f175aacb476260c048..1bf63c5ce6f5db924a1f5 > 907ab45 > > 39e376281bd0 100644 > > --- a/gcc/gimple-range-op.h > > +++ b/gcc/gimple-range-op.h > > @@ -41,6 +41,7 @@ public: > > relation_trio = TRIO_VARYING); > > private: > >void maybe_builtin_call (); > > + void maybe_non_standard (); > >gimple *m_stmt; > >tree m_op1, m_op2; > > }; > > diff --git a/gcc/gimple-range-op.cc b/gcc/gimple-range-op.cc index > > > d9dfdc56939bb62ade72726b15c3d5e87e4ddcd1..a5d625387e712c170e1e > 68f6a7d4 > > 94027f6ef0d0 100644 > > --- a/gcc/gimple-range-op.cc > > +++ b/gcc/gimple-range-op.cc > > @@ -179,6 +179,8 @@ > gimple_range_op_handler::gimple_range_op_handler (gimple *s) > >// statements. > >if (is_a (m_stmt)) > > maybe_builtin_call (); > > + else > > +maybe_non_standard (); > > } > > > > // Calculate what we can determine of the range of this unary @@ > > -764,6 +766,57 @@ public: > >} > > } op_cfn_parity; > > > > +// Set up a gimple_range_op_handler for any nonstandard function > > +which can be // supported via range-ops. > > + > > +void > > +gimple_range_op_handler::maybe_non_standard () { > > + range_operator *signed_op = ptr_op_widen_mult_signed; > > + range_operator *unsigned_op = ptr_op_widen_mult_unsigned; > > + if (gimple_code (m_stmt) == GIMPLE_ASSIGN) > > +switch (gimple_assign_rhs_code (m_stmt)) > > + { > > + case WIDEN_PLUS_EXPR: > > + { > > + signed_op = ptr_op_widen_plus_signed; > > + unsigned_op = ptr_op_widen_plus_unsigned; > > + } > > + gcc_fallthrough (); > > + case WIDEN_MULT_EXPR: > > + { > > + m_valid = false; > > + m_op1 = gimple_assign_rhs1 (m_stmt); > > + m_op2 = gimple_assign_rhs2 (m_stmt); > > + tree ret = gimple_assign_lhs (m_stmt); > > + bool signed1 = TYPE_SIGN (TREE_TYPE (m_op1)) == SIGNED; > > + bool signed2 = TYPE_SIGN (TREE_TYPE (m_op2)) == SIGNED; > > + bool signed_ret = TYPE_SIGN (TREE_TYPE (ret)) == SIGNED; > > + > > + /* Normally these operands should all have the same sign, but > > +some passes and violate this by taking mismatched sign args. > > At > > +the moment the only one that's possible is mismatch inputs and > > +unsigned output. Once ranger supports signs for the operands > > we >
Re: [PATCH 2/4][ranger]: Add range-ops for widen addition and widen multiplication [PR108583]
As Andrew has been advising on this one, I'd prefer for him to review it. However, he's on vacation this week. FYI... Aldy On Mon, Mar 6, 2023 at 12:22 PM Tamar Christina wrote: > > Ping. > > And updated the patch to reject cases that we don't expect or can handle > cleanly for now. > > Bootstrapped Regtested on aarch64-none-linux-gnu and no issues. > > Ok for master? > > Thanks, > Tamar > > gcc/ChangeLog: > > PR target/108583 > * gimple-range-op.h (gimple_range_op_handler): Add maybe_non_standard. > * gimple-range-op.cc > (gimple_range_op_handler::gimple_range_op_handler): > Use it. > (gimple_range_op_handler::maybe_non_standard): New. > * range-op.cc (class operator_widen_plus_signed, > operator_widen_plus_signed::wi_fold, class > operator_widen_plus_unsigned, > operator_widen_plus_unsigned::wi_fold, class > operator_widen_mult_signed, > operator_widen_mult_signed::wi_fold, class > operator_widen_mult_unsigned, > operator_widen_mult_unsigned::wi_fold, > ptr_op_widen_mult_signed, ptr_op_widen_mult_unsigned, > ptr_op_widen_plus_signed, ptr_op_widen_plus_unsigned): New. > * range-op.h (ptr_op_widen_mult_signed, ptr_op_widen_mult_unsigned, > ptr_op_widen_plus_signed, ptr_op_widen_plus_unsigned): New > > Co-Authored-By: Andrew MacLeod > > --- Inline copy of patch --- > > diff --git a/gcc/gimple-range-op.h b/gcc/gimple-range-op.h > index > 743b858126e333ea9590c0f175aacb476260c048..1bf63c5ce6f5db924a1f5907ab4539e376281bd0 > 100644 > --- a/gcc/gimple-range-op.h > +++ b/gcc/gimple-range-op.h > @@ -41,6 +41,7 @@ public: > relation_trio = TRIO_VARYING); > private: >void maybe_builtin_call (); > + void maybe_non_standard (); >gimple *m_stmt; >tree m_op1, m_op2; > }; > diff --git a/gcc/gimple-range-op.cc b/gcc/gimple-range-op.cc > index > d9dfdc56939bb62ade72726b15c3d5e87e4ddcd1..a5d625387e712c170e1e68f6a7d494027f6ef0d0 > 100644 > --- a/gcc/gimple-range-op.cc > +++ b/gcc/gimple-range-op.cc > @@ -179,6 +179,8 @@ gimple_range_op_handler::gimple_range_op_handler (gimple > *s) >// statements. >if (is_a (m_stmt)) > maybe_builtin_call (); > + else > +maybe_non_standard (); > } > > // Calculate what we can determine of the range of this unary > @@ -764,6 +766,57 @@ public: >} > } op_cfn_parity; > > +// Set up a gimple_range_op_handler for any nonstandard function which can be > +// supported via range-ops. > + > +void > +gimple_range_op_handler::maybe_non_standard () > +{ > + range_operator *signed_op = ptr_op_widen_mult_signed; > + range_operator *unsigned_op = ptr_op_widen_mult_unsigned; > + if (gimple_code (m_stmt) == GIMPLE_ASSIGN) > +switch (gimple_assign_rhs_code (m_stmt)) > + { > + case WIDEN_PLUS_EXPR: > + { > + signed_op = ptr_op_widen_plus_signed; > + unsigned_op = ptr_op_widen_plus_unsigned; > + } > + gcc_fallthrough (); > + case WIDEN_MULT_EXPR: > + { > + m_valid = false; > + m_op1 = gimple_assign_rhs1 (m_stmt); > + m_op2 = gimple_assign_rhs2 (m_stmt); > + tree ret = gimple_assign_lhs (m_stmt); > + bool signed1 = TYPE_SIGN (TREE_TYPE (m_op1)) == SIGNED; > + bool signed2 = TYPE_SIGN (TREE_TYPE (m_op2)) == SIGNED; > + bool signed_ret = TYPE_SIGN (TREE_TYPE (ret)) == SIGNED; > + > + /* Normally these operands should all have the same sign, but > +some passes and violate this by taking mismatched sign args. At > +the moment the only one that's possible is mismatch inputs and > +unsigned output. Once ranger supports signs for the operands we > +can properly fix it, for now only accept the case we can do > +correctly. */ > + if ((signed1 ^ signed2) && signed_ret) > + return; > + > + m_valid = true; > + if (signed2 && !signed1) > + std::swap (m_op1, m_op2); > + > + if (signed1 || signed2) > + m_int = signed_op; > + else > + m_int = unsigned_op; > + break; > + } > + default: > + break; > + } > +} > + > // Set up a gimple_range_op_handler for any built in function which can be > // supported via range-ops. > > diff --git a/gcc/range-op.h b/gcc/range-op.h > index > f00b747f08a1fa8404c63bfe5a931b4048008b03..b1eeac70df81f2bdf228af7adff5399e7ac5e5d6 > 100644 > --- a/gcc/range-op.h > +++ b/gcc/range-op.h > @@ -311,4 +311,8 @@ private: > // This holds the range op table for floating point operations. > extern floating_op_table *floating_tree_table; > > +extern range_operator *ptr_op_widen_mult_signed; > +extern range_operator *ptr_op_widen_mult_unsigned; > +extern range_operator *ptr_op_widen_plus_signed; > +extern range_operator *ptr_op_widen_plus_unsigned; > #endif // GCC_RANGE_OP_H > diff --git a/gcc/range-op.cc b/gcc/range-op.cc > ind
RE: [PATCH 2/4][ranger]: Add range-ops for widen addition and widen multiplication [PR108583]
Ping. And updated the patch to reject cases that we don't expect or can handle cleanly for now. Bootstrapped Regtested on aarch64-none-linux-gnu and no issues. Ok for master? Thanks, Tamar gcc/ChangeLog: PR target/108583 * gimple-range-op.h (gimple_range_op_handler): Add maybe_non_standard. * gimple-range-op.cc (gimple_range_op_handler::gimple_range_op_handler): Use it. (gimple_range_op_handler::maybe_non_standard): New. * range-op.cc (class operator_widen_plus_signed, operator_widen_plus_signed::wi_fold, class operator_widen_plus_unsigned, operator_widen_plus_unsigned::wi_fold, class operator_widen_mult_signed, operator_widen_mult_signed::wi_fold, class operator_widen_mult_unsigned, operator_widen_mult_unsigned::wi_fold, ptr_op_widen_mult_signed, ptr_op_widen_mult_unsigned, ptr_op_widen_plus_signed, ptr_op_widen_plus_unsigned): New. * range-op.h (ptr_op_widen_mult_signed, ptr_op_widen_mult_unsigned, ptr_op_widen_plus_signed, ptr_op_widen_plus_unsigned): New Co-Authored-By: Andrew MacLeod --- Inline copy of patch --- diff --git a/gcc/gimple-range-op.h b/gcc/gimple-range-op.h index 743b858126e333ea9590c0f175aacb476260c048..1bf63c5ce6f5db924a1f5907ab4539e376281bd0 100644 --- a/gcc/gimple-range-op.h +++ b/gcc/gimple-range-op.h @@ -41,6 +41,7 @@ public: relation_trio = TRIO_VARYING); private: void maybe_builtin_call (); + void maybe_non_standard (); gimple *m_stmt; tree m_op1, m_op2; }; diff --git a/gcc/gimple-range-op.cc b/gcc/gimple-range-op.cc index d9dfdc56939bb62ade72726b15c3d5e87e4ddcd1..a5d625387e712c170e1e68f6a7d494027f6ef0d0 100644 --- a/gcc/gimple-range-op.cc +++ b/gcc/gimple-range-op.cc @@ -179,6 +179,8 @@ gimple_range_op_handler::gimple_range_op_handler (gimple *s) // statements. if (is_a (m_stmt)) maybe_builtin_call (); + else +maybe_non_standard (); } // Calculate what we can determine of the range of this unary @@ -764,6 +766,57 @@ public: } } op_cfn_parity; +// Set up a gimple_range_op_handler for any nonstandard function which can be +// supported via range-ops. + +void +gimple_range_op_handler::maybe_non_standard () +{ + range_operator *signed_op = ptr_op_widen_mult_signed; + range_operator *unsigned_op = ptr_op_widen_mult_unsigned; + if (gimple_code (m_stmt) == GIMPLE_ASSIGN) +switch (gimple_assign_rhs_code (m_stmt)) + { + case WIDEN_PLUS_EXPR: + { + signed_op = ptr_op_widen_plus_signed; + unsigned_op = ptr_op_widen_plus_unsigned; + } + gcc_fallthrough (); + case WIDEN_MULT_EXPR: + { + m_valid = false; + m_op1 = gimple_assign_rhs1 (m_stmt); + m_op2 = gimple_assign_rhs2 (m_stmt); + tree ret = gimple_assign_lhs (m_stmt); + bool signed1 = TYPE_SIGN (TREE_TYPE (m_op1)) == SIGNED; + bool signed2 = TYPE_SIGN (TREE_TYPE (m_op2)) == SIGNED; + bool signed_ret = TYPE_SIGN (TREE_TYPE (ret)) == SIGNED; + + /* Normally these operands should all have the same sign, but +some passes and violate this by taking mismatched sign args. At +the moment the only one that's possible is mismatch inputs and +unsigned output. Once ranger supports signs for the operands we +can properly fix it, for now only accept the case we can do +correctly. */ + if ((signed1 ^ signed2) && signed_ret) + return; + + m_valid = true; + if (signed2 && !signed1) + std::swap (m_op1, m_op2); + + if (signed1 || signed2) + m_int = signed_op; + else + m_int = unsigned_op; + break; + } + default: + break; + } +} + // Set up a gimple_range_op_handler for any built in function which can be // supported via range-ops. diff --git a/gcc/range-op.h b/gcc/range-op.h index f00b747f08a1fa8404c63bfe5a931b4048008b03..b1eeac70df81f2bdf228af7adff5399e7ac5e5d6 100644 --- a/gcc/range-op.h +++ b/gcc/range-op.h @@ -311,4 +311,8 @@ private: // This holds the range op table for floating point operations. extern floating_op_table *floating_tree_table; +extern range_operator *ptr_op_widen_mult_signed; +extern range_operator *ptr_op_widen_mult_unsigned; +extern range_operator *ptr_op_widen_plus_signed; +extern range_operator *ptr_op_widen_plus_unsigned; #endif // GCC_RANGE_OP_H diff --git a/gcc/range-op.cc b/gcc/range-op.cc index 5c67bce6d3aab81ad3186b902e09d6a96878d9bb..718ccb6f074e1a2a9ef1b7a5d4e879898d4a7fc3 100644 --- a/gcc/range-op.cc +++ b/gcc/range-op.cc @@ -1556,6 +1556,73 @@ operator_plus::op2_range (irange &r, tree type, return op1_range (r, type, lhs, op1, rel.swap_op1_op2 ()); } +class operator_widen_plus_signed : public range_operator +{ +public: + virtual void wi_fold (irange &r, tree type, + const wide_int &lh_lb, +
[PATCH 2/4][ranger]: Add range-ops for widen addition and widen multiplication [PR108583]
Hi All, This adds range-ops for widening addition and widening multiplication. I couldn't figure out how to write a test for this. It looks like there are self tests but not a way to write standalone ones? I did create testcases in the patch 3/4 which tests the end result. Bootstrapped Regtested on aarch64-none-linux-gnu and no issues. Ok for master? Thanks, Tamar gcc/ChangeLog: PR target/108583 * gimple-range-op.h (gimple_range_op_handler): Add maybe_non_standard. * gimple-range-op.cc (gimple_range_op_handler::gimple_range_op_handler): Use it. (gimple_range_op_handler::maybe_non_standard): New. * range-op.cc (class operator_widen_plus_signed, operator_widen_plus_signed::wi_fold, class operator_widen_plus_unsigned, operator_widen_plus_unsigned::wi_fold, class operator_widen_mult_signed, operator_widen_mult_signed::wi_fold, class operator_widen_mult_unsigned, operator_widen_mult_unsigned::wi_fold, ptr_op_widen_mult_signed, ptr_op_widen_mult_unsigned, ptr_op_widen_plus_signed, ptr_op_widen_plus_unsigned): New. * range-op.h (ptr_op_widen_mult_signed, ptr_op_widen_mult_unsigned, ptr_op_widen_plus_signed, ptr_op_widen_plus_unsigned): New Co-Authored-By: Andrew MacLeod --- inline copy of patch -- diff --git a/gcc/gimple-range-op.h b/gcc/gimple-range-op.h index 743b858126e333ea9590c0f175aacb476260c048..1bf63c5ce6f5db924a1f5907ab4539e376281bd0 100644 --- a/gcc/gimple-range-op.h +++ b/gcc/gimple-range-op.h @@ -41,6 +41,7 @@ public: relation_trio = TRIO_VARYING); private: void maybe_builtin_call (); + void maybe_non_standard (); gimple *m_stmt; tree m_op1, m_op2; }; diff --git a/gcc/gimple-range-op.cc b/gcc/gimple-range-op.cc index d9dfdc56939bb62ade72726b15c3d5e87e4ddcd1..ad13c873c6303db5b68b74db1562c0db6763101f 100644 --- a/gcc/gimple-range-op.cc +++ b/gcc/gimple-range-op.cc @@ -179,6 +179,8 @@ gimple_range_op_handler::gimple_range_op_handler (gimple *s) // statements. if (is_a (m_stmt)) maybe_builtin_call (); + else +maybe_non_standard (); } // Calculate what we can determine of the range of this unary @@ -764,6 +766,44 @@ public: } } op_cfn_parity; +// Set up a gimple_range_op_handler for any nonstandard function which can be +// supported via range-ops. + +void +gimple_range_op_handler::maybe_non_standard () +{ + range_operator *signed_op = ptr_op_widen_mult_signed; + range_operator *unsigned_op = ptr_op_widen_mult_unsigned; + if (gimple_code (m_stmt) == GIMPLE_ASSIGN) +switch (gimple_assign_rhs_code (m_stmt)) + { + case WIDEN_PLUS_EXPR: + { + signed_op = ptr_op_widen_plus_signed; + unsigned_op = ptr_op_widen_plus_unsigned; + } + gcc_fallthrough (); + case WIDEN_MULT_EXPR: + { + m_valid = true; + m_op1 = gimple_assign_rhs1 (m_stmt); + m_op2 = gimple_assign_rhs2 (m_stmt); + bool signed1 = TYPE_SIGN (TREE_TYPE (m_op1)) == SIGNED; + bool signed2 = TYPE_SIGN (TREE_TYPE (m_op2)) == SIGNED; + if (signed2 && !signed1) + std::swap (m_op1, m_op2); + + if (signed1 || signed2) + m_int = signed_op; + else + m_int = unsigned_op; + break; + } + default: + break; + } +} + // Set up a gimple_range_op_handler for any built in function which can be // supported via range-ops. diff --git a/gcc/range-op.h b/gcc/range-op.h index f00b747f08a1fa8404c63bfe5a931b4048008b03..b1eeac70df81f2bdf228af7adff5399e7ac5e5d6 100644 --- a/gcc/range-op.h +++ b/gcc/range-op.h @@ -311,4 +311,8 @@ private: // This holds the range op table for floating point operations. extern floating_op_table *floating_tree_table; +extern range_operator *ptr_op_widen_mult_signed; +extern range_operator *ptr_op_widen_mult_unsigned; +extern range_operator *ptr_op_widen_plus_signed; +extern range_operator *ptr_op_widen_plus_unsigned; #endif // GCC_RANGE_OP_H diff --git a/gcc/range-op.cc b/gcc/range-op.cc index 5c67bce6d3aab81ad3186b902e09d6a96878d9bb..718ccb6f074e1a2a9ef1b7a5d4e879898d4a7fc3 100644 --- a/gcc/range-op.cc +++ b/gcc/range-op.cc @@ -1556,6 +1556,73 @@ operator_plus::op2_range (irange &r, tree type, return op1_range (r, type, lhs, op1, rel.swap_op1_op2 ()); } +class operator_widen_plus_signed : public range_operator +{ +public: + virtual void wi_fold (irange &r, tree type, + const wide_int &lh_lb, + const wide_int &lh_ub, + const wide_int &rh_lb, + const wide_int &rh_ub) const; +} op_widen_plus_signed; +range_operator *ptr_op_widen_plus_signed = &op_widen_plus_signed; + +void +operator_widen_plus_signed::wi_fold (irange &r, tree type, +const wide_int &lh_lb, +const wide_int &lh_ub, +