Skip to content

Commit 9a977a0

Browse files
committed
E2E: Fix for checking L3 Cache spans entire numa node
The earlier pr #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 <mniranja@redhat.com>
1 parent edea888 commit 9a977a0

File tree

1 file changed

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

1 file changed

+8
-2
lines changed

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -789,8 +789,14 @@ var _ = Describe("[rfe_id:77446] LLC-aware cpu pinning", Label(string(label.Open
789789
// Get actual CPU ID's from Numa Node 0
790790
numaNode0Cpus := cpuset.New(numaInfo[0]...)
791791

792-
// Compare if L3 cache group CPUs match NUMA Node 0 CPUs
793-
if ccx.Equals(numaNode0Cpus) {
792+
// Compare length of numa node 0 cpus with ccx size
793+
// if they are same then L3 Cache spans the whole of numa node
794+
// we cannot compare the L3 cache cpus are same as numa node 0 cpus as
795+
// as the cpu topology as they many not be same . For example
796+
// ccx cpus may be 0-11, and numa node0 cpus could be 0,2,4,6,8,10,12,14,16,18,22
797+
// if we were to compare the equality, the equality fails and tests will not be
798+
// skipped atleast on Virtual machines
799+
if len(numaInfo[0]) == L3CacheGroupSize {
794800
Skip("This test requires systems where L3 cache is shared amount subset of cpus")
795801
}
796802

0 commit comments

Comments
 (0)