From patchwork Fri May 31 12:11:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 1942087 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=tVmQU6zW; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=6gGGI1Pe; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Phpi5ktn; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=4SINdHO4; 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 4VrMSl68CWz20QB for ; Fri, 31 May 2024 22:12:39 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 225E53858288 for ; Fri, 31 May 2024 12:12:38 +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 [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id 396583858C60 for ; Fri, 31 May 2024 12:12:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 396583858C60 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 396583858C60 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1717157539; cv=none; b=vYNeMAHxPJ6KzDtjWs5xj0cdjN2BVXCNj63oIsQhE5Vf7oEVAvKepiB+SsFT/5U4IW97kNNtstRGTh3R9Dqcwzi90ZXJVb9F+2wx4DW/5Kd9IaaWmRs+7vCorNVMQJTghqn6Lgc8JSVKcgnO9r/9s/HtPduc1QHJTJuVU70p+uI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1717157539; c=relaxed/simple; bh=UXdpH/TgnRuMggDh7UOuxHU0DvUWeEIR2+DxRMsjVl8=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:MIME-Version:Message-Id; b=rDMC6Q6EuU0fWeVJPKK4QPviTa9THa21yIOlRuVMzY+gquEnDXrLkcHtvJY9RywRaFXO+RfB2Y14+qVCgQR7pKZ0D+q84qFw7aRKz2JQUPdHoGedbqQs9O/XpfJ+9pruk2szAYKABNQWAwS4cpZi3uBDtP03FE0FSD3Mf/TlpZ0= 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-out1.suse.de (Postfix) with ESMTPS id E62A121BA8 for ; Fri, 31 May 2024 12:12:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1717157536; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=ThC8SYpsNWf5nCs+ueq9lNw/RkaNbaq3Ai4gLQYVnMI=; b=tVmQU6zWBdi1naddJEe6IXJyBDhCOwRiQ91PXb8T16VZSUYMjOKTgwO8cgJ5rTvfES7khe OATBRqlgS9Ul86MbtvpM7iCK/GizIMe3NrGtPsssouRSdSNXYFhvqWFtQeMAVABdYTrita nEOo/AICjNl/U80KZNLE+x63M9A5jjk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1717157536; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=ThC8SYpsNWf5nCs+ueq9lNw/RkaNbaq3Ai4gLQYVnMI=; b=6gGGI1PeTSDVF1yJQkJEkFsJCxBvzlmzEyl6DCeHjpYhmfK3lMH170/hN07J3k27U0pBaP XrChSLFPUobSijDQ== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Phpi5ktn; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=4SINdHO4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1717157534; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=ThC8SYpsNWf5nCs+ueq9lNw/RkaNbaq3Ai4gLQYVnMI=; b=Phpi5ktn0C4Dls3y7B6E2HSc02ZGQuPNgcSxs9I0NqFbrhSFp7wdoBe5LjtjZj6yJ6DDFN 8vQR2uQsrOWkzetKkBBI+VnDWv5KTnN7pUnaaWhloaaS2Bh7eJN8w6Ik47epzojCs40BuM 94irIztMuDB7LZbielpPBxDEQyb8A34= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1717157534; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=ThC8SYpsNWf5nCs+ueq9lNw/RkaNbaq3Ai4gLQYVnMI=; b=4SINdHO4SmLxRKy9vEws77lT5EglHVX9TaWMptQo/1Z1ZAUGKQ6tKoy788R7pILmjUhKaA lM3o7QdCnt5A7fDQ== 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 CBCD6137C3 for ; Fri, 31 May 2024 12:12:14 +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 cxsPMJ6+WWZoTQAAD6G6ig (envelope-from ) for ; Fri, 31 May 2024 12:12:14 +0000 Date: Fri, 31 May 2024 14:11:43 +0200 (CEST) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/115278 - fix DSE in if-conversion wrt volatiles MIME-Version: 1.0 Message-Id: <20240531121214.CBCD6137C3@imap1.dmz-prg2.suse.org> X-Spam-Score: -6.51 X-Rspamd-Action: no action X-Rspamd-Queue-Id: E62A121BA8 X-Spam-Level: X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-6.51 / 50.00]; BAYES_HAM(-3.00)[100.00%]; DWL_DNSWL_MED(-2.00)[suse.de:dkim]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_ONE(0.00)[1]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_TLS_ALL(0.00)[]; MISSING_XM_UA(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:106:10:150:64:167:received,2a07:de40:b281:104:10:150:64:97:from]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; PREVIOUSLY_DELIVERED(0.00)[gcc-patches@gcc.gnu.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[tree-if-conv.cc:url, imap1.dmz-prg2.suse.org:helo, imap1.dmz-prg2.suse.org:rdns] 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, 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 The following adds the missing guard for volatile stores to the embedded DSE in the loop if-conversion pass. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. PR tree-optimization/115278 * tree-if-conv.cc (ifcvt_local_dce): Do not DSE volatile stores. * g++.dg/vect/pr115278.cc: New testcase. --- gcc/testsuite/g++.dg/vect/pr115278.cc | 38 +++++++++++++++++++++++++++ gcc/tree-if-conv.cc | 4 ++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/vect/pr115278.cc diff --git a/gcc/testsuite/g++.dg/vect/pr115278.cc b/gcc/testsuite/g++.dg/vect/pr115278.cc new file mode 100644 index 00000000000..331075fb278 --- /dev/null +++ b/gcc/testsuite/g++.dg/vect/pr115278.cc @@ -0,0 +1,38 @@ +// { dg-do compile } +// { dg-require-effective-target c++11 } +// { dg-additional-options "-fdump-tree-optimized" } + +#include + +const int runs = 92; + +union BitfieldStructUnion { + struct { + uint64_t a : 17; + uint64_t padding: 39; + uint64_t b : 8; + } __attribute__((packed)); + + struct { + uint32_t value_low; + uint32_t value_high; + } __attribute__((packed)); + + BitfieldStructUnion(uint32_t value_low, uint32_t value_high) : value_low(value_low), value_high(value_high) {} +}; + +volatile uint32_t *WRITE = (volatile unsigned*)0x42; + +void buggy() { + for (int i = 0; i < runs; i++) { + BitfieldStructUnion rt{*WRITE, *WRITE}; + + rt.a = 99; + rt.b = 1; + + *WRITE = rt.value_low; + *WRITE = rt.value_high; + } +} + +// { dg-final { scan-tree-dump-times "\\\*WRITE\[^\r\n\]* ={v} " 2 "optimized" } } diff --git a/gcc/tree-if-conv.cc b/gcc/tree-if-conv.cc index 09d99fb9dda..c4c3ed41a44 100644 --- a/gcc/tree-if-conv.cc +++ b/gcc/tree-if-conv.cc @@ -3381,7 +3381,9 @@ ifcvt_local_dce (class loop *loop) gimple_stmt_iterator gsiprev = gsi; gsi_prev (&gsiprev); stmt = gsi_stmt (gsi); - if (gimple_store_p (stmt) && gimple_vdef (stmt)) + if (!gimple_has_volatile_ops (stmt) + && gimple_store_p (stmt) + && gimple_vdef (stmt)) { tree lhs = gimple_get_lhs (stmt); ao_ref write;