From 451b37820df36588890b4dcec0573155f9f63f21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Se=C3=A1n=20de=20B=C3=BArca?= Date: Thu, 3 Apr 2025 18:17:45 -0700 Subject: [PATCH] nak: remove unnecessary casts and conversions Reviewed-by: Faith Ekstrand Part-of: --- src/nouveau/compiler/nak/api.rs | 4 ++-- src/nouveau/compiler/nak/assign_regs.rs | 4 ++-- src/nouveau/compiler/nak/from_nir.rs | 5 ++--- src/nouveau/compiler/nak/ir.rs | 4 ++-- src/nouveau/compiler/nak/opt_copy_prop.rs | 4 ++-- src/nouveau/compiler/nak/qmd.rs | 10 +++++----- src/nouveau/compiler/nak/spill_values.rs | 2 +- src/nouveau/nil/image.rs | 6 +++--- src/nouveau/nil/tic.rs | 6 +++--- 9 files changed, 22 insertions(+), 23 deletions(-) diff --git a/src/nouveau/compiler/nak/api.rs b/src/nouveau/compiler/nak/api.rs index fe8ea3fb2ad..1bcc43e2996 100644 --- a/src/nouveau/compiler/nak/api.rs +++ b/src/nouveau/compiler/nak/api.rs @@ -314,8 +314,8 @@ impl ShaderBin { writes_point_size: io.attr_written(NAK_ATTR_POINT_SIZE), writes_vprs_table_index: io .attr_written(NAK_ATTR_VPRS_TABLE_INDEX), - clip_enable: io.clip_enable.try_into().unwrap(), - cull_enable: io.cull_enable.try_into().unwrap(), + clip_enable: io.clip_enable, + cull_enable: io.cull_enable, xfb: if let Some(xfb) = &io.xfb { **xfb } else { diff --git a/src/nouveau/compiler/nak/assign_regs.rs b/src/nouveau/compiler/nak/assign_regs.rs index bea0c2791a8..4a262c08a46 100644 --- a/src/nouveau/compiler/nak/assign_regs.rs +++ b/src/nouveau/compiler/nak/assign_regs.rs @@ -1186,7 +1186,7 @@ impl AssignRegsBlock { for (_, src) in pcopy.dsts_srcs.iter_mut() { if let Some(src_vec) = src_ssa_ref(src) { debug_assert!(src_vec.comps() == 1); - let reg = self.get_scalar(src_vec[0]).into(); + let reg = self.get_scalar(src_vec[0]); src_set_reg(src, reg); } } @@ -1225,7 +1225,7 @@ impl AssignRegsBlock { for src in out.srcs.iter_mut() { if let Some(src_vec) = src_ssa_ref(src) { debug_assert!(src_vec.comps() == 1); - let reg = self.get_scalar(src_vec[0]).into(); + let reg = self.get_scalar(src_vec[0]); src_set_reg(src, reg); } } diff --git a/src/nouveau/compiler/nak/from_nir.rs b/src/nouveau/compiler/nak/from_nir.rs index f96295bf905..9b67c34850d 100644 --- a/src/nouveau/compiler/nak/from_nir.rs +++ b/src/nouveau/compiler/nak/from_nir.rs @@ -675,8 +675,7 @@ impl<'a> ShaderFromNir<'a> { } else if *s != Src::from(dw) { continue; } - prmt[usize::from(b)] = - (ds as u8) * 4 + (bytes[b] % 4); + prmt[b] = (ds as u8) * 4 + (bytes[b] % 4); break; } } @@ -2436,7 +2435,7 @@ impl<'a> ShaderFromNir<'a> { b.push_op(OpBreak { bar_out: bar_out.into(), bar_in: bar_in.into(), - cond: cond.into(), + cond, }); self.set_dst(&intrin.def, b.bmov_to_gpr(bar_out.into()).into()); diff --git a/src/nouveau/compiler/nak/ir.rs b/src/nouveau/compiler/nak/ir.rs index ebb67364852..83d8686859b 100644 --- a/src/nouveau/compiler/nak/ir.rs +++ b/src/nouveau/compiler/nak/ir.rs @@ -3779,7 +3779,7 @@ impl Foldable for OpLea { let (dst, o) = u32::overflowing_add(shift_result, b); overflow |= o; - f.set_u32_dst(self, &self.dst, dst as u32); + f.set_u32_dst(self, &self.dst, dst); f.set_pred_dst(self, &self.overflow, overflow); } } @@ -3858,7 +3858,7 @@ impl Foldable for OpLeaX { let (dst, o) = u32::overflowing_add(dst, if carry { 1 } else { 0 }); overflow |= o; - f.set_u32_dst(self, &self.dst, dst as u32); + f.set_u32_dst(self, &self.dst, dst); f.set_pred_dst(self, &self.overflow, overflow); } } diff --git a/src/nouveau/compiler/nak/opt_copy_prop.rs b/src/nouveau/compiler/nak/opt_copy_prop.rs index b32290385fe..fbc5fe7890c 100644 --- a/src/nouveau/compiler/nak/opt_copy_prop.rs +++ b/src/nouveau/compiler/nak/opt_copy_prop.rs @@ -319,10 +319,10 @@ impl<'a> CopyPropPass<'a> { combined[i] = prmt_byte.byte().try_into().unwrap(); } - let entry_src_idx = usize::from(entry_src_idx.unwrap()); + let entry_src_idx = entry_src_idx.unwrap(); let entry_src = &entry.srcs[entry_src_idx]; - if !cbuf_rule.allows_src(entry.bi, &entry_src) { + if !cbuf_rule.allows_src(entry.bi, entry_src) { return; } diff --git a/src/nouveau/compiler/nak/qmd.rs b/src/nouveau/compiler/nak/qmd.rs index bd254ed3f86..565b557a058 100644 --- a/src/nouveau/compiler/nak/qmd.rs +++ b/src/nouveau/compiler/nak/qmd.rs @@ -528,15 +528,15 @@ pub extern "C" fn nak_get_qmd_cbuf_desc_layout( idx: u8, ) -> nak_qmd_cbuf_desc_layout { if dev.cls_compute >= clcbc0::HOPPER_COMPUTE_A { - Qmd4_0::cbuf_desc_layout(idx.into()) + Qmd4_0::cbuf_desc_layout(idx) } else if dev.cls_compute >= clc6c0::AMPERE_COMPUTE_A { - Qmd3_0::cbuf_desc_layout(idx.into()) + Qmd3_0::cbuf_desc_layout(idx) } else if dev.cls_compute >= clc3c0::VOLTA_COMPUTE_A { - Qmd2_2::cbuf_desc_layout(idx.into()) + Qmd2_2::cbuf_desc_layout(idx) } else if dev.cls_compute >= clc0c0::PASCAL_COMPUTE_A { - Qmd2_1::cbuf_desc_layout(idx.into()) + Qmd2_1::cbuf_desc_layout(idx) } else if dev.cls_compute >= cla0c0::KEPLER_COMPUTE_A { - Qmd0_6::cbuf_desc_layout(idx.into()) + Qmd0_6::cbuf_desc_layout(idx) } else { panic!("Unsupported shader model"); } diff --git a/src/nouveau/compiler/nak/spill_values.rs b/src/nouveau/compiler/nak/spill_values.rs index 3ead022d7e6..f334c3730ce 100644 --- a/src/nouveau/compiler/nak/spill_values.rs +++ b/src/nouveau/compiler/nak/spill_values.rs @@ -837,7 +837,7 @@ fn spill_values( assert!(spill.is_const(ssa)); instrs.push(spill.spill(*ssa)); } - *ssa = spill.get_spill(*ssa).into(); + *ssa = spill.get_spill(*ssa); } }); } else if file == RegFile::UPred && !bb.uniform { diff --git a/src/nouveau/nil/image.rs b/src/nouveau/nil/image.rs index 596bd7cb65c..8ae867e6248 100644 --- a/src/nouveau/nil/image.rs +++ b/src/nouveau/nil/image.rs @@ -271,7 +271,7 @@ impl Image { extent_px: info.extent_px, sample_layout, num_levels: info.levels, - levels: [ImageLevel::default(); MAX_LEVELS as usize], + levels: [ImageLevel::default(); MAX_LEVELS], array_stride_B: 0, align_B, size_B, @@ -352,7 +352,7 @@ impl Image { extent_px: info.extent_px, sample_layout, num_levels: info.levels, - levels: [ImageLevel::default(); MAX_LEVELS as usize], + levels: [ImageLevel::default(); MAX_LEVELS], array_stride_B: 0, align_B: 0, size_B: 0, @@ -632,7 +632,7 @@ impl Image { size_B -= next_lvl_offset_in_bytes - lvl.offset_B; } - let mut levels: [ImageLevel; MAX_LEVELS as usize] = Default::default(); + let mut levels: [ImageLevel; MAX_LEVELS] = Default::default(); levels[0] = lvl; *offset_in_bytes_out = lvl.offset_B; diff --git a/src/nouveau/nil/tic.rs b/src/nouveau/nil/tic.rs index 903d84e742b..0c1fa4bd47c 100644 --- a/src/nouveau/nil/tic.rs +++ b/src/nouveau/nil/tic.rs @@ -273,8 +273,8 @@ fn nv9097_fill_tic( nv9097_set_th_v2_0(&mut th, &view.format, view.swizzle); // There's no base layer field in the texture header - let layer_address = base_address - + u64::from(view.base_array_layer) * u64::from(image.array_stride_B); + let layer_address = + base_address + u64::from(view.base_array_layer) * image.array_stride_B; th.set_field(cl9097::TEXHEADV2_OFFSET_LOWER, layer_address as u32); th.set_field(cl9097::TEXHEADV2_OFFSET_UPPER, (layer_address >> 32) as u32); @@ -395,7 +395,7 @@ fn nvb097_fill_tic( view.base_array_layer + view.array_len <= image.extent_px.array_len ); layer_address += - u64::from(view.base_array_layer) * u64::from(image.array_stride_B); + u64::from(view.base_array_layer) * image.array_stride_B; } if tiling.is_tiled() {