From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 11F623858D28 for ; Mon, 6 May 2024 12:14:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 11F623858D28 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 11F623858D28 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=1714997693; cv=none; b=gaEC0dKeWQdNk8vZ1wkUfZBlJ0QEOVlxFOtCKjz2Fzgf7vufW1GhQ5gYcemw2/Q66yoAu0D1SbpJlN2ABjrQymVWx8bxmbtFFdXaDn17lS4T3Xm8hve/YmeyBdeT1Ts6QTnj1dAr+Hl4ZigNDaNDYohbXMrBU5DqiOMbhgcNT88= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714997693; c=relaxed/simple; bh=NIVsM9gTVWhCX8jaQfkPSNoPT1PR/izyf44Io2Rbijk=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:MIME-Version; b=hbUkJg/4MdGZtC0bxExT41Lc6a/Rds2kFsLN2gOFkzxIIczYsH0ljxd3oEC9+GaEs6eZXc1zEMcK4HOkEz5p+Xj0nINlG73UAXcVAN6dqcOSFwJkrPgKpcUZimPbHOwgaJb4p6AKyRMMUEPsru1CEEyXCdtbdgkJPJDI4qnfzAg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from [10.168.5.241] (unknown [10.168.5.241]) (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 DA2515FCD0 for ; Mon, 6 May 2024 12:14:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1714997691; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=rTJdipTHLZeBATH175ZTVu6Xbk9bahryR4WaBgEVHQo=; b=Sy5PKOuNRpCg3k3hQlILbzct8KRgBJ0LtsaGUE75GPbLJrw3l+KPBO0V65cT7xNLNMl5EI PRj9jXD874fKCy9SUxOkKYpC0BEGbT+HzBqC3ZPzvsEI3oP5vKThYQntboO/+x7MaaZ/BC F6PNtRoYcLpnFb/K1p5AJ8h1c07Q9eA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1714997691; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=rTJdipTHLZeBATH175ZTVu6Xbk9bahryR4WaBgEVHQo=; b=2IPW9OW5/W4P+knvXG4a+ZGwAbUg0e10VeT+81kFpeT/H8uhKle9/lJyWa/vJPinTzv2Ls r943pvBhQzvZgmDA== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1714997689; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=rTJdipTHLZeBATH175ZTVu6Xbk9bahryR4WaBgEVHQo=; b=p2Tos3Xsu+G/6iiNmrE6rTpgYu+o4agdN/TQQQP9iqX35chy7BtYVbMrsAtbKp+3PaeDh4 3q0Pwfjl8ug88sAqOuYsFz7mhLExOw6gc5S8dk3Kady5arMdfgwQjVbkJYLdwShYB1yNXP vQHLA/AQWfW/kS03ogzQ7EyDNVPiVNA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1714997689; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=rTJdipTHLZeBATH175ZTVu6Xbk9bahryR4WaBgEVHQo=; b=ycSbDQIxVdIMaocpkULM4gM0AWKzp0ABEu+hrEXR+PzZrCb9o+tYc0yhYI5oVw4jptelgo RKgVUvLryvLDCzDA== Date: Mon, 6 May 2024 14:14:49 +0200 (CEST) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] Complete ao_ref_init_from_vn_reference for all refs MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Spam-Level: X-Spamd-Result: default: False [0.94 / 50.00]; MISSING_MID(2.50)[]; BAYES_HAM(-0.66)[82.82%]; NEURAL_HAM_LONG(-0.64)[-0.635]; NEURAL_HAM_SHORT(-0.16)[-0.810]; MIME_GOOD(-0.10)[text/plain]; MISSING_XM_UA(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_COUNT_ZERO(0.00)[0]; FROM_HAS_DN(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; TO_DN_NONE(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[tree-ssa-sccvn.cc:url] X-Spam-Score: 0.94 X-Spam-Status: No, score=-10.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,MISSING_MID,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 List-Id: Message-ID: <20240506121449.tk1RYy2eFauF1mfvelbuSogyW0O9cc-1rKPZQHdvY0M@z> This makes sure we can create ao_refs from all VN operands we create. Bootstrapped and tested on x86_64-unknown-linux-gnu. Will push later. Richard. * tree-ssa-sccvn.cc (ao_ref_init_from_vn_reference): Add TARGET_MEM_REF support. Handle more bases. --- gcc/tree-ssa-sccvn.cc | 51 ++++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/gcc/tree-ssa-sccvn.cc b/gcc/tree-ssa-sccvn.cc index 02c3bd5f538..fbbfa557833 100644 --- a/gcc/tree-ssa-sccvn.cc +++ b/gcc/tree-ssa-sccvn.cc @@ -1148,8 +1148,29 @@ ao_ref_init_from_vn_reference (ao_ref *ref, { switch (op->opcode) { - /* These may be in the reference ops, but we cannot do anything - sensible with them here. */ + case CALL_EXPR: + return false; + + /* Record the base objects. */ + case MEM_REF: + *op0_p = build2 (MEM_REF, op->type, + NULL_TREE, op->op0); + MR_DEPENDENCE_CLIQUE (*op0_p) = op->clique; + MR_DEPENDENCE_BASE (*op0_p) = op->base; + op0_p = &TREE_OPERAND (*op0_p, 0); + break; + + case TARGET_MEM_REF: + *op0_p = build5 (TARGET_MEM_REF, op->type, + NULL_TREE, op->op2, op->op0, + op->op1, ops[i+1].op0); + MR_DEPENDENCE_CLIQUE (*op0_p) = op->clique; + MR_DEPENDENCE_BASE (*op0_p) = op->base; + op0_p = &TREE_OPERAND (*op0_p, 0); + ++i; + break; + + /* Unwrap some of the wrapped decls. */ case ADDR_EXPR: /* Apart from ADDR_EXPR arguments to MEM_REF. */ if (base != NULL_TREE @@ -1170,21 +1191,16 @@ ao_ref_init_from_vn_reference (ao_ref *ref, break; } /* Fallthru. */ - case CALL_EXPR: - return false; - - /* Record the base objects. */ - case MEM_REF: - *op0_p = build2 (MEM_REF, op->type, - NULL_TREE, op->op0); - MR_DEPENDENCE_CLIQUE (*op0_p) = op->clique; - MR_DEPENDENCE_BASE (*op0_p) = op->base; - op0_p = &TREE_OPERAND (*op0_p, 0); - break; - - case VAR_DECL: case PARM_DECL: + case CONST_DECL: case RESULT_DECL: + /* ??? We shouldn't see these, but un-canonicalize what + copy_reference_ops_from_ref does when visiting MEM_REF. */ + case VAR_DECL: + /* ??? And for this only have DECL_HARD_REGISTER. */ + case STRING_CST: + /* This can show up in ARRAY_REF bases. */ + case INTEGER_CST: case SSA_NAME: *op0_p = op->op0; op0_p = NULL; @@ -1234,13 +1250,12 @@ ao_ref_init_from_vn_reference (ao_ref *ref, case VIEW_CONVERT_EXPR: break; - case STRING_CST: - case INTEGER_CST: + case POLY_INT_CST: case COMPLEX_CST: case VECTOR_CST: case REAL_CST: + case FIXED_CST: case CONSTRUCTOR: - case CONST_DECL: return false; default: -- 2.35.3