From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id D79883858414 for ; Thu, 22 Jun 2023 05:49:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D79883858414 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687412971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Fm9aNKPzaDvsoJNtD2knWrXZykYtyJoyZbFp19sNp5A=; b=A7UQAA2LKk0K8TMubPoG70K6pHPTstL9rpJupiheuJZcYVT91lIWrPk8sRwrjXqKLH6q93 VEfuD+lK9vEJgH4jdxprfXCvVO+mXxgjfqLXaOovUZybJw/WNEFngsMwJWiGP+OK1y3t/0 uNO7KvAUnvXgNjw3122TTvzzrH1pNU8= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-504-xi6Pg_WIPniTzSchLGJwpQ-1; Thu, 22 Jun 2023 01:49:29 -0400 X-MC-Unique: xi6Pg_WIPniTzSchLGJwpQ-1 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-3f9b8c230f5so12532115e9.1 for ; Wed, 21 Jun 2023 22:49:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687412968; x=1690004968; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Fm9aNKPzaDvsoJNtD2knWrXZykYtyJoyZbFp19sNp5A=; b=TWlZRjRTlhdYoz2qFYPcfHiPpDqj02752lB3+Cfn4AbMZee2yE+oKOKiH+0Q3AVJk0 KxhY8BfKrIlwySb+tc/XiTJ6sUhbiSD8Hm5k88Dwf8g8f/633Lc1+jHik5+/u5/MzEAx QKZhYF42FZ02Ay7dTm7/BKSVEunrkTQB6NtFqRAEtNYqRIE2v4ibX69Gi8AF8aGxUDVj khUQS+tyy6yVApFqOY1ItCRRJ15ET/JSrQmNv7234Mpes4P6EQoh3asZgNFNnWjJ/lfs 1rU1yS3f8NAqj6kEr0jjT2DpyVKyre3AO9fbfd0UDXo5D/CCUGdVAOmNv1CJj7fcxby9 VlyQ== X-Gm-Message-State: AC+VfDxPxZOlMvkjp5dnnIgBuqPVgpf/7GsIelXWh/0OqNkxH+cxduyh xBLpNldbb3zadXS2by5cvntqaJFihBh5on8t379WR1YheibEsGuUsbzG3PgYY0OsoHXQ6khOKjW RCJSGsnGp6kU3CDb065n2y7Wjq4T+ysHd+RGM0Y6DmA== X-Received: by 2002:a05:600c:b4d:b0:3f8:fbb6:c17e with SMTP id k13-20020a05600c0b4d00b003f8fbb6c17emr11513259wmr.20.1687412968278; Wed, 21 Jun 2023 22:49:28 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ43+dKar7MgqVGVYokOijwHRsFrvF1LfX86deB8f/vXw7rgs9iEIeB0fIDom8p6pHKXiu0W7zOgv1qh/cFEFpg= X-Received: by 2002:a05:600c:b4d:b0:3f8:fbb6:c17e with SMTP id k13-20020a05600c0b4d00b003f8fbb6c17emr11513254wmr.20.1687412967958; Wed, 21 Jun 2023 22:49:27 -0700 (PDT) MIME-Version: 1.0 References: <20230522185622.537454-1-aldyh@redhat.com> In-Reply-To: From: Aldy Hernandez Date: Thu, 22 Jun 2023 07:49:18 +0200 Message-ID: Subject: Re: [PATCH] Convert ipa_jump_func to use ipa_vr instead of a value_range. To: GCC patches , Martin Jambor Cc: Andrew MacLeod X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/alternative; boundary="0000000000008b804705feb172a8" X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,HTML_MESSAGE,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --0000000000008b804705feb172a8 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Ping*2 On Wed, Jun 14, 2023, 14:09 Aldy Hernandez wrote: > PING > > On Mon, May 22, 2023 at 8:56=E2=80=AFPM Aldy Hernandez = wrote: > > > > This patch converts the ipa_jump_func code to use the type agnostic > > ipa_vr suitable for GC instead of value_range which is integer specific. > > > > I've disabled the range cacheing to simplify the patch for review, but > > it is handled in the next patch in the series. > > > > OK? > > > > gcc/ChangeLog: > > > > * ipa-cp.cc (ipa_vr_operation_and_type_effects): New. > > * ipa-prop.cc (ipa_get_value_range): Adjust for ipa_vr. > > (ipa_set_jfunc_vr): Take a range. > > (ipa_compute_jump_functions_for_edge): Pass range to > > ipa_set_jfunc_vr. > > (ipa_write_jump_function): Call streamer write helper. > > (ipa_read_jump_function): Call streamer read helper. > > * ipa-prop.h (class ipa_vr): Change m_vr to an ipa_vr. > > --- > > gcc/ipa-cp.cc | 15 +++++++++++ > > gcc/ipa-prop.cc | 70 ++++++++++++++++++------------------------------- > > gcc/ipa-prop.h | 5 +++- > > 3 files changed, 44 insertions(+), 46 deletions(-) > > > > diff --git a/gcc/ipa-cp.cc b/gcc/ipa-cp.cc > > index bdbc2184b5f..03273666ea2 100644 > > --- a/gcc/ipa-cp.cc > > +++ b/gcc/ipa-cp.cc > > @@ -1928,6 +1928,21 @@ ipa_vr_operation_and_type_effects (vrange &dst_v= r, > > && !dst_vr.undefined_p ()); > > } > > > > +/* Same as above, but the SRC_VR argument is an IPA_VR which must > > + first be extracted onto a vrange. */ > > + > > +static bool > > +ipa_vr_operation_and_type_effects (vrange &dst_vr, > > + const ipa_vr &src_vr, > > + enum tree_code operation, > > + tree dst_type, tree src_type) > > +{ > > + Value_Range tmp; > > + src_vr.get_vrange (tmp); > > + return ipa_vr_operation_and_type_effects (dst_vr, tmp, operation, > > + dst_type, src_type); > > +} > > + > > /* Determine range of JFUNC given that INFO describes the caller node = or > > the one it is inlined to, CS is the call graph edge corresponding to > JFUNC > > and PARM_TYPE of the parameter. */ > > diff --git a/gcc/ipa-prop.cc b/gcc/ipa-prop.cc > > index bbfe0f8aa45..c46a89f1b49 100644 > > --- a/gcc/ipa-prop.cc > > +++ b/gcc/ipa-prop.cc > > @@ -2287,9 +2287,10 @@ ipa_set_jfunc_bits (ipa_jump_func *jf, const > widest_int &value, > > /* Return a pointer to a value_range just like *TMP, but either find it > in > > ipa_vr_hash_table or allocate it in GC memory. TMP->equiv must be > NULL. */ > > > > -static value_range * > > -ipa_get_value_range (value_range *tmp) > > +static ipa_vr * > > +ipa_get_value_range (const vrange &tmp) > > { > > + /* FIXME: Add hashing support. > > value_range **slot =3D ipa_vr_hash_table->find_slot (tmp, INSERT); > > if (*slot) > > return *slot; > > @@ -2297,40 +2298,27 @@ ipa_get_value_range (value_range *tmp) > > value_range *vr =3D new (ggc_alloc ()) value_range; > > *vr =3D *tmp; > > *slot =3D vr; > > + */ > > + ipa_vr *vr =3D new (ggc_alloc ()) ipa_vr (tmp); > > > > return vr; > > } > > > > -/* Return a pointer to a value range consisting of TYPE, MIN, MAX and > an empty > > - equiv set. Use hash table in order to avoid creating multiple same > copies of > > - value_ranges. */ > > - > > -static value_range * > > -ipa_get_value_range (enum value_range_kind kind, tree min, tree max) > > -{ > > - value_range tmp (TREE_TYPE (min), > > - wi::to_wide (min), wi::to_wide (max), kind); > > - return ipa_get_value_range (&tmp); > > -} > > - > > -/* Assign to JF a pointer to a value_range structure with TYPE, MIN and > MAX and > > - a NULL equiv bitmap. Use hash table in order to avoid creating > multiple > > - same value_range structures. */ > > +/* Assign to JF a pointer to a value_range just like TMP but either > fetch a > > + copy from ipa_vr_hash_table or allocate a new on in GC memory. */ > > > > static void > > -ipa_set_jfunc_vr (ipa_jump_func *jf, enum value_range_kind type, > > - tree min, tree max) > > +ipa_set_jfunc_vr (ipa_jump_func *jf, const vrange &tmp) > > { > > - jf->m_vr =3D ipa_get_value_range (type, min, max); > > + jf->m_vr =3D ipa_get_value_range (tmp); > > } > > > > -/* Assign to JF a pointer to a value_range just like TMP but either > fetch a > > - copy from ipa_vr_hash_table or allocate a new on in GC memory. */ > > - > > static void > > -ipa_set_jfunc_vr (ipa_jump_func *jf, value_range *tmp) > > +ipa_set_jfunc_vr (ipa_jump_func *jf, const ipa_vr &vr) > > { > > - jf->m_vr =3D ipa_get_value_range (tmp); > > + Value_Range tmp; > > + vr.get_vrange (tmp); > > + ipa_set_jfunc_vr (jf, tmp); > > } > > > > /* Compute jump function for all arguments of callsite CS and insert t= he > > @@ -2392,8 +2380,8 @@ ipa_compute_jump_functions_for_edge (struct > ipa_func_body_info *fbi, > > > > if (addr_nonzero) > > { > > - tree z =3D build_int_cst (TREE_TYPE (arg), 0); > > - ipa_set_jfunc_vr (jfunc, VR_ANTI_RANGE, z, z); > > + vr.set_nonzero (TREE_TYPE (arg)); > > + ipa_set_jfunc_vr (jfunc, vr); > > } > > else > > gcc_assert (!jfunc->m_vr); > > @@ -2412,7 +2400,7 @@ ipa_compute_jump_functions_for_edge (struct > ipa_func_body_info *fbi, > > value_range resvr =3D vr; > > range_cast (resvr, param_type); > > if (!resvr.undefined_p () && !resvr.varying_p ()) > > - ipa_set_jfunc_vr (jfunc, &resvr); > > + ipa_set_jfunc_vr (jfunc, resvr); > > else > > gcc_assert (!jfunc->m_vr); > > } > > @@ -4864,16 +4852,12 @@ ipa_write_jump_function (struct output_block *o= b, > > streamer_write_widest_int (ob, jump_func->bits->value); > > streamer_write_widest_int (ob, jump_func->bits->mask); > > } > > - bp_pack_value (&bp, !!jump_func->m_vr, 1); > > - streamer_write_bitpack (&bp); > > if (jump_func->m_vr) > > + jump_func->m_vr->streamer_write (ob); > > + else > > { > > - tree min, max; > > - value_range_kind kind =3D get_legacy_range (*jump_func->m_vr, mi= n, > max); > > - streamer_write_enum (ob->main_stream, value_rang_type, > > - VR_LAST, kind); > > - stream_write_tree (ob, min, true); > > - stream_write_tree (ob, max, true); > > + bp_pack_value (&bp, false, 1); > > + streamer_write_bitpack (&bp); > > } > > } > > > > @@ -5001,21 +4985,17 @@ ipa_read_jump_function (class lto_input_block > *ib, > > widest_int value =3D streamer_read_widest_int (ib); > > widest_int mask =3D streamer_read_widest_int (ib); > > if (prevails) > > - ipa_set_jfunc_bits (jump_func, value, mask); > > + ipa_set_jfunc_bits (jump_func, value, mask); > > } > > else > > jump_func->bits =3D NULL; > > > > - struct bitpack_d vr_bp =3D streamer_read_bitpack (ib); > > - bool vr_known =3D bp_unpack_value (&vr_bp, 1); > > - if (vr_known) > > + ipa_vr vr; > > + vr.streamer_read (ib, data_in); > > + if (vr.known_p ()) > > { > > - enum value_range_kind type =3D streamer_read_enum (ib, > value_range_kind, > > - VR_LAST); > > - tree min =3D stream_read_tree (ib, data_in); > > - tree max =3D stream_read_tree (ib, data_in); > > if (prevails) > > - ipa_set_jfunc_vr (jump_func, type, min, max); > > + ipa_set_jfunc_vr (jump_func, vr); > > } > > else > > jump_func->m_vr =3D NULL; > > diff --git a/gcc/ipa-prop.h b/gcc/ipa-prop.h > > index f87e8a596c1..33fad228913 100644 > > --- a/gcc/ipa-prop.h > > +++ b/gcc/ipa-prop.h > > @@ -325,6 +325,9 @@ private: > > friend void gt_pch_nx (struct ipa_vr &); > > friend void gt_ggc_mx (struct ipa_vr &); > > friend void gt_pch_nx (struct ipa_vr *, gt_pointer_operator, void *); > > + friend void gt_ggc_mx_ipa_vr (void *); > > + friend void gt_pch_nx_ipa_vr (void*); > > + friend void gt_pch_p_6ipa_vr(void*, void*, gt_pointer_operator, > void*); > > > > vrange_storage *m_storage; > > // vrange_storage is typeless, but we need to know what type of > > @@ -351,7 +354,7 @@ struct GTY (()) ipa_jump_func > > /* Information about value range, containing valid data only when > vr_known is > > true. The pointed to structure is shared betweed different jump > > functions. Use ipa_set_jfunc_vr to set this field. */ > > - value_range *m_vr; > > + ipa_vr *m_vr; > > > > enum jump_func_type type; > > /* Represents a value of a jump function. pass_through is used only > in jump > > -- > > 2.40.1 > > > --0000000000008b804705feb172a8--