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

nak: Rename OpBrev to OpBRev

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26550>
This commit is contained in:
Faith Ekstrand 2023-12-06 08:19:29 -06:00 • committed by Marge Bot
parent 9b68c77abb
commit c14f4cc052
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/nouveau/compiler/nak/encode_sm70.rs
View file

@ -643,7 +643,7 @@ impl SM70Instr {
self.set_pred_src(87..90, 90, op.accum);
}
fn encode_brev(&mut self, op: &OpBrev) {
fn encode_brev(&mut self, op: &OpBRev) {
self.encode_alu(
0x101,
Some(op.dst),
@ -1995,7 +1995,7 @@ impl SM70Instr {
Op::DMul(op) => si.encode_dmul(&op),
Op::DSetP(op) => si.encode_dsetp(&op),
Op::MuFu(op) => si.encode_mufu(&op),
Op::Brev(op) => si.encode_brev(&op),
Op::BRev(op) => si.encode_brev(&op),
Op::Flo(op) => si.encode_flo(&op),
Op::IAbs(op) => si.encode_iabs(&op),
Op::IAdd3(op) => si.encode_iadd3(&op),

4
src/nouveau/compiler/nak/from_nir.rs
View file

@ -535,7 +535,7 @@ impl<'a> ShaderFromNir<'a> {
}
nir_op_bitfield_reverse => {
let dst = b.alloc_ssa(RegFile::GPR, 1);
b.push_op(OpBrev {
b.push_op(OpBRev {
dst: dst.into(),
src: srcs[0],
});
@ -605,7 +605,7 @@ impl<'a> ShaderFromNir<'a> {
}
nir_op_find_lsb => {
let tmp = b.alloc_ssa(RegFile::GPR, 1);
b.push_op(OpBrev {
b.push_op(OpBRev {
dst: tmp.into(),
src: srcs[0],
});

12
src/nouveau/compiler/nak/ir.rs
View file

@ -2580,19 +2580,19 @@ impl_display_for_op!(OpDSetP);
#[repr(C)]
#[derive(SrcsAsSlice, DstsAsSlice)]
pub struct OpBrev {
pub struct OpBRev {
pub dst: Dst,
#[src_type(ALU)]
pub src: Src,
}
impl DisplayOp for OpBrev {
impl DisplayOp for OpBRev {
fn fmt_op(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "brev {}", self.src,)
write!(f, "brev {}", self.src)
}
}
impl_display_for_op!(OpBrev);
impl_display_for_op!(OpBRev);
#[repr(C)]
#[derive(SrcsAsSlice, DstsAsSlice)]
@ -4727,7 +4727,7 @@ pub enum Op {
DMnMx(OpDMnMx),
DMul(OpDMul),
DSetP(OpDSetP),
Brev(OpBrev),
BRev(OpBRev),
Flo(OpFlo),
IAbs(OpIAbs),
INeg(OpINeg),
@ -5171,7 +5171,7 @@ impl Instr {
| Op::DSetP(_) => false,
// Integer ALU
Op::Brev(_) | Op::Flo(_) | Op::PopC(_) => false,
Op::BRev(_) | Op::Flo(_) | Op::PopC(_) => false,
Op::IAbs(_)
| Op::INeg(_)
| Op::IAdd2(_)

4
src/nouveau/compiler/nak/legalize.rs
View file

@ -316,7 +316,7 @@ fn legalize_sm50_instr(
Op::PopC(op) => {
copy_alu_src_if_not_reg(b, &mut op.src, SrcType::ALU);
}
Op::Brev(op) => {
Op::BRev(op) => {
copy_alu_src_if_not_reg(b, &mut op.src, SrcType::ALU);
}
Op::FMnMx(op) => {
@ -432,7 +432,7 @@ fn legalize_sm70_instr(
}
copy_alu_src_if_not_reg(b, src0, SrcType::F64);
}
Op::Brev(_) | Op::Flo(_) | 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);