OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rusticl/kernel/launch: get rid of Arc clones for global resources

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29527>
This commit is contained in:
Karol Herbst
2024-06-04 00:18:25 +02:00
committed by Marge Bot
parent 5c1122728a
commit 17a52774db
2 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gallium/frontends/rusticl/core/kernel.rs
View File

@@ -1001,7 +1001,7 @@ impl Kernel {
let offset: u32 = buffer.offset as u32; let offset: u32 = buffer.offset as u32;
input.extend_from_slice(&offset.to_ne_bytes()); input.extend_from_slice(&offset.to_ne_bytes());
} }
resource_info.push((res.clone(), arg.offset)); resource_info.push((res.as_ref(), arg.offset));
} }
KernelArgValue::Image(image) => { KernelArgValue::Image(image) => {
let res = image.get_res_of_dev(q.device)?; let res = image.get_res_of_dev(q.device)?;
@@ -1084,16 +1084,11 @@ impl Kernel {
let mut printf_buf = None; let mut printf_buf = None;
if nir_kernel_build.printf_info.is_some() { if nir_kernel_build.printf_info.is_some() {
let buf = Arc::new( let buf = q
q.device .device
.screen .screen
.resource_create_buffer( .resource_create_buffer(printf_size, ResourceType::Staging, PIPE_BIND_GLOBAL)
printf_size, .unwrap();
ResourceType::Staging,
PIPE_BIND_GLOBAL,
)
.unwrap(),
);
let init_data: [u8; 1] = [4]; let init_data: [u8; 1] = [4];
ctx.buffer_subdata(&buf, 0, init_data.as_ptr().cast(), init_data.len() as u32); ctx.buffer_subdata(&buf, 0, init_data.as_ptr().cast(), init_data.len() as u32);
@@ -1110,7 +1105,7 @@ impl Kernel {
assert!(nir_kernel_build.constant_buffer.is_some()); assert!(nir_kernel_build.constant_buffer.is_some());
input.extend_from_slice(null_ptr); input.extend_from_slice(null_ptr);
resource_info.push(( resource_info.push((
nir_kernel_build.constant_buffer.clone().unwrap(), &nir_kernel_build.constant_buffer.as_ref().unwrap(),
arg.offset, arg.offset,
)); ));
} }
@@ -1123,7 +1118,7 @@ impl Kernel {
} }
InternalKernelArgType::PrintfBuffer => { InternalKernelArgType::PrintfBuffer => {
input.extend_from_slice(null_ptr); input.extend_from_slice(null_ptr);
resource_info.push((printf_buf.as_ref().unwrap().clone(), arg.offset)); resource_info.push((printf_buf.as_ref().unwrap(), arg.offset));
} }
InternalKernelArgType::InlineSampler(cl) => { InternalKernelArgType::InlineSampler(cl) => {
samplers.push(Sampler::cl_to_pipe(cl)); samplers.push(Sampler::cl_to_pipe(cl));
@@ -1158,9 +1153,9 @@ impl Kernel {
let mut resources = Vec::with_capacity(resource_info.len()); let mut resources = Vec::with_capacity(resource_info.len());
let mut globals: Vec<*mut u32> = Vec::with_capacity(resource_info.len()); let mut globals: Vec<*mut u32> = Vec::with_capacity(resource_info.len());
for (res, offset) in &resource_info { for (res, offset) in resource_info {
resources.push(res); resources.push(res);
globals.push(unsafe { input.as_mut_ptr().add(*offset) }.cast()); globals.push(unsafe { input.as_mut_ptr().add(offset) }.cast());
} }
let temp_cso; let temp_cso;

4
src/gallium/frontends/rusticl/mesa/pipe/context.rs
View File

@@ -475,8 +475,8 @@ impl PipeContext {
unsafe { self.pipe.as_ref().launch_grid.unwrap()(self.pipe.as_ptr(), &info) } unsafe { self.pipe.as_ref().launch_grid.unwrap()(self.pipe.as_ptr(), &info) }
} }
pub fn set_global_binding(&self, res: &[&Arc<PipeResource>], out: &mut [*mut u32]) { pub fn set_global_binding(&self, res: &[&PipeResource], out: &mut [*mut u32]) {
let mut res: Vec<_> = res.iter().map(|r| r.pipe()).collect(); let mut res: Vec<_> = res.iter().copied().map(PipeResource::pipe).collect();
unsafe { unsafe {
self.pipe.as_ref().set_global_binding.unwrap()( self.pipe.as_ref().set_global_binding.unwrap()(
self.pipe.as_ptr(), self.pipe.as_ptr(),