Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[refactor] Decouple KernelProfilerBase::sync() from Program::synchronize() #3504

Merged
merged 7 commits into from
Nov 17, 2021
Merged

[refactor] Decouple KernelProfilerBase::sync() from Program::synchronize() #3504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d79fc8f
wip
yolo2themoon Nov 13, 2021
b87c31a
Merge branch 'master' into kernel_profiler_sync
yolo2themoon Nov 14, 2021
12176f9
fix pylint error
yolo2themoon Nov 14, 2021
28433b1
add enabled_ for KernelProfilerBase
yolo2themoon Nov 15, 2021
d64154f
update naming
yolo2themoon Nov 15, 2021
55f7aec
remove enabled_ from KernelProfilerBase
yolo2themoon Nov 16, 2021
2c39a31
finally, we can return nullprt now
yolo2themoon Nov 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions python/taichi/profiler/kernelprofiler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def clear_info(self):
if self._check_not_turned_on_with_warning_message():
return None
#sync first
impl.get_runtime().sync()
impl.get_runtime().prog.sync_kernel_profiler()
#then clear backend & frontend info
impl.get_runtime().prog.clear_kernel_profile_info()
self._clear_frontend()
Expand Down Expand Up @@ -186,7 +186,7 @@ def _clear_frontend(self):

def _update_records(self):
"""Acquires kernel records from a backend."""
impl.get_runtime().sync()
impl.get_runtime().prog.sync_kernel_profiler()
self._clear_frontend()
self._traced_records = impl.get_runtime(
).prog.get_kernel_profiler_records()
Expand Down
6 changes: 4 additions & 2 deletions taichi/backends/metal/kernel_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -997,11 +997,13 @@ class KernelManager::Impl {
end_encoding(encoder.get());
}
// Sync
profiler_->start("metal_synchronize");
if (profiler_)
profiler_->start("metal_synchronize");
commit_command_buffer(cur_command_buffer_.get());
wait_until_completed(cur_command_buffer_.get());
create_new_command_buffer();
profiler_->stop();
if (profiler_)
profiler_->stop();

// print_runtime_debug();
}
Expand Down
2 changes: 2 additions & 0 deletions taichi/program/kernel_profiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ class DefaultProfiler : public KernelProfilerBase {
} // namespace

std::unique_ptr<KernelProfilerBase> make_profiler(Arch arch, bool enable) {
if (!enable)
return nullptr;
if (arch == Arch::cuda) {
#if defined(TI_WITH_CUDA)
return std::make_unique<KernelProfilerCUDA>(enable);
Expand Down
3 changes: 0 additions & 3 deletions taichi/program/program.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,6 @@ void Program::synchronize() {
if (config.async_mode) {
async_engine->synchronize();
}
if (profiler) {
profiler->sync();
}
if (arch_uses_llvm(config.arch) || config.arch == Arch::metal ||
config.arch == Arch::vulkan) {
program_impl_->synchronize();
Expand Down
2 changes: 2 additions & 0 deletions taichi/python/export_lang.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,8 @@ void export_lang(py::module &m) {
py::class_<Program>(m, "Program")
.def(py::init<>())
.def_readonly("config", &Program::config)
.def("sync_kernel_profiler",
[](Program *program) { program->profiler->sync(); })
.def("query_kernel_profile_info",
[](Program *program, const std::string &name) {
return program->query_kernel_profile_info(name);
Expand Down