Skip to content

Commit 9d52172

Browse files
KFilipekKFilipek
committed
[CI] Add non-HMAT qemu configs
1 parent 0216a43 commit 9d52172

File tree

12 files changed

+212
-32
lines changed

12 files changed

+212
-32
lines changed

‎.github/workflows/qemu.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ jobs:
1515
runs-on: ubuntu-22.04
1616
strategy:
1717
matrix:
18-
config: ['default',
19-
'sock_2_var1_hmat',
20-
'sock_2_var2_hmat',
21-
'sock_2_var3_hmat',
22-
'sock_4_var1_hmat',
23-
'sock_4_var2_hmat']
24-
# TODO: Add following
25-
#'sock_2_var1'
26-
#'sock_2_var2'
27-
#'sock_2_var3'
28-
#'sock_4_var1'
29-
#'sock_4_var2'
18+
config: [{name: 'default', hmat: 'on'},
19+
{ name: 'sock_2_var1', hmat: 'off'},
20+
{ name: 'sock_2_var1_hmat', hmat: 'on'},
21+
{ name: 'sock_2_var2', hmat: 'off'},
22+
{ name: 'sock_2_var2_hmat', hmat: 'on'},
23+
{ name: 'sock_2_var3', hmat: 'off'},
24+
{ name: 'sock_2_var3_hmat', hmat: 'on'},
25+
{ name: 'sock_4_var1', hmat: 'off'},
26+
{ name: 'sock_4_var1_hmat', hmat: 'on'},
27+
{ name: 'sock_4_var2', hmat: 'off'},
28+
{ name: 'sock_4_var2_hmat', hmat: 'on'}]
29+
3030
steps:
3131
- name: Checkout
3232
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -86,16 +86,16 @@ jobs:
8686
- name: Print qemu args
8787
run: |
8888
# notice: should be sedded, but it hides status
89-
python3 scripts/qemu/qemu_config.py scripts/qemu/configs/${{matrix.config}}.xml
89+
python3 scripts/qemu/qemu_config.py scripts/qemu/configs/${{matrix.config.name}}.xml
9090
- name: Run qemu
9191
run: |
9292
sudo qemu-system-x86_64 \
9393
-drive file=./ubuntu-23.04-server-cloudimg-amd64.img,format=qcow2,index=0,media=disk,id=hd \
9494
-cdrom ./ubuntu-cloud-init.iso \
95-
-machine q35,usb=off,hmat=on \
95+
-machine q35,usb=off,hmat=${{matrix.config.hmat}} \
9696
-enable-kvm \
9797
-net nic -net user,hostfwd=tcp::2222-:22 \
98-
$(echo `python3 scripts/qemu/qemu_config.py scripts/qemu/configs/${{matrix.config}}.xml | sed s/''\''/'/g`) \
98+
$(echo `python3 scripts/qemu/qemu_config.py scripts/qemu/configs/${{matrix.config.name}}.xml | sed s/''\''/'/g`) \
9999
-daemonize -display none
100100
- name: Run ssh keyscan
101101
run: |

‎scripts/qemu/configs/default.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,21 @@
22
# Copyright (C) 2024 Intel Corporation.
33
-->
44

5+
<!--
6+
7+
Total Sockets: 2
8+
Total CPUs: 4
9+
Thread per CPU: 1
10+
Total Memory: 3500MiB
11+
HMAT: Enabled
12+
13+
_______|_CORES_|____MEMORY____|______DISTANCES______|
14+
Cell 0 | 2 | 1100MiB | 10, 20, 17 |
15+
Cell 1 | 2 | 1200MiB | 20, 10, 28 |
16+
Cell 2 | 0 | 1200MiB | 17, 28, 10 |
17+
18+
-->
19+
520
<domain type='qemu'>
621
<name>Default</name>
722
<os>

‎scripts/qemu/configs/sock_2_var1.xml

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,21 @@
22
# Copyright (C) 2020 - 2024 Intel Corporation.
33
-->
44

5+
<!--
6+
7+
Total Sockets: 2
8+
Total CPUs: 4
9+
Thread per CPU: 1
10+
Total Memory: 3564MiB
11+
HMAT: Disabled
12+
13+
_______|_CORES_|____MEMORY____|______DISTANCES______|
14+
Cell 0 | 2 | 1152MiB | 10, 20, 17 |
15+
Cell 1 | 2 | 1152MiB | 20, 10, 28 |
16+
Cell 2 | 0 | 1260MiB | 17, 28, 10 |
17+
18+
-->
19+
520
<domain type='qemu'>
621
<name>Sockets2Var1</name>
722
<os>
@@ -11,21 +26,21 @@
1126
<cpu>
1227
<topology sockets='2' dies='1' cores='2' threads='1'/>
1328
<numa>
14-
<cell id='0' cpus='0-1' memory='256' unit='MiB'>
29+
<cell id='0' cpus='0-1' memory='1152' unit='MiB'>
1530
<distances>
1631
<sibling id='0' value='10'/>
1732
<sibling id='1' value='20'/>
1833
<sibling id='2' value='17'/>
1934
</distances>
2035
</cell>
21-
<cell id='1' cpus='2-3' memory='512' unit='MiB'>
36+
<cell id='1' cpus='2-3' memory='1152' unit='MiB'>
2237
<distances>
2338
<sibling id='0' value='20'/>
2439
<sibling id='1' value='10'/>
2540
<sibling id='2' value='28'/>
2641
</distances>
2742
</cell>
28-
<cell id='2' memory='2560' unit='MiB'>
43+
<cell id='2' memory='1260' unit='MiB'>
2944
<distances>
3045
<sibling id='0' value='17'/>
3146
<sibling id='1' value='28'/>

‎scripts/qemu/configs/sock_2_var1_hmat.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,21 @@
22
# Copyright (C) 2021 - 2024 Intel Corporation.
33
-->
44

5+
<!--
6+
7+
Total Sockets: 2
8+
Total CPUs: 4
9+
Thread per CPU: 1
10+
Total Memory: 3564MiB
11+
HMAT: Enabled
12+
13+
_______|_CORES_|____MEMORY____|______DISTANCES______|
14+
Cell 0 | 2 | 1152MiB | 10, 20, 17 |
15+
Cell 1 | 2 | 1152MiB | 20, 10, 28 |
16+
Cell 2 | 0 | 1260MiB | 17, 28, 10 |
17+
18+
-->
19+
520
<domain type='qemu'>
621
<name>Sockets2Var1HMAT</name>
722
<os>

‎scripts/qemu/configs/sock_2_var2.xml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,21 @@
22
# Copyright (C) 2021 - 2024 Intel Corporation.
33
-->
44

5+
<!--
6+
7+
Total Sockets: 2
8+
Total CPUs: 4
9+
Thread per CPU: 1
10+
Total Memory: 4096MiB
11+
HMAT: Disabled
12+
13+
_______|_CORES_|____MEMORY____|______DISTANCES______|
14+
Cell 0 | 2 | 768MiB | 10, 20, 28 |
15+
Cell 1 | 2 | 768MiB | 20, 10, 17 |
16+
Cell 2 | 0 | 2560MiB | 28, 17, 10 |
17+
18+
-->
19+
520
<domain type='qemu'>
621
<name>Sockets2Var2</name>
722
<os>
@@ -11,14 +26,14 @@
1126
<cpu>
1227
<topology sockets='2' dies='1' cores='2' threads='1'/>
1328
<numa>
14-
<cell id='0' cpus='0-1' memory='256' unit='MiB'>
29+
<cell id='0' cpus='0-1' memory='768' unit='MiB'>
1530
<distances>
1631
<sibling id='0' value='10'/>
1732
<sibling id='1' value='20'/>
1833
<sibling id='2' value='28'/>
1934
</distances>
2035
</cell>
21-
<cell id='1' cpus='2-3' memory='512' unit='MiB'>
36+
<cell id='1' cpus='2-3' memory='768' unit='MiB'>
2237
<distances>
2338
<sibling id='0' value='20'/>
2439
<sibling id='1' value='10'/>

‎scripts/qemu/configs/sock_2_var2_hmat.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@
22
# Copyright (C) 2021 - 2024 Intel Corporation.
33
-->
44

5+
<!--
6+
7+
Total Sockets: 2
8+
Total CPUs: 4
9+
Thread per CPU: 1
10+
Total Memory: 4096MiB
11+
12+
_______|_CORES_|____MEMORY____|______DISTANCES______|
13+
Cell 0 | 2 | 1152MiB | 10, 20, 17 |
14+
Cell 1 | 2 | 1152MiB | 20, 10, 28 |
15+
Cell 2 | 0 | 1792MiB | 17, 28, 10 |
16+
17+
-->
18+
519
<domain type='qemu'>
620
<name>Sockets2Var2HMAT</name>
721
<os>

‎scripts/qemu/configs/sock_2_var3.xml

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,22 @@
22
# Copyright (C) 2021 - 2024 Intel Corporation.
33
-->
44

5+
<!--
6+
7+
Total Sockets: 2
8+
Total CPUs: 4
9+
Thread per CPU: 1
10+
Total Memory: 4096MiB
11+
HMAT: Disabled
12+
13+
_______|_CORES_|____MEMORY____|______DISTANCES______|
14+
Cell 0 | 2 | 1024MiB | 10, 20, 17, 28 |
15+
Cell 1 | 2 | 1024MiB | 20, 10, 28, 17 |
16+
Cell 2 | 0 | 1024MiB | 17, 28, 10, 28 |
17+
Cell 3 | 0 | 1024MiB | 28, 17, 28, 10 |
18+
19+
-->
20+
521
<domain type='qemu'>
622
<name>Sockets2Var3</name>
723
<os>
@@ -11,31 +27,31 @@
1127
<cpu>
1228
<topology sockets='2' dies='1' cores='2' threads='1'/>
1329
<numa>
14-
<cell id='0' cpus='0-1' memory='256' unit='MiB'>
30+
<cell id='0' cpus='0-1' memory='1024' unit='MiB'>
1531
<distances>
1632
<sibling id='0' value='10'/>
1733
<sibling id='1' value='20'/>
1834
<sibling id='2' value='17'/>
1935
<sibling id='3' value='28'/>
2036
</distances>
2137
</cell>
22-
<cell id='1' cpus='2-3' memory='512' unit='MiB'>
38+
<cell id='1' cpus='2-3' memory='1024' unit='MiB'>
2339
<distances>
2440
<sibling id='0' value='20'/>
2541
<sibling id='1' value='10'/>
2642
<sibling id='2' value='28'/>
2743
<sibling id='3' value='17'/>
2844
</distances>
2945
</cell>
30-
<cell id='2' memory='2560' unit='MiB'>
46+
<cell id='2' memory='1024' unit='MiB'>
3147
<distances>
3248
<sibling id='0' value='17'/>
3349
<sibling id='1' value='28'/>
3450
<sibling id='2' value='10'/>
3551
<sibling id='3' value='28'/>
3652
</distances>
3753
</cell>
38-
<cell id='3' memory='2560' unit='MiB'>
54+
<cell id='3' memory='1024' unit='MiB'>
3955
<distances>
4056
<sibling id='0' value='28'/>
4157
<sibling id='1' value='17'/>

‎scripts/qemu/configs/sock_2_var3_hmat.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,22 @@
22
# Copyright (C) 2021 - 2024 Intel Corporation.
33
-->
44

5+
<!--
6+
7+
Total Sockets: 2
8+
Total CPUs: 4
9+
Thread per CPU: 1
10+
Total Memory: 3840MiB
11+
HMAT: Enabled
12+
13+
_______|_CORES_|____MEMORY____|______DISTANCES______|
14+
Cell 0 | 2 | 1024MiB | 10, 20, 17, 28 |
15+
Cell 1 | 2 | 1024MiB | 20, 10, 28, 17 |
16+
Cell 2 | 0 | 1792MiB | 17, 28, 10, 28 |
17+
Cell 3 | 0 | 1792MiB | 28, 17, 28, 10 |
18+
19+
-->
20+
521
<domain type='qemu'>
622
<name>Sockets2Var3HMAT</name>
723
<os>

‎scripts/qemu/configs/sock_4_var1.xml

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,26 @@
22
# Copyright (C) 2020 - 2024 Intel Corporation.
33
-->
44

5+
<!--
6+
7+
Total Sockets: 4
8+
Total CPUs: 4
9+
Thread per CPU: 1
10+
Total Memory: 10240MiB
11+
HMAT: Disabled
12+
13+
_______|_CORES_|____MEMORY____|___________DISTANCES____________|
14+
Cell 0 | 1 | 1024MiB | 10, 21, 31, 21, 17, 28, 38, 28 |
15+
Cell 1 | 1 | 1024MiB | 21, 10, 21, 31, 28, 17, 28, 38 |
16+
Cell 2 | 1 | 1024MiB | 31, 21, 10, 21, 38, 28, 17, 28 |
17+
Cell 3 | 1 | 1024MiB | 21, 31, 21, 10, 28, 38, 28, 17 |
18+
Cell 4 | 0 | 1536MiB | 17, 28, 38, 28, 10, 28, 38, 28 |
19+
Cell 5 | 0 | 1536MiB | 28, 17, 28, 38, 28, 10, 28, 38 |
20+
Cell 6 | 0 | 1536MiB | 38, 28, 17, 28, 38, 28, 10, 28 |
21+
Cell 7 | 0 | 1536MiB | 28, 38, 28, 17, 28, 38, 28, 10 |
22+
23+
-->
24+
525
<domain type='qemu'>
626
<name>Sockets4Var1</name>
727
<os>
@@ -11,7 +31,7 @@
1131
<cpu>
1232
<topology sockets='4' dies='1' cores='1' threads='1'/>
1333
<numa>
14-
<cell id='0' cpus='0' memory='256' unit='MiB'>
34+
<cell id='0' cpus='0' memory='1024' unit='MiB'>
1535
<distances>
1636
<sibling id='0' value='10'/>
1737
<sibling id='1' value='21'/>
@@ -23,7 +43,7 @@
2343
<sibling id='7' value='28'/>
2444
</distances>
2545
</cell>
26-
<cell id='1' cpus='2' memory='256' unit='MiB'>
46+
<cell id='1' cpus='1' memory='1024' unit='MiB'>
2747
<distances>
2848
<sibling id='0' value='21'/>
2949
<sibling id='1' value='10'/>
@@ -35,7 +55,7 @@
3555
<sibling id='7' value='38'/>
3656
</distances>
3757
</cell>
38-
<cell id='2' cpus='3' memory='256' unit='MiB'>
58+
<cell id='2' cpus='2' memory='1024' unit='MiB'>
3959
<distances>
4060
<sibling id='0' value='31'/>
4161
<sibling id='1' value='21'/>
@@ -47,7 +67,7 @@
4767
<sibling id='7' value='28'/>
4868
</distances>
4969
</cell>
50-
<cell id='3' cpus='4' memory='256' unit='MiB'>
70+
<cell id='3' cpus='3' memory='1024' unit='MiB'>
5171
<distances>
5272
<sibling id='0' value='21'/>
5373
<sibling id='1' value='31'/>

‎scripts/qemu/configs/sock_4_var1_hmat.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,26 @@
22
# Copyright (C) 2020 - 2024 Intel Corporation.
33
-->
44

5+
<!--
6+
7+
Total Sockets: 4
8+
Total CPUs: 4
9+
Thread per CPU: 1
10+
Total Memory: 10240MiB
11+
HMAT: Disabled
12+
13+
_______|_CORES_|____MEMORY____|___________DISTANCES____________|
14+
Cell 0 | 1 | 1024MiB | 10, 21, 31, 21, 17, 28, 38, 28 |
15+
Cell 1 | 1 | 1024MiB | 21, 10, 21, 31, 28, 17, 28, 38 |
16+
Cell 2 | 1 | 1024MiB | 31, 21, 10, 21, 38, 28, 17, 28 |
17+
Cell 3 | 1 | 1024MiB | 21, 31, 21, 10, 28, 38, 28, 17 |
18+
Cell 4 | 0 | 1536MiB | 17, 28, 38, 28, 10, 28, 38, 28 |
19+
Cell 5 | 0 | 1536MiB | 28, 17, 28, 38, 28, 10, 28, 38 |
20+
Cell 6 | 0 | 1536MiB | 38, 28, 17, 28, 38, 28, 10, 28 |
21+
Cell 7 | 0 | 1536MiB | 28, 38, 28, 17, 28, 38, 28, 10 |
22+
23+
-->
24+
525
<domain type='qemu'>
626
<name>Sockets4Var1HMAT</name>
727
<os>

0 commit comments

Comments
 (0)