From patchwork Thu Oct 5 23:14:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Pinski X-Patchwork-Id: 1844184 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=YNzgqMNC; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; 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 [IPv6:2620:52:3:1:0:246e:9693:128c]) (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 4S1nTT1bHJz1yqF for ; Fri, 6 Oct 2023 10:15:06 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4B1AB3857009 for ; Thu, 5 Oct 2023 23:15:04 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) by sourceware.org (Postfix) with ESMTPS id 00DA23858D3C for ; Thu, 5 Oct 2023 23:14:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 00DA23858D3C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-68fb85afef4so1349273b3a.1 for ; Thu, 05 Oct 2023 16:14:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696547690; x=1697152490; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ou1oO1TAixKOCBkBvrF1CxSHn7QMJV2d5xTyYeX4dRI=; b=YNzgqMNC4APM/sDR35UutIBhjx2N340EZW7uh/VjAEPNkWvGH3hvM5M3Tmm2YHm+92 0jO/fowWkrNnOcmRAk6eKJHP5MU8hlIyWJpvgwgYXvoiUONrvZ6eDF32qL7G6bfEghYY 45F2ujiWRewwOJHdri3Lt3/oEwles/nbGQPaKWA/Io6MZMKONuB/DO3ln8MhGg5McjHd X/Q8ZTKmFraKsAsnZZdBel6n9L13YrSU2//NZKyoaame4pwNNflT6Q4rIw2xbglBBlJx 7u53+jqaKyQDmxmzYGTH6RIqpqNJfnvE0uXod5s7xkFcSiVbFJQQDYVmk/XGqtwJQnw6 9H7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696547690; x=1697152490; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ou1oO1TAixKOCBkBvrF1CxSHn7QMJV2d5xTyYeX4dRI=; b=FYAZw0eUOcJWkAXJW/YrX1VU80CEPMGNo0A+2ob2qndbVKEHt3G1SeHLdQzlCOarbG DWalYjftIdnSZig29o6P0WubCO7kTDRAaNMUsuoi25L3/MDvPD4kXPGV5P5tcfxv6AR3 OWUH/ptpV3BiMuxnVmeotM8nzhehJ9qqyrWEjgkko1dcsUO81J82ZjUAAJt/vEzSaEgF qxww0wH7zk5uWwVfI3FtBA6A4zfBWp0KInfVDBvoxtt07u+7Y3xkRrdfwvex48kgeNn6 Dvd0vSKPWXszjsOOOBhzeMguVmsXRA1FLhyFvPC4nw6W9uZRaDw94zDDUr7PDpV5CdSo E5bQ== X-Gm-Message-State: AOJu0YxC1ar0h4VpJ3VoHCWBicfd4BDOdhcvxGtnRdAbbdnnSDS2pH8N pBzTi1LiLAJ6EwUn77/M51woCNzPZ9GnHg== X-Google-Smtp-Source: AGHT+IEcmiCbLH6Mxs3HBEcKU2E6rWBN5EViWeYCazIlsoEapyoZyYcEJMpgZJaYiYUJmyJT7ajXAw== X-Received: by 2002:a05:6a21:778b:b0:164:1ad3:4325 with SMTP id bd11-20020a056a21778b00b001641ad34325mr6676956pzc.44.1696547690464; Thu, 05 Oct 2023 16:14:50 -0700 (PDT) Received: from xeond2.wrightpinski.org ([98.97.114.173]) by smtp.gmail.com with ESMTPSA id 20-20020a170902ee5400b001c61073b064sm2334621plo.69.2023.10.05.16.14.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 16:14:49 -0700 (PDT) From: Andrew Pinski To: gcc-patches@gcc.gnu.org Cc: Andrew Pinski Subject: [PATCH] MATCH: Fix infinite loop between `vec_cond(vec_cond(a, b, 0), c, d)` and `a & b` Date: Thu, 5 Oct 2023 16:14:46 -0700 Message-Id: <20231005231446.400239-1-pinskia@gmail.com> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 X-Spam-Status: No, score=-10.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, 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 Match has a pattern which converts `vec_cond(vec_cond(a,b,0), c, d)` into `vec_cond(a & b, c, d)` but since in this case a is a comparison fold will change `a & b` back into `vec_cond(a,b,0)` which causes an infinite loop. The best way to fix this is to enable the patterns for vec_cond(*,vec_cond,*) only for GIMPLE so we don't get an infinite loop for fold any more. Note this is a latent bug since these patterns were added in r11-2577-g229752afe3156a and was exposed by r14-3350-g47b833a9abe1 where now able to remove a VIEW_CONVERT_EXPR. OK? Bootstrapped and tested on x86_64-linux-gnu with no regressions. PR middle-end/111699 gcc/ChangeLog: * match.pd ((c ? a : b) op d, (c ? a : b) op (c ? d : e), (v ? w : 0) ? a : b, c1 ? c2 ? a : b : b): Enable only for GIMPLE. gcc/testsuite/ChangeLog: * gcc.c-torture/compile/pr111699-1.c: New test. --- gcc/match.pd | 5 +++++ gcc/testsuite/gcc.c-torture/compile/pr111699-1.c | 7 +++++++ 2 files changed, 12 insertions(+) create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr111699-1.c diff --git a/gcc/match.pd b/gcc/match.pd index 4bdd83e6e06..31bfd8b6b68 100644 --- a/gcc/match.pd +++ b/gcc/match.pd @@ -5045,6 +5045,10 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT) /* (v ? w : 0) ? a : b is just (v & w) ? a : b Currently disabled after pass lvec because ARM understands VEC_COND_EXPR but not a plain v==w fed to BIT_IOR_EXPR. */ +#if GIMPLE +/* These can only be done in gimple as fold likes to convert: + (CMP) & N into (CMP) ? N : 0 + and we try to match the same pattern again and again. */ (simplify (vec_cond (vec_cond:s @0 @3 integer_zerop) @1 @2) (if (optimize_vectors_before_lowering_p () && types_match (@0, @3)) @@ -5079,6 +5083,7 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT) (vec_cond @0 @3 (vec_cond:s @1 @2 @3)) (if (optimize_vectors_before_lowering_p () && types_match (@0, @1)) (vec_cond (bit_and (bit_not @0) @1) @2 @3))) +#endif /* Canonicalize mask ? { 0, ... } : { -1, ...} to ~mask if the mask types are compatible. */ diff --git a/gcc/testsuite/gcc.c-torture/compile/pr111699-1.c b/gcc/testsuite/gcc.c-torture/compile/pr111699-1.c new file mode 100644 index 00000000000..87b127ed199 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr111699-1.c @@ -0,0 +1,7 @@ +typedef unsigned char __attribute__((__vector_size__ (8))) V; + +void +foo (V *v) +{ + *v = (V) 0x107B9A7FF >= (*v <= 0); +}