From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by sourceware.org (Postfix) with ESMTPS id 9C334385B512 for ; Fri, 18 Aug 2023 07:46:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9C334385B512 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-out1.suse.de (Postfix) with ESMTPS id 2D4932187B; Fri, 18 Aug 2023 07:46:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1692344767; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=4evHF38tJ5o2AUkkWRcptpGkyd3XHE6bgilDUFIn9K8=; b=zphqOQQoIuDgziQkCV7xvZEPA9EIV1wO+dWgVHiCisT2ibQdXtzS34YxlIrIF6pI1+Znx4 nNmdQ1Xk/QaU/8KiNHGDwm9DG3syxuLvhXL27Mh7rmZz8uhzATWFT+0uW5tPMy+mHErHX7 WNqQGzTJueauVZ0iL2qWN5BeCJxuLYw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1692344767; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=4evHF38tJ5o2AUkkWRcptpGkyd3XHE6bgilDUFIn9K8=; b=AZMZOnAszczqigRd+gF+fwEW2Z+Y/WxVuvM1FwSp6dqhTp0mNpwzQlOfOCKtcRae+W7Pco twwLNzXaSpZLy5Ag== 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 14799138F0; Fri, 18 Aug 2023 07:46:07 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 5unWA78h32TAdAAAMHmgww (envelope-from ); Fri, 18 Aug 2023 07:46:07 +0000 Date: Fri, 18 Aug 2023 09:46:06 +0200 (CEST) From: Richard Biener To: gcc-patches@gcc.gnu.org cc: richard.sandiford@arm.com Subject: [PATCH] tree-optimization/111048 - avoid flawed logic in fold_vec_perm MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Message-Id: <20230818074607.14799138F0@imap2.suse-dmz.suse.de> X-Spam-Status: No, score=-11.2 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 List-Id: The following avoids running into somehow flawed logic in fold_vec_perm for non-VLA vectors. Bootstrap & regtest running on x86_64-unknown-linux-gnu. Richard. PR tree-optimization/111048 * fold-const.cc (fold_vec_perm_cst): Check for non-VLA vectors first. * gcc.dg/torture/pr111048.c: New testcase. --- gcc/fold-const.cc | 12 ++++++------ gcc/testsuite/gcc.dg/torture/pr111048.c | 24 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/torture/pr111048.c diff --git a/gcc/fold-const.cc b/gcc/fold-const.cc index 5c51c9d91be..144fd7481b3 100644 --- a/gcc/fold-const.cc +++ b/gcc/fold-const.cc @@ -10625,6 +10625,11 @@ fold_vec_perm_cst (tree type, tree arg0, tree arg1, const vec_perm_indices &sel, unsigned res_npatterns, res_nelts_per_pattern; unsigned HOST_WIDE_INT res_nelts; + if (TYPE_VECTOR_SUBPARTS (type).is_constant (&res_nelts)) + { + res_npatterns = res_nelts; + res_nelts_per_pattern = 1; + } /* (1) If SEL is a suitable mask as determined by valid_mask_for_fold_vec_perm_cst_p, then: res_npatterns = max of npatterns between ARG0, ARG1, and SEL @@ -10634,7 +10639,7 @@ fold_vec_perm_cst (tree type, tree arg0, tree arg1, const vec_perm_indices &sel, res_npatterns = nelts in result vector. res_nelts_per_pattern = 1. This exception is made so that VLS ARG0, ARG1 and SEL work as before. */ - if (valid_mask_for_fold_vec_perm_cst_p (arg0, arg1, sel, reason)) + else if (valid_mask_for_fold_vec_perm_cst_p (arg0, arg1, sel, reason)) { res_npatterns = std::max (VECTOR_CST_NPATTERNS (arg0), @@ -10648,11 +10653,6 @@ fold_vec_perm_cst (tree type, tree arg0, tree arg1, const vec_perm_indices &sel, res_nelts = res_npatterns * res_nelts_per_pattern; } - else if (TYPE_VECTOR_SUBPARTS (type).is_constant (&res_nelts)) - { - res_npatterns = res_nelts; - res_nelts_per_pattern = 1; - } else return NULL_TREE; diff --git a/gcc/testsuite/gcc.dg/torture/pr111048.c b/gcc/testsuite/gcc.dg/torture/pr111048.c new file mode 100644 index 00000000000..475978aae2b --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr111048.c @@ -0,0 +1,24 @@ +/* { dg-do run } */ +/* { dg-additional-options "-mavx2" { target avx2_runtime } } */ + +typedef unsigned char u8; + +__attribute__((noipa)) +static void check(const u8 * v) { + if (*v != 15) __builtin_trap(); +} + +__attribute__((noipa)) +static void bug(void) { + u8 in_lanes[32]; + for (unsigned i = 0; i < 32; i += 2) { + in_lanes[i + 0] = 0; + in_lanes[i + 1] = ((u8)0xff) >> (i & 7); + } + + check(&in_lanes[13]); + } + +int main() { + bug(); +} -- 2.35.3