Re: [PATCH 1/2] Change vec<,,vl_embed>::m_vecdata refrences into address ()
On Fri, Feb 24, 2023 at 02:46:21PM +0100, Richard Biener wrote: > As preparation to remove m_vecdata in the vl_embed vector this > changes references to it into calls to address (). > > As I was here it also fixes ::contains to avoid repeated bounds > checking and the same issue in ::lower_bound which also suffers > from unnecessary copying around values. > > * vec.h: Change m_vecdata references to address (). > * vec.h (vec::lower_bound): Adjust to > take a const reference to the object, use address to > access data. > (vec::contains): Use address to access data. > (vec::operator[]): Use address instead of > m_vecdata to access data. > (vec::iterate): Likewise. > (vec::copy): Likewise. > (vec::quick_push): Likewise. > (vec::pop): Likewise. > (vec::quick_insert): Likewise. > (vec::ordered_remove): Likewise. > (vec::unordered_remove): Likewise. > (vec::block_remove): Likewise. > (vec::address): Likewise. Ok, thanks. Jakub
[PATCH 1/2] Change vec<, , vl_embed>::m_vecdata refrences into address ()
As preparation to remove m_vecdata in the vl_embed vector this changes references to it into calls to address (). As I was here it also fixes ::contains to avoid repeated bounds checking and the same issue in ::lower_bound which also suffers from unnecessary copying around values. * vec.h: Change m_vecdata references to address (). * vec.h (vec::lower_bound): Adjust to take a const reference to the object, use address to access data. (vec::contains): Use address to access data. (vec::operator[]): Use address instead of m_vecdata to access data. (vec::iterate): Likewise. (vec::copy): Likewise. (vec::quick_push): Likewise. (vec::pop): Likewise. (vec::quick_insert): Likewise. (vec::ordered_remove): Likewise. (vec::unordered_remove): Likewise. (vec::block_remove): Likewise. (vec::address): Likewise. --- gcc/vec.h | 44 +--- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/gcc/vec.h b/gcc/vec.h index a536b68732d..2b36f065234 100644 --- a/gcc/vec.h +++ b/gcc/vec.h @@ -611,10 +611,10 @@ public: void qsort (int (*) (const void *, const void *)); void sort (int (*) (const void *, const void *, void *), void *); void stablesort (int (*) (const void *, const void *, void *), void *); - T *bsearch (const void *key, int (*compar)(const void *, const void *)); + T *bsearch (const void *key, int (*compar) (const void *, const void *)); T *bsearch (const void *key, int (*compar)(const void *, const void *, void *), void *); - unsigned lower_bound (T, bool (*)(const T &, const T &)) const; + unsigned lower_bound (const T &, bool (*) (const T &, const T &)) const; bool contains (const T &search) const; static size_t embedded_size (unsigned); void embedded_init (unsigned, unsigned = 0, unsigned = 0); @@ -879,7 +879,7 @@ inline const T & vec::operator[] (unsigned ix) const { gcc_checking_assert (ix < m_vecpfx.m_num); - return m_vecdata[ix]; + return address ()[ix]; } template @@ -887,7 +887,7 @@ inline T & vec::operator[] (unsigned ix) { gcc_checking_assert (ix < m_vecpfx.m_num); - return m_vecdata[ix]; + return address ()[ix]; } @@ -929,7 +929,7 @@ vec::iterate (unsigned ix, T *ptr) const { if (ix < m_vecpfx.m_num) { - *ptr = m_vecdata[ix]; + *ptr = address ()[ix]; return true; } else @@ -955,7 +955,7 @@ vec::iterate (unsigned ix, T **ptr) const { if (ix < m_vecpfx.m_num) { - *ptr = CONST_CAST (T *, &m_vecdata[ix]); + *ptr = CONST_CAST (T *, &address ()[ix]); return true; } else @@ -978,7 +978,7 @@ vec::copy (ALONE_MEM_STAT_DECL) const { vec_alloc (new_vec, len PASS_MEM_STAT); new_vec->embedded_init (len, len); - vec_copy_construct (new_vec->address (), m_vecdata, len); + vec_copy_construct (new_vec->address (), address (), len); } return new_vec; } @@ -1018,7 +1018,7 @@ inline T * vec::quick_push (const T &obj) { gcc_checking_assert (space (1)); - T *slot = &m_vecdata[m_vecpfx.m_num++]; + T *slot = &address ()[m_vecpfx.m_num++]; *slot = obj; return slot; } @@ -1031,7 +1031,7 @@ inline T & vec::pop (void) { gcc_checking_assert (length () > 0); - return m_vecdata[--m_vecpfx.m_num]; + return address ()[--m_vecpfx.m_num]; } @@ -1056,7 +1056,7 @@ vec::quick_insert (unsigned ix, const T &obj) { gcc_checking_assert (length () < allocated ()); gcc_checking_assert (ix <= length ()); - T *slot = &m_vecdata[ix]; + T *slot = &address ()[ix]; memmove (slot + 1, slot, (m_vecpfx.m_num++ - ix) * sizeof (T)); *slot = obj; } @@ -1071,7 +1071,7 @@ inline void vec::ordered_remove (unsigned ix) { gcc_checking_assert (ix < length ()); - T *slot = &m_vecdata[ix]; + T *slot = &address ()[ix]; memmove (slot, slot + 1, (--m_vecpfx.m_num - ix) * sizeof (T)); } @@ -1118,7 +1118,8 @@ inline void vec::unordered_remove (unsigned ix) { gcc_checking_assert (ix < length ()); - m_vecdata[ix] = m_vecdata[--m_vecpfx.m_num]; + T *p = address (); + p[ix] = p[--m_vecpfx.m_num]; } @@ -1130,7 +1131,7 @@ inline void vec::block_remove (unsigned ix, unsigned len) { gcc_checking_assert (ix + len <= length ()); - T *slot = &m_vecdata[ix]; + T *slot = &address ()[ix]; m_vecpfx.m_num -= len; memmove (slot, slot + len, (m_vecpfx.m_num - ix) * sizeof (T)); } @@ -1248,9 +1249,13 @@ inline bool vec::contains (const T &search) const { unsigned int len = length (); + const T *p = address (); for (unsigned int i = 0; i < len; i++) -if ((*this)[i] == search) - return true; +{ + const T *slot = &p[i]; + if (*slot == search) + return true; +} return false; } @@ -1262,7 +1267,8 @@ vec::contains (const T &search) const template unsigned -vec::lower_bound (T obj, bool (*lessthan)(const T &, const T &)) +
Re: [PATCH 1/2] Change vec<, , vl_embed>::m_vecdata refrences into address ()
On Fri, 24 Feb 2023, Jakub Jelinek wrote: > On Fri, Feb 24, 2023 at 12:32:45PM +0100, Richard Biener via Gcc-patches > wrote: > > --- a/gcc/vec.h > > +++ b/gcc/vec.h > > @@ -614,7 +614,7 @@ public: > >T *bsearch (const void *key, int (*compar)(const void *, const void *)); > >T *bsearch (const void *key, > > int (*compar)(const void *, const void *, void *), void *); > > - unsigned lower_bound (T, bool (*)(const T &, const T &)) const; > > + unsigned lower_bound (const T &, bool (*)(const T &, const T &)) const; > > Missing space after (*) while you're there. > > > @@ -929,7 +929,7 @@ vec::iterate (unsigned ix, T *ptr) const > > { > >if (ix < m_vecpfx.m_num) > > { > > - *ptr = m_vecdata[ix]; > > + *ptr = address()[ix]; > > Missing space before (). > > > @@ -1118,7 +1118,7 @@ inline void > > vec::unordered_remove (unsigned ix) > > { > >gcc_checking_assert (ix < length ()); > > - m_vecdata[ix] = m_vecdata[--m_vecpfx.m_num]; > > + address ()[ix] = address ()[--m_vecpfx.m_num]; > > } > > As address () is used twice here, can't we stick it into a temporary > and use twice then? > > > @@ -1249,8 +1249,11 @@ vec::contains (const T &search) const > > { > >unsigned int len = length (); > >for (unsigned int i = 0; i < len; i++) > > -if ((*this)[i] == search) > > - return true; > > +{ > > + const T *slot = &address ()[i]; > > + if (*slot == search) > > + return true; > > Similarly, can't we do address () once before the loop into a temporary? > > > template > > unsigned > > -vec::lower_bound (T obj, bool (*lessthan)(const T &, const > > T &)) > > +vec::lower_bound (const T &obj, > > + bool (*lessthan)(const T &, const T &)) > > ) ( while you're at it. > > Otherwise LGTM. All fixed. Richard.
Re: [PATCH 1/2] Change vec<, , vl_embed>::m_vecdata refrences into address ()
On Fri, Feb 24, 2023 at 12:32:45PM +0100, Richard Biener via Gcc-patches wrote: > --- a/gcc/vec.h > +++ b/gcc/vec.h > @@ -614,7 +614,7 @@ public: >T *bsearch (const void *key, int (*compar)(const void *, const void *)); >T *bsearch (const void *key, > int (*compar)(const void *, const void *, void *), void *); > - unsigned lower_bound (T, bool (*)(const T &, const T &)) const; > + unsigned lower_bound (const T &, bool (*)(const T &, const T &)) const; Missing space after (*) while you're there. > @@ -929,7 +929,7 @@ vec::iterate (unsigned ix, T *ptr) const > { >if (ix < m_vecpfx.m_num) > { > - *ptr = m_vecdata[ix]; > + *ptr = address()[ix]; Missing space before (). > @@ -1118,7 +1118,7 @@ inline void > vec::unordered_remove (unsigned ix) > { >gcc_checking_assert (ix < length ()); > - m_vecdata[ix] = m_vecdata[--m_vecpfx.m_num]; > + address ()[ix] = address ()[--m_vecpfx.m_num]; > } As address () is used twice here, can't we stick it into a temporary and use twice then? > @@ -1249,8 +1249,11 @@ vec::contains (const T &search) const > { >unsigned int len = length (); >for (unsigned int i = 0; i < len; i++) > -if ((*this)[i] == search) > - return true; > +{ > + const T *slot = &address ()[i]; > + if (*slot == search) > + return true; Similarly, can't we do address () once before the loop into a temporary? > template > unsigned > -vec::lower_bound (T obj, bool (*lessthan)(const T &, const T > &)) > +vec::lower_bound (const T &obj, > + bool (*lessthan)(const T &, const T &)) ) ( while you're at it. Otherwise LGTM. Jakub
[PATCH 1/2] Change vec<, , vl_embed>::m_vecdata refrences into address ()
As preparation to remove m_vecdata in the vl_embed vector this changes references to it into calls to address (). As I was here it also fixes ::contains to avoid repeated bounds checking and the same issue in ::lower_bound which also suffers from unnecessary copying around values. * vec.h: Change m_vecdata references to address (). * vec.h (vec::lower_bound): Adjust to take a const reference to the object, use address to access data. (vec::contains): Use address to access data. (vec::operator[]): Use address instead of m_vecdata to access data. (vec::iterate): Likewise. (vec::copy): Likewise. (vec::quick_push): Likewise. (vec::pop): Likewise. (vec::quick_insert): Likewise. (vec::ordered_remove): Likewise. (vec::unordered_remove): Likewise. (vec::block_remove): Likewise. (vec::address): Likewise. --- gcc/vec.h | 40 ++-- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/gcc/vec.h b/gcc/vec.h index a536b68732d..5a2ee9c0294 100644 --- a/gcc/vec.h +++ b/gcc/vec.h @@ -614,7 +614,7 @@ public: T *bsearch (const void *key, int (*compar)(const void *, const void *)); T *bsearch (const void *key, int (*compar)(const void *, const void *, void *), void *); - unsigned lower_bound (T, bool (*)(const T &, const T &)) const; + unsigned lower_bound (const T &, bool (*)(const T &, const T &)) const; bool contains (const T &search) const; static size_t embedded_size (unsigned); void embedded_init (unsigned, unsigned = 0, unsigned = 0); @@ -879,7 +879,7 @@ inline const T & vec::operator[] (unsigned ix) const { gcc_checking_assert (ix < m_vecpfx.m_num); - return m_vecdata[ix]; + return address ()[ix]; } template @@ -887,7 +887,7 @@ inline T & vec::operator[] (unsigned ix) { gcc_checking_assert (ix < m_vecpfx.m_num); - return m_vecdata[ix]; + return address ()[ix]; } @@ -929,7 +929,7 @@ vec::iterate (unsigned ix, T *ptr) const { if (ix < m_vecpfx.m_num) { - *ptr = m_vecdata[ix]; + *ptr = address()[ix]; return true; } else @@ -955,7 +955,7 @@ vec::iterate (unsigned ix, T **ptr) const { if (ix < m_vecpfx.m_num) { - *ptr = CONST_CAST (T *, &m_vecdata[ix]); + *ptr = CONST_CAST (T *, &address ()[ix]); return true; } else @@ -978,7 +978,7 @@ vec::copy (ALONE_MEM_STAT_DECL) const { vec_alloc (new_vec, len PASS_MEM_STAT); new_vec->embedded_init (len, len); - vec_copy_construct (new_vec->address (), m_vecdata, len); + vec_copy_construct (new_vec->address (), address (), len); } return new_vec; } @@ -1018,7 +1018,7 @@ inline T * vec::quick_push (const T &obj) { gcc_checking_assert (space (1)); - T *slot = &m_vecdata[m_vecpfx.m_num++]; + T *slot = &address ()[m_vecpfx.m_num++]; *slot = obj; return slot; } @@ -1031,7 +1031,7 @@ inline T & vec::pop (void) { gcc_checking_assert (length () > 0); - return m_vecdata[--m_vecpfx.m_num]; + return address ()[--m_vecpfx.m_num]; } @@ -1056,7 +1056,7 @@ vec::quick_insert (unsigned ix, const T &obj) { gcc_checking_assert (length () < allocated ()); gcc_checking_assert (ix <= length ()); - T *slot = &m_vecdata[ix]; + T *slot = &address ()[ix]; memmove (slot + 1, slot, (m_vecpfx.m_num++ - ix) * sizeof (T)); *slot = obj; } @@ -1071,7 +1071,7 @@ inline void vec::ordered_remove (unsigned ix) { gcc_checking_assert (ix < length ()); - T *slot = &m_vecdata[ix]; + T *slot = &address ()[ix]; memmove (slot, slot + 1, (--m_vecpfx.m_num - ix) * sizeof (T)); } @@ -1118,7 +1118,7 @@ inline void vec::unordered_remove (unsigned ix) { gcc_checking_assert (ix < length ()); - m_vecdata[ix] = m_vecdata[--m_vecpfx.m_num]; + address ()[ix] = address ()[--m_vecpfx.m_num]; } @@ -1130,7 +1130,7 @@ inline void vec::block_remove (unsigned ix, unsigned len) { gcc_checking_assert (ix + len <= length ()); - T *slot = &m_vecdata[ix]; + T *slot = &address ()[ix]; m_vecpfx.m_num -= len; memmove (slot, slot + len, (m_vecpfx.m_num - ix) * sizeof (T)); } @@ -1249,8 +1249,11 @@ vec::contains (const T &search) const { unsigned int len = length (); for (unsigned int i = 0; i < len; i++) -if ((*this)[i] == search) - return true; +{ + const T *slot = &address ()[i]; + if (*slot == search) + return true; +} return false; } @@ -1262,7 +1265,8 @@ vec::contains (const T &search) const template unsigned -vec::lower_bound (T obj, bool (*lessthan)(const T &, const T &)) +vec::lower_bound (const T &obj, + bool (*lessthan)(const T &, const T &)) const { unsigned int len = length (); @@ -1273,7 +1277,7 @@ vec::lower_bound (T obj, bool (*lessthan)(const T &, const T &)) half = len / 2; middle = first; middle += half; - T mi