T0b1/regalloc2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some minor opts: inlining, and smallvec reuse

Browse Source
This commit is contained in:
Chris Fallin
2021-05-07 20:54:27 -07:00
parent e41b0101a8
commit ed339ab4d8
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/ion/mod.rs
View File

@@ -68,29 +68,36 @@ pub struct CodeRange {
} }
impl CodeRange { impl CodeRange {
#[inline(always)]
pub fn is_empty(&self) -> bool { pub fn is_empty(&self) -> bool {
self.from == self.to self.from == self.to
} }
#[inline(always)]
pub fn contains(&self, other: &Self) -> bool { pub fn contains(&self, other: &Self) -> bool {
other.from >= self.from && other.to <= self.to other.from >= self.from && other.to <= self.to
} }
#[inline(always)]
pub fn contains_point(&self, other: ProgPoint) -> bool { pub fn contains_point(&self, other: ProgPoint) -> bool {
other >= self.from && other < self.to other >= self.from && other < self.to
} }
#[inline(always)]
pub fn overlaps(&self, other: &Self) -> bool { pub fn overlaps(&self, other: &Self) -> bool {
other.to > self.from && other.from < self.to other.to > self.from && other.from < self.to
} }
#[inline(always)]
pub fn len(&self) -> usize { pub fn len(&self) -> usize {
self.to.inst().index() - self.from.inst().index() self.to.inst().index() - self.from.inst().index()
} }
} }
impl std::cmp::PartialOrd for CodeRange { impl std::cmp::PartialOrd for CodeRange {
#[inline(always)]
fn partial_cmp(&self, other: &Self) -> Option<Ordering> { fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
Some(self.cmp(other)) Some(self.cmp(other))
} }
} }
impl std::cmp::Ord for CodeRange { impl std::cmp::Ord for CodeRange {
#[inline(always)]
fn cmp(&self, other: &Self) -> Ordering { fn cmp(&self, other: &Self) -> Ordering {
if self.to <= other.from { if self.to <= other.from {
Ordering::Less Ordering::Less
@@ -1609,6 +1616,9 @@ impl<'a, F: Function> Env<'a, F> {
// have to split the multiple uses at the same progpoint into // have to split the multiple uses at the same progpoint into
// different bundles, which breaks invariants related to // different bundles, which breaks invariants related to
// disjoint ranges and bundles). // disjoint ranges and bundles).
let mut seen_fixed_for_vreg: SmallVec<[VReg; 16]> = smallvec![];
let mut first_preg: SmallVec<[PRegIndex; 16]> = smallvec![];
let mut extra_clobbers: SmallVec<[(PReg, Inst); 8]> = smallvec![];
for vreg in 0..self.vregs.len() { for vreg in 0..self.vregs.len() {
let mut iter = self.vregs[vreg].first_range; let mut iter = self.vregs[vreg].first_range;
while iter.is_valid() { while iter.is_valid() {
@@ -1618,9 +1628,6 @@ impl<'a, F: Function> Env<'a, F> {
iter iter
); );
let mut last_point = None; let mut last_point = None;
let mut seen_fixed_for_vreg: SmallVec<[VReg; 16]> = smallvec![];
let mut first_preg: SmallVec<[PRegIndex; 16]> = smallvec![];
let mut extra_clobbers: SmallVec<[(PReg, Inst); 8]> = smallvec![];
let mut fixup_multi_fixed_vregs = |pos: ProgPoint, let mut fixup_multi_fixed_vregs = |pos: ProgPoint,
slot: usize, slot: usize,
op: &mut Operand, op: &mut Operand,
@@ -1684,7 +1691,7 @@ impl<'a, F: Function> Env<'a, F> {
use_iter = self.uses[use_iter.index()].next_use(); use_iter = self.uses[use_iter.index()].next_use();
} }
for (clobber, inst) in extra_clobbers { for &(clobber, inst) in &extra_clobbers {
let range = CodeRange { let range = CodeRange {
from: ProgPoint::before(inst), from: ProgPoint::before(inst),
to: ProgPoint::before(inst.next()), to: ProgPoint::before(inst.next()),
@@ -1692,6 +1699,10 @@ impl<'a, F: Function> Env<'a, F> {
self.add_liverange_to_preg(range, clobber); self.add_liverange_to_preg(range, clobber);
} }
extra_clobbers.clear();
first_preg.clear();
seen_fixed_for_vreg.clear();
iter = self.ranges[iter.index()].next_in_reg; iter = self.ranges[iter.index()].next_in_reg;
} }
} }