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: 1824420 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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 4RVr922rNNz1yNm for ; Wed, 23 Aug 2023 12:42:30 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 377A438560A4 for ; Wed, 23 Aug 2023 02:42:28 +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+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" 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)