From d8c05b528b5a75377848d130286bc997da06a792 Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Fri, 30 Dec 2016 14:08:15 +0800 Subject: Implement plan, qpi and metric constructors - separate runner from `plan` and move `plan` to `loader` - rename `algorithm` to `formula` - use `numpy` for formulas - update sample qpi and metrics Change-Id: I3131ca79907376f2de31d6cb920bd7d0230664a6 Signed-off-by: Yujun Zhang --- tests/data/benchmarks/QPI/compute.yaml | 37 ++++++++++----------------------- tests/data/benchmarks/QPI/fake-qpi.yaml | 6 +++--- 2 files changed, 14 insertions(+), 29 deletions(-) (limited to 'tests/data/benchmarks/QPI') diff --git a/tests/data/benchmarks/QPI/compute.yaml b/tests/data/benchmarks/QPI/compute.yaml index 5ad8a4b6..e28efaf9 100644 --- a/tests/data/benchmarks/QPI/compute.yaml +++ b/tests/data/benchmarks/QPI/compute.yaml @@ -1,44 +1,29 @@ title: compute description: sample performance index of computing -algorithm: weighted arithmetic mean +formula: weighted arithmetic mean sections: - name: Integer weight: 0.3 - algorithm: geometric mean + formula: geometric mean metrics: - - spec: dhrystone.yaml - workloads: - - single_cpu - - multi_cpu + - dhrystone.yaml - name: Float weight: 0.3 - algorithm: geometric mean + formula: geometric mean metrics: - - spec: dhrystone.yaml - workloads: - - single_cpu - - multi_cpu + - whetstone.yaml - name: Memory weight: 0.2 - algorithm: geometric mean + formula: geometric mean metrics: - - spec: ramspeed.yaml - workloads: - - int: [add, average, copy, scale, triad] - - float: [add, average, copy, scale, triad] + - ramspeed.yaml - name: DPI weight: 0.1 - algorithm: geometric mean + formula: geometric mean metrics: - - spec: dpi.yaml - workloads: - - bps - - pps + - dpi.yaml - name: SSL weight: 0.1 - algorithm: geometric mean + formula: geometric mean metrics: - - spec: ssl.yaml - workloads: - - aes_128_cbc: [512, 1024, 2048, 4096] - - rsa_sig: [16, 64, 256, 1024, 8192] + - ssl.yaml diff --git a/tests/data/benchmarks/QPI/fake-qpi.yaml b/tests/data/benchmarks/QPI/fake-qpi.yaml index d75c6568..aa1097f4 100644 --- a/tests/data/benchmarks/QPI/fake-qpi.yaml +++ b/tests/data/benchmarks/QPI/fake-qpi.yaml @@ -1,9 +1,9 @@ name: Fake QPI description: a fake QPI producing random result -algorithm: weighted arithmetic mean +formula: weighted arithmetic mean sections: - name: Fake Section weight: 0.5 - algorithm: geometric mean + formula: geometric mean metrics: - - fake_metric.yaml + - fake-metric.yaml -- cgit 1.2.3-korg