From patchwork Thu Jan 11 13:58:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 1885622 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=vmlVFCKC; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=dEyrZgPX; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=vmlVFCKC; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=dEyrZgPX; 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 4T9mc60dbtz1yPp for ; Fri, 12 Jan 2024 01:03:49 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9B80A385770D for ; Thu, 11 Jan 2024 14:03:47 +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 1A28F3858015 for ; Thu, 11 Jan 2024 14:03:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1A28F3858015 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 1A28F3858015 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=1704981807; cv=none; b=IyEN1GrG5msyPtgN5PjDXAY0zwe2Akfd4zC4NOxRgjT1Y9euILF3hcMM1/FxWIKY+hgbwz4l7/O/zmGYjWN6Fy4QJ295475rqo5wF7XoRPCYicwiVRoNh6mSknKondPzGBKI6UvxrEDUZncDhUhtRJ1Qf36Ti4KGJtbvKRaYdNY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704981807; c=relaxed/simple; bh=27sldhVOrWow5kTR23O/qeuCiC+UMC/D2pbTTxdjUTo=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:MIME-Version; b=bQc0lX/VIqIUsTriMHirZMLqklsRbEY9V3JuzRaqqYBug2eSA+quU61LrjmD4Ss8SEzSqrMw/+PVvZrcyxFWbfLy8e/T8twW0Ryr0sq9oepUYLLC6RnkUziDpzzS9rFLk4mBVAboNgGjpSzSTmXd+Kn1Qaxp6L8/nquXZC3jcAg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from [10.168.4.150] (unknown [10.168.4.150]) (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 F27071FBB0; Thu, 11 Jan 2024 14:03:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1704981805; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=ybHDpmkoC5pzDiG1Oe9dAXOvKSz7Z52cR/CCCunOaEE=; b=vmlVFCKChg2oKrMfA6aJ/dqUx9AQMeSTTPJ/nnTi7m1AypcAAOnzPIAU/HlbDvSW7Vh95A Qfzb3J8d/4ZA3kKijwNjkX4OmnMhT3W2NAbBU07Vsv6ah3Xt1nrjcu9nxKuVp6oVHf6Bzm W8UH6soghYus1rRaFUnpGVGFJKQ8GZc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1704981805; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=ybHDpmkoC5pzDiG1Oe9dAXOvKSz7Z52cR/CCCunOaEE=; b=dEyrZgPXluE7CK8sczqPMe7JKGz3fn44qqO+iF2CzzUA7znJBYntyoh29kr8MJLSi7nZir Iz8ypIaUkX13aBAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1704981805; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=ybHDpmkoC5pzDiG1Oe9dAXOvKSz7Z52cR/CCCunOaEE=; b=vmlVFCKChg2oKrMfA6aJ/dqUx9AQMeSTTPJ/nnTi7m1AypcAAOnzPIAU/HlbDvSW7Vh95A Qfzb3J8d/4ZA3kKijwNjkX4OmnMhT3W2NAbBU07Vsv6ah3Xt1nrjcu9nxKuVp6oVHf6Bzm W8UH6soghYus1rRaFUnpGVGFJKQ8GZc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1704981805; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=ybHDpmkoC5pzDiG1Oe9dAXOvKSz7Z52cR/CCCunOaEE=; b=dEyrZgPXluE7CK8sczqPMe7JKGz3fn44qqO+iF2CzzUA7znJBYntyoh29kr8MJLSi7nZir Iz8ypIaUkX13aBAQ== Date: Thu, 11 Jan 2024 14:58:23 +0100 (CET) From: Richard Biener To: gcc-patches@gcc.gnu.org cc: krebbel@linux.ibm.com Subject: [PATCH] [s390] target/112280 - properly guard permute query MIME-Version: 1.0 Authentication-Results: smtp-out2.suse.de; none X-Spamd-Result: default: False [2.06 / 50.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; MISSING_MID(2.50)[]; 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]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; BAYES_HAM(-0.34)[76.22%] X-Spam-Score: 2.06 X-Spam-Status: No, score=-10.8 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, 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 Message-Id: <20240111140347.9B80A385770D@sourceware.org> The following adds guards avoiding code generation to expand_perm_as_a_vlbr_vstbr_candidate when d.testing_p. Built and tested on the testcase in the PR. OK to push as obvious? Otherwise please pick up, test and push. Thanks, Richard. PR target/112280 * config/s390/s390.cc (expand_perm_as_a_vlbr_vstbr_candidate): Do not generate code when d.testing_p. --- gcc/config/s390/s390.cc | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/gcc/config/s390/s390.cc b/gcc/config/s390/s390.cc index 748ad9cd932..f182c26e78b 100644 --- a/gcc/config/s390/s390.cc +++ b/gcc/config/s390/s390.cc @@ -17867,33 +17867,45 @@ expand_perm_as_a_vlbr_vstbr_candidate (const struct expand_vec_perm_d &d) if (memcmp (d.perm, perm[0], MAX_VECT_LEN) == 0) { - rtx target = gen_rtx_SUBREG (V8HImode, d.target, 0); - rtx op0 = gen_rtx_SUBREG (V8HImode, d.op0, 0); - emit_insn (gen_bswapv8hi (target, op0)); + if (!d.testing_p) + { + rtx target = gen_rtx_SUBREG (V8HImode, d.target, 0); + rtx op0 = gen_rtx_SUBREG (V8HImode, d.op0, 0); + emit_insn (gen_bswapv8hi (target, op0)); + } return true; } if (memcmp (d.perm, perm[1], MAX_VECT_LEN) == 0) { - rtx target = gen_rtx_SUBREG (V4SImode, d.target, 0); - rtx op0 = gen_rtx_SUBREG (V4SImode, d.op0, 0); - emit_insn (gen_bswapv4si (target, op0)); + if (!d.testing_p) + { + rtx target = gen_rtx_SUBREG (V4SImode, d.target, 0); + rtx op0 = gen_rtx_SUBREG (V4SImode, d.op0, 0); + emit_insn (gen_bswapv4si (target, op0)); + } return true; } if (memcmp (d.perm, perm[2], MAX_VECT_LEN) == 0) { - rtx target = gen_rtx_SUBREG (V2DImode, d.target, 0); - rtx op0 = gen_rtx_SUBREG (V2DImode, d.op0, 0); - emit_insn (gen_bswapv2di (target, op0)); + if (!d.testing_p) + { + rtx target = gen_rtx_SUBREG (V2DImode, d.target, 0); + rtx op0 = gen_rtx_SUBREG (V2DImode, d.op0, 0); + emit_insn (gen_bswapv2di (target, op0)); + } return true; } if (memcmp (d.perm, perm[3], MAX_VECT_LEN) == 0) { - rtx target = gen_rtx_SUBREG (V1TImode, d.target, 0); - rtx op0 = gen_rtx_SUBREG (V1TImode, d.op0, 0); - emit_insn (gen_bswapv1ti (target, op0)); + if (!d.testing_p) + { + rtx target = gen_rtx_SUBREG (V1TImode, d.target, 0); + rtx op0 = gen_rtx_SUBREG (V1TImode, d.op0, 0); + emit_insn (gen_bswapv1ti (target, op0)); + } return true; }