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

nak: Rename OpBFind to OpFlo

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24998>
This commit is contained in:
Faith Ekstrand 2023-09-11 14:06:26 -05:00 • committed by Marge Bot
parent eb10a778fd
commit 1b869d2db5
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/nouveau/compiler/nak_encode_sm75.rs
View file

@ -550,7 +550,7 @@ impl SM75Instr {
);
}
fn encode_bfind(&mut self, op: &OpBFind) {
fn encode_flo(&mut self, op: &OpFlo) {
self.encode_alu(
0x100,
Some(op.dst),
@ -1564,7 +1564,7 @@ impl SM75Instr {
Op::FSetP(op) => si.encode_fsetp(&op),
Op::MuFu(op) => si.encode_mufu(&op),
Op::Brev(op) => si.encode_brev(&op),
Op::BFind(op) => si.encode_bfind(&op),
Op::Flo(op) => si.encode_flo(&op),
Op::IAbs(op) => si.encode_iabs(&op),
Op::IAdd3(op) => si.encode_iadd3(&op),
Op::IAdd3X(op) => si.encode_iadd3x(&op),

4
src/nouveau/compiler/nak_from_nir.rs
View file

@ -238,7 +238,7 @@ impl<'a> ShaderFromNir<'a> {
src: srcs[0],
});
let dst = b.alloc_ssa(RegFile::GPR, 1);
b.push_op(OpBFind {
b.push_op(OpFlo {
dst: dst.into(),
src: tmp.into(),
signed: alu.op == nir_op_ifind_msb,
@ -478,7 +478,7 @@ impl<'a> ShaderFromNir<'a> {
}
nir_op_ifind_msb | nir_op_ufind_msb => {
let dst = b.alloc_ssa(RegFile::GPR, 1);
b.push_op(OpBFind {
b.push_op(OpFlo {
dst: dst.into(),
src: srcs[0],
signed: alu.op == nir_op_ifind_msb,

10
src/nouveau/compiler/nak_ir.rs
View file

@ -2078,7 +2078,7 @@ impl fmt::Display for OpBrev {
#[repr(C)]
#[derive(SrcsAsSlice, DstsAsSlice)]
pub struct OpBFind {
pub struct OpFlo {
pub dst: Dst,
#[src_type(ALU)]
@ -2088,9 +2088,9 @@ pub struct OpBFind {
pub return_shift_amount: bool,
}
impl fmt::Display for OpBFind {
impl fmt::Display for OpFlo {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "BFIND")?;
write!(f, "FLO")?;
if self.return_shift_amount {
write!(f, ".SAMT")?;
}
@ -3618,7 +3618,7 @@ pub enum Op {
FSetP(OpFSetP),
DAdd(OpDAdd),
Brev(OpBrev),
BFind(OpBFind),
Flo(OpFlo),
IAbs(OpIAbs),
INeg(OpINeg),
IAdd3(OpIAdd3),
@ -4040,7 +4040,7 @@ impl Instr {
| Op::FSOut(_) => {
panic!("Not a hardware opcode")
}
Op::PopC(_) | Op::Brev(_) | Op::BFind(_) | Op::Prmt(_) => Some(15),
Op::PopC(_) | Op::Brev(_) | Op::Flo(_) | Op::Prmt(_) => Some(15),
}
}
}

2
src/nouveau/compiler/nak_legalize.rs
View file

@ -103,7 +103,7 @@ fn legalize_instr(b: &mut impl SSABuilder, instr: &mut Instr) {
swap_srcs_if_not_reg(src0, src1);
copy_src_if_not_reg(b, src0, RegFile::GPR);
}
Op::Brev(_) | Op::BFind(_) | Op::IAbs(_) | Op::INeg(_) => (),
Op::Brev(_) | Op::Flo(_) | Op::IAbs(_) | Op::INeg(_) => (),
Op::IAdd3(op) => {
let [ref mut src0, ref mut src1, ref mut src2] = op.srcs;
swap_srcs_if_not_reg(src0, src1);