-
Notifications
You must be signed in to change notification settings - Fork 5.6k
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.
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
add new profiler components #39964
Merged
wanghuancoder
merged 2 commits into
PaddlePaddle:develop
from
rainyfly:add_new_profiler_components
Feb 28, 2022
Merged
add new profiler components #39964
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 6 additions & 3 deletions
9
paddle/fluid/platform/profiler/CMakeLists.txt
100644 → 100755
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,11 @@ | ||
cc_library(host_tracer SRCS host_tracer.cc DEPS enforce) | ||
cc_library(cuda_tracer SRCS cuda_tracer.cc cupti_data_process.cc DEPS workqueue_utils enforce glog) | ||
cc_library(new_profiler SRCS profiler.cc DEPS host_tracer cuda_tracer) | ||
cc_library(event_node SRCS event_node.cc DEPS enforce) | ||
cc_library(chrometracinglogger SRCS chrometracing_logger.cc DEPS event_node) | ||
cc_library(profiler_utils SRCS utils.cc DEPS enforce glog) | ||
cc_library(chrometracinglogger SRCS chrometracing_logger.cc DEPS event_node profiler_utils) | ||
cc_test(test_event_node SRCS test_event_node.cc DEPS event_node chrometracinglogger) | ||
cc_test(new_profiler_test SRCS profiler_test.cc DEPS new_profiler event_node) | ||
add_subdirectory(dump) | ||
cc_library(cpu_utilization SRCS cpu_utilization.cc DEPS cpu_info os_info enforce glog) | ||
cc_test(test_extra_info SRCS test_extra_info.cc DEPS profiler_utils) | ||
cc_library(new_profiler SRCS profiler.cc DEPS host_tracer cuda_tracer profiler_utils cpu_utilization) | ||
cc_test(new_profiler_test SRCS profiler_test.cc DEPS new_profiler event_node) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,172 @@ | ||
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
#include "paddle/fluid/platform/profiler/cpu_utilization.h" | ||
|
||
namespace paddle { | ||
namespace platform { | ||
|
||
#ifdef _MSC_VER | ||
static uint64_t FileTimeToUint64(FILETIME time) { | ||
uint64_t low_part = time.dwLowDateTime; | ||
uint64_t high_part = time.dwHighDateTime; | ||
uint64_t result = (high_part << 32) | low_part; | ||
return result; | ||
} | ||
#endif | ||
|
||
void CpuUtilization::RecordBeginTimeInfo() { | ||
#if defined(_MSC_VER) | ||
HANDLE process_handle = GetCurrentProcess(); | ||
GetSystemTimeAsFileTime(&start_); | ||
GetSystemTimes(&system_idle_time_start_, &system_kernel_time_start_, | ||
&system_user_time_start_); | ||
GetProcessTimes(process_handle, &process_creation_time_, &process_exit_time_, | ||
&process_kernel_time_start_, &process_user_time_start_); | ||
|
||
#elif defined(__linux__) | ||
start_ = times(&process_tms_start_); | ||
#define proc_path_size 1024 | ||
static char proc_stat_path[proc_path_size] = "/proc/stat"; | ||
FILE *stat_file = fopen(proc_stat_path, "r"); | ||
if (stat_file != nullptr) { | ||
char temp_str[200]; | ||
uint64_t temp_lu; | ||
while (true) { | ||
int retval = fscanf( | ||
stat_file, "%s %" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 | ||
"%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64, | ||
temp_str, &system_tms_start_.tms_utime, &nice_time_start_, | ||
&system_tms_start_.tms_stime, &idle_start_, &iowait_start_, | ||
&irq_start_, &softirq_start_, &steal_start_, &temp_lu, &temp_lu); | ||
if (std::string(temp_str).find("cpu") != 0) { | ||
break; | ||
} | ||
if (retval != 11) { | ||
return; | ||
} | ||
} | ||
fclose(stat_file); | ||
} | ||
#else | ||
#endif | ||
} | ||
|
||
void CpuUtilization::RecordEndTimeInfo() { | ||
#if defined(_MSC_VER) | ||
HANDLE process_handle = GetCurrentProcess(); | ||
GetSystemTimeAsFileTime(&end_); | ||
GetSystemTimes(&system_idle_time_end_, &system_kernel_time_end_, | ||
&system_user_time_end_); | ||
GetProcessTimes(process_handle, &process_creation_time_, &process_exit_time_, | ||
&process_kernel_time_end_, &process_user_time_end_); | ||
#elif defined(__linux__) | ||
end_ = times(&process_tms_end_); | ||
#define proc_path_size 1024 | ||
static char proc_stat_path[proc_path_size] = "/proc/stat"; | ||
FILE *stat_file = fopen(proc_stat_path, "r"); | ||
if (stat_file != nullptr) { | ||
char temp_str[200]; | ||
uint64_t temp_lu; | ||
while (true) { | ||
int retval = fscanf( | ||
stat_file, "%s %" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 | ||
"%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64, | ||
temp_str, &system_tms_end_.tms_utime, &nice_time_end_, | ||
&system_tms_end_.tms_stime, &idle_end_, &iowait_end_, &irq_end_, | ||
&softirq_end_, &steal_end_, &temp_lu, &temp_lu); | ||
if (std::string(temp_str).find("cpu") != 0) { | ||
break; | ||
} | ||
if (retval != 11) { | ||
return; | ||
} | ||
} | ||
fclose(stat_file); | ||
} | ||
#else | ||
#endif | ||
} | ||
|
||
float CpuUtilization::GetCpuUtilization() { | ||
float cpu_utilization = 0.0; | ||
#if defined(_MSC_VER) | ||
uint64_t system_user_time_start = FileTimeToUint64(system_user_time_start_); | ||
uint64_t system_user_time_end = FileTimeToUint64(system_user_time_end_); | ||
uint64_t system_kernel_time_start = | ||
FileTimeToUint64(system_kernel_time_start_); | ||
uint64_t system_kernel_time_end = FileTimeToUint64(system_kernel_time_end_); | ||
uint64_t system_idle_time_start = FileTimeToUint64(system_idle_time_start_); | ||
uint64_t system_idle_time_end = FileTimeToUint64(system_idle_time_end_); | ||
float busy_time = (system_kernel_time_end - system_kernel_time_start) + | ||
(system_user_time_end - system_user_time_start); | ||
float idle_time = system_idle_time_end - system_idle_time_start; | ||
cpu_utilization = busy_time / (busy_time + idle_time); | ||
|
||
#elif defined(__linux__) | ||
float busy_time = (system_tms_end_.tms_utime - system_tms_start_.tms_utime) + | ||
(system_tms_end_.tms_stime - system_tms_start_.tms_stime) + | ||
(nice_time_end_ - nice_time_start_) + | ||
(irq_end_ - irq_start_) + (softirq_end_ - softirq_start_) + | ||
(steal_end_ - steal_start_); | ||
float idle_time = (idle_end_ - idle_start_) + (iowait_end_ - iowait_start_); | ||
cpu_utilization = busy_time / (busy_time + idle_time); | ||
#else | ||
LOG(WARNING) | ||
<< "Current System is not supported to get system cpu utilization" | ||
<< cpu_utilization << std::endl; | ||
#endif | ||
return cpu_utilization; | ||
} | ||
|
||
float CpuUtilization::GetCpuCurProcessUtilization() { | ||
float cpu_process_utilization = 0.0; | ||
#ifdef _MSC_VER | ||
uint64_t process_user_time_start = FileTimeToUint64(process_user_time_start_); | ||
uint64_t process_user_time_end = FileTimeToUint64(process_user_time_end_); | ||
uint64_t process_kernel_time_start = | ||
FileTimeToUint64(process_kernel_time_start_); | ||
uint64_t process_kernel_time_end = FileTimeToUint64(process_kernel_time_end_); | ||
uint64_t start = FileTimeToUint64(start_); | ||
uint64_t end = FileTimeToUint64(end_); | ||
float busy_time = (process_kernel_time_end - process_kernel_time_start) + | ||
(process_user_time_end - process_user_time_start); | ||
cpu_process_utilization = busy_time / (end - start); | ||
LOG(INFO) << "Process Utilization = " << cpu_process_utilization << std::endl; | ||
#elif defined(__linux__) | ||
float busy_time = | ||
(process_tms_end_.tms_utime - process_tms_start_.tms_utime) + | ||
(process_tms_end_.tms_stime - process_tms_start_.tms_stime); | ||
cpu_process_utilization = busy_time / (end_ - start_); | ||
#else | ||
LOG(WARNING) | ||
<< "Current System is not supported to get process cpu utilization" | ||
<< cpu_process_utilization << std::endl; | ||
#endif | ||
return cpu_process_utilization; | ||
} | ||
|
||
} // namespace platform | ||
} // namespace paddle |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
#pragma once | ||
|
||
#include <stdio.h> | ||
#include <cinttypes> | ||
#include <cstdint> | ||
#include "glog/logging.h" | ||
#ifdef _MSC_VER | ||
#include <windows.h> | ||
#else | ||
#include <sys/times.h> | ||
#include <unistd.h> | ||
#endif | ||
|
||
namespace paddle { | ||
namespace platform { | ||
|
||
class CpuUtilization { | ||
public: | ||
CpuUtilization() {} | ||
void RecordBeginTimeInfo(); | ||
void RecordEndTimeInfo(); | ||
float GetCpuUtilization(); | ||
float GetCpuCurProcessUtilization(); | ||
|
||
private: | ||
#ifdef _MSC_VER | ||
FILETIME start_, end_; | ||
FILETIME process_user_time_start_, process_user_time_end_; | ||
FILETIME process_kernel_time_start_, process_kernel_time_end_; | ||
FILETIME system_user_time_start_, system_user_time_end_; | ||
FILETIME system_kernel_time_start_, system_kernel_time_end_; | ||
FILETIME system_idle_time_start_, system_idle_time_end_; | ||
FILETIME process_creation_time_, process_exit_time_; | ||
#else | ||
clock_t start_, end_; | ||
uint64_t idle_start_, idle_end_; | ||
uint64_t iowait_start_, iowait_end_; | ||
uint64_t nice_time_start_, nice_time_end_; | ||
uint64_t irq_start_, irq_end_; | ||
uint64_t softirq_start_, softirq_end_; | ||
uint64_t steal_start_, steal_end_; | ||
struct tms system_tms_start_, system_tms_end_; | ||
struct tms process_tms_start_, process_tms_end_; | ||
#endif | ||
}; | ||
|
||
} // namespace platform | ||
} // namespace paddle |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
#pragma once | ||
|
||
#include <string> | ||
#include <unordered_map> | ||
#include <vector> | ||
|
||
#include "paddle/fluid/platform/profiler/utils.h" | ||
|
||
namespace paddle { | ||
namespace platform { | ||
|
||
class ExtraInfo { | ||
public: | ||
ExtraInfo() {} | ||
template <typename... Args> | ||
void AddExtraInfo(const std::string& key, const std::string& format, | ||
Args... args); | ||
void Clear() { extra_info_.clear(); } | ||
std::unordered_map<std::string, std::string> GetExtraInfo() { | ||
return extra_info_; | ||
} | ||
|
||
private: | ||
std::unordered_map<std::string, std::string> extra_info_; | ||
}; | ||
|
||
template <typename... Args> | ||
void ExtraInfo::AddExtraInfo(const std::string& key, const std::string& format, | ||
Args... args) { | ||
std::string value = string_format(format, args...); | ||
extra_info_[key] = value; | ||
} | ||
|
||
} // namespace platform | ||
} // namespace paddle |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
#include "gtest/gtest.h" | ||
#include "paddle/fluid/platform/profiler/extra_info.h" | ||
|
||
using paddle::platform::ExtraInfo; | ||
|
||
TEST(ExtraInfoTest, case0) { | ||
ExtraInfo instance; | ||
instance.AddExtraInfo(std::string("info1"), std::string("%d"), 20); | ||
instance.AddExtraInfo(std::string("info2"), std::string("%s"), "helloworld"); | ||
std::unordered_map<std::string, std::string> map = instance.GetExtraInfo(); | ||
EXPECT_EQ(map["info1"], "20"); | ||
EXPECT_EQ(map["info2"], "helloworld"); | ||
EXPECT_EQ(map.size(), 2u); | ||
instance.Clear(); | ||
map = instance.GetExtraInfo(); | ||
EXPECT_EQ(map.size(), 0u); | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这段注释为啥还要留着?