From patchwork Thu Nov 11 09:32:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 47444 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 CF4903858402 for ; Thu, 11 Nov 2021 09:33:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CF4903858402 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1636623196; bh=8Iho3ohA2IX/nW2AIIKVtCqsBjVGmi92BN0Mj7P8/UE=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=nOsYdczg/FRqBpKZ/ssjuOWKiij3tsV4KQKNyjEkc0KyalqmdR0uI2hxWk2VxdY8a rcMv3GVyPBGZWyoKd/Uk1RneQhJCmihG3AkH+oW1Ri45wBss4LsLoMrx9ZSiI4cB3c CBnlNde3nHtlwxfjU9Hk+KlUECcioihoiauqdGYI= 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 [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id E79683858402 for ; Thu, 11 Nov 2021 09:32:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E79683858402 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 C105621B35 for ; Thu, 11 Nov 2021 09:32:45 +0000 (UTC) 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 AE48A13B08 for ; Thu, 11 Nov 2021 09:32:45 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id Pj9qKT3jjGGiHAAAMHmgww (envelope-from ) for ; Thu, 11 Nov 2021 09:32:45 +0000 Date: Thu, 11 Nov 2021 10:32:45 +0100 (CET) To: gcc-patches@gcc.gnu.org Subject: [PATCH] middle-end/103181 - fix operation_could_trap_p for vector division Message-ID: <66nqqp2q-36pr-88q0-pq92-rs62177r5soq@fhfr.qr> MIME-Version: 1.0 X-Spam-Status: No, score=-11.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 autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Richard Biener via Gcc-patches From: Richard Biener Reply-To: Richard Biener Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" For integer vector division we only checked for all zero vector constants rather than checking whether any element in the constant vector is zero. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. 2021-11-11 Richard Biener PR middle-end/103181 * tree-eh.c (operation_could_trap_helper_p): Properly check vector constants for a zero element for integer division. Separate floating point and integer division code. * gcc.dg/torture/pr103181.c: New testcase. --- gcc/testsuite/gcc.dg/torture/pr103181.c | 24 +++++++++++++++++++++++ gcc/tree-eh.c | 26 ++++++++++++++++++++----- 2 files changed, 45 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/torture/pr103181.c diff --git a/gcc/testsuite/gcc.dg/torture/pr103181.c b/gcc/testsuite/gcc.dg/torture/pr103181.c new file mode 100644 index 00000000000..6bc705ab52e --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr103181.c @@ -0,0 +1,24 @@ +/* { dg-do run } */ + +typedef unsigned char __attribute__((__vector_size__ (2))) U; +typedef unsigned short S; +typedef unsigned int __attribute__((__vector_size__ (64))) V; + +V v; +U a, b, c; + +U +foo (S s) +{ + v += __builtin_bswap16 (s) || (S) (a / ((U){3, 0})); + return b + c; +} + +int +main (void) +{ + U x = foo (4); + if (x[0] || x[1]) + __builtin_abort (); + return 0; +} diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c index 3a09de95025..3eff07fc8fe 100644 --- a/gcc/tree-eh.c +++ b/gcc/tree-eh.c @@ -2454,15 +2454,31 @@ operation_could_trap_helper_p (enum tree_code op, case FLOOR_MOD_EXPR: case ROUND_MOD_EXPR: case TRUNC_MOD_EXPR: - case RDIV_EXPR: - if (honor_snans) - return true; - if (fp_operation) - return flag_trapping_math; if (!TREE_CONSTANT (divisor) || integer_zerop (divisor)) return true; + if (TREE_CODE (divisor) == VECTOR_CST) + { + /* Inspired by initializer_each_zero_or_onep. */ + unsigned HOST_WIDE_INT nelts = vector_cst_encoded_nelts (divisor); + if (VECTOR_CST_STEPPED_P (divisor) + && !TYPE_VECTOR_SUBPARTS (TREE_TYPE (divisor)) + .is_constant (&nelts)) + return true; + for (unsigned int i = 0; i < nelts; ++i) + { + tree elt = vector_cst_elt (divisor, i); + if (integer_zerop (elt)) + return true; + } + } return false; + case RDIV_EXPR: + if (honor_snans) + return true; + gcc_assert (fp_operation); + return flag_trapping_math; + case LT_EXPR: case LE_EXPR: case GT_EXPR: