Skip to content

Commit 73352c1

Browse files
bratpiorkabratpiorka
authored
Merge pull request #469 from KFilipek/more_qemu_configs
[CI] Add more qemu configurations
2 parents 7f18587 + 0216a43 commit 73352c1

13 files changed

+737
-4
lines changed

‎.github/workflows/qemu.yml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,20 @@ jobs:
1313
qemu-build:
1414
name: Qemu
1515
runs-on: ubuntu-22.04
16-
16+
strategy:
17+
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'
1730
steps:
1831
- name: Checkout
1932
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -72,7 +85,8 @@ jobs:
7285
run: qemu-img resize ./ubuntu-23.04-server-cloudimg-amd64.img +4G
7386
- name: Print qemu args
7487
run: |
75-
echo `python3 scripts/qemu/qemu_config.py scripts/qemu/configs/default.xml | sed s/''\''/'/g`
88+
# notice: should be sedded, but it hides status
89+
python3 scripts/qemu/qemu_config.py scripts/qemu/configs/${{matrix.config}}.xml
7690
- name: Run qemu
7791
run: |
7892
sudo qemu-system-x86_64 \
@@ -81,7 +95,7 @@ jobs:
8195
-machine q35,usb=off,hmat=on \
8296
-enable-kvm \
8397
-net nic -net user,hostfwd=tcp::2222-:22 \
84-
$(echo `python3 scripts/qemu/qemu_config.py scripts/qemu/configs/default.xml | sed s/''\''/'/g`) \
98+
$(echo `python3 scripts/qemu/qemu_config.py scripts/qemu/configs/${{matrix.config}}.xml | sed s/''\''/'/g`) \
8599
-daemonize -display none
86100
- name: Run ssh keyscan
87101
run: |

‎scripts/qemu/configs/default.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<!-- SPDX-License-Identifier: BSD-2-Clause
22
# Copyright (C) 2024 Intel Corporation.
33
-->
4+
45
<domain type='qemu'>
5-
<name>CascadeLake</name>
6+
<name>Default</name>
67
<os>
78
<type arch='x86_64' machine='pc'>hvm</type>
89
</os>

‎scripts/qemu/configs/sock_2_var1.xml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<!-- SPDX-License-Identifier: BSD-2-Clause
2+
# Copyright (C) 2020 - 2024 Intel Corporation.
3+
-->
4+
5+
<domain type='qemu'>
6+
<name>Sockets2Var1</name>
7+
<os>
8+
<type arch='x86_64' machine='pc'>hvm</type>
9+
</os>
10+
<vcpu placement='static'>4</vcpu>
11+
<cpu>
12+
<topology sockets='2' dies='1' cores='2' threads='1'/>
13+
<numa>
14+
<cell id='0' cpus='0-1' memory='256' unit='MiB'>
15+
<distances>
16+
<sibling id='0' value='10'/>
17+
<sibling id='1' value='20'/>
18+
<sibling id='2' value='17'/>
19+
</distances>
20+
</cell>
21+
<cell id='1' cpus='2-3' memory='512' unit='MiB'>
22+
<distances>
23+
<sibling id='0' value='20'/>
24+
<sibling id='1' value='10'/>
25+
<sibling id='2' value='28'/>
26+
</distances>
27+
</cell>
28+
<cell id='2' memory='2560' unit='MiB'>
29+
<distances>
30+
<sibling id='0' value='17'/>
31+
<sibling id='1' value='28'/>
32+
<sibling id='2' value='10'/>
33+
</distances>
34+
</cell>
35+
</numa>
36+
</cpu>
37+
</domain>

‎scripts/qemu/configs/sock_2_var1_hmat.xml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<!-- SPDX-License-Identifier: BSD-2-Clause
2+
# Copyright (C) 2021 - 2024 Intel Corporation.
3+
-->
4+
5+
<domain type='qemu'>
6+
<name>Sockets2Var1HMAT</name>
7+
<os>
8+
<type arch='x86_64' machine='pc'>hvm</type>
9+
</os>
10+
<vcpu placement='static'>4</vcpu>
11+
<cpu>
12+
<topology sockets='2' dies='1' cores='2' threads='1'/>
13+
<numa>
14+
<cell id='0' cpus='0-1' memory='1152' unit='MiB'>
15+
<distances>
16+
<sibling id='0' value='10'/>
17+
<sibling id='1' value='20'/>
18+
<sibling id='2' value='17'/>
19+
</distances>
20+
</cell>
21+
<cell id='1' cpus='2-3' memory='1152' unit='MiB'>
22+
<distances>
23+
<sibling id='0' value='20'/>
24+
<sibling id='1' value='10'/>
25+
<sibling id='2' value='28'/>
26+
</distances>
27+
</cell>
28+
<cell id='2' memory='1260' unit='MiB'>
29+
<distances>
30+
<sibling id='0' value='17'/>
31+
<sibling id='1' value='28'/>
32+
<sibling id='2' value='10'/>
33+
</distances>
34+
</cell>
35+
<interconnects>
36+
<latency initiator='0' target='0' type='access' value='72'/>
37+
<bandwidth initiator='0' target='0' type='access' value='111000' unit='MiB'/>
38+
<latency initiator='0' target='1' type='access' value='133'/>
39+
<bandwidth initiator='0' target='1' type='access' value='33770' unit='MiB'/>
40+
<latency initiator='0' target='2' type='access' value='176'/>
41+
<bandwidth initiator='0' target='2' type='access' value='25600' unit='MiB'/>
42+
<latency initiator='1' target='1' type='access' value='72'/>
43+
<bandwidth initiator='1' target='1' type='access' value='111000' unit='MiB'/>
44+
<latency initiator='1' target='2' type='access' value='240'/>
45+
<bandwidth initiator='1' target='2' type='access' value='840' unit='MiB'/>
46+
</interconnects>
47+
</numa>
48+
</cpu>
49+
</domain>

‎scripts/qemu/configs/sock_2_var2.xml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<!-- SPDX-License-Identifier: BSD-2-Clause
2+
# Copyright (C) 2021 - 2024 Intel Corporation.
3+
-->
4+
5+
<domain type='qemu'>
6+
<name>Sockets2Var2</name>
7+
<os>
8+
<type arch='x86_64' machine='pc'>hvm</type>
9+
</os>
10+
<vcpu placement='static'>4</vcpu>
11+
<cpu>
12+
<topology sockets='2' dies='1' cores='2' threads='1'/>
13+
<numa>
14+
<cell id='0' cpus='0-1' memory='256' unit='MiB'>
15+
<distances>
16+
<sibling id='0' value='10'/>
17+
<sibling id='1' value='20'/>
18+
<sibling id='2' value='28'/>
19+
</distances>
20+
</cell>
21+
<cell id='1' cpus='2-3' memory='512' unit='MiB'>
22+
<distances>
23+
<sibling id='0' value='20'/>
24+
<sibling id='1' value='10'/>
25+
<sibling id='2' value='17'/>
26+
</distances>
27+
</cell>
28+
<cell id='2' memory='2560' unit='MiB'>
29+
<distances>
30+
<sibling id='0' value='28'/>
31+
<sibling id='1' value='17'/>
32+
<sibling id='2' value='10'/>
33+
</distances>
34+
</cell>
35+
</numa>
36+
</cpu>
37+
</domain>

‎scripts/qemu/configs/sock_2_var2_hmat.xml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<!-- SPDX-License-Identifier: BSD-2-Clause
2+
# Copyright (C) 2021 - 2024 Intel Corporation.
3+
-->
4+
5+
<domain type='qemu'>
6+
<name>Sockets2Var2HMAT</name>
7+
<os>
8+
<type arch='x86_64' machine='pc'>hvm</type>
9+
</os>
10+
<vcpu placement='static'>4</vcpu>
11+
<cpu>
12+
<topology sockets='2' dies='1' cores='2' threads='1'/>
13+
<numa>
14+
<cell id='0' cpus='0-1' memory='1152' unit='MiB'>
15+
<distances>
16+
<sibling id='0' value='10'/>
17+
<sibling id='1' value='20'/>
18+
<sibling id='2' value='28'/>
19+
</distances>
20+
</cell>
21+
<cell id='1' cpus='2-3' memory='1152' unit='MiB'>
22+
<distances>
23+
<sibling id='0' value='20'/>
24+
<sibling id='1' value='10'/>
25+
<sibling id='2' value='17'/>
26+
</distances>
27+
</cell>
28+
<cell id='2' memory='1792' unit='MiB'>
29+
<distances>
30+
<sibling id='0' value='28'/>
31+
<sibling id='1' value='17'/>
32+
<sibling id='2' value='10'/>
33+
</distances>
34+
</cell>
35+
<interconnects>
36+
<latency initiator='0' target='0' type='access' value='72'/>
37+
<bandwidth initiator='0' target='0' type='access' value='111000' unit='MiB'/>
38+
<latency initiator='0' target='1' type='access' value='133'/>
39+
<bandwidth initiator='0' target='1' type='access' value='33770' unit='MiB'/>
40+
<latency initiator='0' target='2' type='access' value='240'/>
41+
<bandwidth initiator='0' target='2' type='access' value='840' unit='MiB'/>
42+
<latency initiator='1' target='1' type='access' value='72'/>
43+
<bandwidth initiator='1' target='1' type='access' value='111000' unit='MiB'/>
44+
<latency initiator='1' target='2' type='access' value='176'/>
45+
<bandwidth initiator='1' target='2' type='access' value='25600' unit='MiB'/>
46+
</interconnects>
47+
</numa>
48+
</cpu>
49+
</domain>

‎scripts/qemu/configs/sock_2_var3.xml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<!-- SPDX-License-Identifier: BSD-2-Clause
2+
# Copyright (C) 2021 - 2024 Intel Corporation.
3+
-->
4+
5+
<domain type='qemu'>
6+
<name>Sockets2Var3</name>
7+
<os>
8+
<type arch='x86_64' machine='pc'>hvm</type>
9+
</os>
10+
<vcpu placement='static'>4</vcpu>
11+
<cpu>
12+
<topology sockets='2' dies='1' cores='2' threads='1'/>
13+
<numa>
14+
<cell id='0' cpus='0-1' memory='256' unit='MiB'>
15+
<distances>
16+
<sibling id='0' value='10'/>
17+
<sibling id='1' value='20'/>
18+
<sibling id='2' value='17'/>
19+
<sibling id='3' value='28'/>
20+
</distances>
21+
</cell>
22+
<cell id='1' cpus='2-3' memory='512' unit='MiB'>
23+
<distances>
24+
<sibling id='0' value='20'/>
25+
<sibling id='1' value='10'/>
26+
<sibling id='2' value='28'/>
27+
<sibling id='3' value='17'/>
28+
</distances>
29+
</cell>
30+
<cell id='2' memory='2560' unit='MiB'>
31+
<distances>
32+
<sibling id='0' value='17'/>
33+
<sibling id='1' value='28'/>
34+
<sibling id='2' value='10'/>
35+
<sibling id='3' value='28'/>
36+
</distances>
37+
</cell>
38+
<cell id='3' memory='2560' unit='MiB'>
39+
<distances>
40+
<sibling id='0' value='28'/>
41+
<sibling id='1' value='17'/>
42+
<sibling id='2' value='28'/>
43+
<sibling id='3' value='10'/>
44+
</distances>
45+
</cell>
46+
</numa>
47+
</cpu>
48+
</domain>

‎scripts/qemu/configs/sock_2_var3_hmat.xml

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<!-- SPDX-License-Identifier: BSD-2-Clause
2+
# Copyright (C) 2021 - 2024 Intel Corporation.
3+
-->
4+
5+
<domain type='qemu'>
6+
<name>Sockets2Var3HMAT</name>
7+
<os>
8+
<type arch='x86_64' machine='pc'>hvm</type>
9+
</os>
10+
<vcpu placement='static'>4</vcpu>
11+
<cpu>
12+
<topology sockets='2' dies='1' cores='2' threads='1'/>
13+
<numa>
14+
<cell id='0' cpus='0-1' memory='1024' unit='MiB'>
15+
<distances>
16+
<sibling id='0' value='10'/>
17+
<sibling id='1' value='20'/>
18+
<sibling id='2' value='17'/>
19+
<sibling id='3' value='28'/>
20+
</distances>
21+
</cell>
22+
<cell id='1' cpus='2-3' memory='1024' unit='MiB'>
23+
<distances>
24+
<sibling id='0' value='20'/>
25+
<sibling id='1' value='10'/>
26+
<sibling id='2' value='28'/>
27+
<sibling id='3' value='17'/>
28+
</distances>
29+
</cell>
30+
<cell id='2' memory='1792' unit='MiB'>
31+
<distances>
32+
<sibling id='0' value='17'/>
33+
<sibling id='1' value='28'/>
34+
<sibling id='2' value='10'/>
35+
<sibling id='3' value='28'/>
36+
</distances>
37+
</cell>
38+
<cell id='3' memory='1792' unit='MiB'>
39+
<distances>
40+
<sibling id='0' value='28'/>
41+
<sibling id='1' value='17'/>
42+
<sibling id='2' value='28'/>
43+
<sibling id='3' value='10'/>
44+
</distances>
45+
</cell>
46+
<interconnects>
47+
<latency initiator='0' target='0' type='access' value='72'/>
48+
<bandwidth initiator='0' target='0' type='access' value='111000' unit='MiB'/>
49+
<latency initiator='0' target='1' type='access' value='133'/>
50+
<bandwidth initiator='0' target='1' type='access' value='33770' unit='MiB'/>
51+
<latency initiator='0' target='2' type='access' value='176'/>
52+
<bandwidth initiator='0' target='2' type='access' value='25600' unit='MiB'/>
53+
<latency initiator='0' target='3' type='access' value='240'/>
54+
<bandwidth initiator='0' target='3' type='access' value='840' unit='MiB'/>
55+
<latency initiator='1' target='1' type='access' value='72'/>
56+
<bandwidth initiator='1' target='1' type='access' value='111000' unit='MiB'/>
57+
<latency initiator='1' target='2' type='access' value='240'/>
58+
<bandwidth initiator='1' target='2' type='access' value='840' unit='MiB'/>
59+
<latency initiator='1' target='3' type='access' value='176'/>
60+
<bandwidth initiator='1' target='3' type='access' value='25600' unit='MiB'/>
61+
</interconnects>
62+
</numa>
63+
</cpu>
64+
</domain>

0 commit comments

Comments
 (0)