From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id C21593858C33 for ; Thu, 20 Jul 2023 14:58:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C21593858C33 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de 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 CD7F12069F; Thu, 20 Jul 2023 14:58:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1689865080; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WWj4PAJOzm7CRYZiSiuWzRasO7FIYFIhjM0oshuDC9k=; b=V1i5NbjmFMbuo7r6GdJCxyABPnpsKHHNH3+4PSSh+/ZahqYAugocDMUAShGp7hKnDnPOjY 9OkHzVo94qp3x9JSiDZElzXVcsttxIX5qstbUS1HJiGL3SnTPdSELWq8qpHDcv8oIfJfnH ij106GhcaSMlJiWd04lAIoqQvnIa+J4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1689865080; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WWj4PAJOzm7CRYZiSiuWzRasO7FIYFIhjM0oshuDC9k=; b=J1NxVAvjPIhpIXyOdkoHwmyHLnQvdytyRnCqxmt1QtZieoRzMrPZNltcXsQMjeW2cEdiGl lOJXa6gIr7/NxzCw== 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 C153C138EC; Thu, 20 Jul 2023 14:58:00 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id nP0oL3hLuWQEBwAAMHmgww (envelope-from ); Thu, 20 Jul 2023 14:58:00 +0000 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [PATCH] tree-optimization/110742 - fix latent issue with permuting existing vectors Mime-Version: 1.0 (1.0) X-Apple-Notify-Thread: NO X-Universally-Unique-Identifier: 725F7ECE-4D9E-446F-BFF9-B145F69C6BF0 From: Richard Biener In-Reply-To: Cc: Richard Biener via Gcc-patches Date: Thu, 20 Jul 2023 16:57:50 +0200 X-Apple-Message-Smime-Encrypt: NO Message-Id: References: To: Richard Sandiford X-Mailer: iPhone Mail (20F75) X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,MIME_QP_LONG_LINE,SPF_HELO_NONE,SPF_PASS,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: > Am 20.07.2023 um 16:09 schrieb Richard Sandiford : >=20 > =EF=BB=BFRichard Biener via Gcc-patches writes: >> When we materialize a layout we push edge permutes to constant/external >> defs without checking we can actually do so. For externals defined >> by vector stmts rather than scalar components we can't. >>=20 >> Bootstrapped and tested on x86_64-unknown-linux-gnu. >>=20 >> OK? >>=20 >> Thanks, >> Richard. >>=20 >> PR tree-optimization/110742 >> * tree-vect-slp.cc (vect_optimize_slp_pass::get_result_with_layout): >> Do not materialize an edge permutation in an external node with >> vector defs. >> (vect_slp_analyze_node_operations_1): Guard purely internal >> nodes better. >>=20 >> * g++.dg/torture/pr110742.C: New testcase. >> --- >> gcc/testsuite/g++.dg/torture/pr110742.C | 47 +++++++++++++++++++++++++ >> gcc/tree-vect-slp.cc | 8 +++-- >> 2 files changed, 53 insertions(+), 2 deletions(-) >> create mode 100644 gcc/testsuite/g++.dg/torture/pr110742.C >>=20 >> diff --git a/gcc/testsuite/g++.dg/torture/pr110742.C b/gcc/testsuite/g++.= dg/torture/pr110742.C >> new file mode 100644 >> index 00000000000..d41ac0479d2 >> --- /dev/null >> +++ b/gcc/testsuite/g++.dg/torture/pr110742.C >> @@ -0,0 +1,47 @@ >> +// { dg-do compile } >> + >> +struct HARD_REG_SET { >> + HARD_REG_SET operator~() const { >> + HARD_REG_SET res; >> + for (unsigned int i =3D 0; i < (sizeof(elts) / sizeof((elts)[0])); += +i) >> + res.elts[i] =3D ~elts[i]; >> + return res; >> + } >> + HARD_REG_SET operator&(const HARD_REG_SET &other) const { >> + HARD_REG_SET res; >> + for (unsigned int i =3D 0; i < (sizeof(elts) / sizeof((elts)[0])); += +i) >> + res.elts[i] =3D elts[i] & other.elts[i]; >> + return res; >> + } >> + unsigned long elts[4]; >> +}; >> +typedef const HARD_REG_SET &const_hard_reg_set; >> +inline bool hard_reg_set_subset_p(const_hard_reg_set x, const_hard_reg_s= et y) { >> + unsigned long bad =3D 0; >> + for (unsigned int i =3D 0; i < (sizeof(x.elts) / sizeof((x.elts)[0]));= ++i) >> + bad |=3D (x.elts[i] & ~y.elts[i]); >> + return bad =3D=3D 0; >> +} >> +inline bool hard_reg_set_empty_p(const_hard_reg_set x) { >> + unsigned long bad =3D 0; >> + for (unsigned int i =3D 0; i < (sizeof(x.elts) / sizeof((x.elts)[0]));= ++i) >> + bad |=3D x.elts[i]; >> + return bad =3D=3D 0; >> +} >> +extern HARD_REG_SET rr[2]; >> +extern int t[2]; >> +extern HARD_REG_SET nn; >> +static HARD_REG_SET mm; >> +void setup_reg_class_relations(void) { >> + HARD_REG_SET intersection_set, union_set, temp_set2; >> + for (int cl2 =3D 0; cl2 < 2; cl2++) { >> + temp_set2 =3D rr[cl2] & ~nn; >> + if (hard_reg_set_empty_p(mm) && hard_reg_set_empty_p(temp_set2)) { >> + mm =3D rr[0] & nn; >> + if (hard_reg_set_subset_p(mm, intersection_set)) >> + if (!hard_reg_set_subset_p(mm, temp_set2) || >> + hard_reg_set_subset_p(rr[0], rr[t[cl2]])) >> + t[cl2] =3D 0; >> + } >> + } >> +} >> diff --git a/gcc/tree-vect-slp.cc b/gcc/tree-vect-slp.cc >> index 693621ca990..1d79c77e8ce 100644 >> --- a/gcc/tree-vect-slp.cc >> +++ b/gcc/tree-vect-slp.cc >> @@ -5198,7 +5198,10 @@ vect_optimize_slp_pass::get_result_with_layout (sl= p_tree node, >> return result; >>=20 >> if (SLP_TREE_DEF_TYPE (node) =3D=3D vect_constant_def >> - || SLP_TREE_DEF_TYPE (node) =3D=3D vect_external_def) >> + || (SLP_TREE_DEF_TYPE (node) =3D=3D vect_external_def >> + && (to_layout_i =3D=3D 0 >> + /* We can't permute vector defs. */ >> + || SLP_TREE_VEC_DEFS (node).is_empty ()))) >=20 > Guess it's personal preference, but IMO it's easier to follow without the > to_layout_i condition, so that it ties directly to the create_partitions > test. I don=E2=80=99t understand- in the code guarding this we seem to expect to_l= ayout_i =3D=3D 0 and that=E2=80=99s the case we can handle as noop. I didn=E2= =80=99t understand why the function doesn=E2=80=99t always just do nothing i= n this case though, so I must have missed something. Richard=20 > (Would be nice to have a name for whatever a node matching the new > condition is, but I don't have any good ideas.) >=20 > LGTM otherwise FWIW. >=20 > Thanks, > Richard >=20 >> { >> /* If the vector is uniform or unchanged, there's nothing to do. *= / >> if (to_layout_i =3D=3D 0 || vect_slp_tree_uniform_p (node)) >> @@ -5944,7 +5947,8 @@ vect_slp_analyze_node_operations_1 (vec_info *vinfo= , slp_tree node, >> calculated by the recursive call). Otherwise it is the number of >> scalar elements in one scalar iteration (DR_GROUP_SIZE) multiplied b= y >> VF divided by the number of elements in a vector. */ >> - if (!STMT_VINFO_DATA_REF (stmt_info) >> + if (SLP_TREE_CODE (node) !=3D VEC_PERM_EXPR >> + && !STMT_VINFO_DATA_REF (stmt_info) >> && REDUC_GROUP_FIRST_ELEMENT (stmt_info)) >> { >> for (unsigned i =3D 0; i < SLP_TREE_CHILDREN (node).length (); ++i)=