From patchwork Tue Oct 15 08:26:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 1997249 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=ScVrrAWP; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=VxdFK00x; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=ScVrrAWP; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=VxdFK00x; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XSRz847Wmz1xth for ; Tue, 15 Oct 2024 19:27:00 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CA9FA3858D33 for ; Tue, 15 Oct 2024 08:26:58 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id 439E93858C3A for ; Tue, 15 Oct 2024 08:26:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 439E93858C3A 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 439E93858C3A Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728980779; cv=none; b=SIWftVnuxSXMh3pKXjJoBwQ1Zib2S4BjcxGv1c85leH336L1fz16IXHjXgtWfO3uGPRAcX1wLj+9cdarBBaKGTY0+eKzfLs3YKK45cHLiz/tNdbRoqmOTyCValD/fVIWCVhmv/uQWGEO1s4yCpJju2YwNKI6I0bpn+OB/tWApIU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728980779; c=relaxed/simple; bh=qXHQFYey+oEcfNax5GDzulbuicZH8fK4ILbz+6eQFZw=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:MIME-Version; b=d/5QgXiCjcO4Zo1Jg67ZyZYi7TyRM0TrcsNZDiFD+WaFVmcCIkK0jQXtU4UehhmUC7Ij+W2+D3sWwsX5E+7Dexf6mzkh6sajWM5yFAC4ipJzPxzZ/kGjdqOxpzkrghJIdIxhlLk56baLpEyuP7KDQqeU3cXOenPf4QX6ASsyRSY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from murzim.nue2.suse.org (unknown [10.168.4.243]) (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-out2.suse.de (Postfix) with ESMTPS id 220B71F7ED for ; Tue, 15 Oct 2024 08:26:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1728980775; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=cwUNFfdkNOZEhCeFRbN4AgHDVT8IF38FsZZp6HNxL3g=; b=ScVrrAWPgBZ0VF7vL86fzZHZvkA0KgsGVzDiHB0cJXRTr9e0SvPLDcA1WWRkTSBcX14GzE Lb40hATHKPUQsXvFdt0cMO6Xvvc1IhFh/7Ada6lB/TTeeKOBKm0hrlEowG3q2F0z71j60o 7bqQjMSZN5K7/wCg2pCxQR2gThjMq1c= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1728980775; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=cwUNFfdkNOZEhCeFRbN4AgHDVT8IF38FsZZp6HNxL3g=; b=VxdFK00xxIkW8Exm58TWs6kVYU4l9hzzgkhYLSIRCqtHOqX2rN3FQ6URF5EAw/DbrtpYbU 80aF/pnNhFowrPBg== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1728980775; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=cwUNFfdkNOZEhCeFRbN4AgHDVT8IF38FsZZp6HNxL3g=; b=ScVrrAWPgBZ0VF7vL86fzZHZvkA0KgsGVzDiHB0cJXRTr9e0SvPLDcA1WWRkTSBcX14GzE Lb40hATHKPUQsXvFdt0cMO6Xvvc1IhFh/7Ada6lB/TTeeKOBKm0hrlEowG3q2F0z71j60o 7bqQjMSZN5K7/wCg2pCxQR2gThjMq1c= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1728980775; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=cwUNFfdkNOZEhCeFRbN4AgHDVT8IF38FsZZp6HNxL3g=; b=VxdFK00xxIkW8Exm58TWs6kVYU4l9hzzgkhYLSIRCqtHOqX2rN3FQ6URF5EAw/DbrtpYbU 80aF/pnNhFowrPBg== Date: Tue, 15 Oct 2024 10:26:15 +0200 (CEST) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] middle-end/117137 - expansion issue with vector equality compares MIME-Version: 1.0 X-Spam-Score: -1.14 X-Spamd-Result: default: False [-1.14 / 50.00]; BAYES_HAM(-3.00)[99.99%]; MISSING_MID(2.50)[]; NEURAL_HAM_LONG(-0.36)[-0.356]; NEURAL_HAM_SHORT(-0.18)[-0.908]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_ONE(0.00)[1]; RCVD_COUNT_ZERO(0.00)[0]; ARC_NA(0.00)[]; MISSING_XM_UA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_NONE(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[] X-Spam-Level: X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, MISSING_MID, 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org Message-Id: <20241015082658.CA9FA3858D33@sourceware.org> When expanding a COND_EXPR with a vector equality compare as condition expand_cond_expr_using_cmove fails to properly go the cbranch path. I failed to massage it's twisted logic so the simple fix is to make sure to expand a vector condition separately which also generates the expected code for the testcase: ptest %xmm0, %xmm0 cmovne %edi, %eax Bootstrapped on x86_64-unknown-linux-gnu, testing in progress. Will push if it succeeds. Richard. PR middle-end/117137 * expr.cc (expand_cond_expr_using_cmove): Make sure to expand vector comparisons separately. * gcc.dg/torture/pr117137.c: New testcase. --- gcc/expr.cc | 6 ++++-- gcc/testsuite/gcc.dg/torture/pr117137.c | 13 +++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/torture/pr117137.c diff --git a/gcc/expr.cc b/gcc/expr.cc index 7a471f20e79..da486cf85fd 100644 --- a/gcc/expr.cc +++ b/gcc/expr.cc @@ -9524,7 +9524,8 @@ expand_cond_expr_using_cmove (tree treeop0 ATTRIBUTE_UNUSED, EXPAND_NORMAL); if (TREE_CODE (treeop0) == SSA_NAME - && (srcstmt = get_def_for_expr_class (treeop0, tcc_comparison))) + && (srcstmt = get_def_for_expr_class (treeop0, tcc_comparison)) + && !VECTOR_TYPE_P (TREE_TYPE (gimple_assign_rhs1 (srcstmt)))) { type = TREE_TYPE (gimple_assign_rhs1 (srcstmt)); enum tree_code cmpcode = gimple_assign_rhs_code (srcstmt); @@ -9534,7 +9535,8 @@ expand_cond_expr_using_cmove (tree treeop0 ATTRIBUTE_UNUSED, unsignedp = TYPE_UNSIGNED (type); comparison_code = convert_tree_comp_to_rtx (cmpcode, unsignedp); } - else if (COMPARISON_CLASS_P (treeop0)) + else if (COMPARISON_CLASS_P (treeop0) + && !VECTOR_TYPE_P (TREE_TYPE (TREE_OPERAND (treeop0, 0)))) { type = TREE_TYPE (TREE_OPERAND (treeop0, 0)); enum tree_code cmpcode = TREE_CODE (treeop0); diff --git a/gcc/testsuite/gcc.dg/torture/pr117137.c b/gcc/testsuite/gcc.dg/torture/pr117137.c new file mode 100644 index 00000000000..b6ce78d8608 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr117137.c @@ -0,0 +1,13 @@ +/* { dg-do compile } */ +/* { dg-additional-options "-msse4" { target { x86_64-*-* i?86-*-* } } } */ + +long x[2]; + +int +foo (int c) +{ + long x0 = x[0], x1 = x[1]; + int t = x0 != 0 | x1 != 0; + c *= t; + return c; +}