Fixed the index calculation for QTIP compute, network and storage suites

Earlier inaccurate index calculation updated.
Now indices take into account vm and bm cases

Change-Id: Icf2d7fc17ef765f5c0611b5371d57410ba155cb6
Signed-off-by: Nauman_Ahad <nauman_ahad@xflowresearch.com>
(cherry picked from commit 49b4662f32c415ea141ff269ba39d9a401b6e320)

1 files changed, 73 insertions, 29 deletions

diff --git a/data/ref_results/generator_ref_json.py b/data/ref_results/generator_ref_json.py
index a82dbc5d..db396653 100644
--- a/data/ref_results/generator_ref_json.py
+++ b/data/ref_results/generator_ref_json.py
@@ -3,39 +3,83 @@ import json
 
 dict_ref={};
 dict_ref['compute']={};
-dict_ref['compute']['dpi']=8.12
-dict_ref['compute']['whetstone']=859.1
-dict_ref['compute']['dhrystone']=3146.66
-dict_ref['compute']['ssl']={};
-dict_ref['compute']['ssl']['RSA']={};
-dict_ref['compute']['ssl']['AES']={};
-dict_ref['compute']['ssl']['RSA']['512b']=22148.9
-dict_ref['compute']['ssl']['RSA']['1024b']=7931.44
-dict_ref['compute']['ssl']['RSA']['2048b']=1544.3
-dict_ref['compute']['ssl']['RSA']['4096b']=161.92
-
-dict_ref['compute']['ssl']['AES']['16B']=735490250
-dict_ref['compute']['ssl']['AES']['64B']=788429210
-dict_ref['compute']['ssl']['AES']['256B']=803323650
-dict_ref['compute']['ssl']['AES']['1024B']=808861020
-dict_ref['compute']['ssl']['AES']['8192B']=807701160
-
-dict_ref['compute']['ramspeed']={};
-dict_ref['compute']['ramspeed']['INTmem']={};
-dict_ref['compute']['ramspeed']['FLOATmem']={};
-dict_ref['compute']['ramspeed']['INTmem']['Average (MB/s)']=11775.85
-dict_ref['compute']['ramspeed']['FLOATmem']['Average (MB/s)']=9780.23
+dict_ref['compute']['dpi_bm']=8.12
+dict_ref['compute']['dpi_vm']=22.12
+
+dict_ref['compute']['whetstone_bm']={};
+dict_ref['compute']['whetstone_vm']={};
+dict_ref['compute']['whetstone_bm']['single_cpu']=859.1
+dict_ref['compute']['whetstone_bm']['multi_cpu']=859.1
+dict_ref['compute']['whetstone_vm']['single_cpu']=859.1
+dict_ref['compute']['whetstone_vm']['multi_cpu']=859.
+
+dict_ref['compute']['dhrystone_bm']={};
+dict_ref['compute']['dhrystone_vm']={};
+dict_ref['compute']['dhrystone_bm']['single_cpu']=3231.7
+dict_ref['compute']['dhrystone_bm']['multi_cpu']=103362.1
+dict_ref['compute']['dhrystone_vm']['single_cpu']=2953.6
+dict_ref['compute']['dhrystone_vm']['multi_cpu']=10585.8
+
+dict_ref['compute']['ssl_bm']={};
+dict_ref['compute']['ssl_bm']['RSA']={};
+dict_ref['compute']['ssl_bm']['AES']={};
+dict_ref['compute']['ssl_bm']['RSA']['512b']=22148.9
+dict_ref['compute']['ssl_bm']['RSA']['1024b']=7931.44
+dict_ref['compute']['ssl_bm']['RSA']['2048b']=1544.3
+dict_ref['compute']['ssl_bm']['RSA']['4096b']=161.92
+dict_ref['compute']['ssl_bm']['AES']['16B']=735490250
+dict_ref['compute']['ssl_bm']['AES']['64B']=788429210
+dict_ref['compute']['ssl_bm']['AES']['256B']=803323650
+dict_ref['compute']['ssl_bm']['AES']['1024B']=808861020
+dict_ref['compute']['ssl_bm']['AES']['8192B']=807701160
+
+dict_ref['compute']['ssl_vm']={};
+dict_ref['compute']['ssl_vm']['RSA']={};
+dict_ref['compute']['ssl_vm']['AES']={};
+dict_ref['compute']['ssl_vm']['RSA']['512b']=22148.9
+dict_ref['compute']['ssl_vm']['RSA']['1024b']=7931.44
+dict_ref['compute']['ssl_vm']['RSA']['2048b']=1544.3
+dict_ref['compute']['ssl_vm']['RSA']['4096b']=161.92
+dict_ref['compute']['ssl_vm']['AES']['16B']=735490250
+dict_ref['compute']['ssl_vm']['AES']['64B']=788429210
+dict_ref['compute']['ssl_vm']['AES']['256B']=803323650
+dict_ref['compute']['ssl_vm']['AES']['1024B']=808861020
+dict_ref['compute']['ssl_vm']['AES']['8192B']=807701160
+
+
+dict_ref['compute']['ramspeed_bm']={};
+dict_ref['compute']['ramspeed_bm']['INTmem']={};
+dict_ref['compute']['ramspeed_bm']['FLOATmem']={};
+dict_ref['compute']['ramspeed_bm']['INTmem']['Average (MB/s)']=11775.85
+dict_ref['compute']['ramspeed_bm']['FLOATmem']['Average (MB/s)']=9780.23
+
+dict_ref['compute']['ramspeed_vm']={};
+dict_ref['compute']['ramspeed_vm']['INTmem']={};
+dict_ref['compute']['ramspeed_vm']['FLOATmem']={};
+dict_ref['compute']['ramspeed_vm']['INTmem']['Average (MB/s)']=11775.85
+dict_ref['compute']['ramspeed_vm']['FLOATmem']['Average (MB/s)']=9780.23
+
 
 dict_ref['storage']={};
-dict_ref['storage']['read']={};
-dict_ref['storage']['write']={};
-dict_ref['storage']['read']['IOPS']= 6995
-dict_ref['storage']['write']['IOPS']= 6990
+dict_ref['storage']['fio_bm']={};
+dict_ref['storage']['fio_bm']['read']={};
+dict_ref['storage']['fio_bm']['write']={};
+dict_ref['storage']['fio_bm']['read']['IOPS']=6693
+dict_ref['storage']['fio_bm']['write']['IOPS']=6688
 
-dict_ref['network']={};
-dict_ref['network']['iperf']={};
-dict_ref['network']['iperf']['throughput received(b/s)']=9973180000.0
+dict_ref['storage']['fio_vm']={};
+dict_ref['storage']['fio_vm']['read']={};
+dict_ref['storage']['fio_vm']['write']={};
+dict_ref['storage']['fio_vm']['read']['IOPS']=2239
+dict_ref['storage']['fio_vm']['write']['IOPS']=2237
 
+dict_ref['network']={};
+dict_ref['network']['iperf_bm']={};
+dict_ref['network']['iperf_vm']={};
+dict_ref['network']['iperf_vm_2']={};
+dict_ref['network']['iperf_bm']['throughput received(b/s)']=944473000.0
+dict_ref['network']['iperf_vm']['throughput received(b/s)']=14416700000.0
+dict_ref['network']['iperf_vm_2']['throughput received(b/s)']=2461530000.0
 with open('reference.json', 'w+') as result_json:
     json.dump(dict_ref, result_json, indent=4, sort_keys=True)