Skip to content

[CI] Add no-HMAT qemu configuration files #499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 20, 2024
Merged

[CI] Add no-HMAT qemu configuration files #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions .github/workflows/qemu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ jobs:
runs-on: ubuntu-22.04
strategy:
matrix:
config: ['default',
'sock_2_var1_hmat',
'sock_2_var2_hmat',
'sock_2_var3_hmat',
'sock_4_var1_hmat',
'sock_4_var2_hmat']
# TODO: Add following
#'sock_2_var1'
#'sock_2_var2'
#'sock_2_var3'
#'sock_4_var1'
#'sock_4_var2'
config: [{name: 'default', hmat: 'on'},
{ name: 'sock_2_var1', hmat: 'off'},
{ name: 'sock_2_var1_hmat', hmat: 'on'},
{ name: 'sock_2_var2', hmat: 'off'},
{ name: 'sock_2_var2_hmat', hmat: 'on'},
{ name: 'sock_2_var3', hmat: 'off'},
{ name: 'sock_2_var3_hmat', hmat: 'on'},
{ name: 'sock_4_var1', hmat: 'off'},
{ name: 'sock_4_var1_hmat', hmat: 'on'},
{ name: 'sock_4_var2', hmat: 'off'},
{ name: 'sock_4_var2_hmat', hmat: 'on'}]

steps:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
Expand Down Expand Up @@ -86,16 +86,16 @@ jobs:
- name: Print qemu args
run: |
# notice: should be sedded, but it hides status
python3 scripts/qemu/qemu_config.py scripts/qemu/configs/${{matrix.config}}.xml
python3 scripts/qemu/qemu_config.py scripts/qemu/configs/${{matrix.config.name}}.xml
- name: Run qemu
run: |
sudo qemu-system-x86_64 \
-drive file=./ubuntu-23.04-server-cloudimg-amd64.img,format=qcow2,index=0,media=disk,id=hd \
-cdrom ./ubuntu-cloud-init.iso \
-machine q35,usb=off,hmat=on \
-machine q35,usb=off,hmat=${{matrix.config.hmat}} \
-enable-kvm \
-net nic -net user,hostfwd=tcp::2222-:22 \
$(echo `python3 scripts/qemu/qemu_config.py scripts/qemu/configs/${{matrix.config}}.xml | sed s/''\''/'/g`) \
$(echo `python3 scripts/qemu/qemu_config.py scripts/qemu/configs/${{matrix.config.name}}.xml | sed s/''\''/'/g`) \
-daemonize -display none
- name: Run ssh keyscan
run: |
Expand Down
15 changes: 15 additions & 0 deletions scripts/qemu/configs/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@
# Copyright (C) 2024 Intel Corporation.
-->

<!--

Total Sockets: 2
Total CPUs: 4
Thread per CPU: 1
Total Memory: 3500MiB
HMAT: Enabled

_______|_CORES_|____MEMORY____|______DISTANCES______|
Cell 0 | 2 | 1100MiB | 10, 20, 17 |
Cell 1 | 2 | 1200MiB | 20, 10, 28 |
Cell 2 | 0 | 1200MiB | 17, 28, 10 |

-->

<domain type='qemu'>
<name>Default</name>
<os>
Expand Down
21 changes: 18 additions & 3 deletions scripts/qemu/configs/sock_2_var1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@
# Copyright (C) 2020 - 2024 Intel Corporation.
-->

<!--

Total Sockets: 2
Total CPUs: 4
Thread per CPU: 1
Total Memory: 3564MiB
HMAT: Disabled

_______|_CORES_|____MEMORY____|______DISTANCES______|
Cell 0 | 2 | 1152MiB | 10, 20, 17 |
Cell 1 | 2 | 1152MiB | 20, 10, 28 |
Cell 2 | 0 | 1260MiB | 17, 28, 10 |

-->

<domain type='qemu'>
<name>Sockets2Var1</name>
<os>
Expand All @@ -11,21 +26,21 @@
<cpu>
<topology sockets='2' dies='1' cores='2' threads='1'/>
<numa>
<cell id='0' cpus='0-1' memory='256' unit='MiB'>
<cell id='0' cpus='0-1' memory='1152' unit='MiB'>
<distances>
<sibling id='0' value='10'/>
<sibling id='1' value='20'/>
<sibling id='2' value='17'/>
</distances>
</cell>
<cell id='1' cpus='2-3' memory='512' unit='MiB'>
<cell id='1' cpus='2-3' memory='1152' unit='MiB'>
<distances>
<sibling id='0' value='20'/>
<sibling id='1' value='10'/>
<sibling id='2' value='28'/>
</distances>
</cell>
<cell id='2' memory='2560' unit='MiB'>
<cell id='2' memory='1260' unit='MiB'>
<distances>
<sibling id='0' value='17'/>
<sibling id='1' value='28'/>
Expand Down
15 changes: 15 additions & 0 deletions scripts/qemu/configs/sock_2_var1_hmat.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@
# Copyright (C) 2021 - 2024 Intel Corporation.
-->

<!--

Total Sockets: 2
Total CPUs: 4
Thread per CPU: 1
Total Memory: 3564MiB
HMAT: Enabled

_______|_CORES_|____MEMORY____|______DISTANCES______|
Cell 0 | 2 | 1152MiB | 10, 20, 17 |
Cell 1 | 2 | 1152MiB | 20, 10, 28 |
Cell 2 | 0 | 1260MiB | 17, 28, 10 |

-->

<domain type='qemu'>
<name>Sockets2Var1HMAT</name>
<os>
Expand Down
19 changes: 17 additions & 2 deletions scripts/qemu/configs/sock_2_var2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@
# Copyright (C) 2021 - 2024 Intel Corporation.
-->

<!--

Total Sockets: 2
Total CPUs: 4
Thread per CPU: 1
Total Memory: 4096MiB
HMAT: Disabled

_______|_CORES_|____MEMORY____|______DISTANCES______|
Cell 0 | 2 | 768MiB | 10, 20, 28 |
Cell 1 | 2 | 768MiB | 20, 10, 17 |
Cell 2 | 0 | 2560MiB | 28, 17, 10 |

-->

<domain type='qemu'>
<name>Sockets2Var2</name>
<os>
Expand All @@ -11,14 +26,14 @@
<cpu>
<topology sockets='2' dies='1' cores='2' threads='1'/>
<numa>
<cell id='0' cpus='0-1' memory='256' unit='MiB'>
<cell id='0' cpus='0-1' memory='768' unit='MiB'>
<distances>
<sibling id='0' value='10'/>
<sibling id='1' value='20'/>
<sibling id='2' value='28'/>
</distances>
</cell>
<cell id='1' cpus='2-3' memory='512' unit='MiB'>
<cell id='1' cpus='2-3' memory='768' unit='MiB'>
<distances>
<sibling id='0' value='20'/>
<sibling id='1' value='10'/>
Expand Down
15 changes: 15 additions & 0 deletions scripts/qemu/configs/sock_2_var2_hmat.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@
# Copyright (C) 2021 - 2024 Intel Corporation.
-->

<!--

Total Sockets: 2
Total CPUs: 4
Thread per CPU: 1
Total Memory: 4096MiB
HMAT: Enabled

_______|_CORES_|____MEMORY____|______DISTANCES______|
Cell 0 | 2 | 1152MiB | 10, 20, 17 |
Cell 1 | 2 | 1152MiB | 20, 10, 28 |
Cell 2 | 0 | 1792MiB | 17, 28, 10 |

-->

<domain type='qemu'>
<name>Sockets2Var2HMAT</name>
<os>
Expand Down
24 changes: 20 additions & 4 deletions scripts/qemu/configs/sock_2_var3.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,22 @@
# Copyright (C) 2021 - 2024 Intel Corporation.
-->

<!--

Total Sockets: 2
Total CPUs: 4
Thread per CPU: 1
Total Memory: 4096MiB
HMAT: Disabled

_______|_CORES_|____MEMORY____|______DISTANCES______|
Cell 0 | 2 | 1024MiB | 10, 20, 17, 28 |
Cell 1 | 2 | 1024MiB | 20, 10, 28, 17 |
Cell 2 | 0 | 1024MiB | 17, 28, 10, 28 |
Cell 3 | 0 | 1024MiB | 28, 17, 28, 10 |

-->

<domain type='qemu'>
<name>Sockets2Var3</name>
<os>
Expand All @@ -11,31 +27,31 @@
<cpu>
<topology sockets='2' dies='1' cores='2' threads='1'/>
<numa>
<cell id='0' cpus='0-1' memory='256' unit='MiB'>
<cell id='0' cpus='0-1' memory='1024' unit='MiB'>
<distances>
<sibling id='0' value='10'/>
<sibling id='1' value='20'/>
<sibling id='2' value='17'/>
<sibling id='3' value='28'/>
</distances>
</cell>
<cell id='1' cpus='2-3' memory='512' unit='MiB'>
<cell id='1' cpus='2-3' memory='1024' unit='MiB'>
<distances>
<sibling id='0' value='20'/>
<sibling id='1' value='10'/>
<sibling id='2' value='28'/>
<sibling id='3' value='17'/>
</distances>
</cell>
<cell id='2' memory='2560' unit='MiB'>
<cell id='2' memory='1024' unit='MiB'>
<distances>
<sibling id='0' value='17'/>
<sibling id='1' value='28'/>
<sibling id='2' value='10'/>
<sibling id='3' value='28'/>
</distances>
</cell>
<cell id='3' memory='2560' unit='MiB'>
<cell id='3' memory='1024' unit='MiB'>
<distances>
<sibling id='0' value='28'/>
<sibling id='1' value='17'/>
Expand Down
16 changes: 16 additions & 0 deletions scripts/qemu/configs/sock_2_var3_hmat.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,22 @@
# Copyright (C) 2021 - 2024 Intel Corporation.
-->

<!--

Total Sockets: 2
Total CPUs: 4
Thread per CPU: 1
Total Memory: 3840MiB
HMAT: Enabled

_______|_CORES_|____MEMORY____|______DISTANCES______|
Cell 0 | 2 | 1024MiB | 10, 20, 17, 28 |
Cell 1 | 2 | 1024MiB | 20, 10, 28, 17 |
Cell 2 | 0 | 1792MiB | 17, 28, 10, 28 |
Cell 3 | 0 | 1792MiB | 28, 17, 28, 10 |

-->

<domain type='qemu'>
<name>Sockets2Var3HMAT</name>
<os>
Expand Down
28 changes: 24 additions & 4 deletions scripts/qemu/configs/sock_4_var1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,26 @@
# Copyright (C) 2020 - 2024 Intel Corporation.
-->

<!--

Total Sockets: 4
Total CPUs: 4
Thread per CPU: 1
Total Memory: 10240MiB
HMAT: Disabled

_______|_CORES_|____MEMORY____|___________DISTANCES____________|
Cell 0 | 1 | 1024MiB | 10, 21, 31, 21, 17, 28, 38, 28 |
Cell 1 | 1 | 1024MiB | 21, 10, 21, 31, 28, 17, 28, 38 |
Cell 2 | 1 | 1024MiB | 31, 21, 10, 21, 38, 28, 17, 28 |
Cell 3 | 1 | 1024MiB | 21, 31, 21, 10, 28, 38, 28, 17 |
Cell 4 | 0 | 1536MiB | 17, 28, 38, 28, 10, 28, 38, 28 |
Cell 5 | 0 | 1536MiB | 28, 17, 28, 38, 28, 10, 28, 38 |
Cell 6 | 0 | 1536MiB | 38, 28, 17, 28, 38, 28, 10, 28 |
Cell 7 | 0 | 1536MiB | 28, 38, 28, 17, 28, 38, 28, 10 |

-->

<domain type='qemu'>
<name>Sockets4Var1</name>
<os>
Expand All @@ -11,7 +31,7 @@
<cpu>
<topology sockets='4' dies='1' cores='1' threads='1'/>
<numa>
<cell id='0' cpus='0' memory='256' unit='MiB'>
<cell id='0' cpus='0' memory='1024' unit='MiB'>
<distances>
<sibling id='0' value='10'/>
<sibling id='1' value='21'/>
Expand All @@ -23,7 +43,7 @@
<sibling id='7' value='28'/>
</distances>
</cell>
<cell id='1' cpus='2' memory='256' unit='MiB'>
<cell id='1' cpus='1' memory='1024' unit='MiB'>
<distances>
<sibling id='0' value='21'/>
<sibling id='1' value='10'/>
Expand All @@ -35,7 +55,7 @@
<sibling id='7' value='38'/>
</distances>
</cell>
<cell id='2' cpus='3' memory='256' unit='MiB'>
<cell id='2' cpus='2' memory='1024' unit='MiB'>
<distances>
<sibling id='0' value='31'/>
<sibling id='1' value='21'/>
Expand All @@ -47,7 +67,7 @@
<sibling id='7' value='28'/>
</distances>
</cell>
<cell id='3' cpus='4' memory='256' unit='MiB'>
<cell id='3' cpus='3' memory='1024' unit='MiB'>
<distances>
<sibling id='0' value='21'/>
<sibling id='1' value='31'/>
Expand Down
20 changes: 20 additions & 0 deletions scripts/qemu/configs/sock_4_var1_hmat.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,26 @@
# Copyright (C) 2020 - 2024 Intel Corporation.
-->

<!--

Total Sockets: 4
Total CPUs: 4
Thread per CPU: 1
Total Memory: 10240MiB
HMAT: Enabled

_______|_CORES_|____MEMORY____|___________DISTANCES____________|
Cell 0 | 1 | 1024MiB | 10, 21, 31, 21, 17, 28, 38, 28 |
Cell 1 | 1 | 1024MiB | 21, 10, 21, 31, 28, 17, 28, 38 |
Cell 2 | 1 | 1024MiB | 31, 21, 10, 21, 38, 28, 17, 28 |
Cell 3 | 1 | 1024MiB | 21, 31, 21, 10, 28, 38, 28, 17 |
Cell 4 | 0 | 1536MiB | 17, 28, 38, 28, 10, 28, 38, 28 |
Cell 5 | 0 | 1536MiB | 28, 17, 28, 38, 28, 10, 28, 38 |
Cell 6 | 0 | 1536MiB | 38, 28, 17, 28, 38, 28, 10, 28 |
Cell 7 | 0 | 1536MiB | 28, 38, 28, 17, 28, 38, 28, 10 |

-->

<domain type='qemu'>
<name>Sockets4Var1HMAT</name>
<os>
Expand Down
Loading