From patchwork Thu Nov 2 00:57:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "juzhe.zhong@rivai.ai" X-Patchwork-Id: 160744 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp53475vqu; Wed, 1 Nov 2023 17:58:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEMogWiVNrspSV2G7zd0ReMNsH8lFoaLooNpChcpAINJ9Hdcjc/ygHqH7kj+TCdEXJqWOCa X-Received: by 2002:a81:bc4c:0:b0:5af:a73f:53d3 with SMTP id b12-20020a81bc4c000000b005afa73f53d3mr16231718ywl.13.1698886699744; Wed, 01 Nov 2023 17:58:19 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1698886699; cv=pass; d=google.com; s=arc-20160816; b=GAMy6bvlMFZxNOorZ1mXrFvbwGX2hHKls+X7YV5Toj6ukfsxEa++hVTCprTus20BLP juOCjEfhq4wqRy6Wv4Qs4nFaPlJXpbbjbRmLhHTCbyA1Kce3gopX6JrgBUAovHcXMqVs NBD/jLr223o7cfcwO+TJ8HEvJtEqmxUcG5YGdmqztwaMRitXVAweD/l5lp9yniPUnYJC DxarhT4uwJjJRIHgFPF6wZjBMOKb8H3LcdQGgeV/+wdqt9/WYFQ6UwD1V1brOf2uDP7M 7BATvvyQqxSsnL9boh2DksRziTP0mOJA39l8juU494gRfcoh3+e8vMJATxzFJmJM3kK5 nH7Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:feedback-id :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:arc-filter:dmarc-filter:delivered-to; bh=XIXdSEBKHgjiuWwlJh92FfhtNSc60Hya493C+kjFj8U=; fh=Hxj0cw/2jAkyitv6gv3v4BQlApRvZwleU4172JThTNQ=; b=zbUXsUeJvauwnjSAKh2sdBT2sRFMoQXMGwEc9srLEeJMBWXQgv+nes0Y0lSF2xkzAD HbxNvko5+U1245yeWYf7ZogKr+44bYjlrlPiSuC69Vaxubn+KWxGUJ7mV8/yYKanT9yc pG65n2sKKgtQ2csM6wD6SGa4pHXysaD8KKJl3httZVQtTDu2uy59r+Wu+8GFICGm5rkt csp9AGnXKzwguPxVYffu0v/cpo8VycD9r7QXutAxh2/r6wpWVDx4+TbkU9p7JZklt+w1 OQ2ioIwsGHhouiwJlSi3+rtJdFpMSK1T5/rrIRMyrnMBQp37t1ojcFqI7H9Dph1e2H4u rs0w== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id i9-20020a0cd849000000b006585ee0fcfesi3506235qvj.74.2023.11.01.17.58.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Nov 2023 17:58:19 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7F4C33858408 for ; Thu, 2 Nov 2023 00:58:19 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtpbg151.qq.com (smtpbg151.qq.com [18.169.211.239]) by sourceware.org (Postfix) with ESMTPS id 2455E3858D32 for ; Thu, 2 Nov 2023 00:57:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2455E3858D32 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=rivai.ai Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=rivai.ai ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 2455E3858D32 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=18.169.211.239 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698886676; cv=none; b=cH2EwLH40OhoSiqiHF2JviAaurO6ANt67Z4E0vBpbryAcJWGFwiRlR7zINkdM5U/dZVyI8iO2pfSPZb6yOnUoIyeA10CnTMSVjZVvXRlXCtg8oRIHzgrAlcc6lRMJJlP/R55QFcvj+wJBN1I0rCFIn3EziXEZhXhVkaeYmUz/Io= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698886676; c=relaxed/simple; bh=UxjicRJsdCAB+vyu+dCck28bN0acIGdUyJpucrB59hc=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=GvepG4EH/iDyVUbUHVwIMbdFzgWTG14sk9SFtmdyMNaH1ZehMbKXsg+BD5+dW87e+eWh+L3X9Gopgq7QJNuxmICFTCbkCIE3n+hBvNwBMVjWEZqHJ3Ge8wRh5B4T4MUNj+deqUMjB8TAhO+RWv9EuaZqjLUG2XFWf1HensNDsac= ARC-Authentication-Results: i=1; server2.sourceware.org X-QQ-mid: bizesmtp88t1698886659t7imjaxx Received: from rios-cad121.hadoop.rioslab.org ( [58.60.1.9]) by bizesmtp.qq.com (ESMTP) with id ; Thu, 02 Nov 2023 08:57:38 +0800 (CST) X-QQ-SSF: 01400000000000G0V000000A0000000 X-QQ-FEAT: p8PN4UZ3Lys5a08O9mcyM6qnTQCoZCbngXpPxkmomaeC//DfESp9Flq8wNQWH bePkpdmWFfNSs8I/HCiUh/qS73wutskLDouqOvIFeyjXfCgXJvid/cfJwXVvfwn9LI08fyF jZS+2vSDQbKmxsOs5wPKKXyjZl9JLdWV4Sulyu6TUMgb8iNk3M0qaSsvJZOR3ZUD8gAXI3j DsP3dK1OteKMbAJ/U6liDIeB3fJ58cHJ5f1fjrXxLUNbmy3YZr6gSBiogmeSwvqFNg6D54Z Lw6icsx1wkh5QJPSzdUAH5qoIIWkpYdjB9qUDdg5MZHZWA03huTB3vXZxwDoJ2FwxeGVFSI sJsOgtfJpGF8roICZEpIOxD3CdSm0GZN+vrthb40TVrva3i8NNWdyZTe5Km/xp+3KsLcNMS X-QQ-GoodBg: 2 X-BIZMAIL-ID: 15848547157587018834 From: Juzhe-Zhong To: gcc-patches@gcc.gnu.org Cc: richard.sandiford@arm.com, rguenther@suse.de, Juzhe-Zhong Subject: [tree-optimization/111721] VECT: Support SLP for MASK_LEN_GATHER_LOAD with dummy mask Date: Thu, 2 Nov 2023 08:57:37 +0800 Message-Id: <20231102005737.2418307-1-juzhe.zhong@rivai.ai> X-Mailer: git-send-email 2.36.3 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:rivai.ai:qybglogicsvrgz:qybglogicsvrgz7a-one-0 X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, 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+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781411820149579471 X-GMAIL-MSGID: 1781411820149579471 This patch fixes following FAILs for RVV: FAIL: gcc.dg/vect/vect-gather-1.c -flto -ffat-lto-objects scan-tree-dump vect "Loop contains only SLP stmts" FAIL: gcc.dg/vect/vect-gather-1.c scan-tree-dump vect "Loop contains only SLP stmts" Bootstrap on X86 and regtest passed. Tested on aarch64 passed. Ok for trunk ? PR tree-optimization/111721 gcc/ChangeLog: * tree-vect-slp.cc (vect_get_and_check_slp_defs): Support SLP for dummy mask -1. * tree-vect-stmts.cc (vectorizable_load): Ditto. --- gcc/tree-vect-slp.cc | 14 ++++++++++++-- gcc/tree-vect-stmts.cc | 8 +++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/gcc/tree-vect-slp.cc b/gcc/tree-vect-slp.cc index 43d742e3c92..23ca0318e31 100644 --- a/gcc/tree-vect-slp.cc +++ b/gcc/tree-vect-slp.cc @@ -756,8 +756,7 @@ vect_get_and_check_slp_defs (vec_info *vinfo, unsigned char swap, { tree type = TREE_TYPE (oprnd); dt = dts[i]; - if ((dt == vect_constant_def - || dt == vect_external_def) + if (dt == vect_external_def && !GET_MODE_SIZE (vinfo->vector_mode).is_constant () && (TREE_CODE (type) == BOOLEAN_TYPE || !can_duplicate_and_interleave_p (vinfo, stmts.length (), @@ -769,6 +768,17 @@ vect_get_and_check_slp_defs (vec_info *vinfo, unsigned char swap, "for variable-length SLP %T\n", oprnd); return -1; } + if (dt == vect_constant_def + && !GET_MODE_SIZE (vinfo->vector_mode).is_constant () + && !can_duplicate_and_interleave_p (vinfo, stmts.length (), type)) + { + if (dump_enabled_p ()) + dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location, + "Build SLP failed: invalid type of def " + "for variable-length SLP %T\n", + oprnd); + return -1; + } /* For the swapping logic below force vect_reduction_def for the reduction op in a SLP reduction group. */ diff --git a/gcc/tree-vect-stmts.cc b/gcc/tree-vect-stmts.cc index 6ce4868d3e1..6c47121e158 100644 --- a/gcc/tree-vect-stmts.cc +++ b/gcc/tree-vect-stmts.cc @@ -9859,10 +9859,16 @@ vectorizable_load (vec_info *vinfo, mask_index = internal_fn_mask_index (ifn); if (mask_index >= 0 && slp_node) mask_index = vect_slp_child_index_for_operand (call, mask_index); + slp_tree slp_op = NULL; if (mask_index >= 0 && !vect_check_scalar_mask (vinfo, stmt_info, slp_node, mask_index, - &mask, NULL, &mask_dt, &mask_vectype)) + &mask, &slp_op, &mask_dt, &mask_vectype)) return false; + /* MASK_LEN_GATHER_LOAD dummy mask -1 should always match the + MASK_VECTYPE. */ + if (mask_index >= 0 && slp_node && mask_dt == vect_constant_def + && !vect_maybe_update_slp_op_vectype (slp_op, mask_vectype)) + gcc_unreachable (); } tree vectype = STMT_VINFO_VECTYPE (stmt_info);