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

nak/copy_prop: Don't propagate cbufs into ALU on Blackwell+

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34910>
This commit is contained in:
Faith Ekstrand 2025-05-09 11:19:22 -04:00 • committed by Marge Bot
parent 9604896c70
commit 046f90ad56
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/nouveau/compiler/nak/opt_copy_prop.rs
View file

@ -59,13 +59,15 @@ enum CopyPropEntry {
ConvIntToBool(ConvIntToBool),
}
struct CopyPropPass {
struct CopyPropPass<'a> {
sm: &'a dyn ShaderModel,
ssa_map: HashMap<SSAValue, CopyPropEntry>,
}
impl CopyPropPass {
pub fn new() -> CopyPropPass {
impl<'a> CopyPropPass<'a> {
pub fn new(sm: &'a dyn ShaderModel) -> Self {
CopyPropPass {
sm: sm,
ssa_map: HashMap::new(),
}
}
@ -766,7 +768,12 @@ impl CopyPropPass {
self.prop_to_pred(&mut instr.pred);
let cbuf_rule = if instr.is_uniform() {
let cbuf_rule = if self.sm.sm() >= 100 {
// Blackwell+ doesn't allow cbufs directly in instruction
// sources anymore and instead have to be explicitly loaded
// with OpLdc.
CBufRule::No
} else if instr.is_uniform() {
CBufRule::No
} else if !b_uniform {
CBufRule::BindlessRequiresBlock(bi)
@ -813,7 +820,7 @@ impl CopyPropPass {
impl Shader<'_> {
pub fn opt_copy_prop(&mut self) {
for f in &mut self.functions {
CopyPropPass::new().run(f);
CopyPropPass::new(self.sm).run(f);
}
}
}