add total card power for igcl

Author: planetchili

IntelPresentMon/ControlLib/IntelPowerTelemetryAdapter.cpp

@@ -536,6 +536,15 @@ namespace pwr::intel
             return result;
         }
 
+        result = GetPowerTelemetryItemUsage(
+            currentSample.totalCardEnergyCounter,
+            previousSample->totalCardEnergyCounter,
+            pm_gpu_power_telemetry_info.gpu_card_power_w,
+            GpuTelemetryCapBits::gpu_card_power);
+        if (result != CTL_RESULT_SUCCESS) {
+            return result;
+        }
+
         result = GetPowerTelemetryItemUsagePercent(
             currentSample.globalActivityCounter,
             previousSample->globalActivityCounter,

IntelPresentMon/ControlLib/PresentMonPowerTelemetry.h

@@ -38,6 +38,7 @@ struct PresentMonPowerTelemetryInfo {
     double gpu_overvoltage_percent;
     double gpu_temperature_percent;
     double gpu_power_percent;
+    double gpu_card_power_w;
 
     double vram_power_w;
     double vram_voltage_v;
@@ -123,6 +124,7 @@ enum class GpuTelemetryCapBits {
     max_fan_speed_2,
     max_fan_speed_3,
     max_fan_speed_4,
+    gpu_card_power,
     gpu_telemetry_count,
 };
 

IntelPresentMon/Interprocess/source/IntrospectionCapsLookup.h

@@ -29,6 +29,7 @@ namespace pmon::ipc::intro
 	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_OVERVOLTAGE_PERCENT> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_overvoltage_percent; };
 	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_TEMPERATURE_PERCENT> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_temperature_percent; };
 	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_POWER_PERCENT> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_power_percent; };
+	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_CARD_POWER> { static constexpr auto gpuCapBit = GpuTelemetryCapBits::gpu_card_power; };
 	template<> struct IntrospectionCapsLookup<PM_METRIC_GPU_FAN_SPEED> {
 		static constexpr auto gpuCapBitArray = std::array{ GpuTelemetryCapBits::fan_speed_0, GpuTelemetryCapBits::fan_speed_1,
 			GpuTelemetryCapBits::fan_speed_2, GpuTelemetryCapBits::fan_speed_3, GpuTelemetryCapBits::fan_speed_4, };

IntelPresentMon/Interprocess/source/metadata/MetricList.h

@@ -94,4 +94,5 @@
 		X_(PM_METRIC_GPU_OVERVOLTAGE_PERCENT, PM_METRIC_TYPE_DYNAMIC_FRAME, PM_UNIT_PERCENT, PM_DATA_TYPE_DOUBLE, PM_DATA_TYPE_DOUBLE, 0, PM_DEVICE_TYPE_GRAPHICS_ADAPTER, FULL_STATS) \
 		X_(PM_METRIC_GPU_TEMPERATURE_PERCENT, PM_METRIC_TYPE_DYNAMIC_FRAME, PM_UNIT_PERCENT, PM_DATA_TYPE_DOUBLE, PM_DATA_TYPE_DOUBLE, 0, PM_DEVICE_TYPE_GRAPHICS_ADAPTER, FULL_STATS) \
 		X_(PM_METRIC_GPU_POWER_PERCENT, PM_METRIC_TYPE_DYNAMIC_FRAME, PM_UNIT_PERCENT, PM_DATA_TYPE_DOUBLE, PM_DATA_TYPE_DOUBLE, 0, PM_DEVICE_TYPE_GRAPHICS_ADAPTER, FULL_STATS) \
-		X_(PM_METRIC_GPU_FAN_SPEED_PERCENT, PM_METRIC_TYPE_DYNAMIC_FRAME, PM_UNIT_PERCENT, PM_DATA_TYPE_DOUBLE, PM_DATA_TYPE_DOUBLE, 0, PM_DEVICE_TYPE_GRAPHICS_ADAPTER, FULL_STATS)
+		X_(PM_METRIC_GPU_FAN_SPEED_PERCENT, PM_METRIC_TYPE_DYNAMIC_FRAME, PM_UNIT_PERCENT, PM_DATA_TYPE_DOUBLE, PM_DATA_TYPE_DOUBLE, 0, PM_DEVICE_TYPE_GRAPHICS_ADAPTER, FULL_STATS) \
+		X_(PM_METRIC_GPU_CARD_POWER, PM_METRIC_TYPE_DYNAMIC_FRAME, PM_UNIT_WATTS, PM_DATA_TYPE_DOUBLE, PM_DATA_TYPE_DOUBLE, 0, PM_DEVICE_TYPE_GRAPHICS_ADAPTER, FULL_STATS)

IntelPresentMon/PresentMonAPI2/PresentMonAPI.h

@@ -131,6 +131,7 @@ extern "C" {
 		PM_METRIC_GPU_TEMPERATURE_PERCENT,
 		PM_METRIC_GPU_POWER_PERCENT,
 		PM_METRIC_GPU_FAN_SPEED_PERCENT,
+		PM_METRIC_GPU_CARD_POWER,
 	};
 
 	enum PM_METRIC_TYPE

IntelPresentMon/PresentMonMiddleware/ConcreteMiddleware.cpp

@@ -429,6 +429,9 @@ namespace pmon::mid
             case PM_METRIC_GPU_POWER_PERCENT:
                 pQuery->accumGpuBits.set(static_cast<size_t>(GpuTelemetryCapBits::gpu_power_percent));
                 break;
+            case PM_METRIC_GPU_CARD_POWER:
+                pQuery->accumGpuBits.set(static_cast<size_t>(GpuTelemetryCapBits::gpu_card_power));
+                break;
             case PM_METRIC_CPU_UTILIZATION:
                 pQuery->accumCpuBits.set(static_cast<size_t>(CpuTelemetryCapBits::cpu_utilization));
                 break;
@@ -1631,6 +1634,9 @@ static void ReportMetrics(
         case GpuTelemetryCapBits::gpu_power_percent:
             metricInfo[PM_METRIC_GPU_POWER_PERCENT].data[0].emplace_back(power_telemetry_info.gpu_power_percent);
             break;
+        case GpuTelemetryCapBits::gpu_card_power:
+            metricInfo[PM_METRIC_GPU_CARD_POWER].data[0].emplace_back(power_telemetry_info.gpu_card_power_w);
+            break;
         default:
             validGpuMetric = false;
             break;
@@ -1886,6 +1892,7 @@ static void ReportMetrics(
                 case PM_METRIC_GPU_OVERVOLTAGE_PERCENT:
                 case PM_METRIC_GPU_TEMPERATURE_PERCENT:
                 case PM_METRIC_GPU_POWER_PERCENT:
+                case PM_METRIC_GPU_CARD_POWER:
                     CalculateGpuCpuMetric(metricInfo, qe, pBlob);
                     break;
                 case PM_METRIC_CPU_VENDOR:

IntelPresentMon/metrics.csv

@@ -41,7 +41,7 @@ PM_METRIC_CPU_VENDOR,1,CPU Vendor,Vendor name of the CPU.
 PM_METRIC_CPU_NAME,1,CPU Name,Device name of the CPU.
 ,,,
 PM_METRIC_GPU_SUSTAINED_POWER_LIMIT,1,GPU Sustained Power Limit,Sustained power limit of the GPU.
-PM_METRIC_GPU_POWER,1,GPU Power,Power consumed by the graphics adapter.
+PM_METRIC_GPU_POWER,1,GPU Power,Power consumed by the graphics processing unit.
 PM_METRIC_GPU_VOLTAGE,1,GPU Voltage,Voltage consumed by the graphics adapter.
 PM_METRIC_GPU_FREQUENCY,1,GPU Frequency,Clock speed of the GPU cores.
 PM_METRIC_GPU_TEMPERATURE,1,GPU Temperature,Temperature of the GPU.
@@ -89,4 +89,5 @@ PM_METRIC_GPU_MEM_EFFECTIVE_BANDWIDTH,1,GPU Memory Effective Bandwidth,Data tran
 PM_METRIC_GPU_OVERVOLTAGE_PERCENT,1,GPU Overvoltage Percent,GPU overvoltage increment as a ratio of the maximum increment.
 PM_METRIC_GPU_TEMPERATURE_PERCENT,1,GPU Temperature Percent,GPU temperature as a ratio of the thermal margin.
 PM_METRIC_GPU_POWER_PERCENT,1,GPU Power Percent,GPU power draw as a ratio of default maximum power.
-PM_METRIC_GPU_FAN_SPEED_PERCENT,1,GPU Fan Speed Percent,GPU fan speed as a ratio of the max speed for that fan.
+PM_METRIC_GPU_FAN_SPEED_PERCENT,1,GPU Fan Speed Percent,GPU fan speed as a ratio of the max speed for that fan.
+PM_METRIC_GPU_CARD_POWER,1,GPU Card Power,Total power consumption of the graphics adapter board.