Merge branch 'Syllo:master' into master

Author: Alex313031

CMakeLists.txt

@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.18)
 #                              PROJECT                              #
 #///////////////////////////////////////////////////////////////////#
 
-project(nvtop VERSION 3.2.0
+project(nvtop VERSION 3.3.2
   LANGUAGES C CXX)
 
 set(default_build_type "Release")
@@ -99,7 +99,7 @@ else()
   set(METAX_SUPPORT_DEFAULT ON)
 endif()
 
-# TPU support is only available on Linux
+# TPU and Enflame GCU support is only available on Linux
 if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
   # Check for libtpuinfo.so to set the default for TPU support
   find_library(LIBTPUINFO
@@ -112,8 +112,10 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
   else()
     set(TPU_SUPPORT_DEFAULT ON)
   endif()
+  set(ENFLAME_SUPPORT_DEFAULT ON)
 else()
   set(TPU_SUPPORT_DEFAULT OFF)
+  set(ENFLAME_SUPPORT_DEFAULT OFF)
 endif()
 
 # Rockchip support is only available on Linux on arm
@@ -137,6 +139,7 @@ option(V3D_SUPPORT "Build support for Raspberrypi through v3d" ${V3D_SUPPORT_DEF
 option(TPU_SUPPORT "Build support for Google TPUs through GRPC" ${TPU_SUPPORT_DEFAULT})
 option(ROCKCHIP_SUPPORT "Enable support for Rockchip NPU" ${ROCKCHIP_SUPPORT_DEFAULT})
 option(METAX_SUPPORT "Build support for MetaX GPUs through libmxsml" ${METAX_SUPPORT_DEFAULT})
+option(ENFLAME_SUPPORT "Build support for Enflame GCUs through libefml" ${ENFLAME_SUPPORT_DEFAULT})
 
 add_subdirectory(src)
 

README.markdown

@@ -10,7 +10,8 @@ htop-familiar way.
 
 Currently supported vendors are AMD (Linux amdgpu driver), Apple (limited M1 &
 M2 support), Huawei (Ascend), Intel (Linux i915/Xe drivers), NVIDIA (Linux
-proprietary divers), Qualcomm Adreno (Linux MSM driver), Broadcom VideoCore (Linux v3d driver).
+proprietary divers), Qualcomm Adreno (Linux MSM driver), Broadcom VideoCore (Linux v3d driver),
+Rockchip, MetaX (MXSML driver), Enflame (Linux EFML driver).
 
 Because a picture is worth a thousand words:
 
@@ -31,6 +32,9 @@ Table of Contents
   - [Apple](#apple)
   - [Ascend](#ascend) (only tested on 910B)
   - [VideoCore](#videocore)
+  - [Rockchip](#rockchip)
+  - [MetaX](#metax)
+  - [Enflame](#enflame)
 - [Build](#build)
 - [Distribution Specific Installation Process](#distribution-specific-installation-process)
   - [Ubuntu / Debian](#ubuntu--debian)
@@ -151,6 +155,12 @@ NVTOP supports MetaX (testing on MXC500) by MXSML LIBRARY.
 
 For more information about GPUs please take a look at the [METAX documentation](https://developer.metax-tech.com/doc/index)
 
+### Enflame
+
+NVTOP supports Enflame GCUs (testing on Enflame S60, Enflame L300 and Enflame L600) by EFML LIBRARY
+
+GCU, which refers to General Compute Unit, is a type of accelerator card that is used to perform general-purpose computing tasks just like GPGPU.
+
 Build
 -----
 
@@ -163,6 +173,7 @@ Several libraries are required in order for NVTOP to display GPU info:
 * For AMD: the libdrm library used to query AMD GPUs through the kernel driver.
 * For METAX: the *MetaX System Management Library* (*MXSML*) which comes with the GPU driver.
   * This queries the GPU for info.
+* For Enflame: the *Enflame Management Library* (*EFML*) which comes with the GCU driver.
 
 ## Distribution Specific Installation Process
 
@@ -197,11 +208,11 @@ sudo apt install nvtop
   sudo apt install libudev-dev
   ```
 
-- NVIDIA Depenency
+- NVIDIA Dependency
   - NVIDIA drivers (see [Ubuntu Wiki](https://help.ubuntu.com/community/BinaryDriverHowto/Nvidia) or [Ubuntu PPA](https://launchpad.net/~graphics-drivers/+archive/ubuntu/ppa) or [Debian Wiki](https://wiki.debian.org/NvidiaGraphicsDrivers#NVIDIA_Proprietary_Driver))
 
 - NVTOP Dependencies
- - CMake, ncurses and Git
+  - CMake, ncurses and Git
   ```bash
   sudo apt install cmake libncurses5-dev libncursesw5-dev git
   ```
@@ -241,11 +252,11 @@ A standalone application is available as [AppImage](#appimage).
   sudo dnf install libdrm-devel systemd-devel
   ```
 
-- NVIDIA Depenency
+- NVIDIA Dependency
   - NVIDIA drivers, **CUDA required for nvml libraries** (see [RPM Fusion](https://rpmfusion.org/Howto/NVIDIA))
 
 - NVTOP Dependencies
- - CMake, ncurses, C++ and Git
+  - CMake, ncurses, C++ and Git
   ```bash
   sudo dnf install cmake ncurses-devel git gcc-c++
   ```
@@ -259,12 +270,12 @@ A standalone application is available as an [AppImage](#appimage).
 
 Build process for OpenSUSE:
 
-- AMD Dependecy
+- AMD Dependency
   ```bash
   sudo zypper install libdrm-devel
   ```
 
-- NVIDIA Depenency
+- NVIDIA Dependency
   - NVIDIA drivers (see [SUSE Support Database](https://en.opensuse.org/SDB:NVIDIA_drivers))
 
 - NVTOP Dependencies

cmake/modules/FindCurses.cmake

@@ -53,7 +53,7 @@ if(NOT CURSES_NEED_WIDE)
   set(NCURSES_LIBRARY_NAME "ncurses")
 else()
   set(NCURSES_LIBRARY_NAME "ncursesw")
-  # Also, if we are searchig fo wide curses - we are actually searching
+  # Also, if we are searching for wide curses - we are actually searching
   # for ncurses, we don't know about any other unicode version.
   set(CURSES_NEED_NCURSES TRUE)
 endif()

cmake/modules/sanitize-helpers.cmake

@@ -106,7 +106,7 @@ function (sanitizer_check_compiler_flags FLAG_CANDIDATES NAME PREFIX)
 
     get_property(ENABLED_LANGUAGES GLOBAL PROPERTY ENABLED_LANGUAGES)
     foreach (LANG ${ENABLED_LANGUAGES})
-        # Sanitizer flags are not dependend on language, but the used compiler.
+        # Sanitizer flags are not dependent on language, but the used compiler.
         # So instead of searching flags foreach language, search flags foreach
         # compiler used.
         set(COMPILER ${CMAKE_${LANG}_COMPILER_ID})

include/ascend/dcmi_interface_api.h

@@ -82,7 +82,7 @@ extern "C" {
     unsigned long hugepagesize;             /* unit:KB */
     unsigned long hugepages_total;
     unsigned long hugepages_free;
-    unsigned int utiliza;                  /* ddr memory info usages */
+    unsigned int utilize;                  /* ddr memory info usages */
     unsigned char reserve[60];             /* the size of dcmi_memory_info is 96 */
   };
 
@@ -447,7 +447,7 @@ extern "C" {
   struct dcmi_memory_info_stru {
     unsigned long long memory_size;
     unsigned int freq;
-    unsigned int utiliza;
+    unsigned int utilize;
   };
 
   DCMIDLLEXPORT int dcmi_get_memory_info(int card_id, int device_id, struct dcmi_memory_info_stru *device_memory_info);
@@ -464,4 +464,4 @@ extern "C" {
 #endif
 #endif /* __cplusplus */
 
-#endif /* __DCMI_INTERFACE_API_H__ */
+#endif /* __DCMI_INTERFACE_API_H__ */

include/nvtop/common.h

@@ -42,7 +42,7 @@ static void *nvtop_reallocarray__(void *ptr, size_t nmemb, size_t size) {
 #endif // !defined(HAS_REALLOCARRAY)
 
 // Increment for the number of tracked processes
-// 16 has been experimentally selected for being small while avoiding multipe allocations in most common cases
+// 16 has been experimentally selected for being small while avoiding multiple allocations in most common cases
 #define COMMON_PROCESS_LINEAR_REALLOC_INC 16
 
 #define MAX_LINES_PER_PLOT 4

include/nvtop/extract_gpuinfo_common.h

@@ -105,6 +105,7 @@ enum gpuinfo_dynamic_info_valid {
   gpuinfo_gpu_temp_valid,
   gpuinfo_power_draw_valid,
   gpuinfo_power_draw_max_valid,
+  gpuinfo_effective_load_rate_valid,
   gpuinfo_multi_instance_mode_valid,
   gpuinfo_dynamic_info_count,
 };
@@ -116,6 +117,7 @@ struct gpuinfo_dynamic_info {
   unsigned int mem_clock_speed_max; // Maximum clock speed in MHz
   unsigned int gpu_util_rate;       // GPU utilization rate in %
   unsigned int mem_util_rate;       // MEM utilization rate in %
+  unsigned int effective_load_rate; // Effective load rate in %
   unsigned int encoder_rate;        // Encoder utilization rate in %
   unsigned int decoder_rate;        // Decoder utilization rate in %
   unsigned long long total_memory;  // Total memory (bytes)

include/nvtop/extract_processinfo_fdinfo.h

@@ -57,8 +57,8 @@ void processinfo_drop_callback(const struct gpu_info *info);
 void processinfo_enable_disable_callback_for(const struct gpu_info *info, bool enable);
 
 /**
- * @brief Scann all the processes in /proc. Call the registered callbacks on
- * each file descriptor to the DRM driver that can successfully be oppened. If a
+ * @brief Scan all the processes in /proc. Call the registered callbacks on
+ * each file descriptor to the DRM driver that can successfully be opened. If a
  * callback succeeds, the gpu_info structure processes array will be updated
  * with the retrieved data.
  */

include/nvtop/interface_common.h

@@ -32,6 +32,7 @@ enum plot_information {
   plot_fan_speed,
   plot_gpu_clock_rate,
   plot_gpu_mem_clock_rate,
+  plot_effective_load_rate,
   plot_information_count
 };
 

include/nvtop/interface_options.h

@@ -50,7 +50,7 @@ typedef struct nvtop_interface_option_struct {
   bool show_startup_messages;                       // True to show the startup messages
   bool filter_nvtop_pid;                            // Do not show nvtop pid in the processes list
   bool has_monitored_set_changed;                   // True if the set of monitored gpu was modified through the interface
-  bool has_gpu_info_bar;                            // Show info bar with additional GPU parametres
+  bool has_gpu_info_bar;                            // Show info bar with additional GPU parameters
   bool hide_processes_list;                         // Hide processes list
 } nvtop_interface_option;