From 86b0ef02f5c0ec0ec80ffb0f507ecf7e573611c6 Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Wed, 16 Aug 2017 16:31:44 +0800 Subject: Migrate contents from benchmarks to resources Change-Id: I189c3d5224ec58ad63851d173b94204b273c3696 Signed-off-by: Yujun Zhang --- resources/QPI/compute-baseline.json | 177 ----------------------- resources/ansible_roles/qtip/tasks/calculate.yml | 2 +- resources/baselines/compute.json | 177 +++++++++++++++++++++++ 3 files changed, 178 insertions(+), 178 deletions(-) delete mode 100644 resources/QPI/compute-baseline.json create mode 100644 resources/baselines/compute.json (limited to 'resources') diff --git a/resources/QPI/compute-baseline.json b/resources/QPI/compute-baseline.json deleted file mode 100644 index 3aa19970..00000000 --- a/resources/QPI/compute-baseline.json +++ /dev/null @@ -1,177 +0,0 @@ -{ - "name": "compute-baseline", - "description": "The baseline for compute QPI", - "version": "0.0.1", - "score": 2048, - "spec": "https://git.opnfv.org/qtip/tree/resources/QPI/compute.yaml", - "system_info": { - "product": "EC600G3", - "cpu": "2 Deca core Intel Xeon E5-2650 v3s (-HT-MCP-SMP-)", - "os": "Ubuntu 16.04 xenial", - "kernel": "4.4.0-72-generic x86_64 (64 bit)", - "cpu_speed": "1200/3000 MHz", - "memory": "4062.3/128524.1MB", - "disk": "1200.3GB (0.9% used)" - }, - "condition": { - "installer": "Fuel", - "scenario": "os-nosdn-nofeature-ha" - }, - "sections": [ - { - "name": "SSL", - "metrics": [ - { - "name": "ssl_rsa", - "workloads": [ - { - "name": "rsa_sign_512", - "baseline": "16521.0" - }, - { - "name": "rsa_verify_512", - "baseline": "223925.9" - }, - { - "name": "rsa_sign_1024", - "baseline": "5802.6" - }, - { - "name": "rsa_verify_1024", - "baseline": "89015.3" - }, - { - "name": "rsa_sign_2048", - "baseline": "1236.5" - }, - { - "name": "rsa_verify_2048", - "baseline": "27919.2" - }, - { - "name": "rsa_sign_4096", - "baseline": "114.9" - }, - { - "name": "rsa_verify_4096", - "baseline": "8637.9" - } - ] - }, - { - "name": "ssl_aes", - "workloads": [ - { - "name": "aes_128_cbc_16_bytes", - "baseline": "544031.31k" - }, - { - "name": "aes_128_cbc_64_bytes", - "baseline": "575116.35k" - }, - { - "name": "aes_128_cbc_256_bytes", - "baseline": "587653.72k" - }, - { - "name": "aes_128_cbc_1024_bytes", - "baseline": "595095.21k" - }, - { - "name": "aes_128_cbc_8192_bytes", - "baseline": "590107.99k" - } - ] - } - ] - }, - { - "name": "DPI", - "metrics": [ - { - "name": "dpi_throughput", - "workloads": [ - { - "name": "dpi_pps", - "baseline": "2.42 M" - }, - { - "name": "dpi_bps", - "baseline": "22.70 G" - } - ] - } - ] - }, - { - "name": "memory", - "metrics": [ - { - "name": "floatmem", - "workloads": [ - { - "name": "triad", - "baseline": "10215.75" - }, - { - "name": "add", - "baseline": "10117.36" - }, - { - "name": "copy", - "baseline": "8168.85" - }, - { - "name": "scale", - "baseline": "8119.82" - } - ] - }, - { - "name": "intmem", - "workloads": [ - { - "name": "triad", - "baseline": "12153.15" - }, - { - "name": "add", - "baseline": "12302.58" - }, - { - "name": "copy", - "baseline": "12194.48" - }, - { - "name": "scale", - "baseline": "12187.15" - } - ] - } - ] - }, - { - "name": "arithmetic", - "metrics": [ - { - "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 b07d12f8..9444a0e2 100644 --- a/resources/ansible_roles/qtip/tasks/calculate.yml +++ b/resources/ansible_roles/qtip/tasks/calculate.yml @@ -21,6 +21,6 @@ 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" + baseline: "{{ qtip_resources }}/baselines/compute.json" dest: "{{ qtip_results }}/compute.json" delegate_to: localhost diff --git a/resources/baselines/compute.json b/resources/baselines/compute.json new file mode 100644 index 00000000..3aa19970 --- /dev/null +++ b/resources/baselines/compute.json @@ -0,0 +1,177 @@ +{ + "name": "compute-baseline", + "description": "The baseline for compute QPI", + "version": "0.0.1", + "score": 2048, + "spec": "https://git.opnfv.org/qtip/tree/resources/QPI/compute.yaml", + "system_info": { + "product": "EC600G3", + "cpu": "2 Deca core Intel Xeon E5-2650 v3s (-HT-MCP-SMP-)", + "os": "Ubuntu 16.04 xenial", + "kernel": "4.4.0-72-generic x86_64 (64 bit)", + "cpu_speed": "1200/3000 MHz", + "memory": "4062.3/128524.1MB", + "disk": "1200.3GB (0.9% used)" + }, + "condition": { + "installer": "Fuel", + "scenario": "os-nosdn-nofeature-ha" + }, + "sections": [ + { + "name": "SSL", + "metrics": [ + { + "name": "ssl_rsa", + "workloads": [ + { + "name": "rsa_sign_512", + "baseline": "16521.0" + }, + { + "name": "rsa_verify_512", + "baseline": "223925.9" + }, + { + "name": "rsa_sign_1024", + "baseline": "5802.6" + }, + { + "name": "rsa_verify_1024", + "baseline": "89015.3" + }, + { + "name": "rsa_sign_2048", + "baseline": "1236.5" + }, + { + "name": "rsa_verify_2048", + "baseline": "27919.2" + }, + { + "name": "rsa_sign_4096", + "baseline": "114.9" + }, + { + "name": "rsa_verify_4096", + "baseline": "8637.9" + } + ] + }, + { + "name": "ssl_aes", + "workloads": [ + { + "name": "aes_128_cbc_16_bytes", + "baseline": "544031.31k" + }, + { + "name": "aes_128_cbc_64_bytes", + "baseline": "575116.35k" + }, + { + "name": "aes_128_cbc_256_bytes", + "baseline": "587653.72k" + }, + { + "name": "aes_128_cbc_1024_bytes", + "baseline": "595095.21k" + }, + { + "name": "aes_128_cbc_8192_bytes", + "baseline": "590107.99k" + } + ] + } + ] + }, + { + "name": "DPI", + "metrics": [ + { + "name": "dpi_throughput", + "workloads": [ + { + "name": "dpi_pps", + "baseline": "2.42 M" + }, + { + "name": "dpi_bps", + "baseline": "22.70 G" + } + ] + } + ] + }, + { + "name": "memory", + "metrics": [ + { + "name": "floatmem", + "workloads": [ + { + "name": "triad", + "baseline": "10215.75" + }, + { + "name": "add", + "baseline": "10117.36" + }, + { + "name": "copy", + "baseline": "8168.85" + }, + { + "name": "scale", + "baseline": "8119.82" + } + ] + }, + { + "name": "intmem", + "workloads": [ + { + "name": "triad", + "baseline": "12153.15" + }, + { + "name": "add", + "baseline": "12302.58" + }, + { + "name": "copy", + "baseline": "12194.48" + }, + { + "name": "scale", + "baseline": "12187.15" + } + ] + } + ] + }, + { + "name": "arithmetic", + "metrics": [ + { + "name": "integer", + "workloads": [ + { + "name": "dhrystone_lps", + "baseline": "29002911.0" + } + ] + }, + { + "name": "floating", + "workloads": [ + { + "name": "whetstone_MWIPS", + "baseline": "2176.8" + } + ] + } + ] + } + ] +} -- cgit 1.2.3-korg