Onboarded AMD SMI for Linux and added more metrics

src/VirtualClient/VirtualClient.Main/profiles/MONITORS-GPU-AMD-SMI.json

@@ -0,0 +1,31 @@
+{
+  "Description": "AMD SMI Monitor for AMD GPU systems.",
+  "Metadata": {
+    "SupportedPlatforms": "linux-x64,win-x64",
+    "SupportedOperatingSystems": "CBL-Mariner,CentOS,Debian,RedHat,Suse,Ubuntu,Windows"
+  },
+  "Parameters": {
+    "MonitorFrequency": "00:00:01",
+    "MonitorWarmupPeriod": "00:00:01"
+  },
+  "Monitors": [
+    {
+        "Type": "AmdSmiMonitor",
+        "Parameters": {
+            "Scenario": "AmdGpuCounters",
+            "Subsystem": "metric",
+            "MonitorFrequency": "$.Parameters.MonitorFrequency",
+            "MonitorWarmupPeriod": "$.Parameters.MonitorWarmupPeriod"
+        }
+    },
+    {
+        "Type": "AmdSmiMonitor",
+        "Parameters": {
+            "Scenario": "AmdGpuCounters",
+            "Subsystem": "xgmi",
+            "MonitorFrequency": "$.Parameters.MonitorFrequency",
+            "MonitorWarmupPeriod": "$.Parameters.MonitorWarmupPeriod"
+        }
+    }
+  ]
+}

src/VirtualClient/VirtualClient.Monitors.UnitTests/AmdSmiMetricQueryGpuParserUnitTests.cs

@@ -0,0 +1,58 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+namespace VirtualClient.Monitors
+{
+    using System.Collections.Generic;
+    using System.Diagnostics;
+    using System.IO;
+    using System.Linq;
+    using System.Reflection;
+    using System.Text;
+    using System.Threading.Tasks;
+    using NUnit.Framework;
+    using VirtualClient.Common;
+    using VirtualClient.Contracts;
+
+    [TestFixture]
+    [Category("Unit")]
+    public class AmdSmiMetricQueryGpuParserUnitTests
+    {
+        [Test]
+        public void AmdSmiMetricQueryGpuParserParsesMetricsCorrectly()
+        {
+            string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+            string outputPath = Path.Combine(workingDirectory, "Examples", "amd-smi", "result1.txt");
+            string rawText = File.ReadAllText(outputPath);
+
+            AmdSmiMetricQueryGpuParser testParser = new AmdSmiMetricQueryGpuParser(rawText);
+            IList<Metric> metrics = testParser.Parse();
+
+            Assert.AreEqual(184, metrics.Count);
+            MetricAssert.Exists(metrics, "utilization.gpu", 0, "%");
+            MetricAssert.Exists(metrics, "utilization.memory", 0, "%");
+            MetricAssert.Exists(metrics, "temperature.gpu", 36, "celsius");
+            MetricAssert.Exists(metrics, "temperature.memory", 30, "celsius");
+            MetricAssert.Exists(metrics, "power.draw.average", 133, "W");
+            MetricAssert.Exists(metrics, "gfx_0_clk", 132, "MHz");
+            MetricAssert.Exists(metrics, "gfx_1_clk", 132, "MHz");
+            MetricAssert.Exists(metrics, "gfx_2_clk", 132, "MHz");
+            MetricAssert.Exists(metrics, "gfx_3_clk", 132, "MHz");
+            MetricAssert.Exists(metrics, "gfx_4_clk", 132, "MHz");
+            MetricAssert.Exists(metrics, "gfx_5_clk", 132, "MHz");
+            MetricAssert.Exists(metrics, "gfx_6_clk", 132, "MHz");
+            MetricAssert.Exists(metrics, "gfx_7_clk", 133, "MHz");
+            MetricAssert.Exists(metrics, "mem_0_clk", 900, "MHz");
+            MetricAssert.Exists(metrics, "vclk_0_clk", 29, "MHz");
+            MetricAssert.Exists(metrics, "vclk_1_clk", 29, "MHz");
+            MetricAssert.Exists(metrics, "vclk_2_clk", 29, "MHz");
+            MetricAssert.Exists(metrics, "vclk_3_clk", 29, "MHz");
+            MetricAssert.Exists(metrics, "dclk_0_clk", 22, "MHz");
+            MetricAssert.Exists(metrics, "dclk_1_clk", 22, "MHz");
+            MetricAssert.Exists(metrics, "dclk_2_clk", 22, "MHz");
+            MetricAssert.Exists(metrics, "dclk_3_clk", 22, "MHz");
+            MetricAssert.Exists(metrics, "pcie_bw", 192, "Mb/s");
+
+        }
+    }
+}

src/VirtualClient/VirtualClient.Monitors.UnitTests/AmdSmiXGMIQueryGpuParserUnitTests.cs

@@ -0,0 +1,43 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+namespace VirtualClient.Monitors
+{
+    using System.Collections.Generic;
+    using System.Diagnostics;
+    using System.IO;
+    using System.Linq;
+    using System.Reflection;
+    using System.Text;
+    using System.Threading.Tasks;
+    using NUnit.Framework;
+    using VirtualClient.Common;
+    using VirtualClient.Contracts;
+
+    [TestFixture]
+    [Category("Unit")]
+    public class AmdSmiXGMIQueryGpuParserUnitTests
+    {
+        [Test]
+        public void AmdSmiXGMIQueryGpuParserParsesMetricsCorrectly()
+        {
+            string workingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+            string outputPath = Path.Combine(workingDirectory, "Examples", "amd-smi", "result2.txt");
+            string rawText = File.ReadAllText(outputPath);
+
+            AmdSmiXGMIQueryGpuParser testParser = new AmdSmiXGMIQueryGpuParser(rawText);
+            IList<Metric> metrics = testParser.Parse();
+
+            Assert.AreEqual(64, metrics.Count);
+            MetricAssert.Exists(metrics, "xgmi.bidata.0", 0, "KB");
+            MetricAssert.Exists(metrics, "xgmi.bidata.1", 0, "KB");
+            MetricAssert.Exists(metrics, "xgmi.bidata.2", 2, "KB");
+            MetricAssert.Exists(metrics, "xgmi.bidata.3", 2, "KB");
+            MetricAssert.Exists(metrics, "xgmi.bidata.4", 2, "KB");
+            MetricAssert.Exists(metrics, "xgmi.bidata.5", 2, "KB");
+            MetricAssert.Exists(metrics, "xgmi.bidata.6", 2, "KB");
+            MetricAssert.Exists(metrics, "xgmi.bidata.7", 2, "KB");
+
+        }
+    }
+}

src/VirtualClient/VirtualClient.Monitors/AmdSmiMetricQueryGpuParser.cs

@@ -0,0 +1,89 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+namespace VirtualClient.Monitors
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Data;
+    using System.Linq;
+    using System.Text.RegularExpressions;
+    using VirtualClient.Contracts;
+    using DataTableExtensions = VirtualClient.Contracts.DataTableExtensions;
+
+    /// <summary>
+    /// Parser for AmdSmi output document.
+    /// </summary>
+    public class AmdSmiMetricQueryGpuParser : MetricsParser
+    {
+        /// <summary>
+        /// Constructor for <see cref="AmdSmiMetricQueryGpuParser"/>
+        /// </summary>
+        /// <param name="rawText">Raw text to parse.</param>
+        public AmdSmiMetricQueryGpuParser(string rawText)
+            : base(rawText)
+        {
+        }
+
+        /// <inheritdoc/>
+        public override IList<Metric> Parse()
+        {
+            this.Preprocess();
+
+            List<Metric> metrics = new List<Metric>();
+            DataTable dataTable = DataTableExtensions.DataTableFromCsv(this.PreprocessedText);
+
+            foreach (DataRow row in dataTable.Rows)
+            {
+                Dictionary<string, IConvertible> metadata = new Dictionary<string, IConvertible>()
+                {
+                    { "gpu.id", Convert.ToString(SafeGet(row, "gpu")) }
+                };
+
+                metrics.Add(new Metric("utilization.gpu", Convert.ToDouble(SafeGet(row, "gfx_activity")), unit: "%", metadata: metadata));
+                double value = 100 * Convert.ToDouble(SafeGet(row, "used_vram")) / Convert.ToDouble(SafeGet(row, "total_vram"));
+                int roundedValue = Convert.ToInt32(Math.Round(value));
+                metrics.Add(new Metric("utilization.memory", roundedValue, unit: "%", metadata: metadata));
+                metrics.Add(new Metric("temperature.gpu", Convert.ToDouble(SafeGet(row, "hotspot")), unit: "celsius", metadata: metadata));
+                metrics.Add(new Metric("temperature.memory", Convert.ToDouble(SafeGet(row, "mem")), unit: "celsius", metadata: metadata));
+                metrics.Add(new Metric("power.draw.average", Convert.ToDouble(SafeGet(row, "socket_power")), unit: "W", metadata: metadata));
+                metrics.Add(new Metric("gfx_0_clk", Convert.ToDouble(SafeGet(row, "gfx_0_clk")), unit: "MHz", metadata: metadata));
+                metrics.Add(new Metric("gfx_1_clk", Convert.ToDouble(SafeGet(row, "gfx_1_clk")), unit: "MHz", metadata: metadata));
+                metrics.Add(new Metric("gfx_2_clk", Convert.ToDouble(SafeGet(row, "gfx_2_clk")), unit: "MHz", metadata: metadata));
+                metrics.Add(new Metric("gfx_3_clk", Convert.ToDouble(SafeGet(row, "gfx_3_clk")), unit: "MHz", metadata: metadata));
+                metrics.Add(new Metric("gfx_4_clk", Convert.ToDouble(SafeGet(row, "gfx_4_clk")), unit: "MHz", metadata: metadata));
+                metrics.Add(new Metric("gfx_5_clk", Convert.ToDouble(SafeGet(row, "gfx_5_clk")), unit: "MHz", metadata: metadata));
+                metrics.Add(new Metric("gfx_6_clk", Convert.ToDouble(SafeGet(row, "gfx_6_clk")), unit: "MHz", metadata: metadata));
+                metrics.Add(new Metric("gfx_7_clk", Convert.ToDouble(SafeGet(row, "gfx_7_clk")), unit: "MHz", metadata: metadata));
+                metrics.Add(new Metric("mem_0_clk", Convert.ToDouble(SafeGet(row, "mem_0_clk")), unit: "MHz", metadata: metadata));
+                metrics.Add(new Metric("vclk_0_clk", Convert.ToDouble(SafeGet(row, "vclk_0_clk")), unit: "MHz", metadata: metadata));
+                metrics.Add(new Metric("vclk_1_clk", Convert.ToDouble(SafeGet(row, "vclk_1_clk")), unit: "MHz", metadata: metadata));
+                metrics.Add(new Metric("vclk_2_clk", Convert.ToDouble(SafeGet(row, "vclk_2_clk")), unit: "MHz", metadata: metadata));
+                metrics.Add(new Metric("vclk_3_clk", Convert.ToDouble(SafeGet(row, "vclk_3_clk")), unit: "MHz", metadata: metadata));
+                metrics.Add(new Metric("dclk_0_clk", Convert.ToDouble(SafeGet(row, "dclk_0_clk")), unit: "MHz", metadata: metadata));
+                metrics.Add(new Metric("dclk_1_clk", Convert.ToDouble(SafeGet(row, "dclk_1_clk")), unit: "MHz", metadata: metadata));
+                metrics.Add(new Metric("dclk_2_clk", Convert.ToDouble(SafeGet(row, "dclk_2_clk")), unit: "MHz", metadata: metadata));
+                metrics.Add(new Metric("dclk_3_clk", Convert.ToDouble(SafeGet(row, "dclk_3_clk")), unit: "MHz", metadata: metadata));
+                metrics.Add(new Metric("pcie_bw", Convert.ToDouble(SafeGet(row, "bandwidth")), unit: "Mb/s", metadata: metadata));
+                // metrics.Add(new Metric("memory.total", Convert.ToDouble(SafeGet(row, "total_vram")), unit: "MiB", metadata: metadata));
+                // metrics.Add(new Metric("memory.free", Convert.ToDouble(SafeGet(row, "free_vram")), unit: "MiB", metadata: metadata));
+                // metrics.Add(new Metric("memory.used", Convert.ToDouble(SafeGet(row, "used_vram")), unit: "MiB", metadata: metadata));
+            }
+
+            return metrics;
+        }
+
+        /// <inheritdoc/>
+        protected override void Preprocess()
+        {
+            this.PreprocessedText = this.RawText.Replace("\r\n", Environment.NewLine);
+            Regex quotedPattern = new Regex("\"([^\"]*)\"");
+            this.PreprocessedText = quotedPattern.Replace(this.PreprocessedText, "N/A");
+        }
+
+        private static IConvertible SafeGet(DataRow row, string columnName)
+        {
+            return row.Table.Columns.Contains(columnName) ? Convert.ToString(row[columnName]) : "-1";
+        }
+    }
+}