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

nak: Fold source modifiers in legalize

Browse source 
We were smashing them to None later but didn't actually take them into
account in fold_lop_src() to ensure the smash was valid.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24998>
This commit is contained in:
Faith Ekstrand 2023-09-22 12:19:30 -05:00 • committed by Marge Bot
parent 6da06bf7d7
commit 5654366a55
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -38,6 +38,9 @@ fn fold_lop_src(src: &Src, x: &mut u8) {
if let Some(i) = src_as_lop_imm(src) {
*x = if i { !0 } else { 0 };
}
if src.src_mod.is_bnot() {
*x = !*x;
}
}
fn copy_src(b: &mut impl SSABuilder, src: &mut Src, file: RegFile) {
@ -159,7 +162,7 @@ fn legalize_instr(b: &mut impl SSABuilder, instr: &mut Instr) {
copy_src_if_not_reg(b, src0, RegFile::GPR);
}
Op::Lop3(op) => {
/* Fold constants if we can */
/* Fold constants and modifiers if we can */
op.op = LogicOp::new_lut(&|mut x, mut y, mut z| {
fold_lop_src(&op.srcs[0], &mut x);
fold_lop_src(&op.srcs[1], &mut y);
@ -206,7 +209,7 @@ fn legalize_instr(b: &mut impl SSABuilder, instr: &mut Instr) {
copy_src_if_not_reg(b, src0, RegFile::GPR);
}
Op::PLop3(op) => {
/* Fold constants if we can */
/* Fold constants and modifiers if we can */
for lop in &mut op.ops {
*lop = LogicOp::new_lut(&|mut x, mut y, mut z| {
fold_lop_src(&op.srcs[0], &mut x);