AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvk/qmd: fix shared memory size calcs for blackwell.

Browse Source 
I'm still not 100% happy with these, nvidia does appear to use 26
as the max/target values, which corresponds to + 7 not +1
but let's dig a bit more.

Fixes: 6c052d87b7 ("nak/qmd: Add QMD version 5.0 for Blackwell+")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35484>
This commit is contained in:
Dave Airlie
2025-06-10 10:10:13 +10:00
committed by Marge Bot
parent ec3232691b
commit f310b3fa6f
1 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nouveau/compiler/nak/qmd.rs
+10 -20
View File
@@ -369,22 +369,6 @@ macro_rules! qmd_impl_set_smem_size_bounded {
};
}
fn gb100_sm_config_smem_size(size: u32) -> u32 {
let size = if size > 64 * 1024 {
96 * 1024
} else if size > 32 * 1024 {
64 * 1024
} else if size > 16 * 1024 {
32 * 1024
} else if size > 8 * 1024 {
16 * 1024
} else {
8 * 1024
};
size / 4096 + 7
}
macro_rules! qmd_impl_set_smem_size_bounded_gb {
($c:ident, $s:ident) => {
fn set_smem_size(&mut self, smem_size: u32, smem_max: u32) {
@@ -394,11 +378,17 @@ macro_rules! qmd_impl_set_smem_size_bounded_gb {
let size_shift = 7;
let smem_size_shifted = smem_size >> size_shift;
assert!((smem_size_shifted << size_shift) == smem_size);
set_field!(bv, $c, $s, SHARED_MEMORY_SIZE_SHIFTED7, smem_size);
set_field!(
bv,
$c,
$s,
SHARED_MEMORY_SIZE_SHIFTED7,
smem_size_shifted
);
let max = gb100_sm_config_smem_size(smem_max);
let min = gb100_sm_config_smem_size(smem_size.into());
let target = gb100_sm_config_smem_size(smem_size.into());
let max = gv100_sm_config_smem_size(smem_max);
let min = gv100_sm_config_smem_size(smem_size.into());
let target = gv100_sm_config_smem_size(smem_size.into());
set_field!(bv, $c, $s, MIN_SM_CONFIG_SHARED_MEM_SIZE, min);
set_field!(bv, $c, $s, MAX_SM_CONFIG_SHARED_MEM_SIZE, max);
set_field!(bv, $c, $s, TARGET_SM_CONFIG_SHARED_MEM_SIZE, target);