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

nak/legalize: Take a RegFile in copy_alu_src_and_lower_fmod

Browse source 
Otherwise, we'll screw up uniform GPRs.

Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33107>
(cherry picked from commit 22a30bfa4f)
This commit is contained in:
Faith Ekstrand 2025-04-16 18:58:27 -05:00 • committed by Eric Engestrom
parent 70ad887eda
commit 61b44913f5
4 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -2504,7 +2504,7 @@
"description": "nak/legalize: Take a RegFile in copy_alu_src_and_lower_fmod",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

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

@ -231,11 +231,12 @@ pub trait LegalizeBuildHelpers: SSABuilder {
fn copy_alu_src_and_lower_fmod(
&mut self,
src: &mut Src,
reg_file: RegFile,
src_type: SrcType,
) {
match src_type {
SrcType::F16 | SrcType::F16v2 => {
let val = self.alloc_ssa(RegFile::GPR, 1);
let val = self.alloc_ssa(reg_file, 1);
self.push_op(OpHAdd2 {
dst: val.into(),
srcs: [Src::new_zero().fneg(), *src],
@ -246,7 +247,7 @@ pub trait LegalizeBuildHelpers: SSABuilder {
*src = val.into();
}
SrcType::F32 => {
let val = self.alloc_ssa(RegFile::GPR, 1);
let val = self.alloc_ssa(reg_file, 1);
self.push_op(OpFAdd {
dst: val.into(),
srcs: [Src::new_zero().fneg(), *src],
@ -257,7 +258,7 @@ pub trait LegalizeBuildHelpers: SSABuilder {
*src = val.into();
}
SrcType::F64 => {
let val = self.alloc_ssa(RegFile::GPR, 2);
let val = self.alloc_ssa(reg_file, 2);
self.push_op(OpDAdd {
dst: val.into(),
srcs: [Src::new_zero().fneg(), *src],

29
src/nouveau/compiler/nak/sm50.rs
View file

@ -318,9 +318,14 @@ impl SM50Encoder<'_> {
//
pub trait SM50LegalizeBuildHelpers: LegalizeBuildHelpers {
fn copy_alu_src_if_fabs(&mut self, src: &mut Src, src_type: SrcType) {
fn copy_alu_src_if_fabs(
&mut self,
src: &mut Src,
reg_file: RegFile,
src_type: SrcType,
) {
if src.src_mod.has_fabs() {
self.copy_alu_src_and_lower_fmod(src, src_type);
self.copy_alu_src_and_lower_fmod(src, reg_file, src_type);
}
}
@ -451,9 +456,9 @@ impl SM50Op for OpFFma {
fn legalize(&mut self, b: &mut LegalizeBuilder) {
use RegFile::GPR;
let [src0, src1, src2] = &mut self.srcs;
b.copy_alu_src_if_fabs(src0, SrcType::F32);
b.copy_alu_src_if_fabs(src1, SrcType::F32);
b.copy_alu_src_if_fabs(src2, SrcType::F32);
b.copy_alu_src_if_fabs(src0, GPR, SrcType::F32);
b.copy_alu_src_if_fabs(src1, GPR, SrcType::F32);
b.copy_alu_src_if_fabs(src2, GPR, SrcType::F32);
swap_srcs_if_not_reg(src0, src1, GPR);
b.copy_alu_src_if_not_reg(src0, GPR, SrcType::F32);
b.copy_alu_src_if_f20_overflow(src1, GPR, SrcType::F32);
@ -558,8 +563,8 @@ impl SM50Op for OpFMul {
fn legalize(&mut self, b: &mut LegalizeBuilder) {
use RegFile::GPR;
let [src0, src1] = &mut self.srcs;
b.copy_alu_src_if_fabs(src0, SrcType::F32);
b.copy_alu_src_if_fabs(src1, SrcType::F32);
b.copy_alu_src_if_fabs(src0, GPR, SrcType::F32);
b.copy_alu_src_if_fabs(src1, GPR, SrcType::F32);
swap_srcs_if_not_reg(src0, src1, GPR);
b.copy_alu_src_if_not_reg(src0, GPR, SrcType::F32);
}
@ -889,9 +894,9 @@ impl SM50Op for OpDFma {
fn legalize(&mut self, b: &mut LegalizeBuilder) {
use RegFile::GPR;
let [src0, src1, src2] = &mut self.srcs;
b.copy_alu_src_if_fabs(src0, SrcType::F64);
b.copy_alu_src_if_fabs(src1, SrcType::F64);
b.copy_alu_src_if_fabs(src2, SrcType::F64);
b.copy_alu_src_if_fabs(src0, GPR, SrcType::F64);
b.copy_alu_src_if_fabs(src1, GPR, SrcType::F64);
b.copy_alu_src_if_fabs(src2, GPR, SrcType::F64);
swap_srcs_if_not_reg(src0, src1, GPR);
b.copy_alu_src_if_not_reg(src0, GPR, SrcType::F64);
b.copy_alu_src_if_f20_overflow(src1, GPR, SrcType::F64);
@ -988,8 +993,8 @@ impl SM50Op for OpDMul {
fn legalize(&mut self, b: &mut LegalizeBuilder) {
use RegFile::GPR;
let [src0, src1] = &mut self.srcs;
b.copy_alu_src_if_fabs(src0, SrcType::F64);
b.copy_alu_src_if_fabs(src1, SrcType::F64);
b.copy_alu_src_if_fabs(src0, GPR, SrcType::F64);
b.copy_alu_src_if_fabs(src1, GPR, SrcType::F64);
swap_srcs_if_not_reg(src0, src1, GPR);
b.copy_alu_src_if_not_reg(src0, GPR, SrcType::F64);
b.copy_alu_src_if_f20_overflow(src1, GPR, SrcType::F64);

2
src/nouveau/compiler/nak/sm70.rs
View file

@ -1202,7 +1202,7 @@ impl SM70Op for OpHFma2 {
// HFMA2 doesn't have fabs or fneg on SRC2.
if !src2.src_mod.is_none() {
b.copy_alu_src_and_lower_fmod(src2, SrcType::F16v2);
b.copy_alu_src_and_lower_fmod(src2, gpr, SrcType::F16v2);
}
}