github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #87283 from klueska/update-printing-for-tm-bitmask

Browse Source 
Update bitmask printing to print in groups of 2 instead of all 64 bits
This commit is contained in:
Kubernetes Prow Robot 2020-01-16 12:04:32 -08:00 committed by GitHub
commit 9701baea0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/kubelet/cm/topologymanager/bitmask/bitmask.go
View File

@ -19,6 +19,7 @@ package bitmask
import ( import (
"fmt" "fmt"
"math/bits" "math/bits"
"strconv"
) )
// BitMask interface allows hint providers to create BitMasks for TopologyHints // BitMask interface allows hint providers to create BitMasks for TopologyHints
@ -140,7 +141,13 @@ func (s *bitMask) IsNarrowerThan(mask BitMask) bool {
// String converts mask to string // String converts mask to string
func (s *bitMask) String() string { func (s *bitMask) String() string {
return fmt.Sprintf("%064b", *s) grouping := 2
for shift := 64 - grouping; shift > 0; shift -= grouping {
if *s > (1 << uint(shift)) {
return fmt.Sprintf("%0"+strconv.Itoa(shift+grouping)+"b", *s)
}
}
return fmt.Sprintf("%0"+strconv.Itoa(grouping)+"b", *s)
} }
// Count counts number of bits in mask set to one // Count counts number of bits in mask set to one

54
pkg/kubelet/cm/topologymanager/bitmask/bitmask_test.go
View File

@ -28,7 +28,7 @@ func TestNewEmptyiBitMask(t *testing.T) {
}{ }{
{ {
name: "New empty BitMask", name: "New empty BitMask",
expectedMask: "0000000000000000000000000000000000000000000000000000000000000000", expectedMask: "00",
}, },
} }
for _, tc := range tcases { for _, tc := range tcases {
@ -48,17 +48,17 @@ func TestNewBitMask(t *testing.T) {
{ {
name: "New BitMask with bit 0 set", name: "New BitMask with bit 0 set",
bits: []int{0}, bits: []int{0},
expectedMask: "0000000000000000000000000000000000000000000000000000000000000001", expectedMask: "01",
}, },
{ {
name: "New BitMask with bit 1 set", name: "New BitMask with bit 1 set",
bits: []int{1}, bits: []int{1},
expectedMask: "0000000000000000000000000000000000000000000000000000000000000010", expectedMask: "10",
}, },
{ {
name: "New BitMask with bit 0 and bit 1 set", name: "New BitMask with bit 0 and bit 1 set",
bits: []int{0, 1}, bits: []int{0, 1},
expectedMask: "0000000000000000000000000000000000000000000000000000000000000011", expectedMask: "11",
}, },
} }
for _, tc := range tcases { for _, tc := range tcases {
@ -78,22 +78,22 @@ func TestAdd(t *testing.T) {
{ {
name: "Add BitMask with bit 0 set", name: "Add BitMask with bit 0 set",
bits: []int{0}, bits: []int{0},
expectedMask: "0000000000000000000000000000000000000000000000000000000000000001", expectedMask: "01",
}, },
{ {
name: "Add BitMask with bit 1 set", name: "Add BitMask with bit 1 set",
bits: []int{1}, bits: []int{1},
expectedMask: "0000000000000000000000000000000000000000000000000000000000000010", expectedMask: "10",
}, },
{ {
name: "Add BitMask with bits 0 and 1 set", name: "Add BitMask with bits 0 and 1 set",
bits: []int{0, 1}, bits: []int{0, 1},
expectedMask: "0000000000000000000000000000000000000000000000000000000000000011", expectedMask: "11",
}, },
{ {
name: "Add BitMask with bits outside range 0-63", name: "Add BitMask with bits outside range 0-63",
bits: []int{-1, 64}, bits: []int{-1, 64},
expectedMask: "0000000000000000000000000000000000000000000000000000000000000000", expectedMask: "00",
}, },
} }
for _, tc := range tcases { for _, tc := range tcases {
@ -116,25 +116,25 @@ func TestRemove(t *testing.T) {
name: "Set bit 0. Remove bit 0", name: "Set bit 0. Remove bit 0",
bitsSet: []int{0}, bitsSet: []int{0},
bitsRemove: []int{0}, bitsRemove: []int{0},
expectedMask: "0000000000000000000000000000000000000000000000000000000000000000", expectedMask: "00",
}, },
{ {
name: "Set bits 0 and 1. Remove bit 1", name: "Set bits 0 and 1. Remove bit 1",
bitsSet: []int{0, 1}, bitsSet: []int{0, 1},
bitsRemove: []int{1}, bitsRemove: []int{1},
expectedMask: "0000000000000000000000000000000000000000000000000000000000000001", expectedMask: "01",
}, },
{ {
name: "Set bits 0 and 1. Remove bits 0 and 1", name: "Set bits 0 and 1. Remove bits 0 and 1",
bitsSet: []int{0, 1}, bitsSet: []int{0, 1},
bitsRemove: []int{0, 1}, bitsRemove: []int{0, 1},
expectedMask: "0000000000000000000000000000000000000000000000000000000000000000", expectedMask: "00",
}, },
{ {
name: "Set bit 0. Attempt to remove bits outside range 0-63", name: "Set bit 0. Attempt to remove bits outside range 0-63",
bitsSet: []int{0}, bitsSet: []int{0},
bitsRemove: []int{-1, 64}, bitsRemove: []int{-1, 64},
expectedMask: "0000000000000000000000000000000000000000000000000000000000000001", expectedMask: "01",
}, },
} }
for _, tc := range tcases { for _, tc := range tcases {
@ -155,32 +155,32 @@ func TestAnd(t *testing.T) {
{ {
name: "Mask 11 AND mask 11", name: "Mask 11 AND mask 11",
masks: [][]int{{0, 1}, {0, 1}}, masks: [][]int{{0, 1}, {0, 1}},
andMask: "0000000000000000000000000000000000000000000000000000000000000011", andMask: "11",
}, },
{ {
name: "Mask 11 AND mask 10", name: "Mask 11 AND mask 10",
masks: [][]int{{0, 1}, {1}}, masks: [][]int{{0, 1}, {1}},
andMask: "0000000000000000000000000000000000000000000000000000000000000010", andMask: "10",
}, },
{ {
name: "Mask 01 AND mask 11", name: "Mask 01 AND mask 11",
masks: [][]int{{0}, {0, 1}}, masks: [][]int{{0}, {0, 1}},
andMask: "0000000000000000000000000000000000000000000000000000000000000001", andMask: "01",
}, },
{ {
name: "Mask 11 AND mask 11 AND mask 10", name: "Mask 11 AND mask 11 AND mask 10",
masks: [][]int{{0, 1}, {0, 1}, {1}}, masks: [][]int{{0, 1}, {0, 1}, {1}},
andMask: "0000000000000000000000000000000000000000000000000000000000000010", andMask: "10",
}, },
{ {
name: "Mask 01 AND mask 01 AND mask 10 AND mask 11", name: "Mask 01 AND mask 01 AND mask 10 AND mask 11",
masks: [][]int{{0}, {0}, {1}, {0, 1}}, masks: [][]int{{0}, {0}, {1}, {0, 1}},
andMask: "0000000000000000000000000000000000000000000000000000000000000000", andMask: "00",
}, },
{ {
name: "Mask 1111 AND mask 1110 AND mask 1100 AND mask 1000", name: "Mask 1111 AND mask 1110 AND mask 1100 AND mask 1000",
masks: [][]int{{0, 1, 2, 3}, {1, 2, 3}, {2, 3}, {3}}, masks: [][]int{{0, 1, 2, 3}, {1, 2, 3}, {2, 3}, {3}},
andMask: "0000000000000000000000000000000000000000000000000000000000001000", andMask: "1000",
}, },
} }
for _, tc := range tcases { for _, tc := range tcases {
@ -206,32 +206,32 @@ func TestOr(t *testing.T) {
{ {
name: "Mask 01 OR mask 00", name: "Mask 01 OR mask 00",
masks: [][]int{{0}, {}}, masks: [][]int{{0}, {}},
orMask: "0000000000000000000000000000000000000000000000000000000000000001", orMask: "01",
}, },
{ {
name: "Mask 10 OR mask 10", name: "Mask 10 OR mask 10",
masks: [][]int{{1}, {1}}, masks: [][]int{{1}, {1}},
orMask: "0000000000000000000000000000000000000000000000000000000000000010", orMask: "10",
}, },
{ {
name: "Mask 01 OR mask 10", name: "Mask 01 OR mask 10",
masks: [][]int{{0}, {1}}, masks: [][]int{{0}, {1}},
orMask: "0000000000000000000000000000000000000000000000000000000000000011", orMask: "11",
}, },
{ {
name: "Mask 11 OR mask 11", name: "Mask 11 OR mask 11",
masks: [][]int{{0, 1}, {0, 1}}, masks: [][]int{{0, 1}, {0, 1}},
orMask: "0000000000000000000000000000000000000000000000000000000000000011", orMask: "11",
}, },
{ {
name: "Mask 01 OR mask 10 OR mask 11", name: "Mask 01 OR mask 10 OR mask 11",
masks: [][]int{{0}, {1}, {0, 1}}, masks: [][]int{{0}, {1}, {0, 1}},
orMask: "0000000000000000000000000000000000000000000000000000000000000011", orMask: "11",
}, },
{ {
name: "Mask 1000 OR mask 0100 OR mask 0010 OR mask 0001", name: "Mask 1000 OR mask 0100 OR mask 0010 OR mask 0001",
masks: [][]int{{3}, {2}, {1}, {0}}, masks: [][]int{{3}, {2}, {1}, {0}},
orMask: "0000000000000000000000000000000000000000000000000000000000001111", orMask: "1111",
}, },
} }
for _, tc := range tcases { for _, tc := range tcases {
@ -256,17 +256,17 @@ func TestClear(t *testing.T) {
{ {
name: "Clear mask 01", name: "Clear mask 01",
mask: []int{0}, mask: []int{0},
clearedMask: "0000000000000000000000000000000000000000000000000000000000000000", clearedMask: "00",
}, },
{ {
name: "Clear mask 10", name: "Clear mask 10",
mask: []int{1}, mask: []int{1},
clearedMask: "0000000000000000000000000000000000000000000000000000000000000000", clearedMask: "00",
}, },
{ {
name: "Clear mask 11", name: "Clear mask 11",
mask: []int{0, 1}, mask: []int{0, 1},
clearedMask: "0000000000000000000000000000000000000000000000000000000000000000", clearedMask: "00",
}, },
} }
for _, tc := range tcases { for _, tc := range tcases {