From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=SBwf=5G=rivai.ai=juzhe.zhong@sourceware.org>
Received: from smtpbgau1.qq.com (smtpbgau1.qq.com [54.206.16.166])
	by sourceware.org (Postfix) with ESMTPS id B145F3858CDA
	for <gcc-patches@gcc.gnu.org>; Mon,  9 Jan 2023 23:17:27 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B145F3858CDA
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: bizesmtp65t1673306242t2cg1kkq
Received: from server1.localdomain ( [58.60.1.22])
	by bizesmtp.qq.com (ESMTP) with 
	id ; Tue, 10 Jan 2023 07:17:21 +0800 (CST)
X-QQ-SSF: 01400000002000E0L000B00A0000000
X-QQ-FEAT: rZJGTgY0+YOmqgMjemrY57wMYlFRB1xZcNE+LzzNIJdmeQVI2YuntYrPN1NVP
	6ZvH/2BIe773Ax0YJjBMT4YVKyEtMPkZBT1cK1Y4P694eutzzjYqLbUuxqIZCIok1jqm0fN
	EfUaI52pbWp+BnE56HXj08/WpO0HOcIUrMm4OstHj39Zk5V5APGECUIl/0Qdv8j+xLv/Zh2
	IUJ0yiF+t7G1Q7/crrQo/n/hTrDj3/pnNQUvYbaNPACit9BCQRJiSU4pAfn/sgiCpC8pN++
	EY3/NAiKAGTKckgQA5abCXUA71UpaLcvEIRpVdKfhgZzf6sWudB4P/JTWBSOZcA5nmcgwSX
	uVZjEZbcSA5I1fw1x2kk4LNjQvkFH1zWWJUInDcvFdJNvhW2y2LnOnD/BMisw==
X-QQ-GoodBg: 2
From: juzhe.zhong@rivai.ai
To: gcc-patches@gcc.gnu.org
Cc: kito.cheng@gmail.com,
	palmer@dabbelt.com,
	Ju-Zhe Zhong <juzhe.zhong@rivai.ai>
Subject: [PATCH] RISC-V: Add probability model of each block to prevent endless loop of Phase 3
Date: Tue, 10 Jan 2023 07:17:20 +0800
Message-Id: <20230109231720.155773-1-juzhe.zhong@rivai.ai>
X-Mailer: git-send-email 2.36.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-QQ-SENDSIZE: 520
Feedback-ID: bizesmtp:rivai.ai:qybglogicsvr:qybglogicsvr7
X-Spam-Status: No, score=-10.4 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_STATUS,KAM_NUMSUBJECT,RCVD_IN_BARRACUDACENTRAL,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,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
List-Id: <gcc-patches.gcc.gnu.org>

From: Ju-Zhe Zhong <juzhe.zhong@rivai.ai>

Notice that the PASS is just simpily pick the probability >= 50% 
to do the backward fusion which will create endless loop on Phase 3.

Adding this probability to fix this bug.
gcc/ChangeLog:

        * config/riscv/riscv-vsetvl.cc (vector_infos_manager::vector_infos_manager): Add probability.
        (vector_infos_manager::dump): Ditto.
        (pass_vsetvl::compute_probabilities): Ditto.
        * config/riscv/riscv-vsetvl.h (struct vector_block_info): Ditto.

---
 gcc/config/riscv/riscv-vsetvl.cc | 39 ++++++++++++++++++++++++++++++++
 gcc/config/riscv/riscv-vsetvl.h  |  3 +++
 2 files changed, 42 insertions(+)

diff --git a/gcc/config/riscv/riscv-vsetvl.cc b/gcc/config/riscv/riscv-vsetvl.cc
index 0f12d4ddb23..7d8c3a32aaa 100644
--- a/gcc/config/riscv/riscv-vsetvl.cc
+++ b/gcc/config/riscv/riscv-vsetvl.cc
@@ -1465,6 +1465,7 @@ vector_infos_manager::vector_infos_manager ()
 	  vector_block_infos[bb->index ()].reaching_out = vector_insn_info ();
 	  for (insn_info *insn : bb->real_insns ())
 	    vector_insn_infos[insn->uid ()].parse_insn (insn);
+	  vector_block_infos[bb->index ()].probability = profile_probability ();
 	}
     }
 }
@@ -1642,6 +1643,8 @@ vector_infos_manager::dump (FILE *file) const
 	}
       fprintf (file, "<FOOTER>=");
       vector_block_infos[cfg_bb->index].reaching_out.dump (file);
+      fprintf (file, "<Probability>=");
+      vector_block_infos[cfg_bb->index].probability.dump (file);
       fprintf (file, "\n\n");
     }
 
@@ -1764,6 +1767,7 @@ private:
 
   void init (void);
   void done (void);
+  void compute_probabilities (void);
 
 public:
   pass_vsetvl (gcc::context *ctxt) : rtl_opt_pass (pass_data_vsetvl, ctxt) {}
@@ -2629,6 +2633,41 @@ pass_vsetvl::done (void)
   m_vector_manager = nullptr;
 }
 
+/* Compute probability for each block.  */
+void
+pass_vsetvl::compute_probabilities (void)
+{
+  /* Don't compute it in -O0 since we don't need it.  */
+  if (!optimize)
+    return;
+  edge e;
+  edge_iterator ei;
+
+  for (const bb_info *bb : crtl->ssa->bbs ())
+    {
+      basic_block cfg_bb = bb->cfg_bb ();
+      auto &curr_prob
+	= m_vector_manager->vector_block_infos[cfg_bb->index].probability;
+      if (ENTRY_BLOCK_PTR_FOR_FN (cfun) == cfg_bb)
+	curr_prob = profile_probability::always ();
+      gcc_assert (curr_prob.initialized_p ());
+      FOR_EACH_EDGE (e, ei, cfg_bb->succs)
+	{
+	  auto &new_prob
+	    = m_vector_manager->vector_block_infos[e->dest->index].probability;
+	  if (!new_prob.initialized_p ())
+	    new_prob = curr_prob * e->probability;
+	  else if (new_prob == profile_probability::always ())
+	    continue;
+	  else
+	    new_prob += curr_prob * e->probability;
+	}
+    }
+  auto &exit_block
+    = m_vector_manager->vector_block_infos[EXIT_BLOCK_PTR_FOR_FN (cfun)->index];
+  exit_block.probability = profile_probability::always ();
+}
+
 /* Lazy vsetvl insertion for optimize > 0. */
 void
 pass_vsetvl::lazy_vsetvl (void)
diff --git a/gcc/config/riscv/riscv-vsetvl.h b/gcc/config/riscv/riscv-vsetvl.h
index 563ad3084ed..fb3ebb9db79 100644
--- a/gcc/config/riscv/riscv-vsetvl.h
+++ b/gcc/config/riscv/riscv-vsetvl.h
@@ -291,6 +291,9 @@ struct vector_block_info
   /* The reaching_out vector insn_info of the block.  */
   vector_insn_info reaching_out;
 
+  /* The static execute probability of the demand info.  */
+  profile_probability probability;
+
   vector_block_info () = default;
 };
 
-- 
2.36.1