From 89e6be275715aefa8473835eb78eed309f37f2ee Mon Sep 17 00:00:00 2001 From: Stanislav Chlebec Date: Thu, 17 Jan 2019 03:15:54 -0800 Subject: Add ARM Taishan testbed33 perftest Change-Id: Iaa0e7fbca7de26c7dce8b389cc3494f628a2ecd0 Signed-off-by: Stanislav Chlebec Signed-off-by: juraj.linkes --- .../ansible/roles/calibration/tasks/main.yaml | 21 +++------------------ .../ansible/roles/calibration/tasks/x86_64.yaml | 21 +++++++++++++++++++++ .../roles/sut/files/taishan_workaround.service | 4 ++-- 3 files changed, 26 insertions(+), 20 deletions(-) create mode 100644 resources/tools/testbed-setup/ansible/roles/calibration/tasks/x86_64.yaml (limited to 'resources/tools/testbed-setup') diff --git a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml index b70694ad31..17be80064a 100644 --- a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml @@ -13,21 +13,6 @@ - debug: var=spectre_meltdown_output.stdout_lines tags: run-spectre-meltdown-checker -- name: Clone Jitter tool - git: - repo: 'https://gerrit.fd.io/r/pma_tools' - dest: '{{ jitter.directory }}' - tags: run-jitter-tool - -- name: Compile Jitter tool - raw: 'cd {{ jitter.directory }}/jitter && make' - tags: run-jitter-tool - -- name: Run Jitter tool - raw: '{{ jitter.directory }}/jitter/jitter -c {{ jitter.core }} -i {{ jitter.iterations }} -f' - become: yes - register: jitter_output - tags: run-jitter-tool - -- debug: var=jitter_output.stdout_lines - tags: run-jitter-tool +- name: x86 specific + import_tasks: x86_64.yaml + when: ansible_machine == 'x86_64' diff --git a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/x86_64.yaml b/resources/tools/testbed-setup/ansible/roles/calibration/tasks/x86_64.yaml new file mode 100644 index 0000000000..a6132841a0 --- /dev/null +++ b/resources/tools/testbed-setup/ansible/roles/calibration/tasks/x86_64.yaml @@ -0,0 +1,21 @@ +--- +# file: roles/calibration/tasks/x86_64.yaml + +- name: Clone Jitter tool + git: + repo: 'https://gerrit.fd.io/r/pma_tools' + dest: '{{ jitter.directory }}' + tags: run-jitter-tool + +- name: Compile Jitter tool + raw: 'cd {{ jitter.directory }}/jitter && make' + tags: run-jitter-tool + +- name: Run Jitter tool + raw: '{{ jitter.directory }}/jitter/jitter -c {{ jitter.core }} -i {{ jitter.iterations }} -f' + become: yes + register: jitter_output + tags: run-jitter-tool + +- debug: var=jitter_output.stdout_lines + tags: run-jitter-tool diff --git a/resources/tools/testbed-setup/ansible/roles/sut/files/taishan_workaround.service b/resources/tools/testbed-setup/ansible/roles/sut/files/taishan_workaround.service index 05f865f407..246c985baa 100644 --- a/resources/tools/testbed-setup/ansible/roles/sut/files/taishan_workaround.service +++ b/resources/tools/testbed-setup/ansible/roles/sut/files/taishan_workaround.service @@ -2,8 +2,8 @@ Description=Numa node workaround configuration [Service] -ExecStart=/bin/sh -c 'echo 1 > /sys/bus/pci/devices/000a:11:00.0/numa_node' -ExecStart=/bin/sh -c 'echo 1 > /sys/bus/pci/devices/000a:11:00.1/numa_node' +ExecStart=/bin/sh -c 'echo 1 > /sys/bus/pci/devices/0000:11:00.0/numa_node' +ExecStart=/bin/sh -c 'echo 1 > /sys/bus/pci/devices/0000:11:00.1/numa_node' Type=oneshot RemainAfterExit=yes -- cgit 1.2.3-korg