From patchwork Fri Feb 24 11:32:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 61277 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp852356wrd; Fri, 24 Feb 2023 03:33:33 -0800 (PST) X-Google-Smtp-Source: AK7set8i6B9bjryR4d/4S8nkEwRhPHiYOHh5qFKoWZHs9+UnX6f146x+VEiZ65N1Kv6qhxbQNmSy X-Received: by 2002:a17:906:d925:b0:8b1:78b6:4b3c with SMTP id rn5-20020a170906d92500b008b178b64b3cmr27113603ejb.73.1677238412959; Fri, 24 Feb 2023 03:33:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677238412; cv=none; d=google.com; s=arc-20160816; b=Pd1ZaDh9xtX7KlhwvkzmNoal92aRsoeRUiY/btxsG1D+UwryZv5CD/YxAV/hf/cjw0 oQJNMfrAwGZMTo4XeQgf5G4OwHV1xo9uVfPm7Ol0tQqD9cYXKD1uIVcwsWnRtP3Wbwa4 nWf0nZ2yZROQCHyZlzMpssxmcITq1c7njkeiWqFiJmKFZ3VQSb7CEiUk/XM/Lmwo3YdG sB4JZSaYf80kw1DpNmCtot/jsWsvJ/TeC+/RRpL7P47SDcte1EfxDsmQb6lbXzzQa7Re pAmXgljsofb7TtFnO75VsYDXifj0ys0DQzgLQiTokseAKzodHnipxpTromrIDQkNjIes J7kQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:message-id :mime-version:subject:to:date:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=iYJcp4jg/0+j/qDu2O+muhNQzkBMqZZ8HijVhk3Jr24=; b=bWOugSlL2K1G8Ld1PoL5vxcJhtJ0QzvDZlkd5ytUFOJxB/nzxr3xlN53aDi15fr4Qk joexUHfcXHhoz2yF+hMyrNS/kHYMVqDA6nPG/zG+kdijCuwrtX+kzG7GrkCGmpKjRvOT ZBYOMskECKfXdV+Y2ie4T2hjFwJI+eEBJnGO7QZecc+f3zr56qK951cvNfp4Ge8U/Inn 20E54LhRnfY6CICZrx6QI3qIGfp2ksKZiYv+X3n+d//qSe57c4cnbKqPxh8wMFrxVa4v GvBE69PKaqx26G0h8e8e+MOo57RoLOADJQJuyhFVn69MCEkpKllXO6JfO0YM+0BZhoIX RLqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="POc/k1lW"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id 25-20020a170906025900b008b17fe95459si29682880ejl.47.2023.02.24.03.33.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Feb 2023 03:33:32 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="POc/k1lW"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0BD91385B53E for ; Fri, 24 Feb 2023 11:33:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0BD91385B53E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1677238412; bh=iYJcp4jg/0+j/qDu2O+muhNQzkBMqZZ8HijVhk3Jr24=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=POc/k1lWnUYRKFYmpZfBhGiUYeclrp27zqhXEzLY5laoD/R1X4B0VLhMgpHNX2lNN n+5gq5HVvtC3qLIh88ek5T/uJkO47ZqbKsm3J5DyXwZXajpWWMwUvIcvg7fqsGyJdD rKBnDWgSDHc8vx/XUUtf10bNLYm+XI5skpnQEf0I= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id B66783853567 for ; Fri, 24 Feb 2023 11:32:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B66783853567 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id B5EB9605D2 for ; Fri, 24 Feb 2023 11:32:45 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 9645013246 for ; Fri, 24 Feb 2023 11:32:45 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id pHWPI12g+GMWAwAAMHmgww (envelope-from ) for ; Fri, 24 Feb 2023 11:32:45 +0000 Date: Fri, 24 Feb 2023 12:32:45 +0100 (CET) To: gcc-patches@gcc.gnu.org Subject: [PATCH 1/2] Change vec<, , vl_embed>::m_vecdata refrences into address () MIME-Version: 1.0 Message-Id: <20230224113245.9645013246@imap2.suse-dmz.suse.de> X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Richard Biener via Gcc-patches From: Richard Biener Reply-To: Richard Biener Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758711946312301710?= X-GMAIL-MSGID: =?utf-8?q?1758711946312301710?= 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 middle_elem = (*this)[middle]; + const T &middle_elem = address ()[middle]; if (lessthan (middle_elem, obj)) { first = middle; @@ -1476,10 +1480,10 @@ public: { return m_vec ? m_vec->length () : 0; } T *address (void) - { return m_vec ? m_vec->m_vecdata : NULL; } + { return m_vec ? m_vec->address () : NULL; } const T *address (void) const - { return m_vec ? m_vec->m_vecdata : NULL; } + { return m_vec ? m_vec->address () : NULL; } T *begin () { return address (); } const T *begin () const { return address (); }