Skip to content

Commit 8b72d91

Browse files
committed
E2E: Fix for checking L3 Cache spans entire numa node
The earlier pr openshift#1397 used to compare if the cpus returned by ccx are same as numa node 0, which may not be same, even though the size matches. This cause the test to not skip on vm. Signed-off-by: Niranjan M.R <[email protected]>
1 parent edea888 commit 8b72d91

File tree

1 file changed

+8
-5
lines changed
  • test/e2e/performanceprofile/functests/13_llc

1 file changed

+8
-5
lines changed

test/e2e/performanceprofile/functests/13_llc/llc.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -786,11 +786,14 @@ var _ = Describe("[rfe_id:77446] LLC-aware cpu pinning", Label(string(label.Open
786786
ccx, err := getCCX(0)
787787
Expect(err).ToNot(HaveOccurred())
788788
L3CacheGroupSize = ccx.Size()
789-
// Get actual CPU ID's from Numa Node 0
790-
numaNode0Cpus := cpuset.New(numaInfo[0]...)
791-
792-
// Compare if L3 cache group CPUs match NUMA Node 0 CPUs
793-
if ccx.Equals(numaNode0Cpus) {
789+
// Compare length of numa node 0 cpus with ccx size
790+
// if they are same then L3 Cache spans the whole of numa node
791+
// we cannot compare the L3 cache cpus are same as numa node 0 cpus as
792+
// as the cpu topology as they many not be same . For example
793+
// ccx cpus may be 0-11, and numa node0 cpus could be 0,2,4,6,8,10,12,14,16,18,22
794+
// if we were to compare the equality, the equality fails and tests will not be
795+
// skipped atleast on Virtual machines
796+
if len(numaInfo[0]) == L3CacheGroupSize {
794797
Skip("This test requires systems where L3 cache is shared amount subset of cpus")
795798
}
796799

0 commit comments

Comments
 (0)