From patchwork Sat Jan 20 20:52:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jambor X-Patchwork-Id: 1888806 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.cz header.i=@suse.cz header.a=rsa-sha256 header.s=susede2_rsa header.b=K/iKGzjW; dkim=pass header.d=suse.cz header.i=@suse.cz header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=bVs0Us2J; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.a=rsa-sha256 header.s=susede2_rsa header.b=K/iKGzjW; dkim=neutral header.d=suse.cz header.i=@suse.cz header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=bVs0Us2J; 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 4THTFW1JKLz1yPJ for ; Sun, 21 Jan 2024 07:52:31 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F292F3858430 for ; Sat, 20 Jan 2024 20:52:28 +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 [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id C1DE7385840C for ; Sat, 20 Jan 2024 20:52:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C1DE7385840C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.cz ARC-Filter: OpenARC Filter v1.0.0 sourceware.org C1DE7385840C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705783930; cv=none; b=RCMD5VH0pAHzhT8mEvWhhB6BbgYXJCuXkWLgiQz3Uha2/ZapiiukINBcjQhM77rRtG3ZMAg+4IuzR0L7zDbIxjyf+fjWoPq5ST41CBoeTqpn7lT8OZO+owN8UnRp80z3joet5+86ztSa7bT6nUufpLsf3i7fZiJVI/sOmbxDGHk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705783930; c=relaxed/simple; bh=8KHQY6XYUWO68078CSGE9oPIw7iR5/istGN00a32mOk=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=LW2BiGZBdRI/Pu9ahpG0g4S4KggsdRXe5zzqyk7HvcBISaHVe4bSLcykOphE6QaK0TIaugz7vDBwEkWyT614t31SFUVHqZxN27iUdN6tlGybsV4APLckjLsWs73AiSIoWahjVIJa1MrpdbHPc8mHCaeJNDxv/T2srV6d29tVQCM= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (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 3ED491FBA9; Sat, 20 Jan 2024 20:52:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1705783926; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=6UJxYp1shdJfGTWqiEUgmMJdZ/vZcDiGxI3dvrYPTw8=; b=K/iKGzjW3REQCHr6j5l51hGL7CEj3kjMfUz9l0ZNkxXezoK0jFW1CofwY4o3K4nRGKbGGD INQeRpmhz5XFv0V+FJ6Ttdows0tdYYGEMQyX4e54T9Ov5hhUOd4WvOQVpTlg6XX851yCtj yGTb/TM/6nQimL8kYF27HWDP2oksndM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1705783926; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=6UJxYp1shdJfGTWqiEUgmMJdZ/vZcDiGxI3dvrYPTw8=; b=bVs0Us2JDdYZA9J4rP+Ibyhy1FTLrXx9ky6FQN6wssobsOMGzb8uD3lTMCloITz1v5aVIk 0X8EECFFi29MQ5DQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1705783926; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=6UJxYp1shdJfGTWqiEUgmMJdZ/vZcDiGxI3dvrYPTw8=; b=K/iKGzjW3REQCHr6j5l51hGL7CEj3kjMfUz9l0ZNkxXezoK0jFW1CofwY4o3K4nRGKbGGD INQeRpmhz5XFv0V+FJ6Ttdows0tdYYGEMQyX4e54T9Ov5hhUOd4WvOQVpTlg6XX851yCtj yGTb/TM/6nQimL8kYF27HWDP2oksndM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1705783926; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=6UJxYp1shdJfGTWqiEUgmMJdZ/vZcDiGxI3dvrYPTw8=; b=bVs0Us2JDdYZA9J4rP+Ibyhy1FTLrXx9ky6FQN6wssobsOMGzb8uD3lTMCloITz1v5aVIk 0X8EECFFi29MQ5DQ== Received: from imap1.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 imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 2AE97136F5; Sat, 20 Jan 2024 20:52:06 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id I+s4CnYyrGXbdwAAD6G6ig (envelope-from ); Sat, 20 Jan 2024 20:52:06 +0000 From: Martin Jambor To: GCC Patches Cc: Jan Hubicka Subject: [PATCH] ipa-cp: Fix check for exceeding param_ipa_cp_value_list_size (PR 113490) User-Agent: Notmuch/0.38.1 (https://notmuchmail.org) Emacs/29.1 (x86_64-suse-linux-gnu) Date: Sat, 20 Jan 2024 21:52:05 +0100 Message-ID: MIME-Version: 1.0 Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b="K/iKGzjW"; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=bVs0Us2J X-Spamd-Result: default: False [-1.11 / 50.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[suse.cz:s=susede2_rsa,suse.cz:s=susede2_ed25519]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FROM_HAS_DN(0.00)[]; DWL_DNSWL_BLOCKED(0.00)[suse.cz:dkim]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:106:10:150:64:167:received]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_ALL(0.00)[]; MX_GOOD(-0.01)[]; RCPT_COUNT_TWO(0.00)[2]; DKIM_SIGNED(0.00)[suse.cz:s=susede2_rsa,suse.cz:s=susede2_ed25519]; INVALID_MSGID(1.70)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.cz:dkim,suse.cz:email]; DKIM_TRACE(0.00)[suse.cz:+]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; MID_RHS_NOT_FQDN(0.50)[]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%] X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Rspamd-Queue-Id: 3ED491FBA9 X-Spam-Level: X-Spam-Score: -1.11 X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, INVALID_MSGID, 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Hi, When the check for exceeding param_ipa_cp_value_list_size limit was modified to be ignored for generating values from self-recursive calls, it should have been changed from equal to, to equals toor is greater than. This omission manifests itself as PR 113490. When I examined the condition I also noticed that the parameter should come from the callee rather than the caller, since the value list is associated with the former and not the latter. In practice the limit is of course very likely to be the same, but I fixed this aspect of the condition too. I briefly audited all other uses of opt_for_fn in ipa-cp.cc and all the others looked OK. Bootstrapped and tested on x86_64-linux. OK for master? Thanks, Martin gcc/ChangeLog: 2024-01-19 Martin Jambor PR ipa/113490 * ipa-cp.cc (ipcp_lattice::add_value): Bail out if value count is equal or greater than the limit. Use the limit from the callee. gcc/testsuite/ChangeLog: 2024-01-19 Martin Jambor PR ipa/113490 * gcc.dg/ipa/pr113490.c: New test. --- gcc/ipa-cp.cc | 2 +- gcc/testsuite/gcc.dg/ipa/pr113490.c | 31 +++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/ipa/pr113490.c diff --git a/gcc/ipa-cp.cc b/gcc/ipa-cp.cc index b1e2a3a829a..e85477df32d 100644 --- a/gcc/ipa-cp.cc +++ b/gcc/ipa-cp.cc @@ -2298,7 +2298,7 @@ ipcp_lattice::add_value (valtype newval, cgraph_edge *cs, return false; } - if (!same_lat_gen_level && values_count == opt_for_fn (cs->caller->decl, + if (!same_lat_gen_level && values_count >= opt_for_fn (cs->callee->decl, param_ipa_cp_value_list_size)) { /* We can only free sources, not the values themselves, because sources diff --git a/gcc/testsuite/gcc.dg/ipa/pr113490.c b/gcc/testsuite/gcc.dg/ipa/pr113490.c new file mode 100644 index 00000000000..cffb0c5f639 --- /dev/null +++ b/gcc/testsuite/gcc.dg/ipa/pr113490.c @@ -0,0 +1,31 @@ +/* { dg-do compile } */ +/* { dg-options "-O3 -Wno-psabi" } */ + +typedef char A __attribute__((vector_size (64))); +typedef short B __attribute__((vector_size (64))); +typedef unsigned C __attribute__((vector_size (64))); +typedef long D __attribute__((vector_size (64))); +typedef __int128 E __attribute__((vector_size (64))); + +D bar1_D_0; +E bar4 (A, D); + +E +bar1 (C C_0) +{ + C_0 >>= 1; + bar4 ((A) C_0, bar1_D_0); + bar4 ((A) (E) {~0 }, (D) (A){ ~0 }); + bar4 ((A) (B) { ~0 }, (D) (C) { ~0 }); + bar1 ((C) (D) { 0, ~0}); + bar4 ((A) C_0, bar1_D_0); + (A) { bar1 ((C) { 7})[5] - C_0[63], bar4 ((A) (D) {~0}, (D) (C) { 0, ~0})[3]}; +} + +E +bar4 (A A_0, D D_0) +{ + bar1 ((C) A_0); + bar1 ((C) {5}); + bar1 ((C) D_0); +}