fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 02:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

nak: fix clippy::useless_conversion warnings

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27234>
This commit is contained in:
Karol Herbst 2024-01-24 12:42:10 +01:00 • committed by Marge Bot
parent ec7b32d920
commit 00a6e2ae4d
4 changed files with 38 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -43,13 +43,13 @@ pub trait Builder {
} }
if is_predicate { if is_predicate {
self.push_op(OpPLop3 { self.push_op(OpPLop3 {
dsts: [dst.into(), Dst::None], dsts: [dst, Dst::None],
srcs: [x, y, true.into()], srcs: [x, y, true.into()],
ops: [op, LogicOp3::new_const(false)], ops: [op, LogicOp3::new_const(false)],
}); });
} else { } else {
self.push_op(OpLop3 { self.push_op(OpLop3 {
dst: dst.into(), dst: dst,
srcs: [x, y, 0.into()], srcs: [x, y, 0.into()],
op: op, op: op,
}); });
@ -68,13 +68,13 @@ pub trait Builder {
} }
}; };
self.push_op(OpPSetP { self.push_op(OpPSetP {
dsts: [dst.into(), Dst::None], dsts: [dst, Dst::None],
ops: [cmp_op, PredSetOp::And], ops: [cmp_op, PredSetOp::And],
srcs: [x, y, true.into()], srcs: [x, y, true.into()],
}); });
} else { } else {
self.push_op(OpLop2 { self.push_op(OpLop2 {
dst: dst.into(), dst: dst,
srcs: [x, y], srcs: [x, y],
op: op, op: op,
}); });
@ -566,12 +566,12 @@ pub trait SSABuilder: Builder {
self.push_op(OpPSetP { self.push_op(OpPSetP {
dsts: [tmp.into(), Dst::None], dsts: [tmp.into(), Dst::None],
ops: [PredSetOp::And, PredSetOp::And], ops: [PredSetOp::And, PredSetOp::And],
srcs: [cond.into(), x.into(), true.into()], srcs: [cond, x, true.into()],
}); });
self.push_op(OpPSetP { self.push_op(OpPSetP {
dsts: [dst.into(), Dst::None], dsts: [dst.into(), Dst::None],
ops: [PredSetOp::And, PredSetOp::Or], ops: [PredSetOp::And, PredSetOp::Or],
srcs: [Src::from(cond).bnot(), y.into(), tmp.into()], srcs: [cond.bnot(), y, tmp.into()],
}); });
} }
dst dst

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

@ -815,8 +815,8 @@ impl SM70Instr {
self.encode_alu( self.encode_alu(
0x00c, 0x00c,
None, None,
ALUSrc::from_src(&op.srcs[0].into()), ALUSrc::from_src(&op.srcs[0]),
ALUSrc::from_src(&op.srcs[1].into()), ALUSrc::from_src(&op.srcs[1]),
ALUSrc::None, ALUSrc::None,
); );
@ -843,9 +843,9 @@ impl SM70Instr {
self.encode_alu( self.encode_alu(
0x012, 0x012,
Some(op.dst), Some(op.dst),
ALUSrc::from_src(&op.srcs[0].into()), ALUSrc::from_src(&op.srcs[0]),
ALUSrc::from_src(&op.srcs[1].into()), ALUSrc::from_src(&op.srcs[1]),
ALUSrc::from_src(&op.srcs[2].into()), ALUSrc::from_src(&op.srcs[2]),
); );
self.set_field(72..80, op.op.lut); self.set_field(72..80, op.op.lut);
@ -898,7 +898,7 @@ impl SM70Instr {
0x104, 0x104,
Some(op.dst), Some(op.dst),
ALUSrc::None, ALUSrc::None,
ALUSrc::from_src(&op.src.into()), ALUSrc::from_src(&op.src),
ALUSrc::None, ALUSrc::None,
); );
} else { } else {
@ -906,7 +906,7 @@ impl SM70Instr {
0x110, 0x110,
Some(op.dst), Some(op.dst),
ALUSrc::None, ALUSrc::None,
ALUSrc::from_src(&op.src.into()), ALUSrc::from_src(&op.src),
ALUSrc::None, ALUSrc::None,
); );
} }
@ -927,7 +927,7 @@ impl SM70Instr {
0x105, 0x105,
Some(op.dst), Some(op.dst),
ALUSrc::None, ALUSrc::None,
ALUSrc::from_src(&op.src.into()), ALUSrc::from_src(&op.src),
ALUSrc::None, ALUSrc::None,
); );
} else { } else {
@ -935,7 +935,7 @@ impl SM70Instr {
0x111, 0x111,
Some(op.dst), Some(op.dst),
ALUSrc::None, ALUSrc::None,
ALUSrc::from_src(&op.src.into()), ALUSrc::from_src(&op.src),
ALUSrc::None, ALUSrc::None,
); );
} }
@ -954,7 +954,7 @@ impl SM70Instr {
0x106, 0x106,
Some(op.dst), Some(op.dst),
ALUSrc::None, ALUSrc::None,
ALUSrc::from_src(&op.src.into()), ALUSrc::from_src(&op.src),
ALUSrc::None, ALUSrc::None,
); );
} else { } else {
@ -962,7 +962,7 @@ impl SM70Instr {
0x112, 0x112,
Some(op.dst), Some(op.dst),
ALUSrc::None, ALUSrc::None,
ALUSrc::from_src(&op.src.into()), ALUSrc::from_src(&op.src),
ALUSrc::None, ALUSrc::None,
); );
} }
@ -980,7 +980,7 @@ impl SM70Instr {
0x107, 0x107,
Some(op.dst), Some(op.dst),
ALUSrc::None, ALUSrc::None,
ALUSrc::from_src(&op.src.into()), ALUSrc::from_src(&op.src),
ALUSrc::None, ALUSrc::None,
); );
} else { } else {
@ -988,7 +988,7 @@ impl SM70Instr {
0x113, 0x113,
Some(op.dst), Some(op.dst),
ALUSrc::None, ALUSrc::None,
ALUSrc::from_src(&op.src.into()), ALUSrc::from_src(&op.src),
ALUSrc::None, ALUSrc::None,
); );
} }
@ -1004,7 +1004,7 @@ impl SM70Instr {
0x002, 0x002,
Some(op.dst), Some(op.dst),
ALUSrc::None, ALUSrc::None,
ALUSrc::from_src(&op.src.into()), ALUSrc::from_src(&op.src),
ALUSrc::None, ALUSrc::None,
); );
self.set_field(72..76, op.quad_lanes); self.set_field(72..76, op.quad_lanes);
@ -1037,8 +1037,8 @@ impl SM70Instr {
self.encode_alu( self.encode_alu(
0x007, 0x007,
Some(op.dst), Some(op.dst),
ALUSrc::from_src(&op.srcs[0].into()), ALUSrc::from_src(&op.srcs[0]),
ALUSrc::from_src(&op.srcs[1].into()), ALUSrc::from_src(&op.srcs[1]),
ALUSrc::None, ALUSrc::None,
); );

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

@ -28,9 +28,9 @@ fn init_info_from_nir(nir: &nir_shader, sm: u8) -> ShaderInfo {
MESA_SHADER_COMPUTE => { MESA_SHADER_COMPUTE => {
ShaderStageInfo::Compute(ComputeShaderInfo { ShaderStageInfo::Compute(ComputeShaderInfo {
local_size: [ local_size: [
nir.info.workgroup_size[0].into(), nir.info.workgroup_size[0],
nir.info.workgroup_size[1].into(), nir.info.workgroup_size[1],
nir.info.workgroup_size[2].into(), nir.info.workgroup_size[2],
], ],
smem_size: nir.info.shared_size.try_into().unwrap(), smem_size: nir.info.shared_size.try_into().unwrap(),
}) })
@ -280,7 +280,7 @@ impl<'a> ShaderFromNir<'a> {
} }
let bits = let bits =
usize::from(def.bit_size) * usize::from(def.num_components); usize::from(def.bit_size) * usize::from(def.num_components);
assert!(vec.len() == bits.div_ceil(32).into()); assert!(vec.len() == bits.div_ceil(32));
} }
self.ssa_map self.ssa_map
.entry(def.index) .entry(def.index)
@ -1632,7 +1632,7 @@ impl<'a> ShaderFromNir<'a> {
if mask & (1 << i) == 0 { if mask & (1 << i) == 0 {
nir_dst.push(b.copy(0.into())[0]); nir_dst.push(b.copy(0.into())[0]);
} else { } else {
nir_dst.push(dst[di].into()); nir_dst.push(dst[di]);
di += 1; di += 1;
} }
} }
@ -1959,7 +1959,7 @@ impl<'a> ShaderFromNir<'a> {
let coord = self.get_image_coord(intrin, dim); let coord = self.get_image_coord(intrin, dim);
// let sample = self.get_src(&srcs[2]); // let sample = self.get_src(&srcs[2]);
let comps = u8::try_from(intrin.num_components).unwrap(); let comps = intrin.num_components;
assert!(intrin.def.bit_size() == 32); assert!(intrin.def.bit_size() == 32);
assert!(comps == 1 || comps == 2 || comps == 4); assert!(comps == 1 || comps == 2 || comps == 4);
@ -1985,7 +1985,7 @@ impl<'a> ShaderFromNir<'a> {
// let sample = self.get_src(&srcs[2]); // let sample = self.get_src(&srcs[2]);
let data = self.get_src(&srcs[3]); let data = self.get_src(&srcs[3]);
let comps = u8::try_from(intrin.num_components).unwrap(); let comps = intrin.num_components;
assert!(srcs[3].bit_size() == 32); assert!(srcs[3].bit_size() == 32);
assert!(comps == 1 || comps == 2 || comps == 4); assert!(comps == 1 || comps == 2 || comps == 4);
@ -2555,7 +2555,7 @@ impl<'a> ShaderFromNir<'a> {
assert!(addr % 4 == 0); assert!(addr % 4 == 0);
for c in 0..usize::from(intrin.num_components) { for c in 0..usize::from(intrin.num_components) {
let idx = usize::from(addr / 4) + usize::from(c); let idx = usize::from(addr / 4) + c;
self.fs_out_regs[idx] = data.as_ssa().unwrap()[c]; self.fs_out_regs[idx] = data.as_ssa().unwrap()[c];
} }
} }

16
src/nouveau/compiler/nak/spill_values.rs
View file

@ -156,7 +156,7 @@ impl Spill for SpillBar {
assert!(dst.file() == RegFile::GPR); assert!(dst.file() == RegFile::GPR);
Instr::new_boxed(OpBMov { Instr::new_boxed(OpBMov {
dst: dst.into(), dst: dst.into(),
src: src.into(), src: src,
clear: false, clear: false,
}) })
} }
@ -164,7 +164,7 @@ impl Spill for SpillBar {
fn fill(&self, dst: Dst, src: SSAValue) -> Box<Instr> { fn fill(&self, dst: Dst, src: SSAValue) -> Box<Instr> {
assert!(src.file() == RegFile::GPR); assert!(src.file() == RegFile::GPR);
Instr::new_boxed(OpBMov { Instr::new_boxed(OpBMov {
dst: dst.into(), dst: dst,
src: src.into(), src: src.into(),
clear: false, clear: false,
}) })
@ -456,7 +456,7 @@ fn spill_values<S: Spill>(
some.push(Reverse(SSANextUse::new(*ssa, next_use))); some.push(Reverse(SSANextUse::new(*ssa, next_use)));
} }
} }
while w.count(file) < limit.into() { while w.count(file) < limit {
let Some(entry) = some.pop() else { let Some(entry) = some.pop() else {
break; break;
}; };
@ -465,7 +465,7 @@ fn spill_values<S: Spill>(
// If we still have room, consider values which aren't used // If we still have room, consider values which aren't used
// inside the loop. // inside the loop.
if w.count(file) < limit.into() { if w.count(file) < limit {
for ssa in i_b.iter() { for ssa in i_b.iter() {
debug_assert!(ssa.file() == file); debug_assert!(ssa.file() == file);
if !lu.contains(ssa) { if !lu.contains(ssa) {
@ -474,7 +474,7 @@ fn spill_values<S: Spill>(
} }
} }
while w.count(file) < limit.into() { while w.count(file) < limit {
let Some(entry) = some.pop() else { let Some(entry) = some.pop() else {
break; break;
}; };
@ -522,7 +522,7 @@ fn spill_values<S: Spill>(
some.push(Reverse(SSANextUse::new(ssa, info.next_use))); some.push(Reverse(SSANextUse::new(ssa, info.next_use)));
} }
} }
while w.count(file) < limit.into() { while w.count(file) < limit {
let Some(entry) = some.pop() else { let Some(entry) = some.pop() else {
break; break;
}; };
@ -698,8 +698,8 @@ fn spill_values<S: Spill>(
let abs_pressure = let abs_pressure =
b.w.count(file) + u32::from(rel_pressure); b.w.count(file) + u32::from(rel_pressure);
if abs_pressure > limit.into() { if abs_pressure > limit {
let count = abs_pressure - u32::from(limit); let count = abs_pressure - limit;
let count = count.try_into().unwrap(); let count = count.try_into().unwrap();
let mut spills = SpillChooser::new(bl, ip, count); let mut spills = SpillChooser::new(bl, ip, count);