From patchwork Mon Dec 4 13:25:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 81282 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5A1EA3864C6A for ; Mon, 4 Dec 2023 13:26:09 +0000 (GMT) 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 [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id B42AF385841A for ; Mon, 4 Dec 2023 13:25:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B42AF385841A Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org B42AF385841A Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701696353; cv=none; b=BTZCOQgRg9LAbKrETQzRquhBuxZi4RfeiI/pLql/QOTMCPyp9/wF8iY0Xeoe7ra5oxcVVCiKGyd6bLKMuPLItZOLkOIFMM6il5Pgl9mnX5KcuqR3WCEuF/xmZ41Ns4MvZ9x5sw4QovAV4/p4LhcdYsda+GQthv3vgsvF5WmQwqc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701696353; c=relaxed/simple; bh=IN7EvWYJRX11rVkF/19gQU1F7g67c68b/sHBgwJBonw=; h=DKIM-Signature:DKIM-Signature:Date:From:To:Subject:MIME-Version: Message-Id; b=ZCZtZ3Yp7LvgG1+MO+qfpu/Y/K3AYRxW/XmjW5GzYrkEWE2Huo4cW4yoJDLDDXgsN2MpkvsD7xrVIxmAEO1cUcW1pBiwols7Zas1xBSekz4FFgyL+fYqE5CO3nftV9AQxfJBFnBzrbkaErAI4QTzoFj9spC5jVM+9RbEzP2fdwU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap2.dmz-prg2.suse.org (imap2.dmz-prg2.suse.org [10.150.64.98]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 9B2C622083 for ; Mon, 4 Dec 2023 13:25:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1701696349; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=IRHUfFwtU6FZLAh7Dee5VtZDQF862fNTrokYqcNEkaM=; b=CYA/eEyY3oIEpsvcpJDuZBNq81SLwsPMduESe3vgewKen3bn8yUYSMbIfGC3WFWqIMU+Gh G2KajA0X5V0dgAujDtT1Oac0IwnvmEs823vaCBkViLY38j/Vqk+CecVGJfQW09JbqpZGje JMz6B1TQvFUa1DggPK7xzGU+VHXpoE4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1701696349; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=IRHUfFwtU6FZLAh7Dee5VtZDQF862fNTrokYqcNEkaM=; b=q01i6NEZE3mD70Jifu+WXhSWxAUhn+2OpYTzv8ubmg659/LSIA69sTHCRDCRkTCUOsGOMl rw8j3Coahf+P4cBA== Received: from imap2.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap2.dmz-prg2.suse.org (Postfix) with ESMTPS id 809D513588 for ; Mon, 4 Dec 2023 13:25:49 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap2.dmz-prg2.suse.org with ESMTPSA id Ee/THV3TbWXUdwAAn2gu4w (envelope-from ) for ; Mon, 04 Dec 2023 13:25:49 +0000 Date: Mon, 4 Dec 2023 14:25:49 +0100 (CET) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/112818 - re-instantiate vector type size check for bswap MIME-Version: 1.0 Message-Id: <20231204132549.809D513588@imap2.dmz-prg2.suse.org> Authentication-Results: smtp-out1.suse.de; none X-Spam-Score: 3.32 X-Spamd-Result: default: False [3.32 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_SPAM_SHORT(2.98)[0.993]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[gcc-patches@gcc.gnu.org]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_SPAM_LONG(3.44)[0.984]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%] X-Spam-Status: No, score=-10.9 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, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org For __builtin_bswap vectorization we still require an equal vector type size. Re-instantiate that check. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. PR tree-optimization/112818 * tree-vect-stmts.cc (vectorizable_bswap): Check input and output vector types have the same size. * gcc.dg/vect/pr112818.c: New testcase. --- gcc/testsuite/gcc.dg/vect/pr112818.c | 34 ++++++++++++++++++++++++++++ gcc/tree-vect-stmts.cc | 9 ++++++++ 2 files changed, 43 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/vect/pr112818.c diff --git a/gcc/testsuite/gcc.dg/vect/pr112818.c b/gcc/testsuite/gcc.dg/vect/pr112818.c new file mode 100644 index 00000000000..61a30a576b7 --- /dev/null +++ b/gcc/testsuite/gcc.dg/vect/pr112818.c @@ -0,0 +1,34 @@ +/* { dg-do compile } */ + +extern char tag_data[]; +struct pppoe_tag { + unsigned short tag_type; + unsigned short tag_len; +}; + +char code; +int *add_tag_pack; +void *add_tag_data; +short e; +long c, d; + +static int add_tag(int type, int len) { + short a, b; + struct pppoe_tag *tag = (struct pppoe_tag *)add_tag_pack; + if (e + len || len < 0) + return 1; + b = __builtin_bswap16(type); + tag->tag_type = b; + a = __builtin_bswap16(len); + tag->tag_len = a; + if (add_tag_data) + __builtin___memcpy_chk(tag_data, add_tag_data, len, c); + return 0; +} +void pppoe_serv_read() { + switch (code) + case 9: { + add_tag(2, d); + add_tag(0, 2); + } +} diff --git a/gcc/tree-vect-stmts.cc b/gcc/tree-vect-stmts.cc index 067abac3917..390c8472fd6 100644 --- a/gcc/tree-vect-stmts.cc +++ b/gcc/tree-vect-stmts.cc @@ -2976,6 +2976,15 @@ vectorizable_bswap (vec_info *vinfo, gcc_assert (ncopies >= 1); + if (TYPE_SIZE (vectype_in) != TYPE_SIZE (vectype)) + { + if (dump_enabled_p ()) + dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location, + "mismatched vector sizes %T and %T\n", + vectype_in, vectype); + return false; + } + tree char_vectype = get_same_sized_vectype (char_type_node, vectype_in); if (! char_vectype) return false;