PPC: unit: test sortTopology for expected output

The node topology contains several slices that later on are sorted and used to determine whether two nodes are equal. Add a unit test to verify this sorting is done as expected. Signed-off-by: Shereen Haj <[email protected]>
openshift · Nov 14, 2024 · 50252a6 · 50252a6
1 parent 1e9a589
commit 50252a6
Show file tree

Hide file tree

Showing 2 changed files with 149 additions and 1 deletion.
diff --git a/pkg/performanceprofile/profilecreator/profilecreator.go b/pkg/performanceprofile/profilecreator/profilecreator.go
@@ -270,6 +270,11 @@ func (ghwHandler GHWHandler) SortedTopology() (*topology.Info, error) {
 	if err != nil {
 		return nil, fmt.Errorf("can't obtain topology info from GHW snapshot: %v", err)
 	}
+	sortTopology(topologyInfo)
+	return topologyInfo, nil
+}
+
+func sortTopology(topologyInfo *topology.Info) {
 	sort.Slice(topologyInfo.Nodes, func(x, y int) bool {
 		return topologyInfo.Nodes[x].ID < topologyInfo.Nodes[y].ID
 	})
@@ -283,7 +288,6 @@ func (ghwHandler GHWHandler) SortedTopology() (*topology.Info, error) {
 			return node.Cores[i].LogicalProcessors[0] < node.Cores[j].LogicalProcessors[0]
 		})
 	}
-	return topologyInfo, nil
 }
 
 // topologyHTDisabled returns topologyinfo in case Hyperthreading needs to be disabled.

diff --git a/pkg/performanceprofile/profilecreator/profilecreator_test.go b/pkg/performanceprofile/profilecreator/profilecreator_test.go
@@ -3,6 +3,7 @@ package profilecreator
 import (
 	"fmt"
 	"path/filepath"
+	"reflect"
 	"sort"
 
 	"github.com/jaypipes/ghw/pkg/cpu"
@@ -1477,6 +1478,149 @@ var _ = Describe("PerformanceProfileCreator: Test Helper Function ensureSameTopo
 	})
 })
 
+var _ = Describe("PerformanceProfileCreator: Test Helper Function sortTopology", func() {
+	It("should sort node topologies as expected", func() {
+		unsorted := topology.Info{
+			Nodes: []*topology.Node{
+				{
+					ID: 2,
+					Cores: []*cpu.ProcessorCore{
+						{
+							ID:                0,
+							LogicalProcessors: []int{2, 0, 1},
+						},
+						{
+							ID:                3,
+							LogicalProcessors: []int{11, 9, 10},
+						},
+						{
+							ID:                2,
+							LogicalProcessors: []int{8, 7, 6},
+						},
+						{
+							ID:                1,
+							LogicalProcessors: []int{3, 5, 4},
+						},
+					},
+				},
+				{
+					ID: 1,
+					Cores: []*cpu.ProcessorCore{
+
+						{
+							ID:                2,
+							LogicalProcessors: []int{8, 7, 6},
+						},
+						{
+							ID:                3,
+							LogicalProcessors: []int{11, 9, 10},
+						},
+						{
+							ID:                0,
+							LogicalProcessors: []int{2, 0, 1},
+						},
+						{
+							ID:                1,
+							LogicalProcessors: []int{3, 5, 4},
+						},
+					},
+				},
+				{
+					ID: 0,
+					Cores: []*cpu.ProcessorCore{
+						{
+							ID:                1,
+							LogicalProcessors: []int{3, 5, 4},
+						},
+						{
+							ID:                0,
+							LogicalProcessors: []int{2, 0, 1},
+						},
+						{
+							ID:                3,
+							LogicalProcessors: []int{11, 9, 10},
+						},
+						{
+							ID:                2,
+							LogicalProcessors: []int{8, 7, 6},
+						},
+					},
+				},
+			},
+		}
+		expectedSorted := topology.Info{
+			Nodes: []*topology.Node{
+				{
+					ID: 0,
+					Cores: []*cpu.ProcessorCore{
+						{
+							ID:                0,
+							LogicalProcessors: []int{0, 1, 2},
+						},
+						{
+							ID:                1,
+							LogicalProcessors: []int{3, 4, 5},
+						},
+						{
+							ID:                2,
+							LogicalProcessors: []int{6, 7, 8},
+						},
+						{
+							ID:                3,
+							LogicalProcessors: []int{9, 10, 11},
+						},
+					},
+				},
+				{
+					ID: 1,
+					Cores: []*cpu.ProcessorCore{
+						{
+							ID:                0,
+							LogicalProcessors: []int{0, 1, 2},
+						},
+						{
+							ID:                1,
+							LogicalProcessors: []int{3, 4, 5},
+						},
+						{
+							ID:                2,
+							LogicalProcessors: []int{6, 7, 8},
+						},
+						{
+							ID:                3,
+							LogicalProcessors: []int{9, 10, 11},
+						},
+					},
+				},
+				{
+					ID: 2,
+					Cores: []*cpu.ProcessorCore{
+						{
+							ID:                0,
+							LogicalProcessors: []int{0, 1, 2},
+						},
+						{
+							ID:                1,
+							LogicalProcessors: []int{3, 4, 5},
+						},
+						{
+							ID:                2,
+							LogicalProcessors: []int{6, 7, 8},
+						},
+						{
+							ID:                3,
+							LogicalProcessors: []int{9, 10, 11},
+						},
+					},
+				},
+			},
+		}
+
+		sortTopology(&unsorted)
+		Expect(reflect.DeepEqual(unsorted, expectedSorted)).To(BeTrue(), "expected %+v, got %+v", expectedSorted, unsorted)
+	})
+})
+
 var _ = Describe("PerformanceProfileCreator: Test Helper Function GetAdditionalKernelArgs", func() {
 	var disableHT bool