From patchwork Mon Dec 4 09:35:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 81263 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 6ABE43857BAC for ; Mon, 4 Dec 2023 09:35:24 +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 15C3D3858410 for ; Mon, 4 Dec 2023 09:35:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 15C3D3858410 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 15C3D3858410 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=1701682509; cv=none; b=ojvjNYNsGY5wwrNej1n3cUDOvFbxROM7pTQPt+vY8ghImFesOE79WmhwtMKOP31wMjQc5ok2rqKr2LAzE6r67oo1OWb3kfXNlh1RueuIbDb1NjPANMusQ9YNN1VrDGMZ7J4Ucu0gQVT7ksG7CJszUXNvonN6pUXmqTQNWc/zOhk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701682509; c=relaxed/simple; bh=8IKVShaEeWXXDb5okW6I+lvIbdKGXJojWWf6iDSEozw=; h=DKIM-Signature:DKIM-Signature:Date:From:To:Subject:MIME-Version: Message-Id; b=NBqPeIy0tGXGAN3+dk2sxkzaqi4j0GDstsCMlp8GbXYAcxEOJcSbxDHIhFkeCxkwpvWmSdwRFuGbVcE+4I8qehoYMXBCNpk6V/s/fhx68gdresJP5mmDixavvM2cxo4vhOKIldbtEIINN4SHzUnGTmfqpJM5zj4ChuLHOZtD/EA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap2.dmz-prg2.suse.org (imap2.dmz-prg2.suse.org [10.150.64.98]) (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 1706E1FE5F; Mon, 4 Dec 2023 09:35:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1701682507; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=Z2p81qKSXTA9n6C+ZDMh2MPdIKCvsAVn5m+8hH5ucBw=; b=0N6WK2tS0XiUDtlTwS4RrH5v/66pFH7Vp6Z7vnwLHisb6CSO7iOh140Y9aWpfkwGNvoxxc fGQ7s9X5QTh/FEX4A2T4iafY9mDF7FixJy+fzyRNKjzr7QEtfrS2Omc+pZ6s7L5DJA7w/R AVfgUGbfceWczv8vJnWb3cWB1jEcdEw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1701682507; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=Z2p81qKSXTA9n6C+ZDMh2MPdIKCvsAVn5m+8hH5ucBw=; b=0FAGe8ea8zew+LU7jzc14o+89ZrQa+cw0b/LUR1jSMAWaBCd7DfuKqNZNaX1ffjKeC4wIB oSulrtmA0EBPKKCA== Received: from imap2.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 imap2.dmz-prg2.suse.org (Postfix) with ESMTPS id E9DA913588; Mon, 4 Dec 2023 09:35:06 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap2.dmz-prg2.suse.org with ESMTPSA id 2pNiN0qdbWUcMQAAn2gu4w (envelope-from ); Mon, 04 Dec 2023 09:35:06 +0000 Date: Mon, 4 Dec 2023 10:35:06 +0100 (CET) From: Richard Biener To: gcc-patches@gcc.gnu.org cc: "Joseph S. Myers" Subject: [PATCH 1/2][RFC] middle-end/112830 - memcpy expansion drops address-spaces MIME-Version: 1.0 Message-Id: <20231204093506.E9DA913588@imap2.dmz-prg2.suse.org> Authentication-Results: smtp-out2.suse.de; none X-Spam-Level: X-Spam-Score: -4.10 X-Spamd-Result: default: False [-4.10 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCPT_COUNT_TWO(0.00)[2]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%] X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, 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+patchwork=sourceware.org@gcc.gnu.org The following makes sure we are not losing address-space info when expanding a __builtin_memcpy (synthesized by gimplification, which _might_ be the other actual problem). The issue is with get_memory_rtx which is also used by other builtin expansions but is not aware of address-spaces. The following fixes that which resolves an ICE with AVR and properly dispatches to inline expansion then in emit_block_move_hints. The alternative, to not intoduce memcpy by gimplification is possible but IL verification rejects WITH_SIZE_EXPR as part of GIMPLE assignments, removing that restriction also "works" (for the testcase). Alternative is in [2/2]. Sofar untested, will test on x86_64 - in principle I'd prefer 2/2. Richard. PR middle-end/112830 * builtins.cc (get_memory_rtx): Make address-space aware. * gcc.target/avr/pr112830.c: New testcase. --- gcc/builtins.cc | 10 +++++++--- gcc/testsuite/gcc.target/avr/pr112830.c | 11 +++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.target/avr/pr112830.c diff --git a/gcc/builtins.cc b/gcc/builtins.cc index 4fc58a0bda9..05c50b782d7 100644 --- a/gcc/builtins.cc +++ b/gcc/builtins.cc @@ -1353,7 +1353,8 @@ get_memory_rtx (tree exp, tree len) exp = TREE_OPERAND (exp, 0); addr = expand_expr (orig_exp, NULL_RTX, ptr_mode, EXPAND_NORMAL); - mem = gen_rtx_MEM (BLKmode, memory_address (BLKmode, addr)); + addr_space_t as = TYPE_ADDR_SPACE (TREE_TYPE (TREE_TYPE (exp))); + mem = gen_rtx_MEM (BLKmode, memory_address_addr_space (BLKmode, addr, as)); /* Get an expression we can use to find the attributes to assign to MEM. First remove any nops. */ @@ -1363,8 +1364,11 @@ get_memory_rtx (tree exp, tree len) /* Build a MEM_REF representing the whole accessed area as a byte blob, (as builtin stringops may alias with anything). */ + tree ctype = char_type_node; + if (!ADDR_SPACE_GENERIC_P (as)) + ctype = build_qualified_type (ctype, ENCODE_QUAL_ADDR_SPACE (as)); exp = fold_build2 (MEM_REF, - build_array_type (char_type_node, + build_array_type (ctype, build_range_type (sizetype, size_one_node, len)), exp, build_int_cst (ptr_type_node, 0)); @@ -1381,7 +1385,7 @@ get_memory_rtx (tree exp, tree len) unsigned int align = get_pointer_alignment (TREE_OPERAND (exp, 0)); exp = build_fold_addr_expr (base); exp = fold_build2 (MEM_REF, - build_array_type (char_type_node, + build_array_type (ctype, build_range_type (sizetype, size_zero_node, NULL)), diff --git a/gcc/testsuite/gcc.target/avr/pr112830.c b/gcc/testsuite/gcc.target/avr/pr112830.c new file mode 100644 index 00000000000..576107b9909 --- /dev/null +++ b/gcc/testsuite/gcc.target/avr/pr112830.c @@ -0,0 +1,11 @@ +/* { dg-do compile } */ + +typedef __SIZE_TYPE__ size_t; + +void copy_n (void *vdst, const __memx void *vsrc, size_t n) +{ + typedef struct { char a[n]; } T; + T *dst = (T*) vdst; + const __memx T *src = (const __memx T*) vsrc; + *dst = *src; +}