Add enhanced GPU details from lshw -class display

- Added new LshwGPUScriptName script for lshw -class display
- Updated GPU struct with additional fields: LogicalName, BusInfo, Version, Width, Clock, Capabilities, Configuration, Resources
- Modified gpuInfoFromOutput to parse detailed lshw output
- Updated gpuTableValues to display all new GPU fields
- Changed GPU table to use new lshw gpu script instead of generic lshw

Co-authored-by: harp-intel <[email protected]>

Author: Copilot

internal/report/table_defs.go

@@ -408,7 +408,7 @@ var tableDefinitions = map[string]TableDefinition{
 		HasRows:   true,
 		MenuLabel: DevicesMenuLabel,
 		ScriptNames: []string{
-			script.LshwScriptName,
+			script.LshwGPUScriptName,
 		},
 		FieldsFunc: gpuTableValues},
 	GaudiTableName: {
@@ -1781,11 +1781,27 @@ func gpuTableValues(outputs map[string]script.ScriptOutput) []Field {
 		{Name: "Manufacturer"},
 		{Name: "Model"},
 		{Name: "PCI ID"},
+		{Name: "Logical Name"},
+		{Name: "Bus Info"},
+		{Name: "Version"},
+		{Name: "Width"},
+		{Name: "Clock"},
+		{Name: "Capabilities"},
+		{Name: "Configuration"},
+		{Name: "Resources"},
 	}
 	for _, gpuInfo := range gpuInfos {
 		fields[0].Values = append(fields[0].Values, gpuInfo.Manufacturer)
 		fields[1].Values = append(fields[1].Values, gpuInfo.Model)
 		fields[2].Values = append(fields[2].Values, gpuInfo.PCIID)
+		fields[3].Values = append(fields[3].Values, gpuInfo.LogicalName)
+		fields[4].Values = append(fields[4].Values, gpuInfo.BusInfo)
+		fields[5].Values = append(fields[5].Values, gpuInfo.Version)
+		fields[6].Values = append(fields[6].Values, gpuInfo.Width)
+		fields[7].Values = append(fields[7].Values, gpuInfo.Clock)
+		fields[8].Values = append(fields[8].Values, gpuInfo.Capabilities)
+		fields[9].Values = append(fields[9].Values, gpuInfo.Configuration)
+		fields[10].Values = append(fields[10].Values, gpuInfo.Resources)
 	}
 	return fields
 }

internal/report/table_helpers.go

@@ -1476,40 +1476,94 @@ func filesystemFieldValuesFromOutput(outputs map[string]script.ScriptOutput) []F
 }
 
 type GPU struct {
-	Manufacturer string
-	Model        string
-	PCIID        string
+	Manufacturer  string
+	Model         string
+	PCIID         string
+	LogicalName   string
+	BusInfo       string
+	Version       string
+	Width         string
+	Clock         string
+	Capabilities  string
+	Configuration string
+	Resources     string
 }
 
 func gpuInfoFromOutput(outputs map[string]script.ScriptOutput) []GPU {
 	gpus := []GPU{}
-	gpusLshw := valsArrayFromRegexSubmatch(outputs[script.LshwScriptName].Stdout, `^pci.*?\s+display\s+(\w+).*?\s+\[(\w+):(\w+)]$`)
-	idxMfgName := 0
-	idxMfgID := 1
-	idxDevID := 2
-	for _, gpu := range gpusLshw {
-		// Find GPU in GPU defs, note the model
-		var model string
-		for _, intelGPU := range gpuDefinitions {
-			if gpu[idxMfgID] == intelGPU.MfgID {
-				model = intelGPU.Model
-				break
-			}
-			re := regexp.MustCompile(intelGPU.DevID)
-			if re.FindString(gpu[idxDevID]) != "" {
-				model = intelGPU.Model
-				break
+
+	// Parse the lshw -class display output
+	lshwGPUOutput := outputs[script.LshwGPUScriptName].Stdout
+	if lshwGPUOutput == "" {
+		return gpus
+	}
+
+	// Parse each GPU device from the lshw output
+	// The output is in a format like:
+	// *-display
+	//    description: VGA compatible controller
+	//    product: ...
+	//    vendor: ...
+	//    ...
+
+	lines := strings.Split(lshwGPUOutput, "\n")
+	var currentGPU *GPU
+
+	for _, line := range lines {
+		trimmedLine := strings.TrimSpace(line)
+
+		// Start of a new GPU device
+		if strings.HasPrefix(trimmedLine, "*-") {
+			if currentGPU != nil {
+				gpus = append(gpus, *currentGPU)
 			}
+			currentGPU = &GPU{}
+			continue
 		}
-		if model == "" {
-			if gpu[idxMfgID] == "8086" {
-				model = "Unknown Intel"
-			} else {
-				model = "Unknown"
+
+		if currentGPU == nil {
+			continue
+		}
+
+		// Parse the fields
+		if strings.HasPrefix(trimmedLine, "product:") {
+			product := strings.TrimSpace(strings.TrimPrefix(trimmedLine, "product:"))
+			// Try to find a matching model from GPU definitions
+			// Extract vendor and device IDs if present in bus info
+			currentGPU.Model = product
+		} else if strings.HasPrefix(trimmedLine, "vendor:") {
+			currentGPU.Manufacturer = strings.TrimSpace(strings.TrimPrefix(trimmedLine, "vendor:"))
+		} else if strings.HasPrefix(trimmedLine, "bus info:") {
+			busInfo := strings.TrimSpace(strings.TrimPrefix(trimmedLine, "bus info:"))
+			currentGPU.BusInfo = busInfo
+
+			// Extract PCI ID from bus info (e.g., pci@0000:00:02.0)
+			if strings.HasPrefix(busInfo, "pci@") {
+				pciAddr := strings.TrimPrefix(busInfo, "pci@")
+				currentGPU.PCIID = pciAddr
 			}
+		} else if strings.HasPrefix(trimmedLine, "logical name:") {
+			currentGPU.LogicalName = strings.TrimSpace(strings.TrimPrefix(trimmedLine, "logical name:"))
+		} else if strings.HasPrefix(trimmedLine, "version:") {
+			currentGPU.Version = strings.TrimSpace(strings.TrimPrefix(trimmedLine, "version:"))
+		} else if strings.HasPrefix(trimmedLine, "width:") {
+			currentGPU.Width = strings.TrimSpace(strings.TrimPrefix(trimmedLine, "width:"))
+		} else if strings.HasPrefix(trimmedLine, "clock:") {
+			currentGPU.Clock = strings.TrimSpace(strings.TrimPrefix(trimmedLine, "clock:"))
+		} else if strings.HasPrefix(trimmedLine, "capabilities:") {
+			currentGPU.Capabilities = strings.TrimSpace(strings.TrimPrefix(trimmedLine, "capabilities:"))
+		} else if strings.HasPrefix(trimmedLine, "configuration:") {
+			currentGPU.Configuration = strings.TrimSpace(strings.TrimPrefix(trimmedLine, "configuration:"))
+		} else if strings.HasPrefix(trimmedLine, "resources:") {
+			currentGPU.Resources = strings.TrimSpace(strings.TrimPrefix(trimmedLine, "resources:"))
 		}
-		gpus = append(gpus, GPU{Manufacturer: gpu[idxMfgName], Model: model, PCIID: gpu[idxMfgID] + ":" + gpu[idxDevID]})
 	}
+
+	// Don't forget the last GPU
+	if currentGPU != nil {
+		gpus = append(gpus, *currentGPU)
+	}
+
 	return gpus
 }
 

internal/script/script_defs.go

@@ -70,6 +70,7 @@ const (
 	IaaDevicesScriptName             = "iaa devices"
 	DsaDevicesScriptName             = "dsa devices"
 	LshwScriptName                   = "lshw"
+	LshwGPUScriptName                = "lshw gpu"
 	UncoreMaxFromMSRScriptName       = "uncore max from msr"
 	UncoreMinFromMSRScriptName       = "uncore min from msr"
 	UncoreMaxFromTPMIScriptName      = "uncore max from tpmi"
@@ -726,6 +727,12 @@ rdmsr 0x2FFE
 		Depends:        []string{"lshw"},
 		Superuser:      true,
 	},
+	LshwGPUScriptName: {
+		Name:           LshwGPUScriptName,
+		ScriptTemplate: "timeout 30 lshw -class display",
+		Depends:        []string{"lshw"},
+		Superuser:      true,
+	},
 	MeminfoScriptName: {
 		Name:           MeminfoScriptName,
 		ScriptTemplate: "cat /proc/meminfo",