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

rusticl: Wire the 'start' and 'end' profilng times up

Browse source 
We use the timestamp pipe queries to retrieve times from the
device, hopefully close to the execution of the code.

For now we use the End value for complete as well.

Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24101>
This commit is contained in:
Dr. David Alan Gilbert 2023-07-10 15:10:31 +01:00 • committed by Marge Bot
parent 4a44dd1654
commit 69101c72f3
2 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gallium/frontends/rusticl/api/event.rs
View file

@ -49,12 +49,12 @@ impl CLInfo<cl_profiling_info> for cl_event {
}
Ok(match *q {
// TODO
CL_PROFILING_COMMAND_QUEUED => cl_prop::<cl_ulong>(event.get_time(EventTimes::Queued)),
CL_PROFILING_COMMAND_SUBMIT => cl_prop::<cl_ulong>(event.get_time(EventTimes::Submit)),
CL_PROFILING_COMMAND_START => cl_prop::<cl_ulong>(2),
CL_PROFILING_COMMAND_END => cl_prop::<cl_ulong>(3),
CL_PROFILING_COMMAND_COMPLETE => cl_prop::<cl_ulong>(3),
CL_PROFILING_COMMAND_START => cl_prop::<cl_ulong>(event.get_time(EventTimes::Start)),
CL_PROFILING_COMMAND_END => cl_prop::<cl_ulong>(event.get_time(EventTimes::End)),
// For now, we treat Complete the same as End
CL_PROFILING_COMMAND_COMPLETE => cl_prop::<cl_ulong>(event.get_time(EventTimes::End)),
_ => return Err(CL_INVALID_VALUE),
})
}

25
src/gallium/frontends/rusticl/core/event.rs
View file

@ -5,6 +5,8 @@ use crate::core::queue::*;
use crate::impl_cl_type_trait;
use mesa_rust::pipe::context::*;
use mesa_rust::pipe::query::*;
use mesa_rust_gen::*;
use mesa_rust_util::static_assert;
use rusticl_opencl_gen::*;
@ -28,6 +30,8 @@ pub type EventSig = Box<dyn Fn(&Arc<Queue>, &PipeContext) -> CLResult<()>>;
pub enum EventTimes {
Queued = CL_PROFILING_COMMAND_QUEUED as isize,
Submit = CL_PROFILING_COMMAND_SUBMIT as isize,
Start = CL_PROFILING_COMMAND_START as isize,
End = CL_PROFILING_COMMAND_END as isize,
}
#[derive(Default)]
@ -37,6 +41,8 @@ struct EventMutState {
work: Option<EventSig>,
time_queued: cl_ulong,
time_submit: cl_ulong,
time_start: cl_ulong,
time_end: cl_ulong,
}
pub struct Event {
@ -139,6 +145,8 @@ impl Event {
match which {
EventTimes::Queued => lock.time_queued = value,
EventTimes::Submit => lock.time_submit = value,
EventTimes::Start => lock.time_start = value,
EventTimes::End => lock.time_end = value,
}
}
@ -148,6 +156,8 @@ impl Event {
match which {
EventTimes::Queued => lock.time_queued,
EventTimes::Submit => lock.time_submit,
EventTimes::Start => lock.time_start,
EventTimes::End => lock.time_end,
}
}
@ -197,15 +207,26 @@ impl Event {
lock.time_submit = queue.device.screen().get_timestamp();
}
let work = lock.work.take();
let mut query_start = None;
let mut query_end = None;
let new = work.as_ref().map_or(
// if there is no work
CL_SUBMITTED as cl_int,
|w| {
if profiling_enabled {
query_start =
PipeQueryGen::<{ pipe_query_type::PIPE_QUERY_TIMESTAMP }>::new(ctx);
}
let res = w(queue, ctx).err().map_or(
// if there is an error, negate it
CL_SUBMITTED as cl_int,
|e| e,
);
if profiling_enabled {
query_end =
PipeQueryGen::<{ pipe_query_type::PIPE_QUERY_TIMESTAMP }>::new(ctx);
}
res
},
);
@ -213,6 +234,10 @@ impl Event {
// status change. It's probably fine to move the value above, but we have to be
// absolutely sure it happens before the status update.
drop(work);
if profiling_enabled {
lock.time_start = query_start.unwrap().read_blocked();
lock.time_end = query_end.unwrap().read_blocked();
}
self.set_status(&mut lock, new);
}
}