labeler: add xe support for tile counting

Signed-off-by: Tuomas Katila <tuomas.katila@intel.com>

Author: tkatila

cmd/internal/labeler/labeler.go

@@ -184,10 +184,16 @@ func GetMemoryAmount(sysfsDrmDir, gpuName string, numTiles uint64) uint64 {
 }
 
 // GetTileCount reads the tile count.
-func GetTileCount(sysfsDrmDir, gpuName string) (numTiles uint64) {
-	filePath := filepath.Join(sysfsDrmDir, gpuName, "gt/gt*")
+func GetTileCount(cardPath string) (numTiles uint64) {
+	files := []string{}
 
-	files, _ := filepath.Glob(filePath)
+	paths, _ := filepath.Glob(filepath.Join(cardPath, "gt/gt*")) // i915 driver
+	files = append(files, paths...)
+
+	paths, _ = filepath.Glob(filepath.Join(cardPath, "device/tile?")) // Xe driver
+	files = append(files, paths...)
+
+	klog.V(4).Info("tile files found:", files)
 
 	if len(files) == 0 {
 		return 1
@@ -308,7 +314,7 @@ func (l *labeler) createLabels() error {
 			return errors.Wrap(err, "gpu name parsing error")
 		}
 
-		numTiles := GetTileCount(l.sysfsDRMDir, gpuName)
+		numTiles := GetTileCount(filepath.Join(l.sysfsDRMDir, gpuName))
 		tileCount += int(numTiles)
 
 		memoryAmount := GetMemoryAmount(l.sysfsDRMDir, gpuName, numTiles)

cmd/internal/labeler/labeler_test.go

@@ -137,60 +137,6 @@ func getTestCases() []testcase {
 				"gpu.intel.com/tiles":       "1",
 			},
 		},
-		{
-			sysfsdirs: []string{
-				"card0/device/drm/card0",
-			},
-			sysfsfiles: map[string][]byte{
-				"card0/device/vendor": []byte("0x8086"),
-			},
-			name:           "when gen:capability info is missing",
-			memoryOverride: 16000000000,
-			expectedRetval: nil,
-			expectedLabels: labelMap{
-				"gpu.intel.com/millicores":  "1000",
-				"gpu.intel.com/memory.max":  "16000000000",
-				"gpu.intel.com/cards":       "card0",
-				"gpu.intel.com/gpu-numbers": "0",
-				"gpu.intel.com/tiles":       "1",
-			},
-		},
-		{
-			sysfsdirs: []string{
-				"card0/device/drm/card0",
-			},
-			sysfsfiles: map[string][]byte{
-				"card0/device/vendor": []byte("0x8086"),
-			},
-			name:           "gen version missing, but media & graphics versions present",
-			memoryOverride: 16000000000,
-			expectedRetval: nil,
-			expectedLabels: labelMap{
-				"gpu.intel.com/millicores":  "1000",
-				"gpu.intel.com/memory.max":  "16000000000",
-				"gpu.intel.com/cards":       "card0",
-				"gpu.intel.com/gpu-numbers": "0",
-				"gpu.intel.com/tiles":       "1",
-			},
-		},
-		{
-			sysfsdirs: []string{
-				"card0/device/drm/card0",
-			},
-			sysfsfiles: map[string][]byte{
-				"card0/device/vendor": []byte("0x8086"),
-			},
-			name:           "only media version present",
-			memoryOverride: 16000000000,
-			expectedRetval: nil,
-			expectedLabels: labelMap{
-				"gpu.intel.com/millicores":  "1000",
-				"gpu.intel.com/memory.max":  "16000000000",
-				"gpu.intel.com/cards":       "card0",
-				"gpu.intel.com/gpu-numbers": "0",
-				"gpu.intel.com/tiles":       "1",
-			},
-		},
 		{
 			sysfsdirs: []string{
 				"card0/device/drm/card0",
@@ -562,6 +508,74 @@ func getTestCases() []testcase {
 				"gpu.intel.com/tiles":       "1",
 			},
 		},
+		{
+			sysfsdirs: []string{
+				"card0/device/drm/card0",
+				"card0/device/tile0/gt0",
+				"card0/device/tile1/gt0",
+				"card1/device/drm/card1",
+				"card1/device/tile0/gt0",
+				"card1/device/tile1/gt0",
+				"card2/device/drm/card2",
+				"card2/device/tile0/gt0",
+				"card2/device/tile1/gt0",
+			},
+			sysfsfiles: map[string][]byte{
+				"card0/device/vendor":    []byte("0x8086"),
+				"card0/lmem_total_bytes": []byte("8000"),
+				"card0/device/numa_node": []byte("1"),
+				"card1/device/vendor":    []byte("0x8086"),
+				"card1/lmem_total_bytes": []byte("8000"),
+				"card1/device/numa_node": []byte("1"),
+				"card2/device/vendor":    []byte("0x8086"),
+				"card2/lmem_total_bytes": []byte("8000"),
+				"card2/device/numa_node": []byte("1"),
+			},
+			name:           "successful labeling with three cards and with xe driver",
+			expectedRetval: nil,
+			expectedLabels: labelMap{
+				"gpu.intel.com/millicores":   "3000",
+				"gpu.intel.com/memory.max":   "48000",
+				"gpu.intel.com/gpu-numbers":  "0.1.2",
+				"gpu.intel.com/cards":        "card0.card1.card2",
+				"gpu.intel.com/tiles":        "6",
+				"gpu.intel.com/numa-gpu-map": "1-0.1.2",
+			},
+		},
+		{
+			sysfsdirs: []string{
+				"card0/device/drm/card0",
+				"card0/device/tile0/gt0",
+				"card0/device/tile0/gt1",
+				"card0/device/tile1/gt2",
+				"card0/device/tile1/gt3",
+				"card0/device/tile1/gt4",
+				"card0/device/tile1/gt5",
+				"card1/device/drm/card1",
+				"card1/device/tile0/gt0",
+				"card1/device/tile0/gt1",
+				"card1/device/tile1/gt2",
+				"card1/device/tile1/gt4",
+			},
+			sysfsfiles: map[string][]byte{
+				"card0/device/vendor":    []byte("0x8086"),
+				"card0/lmem_total_bytes": []byte("8000"),
+				"card0/device/numa_node": []byte("1"),
+				"card1/device/vendor":    []byte("0x8086"),
+				"card1/lmem_total_bytes": []byte("8000"),
+				"card1/device/numa_node": []byte("1"),
+			},
+			name:           "successful labeling with two cards, two tiles per card and multiple gts per tile",
+			expectedRetval: nil,
+			expectedLabels: labelMap{
+				"gpu.intel.com/millicores":   "2000",
+				"gpu.intel.com/memory.max":   "32000",
+				"gpu.intel.com/gpu-numbers":  "0.1",
+				"gpu.intel.com/cards":        "card0.card1",
+				"gpu.intel.com/tiles":        "4",
+				"gpu.intel.com/numa-gpu-map": "1-0.1",
+			},
+		},
 	}
 }