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

rusticl/kernel/launch: rework how the printf buffer is allocated

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29527>
This commit is contained in:
Karol Herbst 2024-06-04 00:00:49 +02:00 • committed by Marge Bot
parent 25d1f84b57
commit 5c1122728a
1 changed files with 20 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/gallium/frontends/rusticl/core/kernel.rs
View file

@ -1082,8 +1082,25 @@ impl Kernel {
// subtract the shader local_size as we only request something on top of that.
variable_local_size -= static_local_size;
let printf_format = &nir_kernel_build.printf_info;
let mut printf_buf = None;
if nir_kernel_build.printf_info.is_some() {
let buf = Arc::new(
q.device
.screen
.resource_create_buffer(
printf_size,
ResourceType::Staging,
PIPE_BIND_GLOBAL,
)
.unwrap(),
);
let init_data: [u8; 1] = [4];
ctx.buffer_subdata(&buf, 0, init_data.as_ptr().cast(), init_data.len() as u32);
printf_buf = Some(buf);
}
for arg in &kernel_info.internal_args {
if arg.offset > input.len() {
input.resize(arg.offset, 0);
@ -1105,21 +1122,8 @@ impl Kernel {
input.extend_from_slice(null_ptr_v3);
}
InternalKernelArgType::PrintfBuffer => {
let buf = Arc::new(
q.device
.screen
.resource_create_buffer(
printf_size,
ResourceType::Staging,
PIPE_BIND_GLOBAL,
)
.unwrap(),
);
input.extend_from_slice(null_ptr);
resource_info.push((buf.clone(), arg.offset));
printf_buf = Some(buf);
resource_info.push((printf_buf.as_ref().unwrap().clone(), arg.offset));
}
InternalKernelArgType::InlineSampler(cl) => {
samplers.push(Sampler::cl_to_pipe(cl));
@ -1159,16 +1163,6 @@ impl Kernel {
globals.push(unsafe { input.as_mut_ptr().add(*offset) }.cast());
}
if let Some(printf_buf) = &printf_buf {
let init_data: [u8; 1] = [4];
ctx.buffer_subdata(
printf_buf,
0,
init_data.as_ptr().cast(),
init_data.len() as u32,
);
}
let temp_cso;
let cso = match &nir_kernel_build.nir_or_cso {
KernelDevStateVariant::Cso(cso) => cso,
@ -1256,7 +1250,7 @@ impl Kernel {
// update our slice to make sure we don't go out of bounds
buf = &buf[0..(length - 4) as usize];
if let Some(pf) = printf_format.as_ref() {
if let Some(pf) = &nir_kernel_build.printf_info {
pf.u_printf(buf)
}
}