Skip to content

Commit

Permalink
utils/tests/calc: check for multiple levels of groups
Browse files Browse the repository at this point in the history
Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr>
  • Loading branch information
bgoglin committed Jul 19, 2022
1 parent ac18e13 commit 4732ec4
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
12 changes: 12 additions & 0 deletions utils/hwloc/test-hwloc-calc.output
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,18 @@
# combination of different ranges, hierarchical or not
0x8000c000,0x000ee0c0

# number of Group0 when there are 3 group levels
2

# list of Group1 near one Group0 when there are 3 group levels
0,1

# hierarchical list of Group0.Group2 near one NUMA when there are 3 group levels
Group0:1.Group2:2 Group0:1.Group2:3

# number of Group2 when there are 3 group levels
8

# Number of NUMA Nodes
4

Expand Down
15 changes: 14 additions & 1 deletion utils/hwloc/test-hwloc-calc.sh.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#
# Copyright © 2009 CNRS
# Copyright © 2009-2020 Inria. All rights reserved.
# Copyright © 2009-2022 Inria. All rights reserved.
# Copyright © 2009, 2011 Université Bordeaux
# Copyright © 2014 Cisco Systems, Inc. All rights reserved.
# See COPYING in top-level directory.
Expand Down Expand Up @@ -98,6 +98,19 @@ set -e
$calc --if synthetic --input "node:4 core:4 pu:4" pu:6:2 core:3-4.pu:1-3 node:2.pu:14:2 node:3.core:3.pu:3
echo

echo "# number of Group0 when there are 3 group levels"
$calc --if synthetic --input "group:2 node:2 group:2 pu:2" -N group0 all
echo
echo "# list of Group1 near one Group0 when there are 3 group levels"
$calc --if synthetic --input "group:2 node:2 group:2 pu:2" -I group1 group0:0
echo
echo "# hierarchical list of Group0.Group2 near one NUMA when there are 3 group levels"
$calc --if synthetic --input "group:2 node:2 group:2 pu:2" -H group0.group2 numa:3
echo
echo "# number of Group2 when there are 3 group levels"
$calc --if synthetic --input "group:2 node:2 group:2 pu:2" -N group2 all
echo

echo "# Number of NUMA Nodes"
$calc --if synthetic --input "node:4 core:4 pu:4" root --number-of node
echo
Expand Down

0 comments on commit 4732ec4

Please sign in to comment.