fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 00:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nak: Use .wrap for 64-bit shifts

Browse source 
If we set the shift up correctly, we can get the 64-bit wrapping
behavior to work for us instead of adding an instruction to wrap
manually.  While we're at it, set known-unused sources to 0.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30275>
This commit is contained in:
Faith Ekstrand 2024-07-20 17:45:16 -05:00 • committed by Marge Bot
parent 08efc78a25
commit e02dfb6a34
1 changed files with 10 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/nouveau/compiler/nak/builder.rs
View file

@ -145,26 +145,18 @@ pub trait SSABuilder: Builder {
fn shl64(&mut self, x: Src, shift: Src) -> SSARef {
let x = x.as_ssa().unwrap();
// For 64-bit shifts, we have to use clamp mode so we need
// to mask the shift in order satisfy NIR semantics.
debug_assert!(shift.src_mod.is_none());
let shift = if let SrcRef::Imm32(imm) = shift.src_ref {
(imm & 0x3f).into()
} else {
self.lop2(LogicOp2::And, shift, 0x3f.into()).into()
};
let dst = self.alloc_ssa(RegFile::GPR, 2);
self.push_op(OpShf {
dst: dst[0].into(),
low: 0.into(),
high: x[0].into(),
low: x[0].into(),
high: 0.into(),
shift,
right: false,
wrap: false,
data_type: IntType::U32,
dst_high: true,
wrap: true,
data_type: IntType::U64,
dst_high: false,
});
self.push_op(OpShf {
dst: dst[1].into(),
@ -172,7 +164,7 @@ pub trait SSABuilder: Builder {
high: x[1].into(),
shift,
right: false,
wrap: false,
wrap: true,
data_type: IntType::U64,
dst_high: true,
});
@ -206,15 +198,7 @@ pub trait SSABuilder: Builder {
fn shr64(&mut self, x: Src, shift: Src, signed: bool) -> SSARef {
let x = x.as_ssa().unwrap();
// For 64-bit shifts, we have to use clamp mode so we need
// to mask the shift in order satisfy NIR semantics.
debug_assert!(shift.src_mod.is_none());
let shift = if let SrcRef::Imm32(imm) = shift.src_ref {
(imm & 0x3f).into()
} else {
self.lop2(LogicOp2::And, shift, 0x3f.into()).into()
};
let dst = self.alloc_ssa(RegFile::GPR, 2);
self.push_op(OpShf {
@ -223,18 +207,18 @@ pub trait SSABuilder: Builder {
high: x[1].into(),
shift,
right: true,
wrap: false,
wrap: true,
data_type: if signed { IntType::I64 } else { IntType::U64 },
dst_high: false,
});
self.push_op(OpShf {
dst: dst[1].into(),
low: x[0].into(),
low: 0.into(),
high: x[1].into(),
shift,
right: true,
wrap: false,
data_type: if signed { IntType::I32 } else { IntType::U32 },
wrap: true,
data_type: if signed { IntType::I64 } else { IntType::U64 },
dst_high: true,
});
dst