From 707aacd8187d9e701c612aacb06e9e40a8d14151 Mon Sep 17 00:00:00 2001
From: Amanieu d'Antras <amanieu@gmail.com>
Date: Sun, 28 Nov 2021 17:52:50 +0000
Subject: [PATCH] Split up functions in liverange.rs

This helps with profiling even if they are inlined since perf with DWARF
callgraph profiling can attribute execution time to inlined functions.
---
 src/ion/liveranges.rs | 32 ++++++++++++++++++--------------
 src/ion/mod.rs        |  2 ++
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/ion/liveranges.rs b/src/ion/liveranges.rs
index 758349a..a8e3561 100644
--- a/src/ion/liveranges.rs
+++ b/src/ion/liveranges.rs
@@ -392,6 +392,10 @@ impl<'a, F: Function> Env<'a, F> {
             return Err(RegAllocError::EntryLivein);
         }
 
+        Ok(())
+    }
+
+    pub fn build_liveranges(&mut self) {
         for &vreg in self.func.reftype_vregs() {
             self.safepoints_per_vreg.insert(vreg.vreg(), HashSet::new());
         }
@@ -1142,6 +1146,20 @@ impl<'a, F: Function> Env<'a, F> {
             }
         }
 
+        self.blockparam_ins.sort_unstable();
+        self.blockparam_outs.sort_unstable();
+        self.prog_move_srcs.sort_unstable_by_key(|(pos, _)| *pos);
+        self.prog_move_dsts.sort_unstable_by_key(|(pos, _)| *pos);
+
+        log::trace!("prog_move_srcs = {:?}", self.prog_move_srcs);
+        log::trace!("prog_move_dsts = {:?}", self.prog_move_dsts);
+
+        self.stats.initial_liverange_count = self.ranges.len();
+        self.stats.blockparam_ins_count = self.blockparam_ins.len();
+        self.stats.blockparam_outs_count = self.blockparam_outs.len();
+    }
+
+    pub fn fixup_multi_fixed_vregs(&mut self) {
         // Do a fixed-reg cleanup pass: if there are any LiveRanges with
         // multiple uses (or defs) at the same ProgPoint and there is
         // more than one FixedReg constraint at that ProgPoint, we
@@ -1239,19 +1257,5 @@ impl<'a, F: Function> Env<'a, F> {
                 seen_fixed_for_vreg.clear();
             }
         }
-
-        self.blockparam_ins.sort_unstable();
-        self.blockparam_outs.sort_unstable();
-        self.prog_move_srcs.sort_unstable_by_key(|(pos, _)| *pos);
-        self.prog_move_dsts.sort_unstable_by_key(|(pos, _)| *pos);
-
-        log::trace!("prog_move_srcs = {:?}", self.prog_move_srcs);
-        log::trace!("prog_move_dsts = {:?}", self.prog_move_dsts);
-
-        self.stats.initial_liverange_count = self.ranges.len();
-        self.stats.blockparam_ins_count = self.blockparam_ins.len();
-        self.stats.blockparam_outs_count = self.blockparam_outs.len();
-
-        Ok(())
     }
 }
diff --git a/src/ion/mod.rs b/src/ion/mod.rs
index aed56dd..5903f58 100644
--- a/src/ion/mod.rs
+++ b/src/ion/mod.rs
@@ -92,6 +92,8 @@ impl<'a, F: Function> Env<'a, F> {
     pub(crate) fn init(&mut self) -> Result<(), RegAllocError> {
         self.create_pregs_and_vregs();
         self.compute_liveness()?;
+        self.build_liveranges();
+        self.fixup_multi_fixed_vregs();
         self.merge_vreg_bundles();
         self.queue_bundles();
         if log::log_enabled!(log::Level::Trace) {