summaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorYujun Zhang <zhang.yujunz@zte.com.cn>2017-06-28 13:59:25 +0800
committerYujun Zhang <zhang.yujunz@zte.com.cn>2017-06-28 14:03:03 +0800
commit116b5101e8f917b23b49ad91f0a65fada76e8c5e (patch)
treeebb5c0e83226041562aaaa36f12daf6e4ba9ecf2 /resources
parentca48eba137345cf106175325bbbb3c5f8f1dfecc (diff)
Fix bug in QPI calculation
compute spec was amended in 45111c but the calculation is not updated Change-Id: Ibf0139b2278f617a52335e8839f51c97d5ded8b7 Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
Diffstat (limited to 'resources')
-rw-r--r--resources/QPI/compute-baseline.json10
-rw-r--r--resources/ansible_roles/qtip/tasks/calculate.yml3
2 files changed, 9 insertions, 4 deletions
diff --git a/resources/QPI/compute-baseline.json b/resources/QPI/compute-baseline.json
index 33f711d2..3aa19970 100644
--- a/resources/QPI/compute-baseline.json
+++ b/resources/QPI/compute-baseline.json
@@ -154,18 +154,22 @@
"name": "arithmetic",
"metrics": [
{
- "name": "arithmetic",
+ "name": "integer",
"workloads": [
{
"name": "dhrystone_lps",
"baseline": "29002911.0"
- },
+ }
+ ]
+ },
+ {
+ "name": "floating",
+ "workloads": [
{
"name": "whetstone_MWIPS",
"baseline": "2176.8"
}
]
-
}
]
}
diff --git a/resources/ansible_roles/qtip/tasks/calculate.yml b/resources/ansible_roles/qtip/tasks/calculate.yml
index c472ee34..b07d12f8 100644
--- a/resources/ansible_roles/qtip/tasks/calculate.yml
+++ b/resources/ansible_roles/qtip/tasks/calculate.yml
@@ -17,7 +17,8 @@
dpi_throughput: "{{ qtip_results }}/dpi/metrics.json"
intmem: "{{ qtip_results }}/memory/integer-metrics.json"
floatmem: "{{ qtip_results }}/memory/float-metrics.json"
- arithmetic: "{{ qtip_results }}/arithmetic/metrics.json"
+ integer: "{{ qtip_results }}/arithmetic/metrics.json"
+ floating: "{{ qtip_results }}/arithmetic/metrics.json"
sysinfo: "{{ qtip_results }}/sysinfo/condition.json"
spec: "{{ qtip_resources }}/QPI/compute.yaml"
baseline: "{{ qtip_resources }}/QPI/compute-baseline.json"