From acd3f8578f8bbbb520bbf220155f315a3bd6c997 Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Wed, 12 Aug 2020 21:14:58 +0300
Subject: [PATCH] Add some GPU stats
---
applications/gui2/CMakeLists.txt | 2 +-
applications/gui2/src/modules/statistics.cpp | 41 +++++++++++++++++++
applications/gui2/src/modules/statistics.hpp | 4 ++
components/streams/src/feed.cpp | 1 +
.../streams/src/renderers/screen_render.cpp | 2 +
5 files changed, 49 insertions(+), 1 deletion(-)
diff --git a/applications/gui2/CMakeLists.txt b/applications/gui2/CMakeLists.txt
index a4c7beace..9c147be1a 100644
--- a/applications/gui2/CMakeLists.txt
+++ b/applications/gui2/CMakeLists.txt
@@ -72,6 +72,6 @@ target_include_directories(ftl-gui2 PUBLIC
#endif()
#target_include_directories(cv-node PUBLIC ${PROJECT_SOURCE_DIR}/include)
-target_link_libraries(ftl-gui2 ftlcommon ftldata ftlctrl ftlrgbd ftlstreams ftlrender Threads::Threads ${OpenCV_LIBS} openvr ftlnet nanogui ${NANOGUI_EXTRA_LIBS} ceres)
+target_link_libraries(ftl-gui2 ftlcommon ftldata ftlctrl ftlrgbd ftlstreams ftlrender Threads::Threads ${OpenCV_LIBS} openvr ftlnet nanogui ${NANOGUI_EXTRA_LIBS} ceres nvidia-ml)
target_precompile_headers(ftl-gui2 REUSE_FROM ftldata)
diff --git a/applications/gui2/src/modules/statistics.cpp b/applications/gui2/src/modules/statistics.cpp
index 60fe0fedd..714788829 100644
--- a/applications/gui2/src/modules/statistics.cpp
+++ b/applications/gui2/src/modules/statistics.cpp
@@ -10,6 +10,12 @@
#include <loguru.hpp>
+#include <nvml.h>
+
+#ifdef WIN32
+#pragma comment(lib, "nvml")
+#endif
+
using ftl::gui2::Statistics;
using ftl::gui2::StatisticsPanel;
@@ -21,6 +27,10 @@ std::string to_string_with_precision(const T a_value, const int n = 6) {
return out.str();
}
+Statistics::~Statistics() {
+ nvmlShutdown();
+}
+
void Statistics::update(double delta) {
time_count_ += delta;
if (time_count_ > 1.0) {
@@ -29,10 +39,41 @@ void Statistics::update(double delta) {
getJSON(StatisticsPanel::PERFORMANCE_INFO)["Bitrate"] = to_string_with_precision(bitrate, 1) + std::string("Mbit/s");
}
time_count_ = 0.0;
+
+ size_t gpu_free_mem;
+ size_t gpu_total_mem;
+ cudaSafeCall(cudaMemGetInfo(&gpu_free_mem, &gpu_total_mem));
+ float gpu_mem = 1.0f - (float(gpu_free_mem) / float(gpu_total_mem));
+ getJSON(StatisticsPanel::PERFORMANCE_INFO)["GPU Memory"] = to_string_with_precision(gpu_mem*100.0f, 1) + std::string("%");
+
+ nvmlDevice_t device;
+ auto result = nvmlDeviceGetHandleByIndex(0, &device);
+ nvmlUtilization_st device_utilization;
+ result = nvmlDeviceGetUtilizationRates(device, &device_utilization);
+ getJSON(StatisticsPanel::PERFORMANCE_INFO)["GPU Usage"] = std::to_string(device_utilization.gpu) + std::string("%");
+
+ unsigned int decode_util;
+ unsigned int decode_period;
+ result = nvmlDeviceGetDecoderUtilization(device, &decode_util, &decode_period);
+ getJSON(StatisticsPanel::PERFORMANCE_INFO)["GPU Decoder"] = std::to_string(decode_util) + std::string("%");
+
+ // Doesn't seem to work
+ unsigned int encoder_sessions=0;
+ unsigned int encoder_fps;
+ unsigned int encoder_latency;
+ result = nvmlDeviceGetEncoderStats(device, &encoder_sessions, &encoder_fps, &encoder_latency);
+
+ unsigned int encoder_util;
+ unsigned int encoder_period;
+ result = nvmlDeviceGetEncoderUtilization(device, &encoder_util, &encoder_period);
+ getJSON(StatisticsPanel::PERFORMANCE_INFO)["GPU Encoder"] = std::to_string(encoder_util) + std::string("% (") + std::to_string(encoder_sessions) + std::string(")");
}
}
void Statistics::init() {
+ auto result = nvmlInit();
+ if (result != NVML_SUCCESS) throw FTL_Error("No NVML");
+
/**
* TODO: store all values in hash table and allow other modules to
* add/remove items/groups.
diff --git a/applications/gui2/src/modules/statistics.hpp b/applications/gui2/src/modules/statistics.hpp
index 913815fb7..608ccacfa 100644
--- a/applications/gui2/src/modules/statistics.hpp
+++ b/applications/gui2/src/modules/statistics.hpp
@@ -21,6 +21,10 @@ enum class StatisticsPanel {
class Statistics : public Module {
public:
using Module::Module;
+
+ //Statistics();
+ ~Statistics();
+
virtual void init() override;
virtual void update(double delta) override;
diff --git a/components/streams/src/feed.cpp b/components/streams/src/feed.cpp
index e78e892d8..bc535e545 100644
--- a/components/streams/src/feed.cpp
+++ b/components/streams/src/feed.cpp
@@ -1153,6 +1153,7 @@ bool Feed::_isRecording() {
}
ftl::data::FrameSetPtr Feed::getFrameSet(uint32_t fsid) {
+ SHARED_LOCK(mtx_, lk);
if (latest_.count(fsid) == 0) {
throw ftl::exception("No FrameSet with given ID");
}
diff --git a/components/streams/src/renderers/screen_render.cpp b/components/streams/src/renderers/screen_render.cpp
index 7b74511b9..c4c6f11c5 100644
--- a/components/streams/src/renderers/screen_render.cpp
+++ b/components/streams/src/renderers/screen_render.cpp
@@ -64,6 +64,8 @@ ScreenRender::ScreenRender(ftl::render::Source *host, ftl::stream::Feed *feed)
filter_ = feed_->filter({Channel::Colour, Channel::Depth});
}
});
+
+ calibration_uptodate_.clear();
}
ScreenRender::~ScreenRender() {
--
GitLab