From patchwork Wed Aug 23 02:42:01 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: 136626 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp199428vqm; Tue, 22 Aug 2023 19:42:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEUT2WY9pkpTz0ySXkLsrlAdPEVtPafTg8banf9L+GtJR8Wbsstg4PXUjJSzi6yhVjz07rX X-Received: by 2002:a17:906:224c:b0:9a1:b144:30eb with SMTP id 12-20020a170906224c00b009a1b14430ebmr3581789ejr.54.1692758564345; Tue, 22 Aug 2023 19:42:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692758564; cv=none; d=google.com; s=arc-20160816; b=o7T8mSpxLVviH+4koqm3TyvLQU1hPhPKvUwxfBYfAMyqvOHhzwQ6U11pUrAJ/5PYZ2 cnVmVdWQUYAFfs4SsoLYGM5voExehmNRmcr4eAbNsD55fS4bzP7sqAJ/lexBi1K/w5Cz FsvjJuz5v3XalfuCOfNrbitU7h0N/JTbc+ckHbTCnj90/wB4e3ByUsC5Q19SSbuQxRTe wbsYKR2r0qrf+3Ufgw3b/B9fVoHP6LsgKnGmVmYNj/M6JXp+wutXop4QimupM6T0+pQd R8n6xMSToGqgacyAufj+xoFIx1xJTfT+2c6hjkpftOSfxTpTb2CJTQWTksU6ZzcyVqs4 urUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender: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:dmarc-filter:delivered-to; bh=x/LI0BmL40tSwwoMO5XbtBh8wmWnhhgJts3OpT6dIyc=; fh=NF4ZuEwBSZUzhDQca3vBRUazRF6p5arhTIdSttTSvE8=; b=SxC/Uawt3d4g1r0CjoOLI7vPjKKYgpyAQROSUWTGRVHl17Um25Pc5c/0M2tlL2CxOk jWrmMLuxd0J0ihL5Xs/GBGh5KMDSF3O6xBzGMKImf37Bllb/5sMaZC+OAChqKjJ7D9QZ jDJWh6tJzKtqASi07BkQIcaKs8NqufRI355isjga4lESm4VwPD0gcd3RuehjHIYuNm46 oHfvjmAzKsoOvn2DUeEn8dwoRlbpHE4d7QkmF0hwt7kLYboTSqfJdqv7tg61toox/ksu pMN/v/AG3JiRLCcpHinMs/vSUSYlrFRbRi5Vp3LJGmBu5/sbj5RX41gu6QvY2DKGxlAz zXWw== ARC-Authentication-Results: i=1; mx.google.com; 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 (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id qq28-20020a17090720dc00b0099bd19fe601si8334600ejb.533.2023.08.22.19.42.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Aug 2023 19:42:44 -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; 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 A3222385C6EB for ; Wed, 23 Aug 2023 02:42:40 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtpbgbr1.qq.com (smtpbgbr1.qq.com [54.207.19.206]) by sourceware.org (Postfix) with ESMTPS id BCC4E3857C41 for ; Wed, 23 Aug 2023 02:42:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BCC4E3857C41 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=rivai.ai Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=rivai.ai X-QQ-mid: bizesmtp83t1692758524t3658n5v Received: from rios-cad122.hadoop.rioslab.org ( [58.60.1.8]) by bizesmtp.qq.com (ESMTP) with id ; Wed, 23 Aug 2023 10:42:03 +0800 (CST) X-QQ-SSF: 01400000000000G0V000000A0000000 X-QQ-FEAT: Fc2LLDWeHZ/r8u/jzEoskpN+AyBMIZU7ibOz8cJmc7RkMIH/pHri00+c2L/JB 8xsclmwSgYAW5Y9zieEldodyEm5t/dYd8YDjrNKugSpDQlhFm1XLIO0+IxAxKZJCxboZ8hJ d3A/MOT2KMKwsrNoRA694inkj12JNluSlhY+rgfoPRA456FUTdXbWpqk5pTvOplQhCvRiqJ euCkIQc2sOOcUREFdNR7hRb1GE+ksA3sk0wVfbSRaDxA05w2A9C65+nCzB0y+P1VvQovujH +DdWt1JjRDSKyo0z+rOKiOQbCYtgfD0J7+zSBCJ7v39sdZCEt/dUKOxH0n3etq09JQQhPiy EGol80FnlJtd2FcJlLAZvDRjH5jq2tCSN0Jo/0SBo7cRpckANRD8QEicpLuh5rB+0FrzYFb psOVMJRCG0U= X-QQ-GoodBg: 2 X-BIZMAIL-ID: 5844556417032370543 From: Juzhe-Zhong To: gcc-patches@gcc.gnu.org Cc: kito.cheng@gmail.com, kito.cheng@sifive.com, Juzhe-Zhong Subject: [PATCH] RISC-V: Fix potential ICE of global vsetvl elimination Date: Wed, 23 Aug 2023 10:42:01 +0800 Message-Id: <20230823024201.3507755-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=-10.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 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 Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1774986003974555513 X-GMAIL-MSGID: 1774986003974555513 Committed for following VSETVL refactor patch to make V2 patch easier to review. gcc/ChangeLog: * config/riscv/riscv-vsetvl.cc (pass_vsetvl::global_eliminate_vsetvl_insn): Fix potential ICE. --- gcc/config/riscv/riscv-vsetvl.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gcc/config/riscv/riscv-vsetvl.cc b/gcc/config/riscv/riscv-vsetvl.cc index ec1aaa4b442..f7558cad2e2 100644 --- a/gcc/config/riscv/riscv-vsetvl.cc +++ b/gcc/config/riscv/riscv-vsetvl.cc @@ -4383,7 +4383,7 @@ pass_vsetvl::global_eliminate_vsetvl_insn (const bb_info *bb) const unsigned int bb_index; sbitmap_iterator sbi; - rtx avl = get_avl (dem.get_insn ()->rtl ()); + rtx avl = dem.get_avl (); hash_set sets = get_all_sets (dem.get_avl_source (), true, false, false); /* Condition 2: All VL/VTYPE available in are all compatible. */ @@ -4407,7 +4407,10 @@ pass_vsetvl::global_eliminate_vsetvl_insn (const bb_info *bb) const { sbitmap avout = m_vector_manager->vector_avout[e->src->index]; if (e->src == ENTRY_BLOCK_PTR_FOR_FN (cfun) - || e->src == EXIT_BLOCK_PTR_FOR_FN (cfun) || bitmap_empty_p (avout)) + || e->src == EXIT_BLOCK_PTR_FOR_FN (cfun) + || (unsigned int) e->src->index + >= m_vector_manager->vector_block_infos.length () + || bitmap_empty_p (avout)) return false; EXECUTE_IF_SET_IN_BITMAP (avout, 0, bb_index, sbi)