From patchwork Fri Feb 24 13:46:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 61320 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp914724wrd; Fri, 24 Feb 2023 05:47:09 -0800 (PST) X-Google-Smtp-Source: AK7set9G2SEr9VYFj8uL/YBh/2bVsSDT63cd7Odhzw+mmJbs/ClVPUNmzJVrLveu5dp05rcX4LYn X-Received: by 2002:aa7:d0d6:0:b0:4ab:178d:3d9f with SMTP id u22-20020aa7d0d6000000b004ab178d3d9fmr15740432edo.28.1677246429085; Fri, 24 Feb 2023 05:47:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677246429; cv=none; d=google.com; s=arc-20160816; b=v2Nm9IzhwMcmQzGXW5AbW/NZN5UJzxRw9ERtbqj39TwpGNeResG+JVfV+0oOLUYNgP X+IDZzY0OMGvBzmM8KBR8ekg41tH7UJjb0fM84PAXWQQxec2dQLO3QeiSls+gc6VAYwh FjR6nJZzr63RPt47eqOr83E6eeQ505ZZz+IO1cf6bhryCzQ4fSfK9fqozO2mSPT7UFrO sQK3qFa34n74hyi3rIekf4ONdPs0d4I0WTJI0ZBrGdr0UiO3/TRJGzDw0YB+h86FaxUE Gcifs7bgQjsg2FukHgMBOU1K5K7XSngD78YIlkyy72qZZvi3pT3CIG0LaMZIhCGCVUm7 JX0Q== 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:cc:to:date:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=y3htTL6UuaeX8htc/hUUA+y3eEm+A5WMQgCXx/gdHd0=; b=Ojsq7WeJ7rBUPv4iDzx2KWz9D51K0bZQ8xvlUfS+6v2MG4dxSfP/cxSaxSaOOCXjTO HaNY3e0Vci4+KMUbeOAlm9MGA3hYgMECEQvM4zfeoT1MNmsqbTeZF+LG+uWCA/A+mMMU LLoF4pgA+Bl/gJa8+5QbcFJ58RXOr+dawIsdB/4lhrITG3mTSlIaK0wtO21aGjOGfWOG 09RzaV/RlPBUVXrwlPqcf4fn2ZdZNxPaRxRJfLUeGscMV3xAFce3vIybXeAcIfl+5Yte lBko0bf0NWkI4qohStHKL6PTpRlIxn0G7JrmbZT6EIEryIJnOh2deEYSynG410qtToXY Az2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=Qw9MlE8E; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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 (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id f23-20020a05640214d700b004acb5ff05e8si14144777edx.633.2023.02.24.05.47.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Feb 2023 05:47:09 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=Qw9MlE8E; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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 E07A3385559A for ; Fri, 24 Feb 2023 13:47:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E07A3385559A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1677246427; bh=y3htTL6UuaeX8htc/hUUA+y3eEm+A5WMQgCXx/gdHd0=; h=Date:To:cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=Qw9MlE8EGAaXmqK2e3W+H1RKWwIvkAsiDxwuJ0ZbxVna58WONiRklPa8ek3ImhDIJ wfpQUVAJ+zpB9xDaW/sxCEA9iunQiZgtd/+QMHn6A3uO1rsxlpxOV2DWswXeGP/+2p YUILHOWR/rWnTCG0N9xBiMrU7JVcx5nfeRb4msGU= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 30C8A385840F for ; Fri, 24 Feb 2023 13:46:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 30C8A385840F 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-out1.suse.de (Postfix) with ESMTPS id 1FB2D34D8A; Fri, 24 Feb 2023 13:46:22 +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 09FCF13246; Fri, 24 Feb 2023 13:46:22 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id RwVeAa6/+GPDUQAAMHmgww (envelope-from ); Fri, 24 Feb 2023 13:46:22 +0000 Date: Fri, 24 Feb 2023 14:46:21 +0100 (CET) To: gcc-patches@gcc.gnu.org cc: Jakub Jelinek Subject: [PATCH 1/2] Change vec<, , vl_embed>::m_vecdata refrences into address () MIME-Version: 1.0 Message-Id: <20230224134622.09FCF13246@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?1758720351486300533?= 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 &)) +vec::lower_bound (const T &obj, + bool (*lessthan)(const T &, const T &)) const { unsigned int len = length (); @@ -1273,7 +1279,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 +1482,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 (); }