From b09d20dc7dc126ee6734f7c7f8d135b49886afbc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Genevi=C3=A8ve=20Bastien?= Date: Tue, 15 Jul 2014 12:17:30 -0400 Subject: [PATCH] TMF: Update the benchmark's scenario ID to match our own spec MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit As we discussed, the names of benchmark should be org.eclipse.linuxtools# # Change-Id: I78f0c3207a824990706bc8d479044d8df2024708 Signed-off-by: Geneviève Bastien Reviewed-on: https://git.eclipse.org/r/29918 Tested-by: Hudson CI Reviewed-by: Matthew Khouzam --- .../perf/event/matching/EventMatchingBenchmark.java | 10 +++++----- .../event/matching/TraceSynchronizationBenchmark.java | 10 +++++----- .../tests/perf/experiment/ExperimentBenchmark.java | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/org.eclipse.linuxtools.lttng2.kernel.core.tests/perf/org/eclipse/linuxtools/lttng2/kernel/core/tests/perf/event/matching/EventMatchingBenchmark.java b/org.eclipse.linuxtools.lttng2.kernel.core.tests/perf/org/eclipse/linuxtools/lttng2/kernel/core/tests/perf/event/matching/EventMatchingBenchmark.java index 03c4d19d4f..c19669141c 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.core.tests/perf/org/eclipse/linuxtools/lttng2/kernel/core/tests/perf/event/matching/EventMatchingBenchmark.java +++ b/org.eclipse.linuxtools.lttng2.kernel.core.tests/perf/org/eclipse/linuxtools/lttng2/kernel/core/tests/perf/event/matching/EventMatchingBenchmark.java @@ -39,7 +39,7 @@ import com.google.common.collect.ImmutableSet; */ public class EventMatchingBenchmark { - private static final String TEST_ID = "org.eclipse.linuxtools#Event matching"; + private static final String TEST_ID = "org.eclipse.linuxtools#Event matching#"; private static final String TIME = " (time)"; private static final String MEMORY = " (memory usage)"; private static final String TEST_SUMMARY = "Event matching"; @@ -90,8 +90,8 @@ public class EventMatchingBenchmark { private static void runCpuTest(Set testTraces, String testName, int loop_count) { Performance perf = Performance.getDefault(); - PerformanceMeter pm = perf.createPerformanceMeter(TEST_ID + TIME + '#' + testName); - perf.tagAsSummary(pm, TEST_SUMMARY + TIME + ':' + testName, Dimension.CPU_TIME); + PerformanceMeter pm = perf.createPerformanceMeter(TEST_ID + testName + TIME); + perf.tagAsSummary(pm, TEST_SUMMARY + ':' + testName + TIME, Dimension.CPU_TIME); for (int i = 0; i < loop_count; i++) { TmfNetworkEventMatching traceMatch = new TmfNetworkEventMatching(testTraces); @@ -107,8 +107,8 @@ public class EventMatchingBenchmark { /* Benchmark memory used by the algorithm */ private static void runMemoryTest(Set testTraces, String testName, int loop_count) { Performance perf = Performance.getDefault(); - PerformanceMeter pm = perf.createPerformanceMeter(TEST_ID + MEMORY + '#' + testName); - perf.tagAsSummary(pm, TEST_SUMMARY + MEMORY + ':' + testName, Dimension.USED_JAVA_HEAP); + PerformanceMeter pm = perf.createPerformanceMeter(TEST_ID + testName + MEMORY); + perf.tagAsSummary(pm, TEST_SUMMARY + ':' + testName + MEMORY, Dimension.USED_JAVA_HEAP); for (int i = 0; i < loop_count; i++) { TmfNetworkEventMatching traceMatch = new TmfNetworkEventMatching(testTraces); diff --git a/org.eclipse.linuxtools.lttng2.kernel.core.tests/perf/org/eclipse/linuxtools/lttng2/kernel/core/tests/perf/event/matching/TraceSynchronizationBenchmark.java b/org.eclipse.linuxtools.lttng2.kernel.core.tests/perf/org/eclipse/linuxtools/lttng2/kernel/core/tests/perf/event/matching/TraceSynchronizationBenchmark.java index 38bf50c735..5fe6fd25d4 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.core.tests/perf/org/eclipse/linuxtools/lttng2/kernel/core/tests/perf/event/matching/TraceSynchronizationBenchmark.java +++ b/org.eclipse.linuxtools.lttng2.kernel.core.tests/perf/org/eclipse/linuxtools/lttng2/kernel/core/tests/perf/event/matching/TraceSynchronizationBenchmark.java @@ -38,7 +38,7 @@ import org.junit.Test; */ public class TraceSynchronizationBenchmark { - private static final String TEST_ID = "org.eclipse.linuxtools#Trace synchronization"; + private static final String TEST_ID = "org.eclipse.linuxtools#Trace synchronization#"; private static final String TIME = " (time)"; private static final String MEMORY = " (memory usage)"; private static final String TEST_SUMMARY = "Trace synchronization"; @@ -90,8 +90,8 @@ public class TraceSynchronizationBenchmark { private static void runCpuTest(ITmfTrace[] testTraces, String testName, int loop_count) { Performance perf = Performance.getDefault(); - PerformanceMeter pm = perf.createPerformanceMeter(TEST_ID + TIME + '#' + testName); - perf.tagAsSummary(pm, TEST_SUMMARY + TIME + ':' + testName, Dimension.CPU_TIME); + PerformanceMeter pm = perf.createPerformanceMeter(TEST_ID + testName + TIME); + perf.tagAsSummary(pm, TEST_SUMMARY + ':' + testName + TIME, Dimension.CPU_TIME); for (int i = 0; i < loop_count; i++) { TmfExperiment experiment = new TmfExperiment(CtfTmfEvent.class, "Test experiment", testTraces, BLOCK_SIZE); @@ -112,8 +112,8 @@ public class TraceSynchronizationBenchmark { /* Benchmark memory used by the algorithm */ private static void runMemoryTest(ITmfTrace[] testTraces, String testName, int loop_count) { Performance perf = Performance.getDefault(); - PerformanceMeter pm = perf.createPerformanceMeter(TEST_ID + MEMORY + '#' + testName); - perf.tagAsSummary(pm, TEST_SUMMARY + MEMORY + ':' + testName, Dimension.USED_JAVA_HEAP); + PerformanceMeter pm = perf.createPerformanceMeter(TEST_ID + testName + MEMORY); + perf.tagAsSummary(pm, TEST_SUMMARY + ':' + testName + MEMORY, Dimension.USED_JAVA_HEAP); for (int i = 0; i < loop_count; i++) { TmfExperiment experiment = new TmfExperiment(CtfTmfEvent.class, "Test experiment", testTraces, BLOCK_SIZE); diff --git a/org.eclipse.linuxtools.tmf.ctf.core.tests/perf/org/eclipse/linuxtools/tmf/ctf/core/tests/perf/experiment/ExperimentBenchmark.java b/org.eclipse.linuxtools.tmf.ctf.core.tests/perf/org/eclipse/linuxtools/tmf/ctf/core/tests/perf/experiment/ExperimentBenchmark.java index 5c038b3c0e..e19c1af8a0 100644 --- a/org.eclipse.linuxtools.tmf.ctf.core.tests/perf/org/eclipse/linuxtools/tmf/ctf/core/tests/perf/experiment/ExperimentBenchmark.java +++ b/org.eclipse.linuxtools.tmf.ctf.core.tests/perf/org/eclipse/linuxtools/tmf/ctf/core/tests/perf/experiment/ExperimentBenchmark.java @@ -40,7 +40,7 @@ import org.junit.Test; */ public class ExperimentBenchmark { - private static final String TEST_ID = "org.eclipse.linuxtools#Experiment benchmark"; + private static final String TEST_ID = "org.eclipse.linuxtools#Experiment benchmark#"; private static final int MAX_TRACES = 160; private static final int BLOCK_SIZE = 100; private static final String TRACES_ROOT_PATH = CtfTestTrace.TRACE_EXPERIMENT.getPath(); @@ -56,10 +56,10 @@ public class ExperimentBenchmark { Performance perf = Performance.getDefault(); for (int numTraces = 1; numTraces < MAX_TRACES; numTraces = (int) (1.6 * (numTraces + 1))) { - PerformanceMeter pm = perf.createPerformanceMeter(TEST_ID + '(' + numTraces + ')'); - perf.tagAsSummary(pm, "Experiment Benchmark traces:" + numTraces, Dimension.CPU_TIME); + PerformanceMeter pm = perf.createPerformanceMeter(TEST_ID + numTraces + " traces"); + perf.tagAsSummary(pm, "Experiment Benchmark:" + numTraces + " traces", Dimension.CPU_TIME); if ((int) (1.6 * (numTraces + 1)) > MAX_TRACES) { - perf.tagAsGlobalSummary(pm, "Experiment Benchmark traces: " + numTraces, Dimension.CPU_TIME); + perf.tagAsGlobalSummary(pm, "Experiment Benchmark:" + numTraces + " traces", Dimension.CPU_TIME); } for (int s = 0; s < SAMPLE_SIZE; s++) { -- 2.34.1