fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 13:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nak: Use num_regs instead of max_reg in RA

Browse source 
Since the top value is always the default register, we don't need to
worry about overflowing a u8.  What we do need to worry about is
register files with zero registers which is a thing pre-Turing for
uniform register files.  Use num instead of max so we don't end up
subtracting 1 from 0.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24998>
This commit is contained in:
Faith Ekstrand 2023-06-06 14:47:53 -05:00 • committed by Marge Bot
parent 19806cc9e4
commit c0e6d80063
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/nouveau/compiler/nak_assign_regs.rs
View file

@ -152,7 +152,7 @@ impl PartialOrd for LiveValue {
#[derive(Clone)]
struct RegFileAllocation {
file: RegFile,
max_reg: u8,
num_regs: u8,
used: BitSet,
pinned: BitSet,
reg_ssa: Vec<SSAValue>,
@ -163,7 +163,7 @@ impl RegFileAllocation {
pub fn new(file: RegFile, sm: u8) -> Self {
Self {
file: file,
max_reg: file.num_regs(sm) - 1,
num_regs: file.num_regs(sm),
used: BitSet::new(),
pinned: BitSet::new(),
reg_ssa: Vec::new(),
@ -183,7 +183,7 @@ impl RegFileAllocation {
fn is_reg_in_bounds(&self, reg: u8, comps: u8) -> bool {
if let Some(max_reg) = reg.checked_add(comps - 1) {
max_reg <= self.max_reg
max_reg < self.num_regs
} else {
false
}
@ -238,7 +238,7 @@ impl RegFileAllocation {
pub fn assign_reg(&mut self, ssa: SSAValue, reg: u8) -> RegRef {
assert!(ssa.file() == self.file);
assert!(reg <= self.max_reg);
assert!(reg < self.num_regs);
assert!(!self.used.get(reg.into()));
if usize::from(reg) >= self.reg_ssa.len() {