Include memory metrics to calculation

Change-Id: Iaf67cc53d7c95a4f3527000e479936a57a4c41cc
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>

diff --git a/resources/QPI/compute.yaml b/resources/QPI/compute.yaml
index cf2d101..e69a463 100644 (file)
--- a/resources/QPI/compute.yaml
+++ b/resources/QPI/compute.yaml
@@ -56,3 +56,26 @@ sections: # split based on different application
             baseline: 2.19M
           - name: dpi_bps
             baseline: 20.55G
+  - name: memory
+    description: cache and memory performance
+    metrics:
+      - name: floatmem
+        workloads:
+          - name: triad
+            baseline: 9748.98
+          - name: add
+            baseline: 9734.18
+          - name: copy
+            baseline: 7692.26
+          - name: scale
+            baseline: 7616.35
+      - name: intmem
+        workloads:
+          - name: triad
+            baseline: 12110.50
+          - name: add
+            baseline: 12153.10
+          - name: copy
+            baseline: 11913.03
+          - name: scale
+            baseline: 11945.36

diff --git a/resources/ansible_roles/qtip/tasks/calculate.yml b/resources/ansible_roles/qtip/tasks/calculate.yml
index b00707e..e4107e4 100644 (file)
--- a/resources/ansible_roles/qtip/tasks/calculate.yml
+++ b/resources/ansible_roles/qtip/tasks/calculate.yml
@@ -15,6 +15,8 @@
       ssl_rsa: "{{ ssl_rsa_metrics }}"
       ssl_aes: "{{ ssl_aes_metrics }}"
       dpi_throughput: "{{ dpi_metrics }}"
+      intmem: "{{ intmem_metrics }}"
+      floatmem: "{{ floatmem_metrics }}"
     spec:   "{{ qtip_resources }}/QPI/compute.yaml"
     dest: "{{ qtip_results }}/compute.json"
   register: qpi_result

diff --git a/resources/ansible_roles/ramspeed/tasks/main.yml b/resources/ansible_roles/ramspeed/tasks/main.yml
index 34b38fa..dbf1656 100644 (file)
--- a/resources/ansible_roles/ramspeed/tasks/main.yml
+++ b/resources/ansible_roles/ramspeed/tasks/main.yml
@@ -47,6 +47,7 @@
   set_fact:
     int_logfile: "{{ output }}/ramsmp-int.log"
     float_logfile: "{{ output }}/ramsmp-float.log"
+  tags: always
 
 - name: saving integer output to log
   copy:
@@ -71,6 +72,7 @@
       - '^INTEGER\s+BatchRun\s+AVERAGE:\s+?(?P<average>\d+\.\d+)\sMB/s$'
     dest: "{{ output }}/integer-metrics.json"
   register: intmem_metrics
+  tags: collect
 
 - name: collect float memory metrics from ramspeed
   collect:
@@ -83,6 +85,7 @@
       - '^FL-POINT\s+BatchRun\s+AVERAGE:\s+?(?P<average>\d+\.\d+)\sMB/s$'
     dest: "{{ output }}/float-metrics.json"
   register: floatmem_metrics
+  tags: collect
 
 - name: create memory metrics report
   template: