nak: fix clippy::match_like_matches_macro warnings

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27234>
This commit is contained in:
Karol Herbst
2024-01-24 13:02:46 +01:00
committed by Marge Bot
parent 4d414cb61a
commit 4b039abd7b
5 changed files with 21 additions and 51 deletions

View File

@@ -9,10 +9,7 @@ use std::ops::Range;
impl Src {
fn is_reg_or_zero(&self) -> bool {
match self.src_ref {
SrcRef::Zero | SrcRef::Reg(_) => true,
_ => false,
}
matches!(self.src_ref, SrcRef::Zero | SrcRef::Reg(_))
}
}

View File

@@ -3010,15 +3010,14 @@ impl<'a> ShaderFromNir<'a> {
// Tessellation evaluation shaders MUST claim to read gl_TessCoord or
// the hardware will throw an SPH error.
match &self.info.stage {
ShaderStageInfo::Tessellation => match &mut self.info.io {
if matches!(self.info.stage, ShaderStageInfo::Tessellation) {
match &mut self.info.io {
ShaderIoInfo::Vtg(io) => {
let tc = NAK_ATTR_TESS_COORD;
io.mark_attrs_written(tc..(tc + 8));
}
_ => panic!("Tessellation must have ShaderIoInfo::Vtg"),
},
_ => (),
}
}
Shader {

View File

@@ -680,10 +680,7 @@ pub enum Dst {
impl Dst {
pub fn is_none(&self) -> bool {
match self {
Dst::None => true,
_ => false,
}
matches!(self, Dst::None)
}
pub fn as_reg(&self) -> Option<&RegRef> {
@@ -952,10 +949,7 @@ pub enum SrcMod {
impl SrcMod {
pub fn is_none(&self) -> bool {
match self {
SrcMod::None => true,
_ => false,
}
matches!(self, SrcMod::None)
}
pub fn has_fabs(&self) -> bool {
@@ -1201,10 +1195,9 @@ impl Src {
pub fn is_fneg_zero(&self, src_type: SrcType) -> bool {
match self.src_ref {
SrcRef::Zero | SrcRef::Imm32(0) => match self.src_mod {
SrcMod::FNeg | SrcMod::FNegAbs => true,
_ => false,
},
SrcRef::Zero | SrcRef::Imm32(0) => {
matches!(self.src_mod, SrcMod::FNeg | SrcMod::FNegAbs)
}
SrcRef::Imm32(0x80000000) => {
src_type == SrcType::F32 && self.src_mod.is_none()
}
@@ -1220,20 +1213,17 @@ impl Src {
return false;
}
match self.src_ref {
SrcRef::SSA(_) | SrcRef::Reg(_) => true,
_ => false,
}
matches!(self.src_ref, SrcRef::SSA(_) | SrcRef::Reg(_))
}
SrcType::GPR => {
if !self.src_mod.is_none() {
return false;
}
match self.src_ref {
SrcRef::Zero | SrcRef::SSA(_) | SrcRef::Reg(_) => true,
_ => false,
}
matches!(
self.src_ref,
SrcRef::Zero | SrcRef::SSA(_) | SrcRef::Reg(_)
)
}
SrcType::ALU => self.src_mod.is_none() && self.src_ref.is_alu(),
SrcType::F32 | SrcType::F64 => {
@@ -4923,10 +4913,7 @@ impl PredRef {
}
pub fn is_none(&self) -> bool {
match self {
PredRef::None => true,
_ => false,
}
matches!(self, PredRef::None)
}
pub fn iter_ssa(&self) -> slice::Iter<'_, SSAValue> {
@@ -5187,17 +5174,11 @@ impl Instr {
}
pub fn is_branch(&self) -> bool {
match self.op {
Op::Bra(_) | Op::Exit(_) => true,
_ => false,
}
matches!(self.op, Op::Bra(_) | Op::Exit(_))
}
pub fn is_barrier(&self) -> bool {
match self.op {
Op::Bar(_) => true,
_ => false,
}
matches!(self.op, Op::Bar(_))
}
pub fn uses_global_mem(&self) -> bool {
@@ -5392,10 +5373,7 @@ impl Instr {
}
pub fn needs_yield(&self) -> bool {
match &self.op {
Op::Bar(_) | Op::BSync(_) => true,
_ => false,
}
matches!(&self.op, Op::Bar(_) | Op::BSync(_))
}
fn fmt_pred(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

View File

@@ -85,9 +85,8 @@ fn copy_alu_src_if_cbuf(
src: &mut Src,
src_type: SrcType,
) {
match src.src_ref {
SrcRef::CBuf(_) => copy_alu_src(b, src, src_type),
_ => (),
if matches!(src.src_ref, SrcRef::CBuf(_)) {
copy_alu_src(b, src, src_type);
}
}

View File

@@ -81,10 +81,7 @@ fn get_ssa_or_phi(
}
fn get_or_insert_phi_dsts(bb: &mut BasicBlock) -> &mut OpPhiDsts {
let has_phi = match &bb.instrs[0].op {
Op::PhiDsts(_) => true,
_ => false,
};
let has_phi = matches!(&bb.instrs[0].op, Op::PhiDsts(_));
if !has_phi {
bb.instrs.insert(0, Instr::new_boxed(OpPhiDsts::new()));
}