Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2012-06-12 22:28:23 +0000
committerAlexander Kurtakov2012-06-12 22:28:23 +0000
commite080f38e237472aae239634b0f7628affca8ac37 (patch)
tree5c6edbdca4531d147bdd79ae8d9d21c926af8d6e
parent44889ffb22534433510b090be5aa3a993537cdf4 (diff)
downloadorg.eclipse.linuxtools-e080f38e237472aae239634b0f7628affca8ac37.tar.gz
org.eclipse.linuxtools-e080f38e237472aae239634b0f7628affca8ac37.tar.xz
org.eclipse.linuxtools-e080f38e237472aae239634b0f7628affca8ac37.zip
Add valgrind.cachegrind tests.
They were lost during git conversion.
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/.classpath7
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/.project34
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/ChangeLog4
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/META-INF/MANIFEST.MF2
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/about.html26
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/build.properties10
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/resources/cpptest/.cproject927
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/resources/cpptest/.project82
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/resources/cpptest/cpptest.cpp54
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/resources/cpptest/cpptest.h23
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/resources/multiProcTest/.cproject577
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/resources/multiProcTest/.project83
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/resources/multiProcTest/parent.cpp42
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/AbstractCachegrindTest.java52
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/AllTests.java34
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/BasicCachegrindTest.java63
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/CModelLabelsTest.java142
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/CachegrindTestsPlugin.java60
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/DoubleClickTest.java139
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/ExpandCollapseTest.java90
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/LaunchConfigTabTest.java210
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/MultiProcessTest.java110
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/test.xml54
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testBranchSim/cachegrind_5190.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testBranchSim/template_cachegrind_5190.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testBranchSim/template_valgrind_5190.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testD1Cache/cachegrind_5300.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testD1Cache/template_cachegrind_5300.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testD1Cache/template_valgrind_5300.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDefaults/cachegrind_5885.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDefaults/template_cachegrind_5885.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDefaults/template_valgrind_5885.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDoubleClickFile/cachegrind_4919.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDoubleClickFile/template_cachegrind_4919.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDoubleClickFile/template_valgrind_4919.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDoubleClickFunction/cachegrind_5031.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDoubleClickFunction/template_cachegrind_5031.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDoubleClickFunction/template_valgrind_5031.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testExec/cachegrind_5774.txt244
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testExec/cachegrind_5779.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testExec/template_cachegrind_5774.txt244
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testExec/template_cachegrind_5779.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testExec/template_valgrind_5774.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testExec/template_valgrind_5779.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileLabelsCPP/cachegrind_4644.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileLabelsCPP/template_cachegrind_4644.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileLabelsCPP/template_valgrind_4644.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileLabelsH/cachegrind_4699.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileLabelsH/template_cachegrind_4699.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileLabelsH/template_valgrind_4699.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileNames/cachegrind_4534.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileNames/template_cachegrind_4534.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileNames/template_valgrind_4534.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFunctionLabel/cachegrind_4754.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFunctionLabel/template_cachegrind_4754.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFunctionLabel/template_valgrind_4754.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testI1Cache/cachegrind_5245.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testI1Cache/template_cachegrind_5245.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testI1Cache/template_valgrind_5245.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testL2Cache/cachegrind_5355.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testL2Cache/template_cachegrind_5355.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testL2Cache/template_valgrind_5355.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testMethodLabel/cachegrind_4809.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testMethodLabel/template_cachegrind_4809.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testMethodLabel/template_valgrind_4809.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNestedMethodLabel/cachegrind_4864.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNestedMethodLabel/template_cachegrind_4864.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNestedMethodLabel/template_valgrind_4864.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNoExec/cachegrind_5670.txt244
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNoExec/template_cachegrind_5670.txt244
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNoExec/template_valgrind_5670.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNumFunctions/cachegrind_4589.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNumFunctions/template_cachegrind_4589.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNumFunctions/template_valgrind_4589.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNumPIDs/cachegrind_4478.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNumPIDs/template_cachegrind_4478.txt250
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNumPIDs/template_valgrind_4478.txt0
78 files changed, 11805 insertions, 3 deletions
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/.classpath b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/.classpath
new file mode 100644
index 0000000000..64c5e31b7a
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/.project b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/.project
new file mode 100644
index 0000000000..7831c66e46
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.linuxtools.valgrind.cachegrind.tests</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+ </natures>
+</projectDescription>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/.settings/org.eclipse.jdt.core.prefs b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..f15f655388
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Thu Mar 12 10:51:52 EDT 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/ChangeLog
index e82fdf4c60..c048ab0493 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/ChangeLog
@@ -1,6 +1,6 @@
-2010-08-25 Elliott Baron <ebaron@fedoraproject.org>
+2010-07-26 Elliott Baron <ebaron@fedoraproject.org>
- * META-INF/MANIFEST.MF: Bump version to 0.6.1.
+ * META-INF/MANIFEST.MF: Bump version to 0.7.0.
2009-12-22 Roland Grunberg <rgrunber@redhat.com>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/META-INF/MANIFEST.MF
index 1971341101..89bf3eea5e 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.linuxtools.valgrind.cachegrind.tests
-Bundle-Version: 0.6.1.qualifier
+Bundle-Version: 0.7.0.qualifier
Bundle-Activator: org.eclipse.linuxtools.internal.valgrind.cachegrind.tests.CachegrindTestsPlugin
Bundle-Vendor: %Bundle-Vendor.0
Require-Bundle: org.eclipse.ui,
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/about.html b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/about.html
new file mode 100644
index 0000000000..e6a2741fc0
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/about.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+
+
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>About</title>
+</head><body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>October 24, 2008</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body></html> \ No newline at end of file
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/build.properties b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/build.properties
new file mode 100644
index 0000000000..118522991a
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/build.properties
@@ -0,0 +1,10 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ plugin.properties,\
+ resources/,\
+ about.html,\
+ valgrindFiles/,\
+ test.xml
+
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/resources/cpptest/.cproject b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/resources/cpptest/.cproject
new file mode 100644
index 0000000000..08a4ce3e63
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/resources/cpptest/.cproject
@@ -0,0 +1,927 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?>
+
+<cproject>
+<storageModule moduleId="org.eclipse.cdt.core.settings">
+<cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.1463910690">
+<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.1463910690" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+<externalSettings/>
+<extensions>
+<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+</extensions>
+</storageModule>
+<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+<configuration artifactName="cpptest" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.1463910690" name="Debug" parent="cdt.managedbuild.config.gnu.exe.debug">
+<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.1463910690." name="/" resourcePath="">
+<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.149960898" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
+<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.1500334364" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
+<builder buildPath="${workspace_loc:/cpptest/Debug}" id="cdt.managedbuild.target.gnu.builder.exe.debug.328121746" managedBuildOn="true" name="Gnu Make Builder.Debug" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
+<tool id="cdt.managedbuild.tool.gnu.archiver.base.1298736048" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1953407560" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
+<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.1473633174" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
+<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.1312827060" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
+<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.968970650" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.652886580" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">
+<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.971220945" superClass="gnu.c.compiler.exe.debug.option.optimization.level" valueType="enumerated"/>
+<option id="gnu.c.compiler.exe.debug.option.debugging.level.441208182" superClass="gnu.c.compiler.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
+<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.957338308" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.934477526" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug"/>
+<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.278234789" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug">
+<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1399405690" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
+<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+</inputType>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.assembler.exe.debug.1699028925" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug">
+<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1876371051" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+</tool>
+</toolChain>
+</folderInfo>
+</configuration>
+</storageModule>
+<storageModule moduleId="scannerConfiguration">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1753505102;cdt.managedbuild.config.gnu.exe.release.1753505102.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.275019146;cdt.managedbuild.tool.gnu.c.compiler.input.1753556205">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.1463910690;cdt.managedbuild.config.gnu.exe.debug.1463910690.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.652886580;cdt.managedbuild.tool.gnu.c.compiler.input.957338308">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1753505102;cdt.managedbuild.config.gnu.exe.release.1753505102.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.456235642;cdt.managedbuild.tool.gnu.cpp.compiler.input.340493281">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.1463910690;cdt.managedbuild.config.gnu.exe.debug.1463910690.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1953407560;cdt.managedbuild.tool.gnu.cpp.compiler.input.968970650">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+</storageModule>
+<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+</cconfiguration>
+<cconfiguration id="cdt.managedbuild.config.gnu.exe.release.1753505102">
+<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.release.1753505102" moduleId="org.eclipse.cdt.core.settings" name="Release">
+<externalSettings/>
+<extensions>
+<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+</extensions>
+</storageModule>
+<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+<configuration artifactName="cpptest" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.1753505102" name="Release" parent="cdt.managedbuild.config.gnu.exe.release">
+<folderInfo id="cdt.managedbuild.config.gnu.exe.release.1753505102." name="/" resourcePath="">
+<toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.385921575" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
+<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.366626344" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>
+<builder buildPath="${workspace_loc:/cpptest/Release}" id="cdt.managedbuild.target.gnu.builder.exe.release.1887182313" managedBuildOn="true" name="Gnu Make Builder.Release" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/>
+<tool id="cdt.managedbuild.tool.gnu.archiver.base.368404610" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.456235642" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release">
+<option id="gnu.cpp.compiler.exe.release.option.optimization.level.1052231562" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
+<option id="gnu.cpp.compiler.exe.release.option.debugging.level.1912250672" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
+<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.340493281" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.275019146" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release">
+<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.1405936688" superClass="gnu.c.compiler.exe.release.option.optimization.level" valueType="enumerated"/>
+<option id="gnu.c.compiler.exe.release.option.debugging.level.355786697" superClass="gnu.c.compiler.exe.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
+<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1753556205" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.176412242" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release"/>
+<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.release.1791495231" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.release">
+<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.862229990" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
+<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+</inputType>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.assembler.exe.release.1904268286" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.release">
+<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1462248242" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+</tool>
+</toolChain>
+</folderInfo>
+</configuration>
+</storageModule>
+<storageModule moduleId="scannerConfiguration">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1753505102;cdt.managedbuild.config.gnu.exe.release.1753505102.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.275019146;cdt.managedbuild.tool.gnu.c.compiler.input.1753556205">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.1463910690;cdt.managedbuild.config.gnu.exe.debug.1463910690.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.652886580;cdt.managedbuild.tool.gnu.c.compiler.input.957338308">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1753505102;cdt.managedbuild.config.gnu.exe.release.1753505102.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.456235642;cdt.managedbuild.tool.gnu.cpp.compiler.input.340493281">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.1463910690;cdt.managedbuild.config.gnu.exe.debug.1463910690.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1953407560;cdt.managedbuild.tool.gnu.cpp.compiler.input.968970650">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+</storageModule>
+</cconfiguration>
+</storageModule>
+<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+<project id="cpptest.cdt.managedbuild.target.gnu.exe.1242136619" name="Executable" projectType="cdt.managedbuild.target.gnu.exe"/>
+</storageModule>
+</cproject>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/resources/cpptest/.project b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/resources/cpptest/.project
new file mode 100644
index 0000000000..0c43235ddd
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/resources/cpptest/.project
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>cpptest</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+ <triggers>clean,full,incremental,</triggers>
+ <arguments>
+ <dictionary>
+ <key>?name?</key>
+ <value></value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.append_environment</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.autoBuildTarget</key>
+ <value>all</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.buildArguments</key>
+ <value></value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.buildCommand</key>
+ <value>make</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.buildLocation</key>
+ <value>${workspace_loc:/cpptest/Debug}</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
+ <value>clean</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.contents</key>
+ <value>org.eclipse.cdt.make.core.activeConfigSettings</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableAutoBuild</key>
+ <value>false</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableCleanBuild</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableFullBuild</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.fullBuildTarget</key>
+ <value>all</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.stopOnError</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
+ <value>true</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.cdt.core.ccnature</nature>
+ <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+ <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+ <nature>org.eclipse.cdt.core.cnature</nature>
+ </natures>
+</projectDescription>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/resources/cpptest/cpptest.cpp b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/resources/cpptest/cpptest.cpp
new file mode 100644
index 0000000000..bd52aef5a3
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/resources/cpptest/cpptest.cpp
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Elliott Baron <ebaron@redhat.com> - initial API and implementation
+ *******************************************************************************/
+#include "cpptest.h"
+
+int x = 3;
+
+class A {
+public:
+ A() : y(6) {}
+ int c() {
+ B b = B();
+ b.d();
+ return b.x + y;
+ }
+private:
+ class B {
+ public:
+ B() : x(5) {}
+ void d() {
+ x++;
+ e();
+ }
+ int x;
+ private:
+ void e() {
+ x--;
+ }
+ };
+ int y;
+};
+
+int Foo::bar(int z) {
+ return x + baz(y, z);
+}
+
+int Foo::baz(int a, int b) {
+ return a + b;
+}
+
+int main(int argc, char **argv) {
+ Foo f = Foo();
+ A a = A();
+ f.bar(5);
+ a.c();
+ return 0;
+}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/resources/cpptest/cpptest.h b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/resources/cpptest/cpptest.h
new file mode 100644
index 0000000000..2f82087fbe
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/resources/cpptest/cpptest.h
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Elliott Baron <ebaron@redhat.com> - initial API and implementation
+ *******************************************************************************/
+#ifndef CPPTEST_H_
+#define CPPTEST_H_
+
+class Foo {
+public:
+ Foo() : y(4) {}
+ int bar(int);
+private:
+ int baz(int, int);
+ int y;
+};
+
+#endif /* CPPTEST_H_ */
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/resources/multiProcTest/.cproject b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/resources/multiProcTest/.cproject
new file mode 100644
index 0000000000..42551e0bab
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/resources/multiProcTest/.cproject
@@ -0,0 +1,577 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?>
+
+<cproject>
+<storageModule moduleId="org.eclipse.cdt.core.settings">
+<cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.1403986992">
+<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.1403986992" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+<externalSettings/>
+<extensions>
+<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+</extensions>
+</storageModule>
+<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+<configuration artifactName="multiProcTest" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.1403986992" name="Debug" parent="cdt.managedbuild.config.gnu.exe.debug">
+<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.1403986992." name="/" resourcePath="">
+<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.278021374" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
+<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.89398874" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
+<builder buildPath="${workspace_loc:/multiProcTest/Debug}" id="cdt.managedbuild.target.gnu.builder.exe.debug.408442332" managedBuildOn="true" name="Gnu Make Builder.Debug" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
+<tool id="cdt.managedbuild.tool.gnu.archiver.base.2144670746" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.308805987" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
+<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.1510340022" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
+<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.1758201535" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1518367575" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">
+<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.684491426" superClass="gnu.c.compiler.exe.debug.option.optimization.level" valueType="enumerated"/>
+<option id="gnu.c.compiler.exe.debug.option.debugging.level.1940432447" superClass="gnu.c.compiler.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.1656745772" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug"/>
+<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.191481253" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug"/>
+<tool id="cdt.managedbuild.tool.gnu.assembler.exe.debug.1051360222" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug"/>
+</toolChain>
+</folderInfo>
+</configuration>
+</storageModule>
+<storageModule moduleId="scannerConfiguration">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.1403986992;cdt.managedbuild.config.gnu.exe.debug.1403986992.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1518367575;cdt.managedbuild.tool.gnu.c.compiler.input.1512497663">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.1403986992;cdt.managedbuild.config.gnu.exe.debug.1403986992.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.308805987;cdt.managedbuild.tool.gnu.cpp.compiler.input.406930381">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+</storageModule>
+<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+</cconfiguration>
+<cconfiguration id="cdt.managedbuild.config.gnu.exe.release.206269348">
+<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.release.206269348" moduleId="org.eclipse.cdt.core.settings" name="Release">
+<externalSettings/>
+<extensions>
+<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+</extensions>
+</storageModule>
+<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+<configuration artifactName="multiProcTest" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.206269348" name="Release" parent="cdt.managedbuild.config.gnu.exe.release">
+<folderInfo id="cdt.managedbuild.config.gnu.exe.release.206269348." name="/" resourcePath="">
+<toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.1614180026" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
+<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.680850049" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>
+<builder buildPath="${workspace_loc:/multiProcTest/Release}" id="cdt.managedbuild.target.gnu.builder.exe.release.1001753861" managedBuildOn="true" name="Gnu Make Builder.Release" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/>
+<tool id="cdt.managedbuild.tool.gnu.archiver.base.1866479351" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.1048530434" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release">
+<option id="gnu.cpp.compiler.exe.release.option.optimization.level.193324125" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
+<option id="gnu.cpp.compiler.exe.release.option.debugging.level.65680841" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.53104544" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release">
+<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.1277454231" superClass="gnu.c.compiler.exe.release.option.optimization.level" valueType="enumerated"/>
+<option id="gnu.c.compiler.exe.release.option.debugging.level.1754602421" superClass="gnu.c.compiler.exe.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.790479271" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release"/>
+<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.release.1251386839" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.release"/>
+<tool id="cdt.managedbuild.tool.gnu.assembler.exe.release.1731287201" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.release"/>
+</toolChain>
+</folderInfo>
+</configuration>
+</storageModule>
+<storageModule moduleId="scannerConfiguration">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.1403986992;cdt.managedbuild.config.gnu.exe.debug.1403986992.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1518367575;cdt.managedbuild.tool.gnu.c.compiler.input.1512497663">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.1403986992;cdt.managedbuild.config.gnu.exe.debug.1403986992.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.308805987;cdt.managedbuild.tool.gnu.cpp.compiler.input.406930381">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+</storageModule>
+</cconfiguration>
+</storageModule>
+<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+<project id="multiProcTest.cdt.managedbuild.target.gnu.exe.962066261" name="Executable" projectType="cdt.managedbuild.target.gnu.exe"/>
+</storageModule>
+</cproject>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/resources/multiProcTest/.project b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/resources/multiProcTest/.project
new file mode 100644
index 0000000000..b7e2857347
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/resources/multiProcTest/.project
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>multiProcTest</name>
+ <comment></comment>
+ <projects>
+ <project>cpptest</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+ <triggers>clean,full,incremental,</triggers>
+ <arguments>
+ <dictionary>
+ <key>?name?</key>
+ <value></value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.append_environment</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.autoBuildTarget</key>
+ <value>all</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.buildArguments</key>
+ <value></value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.buildCommand</key>
+ <value>make</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.buildLocation</key>
+ <value>${workspace_loc:/multiProcTest/Debug}</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
+ <value>clean</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.contents</key>
+ <value>org.eclipse.cdt.make.core.activeConfigSettings</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableAutoBuild</key>
+ <value>false</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableCleanBuild</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableFullBuild</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.fullBuildTarget</key>
+ <value>all</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.stopOnError</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
+ <value>true</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.cdt.core.ccnature</nature>
+ <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+ <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+ <nature>org.eclipse.cdt.core.cnature</nature>
+ </natures>
+</projectDescription>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/resources/multiProcTest/parent.cpp b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/resources/multiProcTest/parent.cpp
new file mode 100644
index 0000000000..6c9860528a
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/resources/multiProcTest/parent.cpp
@@ -0,0 +1,42 @@
+#include <cstdio>
+#include <unistd.h>
+
+int x = 3;
+
+class A {
+public:
+ A() : y(6) {}
+ int c() {
+ B b = B();
+ b.d();
+ return b.x + y;
+ }
+private:
+ class B {
+ public:
+ B() : x(5) {}
+ void d() {
+ x++;
+ e();
+ }
+ int x;
+ private:
+ void e() {
+ x--;
+ }
+ };
+ int y;
+};
+
+int main() {
+ if (fork()) {
+ A a = A();
+ a.c();
+ }
+ else {
+ execv("../cpptest/Debug/cpptest", NULL);
+ perror("execv");
+ }
+ return 0;
+}
+
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/AbstractCachegrindTest.java b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/AbstractCachegrindTest.java
new file mode 100644
index 0000000000..5a8d4b8b8f
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/AbstractCachegrindTest.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Elliott Baron <ebaron@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.valgrind.cachegrind.tests;
+
+import org.eclipse.linuxtools.internal.valgrind.cachegrind.CachegrindPlugin;
+import org.eclipse.linuxtools.internal.valgrind.cachegrind.model.CachegrindFile;
+import org.eclipse.linuxtools.internal.valgrind.cachegrind.model.CachegrindFunction;
+import org.eclipse.linuxtools.internal.valgrind.cachegrind.model.CachegrindOutput;
+import org.eclipse.linuxtools.internal.valgrind.tests.AbstractValgrindTest;
+import org.osgi.framework.Bundle;
+
+public abstract class AbstractCachegrindTest extends AbstractValgrindTest {
+
+ @Override
+ protected Bundle getBundle() {
+ return CachegrindTestsPlugin.getDefault().getBundle();
+ }
+
+ @Override
+ protected String getToolID() {
+ return CachegrindPlugin.TOOL_ID;
+ }
+
+ protected CachegrindFile getFileByName(CachegrindOutput output, String name) {
+ CachegrindFile file = null;
+ for (CachegrindFile f : output.getFiles()) {
+ if (f.getName().equals(name)) {
+ file = f;
+ }
+ }
+ return file;
+ }
+
+ protected CachegrindFunction getFunctionByName(CachegrindFile file, String name) {
+ CachegrindFunction function = null;
+ for (CachegrindFunction f : file.getFunctions()) {
+ if (f.getName().equals(name)) {
+ function = f;
+ }
+ }
+ return function;
+ }
+
+}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/AllTests.java b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/AllTests.java
new file mode 100644
index 0000000000..36d6e65969
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/AllTests.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Elliott Baron <ebaron@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.valgrind.cachegrind.tests;
+
+import org.eclipse.linuxtools.internal.valgrind.cachegrind.CachegrindPlugin;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllTests {
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite(
+ "Tests for " + CachegrindPlugin.PLUGIN_ID); //$NON-NLS-1$
+ //$JUnit-BEGIN$
+ suite.addTestSuite(BasicCachegrindTest.class);
+ suite.addTestSuite(CModelLabelsTest.class);
+ suite.addTestSuite(DoubleClickTest.class);
+ suite.addTestSuite(LaunchConfigTabTest.class);
+ suite.addTestSuite(MultiProcessTest.class);
+ suite.addTestSuite(ExpandCollapseTest.class);
+ //$JUnit-END$
+ return suite;
+ }
+
+}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/BasicCachegrindTest.java b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/BasicCachegrindTest.java
new file mode 100644
index 0000000000..5f7fc0cfe1
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/BasicCachegrindTest.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Elliott Baron <ebaron@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.valgrind.cachegrind.tests;
+
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.linuxtools.internal.valgrind.cachegrind.CachegrindViewPart;
+import org.eclipse.linuxtools.internal.valgrind.cachegrind.model.CachegrindFile;
+import org.eclipse.linuxtools.internal.valgrind.cachegrind.model.CachegrindOutput;
+import org.eclipse.linuxtools.internal.valgrind.ui.ValgrindUIPlugin;
+
+public class BasicCachegrindTest extends AbstractCachegrindTest {
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ proj = createProjectAndBuild("cpptest"); //$NON-NLS-1$
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ deleteProject(proj);
+ super.tearDown();
+ }
+
+ public void testNumPIDs() throws Exception {
+ ILaunchConfiguration config = createConfiguration(proj.getProject());
+ doLaunch(config, "testNumPIDs"); //$NON-NLS-1$
+
+ CachegrindViewPart view = (CachegrindViewPart) ValgrindUIPlugin.getDefault().getView().getDynamicView();
+ assertEquals(1, view.getOutputs().length);
+ }
+
+ public void testFileNames() throws Exception {
+ ILaunchConfiguration config = createConfiguration(proj.getProject());
+ doLaunch(config, "testFileNames"); //$NON-NLS-1$
+
+ CachegrindViewPart view = (CachegrindViewPart) ValgrindUIPlugin.getDefault().getView().getDynamicView();
+ CachegrindOutput output = view.getOutputs()[0];
+ CachegrindFile file = getFileByName(output, "cpptest.cpp"); //$NON-NLS-1$
+ assertNotNull(file);
+ file = getFileByName(output, "cpptest.h"); //$NON-NLS-1$
+ assertNotNull(file);
+ }
+
+ public void testNumFunctions() throws Exception {
+ ILaunchConfiguration config = createConfiguration(proj.getProject());
+ doLaunch(config, "testNumFunctions"); //$NON-NLS-1$
+
+ CachegrindViewPart view = (CachegrindViewPart) ValgrindUIPlugin.getDefault().getView().getDynamicView();
+ CachegrindOutput output = view.getOutputs()[0];
+ CachegrindFile file = getFileByName(output, "cpptest.cpp"); //$NON-NLS-1$
+ assertNotNull(file);
+ assertEquals(8, file.getFunctions().length);
+ }
+}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/CModelLabelsTest.java b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/CModelLabelsTest.java
new file mode 100644
index 0000000000..01f300b0fe
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/CModelLabelsTest.java
@@ -0,0 +1,142 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Elliott Baron <ebaron@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.valgrind.cachegrind.tests;
+
+import org.eclipse.cdt.core.model.IFunction;
+import org.eclipse.cdt.core.model.IMethod;
+import org.eclipse.cdt.core.model.ITranslationUnit;
+import org.eclipse.cdt.ui.CElementLabelProvider;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.jface.viewers.TreePath;
+import org.eclipse.jface.viewers.TreeSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.linuxtools.internal.valgrind.cachegrind.CachegrindLabelProvider;
+import org.eclipse.linuxtools.internal.valgrind.cachegrind.CachegrindViewPart;
+import org.eclipse.linuxtools.internal.valgrind.cachegrind.model.CachegrindFile;
+import org.eclipse.linuxtools.internal.valgrind.cachegrind.model.CachegrindFunction;
+import org.eclipse.linuxtools.internal.valgrind.cachegrind.model.CachegrindOutput;
+import org.eclipse.linuxtools.internal.valgrind.cachegrind.model.ICachegrindElement;
+import org.eclipse.linuxtools.internal.valgrind.ui.ValgrindUIPlugin;
+import org.eclipse.swt.widgets.TreeItem;
+
+public class CModelLabelsTest extends AbstractCachegrindTest {
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ proj = createProjectAndBuild("cpptest"); //$NON-NLS-1$
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ deleteProject(proj);
+ super.tearDown();
+ }
+
+ public void testFileLabelsCPP() throws Exception {
+ ILaunchConfiguration config = createConfiguration(proj.getProject());
+ doLaunch(config, "testFileLabelsCPP"); //$NON-NLS-1$
+
+ CachegrindViewPart view = (CachegrindViewPart) ValgrindUIPlugin.getDefault().getView().getDynamicView();
+ CachegrindOutput output = view.getOutputs()[0];
+ CachegrindFile file = getFileByName(output, "cpptest.cpp"); //$NON-NLS-1$
+
+ assertTrue(file.getModel() instanceof ITranslationUnit);
+
+ checkLabelProvider(file);
+ }
+
+ public void testFileLabelsH() throws Exception {
+ ILaunchConfiguration config = createConfiguration(proj.getProject());
+ doLaunch(config, "testFileLabelsH"); //$NON-NLS-1$
+
+ CachegrindViewPart view = (CachegrindViewPart) ValgrindUIPlugin.getDefault().getView().getDynamicView();
+ CachegrindOutput output = view.getOutputs()[0];
+ CachegrindFile file = getFileByName(output, "cpptest.h"); //$NON-NLS-1$
+
+ assertTrue(file.getModel() instanceof ITranslationUnit);
+ assertTrue(((ITranslationUnit) file.getModel()).isHeaderUnit());
+
+ checkLabelProvider(file);
+ }
+
+ public void testFunctionLabel() throws Exception {
+ ILaunchConfiguration config = createConfiguration(proj.getProject());
+ doLaunch(config, "testFunctionLabel"); //$NON-NLS-1$
+
+ CachegrindViewPart view = (CachegrindViewPart) ValgrindUIPlugin.getDefault().getView().getDynamicView();
+ CachegrindOutput output = view.getOutputs()[0];
+ CachegrindFile file = getFileByName(output, "cpptest.cpp"); //$NON-NLS-1$
+ CachegrindFunction func = getFunctionByName(file, "main"); //$NON-NLS-1$
+
+ assertTrue(func.getModel() instanceof IFunction);
+
+ checkLabelProvider(func, file);
+ }
+
+ public void testMethodLabel() throws Exception {
+ ILaunchConfiguration config = createConfiguration(proj.getProject());
+ doLaunch(config, "testMethodLabel"); //$NON-NLS-1$
+
+ CachegrindViewPart view = (CachegrindViewPart) ValgrindUIPlugin.getDefault().getView().getDynamicView();
+ CachegrindOutput output = view.getOutputs()[0];
+ CachegrindFile file = getFileByName(output, "cpptest.cpp"); //$NON-NLS-1$
+ CachegrindFunction func = getFunctionByName(file, "A::A()"); //$NON-NLS-1$
+
+ assertTrue(func.getModel() instanceof IMethod);
+
+ checkLabelProvider(func, file);
+ }
+
+ public void testNestedMethodLabel() throws Exception {
+ ILaunchConfiguration config = createConfiguration(proj.getProject());
+ doLaunch(config, "testNestedMethodLabel"); //$NON-NLS-1$
+
+ CachegrindViewPart view = (CachegrindViewPart) ValgrindUIPlugin.getDefault().getView().getDynamicView();
+ CachegrindOutput output = view.getOutputs()[0];
+ CachegrindFile file = getFileByName(output, "cpptest.cpp"); //$NON-NLS-1$
+ CachegrindFunction func = getFunctionByName(file, "A::B::e()"); //$NON-NLS-1$
+
+ assertTrue(func.getModel() instanceof IMethod);
+
+ checkLabelProvider(func, file);
+ }
+
+ private void checkLabelProvider(CachegrindFile file) {
+ CachegrindViewPart view = (CachegrindViewPart) ValgrindUIPlugin.getDefault().getView().getDynamicView();
+ TreeViewer viewer = view.getViewer();
+
+ TreePath path = new TreePath(new Object[] { view.getOutputs()[0], file });
+ checkLabelProvider(viewer, path, file);
+ }
+
+ private void checkLabelProvider(CachegrindFunction func, CachegrindFile file) {
+ CachegrindViewPart view = (CachegrindViewPart) ValgrindUIPlugin.getDefault().getView().getDynamicView();
+ TreeViewer viewer = view.getViewer();
+
+ TreePath path = new TreePath(new Object[] { view.getOutputs()[0], file, func });
+ checkLabelProvider(viewer, path, func);
+ }
+
+ private void checkLabelProvider(TreeViewer viewer, TreePath path, ICachegrindElement element) {
+ // expand only the interesting item
+ viewer.expandToLevel(element, TreeViewer.ALL_LEVELS);
+ TreeSelection selection = new TreeSelection(path);
+ viewer.setSelection(selection);
+ TreeItem item = viewer.getTree().getSelection()[0];
+
+ // ensure the CElementLabelProvider is called correctly
+ CElementLabelProvider provider = ((CachegrindLabelProvider) viewer.getLabelProvider(0)).getCLabelProvider();
+ assertEquals(provider.getText(element.getModel()), item.getText());
+ assertEquals(provider.getImage(element.getModel()), item.getImage());
+ }
+
+}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/CachegrindTestsPlugin.java b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/CachegrindTestsPlugin.java
new file mode 100644
index 0000000000..65e5581344
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/CachegrindTestsPlugin.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Elliott Baron <ebaron@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.valgrind.cachegrind.tests;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class CachegrindTestsPlugin extends AbstractUIPlugin {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.eclipse.linuxtools.valgrind.cachegrind.tests"; //$NON-NLS-1$
+
+ // The shared instance
+ private static CachegrindTestsPlugin plugin;
+
+ /**
+ * The constructor
+ */
+ public CachegrindTestsPlugin() {
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static CachegrindTestsPlugin getDefault() {
+ return plugin;
+ }
+
+}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/DoubleClickTest.java b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/DoubleClickTest.java
new file mode 100644
index 0000000000..a2e9c83507
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/DoubleClickTest.java
@@ -0,0 +1,139 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Elliott Baron <ebaron@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.valgrind.cachegrind.tests;
+
+import java.io.File;
+
+import org.eclipse.cdt.core.model.IFunction;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.jface.text.TextSelection;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.TreePath;
+import org.eclipse.jface.viewers.TreeSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.linuxtools.internal.valgrind.cachegrind.CachegrindViewPart;
+import org.eclipse.linuxtools.internal.valgrind.cachegrind.model.CachegrindFile;
+import org.eclipse.linuxtools.internal.valgrind.cachegrind.model.CachegrindFunction;
+import org.eclipse.linuxtools.internal.valgrind.cachegrind.model.CachegrindLine;
+import org.eclipse.linuxtools.internal.valgrind.cachegrind.model.CachegrindOutput;
+import org.eclipse.linuxtools.internal.valgrind.cachegrind.model.ICachegrindElement;
+import org.eclipse.linuxtools.internal.valgrind.ui.ValgrindUIPlugin;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.texteditor.ITextEditor;
+
+public class DoubleClickTest extends AbstractCachegrindTest {
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ proj = createProjectAndBuild("cpptest"); //$NON-NLS-1$
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ deleteProject(proj);
+ super.tearDown();
+ }
+
+ private void doDoubleClick(TreePath path) {
+ CachegrindViewPart view = (CachegrindViewPart) ValgrindUIPlugin.getDefault().getView().getDynamicView();
+ TreeViewer treeViewer = (TreeViewer) view.getViewer();
+
+ ICachegrindElement element = (ICachegrindElement) path.getLastSegment();
+ treeViewer.expandToLevel(element, TreeViewer.ALL_LEVELS);
+ TreeSelection selection = new TreeSelection(path);
+
+ IDoubleClickListener listener = view.getDoubleClickListener();
+ listener.doubleClick(new DoubleClickEvent(treeViewer, selection));
+ }
+
+ public void testDoubleClickFile() throws Exception {
+ ILaunchConfiguration config = createConfiguration(proj.getProject());
+ doLaunch(config, "testDoubleClickFile"); //$NON-NLS-1$
+
+ CachegrindViewPart view = (CachegrindViewPart) ValgrindUIPlugin.getDefault().getView().getDynamicView();
+ CachegrindOutput output = view.getOutputs()[0];
+ CachegrindFile file = getFileByName(output, "cpptest.cpp"); //$NON-NLS-1$
+ TreePath path = new TreePath(new Object[] { output, file });
+
+ doDoubleClick(path);
+
+ checkFile(file);
+ }
+
+ public void testDoubleClickFunction() throws Exception {
+ ILaunchConfiguration config = createConfiguration(proj.getProject());
+ doLaunch(config, "testDoubleClickFunction"); //$NON-NLS-1$
+
+ CachegrindViewPart view = (CachegrindViewPart) ValgrindUIPlugin.getDefault().getView().getDynamicView();
+ CachegrindOutput output = view.getOutputs()[0];
+ CachegrindFile file = getFileByName(output, "cpptest.cpp"); //$NON-NLS-1$
+ CachegrindFunction func = getFunctionByName(file, "main"); //$NON-NLS-1$
+ TreePath path = new TreePath(new Object[] { output, file, func });
+
+ doDoubleClick(path);
+
+ // check file in editor
+ IEditorPart editor = checkFile(file);
+
+ // check line number
+ ITextEditor textEditor = (ITextEditor) editor;
+
+ ISelection selection = textEditor.getSelectionProvider().getSelection();
+ TextSelection textSelection = (TextSelection) selection;
+ int line = textSelection.getStartLine() + 1; // zero-indexed
+
+ int expectedLine = ((IFunction) func.getModel()).getSourceRange().getStartLine();
+ assertEquals(expectedLine, line);
+ }
+
+ public void testDoubleClickLine() throws Exception {
+ ILaunchConfiguration config = createConfiguration(proj.getProject());
+ doLaunch(config, "testDoubleClickFunction"); //$NON-NLS-1$
+
+ CachegrindViewPart view = (CachegrindViewPart) ValgrindUIPlugin.getDefault().getView().getDynamicView();
+ CachegrindOutput output = view.getOutputs()[0];
+ CachegrindFile file = getFileByName(output, "cpptest.cpp"); //$NON-NLS-1$
+ CachegrindFunction func = getFunctionByName(file, "main"); //$NON-NLS-1$
+ CachegrindLine line = func.getLines()[0];
+ TreePath path = new TreePath(new Object[] { output, file, func });
+
+ doDoubleClick(path);
+
+ // check file in editor
+ IEditorPart editor = checkFile(file);
+
+ // check line number
+ ITextEditor textEditor = (ITextEditor) editor;
+
+ ISelection selection = textEditor.getSelectionProvider().getSelection();
+ TextSelection textSelection = (TextSelection) selection;
+ int actualLine = textSelection.getStartLine() + 1; // zero-indexed
+
+ assertEquals(line.getLine(), actualLine);
+ }
+
+ private IEditorPart checkFile(CachegrindFile file) {
+ IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ IEditorInput input = editor.getEditorInput();
+ IFileEditorInput fileInput = (IFileEditorInput) input;
+ IResource expectedResource = proj.getProject().findMember(file.getName());
+ File expectedFile = expectedResource.getLocation().toFile();
+ File actualFile = fileInput.getFile().getLocation().toFile();
+ assertEquals(expectedFile, actualFile);
+ return editor;
+ }
+}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/ExpandCollapseTest.java b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/ExpandCollapseTest.java
new file mode 100644
index 0000000000..c402d15d92
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/ExpandCollapseTest.java
@@ -0,0 +1,90 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Elliott Baron <ebaron@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.valgrind.cachegrind.tests;
+
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.jface.viewers.TreePath;
+import org.eclipse.jface.viewers.TreeSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.linuxtools.internal.valgrind.cachegrind.CachegrindViewPart;
+import org.eclipse.linuxtools.internal.valgrind.cachegrind.model.CachegrindOutput;
+import org.eclipse.linuxtools.internal.valgrind.cachegrind.model.ICachegrindElement;
+import org.eclipse.linuxtools.internal.valgrind.ui.ValgrindUIPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Menu;
+
+public class ExpandCollapseTest extends AbstractCachegrindTest {
+
+ protected TreeViewer viewer;
+ protected Menu contextMenu;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ proj = createProjectAndBuild("cpptest"); //$NON-NLS-1$
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ deleteProject(proj);
+ super.tearDown();
+ }
+
+ public void testExpand() throws Exception {
+ ILaunchConfiguration config = createConfiguration(proj.getProject());
+ doLaunch(config, "testDefaults"); //$NON-NLS-1$
+
+ CachegrindViewPart view = (CachegrindViewPart) ValgrindUIPlugin.getDefault().getView().getDynamicView();
+ viewer = view.getViewer();
+ contextMenu = viewer.getTree().getMenu();
+
+ // Select first snapshot and expand it
+ CachegrindOutput[] outputs = (CachegrindOutput[]) viewer.getInput();
+ CachegrindOutput output = outputs[0];
+ TreeSelection selection = new TreeSelection(new TreePath(new Object[] { output }));
+ viewer.setSelection(selection);
+ contextMenu.notifyListeners(SWT.Show, null);
+ contextMenu.getItem(0).notifyListeners(SWT.Selection, null);
+
+ checkExpanded(output, true);
+ }
+
+ public void testCollapse() throws Exception {
+ // Expand the element first
+ testExpand();
+
+ // Then collapse it
+ CachegrindOutput[] outputs = (CachegrindOutput[]) viewer.getInput();
+ CachegrindOutput output = outputs[0];
+ TreeSelection selection = new TreeSelection(new TreePath(new Object[] { output }));
+ viewer.setSelection(selection);
+ contextMenu.notifyListeners(SWT.Show, null);
+ contextMenu.getItem(1).notifyListeners(SWT.Selection, null);
+
+ checkExpanded(output, false);
+ }
+
+ private void checkExpanded(ICachegrindElement element, boolean expanded) {
+ if (element.getChildren() != null && element.getChildren().length > 0) {
+ // only applicable to internal nodes
+ if (expanded) {
+ assertTrue(viewer.getExpandedState(element));
+ }
+ else {
+ assertFalse(viewer.getExpandedState(element));
+ }
+ for (ICachegrindElement child : element.getChildren()) {
+ checkExpanded(child, expanded);
+ }
+ }
+ }
+
+}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/LaunchConfigTabTest.java b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/LaunchConfigTabTest.java
new file mode 100644
index 0000000000..e5f272e32a
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/LaunchConfigTabTest.java
@@ -0,0 +1,210 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Elliott Baron <ebaron@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.valgrind.cachegrind.tests;
+
+import java.util.Arrays;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.debug.core.ILaunch;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.debug.core.model.IProcess;
+import org.eclipse.debug.ui.ILaunchConfigurationTab;
+import org.eclipse.linuxtools.internal.valgrind.cachegrind.CachegrindPlugin;
+import org.eclipse.linuxtools.internal.valgrind.cachegrind.CachegrindToolPage;
+import org.eclipse.linuxtools.internal.valgrind.launch.ValgrindOptionsTab;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+
+public class LaunchConfigTabTest extends AbstractCachegrindTest {
+
+ protected ILaunchConfiguration config;
+ protected Shell testShell;
+ protected ValgrindOptionsTab tab;
+ protected CachegrindToolPage dynamicTab;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ proj = createProjectAndBuild("cpptest"); //$NON-NLS-1$
+
+ config = createConfiguration(proj.getProject());
+
+ testShell = new Shell(Display.getDefault());
+ testShell.setLayout(new GridLayout());
+ tab = new ValgrindOptionsTab();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ tab.dispose();
+ testShell.dispose();
+ deleteProject(proj);
+ super.tearDown();
+ }
+
+ private ILaunchConfigurationWorkingCopy initConfig() throws CoreException {
+ ILaunchConfigurationWorkingCopy wc = config.getWorkingCopy();
+ tab.setDefaults(wc);
+ tab.createControl(testShell);
+ tab.initializeFrom(config);
+ int ix = Arrays.asList(tab.getTools()).indexOf(CachegrindPlugin.TOOL_ID);
+ tab.getToolsCombo().select(ix);
+ ILaunchConfigurationTab dynamicTab = tab.getDynamicTab();
+ this.dynamicTab = (CachegrindToolPage) dynamicTab;
+ return wc;
+ }
+
+ private ILaunch saveAndLaunch(ILaunchConfigurationWorkingCopy wc, String testName)
+ throws Exception {
+ tab.performApply(wc);
+ config = wc.doSave();
+
+ ILaunch launch = doLaunch(config, testName);
+ return launch;
+ }
+
+ public void testDefaults() throws Exception {
+ ILaunchConfigurationWorkingCopy wc = initConfig();
+ ILaunch launch = saveAndLaunch(wc, "testDefaults"); //$NON-NLS-1$
+ IProcess[] p = launch.getProcesses();
+ if (p.length > 0) {
+ String cmd = p[0].getAttribute(IProcess.ATTR_CMDLINE);
+ assertEquals(0, p[0].getExitValue());
+ assertTrue(cmd.contains("--tool=cachegrind")); //$NON-NLS-1$
+ assertFalse(cmd.contains("--xml=yes")); //$NON-NLS-1$
+ assertTrue(cmd.contains("-q")); //$NON-NLS-1$
+ assertTrue(cmd.contains("--trace-children=no")); //$NON-NLS-1$
+ assertTrue(cmd.contains("--child-silent-after-fork=yes")); //$NON-NLS-1$
+ assertTrue(cmd.contains("--demangle=yes")); //$NON-NLS-1$
+ assertTrue(cmd.contains("--num-callers=12")); //$NON-NLS-1$
+ assertTrue(cmd.contains("--error-limit=yes")); //$NON-NLS-1$
+ assertTrue(cmd.contains("--show-below-main=no")); //$NON-NLS-1$
+ assertFalse(cmd.contains("--suppressions")); //$NON-NLS-1$
+ assertTrue(cmd.contains("--max-stackframe=2000000")); //$NON-NLS-1$
+ assertTrue(cmd.contains("--run-libc-freeres=yes")); //$NON-NLS-1$
+
+ assertTrue(cmd.contains("--cache-sim=yes")); //$NON-NLS-1$
+ assertTrue(cmd.contains("--branch-sim=no")); //$NON-NLS-1$
+ }
+ else {
+ fail();
+ }
+ }
+
+ public void testNoSim() throws Exception {
+ ILaunchConfigurationWorkingCopy wc = initConfig();
+ dynamicTab.getCacheButton().setSelection(false);
+ tab.performApply(wc);
+ wc.doSave();
+
+ assertFalse(tab.isValid(config));
+ }
+
+ public void testBranchSim() throws Exception {
+ ILaunchConfigurationWorkingCopy wc = initConfig();
+ dynamicTab.getBranchButton().setSelection(true);
+ tab.performApply(wc);
+ wc.doSave();
+
+ ILaunch launch = saveAndLaunch(wc, "testBranchSim"); //$NON-NLS-1$
+ IProcess[] p = launch.getProcesses();
+ if (p.length > 0) {
+ String cmd = p[0].getAttribute(IProcess.ATTR_CMDLINE);
+ assertEquals(0, p[0].getExitValue());
+ assertTrue(cmd.contains("--branch-sim=yes")); //$NON-NLS-1$
+ }
+ else {
+ fail();
+ }
+ }
+
+ public void testI1Cache() throws Exception {
+ ILaunchConfigurationWorkingCopy wc = initConfig();
+
+ assertFalse(dynamicTab.getI1SizeSpinner().isEnabled());
+ dynamicTab.getI1Button().setSelection(true);
+ dynamicTab.getI1Button().notifyListeners(SWT.Selection, null);
+ assertTrue(dynamicTab.getI1SizeSpinner().isEnabled());
+
+ dynamicTab.getI1SizeSpinner().setSelection(16384);
+ dynamicTab.getI1AssocSpinner().setSelection(1);
+ dynamicTab.getI1LineSizeSpinner().setSelection(16);
+
+ tab.performApply(wc);
+ wc.doSave();
+
+ ILaunch launch = saveAndLaunch(wc, "testI1Cache"); //$NON-NLS-1$
+ IProcess[] p = launch.getProcesses();
+ if (p.length > 0) {
+ String cmd = p[0].getAttribute(IProcess.ATTR_CMDLINE);
+ assertTrue(cmd.contains("--I1=16384,1,16")); //$NON-NLS-1$
+ }
+ else {
+ fail();
+ }
+ }
+
+ public void testD1Cache() throws Exception {
+ ILaunchConfigurationWorkingCopy wc = initConfig();
+
+ assertFalse(dynamicTab.getD1SizeSpinner().isEnabled());
+ dynamicTab.getD1Button().setSelection(true);
+ dynamicTab.getD1Button().notifyListeners(SWT.Selection, null);
+ assertTrue(dynamicTab.getD1SizeSpinner().isEnabled());
+
+ dynamicTab.getD1SizeSpinner().setSelection(16384);
+ dynamicTab.getD1AssocSpinner().setSelection(1);
+ dynamicTab.getD1LineSizeSpinner().setSelection(16);
+
+ tab.performApply(wc);
+ wc.doSave();
+
+ ILaunch launch = saveAndLaunch(wc, "testD1Cache"); //$NON-NLS-1$
+ IProcess[] p = launch.getProcesses();
+ if (p.length > 0) {
+ String cmd = p[0].getAttribute(IProcess.ATTR_CMDLINE);
+ assertTrue(cmd.contains("--D1=16384,1,16")); //$NON-NLS-1$
+ }
+ else {
+ fail();
+ }
+ }
+
+ public void testL2Cache() throws Exception {
+ ILaunchConfigurationWorkingCopy wc = initConfig();
+
+ assertFalse(dynamicTab.getL2SizeSpinner().isEnabled());
+ dynamicTab.getL2Button().setSelection(true);
+ dynamicTab.getL2Button().notifyListeners(SWT.Selection, null);
+ assertTrue(dynamicTab.getL2SizeSpinner().isEnabled());
+
+ dynamicTab.getL2SizeSpinner().setSelection(16384);
+ dynamicTab.getL2AssocSpinner().setSelection(1);
+ dynamicTab.getL2LineSizeSpinner().setSelection(16);
+
+ tab.performApply(wc);
+ wc.doSave();
+
+ ILaunch launch = saveAndLaunch(wc, "testL2Cache"); //$NON-NLS-1$
+ IProcess[] p = launch.getProcesses();
+ if (p.length > 0) {
+ String cmd = p[0].getAttribute(IProcess.ATTR_CMDLINE);
+ assertTrue(cmd.contains("--L2=16384,1,16")); //$NON-NLS-1$
+ }
+ else {
+ fail();
+ }
+ }
+
+}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/MultiProcessTest.java b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/MultiProcessTest.java
new file mode 100644
index 0000000000..63a68d525f
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/MultiProcessTest.java
@@ -0,0 +1,110 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Elliott Baron <ebaron@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.valgrind.cachegrind.tests;
+
+import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.linuxtools.internal.valgrind.cachegrind.CachegrindViewPart;
+import org.eclipse.linuxtools.internal.valgrind.cachegrind.model.CachegrindFile;
+import org.eclipse.linuxtools.internal.valgrind.cachegrind.model.CachegrindOutput;
+import org.eclipse.linuxtools.internal.valgrind.core.LaunchConfigurationConstants;
+import org.eclipse.linuxtools.internal.valgrind.ui.ValgrindUIPlugin;
+
+public class MultiProcessTest extends AbstractCachegrindTest {
+ ICProject refProj;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ refProj = createProjectAndBuild("cpptest"); //$NON-NLS-1$
+ proj = createProjectAndBuild("multiProcTest"); //$NON-NLS-1$
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ deleteProject(proj);
+ deleteProject(refProj);
+ super.tearDown();
+ }
+
+ public void testNoExec() throws Exception {
+ ILaunchConfiguration config = createConfiguration(proj.getProject());
+ doLaunch(config, "testNoExec"); //$NON-NLS-1$
+
+ CachegrindViewPart view = (CachegrindViewPart) ValgrindUIPlugin.getDefault().getView().getDynamicView();
+ assertEquals(1, view.getOutputs().length);
+ }
+
+ public void testNumPids() throws Exception {
+ ILaunchConfigurationWorkingCopy config = createConfiguration(proj.getProject()).getWorkingCopy();
+ config.setAttribute(LaunchConfigurationConstants.ATTR_GENERAL_TRACECHILD, true);
+ config.doSave();
+ doLaunch(config, "testExec"); //$NON-NLS-1$
+
+ CachegrindViewPart view = (CachegrindViewPart) ValgrindUIPlugin.getDefault().getView().getDynamicView();
+ assertEquals(2, view.getOutputs().length);
+ }
+
+ public void testFileNames() throws Exception {
+ ILaunchConfigurationWorkingCopy config = createConfiguration(proj.getProject()).getWorkingCopy();
+ config.setAttribute(LaunchConfigurationConstants.ATTR_GENERAL_TRACECHILD, true);
+ config.doSave();
+ doLaunch(config, "testExec"); //$NON-NLS-1$
+
+ CachegrindViewPart view = (CachegrindViewPart) ValgrindUIPlugin.getDefault().getView().getDynamicView();
+
+ int pidIx = 0;
+ CachegrindOutput output = view.getOutputs()[pidIx];
+ CachegrindFile file = getFileByName(output, "cpptest.cpp"); //$NON-NLS-1$
+ if (file == null) {
+ pidIx = 1;
+ output = view.getOutputs()[pidIx];
+ file = getFileByName(output, "cpptest.cpp"); //$NON-NLS-1$
+ }
+ assertNotNull(file);
+ file = getFileByName(output, "cpptest.h"); //$NON-NLS-1$
+ assertNotNull(file);
+
+ // test other pid
+ pidIx = (pidIx + 1) % 2;
+ output = view.getOutputs()[pidIx];
+ file = getFileByName(output, "parent.cpp"); //$NON-NLS-1$
+ assertNotNull(file);
+ }
+
+ public void testNumFunctions() throws Exception {
+ ILaunchConfigurationWorkingCopy config = createConfiguration(proj.getProject()).getWorkingCopy();
+ config.setAttribute(LaunchConfigurationConstants.ATTR_GENERAL_TRACECHILD, true);
+ config.doSave();;
+ doLaunch(config, "testExec"); //$NON-NLS-1$
+
+ CachegrindViewPart view = (CachegrindViewPart) ValgrindUIPlugin.getDefault().getView().getDynamicView();
+
+ int pidIx = 0;
+ CachegrindOutput output = view.getOutputs()[pidIx];
+ CachegrindFile file = getFileByName(output, "cpptest.cpp"); //$NON-NLS-1$
+ if (file == null) {
+ pidIx = 1;
+ output = view.getOutputs()[pidIx];
+ file = getFileByName(output, "cpptest.cpp"); //$NON-NLS-1$
+ }
+ assertNotNull(file);
+ assertEquals(8, file.getFunctions().length);
+
+ // test other pid
+ pidIx = (pidIx + 1) % 2;
+ output = view.getOutputs()[pidIx];
+ file = getFileByName(output, "parent.cpp"); //$NON-NLS-1$
+ assertNotNull(file);
+ assertEquals(6, file.getFunctions().length);
+ }
+}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/test.xml b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/test.xml
new file mode 100644
index 0000000000..a431252ffe
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/test.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+
+<project name="testsuite" default="run" basedir=".">
+ <property name="cachegrind_classname" value="org.eclipse.linuxtools.internal.valgrind.cachegrind.tests.AllTests" />
+ <property name="cachegrind-plugin-name" value="org.eclipse.linuxtools.valgrind.cachegrind.tests" />
+
+ <property name="library-file" value="${eclipse-home}/dropins/${subProjectName2}/plugins/org.eclipse.test/library.xml" />
+
+ <!-- The property ${eclipse-home} should be passed into this script -->
+ <!-- Set a meaningful default value for when it is not. -->
+ <property name="eclipse-home" value="${basedir}/../.." />
+
+ <!-- This target holds all initialization code that needs to be done for -->
+ <!-- all tests that are to be run. Initialization for individual tests -->
+ <!-- should be done within the body of the suite target. -->
+ <target name="init">
+ <tstamp />
+ <delete>
+ <fileset dir="${eclipse-home}" includes="org*.xml" />
+ </delete>
+ </target>
+
+ <!-- This target defines the tests that need to be run. -->
+ <target name="cachegrind_suite">
+ <property name="cachegrind-folder" value="${eclipse-home}/cachegrind_folder" />
+ <delete dir="${cachegrind-folder}" quiet="true" />
+ <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+ <property name="data-dir" value="${cachegrind-folder}" />
+ <property name="plugin-name" value="${cachegrind-plugin-name}" />
+ <property name="classname" value="${cachegrind_classname}" />
+ </ant>
+ </target>
+
+ <!-- This target holds code to cleanup the testing environment after -->
+ <!-- after all of the tests have been run. You can use this target to -->
+ <!-- delete temporary files that have been created. -->
+ <target name="cleanup">
+ <mkdir dir="${results}/consolelogs" />
+ <copy failonerror="false" file="${eclipse-home}/results/${cachegrind_classname}.txt" tofile="${results}/consolelogs/${cachegrind_classname}_${platform}.metadata.log.txt" />
+ </target>
+
+ <!-- This target runs the test suite. Any actions that need to happen -->
+ <!-- after all the tests have been run should go here. -->
+ <target name="run" depends="init,cachegrind_suite,cleanup">
+ <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
+ <property name="includes" value="org*.xml" />
+ <property name="output-file" value="${cachegrind-plugin-name}.xml" />
+ </ant>
+ </target>
+
+ <target name="all" depends="run" description="Dummy target to run all tests">
+ </target>
+
+</project>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testBranchSim/cachegrind_5190.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testBranchSim/cachegrind_5190.txt
new file mode 100644
index 0000000000..44f498baea
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testBranchSim/cachegrind_5190.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw Bc Bcm Bi Bim
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0 0 0 0 0
+fn=A::B::B()
+26 7 1 1 3 0 0 3 0 0 0 0 0 0
+fn=A::B::d()
+27 4 0 0 0 0 0 2 0 0 0 0 0 0
+28 5 0 0 3 0 0 1 0 0 0 0 0 0
+29 3 0 0 1 0 0 1 0 0 0 0 0 0
+30 2 0 0 2 0 0 0 0 0 0 0 0 0
+fn=A::B::e()
+33 3 0 0 0 0 0 2 0 0 0 0 0 0
+34 5 0 0 3 0 0 1 0 0 0 0 0 0
+35 2 0 0 2 0 0 0 0 0 0 0 0 0
+fn=A::c()
+18 4 0 0 0 0 0 2 0 0 0 0 0 0
+19 3 0 0 0 0 0 1 0 0 0 0 0 0
+20 3 0 0 0 0 0 1 0 0 0 0 0 0
+21 4 0 0 3 0 0 0 0 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 0 0 0 0 0 3 0 0 0 0 0 0
+41 9 0 0 5 0 0 1 0 0 0 0 0 0
+42 2 0 0 2 0 0 0 0 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 0 0 0 0 0 4 0 0 0 0 0 0
+45 3 0 0 2 0 0 0 0 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0 0 0 0 0
+fn=main
+48 5 1 1 0 0 0 3 0 0 0 0 0 0
+49 3 0 0 0 0 0 1 0 0 0 0 0 0
+50 3 0 0 0 0 0 1 0 0 0 0 0 0
+51 4 0 0 0 0 0 1 0 0 0 0 0 0
+52 3 0 0 0 0 0 1 0 0 0 0 0 0
+53 1 0 0 0 0 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0 0 0 0 0
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 1 1 3 0 0 3 0 0 0 0 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 0 17 0 0 7 1 0 0
+fn=???
+0 718 79 74 300 55 11 185 12 8 73 34 105 16
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0 10 5 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 12 9 14 0 0 17 7 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1 3 0 0 0
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0 54 16 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 2 1 3 0 0 0
+fn=__libc_csu_init
+0 25 3 3 7 0 0 7 0 0 1 1 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0 1 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0 2 0 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0 122 33 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0 24 13 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0 1 0 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1 0 0 0 0
+fn=__unregister_atfork
+0 32 2 2 12 1 1 4 0 0 4 3 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 0 10 1 0 2 2 0 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 0 18 1 1 17 4 0 0
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28 231 11 0 0
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0 787 53 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2 12 3 0 0
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0 22 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 15 15 403 28 28 388 91 0 0
+fn=_dl_debug_initialize
+0 76 3 3 24 2 1 4 0 0 22 2 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0 11 3 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1 15 4 0 0
+fn=_dl_fini
+0 409 12 12 134 2 0 43 3 0 94 24 0 0
+fn=_dl_fixup
+0 437 6 6 158 34 1 42 0 0 59 2 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3 34 16 0 0
+fn=_dl_init
+0 104 5 5 25 3 0 15 0 0 10 8 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3 245 15 0 0
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0 255 54 0 0
+fn=_dl_lookup_symbol_x
+0 525437 10 10 81620 1224 1065 27255 2 0 59165 1255 0 0
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9 492 85 0 0
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 2 191 3 2 739 96 0 0
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55 864 163 0 0
+fn=_dl_name_match_p
+0 5158 2 2 1384 15 0 798 2 2 796 49 0 0
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36 182 83 0 0
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 23 23 2 0 0 96 27 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0 2 0 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0 8 0 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0 0 0 0 0
+fn=_dl_relocate_object
+0 183682 36 36 47167 2860 2097 14356 753 490 28971 664 2141 11
+fn=_dl_runtime_resolve
+0 126 2 2 54 0 0 48 0 0 0 0 6 3
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1 14 0 0 0
+fn=_dl_sort_fini
+0 666 6 6 172 5 0 24 0 0 163 41 0 0
+fn=_dl_start
+0 397 17 16 48 14 12 40 12 12 74 25 0 0
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0 3 1 0 0
+fn=_dl_sysdep_start
+0 395 13 13 108 16 15 27 2 2 86 24 16 12
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0 1 0 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0 2 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0 12 0 0 0
+fn=_init
+0 136 9 9 22 4 1 18 5 4 12 7 0 0
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0 32 5 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0 1 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1 2 0 0 0
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 0 459 111 0 0
+fn=call_init
+0 307 5 5 105 17 0 60 0 0 38 11 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0 14 12 0 0
+fn=check_match.8652
+0 68242 7 7 23556 162 99 5915 0 0 9409 25 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0 6 0 0 0
+fn=dl_main
+0 1126 63 63 289 32 19 128 14 14 323 91 0 0
+fn=do_lookup_x
+0 326670 13 13 104430 1862 504 46233 1 0 48859 2855 0 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0 1 0 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0 16 5 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0 2 0 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4 95 43 0 0
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1 20 6 0 0
+fn=index
+0 687 2 2 62 7 7 0 0 0 63 38 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3 15 5 0 0
+fn=init_tls
+0 86 4 4 22 2 1 14 0 0 20 11 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0 176 11 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1 160 44 0 0
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0 4 0 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0 0 0 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0 273 29 0 0
+fn=memcpy
+0 862 6 6 143 0 0 119 15 15 203 87 0 0
+fn=mempcpy
+0 2443 6 6 384 2 1 305 11 11 571 149 0 0
+fn=memset
+0 1042 3 3 7 0 0 515 67 67 123 49 0 0
+fn=mmap
+0 108 2 2 18 0 0 0 0 0 18 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0 9 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0 1 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0 31 4 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1 338 49 0 0
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4 432 101 0 0
+fn=openaux
+0 231 2 2 88 0 0 44 1 1 0 0 0 0
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3 89 33 2 2
+fn=read
+0 25 1 1 5 0 0 0 0 0 5 0 0 0
+fn=rindex
+0 105 3 3 6 2 1 0 0 0 15 4 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1 3 1 0 0
+fn=strcmp
+0 110867 2 2 32622 70 20 0 0 0 30555 1530 0 0
+fn=strlen
+0 776 2 2 99 2 2 0 0 0 73 32 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0 1350 20 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0 1 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0 1 1 0 0
+summary: 1273787 700 694 302365 6648 4096 100676 1095 817 188014 8300 2270 44
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testBranchSim/template_cachegrind_5190.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testBranchSim/template_cachegrind_5190.txt
new file mode 100644
index 0000000000..da3ecbe7ae
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testBranchSim/template_cachegrind_5190.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: XXXXXXXXXXXX/cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw Bc Bcm Bi Bim
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0 0 0 0 0
+fn=A::B::B()
+26 7 1 1 3 0 0 3 0 0 0 0 0 0
+fn=A::B::d()
+27 4 0 0 0 0 0 2 0 0 0 0 0 0
+28 5 0 0 3 0 0 1 0 0 0 0 0 0
+29 3 0 0 1 0 0 1 0 0 0 0 0 0
+30 2 0 0 2 0 0 0 0 0 0 0 0 0
+fn=A::B::e()
+33 3 0 0 0 0 0 2 0 0 0 0 0 0
+34 5 0 0 3 0 0 1 0 0 0 0 0 0
+35 2 0 0 2 0 0 0 0 0 0 0 0 0
+fn=A::c()
+18 4 0 0 0 0 0 2 0 0 0 0 0 0
+19 3 0 0 0 0 0 1 0 0 0 0 0 0
+20 3 0 0 0 0 0 1 0 0 0 0 0 0
+21 4 0 0 3 0 0 0 0 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 0 0 0 0 0 3 0 0 0 0 0 0
+41 9 0 0 5 0 0 1 0 0 0 0 0 0
+42 2 0 0 2 0 0 0 0 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 0 0 0 0 0 4 0 0 0 0 0 0
+45 3 0 0 2 0 0 0 0 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0 0 0 0 0
+fn=main
+48 5 1 1 0 0 0 3 0 0 0 0 0 0
+49 3 0 0 0 0 0 1 0 0 0 0 0 0
+50 3 0 0 0 0 0 1 0 0 0 0 0 0
+51 4 0 0 0 0 0 1 0 0 0 0 0 0
+52 3 0 0 0 0 0 1 0 0 0 0 0 0
+53 1 0 0 0 0 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0 0 0 0 0
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 1 1 3 0 0 3 0 0 0 0 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 0 17 0 0 7 1 0 0
+fn=???
+0 718 79 74 300 55 11 185 12 8 73 34 105 16
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0 10 5 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 12 9 14 0 0 17 7 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1 3 0 0 0
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0 54 16 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 2 1 3 0 0 0
+fn=__libc_csu_init
+0 25 3 3 7 0 0 7 0 0 1 1 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0 1 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0 2 0 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0 122 33 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0 24 13 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0 1 0 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1 0 0 0 0
+fn=__unregister_atfork
+0 32 2 2 12 1 1 4 0 0 4 3 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 0 10 1 0 2 2 0 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 0 18 1 1 17 4 0 0
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28 231 11 0 0
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0 787 53 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2 12 3 0 0
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0 22 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 15 15 403 28 28 388 91 0 0
+fn=_dl_debug_initialize
+0 76 3 3 24 2 1 4 0 0 22 2 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0 11 3 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1 15 4 0 0
+fn=_dl_fini
+0 409 12 12 134 2 0 43 3 0 94 24 0 0
+fn=_dl_fixup
+0 437 6 6 158 34 1 42 0 0 59 2 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3 34 16 0 0
+fn=_dl_init
+0 104 5 5 25 3 0 15 0 0 10 8 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3 245 15 0 0
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0 255 54 0 0
+fn=_dl_lookup_symbol_x
+0 525437 10 10 81620 1224 1065 27255 2 0 59165 1255 0 0
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9 492 85 0 0
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 2 191 3 2 739 96 0 0
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55 864 163 0 0
+fn=_dl_name_match_p
+0 5158 2 2 1384 15 0 798 2 2 796 49 0 0
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36 182 83 0 0
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 23 23 2 0 0 96 27 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0 2 0 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0 8 0 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0 0 0 0 0
+fn=_dl_relocate_object
+0 183682 36 36 47167 2860 2097 14356 753 490 28971 664 2141 11
+fn=_dl_runtime_resolve
+0 126 2 2 54 0 0 48 0 0 0 0 6 3
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1 14 0 0 0
+fn=_dl_sort_fini
+0 666 6 6 172 5 0 24 0 0 163 41 0 0
+fn=_dl_start
+0 397 17 16 48 14 12 40 12 12 74 25 0 0
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0 3 1 0 0
+fn=_dl_sysdep_start
+0 395 13 13 108 16 15 27 2 2 86 24 16 12
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0 1 0 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0 2 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0 12 0 0 0
+fn=_init
+0 136 9 9 22 4 1 18 5 4 12 7 0 0
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0 32 5 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0 1 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1 2 0 0 0
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 0 459 111 0 0
+fn=call_init
+0 307 5 5 105 17 0 60 0 0 38 11 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0 14 12 0 0
+fn=check_match.8652
+0 68242 7 7 23556 162 99 5915 0 0 9409 25 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0 6 0 0 0
+fn=dl_main
+0 1126 63 63 289 32 19 128 14 14 323 91 0 0
+fn=do_lookup_x
+0 326670 13 13 104430 1862 504 46233 1 0 48859 2855 0 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0 1 0 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0 16 5 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0 2 0 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4 95 43 0 0
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1 20 6 0 0
+fn=index
+0 687 2 2 62 7 7 0 0 0 63 38 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3 15 5 0 0
+fn=init_tls
+0 86 4 4 22 2 1 14 0 0 20 11 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0 176 11 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1 160 44 0 0
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0 4 0 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0 0 0 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0 273 29 0 0
+fn=memcpy
+0 862 6 6 143 0 0 119 15 15 203 87 0 0
+fn=mempcpy
+0 2443 6 6 384 2 1 305 11 11 571 149 0 0
+fn=memset
+0 1042 3 3 7 0 0 515 67 67 123 49 0 0
+fn=mmap
+0 108 2 2 18 0 0 0 0 0 18 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0 9 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0 1 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0 31 4 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1 338 49 0 0
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4 432 101 0 0
+fn=openaux
+0 231 2 2 88 0 0 44 1 1 0 0 0 0
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3 89 33 2 2
+fn=read
+0 25 1 1 5 0 0 0 0 0 5 0 0 0
+fn=rindex
+0 105 3 3 6 2 1 0 0 0 15 4 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1 3 1 0 0
+fn=strcmp
+0 110867 2 2 32622 70 20 0 0 0 30555 1530 0 0
+fn=strlen
+0 776 2 2 99 2 2 0 0 0 73 32 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0 1350 20 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0 1 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0 1 1 0 0
+summary: 1273787 700 694 302365 6648 4096 100676 1095 817 188014 8300 2270 44
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testBranchSim/template_valgrind_5190.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testBranchSim/template_valgrind_5190.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testBranchSim/template_valgrind_5190.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testD1Cache/cachegrind_5300.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testD1Cache/cachegrind_5300.txt
new file mode 100644
index 0000000000..098f299297
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testD1Cache/cachegrind_5300.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 16384 B, 16 B, direct-mapped
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+26 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+27 4 0 0 0 0 0 2 0 0
+28 5 0 0 3 0 0 1 0 0
+29 3 0 0 1 0 0 1 0 0
+30 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+33 3 0 0 0 0 0 2 1 0
+34 5 0 0 3 0 0 1 0 0
+35 2 0 0 2 0 0 0 0 0
+fn=A::c()
+18 4 0 0 0 0 0 2 0 0
+19 3 0 0 0 0 0 1 0 0
+20 3 0 0 0 0 0 1 0 0
+21 4 0 0 3 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 0 0 0 0 0 3 0 0
+41 9 0 0 5 0 0 1 0 0
+42 2 0 0 2 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 0 0 0 0 0 4 1 0
+45 3 0 0 2 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0
+fn=main
+48 5 1 1 0 0 0 3 0 0
+49 3 0 0 0 0 0 1 0 0
+50 3 0 0 0 0 0 1 0 0
+51 4 0 0 0 0 0 1 0 0
+52 3 0 0 0 0 0 1 0 0
+53 1 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 1 1 3 0 0 3 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 3 0 17 0 0
+fn=???
+0 718 79 74 300 95 11 185 32 8
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 3 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 12 9 14 1 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 3 1
+fn=__cxa_finalize
+0 279 6 6 72 7 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 3 1
+fn=__libc_csu_init
+0 25 3 3 7 0 0 7 1 0
+fn=__libc_fini
+0 6 0 0 3 1 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 2 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 7 0 206 16 0
+fn=__new_exitfn
+0 111 6 6 30 7 5 10 3 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 1 0 104 18 1
+fn=__unregister_atfork
+0 32 2 2 12 4 1 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 5 0 10 3 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 9 0 18 3 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 112 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 34 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 7 0 204 19 2
+fn=_dl_check_all_versions
+0 124 3 3 19 4 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 105 15 403 112 28
+fn=_dl_debug_initialize
+0 76 3 3 24 8 1 4 1 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 2 1 11 1 0
+fn=_dl_discover_osversion
+0 87 4 4 12 2 1 4 2 1
+fn=_dl_fini
+0 409 12 12 134 46 0 43 9 0
+fn=_dl_fixup
+0 437 6 6 158 49 1 42 4 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 13 3
+fn=_dl_init
+0 104 5 5 25 11 0 15 1 0
+fn=_dl_init_paths
+0 1752 17 17 249 4 1 42 15 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 48 30 66 2 0
+fn=_dl_lookup_symbol_x
+0 525437 10 10 81620 6076 1065 27255 266 0
+fn=_dl_map_object
+0 2229 23 23 566 69 1 331 34 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 111 2 191 27 2
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 185 47 459 164 55
+fn=_dl_name_match_p
+0 5158 2 2 1384 190 0 798 14 2
+fn=_dl_new_object
+0 1241 13 13 237 13 8 231 91 36
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 43 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 1 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 5 0 8 1 0
+fn=_dl_receive_error
+0 28 2 2 10 5 0 12 1 0
+fn=_dl_relocate_object
+0 183682 36 36 47167 8100 2097 14356 2100 490
+fn=_dl_runtime_resolve
+0 126 2 2 54 2 0 48 1 0
+fn=_dl_setup_hash
+0 203 2 2 49 12 10 42 19 1
+fn=_dl_sort_fini
+0 666 6 6 172 23 0 24 0 0
+fn=_dl_start
+0 397 17 16 48 34 12 40 28 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 1 0
+fn=_dl_sysdep_start
+0 395 13 13 108 58 15 27 9 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 2 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 7 1 18 6 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 1 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 5 0
+fn=call_init
+0 307 5 5 105 31 0 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68242 7 7 23556 907 99 5915 73 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 63 63 289 102 19 128 44 14
+fn=do_lookup_x
+0 326670 13 13 104430 10226 504 46233 1368 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 1 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 2 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 23 4
+fn=handle_intel
+0 195 4 4 26 0 0 45 6 1
+fn=index
+0 687 2 2 62 27 7 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 5 3
+fn=init_tls
+0 86 4 4 22 10 1 14 4 0
+fn=intel_02_known_compare
+0 1218 1 1 528 25 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 5 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 1 0
+fn=match_symbol
+0 1251 4 4 465 90 24 144 3 0
+fn=memcpy
+0 862 6 6 143 0 0 119 44 15
+fn=mempcpy
+0 2443 6 6 384 19 1 305 38 11
+fn=memset
+0 1042 3 3 7 0 0 515 259 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 2 0
+fn=open_path
+0 2236 14 14 802 24 0 239 10 1
+fn=open_verify
+0 1879 11 11 604 23 7 325 26 4
+fn=openaux
+0 231 2 2 88 10 0 44 6 1
+fn=process_envvars
+0 230 9 9 74 8 4 16 9 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 105 3 3 6 5 1 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 1 0 2 1 1
+fn=strcmp
+0 110867 2 2 32622 235 20 0 0 0
+fn=strlen
+0 776 2 2 99 5 2 0 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 1 0 2 0 0
+summary: 1273787 700 694 302365 27165 4096 100676 5075 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testD1Cache/template_cachegrind_5300.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testD1Cache/template_cachegrind_5300.txt
new file mode 100644
index 0000000000..50e2cdedfa
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testD1Cache/template_cachegrind_5300.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 16384 B, 16 B, direct-mapped
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: XXXXXXXXXXXX/cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+26 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+27 4 0 0 0 0 0 2 0 0
+28 5 0 0 3 0 0 1 0 0
+29 3 0 0 1 0 0 1 0 0
+30 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+33 3 0 0 0 0 0 2 1 0
+34 5 0 0 3 0 0 1 0 0
+35 2 0 0 2 0 0 0 0 0
+fn=A::c()
+18 4 0 0 0 0 0 2 0 0
+19 3 0 0 0 0 0 1 0 0
+20 3 0 0 0 0 0 1 0 0
+21 4 0 0 3 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 0 0 0 0 0 3 0 0
+41 9 0 0 5 0 0 1 0 0
+42 2 0 0 2 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 0 0 0 0 0 4 1 0
+45 3 0 0 2 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0
+fn=main
+48 5 1 1 0 0 0 3 0 0
+49 3 0 0 0 0 0 1 0 0
+50 3 0 0 0 0 0 1 0 0
+51 4 0 0 0 0 0 1 0 0
+52 3 0 0 0 0 0 1 0 0
+53 1 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 1 1 3 0 0 3 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 3 0 17 0 0
+fn=???
+0 718 79 74 300 95 11 185 32 8
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 3 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 12 9 14 1 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 3 1
+fn=__cxa_finalize
+0 279 6 6 72 7 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 3 1
+fn=__libc_csu_init
+0 25 3 3 7 0 0 7 1 0
+fn=__libc_fini
+0 6 0 0 3 1 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 2 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 7 0 206 16 0
+fn=__new_exitfn
+0 111 6 6 30 7 5 10 3 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 1 0 104 18 1
+fn=__unregister_atfork
+0 32 2 2 12 4 1 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 5 0 10 3 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 9 0 18 3 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 112 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 34 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 7 0 204 19 2
+fn=_dl_check_all_versions
+0 124 3 3 19 4 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 105 15 403 112 28
+fn=_dl_debug_initialize
+0 76 3 3 24 8 1 4 1 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 2 1 11 1 0
+fn=_dl_discover_osversion
+0 87 4 4 12 2 1 4 2 1
+fn=_dl_fini
+0 409 12 12 134 46 0 43 9 0
+fn=_dl_fixup
+0 437 6 6 158 49 1 42 4 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 13 3
+fn=_dl_init
+0 104 5 5 25 11 0 15 1 0
+fn=_dl_init_paths
+0 1752 17 17 249 4 1 42 15 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 48 30 66 2 0
+fn=_dl_lookup_symbol_x
+0 525437 10 10 81620 6076 1065 27255 266 0
+fn=_dl_map_object
+0 2229 23 23 566 69 1 331 34 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 111 2 191 27 2
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 185 47 459 164 55
+fn=_dl_name_match_p
+0 5158 2 2 1384 190 0 798 14 2
+fn=_dl_new_object
+0 1241 13 13 237 13 8 231 91 36
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 43 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 1 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 5 0 8 1 0
+fn=_dl_receive_error
+0 28 2 2 10 5 0 12 1 0
+fn=_dl_relocate_object
+0 183682 36 36 47167 8100 2097 14356 2100 490
+fn=_dl_runtime_resolve
+0 126 2 2 54 2 0 48 1 0
+fn=_dl_setup_hash
+0 203 2 2 49 12 10 42 19 1
+fn=_dl_sort_fini
+0 666 6 6 172 23 0 24 0 0
+fn=_dl_start
+0 397 17 16 48 34 12 40 28 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 1 0
+fn=_dl_sysdep_start
+0 395 13 13 108 58 15 27 9 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 2 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 7 1 18 6 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 1 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 5 0
+fn=call_init
+0 307 5 5 105 31 0 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68242 7 7 23556 907 99 5915 73 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 63 63 289 102 19 128 44 14
+fn=do_lookup_x
+0 326670 13 13 104430 10226 504 46233 1368 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 1 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 2 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 23 4
+fn=handle_intel
+0 195 4 4 26 0 0 45 6 1
+fn=index
+0 687 2 2 62 27 7 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 5 3
+fn=init_tls
+0 86 4 4 22 10 1 14 4 0
+fn=intel_02_known_compare
+0 1218 1 1 528 25 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 5 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 1 0
+fn=match_symbol
+0 1251 4 4 465 90 24 144 3 0
+fn=memcpy
+0 862 6 6 143 0 0 119 44 15
+fn=mempcpy
+0 2443 6 6 384 19 1 305 38 11
+fn=memset
+0 1042 3 3 7 0 0 515 259 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 2 0
+fn=open_path
+0 2236 14 14 802 24 0 239 10 1
+fn=open_verify
+0 1879 11 11 604 23 7 325 26 4
+fn=openaux
+0 231 2 2 88 10 0 44 6 1
+fn=process_envvars
+0 230 9 9 74 8 4 16 9 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 105 3 3 6 5 1 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 1 0 2 1 1
+fn=strcmp
+0 110867 2 2 32622 235 20 0 0 0
+fn=strlen
+0 776 2 2 99 5 2 0 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 1 0 2 0 0
+summary: 1273787 700 694 302365 27165 4096 100676 5075 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testD1Cache/template_valgrind_5300.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testD1Cache/template_valgrind_5300.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testD1Cache/template_valgrind_5300.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDefaults/cachegrind_5885.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDefaults/cachegrind_5885.txt
new file mode 100644
index 0000000000..69564e6599
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDefaults/cachegrind_5885.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+26 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+27 4 0 0 0 0 0 2 0 0
+28 5 0 0 3 0 0 1 0 0
+29 3 0 0 1 0 0 1 0 0
+30 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+33 3 0 0 0 0 0 2 0 0
+34 5 0 0 3 0 0 1 0 0
+35 2 0 0 2 0 0 0 0 0
+fn=A::c()
+18 4 0 0 0 0 0 2 0 0
+19 3 0 0 0 0 0 1 0 0
+20 3 0 0 0 0 0 1 0 0
+21 4 0 0 3 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 0 0 0 0 0 3 0 0
+41 9 0 0 5 0 0 1 0 0
+42 2 0 0 2 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 0 0 0 0 0 4 0 0
+45 3 0 0 2 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0
+fn=main
+48 5 1 1 0 0 0 3 0 0
+49 3 0 0 0 0 0 1 0 0
+50 3 0 0 0 0 0 1 0 0
+51 4 0 0 0 0 0 1 0 0
+52 3 0 0 0 0 0 1 0 0
+53 1 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 1 1 3 0 0 3 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 0 17 0 0
+fn=???
+0 718 79 74 300 55 11 185 12 8
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 12 9 14 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 2 1
+fn=__libc_csu_init
+0 25 3 3 7 0 0 7 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 2 2 12 1 1 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 0 10 1 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 0 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 15 15 403 28 28
+fn=_dl_debug_initialize
+0 76 3 3 24 2 1 4 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 12 12 134 2 0 43 3 0
+fn=_dl_fixup
+0 437 6 6 158 34 1 42 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 5 5 25 3 0 15 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525437 10 10 81620 1224 1065 27255 2 0
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 2 191 3 2
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5158 2 2 1384 15 0 798 2 2
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 23 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183682 36 36 47167 2860 2097 14356 753 490
+fn=_dl_runtime_resolve
+0 126 2 2 54 0 0 48 0 0
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 6 6 172 5 0 24 0 0
+fn=_dl_start
+0 397 17 16 48 14 12 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 395 13 13 108 16 15 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 4 1 18 5 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 0
+fn=call_init
+0 307 5 5 105 17 0 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68242 7 7 23556 162 99 5915 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 63 63 289 32 19 128 14 14
+fn=do_lookup_x
+0 326670 13 13 104430 1862 504 46233 1 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1
+fn=index
+0 687 2 2 62 7 7 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3
+fn=init_tls
+0 86 4 4 22 2 1 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0
+fn=memcpy
+0 862 6 6 143 0 0 119 15 15
+fn=mempcpy
+0 2443 6 6 384 2 1 305 11 11
+fn=memset
+0 1042 3 3 7 0 0 515 67 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4
+fn=openaux
+0 231 2 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 105 3 3 6 2 1 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1
+fn=strcmp
+0 110867 2 2 32622 70 20 0 0 0
+fn=strlen
+0 776 2 2 99 2 2 0 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0
+summary: 1273787 700 694 302365 6648 4096 100676 1095 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDefaults/template_cachegrind_5885.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDefaults/template_cachegrind_5885.txt
new file mode 100644
index 0000000000..6ebabc9785
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDefaults/template_cachegrind_5885.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: XXXXXXXXXXXX/cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+26 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+27 4 0 0 0 0 0 2 0 0
+28 5 0 0 3 0 0 1 0 0
+29 3 0 0 1 0 0 1 0 0
+30 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+33 3 0 0 0 0 0 2 0 0
+34 5 0 0 3 0 0 1 0 0
+35 2 0 0 2 0 0 0 0 0
+fn=A::c()
+18 4 0 0 0 0 0 2 0 0
+19 3 0 0 0 0 0 1 0 0
+20 3 0 0 0 0 0 1 0 0
+21 4 0 0 3 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 0 0 0 0 0 3 0 0
+41 9 0 0 5 0 0 1 0 0
+42 2 0 0 2 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 0 0 0 0 0 4 0 0
+45 3 0 0 2 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0
+fn=main
+48 5 1 1 0 0 0 3 0 0
+49 3 0 0 0 0 0 1 0 0
+50 3 0 0 0 0 0 1 0 0
+51 4 0 0 0 0 0 1 0 0
+52 3 0 0 0 0 0 1 0 0
+53 1 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 1 1 3 0 0 3 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 0 17 0 0
+fn=???
+0 718 79 74 300 55 11 185 12 8
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 12 9 14 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 2 1
+fn=__libc_csu_init
+0 25 3 3 7 0 0 7 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 2 2 12 1 1 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 0 10 1 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 0 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 15 15 403 28 28
+fn=_dl_debug_initialize
+0 76 3 3 24 2 1 4 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 12 12 134 2 0 43 3 0
+fn=_dl_fixup
+0 437 6 6 158 34 1 42 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 5 5 25 3 0 15 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525437 10 10 81620 1224 1065 27255 2 0
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 2 191 3 2
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5158 2 2 1384 15 0 798 2 2
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 23 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183682 36 36 47167 2860 2097 14356 753 490
+fn=_dl_runtime_resolve
+0 126 2 2 54 0 0 48 0 0
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 6 6 172 5 0 24 0 0
+fn=_dl_start
+0 397 17 16 48 14 12 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 395 13 13 108 16 15 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 4 1 18 5 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 0
+fn=call_init
+0 307 5 5 105 17 0 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68242 7 7 23556 162 99 5915 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 63 63 289 32 19 128 14 14
+fn=do_lookup_x
+0 326670 13 13 104430 1862 504 46233 1 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1
+fn=index
+0 687 2 2 62 7 7 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3
+fn=init_tls
+0 86 4 4 22 2 1 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0
+fn=memcpy
+0 862 6 6 143 0 0 119 15 15
+fn=mempcpy
+0 2443 6 6 384 2 1 305 11 11
+fn=memset
+0 1042 3 3 7 0 0 515 67 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4
+fn=openaux
+0 231 2 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 105 3 3 6 2 1 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1
+fn=strcmp
+0 110867 2 2 32622 70 20 0 0 0
+fn=strlen
+0 776 2 2 99 2 2 0 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0
+summary: 1273787 700 694 302365 6648 4096 100676 1095 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDefaults/template_valgrind_5885.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDefaults/template_valgrind_5885.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDefaults/template_valgrind_5885.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDoubleClickFile/cachegrind_4919.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDoubleClickFile/cachegrind_4919.txt
new file mode 100644
index 0000000000..69564e6599
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDoubleClickFile/cachegrind_4919.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+26 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+27 4 0 0 0 0 0 2 0 0
+28 5 0 0 3 0 0 1 0 0
+29 3 0 0 1 0 0 1 0 0
+30 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+33 3 0 0 0 0 0 2 0 0
+34 5 0 0 3 0 0 1 0 0
+35 2 0 0 2 0 0 0 0 0
+fn=A::c()
+18 4 0 0 0 0 0 2 0 0
+19 3 0 0 0 0 0 1 0 0
+20 3 0 0 0 0 0 1 0 0
+21 4 0 0 3 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 0 0 0 0 0 3 0 0
+41 9 0 0 5 0 0 1 0 0
+42 2 0 0 2 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 0 0 0 0 0 4 0 0
+45 3 0 0 2 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0
+fn=main
+48 5 1 1 0 0 0 3 0 0
+49 3 0 0 0 0 0 1 0 0
+50 3 0 0 0 0 0 1 0 0
+51 4 0 0 0 0 0 1 0 0
+52 3 0 0 0 0 0 1 0 0
+53 1 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 1 1 3 0 0 3 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 0 17 0 0
+fn=???
+0 718 79 74 300 55 11 185 12 8
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 12 9 14 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 2 1
+fn=__libc_csu_init
+0 25 3 3 7 0 0 7 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 2 2 12 1 1 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 0 10 1 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 0 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 15 15 403 28 28
+fn=_dl_debug_initialize
+0 76 3 3 24 2 1 4 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 12 12 134 2 0 43 3 0
+fn=_dl_fixup
+0 437 6 6 158 34 1 42 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 5 5 25 3 0 15 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525437 10 10 81620 1224 1065 27255 2 0
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 2 191 3 2
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5158 2 2 1384 15 0 798 2 2
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 23 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183682 36 36 47167 2860 2097 14356 753 490
+fn=_dl_runtime_resolve
+0 126 2 2 54 0 0 48 0 0
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 6 6 172 5 0 24 0 0
+fn=_dl_start
+0 397 17 16 48 14 12 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 395 13 13 108 16 15 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 4 1 18 5 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 0
+fn=call_init
+0 307 5 5 105 17 0 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68242 7 7 23556 162 99 5915 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 63 63 289 32 19 128 14 14
+fn=do_lookup_x
+0 326670 13 13 104430 1862 504 46233 1 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1
+fn=index
+0 687 2 2 62 7 7 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3
+fn=init_tls
+0 86 4 4 22 2 1 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0
+fn=memcpy
+0 862 6 6 143 0 0 119 15 15
+fn=mempcpy
+0 2443 6 6 384 2 1 305 11 11
+fn=memset
+0 1042 3 3 7 0 0 515 67 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4
+fn=openaux
+0 231 2 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 105 3 3 6 2 1 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1
+fn=strcmp
+0 110867 2 2 32622 70 20 0 0 0
+fn=strlen
+0 776 2 2 99 2 2 0 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0
+summary: 1273787 700 694 302365 6648 4096 100676 1095 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDoubleClickFile/template_cachegrind_4919.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDoubleClickFile/template_cachegrind_4919.txt
new file mode 100644
index 0000000000..6ebabc9785
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDoubleClickFile/template_cachegrind_4919.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: XXXXXXXXXXXX/cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+26 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+27 4 0 0 0 0 0 2 0 0
+28 5 0 0 3 0 0 1 0 0
+29 3 0 0 1 0 0 1 0 0
+30 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+33 3 0 0 0 0 0 2 0 0
+34 5 0 0 3 0 0 1 0 0
+35 2 0 0 2 0 0 0 0 0
+fn=A::c()
+18 4 0 0 0 0 0 2 0 0
+19 3 0 0 0 0 0 1 0 0
+20 3 0 0 0 0 0 1 0 0
+21 4 0 0 3 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 0 0 0 0 0 3 0 0
+41 9 0 0 5 0 0 1 0 0
+42 2 0 0 2 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 0 0 0 0 0 4 0 0
+45 3 0 0 2 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0
+fn=main
+48 5 1 1 0 0 0 3 0 0
+49 3 0 0 0 0 0 1 0 0
+50 3 0 0 0 0 0 1 0 0
+51 4 0 0 0 0 0 1 0 0
+52 3 0 0 0 0 0 1 0 0
+53 1 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 1 1 3 0 0 3 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 0 17 0 0
+fn=???
+0 718 79 74 300 55 11 185 12 8
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 12 9 14 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 2 1
+fn=__libc_csu_init
+0 25 3 3 7 0 0 7 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 2 2 12 1 1 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 0 10 1 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 0 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 15 15 403 28 28
+fn=_dl_debug_initialize
+0 76 3 3 24 2 1 4 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 12 12 134 2 0 43 3 0
+fn=_dl_fixup
+0 437 6 6 158 34 1 42 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 5 5 25 3 0 15 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525437 10 10 81620 1224 1065 27255 2 0
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 2 191 3 2
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5158 2 2 1384 15 0 798 2 2
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 23 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183682 36 36 47167 2860 2097 14356 753 490
+fn=_dl_runtime_resolve
+0 126 2 2 54 0 0 48 0 0
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 6 6 172 5 0 24 0 0
+fn=_dl_start
+0 397 17 16 48 14 12 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 395 13 13 108 16 15 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 4 1 18 5 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 0
+fn=call_init
+0 307 5 5 105 17 0 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68242 7 7 23556 162 99 5915 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 63 63 289 32 19 128 14 14
+fn=do_lookup_x
+0 326670 13 13 104430 1862 504 46233 1 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1
+fn=index
+0 687 2 2 62 7 7 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3
+fn=init_tls
+0 86 4 4 22 2 1 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0
+fn=memcpy
+0 862 6 6 143 0 0 119 15 15
+fn=mempcpy
+0 2443 6 6 384 2 1 305 11 11
+fn=memset
+0 1042 3 3 7 0 0 515 67 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4
+fn=openaux
+0 231 2 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 105 3 3 6 2 1 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1
+fn=strcmp
+0 110867 2 2 32622 70 20 0 0 0
+fn=strlen
+0 776 2 2 99 2 2 0 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0
+summary: 1273787 700 694 302365 6648 4096 100676 1095 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDoubleClickFile/template_valgrind_4919.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDoubleClickFile/template_valgrind_4919.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDoubleClickFile/template_valgrind_4919.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDoubleClickFunction/cachegrind_5031.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDoubleClickFunction/cachegrind_5031.txt
new file mode 100644
index 0000000000..69564e6599
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDoubleClickFunction/cachegrind_5031.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+26 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+27 4 0 0 0 0 0 2 0 0
+28 5 0 0 3 0 0 1 0 0
+29 3 0 0 1 0 0 1 0 0
+30 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+33 3 0 0 0 0 0 2 0 0
+34 5 0 0 3 0 0 1 0 0
+35 2 0 0 2 0 0 0 0 0
+fn=A::c()
+18 4 0 0 0 0 0 2 0 0
+19 3 0 0 0 0 0 1 0 0
+20 3 0 0 0 0 0 1 0 0
+21 4 0 0 3 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 0 0 0 0 0 3 0 0
+41 9 0 0 5 0 0 1 0 0
+42 2 0 0 2 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 0 0 0 0 0 4 0 0
+45 3 0 0 2 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0
+fn=main
+48 5 1 1 0 0 0 3 0 0
+49 3 0 0 0 0 0 1 0 0
+50 3 0 0 0 0 0 1 0 0
+51 4 0 0 0 0 0 1 0 0
+52 3 0 0 0 0 0 1 0 0
+53 1 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 1 1 3 0 0 3 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 0 17 0 0
+fn=???
+0 718 79 74 300 55 11 185 12 8
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 12 9 14 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 2 1
+fn=__libc_csu_init
+0 25 3 3 7 0 0 7 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 2 2 12 1 1 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 0 10 1 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 0 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 15 15 403 28 28
+fn=_dl_debug_initialize
+0 76 3 3 24 2 1 4 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 12 12 134 2 0 43 3 0
+fn=_dl_fixup
+0 437 6 6 158 34 1 42 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 5 5 25 3 0 15 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525437 10 10 81620 1224 1065 27255 2 0
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 2 191 3 2
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5158 2 2 1384 15 0 798 2 2
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 23 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183682 36 36 47167 2860 2097 14356 753 490
+fn=_dl_runtime_resolve
+0 126 2 2 54 0 0 48 0 0
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 6 6 172 5 0 24 0 0
+fn=_dl_start
+0 397 17 16 48 14 12 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 395 13 13 108 16 15 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 4 1 18 5 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 0
+fn=call_init
+0 307 5 5 105 17 0 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68242 7 7 23556 162 99 5915 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 63 63 289 32 19 128 14 14
+fn=do_lookup_x
+0 326670 13 13 104430 1862 504 46233 1 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1
+fn=index
+0 687 2 2 62 7 7 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3
+fn=init_tls
+0 86 4 4 22 2 1 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0
+fn=memcpy
+0 862 6 6 143 0 0 119 15 15
+fn=mempcpy
+0 2443 6 6 384 2 1 305 11 11
+fn=memset
+0 1042 3 3 7 0 0 515 67 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4
+fn=openaux
+0 231 2 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 105 3 3 6 2 1 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1
+fn=strcmp
+0 110867 2 2 32622 70 20 0 0 0
+fn=strlen
+0 776 2 2 99 2 2 0 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0
+summary: 1273787 700 694 302365 6648 4096 100676 1095 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDoubleClickFunction/template_cachegrind_5031.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDoubleClickFunction/template_cachegrind_5031.txt
new file mode 100644
index 0000000000..6ebabc9785
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDoubleClickFunction/template_cachegrind_5031.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: XXXXXXXXXXXX/cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+26 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+27 4 0 0 0 0 0 2 0 0
+28 5 0 0 3 0 0 1 0 0
+29 3 0 0 1 0 0 1 0 0
+30 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+33 3 0 0 0 0 0 2 0 0
+34 5 0 0 3 0 0 1 0 0
+35 2 0 0 2 0 0 0 0 0
+fn=A::c()
+18 4 0 0 0 0 0 2 0 0
+19 3 0 0 0 0 0 1 0 0
+20 3 0 0 0 0 0 1 0 0
+21 4 0 0 3 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 0 0 0 0 0 3 0 0
+41 9 0 0 5 0 0 1 0 0
+42 2 0 0 2 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 0 0 0 0 0 4 0 0
+45 3 0 0 2 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0
+fn=main
+48 5 1 1 0 0 0 3 0 0
+49 3 0 0 0 0 0 1 0 0
+50 3 0 0 0 0 0 1 0 0
+51 4 0 0 0 0 0 1 0 0
+52 3 0 0 0 0 0 1 0 0
+53 1 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 1 1 3 0 0 3 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 0 17 0 0
+fn=???
+0 718 79 74 300 55 11 185 12 8
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 12 9 14 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 2 1
+fn=__libc_csu_init
+0 25 3 3 7 0 0 7 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 2 2 12 1 1 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 0 10 1 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 0 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 15 15 403 28 28
+fn=_dl_debug_initialize
+0 76 3 3 24 2 1 4 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 12 12 134 2 0 43 3 0
+fn=_dl_fixup
+0 437 6 6 158 34 1 42 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 5 5 25 3 0 15 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525437 10 10 81620 1224 1065 27255 2 0
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 2 191 3 2
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5158 2 2 1384 15 0 798 2 2
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 23 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183682 36 36 47167 2860 2097 14356 753 490
+fn=_dl_runtime_resolve
+0 126 2 2 54 0 0 48 0 0
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 6 6 172 5 0 24 0 0
+fn=_dl_start
+0 397 17 16 48 14 12 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 395 13 13 108 16 15 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 4 1 18 5 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 0
+fn=call_init
+0 307 5 5 105 17 0 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68242 7 7 23556 162 99 5915 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 63 63 289 32 19 128 14 14
+fn=do_lookup_x
+0 326670 13 13 104430 1862 504 46233 1 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1
+fn=index
+0 687 2 2 62 7 7 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3
+fn=init_tls
+0 86 4 4 22 2 1 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0
+fn=memcpy
+0 862 6 6 143 0 0 119 15 15
+fn=mempcpy
+0 2443 6 6 384 2 1 305 11 11
+fn=memset
+0 1042 3 3 7 0 0 515 67 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4
+fn=openaux
+0 231 2 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 105 3 3 6 2 1 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1
+fn=strcmp
+0 110867 2 2 32622 70 20 0 0 0
+fn=strlen
+0 776 2 2 99 2 2 0 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0
+summary: 1273787 700 694 302365 6648 4096 100676 1095 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDoubleClickFunction/template_valgrind_5031.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDoubleClickFunction/template_valgrind_5031.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testDoubleClickFunction/template_valgrind_5031.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testExec/cachegrind_5774.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testExec/cachegrind_5774.txt
new file mode 100644
index 0000000000..5b1f31c6ef
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testExec/cachegrind_5774.txt
@@ -0,0 +1,244 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/multiProcTest/Debug/multiProcTest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/multiProcTest/Debug/../parent.cpp
+fn=A::A()
+8 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+18 4 0 0 0 0 0 2 0 0
+19 5 0 0 3 0 0 1 0 0
+20 3 1 1 1 0 0 1 0 0
+21 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+24 3 0 0 0 0 0 2 0 0
+25 5 0 0 3 0 0 1 0 0
+26 2 0 0 2 0 0 0 0 0
+fn=A::c()
+9 4 0 0 0 0 0 2 0 0
+10 3 0 0 0 0 0 1 0 0
+11 3 0 0 0 0 0 1 0 0
+12 4 0 0 3 0 0 0 0 0
+13 2 0 0 2 0 0 0 0 0
+fn=main
+31 3 0 0 0 0 0 1 0 0
+32 5 1 1 0 0 0 1 0 0
+33 3 0 0 0 0 0 1 0 0
+34 4 0 0 0 0 0 1 0 0
+40 1 0 0 0 0 0 0 0 0
+41 2 0 0 2 0 0 0 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 0 17 0 0
+fn=???
+0 723 79 74 303 53 10 187 12 8
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 11 8 14 0 0
+fn=_IO_list_lock
+0 12 2 2 6 1 1 1 0 0
+fn=_IO_list_unlock
+0 11 1 1 4 0 0 2 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 2 1
+fn=__libc_csu_init
+0 25 2 2 7 0 0 7 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 2 2 12 0 0 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 0 10 1 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 0 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 14 14 403 28 28
+fn=_dl_debug_initialize
+0 76 3 3 24 2 1 4 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 12 12 134 2 0 43 3 0
+fn=_dl_fixup
+0 511 6 6 185 34 2 49 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 5 5 25 3 0 15 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525566 10 10 81654 1223 1065 27278 2 0
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 2 191 3 2
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5288 2 2 1419 15 0 818 2 2
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 23 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183718 36 36 47179 2861 2100 14356 753 490
+fn=_dl_runtime_resolve
+0 147 2 2 63 0 0 56 0 0
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 6 6 172 5 0 24 0 0
+fn=_dl_start
+0 397 17 16 48 14 12 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 395 13 13 108 16 15 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 4 1 18 5 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 0
+fn=call_init
+0 307 5 5 105 17 0 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68308 7 7 23580 165 102 5922 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 63 63 289 32 19 128 14 14
+fn=do_lookup_x
+0 327134 13 13 104586 1864 506 46308 1 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4
+fn=fork
+0 45 6 6 11 1 1 9 0 0
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1
+fn=index
+0 723 2 2 66 7 7 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3
+fn=init_tls
+0 86 4 4 22 3 1 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0
+fn=memcpy
+0 862 6 6 143 0 0 119 15 15
+fn=mempcpy
+0 2443 6 6 384 2 1 305 11 11
+fn=memset
+0 1042 3 3 7 0 0 515 67 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4
+fn=openaux
+0 231 2 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 123 3 3 7 3 1 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1
+fn=strcmp
+0 111123 2 2 32706 73 22 0 0 0
+fn=strlen
+0 800 2 2 103 2 2 0 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0
+summary: 1275078 708 702 302765 6655 4105 100816 1095 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testExec/cachegrind_5779.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testExec/cachegrind_5779.txt
new file mode 100644
index 0000000000..f476f42942
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testExec/cachegrind_5779.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: ../cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+26 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+27 4 0 0 0 0 0 2 0 0
+28 5 0 0 3 0 0 1 0 0
+29 3 0 0 1 0 0 1 0 0
+30 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+33 3 0 0 0 0 0 2 0 0
+34 5 0 0 3 0 0 1 0 0
+35 2 0 0 2 0 0 0 0 0
+fn=A::c()
+18 4 0 0 0 0 0 2 0 0
+19 3 0 0 0 0 0 1 0 0
+20 3 0 0 0 0 0 1 0 0
+21 4 0 0 3 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 0 0 0 0 0 3 0 0
+41 9 0 0 5 0 0 1 0 0
+42 2 0 0 2 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 0 0 0 0 0 4 0 0
+45 3 0 0 2 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0
+fn=main
+48 5 1 1 0 0 0 3 0 0
+49 3 0 0 0 0 0 1 0 0
+50 3 0 0 0 0 0 1 0 0
+51 4 0 0 0 0 0 1 0 0
+52 3 0 0 0 0 0 1 0 0
+53 1 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 1 1 3 0 0 3 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 0 17 0 0
+fn=???
+0 718 79 74 300 55 11 185 12 8
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 12 9 14 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 2 1
+fn=__libc_csu_init
+0 25 3 3 7 0 0 7 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 2 2 12 1 1 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 0 10 1 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 0 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 15 15 403 28 28
+fn=_dl_debug_initialize
+0 76 3 3 24 2 1 4 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 12 12 134 2 0 43 3 0
+fn=_dl_fixup
+0 437 6 6 158 34 1 42 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 5 5 25 3 0 15 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525437 10 10 81620 1224 1065 27255 2 0
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 2 191 3 2
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5158 2 2 1384 15 0 798 2 2
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 303 2 2 104 22 22 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183682 36 36 47167 2860 2097 14356 753 490
+fn=_dl_runtime_resolve
+0 126 2 2 54 0 0 48 0 0
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 6 6 172 5 0 24 0 0
+fn=_dl_start
+0 397 17 16 48 14 12 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 398 13 13 109 16 15 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 4 1 18 5 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 0
+fn=call_init
+0 307 5 5 105 17 0 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68242 7 7 23556 162 99 5915 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1135 63 63 291 32 19 129 14 14
+fn=do_lookup_x
+0 326670 13 13 104430 1862 504 46233 1 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1
+fn=index
+0 687 2 2 62 8 8 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3
+fn=init_tls
+0 86 4 4 22 2 1 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0
+fn=memcpy
+0 870 6 6 144 0 0 120 15 15
+fn=mempcpy
+0 2443 6 6 384 2 1 305 11 11
+fn=memset
+0 1042 3 3 7 0 0 515 67 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4
+fn=openaux
+0 231 2 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 52 3 3 3 1 0 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1
+fn=strcmp
+0 110867 2 2 32622 70 20 0 0 0
+fn=strlen
+0 776 2 2 99 2 2 0 0 0
+fn=strsep
+0 5185 3 3 826 0 0 10 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0
+summary: 1273789 700 694 302373 6647 4095 100680 1095 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testExec/template_cachegrind_5774.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testExec/template_cachegrind_5774.txt
new file mode 100644
index 0000000000..2c6ddb24af
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testExec/template_cachegrind_5774.txt
@@ -0,0 +1,244 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: XXXXXXXXXXXX/multiProcTest/Debug/multiProcTest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=XXXXXXXXXXXX/multiProcTest/Debug/../parent.cpp
+fn=A::A()
+8 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+18 4 0 0 0 0 0 2 0 0
+19 5 0 0 3 0 0 1 0 0
+20 3 1 1 1 0 0 1 0 0
+21 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+24 3 0 0 0 0 0 2 0 0
+25 5 0 0 3 0 0 1 0 0
+26 2 0 0 2 0 0 0 0 0
+fn=A::c()
+9 4 0 0 0 0 0 2 0 0
+10 3 0 0 0 0 0 1 0 0
+11 3 0 0 0 0 0 1 0 0
+12 4 0 0 3 0 0 0 0 0
+13 2 0 0 2 0 0 0 0 0
+fn=main
+31 3 0 0 0 0 0 1 0 0
+32 5 1 1 0 0 0 1 0 0
+33 3 0 0 0 0 0 1 0 0
+34 4 0 0 0 0 0 1 0 0
+40 1 0 0 0 0 0 0 0 0
+41 2 0 0 2 0 0 0 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 0 17 0 0
+fn=???
+0 723 79 74 303 53 10 187 12 8
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 11 8 14 0 0
+fn=_IO_list_lock
+0 12 2 2 6 1 1 1 0 0
+fn=_IO_list_unlock
+0 11 1 1 4 0 0 2 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 2 1
+fn=__libc_csu_init
+0 25 2 2 7 0 0 7 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 2 2 12 0 0 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 0 10 1 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 0 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 14 14 403 28 28
+fn=_dl_debug_initialize
+0 76 3 3 24 2 1 4 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 12 12 134 2 0 43 3 0
+fn=_dl_fixup
+0 511 6 6 185 34 2 49 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 5 5 25 3 0 15 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525566 10 10 81654 1223 1065 27278 2 0
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 2 191 3 2
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5288 2 2 1419 15 0 818 2 2
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 23 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183718 36 36 47179 2861 2100 14356 753 490
+fn=_dl_runtime_resolve
+0 147 2 2 63 0 0 56 0 0
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 6 6 172 5 0 24 0 0
+fn=_dl_start
+0 397 17 16 48 14 12 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 395 13 13 108 16 15 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 4 1 18 5 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 0
+fn=call_init
+0 307 5 5 105 17 0 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68308 7 7 23580 165 102 5922 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 63 63 289 32 19 128 14 14
+fn=do_lookup_x
+0 327134 13 13 104586 1864 506 46308 1 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4
+fn=fork
+0 45 6 6 11 1 1 9 0 0
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1
+fn=index
+0 723 2 2 66 7 7 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3
+fn=init_tls
+0 86 4 4 22 3 1 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0
+fn=memcpy
+0 862 6 6 143 0 0 119 15 15
+fn=mempcpy
+0 2443 6 6 384 2 1 305 11 11
+fn=memset
+0 1042 3 3 7 0 0 515 67 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4
+fn=openaux
+0 231 2 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 123 3 3 7 3 1 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1
+fn=strcmp
+0 111123 2 2 32706 73 22 0 0 0
+fn=strlen
+0 800 2 2 103 2 2 0 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0
+summary: 1275078 708 702 302765 6655 4105 100816 1095 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testExec/template_cachegrind_5779.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testExec/template_cachegrind_5779.txt
new file mode 100644
index 0000000000..1c726b97b1
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testExec/template_cachegrind_5779.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: ../cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+26 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+27 4 0 0 0 0 0 2 0 0
+28 5 0 0 3 0 0 1 0 0
+29 3 0 0 1 0 0 1 0 0
+30 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+33 3 0 0 0 0 0 2 0 0
+34 5 0 0 3 0 0 1 0 0
+35 2 0 0 2 0 0 0 0 0
+fn=A::c()
+18 4 0 0 0 0 0 2 0 0
+19 3 0 0 0 0 0 1 0 0
+20 3 0 0 0 0 0 1 0 0
+21 4 0 0 3 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 0 0 0 0 0 3 0 0
+41 9 0 0 5 0 0 1 0 0
+42 2 0 0 2 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 0 0 0 0 0 4 0 0
+45 3 0 0 2 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0
+fn=main
+48 5 1 1 0 0 0 3 0 0
+49 3 0 0 0 0 0 1 0 0
+50 3 0 0 0 0 0 1 0 0
+51 4 0 0 0 0 0 1 0 0
+52 3 0 0 0 0 0 1 0 0
+53 1 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 1 1 3 0 0 3 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 0 17 0 0
+fn=???
+0 718 79 74 300 55 11 185 12 8
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 12 9 14 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 2 1
+fn=__libc_csu_init
+0 25 3 3 7 0 0 7 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 2 2 12 1 1 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 0 10 1 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 0 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 15 15 403 28 28
+fn=_dl_debug_initialize
+0 76 3 3 24 2 1 4 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 12 12 134 2 0 43 3 0
+fn=_dl_fixup
+0 437 6 6 158 34 1 42 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 5 5 25 3 0 15 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525437 10 10 81620 1224 1065 27255 2 0
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 2 191 3 2
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5158 2 2 1384 15 0 798 2 2
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 303 2 2 104 22 22 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183682 36 36 47167 2860 2097 14356 753 490
+fn=_dl_runtime_resolve
+0 126 2 2 54 0 0 48 0 0
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 6 6 172 5 0 24 0 0
+fn=_dl_start
+0 397 17 16 48 14 12 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 398 13 13 109 16 15 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 4 1 18 5 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 0
+fn=call_init
+0 307 5 5 105 17 0 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68242 7 7 23556 162 99 5915 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1135 63 63 291 32 19 129 14 14
+fn=do_lookup_x
+0 326670 13 13 104430 1862 504 46233 1 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1
+fn=index
+0 687 2 2 62 8 8 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3
+fn=init_tls
+0 86 4 4 22 2 1 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0
+fn=memcpy
+0 870 6 6 144 0 0 120 15 15
+fn=mempcpy
+0 2443 6 6 384 2 1 305 11 11
+fn=memset
+0 1042 3 3 7 0 0 515 67 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4
+fn=openaux
+0 231 2 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 52 3 3 3 1 0 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1
+fn=strcmp
+0 110867 2 2 32622 70 20 0 0 0
+fn=strlen
+0 776 2 2 99 2 2 0 0 0
+fn=strsep
+0 5185 3 3 826 0 0 10 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0
+summary: 1273789 700 694 302373 6647 4095 100680 1095 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testExec/template_valgrind_5774.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testExec/template_valgrind_5774.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testExec/template_valgrind_5774.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testExec/template_valgrind_5779.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testExec/template_valgrind_5779.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testExec/template_valgrind_5779.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileLabelsCPP/cachegrind_4644.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileLabelsCPP/cachegrind_4644.txt
new file mode 100644
index 0000000000..69564e6599
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileLabelsCPP/cachegrind_4644.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+26 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+27 4 0 0 0 0 0 2 0 0
+28 5 0 0 3 0 0 1 0 0
+29 3 0 0 1 0 0 1 0 0
+30 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+33 3 0 0 0 0 0 2 0 0
+34 5 0 0 3 0 0 1 0 0
+35 2 0 0 2 0 0 0 0 0
+fn=A::c()
+18 4 0 0 0 0 0 2 0 0
+19 3 0 0 0 0 0 1 0 0
+20 3 0 0 0 0 0 1 0 0
+21 4 0 0 3 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 0 0 0 0 0 3 0 0
+41 9 0 0 5 0 0 1 0 0
+42 2 0 0 2 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 0 0 0 0 0 4 0 0
+45 3 0 0 2 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0
+fn=main
+48 5 1 1 0 0 0 3 0 0
+49 3 0 0 0 0 0 1 0 0
+50 3 0 0 0 0 0 1 0 0
+51 4 0 0 0 0 0 1 0 0
+52 3 0 0 0 0 0 1 0 0
+53 1 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 1 1 3 0 0 3 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 0 17 0 0
+fn=???
+0 718 79 74 300 55 11 185 12 8
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 12 9 14 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 2 1
+fn=__libc_csu_init
+0 25 3 3 7 0 0 7 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 2 2 12 1 1 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 0 10 1 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 0 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 15 15 403 28 28
+fn=_dl_debug_initialize
+0 76 3 3 24 2 1 4 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 12 12 134 2 0 43 3 0
+fn=_dl_fixup
+0 437 6 6 158 34 1 42 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 5 5 25 3 0 15 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525437 10 10 81620 1224 1065 27255 2 0
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 2 191 3 2
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5158 2 2 1384 15 0 798 2 2
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 23 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183682 36 36 47167 2860 2097 14356 753 490
+fn=_dl_runtime_resolve
+0 126 2 2 54 0 0 48 0 0
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 6 6 172 5 0 24 0 0
+fn=_dl_start
+0 397 17 16 48 14 12 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 395 13 13 108 16 15 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 4 1 18 5 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 0
+fn=call_init
+0 307 5 5 105 17 0 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68242 7 7 23556 162 99 5915 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 63 63 289 32 19 128 14 14
+fn=do_lookup_x
+0 326670 13 13 104430 1862 504 46233 1 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1
+fn=index
+0 687 2 2 62 7 7 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3
+fn=init_tls
+0 86 4 4 22 2 1 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0
+fn=memcpy
+0 862 6 6 143 0 0 119 15 15
+fn=mempcpy
+0 2443 6 6 384 2 1 305 11 11
+fn=memset
+0 1042 3 3 7 0 0 515 67 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4
+fn=openaux
+0 231 2 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 105 3 3 6 2 1 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1
+fn=strcmp
+0 110867 2 2 32622 70 20 0 0 0
+fn=strlen
+0 776 2 2 99 2 2 0 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0
+summary: 1273787 700 694 302365 6648 4096 100676 1095 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileLabelsCPP/template_cachegrind_4644.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileLabelsCPP/template_cachegrind_4644.txt
new file mode 100644
index 0000000000..6ebabc9785
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileLabelsCPP/template_cachegrind_4644.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: XXXXXXXXXXXX/cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+26 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+27 4 0 0 0 0 0 2 0 0
+28 5 0 0 3 0 0 1 0 0
+29 3 0 0 1 0 0 1 0 0
+30 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+33 3 0 0 0 0 0 2 0 0
+34 5 0 0 3 0 0 1 0 0
+35 2 0 0 2 0 0 0 0 0
+fn=A::c()
+18 4 0 0 0 0 0 2 0 0
+19 3 0 0 0 0 0 1 0 0
+20 3 0 0 0 0 0 1 0 0
+21 4 0 0 3 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 0 0 0 0 0 3 0 0
+41 9 0 0 5 0 0 1 0 0
+42 2 0 0 2 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 0 0 0 0 0 4 0 0
+45 3 0 0 2 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0
+fn=main
+48 5 1 1 0 0 0 3 0 0
+49 3 0 0 0 0 0 1 0 0
+50 3 0 0 0 0 0 1 0 0
+51 4 0 0 0 0 0 1 0 0
+52 3 0 0 0 0 0 1 0 0
+53 1 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 1 1 3 0 0 3 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 0 17 0 0
+fn=???
+0 718 79 74 300 55 11 185 12 8
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 12 9 14 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 2 1
+fn=__libc_csu_init
+0 25 3 3 7 0 0 7 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 2 2 12 1 1 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 0 10 1 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 0 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 15 15 403 28 28
+fn=_dl_debug_initialize
+0 76 3 3 24 2 1 4 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 12 12 134 2 0 43 3 0
+fn=_dl_fixup
+0 437 6 6 158 34 1 42 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 5 5 25 3 0 15 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525437 10 10 81620 1224 1065 27255 2 0
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 2 191 3 2
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5158 2 2 1384 15 0 798 2 2
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 23 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183682 36 36 47167 2860 2097 14356 753 490
+fn=_dl_runtime_resolve
+0 126 2 2 54 0 0 48 0 0
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 6 6 172 5 0 24 0 0
+fn=_dl_start
+0 397 17 16 48 14 12 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 395 13 13 108 16 15 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 4 1 18 5 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 0
+fn=call_init
+0 307 5 5 105 17 0 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68242 7 7 23556 162 99 5915 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 63 63 289 32 19 128 14 14
+fn=do_lookup_x
+0 326670 13 13 104430 1862 504 46233 1 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1
+fn=index
+0 687 2 2 62 7 7 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3
+fn=init_tls
+0 86 4 4 22 2 1 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0
+fn=memcpy
+0 862 6 6 143 0 0 119 15 15
+fn=mempcpy
+0 2443 6 6 384 2 1 305 11 11
+fn=memset
+0 1042 3 3 7 0 0 515 67 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4
+fn=openaux
+0 231 2 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 105 3 3 6 2 1 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1
+fn=strcmp
+0 110867 2 2 32622 70 20 0 0 0
+fn=strlen
+0 776 2 2 99 2 2 0 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0
+summary: 1273787 700 694 302365 6648 4096 100676 1095 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileLabelsCPP/template_valgrind_4644.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileLabelsCPP/template_valgrind_4644.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileLabelsCPP/template_valgrind_4644.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileLabelsH/cachegrind_4699.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileLabelsH/cachegrind_4699.txt
new file mode 100644
index 0000000000..69564e6599
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileLabelsH/cachegrind_4699.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+26 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+27 4 0 0 0 0 0 2 0 0
+28 5 0 0 3 0 0 1 0 0
+29 3 0 0 1 0 0 1 0 0
+30 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+33 3 0 0 0 0 0 2 0 0
+34 5 0 0 3 0 0 1 0 0
+35 2 0 0 2 0 0 0 0 0
+fn=A::c()
+18 4 0 0 0 0 0 2 0 0
+19 3 0 0 0 0 0 1 0 0
+20 3 0 0 0 0 0 1 0 0
+21 4 0 0 3 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 0 0 0 0 0 3 0 0
+41 9 0 0 5 0 0 1 0 0
+42 2 0 0 2 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 0 0 0 0 0 4 0 0
+45 3 0 0 2 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0
+fn=main
+48 5 1 1 0 0 0 3 0 0
+49 3 0 0 0 0 0 1 0 0
+50 3 0 0 0 0 0 1 0 0
+51 4 0 0 0 0 0 1 0 0
+52 3 0 0 0 0 0 1 0 0
+53 1 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 1 1 3 0 0 3 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 0 17 0 0
+fn=???
+0 718 79 74 300 55 11 185 12 8
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 12 9 14 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 2 1
+fn=__libc_csu_init
+0 25 3 3 7 0 0 7 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 2 2 12 1 1 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 0 10 1 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 0 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 15 15 403 28 28
+fn=_dl_debug_initialize
+0 76 3 3 24 2 1 4 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 12 12 134 2 0 43 3 0
+fn=_dl_fixup
+0 437 6 6 158 34 1 42 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 5 5 25 3 0 15 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525437 10 10 81620 1224 1065 27255 2 0
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 2 191 3 2
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5158 2 2 1384 15 0 798 2 2
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 23 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183682 36 36 47167 2860 2097 14356 753 490
+fn=_dl_runtime_resolve
+0 126 2 2 54 0 0 48 0 0
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 6 6 172 5 0 24 0 0
+fn=_dl_start
+0 397 17 16 48 14 12 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 395 13 13 108 16 15 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 4 1 18 5 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 0
+fn=call_init
+0 307 5 5 105 17 0 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68242 7 7 23556 162 99 5915 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 63 63 289 32 19 128 14 14
+fn=do_lookup_x
+0 326670 13 13 104430 1862 504 46233 1 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1
+fn=index
+0 687 2 2 62 7 7 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3
+fn=init_tls
+0 86 4 4 22 2 1 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0
+fn=memcpy
+0 862 6 6 143 0 0 119 15 15
+fn=mempcpy
+0 2443 6 6 384 2 1 305 11 11
+fn=memset
+0 1042 3 3 7 0 0 515 67 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4
+fn=openaux
+0 231 2 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 105 3 3 6 2 1 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1
+fn=strcmp
+0 110867 2 2 32622 70 20 0 0 0
+fn=strlen
+0 776 2 2 99 2 2 0 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0
+summary: 1273787 700 694 302365 6648 4096 100676 1095 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileLabelsH/template_cachegrind_4699.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileLabelsH/template_cachegrind_4699.txt
new file mode 100644
index 0000000000..6ebabc9785
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileLabelsH/template_cachegrind_4699.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: XXXXXXXXXXXX/cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+26 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+27 4 0 0 0 0 0 2 0 0
+28 5 0 0 3 0 0 1 0 0
+29 3 0 0 1 0 0 1 0 0
+30 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+33 3 0 0 0 0 0 2 0 0
+34 5 0 0 3 0 0 1 0 0
+35 2 0 0 2 0 0 0 0 0
+fn=A::c()
+18 4 0 0 0 0 0 2 0 0
+19 3 0 0 0 0 0 1 0 0
+20 3 0 0 0 0 0 1 0 0
+21 4 0 0 3 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 0 0 0 0 0 3 0 0
+41 9 0 0 5 0 0 1 0 0
+42 2 0 0 2 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 0 0 0 0 0 4 0 0
+45 3 0 0 2 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0
+fn=main
+48 5 1 1 0 0 0 3 0 0
+49 3 0 0 0 0 0 1 0 0
+50 3 0 0 0 0 0 1 0 0
+51 4 0 0 0 0 0 1 0 0
+52 3 0 0 0 0 0 1 0 0
+53 1 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 1 1 3 0 0 3 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 0 17 0 0
+fn=???
+0 718 79 74 300 55 11 185 12 8
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 12 9 14 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 2 1
+fn=__libc_csu_init
+0 25 3 3 7 0 0 7 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 2 2 12 1 1 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 0 10 1 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 0 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 15 15 403 28 28
+fn=_dl_debug_initialize
+0 76 3 3 24 2 1 4 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 12 12 134 2 0 43 3 0
+fn=_dl_fixup
+0 437 6 6 158 34 1 42 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 5 5 25 3 0 15 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525437 10 10 81620 1224 1065 27255 2 0
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 2 191 3 2
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5158 2 2 1384 15 0 798 2 2
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 23 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183682 36 36 47167 2860 2097 14356 753 490
+fn=_dl_runtime_resolve
+0 126 2 2 54 0 0 48 0 0
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 6 6 172 5 0 24 0 0
+fn=_dl_start
+0 397 17 16 48 14 12 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 395 13 13 108 16 15 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 4 1 18 5 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 0
+fn=call_init
+0 307 5 5 105 17 0 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68242 7 7 23556 162 99 5915 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 63 63 289 32 19 128 14 14
+fn=do_lookup_x
+0 326670 13 13 104430 1862 504 46233 1 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1
+fn=index
+0 687 2 2 62 7 7 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3
+fn=init_tls
+0 86 4 4 22 2 1 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0
+fn=memcpy
+0 862 6 6 143 0 0 119 15 15
+fn=mempcpy
+0 2443 6 6 384 2 1 305 11 11
+fn=memset
+0 1042 3 3 7 0 0 515 67 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4
+fn=openaux
+0 231 2 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 105 3 3 6 2 1 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1
+fn=strcmp
+0 110867 2 2 32622 70 20 0 0 0
+fn=strlen
+0 776 2 2 99 2 2 0 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0
+summary: 1273787 700 694 302365 6648 4096 100676 1095 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileLabelsH/template_valgrind_4699.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileLabelsH/template_valgrind_4699.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileLabelsH/template_valgrind_4699.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileNames/cachegrind_4534.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileNames/cachegrind_4534.txt
new file mode 100644
index 0000000000..69564e6599
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileNames/cachegrind_4534.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+26 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+27 4 0 0 0 0 0 2 0 0
+28 5 0 0 3 0 0 1 0 0
+29 3 0 0 1 0 0 1 0 0
+30 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+33 3 0 0 0 0 0 2 0 0
+34 5 0 0 3 0 0 1 0 0
+35 2 0 0 2 0 0 0 0 0
+fn=A::c()
+18 4 0 0 0 0 0 2 0 0
+19 3 0 0 0 0 0 1 0 0
+20 3 0 0 0 0 0 1 0 0
+21 4 0 0 3 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 0 0 0 0 0 3 0 0
+41 9 0 0 5 0 0 1 0 0
+42 2 0 0 2 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 0 0 0 0 0 4 0 0
+45 3 0 0 2 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0
+fn=main
+48 5 1 1 0 0 0 3 0 0
+49 3 0 0 0 0 0 1 0 0
+50 3 0 0 0 0 0 1 0 0
+51 4 0 0 0 0 0 1 0 0
+52 3 0 0 0 0 0 1 0 0
+53 1 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 1 1 3 0 0 3 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 0 17 0 0
+fn=???
+0 718 79 74 300 55 11 185 12 8
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 12 9 14 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 2 1
+fn=__libc_csu_init
+0 25 3 3 7 0 0 7 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 2 2 12 1 1 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 0 10 1 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 0 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 15 15 403 28 28
+fn=_dl_debug_initialize
+0 76 3 3 24 2 1 4 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 12 12 134 2 0 43 3 0
+fn=_dl_fixup
+0 437 6 6 158 34 1 42 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 5 5 25 3 0 15 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525437 10 10 81620 1224 1065 27255 2 0
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 2 191 3 2
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5158 2 2 1384 15 0 798 2 2
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 23 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183682 36 36 47167 2860 2097 14356 753 490
+fn=_dl_runtime_resolve
+0 126 2 2 54 0 0 48 0 0
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 6 6 172 5 0 24 0 0
+fn=_dl_start
+0 397 17 16 48 14 12 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 395 13 13 108 16 15 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 4 1 18 5 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 0
+fn=call_init
+0 307 5 5 105 17 0 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68242 7 7 23556 162 99 5915 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 63 63 289 32 19 128 14 14
+fn=do_lookup_x
+0 326670 13 13 104430 1862 504 46233 1 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1
+fn=index
+0 687 2 2 62 7 7 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3
+fn=init_tls
+0 86 4 4 22 2 1 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0
+fn=memcpy
+0 862 6 6 143 0 0 119 15 15
+fn=mempcpy
+0 2443 6 6 384 2 1 305 11 11
+fn=memset
+0 1042 3 3 7 0 0 515 67 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4
+fn=openaux
+0 231 2 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 105 3 3 6 2 1 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1
+fn=strcmp
+0 110867 2 2 32622 70 20 0 0 0
+fn=strlen
+0 776 2 2 99 2 2 0 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0
+summary: 1273787 700 694 302365 6648 4096 100676 1095 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileNames/template_cachegrind_4534.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileNames/template_cachegrind_4534.txt
new file mode 100644
index 0000000000..6ebabc9785
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileNames/template_cachegrind_4534.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: XXXXXXXXXXXX/cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+26 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+27 4 0 0 0 0 0 2 0 0
+28 5 0 0 3 0 0 1 0 0
+29 3 0 0 1 0 0 1 0 0
+30 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+33 3 0 0 0 0 0 2 0 0
+34 5 0 0 3 0 0 1 0 0
+35 2 0 0 2 0 0 0 0 0
+fn=A::c()
+18 4 0 0 0 0 0 2 0 0
+19 3 0 0 0 0 0 1 0 0
+20 3 0 0 0 0 0 1 0 0
+21 4 0 0 3 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 0 0 0 0 0 3 0 0
+41 9 0 0 5 0 0 1 0 0
+42 2 0 0 2 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 0 0 0 0 0 4 0 0
+45 3 0 0 2 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0
+fn=main
+48 5 1 1 0 0 0 3 0 0
+49 3 0 0 0 0 0 1 0 0
+50 3 0 0 0 0 0 1 0 0
+51 4 0 0 0 0 0 1 0 0
+52 3 0 0 0 0 0 1 0 0
+53 1 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 1 1 3 0 0 3 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 0 17 0 0
+fn=???
+0 718 79 74 300 55 11 185 12 8
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 12 9 14 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 2 1
+fn=__libc_csu_init
+0 25 3 3 7 0 0 7 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 2 2 12 1 1 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 0 10 1 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 0 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 15 15 403 28 28
+fn=_dl_debug_initialize
+0 76 3 3 24 2 1 4 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 12 12 134 2 0 43 3 0
+fn=_dl_fixup
+0 437 6 6 158 34 1 42 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 5 5 25 3 0 15 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525437 10 10 81620 1224 1065 27255 2 0
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 2 191 3 2
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5158 2 2 1384 15 0 798 2 2
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 23 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183682 36 36 47167 2860 2097 14356 753 490
+fn=_dl_runtime_resolve
+0 126 2 2 54 0 0 48 0 0
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 6 6 172 5 0 24 0 0
+fn=_dl_start
+0 397 17 16 48 14 12 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 395 13 13 108 16 15 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 4 1 18 5 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 0
+fn=call_init
+0 307 5 5 105 17 0 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68242 7 7 23556 162 99 5915 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 63 63 289 32 19 128 14 14
+fn=do_lookup_x
+0 326670 13 13 104430 1862 504 46233 1 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1
+fn=index
+0 687 2 2 62 7 7 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3
+fn=init_tls
+0 86 4 4 22 2 1 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0
+fn=memcpy
+0 862 6 6 143 0 0 119 15 15
+fn=mempcpy
+0 2443 6 6 384 2 1 305 11 11
+fn=memset
+0 1042 3 3 7 0 0 515 67 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4
+fn=openaux
+0 231 2 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 105 3 3 6 2 1 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1
+fn=strcmp
+0 110867 2 2 32622 70 20 0 0 0
+fn=strlen
+0 776 2 2 99 2 2 0 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0
+summary: 1273787 700 694 302365 6648 4096 100676 1095 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileNames/template_valgrind_4534.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileNames/template_valgrind_4534.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFileNames/template_valgrind_4534.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFunctionLabel/cachegrind_4754.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFunctionLabel/cachegrind_4754.txt
new file mode 100644
index 0000000000..69564e6599
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFunctionLabel/cachegrind_4754.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+26 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+27 4 0 0 0 0 0 2 0 0
+28 5 0 0 3 0 0 1 0 0
+29 3 0 0 1 0 0 1 0 0
+30 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+33 3 0 0 0 0 0 2 0 0
+34 5 0 0 3 0 0 1 0 0
+35 2 0 0 2 0 0 0 0 0
+fn=A::c()
+18 4 0 0 0 0 0 2 0 0
+19 3 0 0 0 0 0 1 0 0
+20 3 0 0 0 0 0 1 0 0
+21 4 0 0 3 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 0 0 0 0 0 3 0 0
+41 9 0 0 5 0 0 1 0 0
+42 2 0 0 2 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 0 0 0 0 0 4 0 0
+45 3 0 0 2 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0
+fn=main
+48 5 1 1 0 0 0 3 0 0
+49 3 0 0 0 0 0 1 0 0
+50 3 0 0 0 0 0 1 0 0
+51 4 0 0 0 0 0 1 0 0
+52 3 0 0 0 0 0 1 0 0
+53 1 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 1 1 3 0 0 3 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 0 17 0 0
+fn=???
+0 718 79 74 300 55 11 185 12 8
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 12 9 14 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 2 1
+fn=__libc_csu_init
+0 25 3 3 7 0 0 7 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 2 2 12 1 1 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 0 10 1 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 0 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 15 15 403 28 28
+fn=_dl_debug_initialize
+0 76 3 3 24 2 1 4 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 12 12 134 2 0 43 3 0
+fn=_dl_fixup
+0 437 6 6 158 34 1 42 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 5 5 25 3 0 15 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525437 10 10 81620 1224 1065 27255 2 0
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 2 191 3 2
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5158 2 2 1384 15 0 798 2 2
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 23 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183682 36 36 47167 2860 2097 14356 753 490
+fn=_dl_runtime_resolve
+0 126 2 2 54 0 0 48 0 0
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 6 6 172 5 0 24 0 0
+fn=_dl_start
+0 397 17 16 48 14 12 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 395 13 13 108 16 15 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 4 1 18 5 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 0
+fn=call_init
+0 307 5 5 105 17 0 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68242 7 7 23556 162 99 5915 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 63 63 289 32 19 128 14 14
+fn=do_lookup_x
+0 326670 13 13 104430 1862 504 46233 1 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1
+fn=index
+0 687 2 2 62 7 7 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3
+fn=init_tls
+0 86 4 4 22 2 1 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0
+fn=memcpy
+0 862 6 6 143 0 0 119 15 15
+fn=mempcpy
+0 2443 6 6 384 2 1 305 11 11
+fn=memset
+0 1042 3 3 7 0 0 515 67 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4
+fn=openaux
+0 231 2 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 105 3 3 6 2 1 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1
+fn=strcmp
+0 110867 2 2 32622 70 20 0 0 0
+fn=strlen
+0 776 2 2 99 2 2 0 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0
+summary: 1273787 700 694 302365 6648 4096 100676 1095 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFunctionLabel/template_cachegrind_4754.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFunctionLabel/template_cachegrind_4754.txt
new file mode 100644
index 0000000000..6ebabc9785
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFunctionLabel/template_cachegrind_4754.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: XXXXXXXXXXXX/cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+26 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+27 4 0 0 0 0 0 2 0 0
+28 5 0 0 3 0 0 1 0 0
+29 3 0 0 1 0 0 1 0 0
+30 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+33 3 0 0 0 0 0 2 0 0
+34 5 0 0 3 0 0 1 0 0
+35 2 0 0 2 0 0 0 0 0
+fn=A::c()
+18 4 0 0 0 0 0 2 0 0
+19 3 0 0 0 0 0 1 0 0
+20 3 0 0 0 0 0 1 0 0
+21 4 0 0 3 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 0 0 0 0 0 3 0 0
+41 9 0 0 5 0 0 1 0 0
+42 2 0 0 2 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 0 0 0 0 0 4 0 0
+45 3 0 0 2 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0
+fn=main
+48 5 1 1 0 0 0 3 0 0
+49 3 0 0 0 0 0 1 0 0
+50 3 0 0 0 0 0 1 0 0
+51 4 0 0 0 0 0 1 0 0
+52 3 0 0 0 0 0 1 0 0
+53 1 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 1 1 3 0 0 3 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 0 17 0 0
+fn=???
+0 718 79 74 300 55 11 185 12 8
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 12 9 14 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 2 1
+fn=__libc_csu_init
+0 25 3 3 7 0 0 7 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 2 2 12 1 1 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 0 10 1 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 0 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 15 15 403 28 28
+fn=_dl_debug_initialize
+0 76 3 3 24 2 1 4 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 12 12 134 2 0 43 3 0
+fn=_dl_fixup
+0 437 6 6 158 34 1 42 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 5 5 25 3 0 15 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525437 10 10 81620 1224 1065 27255 2 0
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 2 191 3 2
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5158 2 2 1384 15 0 798 2 2
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 23 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183682 36 36 47167 2860 2097 14356 753 490
+fn=_dl_runtime_resolve
+0 126 2 2 54 0 0 48 0 0
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 6 6 172 5 0 24 0 0
+fn=_dl_start
+0 397 17 16 48 14 12 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 395 13 13 108 16 15 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 4 1 18 5 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 0
+fn=call_init
+0 307 5 5 105 17 0 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68242 7 7 23556 162 99 5915 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 63 63 289 32 19 128 14 14
+fn=do_lookup_x
+0 326670 13 13 104430 1862 504 46233 1 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1
+fn=index
+0 687 2 2 62 7 7 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3
+fn=init_tls
+0 86 4 4 22 2 1 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0
+fn=memcpy
+0 862 6 6 143 0 0 119 15 15
+fn=mempcpy
+0 2443 6 6 384 2 1 305 11 11
+fn=memset
+0 1042 3 3 7 0 0 515 67 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4
+fn=openaux
+0 231 2 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 105 3 3 6 2 1 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1
+fn=strcmp
+0 110867 2 2 32622 70 20 0 0 0
+fn=strlen
+0 776 2 2 99 2 2 0 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0
+summary: 1273787 700 694 302365 6648 4096 100676 1095 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFunctionLabel/template_valgrind_4754.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFunctionLabel/template_valgrind_4754.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testFunctionLabel/template_valgrind_4754.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testI1Cache/cachegrind_5245.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testI1Cache/cachegrind_5245.txt
new file mode 100644
index 0000000000..4e887f4693
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testI1Cache/cachegrind_5245.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 16384 B, 16 B, direct-mapped
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+26 7 2 1 3 0 0 3 0 0
+fn=A::B::d()
+27 4 1 0 0 0 0 2 0 0
+28 5 1 0 3 0 0 1 0 0
+29 3 0 0 1 0 0 1 0 0
+30 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+33 3 1 0 0 0 0 2 0 0
+34 5 1 0 3 0 0 1 0 0
+35 2 0 0 2 0 0 0 0 0
+fn=A::c()
+18 4 1 0 0 0 0 2 0 0
+19 3 1 0 0 0 0 1 0 0
+20 3 1 0 0 0 0 1 0 0
+21 4 0 0 3 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 1 0 0 0 0 3 0 0
+41 9 1 0 5 0 0 1 0 0
+42 2 0 0 2 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 1 0 0 0 0 4 0 0
+45 3 0 0 2 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0
+fn=main
+48 5 2 1 0 0 0 3 0 0
+49 3 1 0 0 0 0 1 0 0
+50 3 1 0 0 0 0 1 0 0
+51 4 1 0 0 0 0 1 0 0
+52 3 0 0 0 0 0 1 0 0
+53 1 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 2 1 3 0 0 3 0 0
+fl=???
+fn=(below main)
+0 57 18 4 17 2 0 17 0 0
+fn=???
+0 718 202 74 300 55 11 185 12 8
+fn=_Exit
+0 8 3 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 9 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 15 7 22 12 9 14 0 0
+fn=__cxa_atexit
+0 75 11 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 19 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 6 2 7 1 0 5 2 1
+fn=__libc_csu_init
+0 25 8 3 7 0 0 7 0 0
+fn=__libc_fini
+0 6 2 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 3 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 61 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 26 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 2 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 26 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 3 2 12 1 1 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 6 4 16 4 0 10 1 0
+fn=_dl_allocate_tls_init
+0 133 25 8 44 4 0 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 10 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 10 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 39 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 7 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 56 15 1055 15 15 403 28 28
+fn=_dl_debug_initialize
+0 76 17 3 24 2 1 4 0 0
+fn=_dl_debug_state
+0 2 2 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 19 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 11 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 41 12 134 2 0 43 3 0
+fn=_dl_fixup
+0 437 113 6 158 34 1 42 0 0
+fn=_dl_important_hwcaps
+0 257 48 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 12 5 25 3 0 15 0 0
+fn=_dl_init_paths
+0 1752 54 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 5 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 91 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525437 154 10 81620 1224 1065 27255 2 0
+fn=_dl_map_object
+0 2229 128 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 114 28 517 3 2 191 3 2
+fn=_dl_map_object_from_fd
+0 4446 220 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5158 36 2 1384 15 0 798 2 2
+fn=_dl_new_object
+0 1241 94 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 296 4 2 102 23 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 3 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 5 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 8 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183682 174 36 47167 2860 2097 14356 753 490
+fn=_dl_runtime_resolve
+0 126 7 2 54 0 0 48 0 0
+fn=_dl_setup_hash
+0 203 7 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 20 6 172 5 0 24 0 0
+fn=_dl_start
+0 397 53 16 48 14 12 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 11 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 395 45 13 108 16 15 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 1 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 4 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 2 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 4 1 6 0 0 0 0 0
+fn=_init
+0 136 30 9 22 4 1 18 5 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 3 1 16 0 0 13 0 0
+fn=access
+0 11 3 1 1 0 0 1 0 0
+fn=brk
+0 11 3 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 9 3 416 0 0 585 1 0
+fn=call_init
+0 307 21 5 105 17 0 60 0 0
+fn=calloc
+0 126 18 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68242 22 7 23556 162 99 5915 0 0
+fn=close
+0 30 2 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 224 63 289 32 19 128 14 14
+fn=do_lookup_x
+0 326670 52 13 104430 1862 504 46233 1 0
+fn=do_preload
+0 28 9 3 7 0 0 9 0 0
+fn=exit
+0 76 13 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 9 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 42 16 94 0 0 85 4 4
+fn=handle_intel
+0 195 16 4 26 0 0 45 1 1
+fn=index
+0 687 8 2 62 7 7 0 0 0
+fn=init_cacheinfo
+0 106 22 8 4 0 0 10 3 3
+fn=init_tls
+0 86 13 4 22 2 1 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 20 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 5 1 8 0 0 16 0 0
+fn=malloc
+0 114 6 0 0 0 0 0 0 0
+fn=map_doit
+0 15 4 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 13 4 465 24 24 144 0 0
+fn=memcpy
+0 862 26 6 143 0 0 119 15 15
+fn=mempcpy
+0 2443 26 6 384 2 1 305 11 11
+fn=memset
+0 1042 33 3 7 0 0 515 67 67
+fn=mmap
+0 108 4 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 1 0 1 0 0 0 0 0
+fn=open
+0 305 13 1 31 0 0 25 0 0
+fn=open_path
+0 2236 46 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 130 11 604 7 7 325 4 4
+fn=openaux
+0 231 38 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 24 9 74 4 4 16 3 3
+fn=read
+0 25 5 1 5 0 0 0 0 0
+fn=rindex
+0 105 9 3 6 2 1 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 1 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 1 0 2 0 0 0 0 0
+fn=sbrk
+0 17 5 2 5 0 0 2 1 1
+fn=strcmp
+0 110867 3 2 32622 70 20 0 0 0
+fn=strlen
+0 776 54 2 99 2 2 0 0 0
+fn=strsep
+0 5157 8 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 3 1 4 0 0 2 0 0
+summary: 1273787 3095 694 302365 6648 4096 100676 1095 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testI1Cache/template_cachegrind_5245.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testI1Cache/template_cachegrind_5245.txt
new file mode 100644
index 0000000000..15a8a7922f
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testI1Cache/template_cachegrind_5245.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 16384 B, 16 B, direct-mapped
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: XXXXXXXXXXXX/cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+26 7 2 1 3 0 0 3 0 0
+fn=A::B::d()
+27 4 1 0 0 0 0 2 0 0
+28 5 1 0 3 0 0 1 0 0
+29 3 0 0 1 0 0 1 0 0
+30 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+33 3 1 0 0 0 0 2 0 0
+34 5 1 0 3 0 0 1 0 0
+35 2 0 0 2 0 0 0 0 0
+fn=A::c()
+18 4 1 0 0 0 0 2 0 0
+19 3 1 0 0 0 0 1 0 0
+20 3 1 0 0 0 0 1 0 0
+21 4 0 0 3 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 1 0 0 0 0 3 0 0
+41 9 1 0 5 0 0 1 0 0
+42 2 0 0 2 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 1 0 0 0 0 4 0 0
+45 3 0 0 2 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0
+fn=main
+48 5 2 1 0 0 0 3 0 0
+49 3 1 0 0 0 0 1 0 0
+50 3 1 0 0 0 0 1 0 0
+51 4 1 0 0 0 0 1 0 0
+52 3 0 0 0 0 0 1 0 0
+53 1 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 2 1 3 0 0 3 0 0
+fl=???
+fn=(below main)
+0 57 18 4 17 2 0 17 0 0
+fn=???
+0 718 202 74 300 55 11 185 12 8
+fn=_Exit
+0 8 3 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 9 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 15 7 22 12 9 14 0 0
+fn=__cxa_atexit
+0 75 11 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 19 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 6 2 7 1 0 5 2 1
+fn=__libc_csu_init
+0 25 8 3 7 0 0 7 0 0
+fn=__libc_fini
+0 6 2 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 3 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 61 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 26 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 2 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 26 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 3 2 12 1 1 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 6 4 16 4 0 10 1 0
+fn=_dl_allocate_tls_init
+0 133 25 8 44 4 0 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 10 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 10 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 39 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 7 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 56 15 1055 15 15 403 28 28
+fn=_dl_debug_initialize
+0 76 17 3 24 2 1 4 0 0
+fn=_dl_debug_state
+0 2 2 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 19 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 11 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 41 12 134 2 0 43 3 0
+fn=_dl_fixup
+0 437 113 6 158 34 1 42 0 0
+fn=_dl_important_hwcaps
+0 257 48 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 12 5 25 3 0 15 0 0
+fn=_dl_init_paths
+0 1752 54 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 5 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 91 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525437 154 10 81620 1224 1065 27255 2 0
+fn=_dl_map_object
+0 2229 128 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 114 28 517 3 2 191 3 2
+fn=_dl_map_object_from_fd
+0 4446 220 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5158 36 2 1384 15 0 798 2 2
+fn=_dl_new_object
+0 1241 94 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 296 4 2 102 23 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 3 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 5 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 8 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183682 174 36 47167 2860 2097 14356 753 490
+fn=_dl_runtime_resolve
+0 126 7 2 54 0 0 48 0 0
+fn=_dl_setup_hash
+0 203 7 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 20 6 172 5 0 24 0 0
+fn=_dl_start
+0 397 53 16 48 14 12 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 11 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 395 45 13 108 16 15 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 1 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 4 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 2 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 4 1 6 0 0 0 0 0
+fn=_init
+0 136 30 9 22 4 1 18 5 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 3 1 16 0 0 13 0 0
+fn=access
+0 11 3 1 1 0 0 1 0 0
+fn=brk
+0 11 3 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 9 3 416 0 0 585 1 0
+fn=call_init
+0 307 21 5 105 17 0 60 0 0
+fn=calloc
+0 126 18 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68242 22 7 23556 162 99 5915 0 0
+fn=close
+0 30 2 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 224 63 289 32 19 128 14 14
+fn=do_lookup_x
+0 326670 52 13 104430 1862 504 46233 1 0
+fn=do_preload
+0 28 9 3 7 0 0 9 0 0
+fn=exit
+0 76 13 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 9 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 42 16 94 0 0 85 4 4
+fn=handle_intel
+0 195 16 4 26 0 0 45 1 1
+fn=index
+0 687 8 2 62 7 7 0 0 0
+fn=init_cacheinfo
+0 106 22 8 4 0 0 10 3 3
+fn=init_tls
+0 86 13 4 22 2 1 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 20 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 5 1 8 0 0 16 0 0
+fn=malloc
+0 114 6 0 0 0 0 0 0 0
+fn=map_doit
+0 15 4 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 13 4 465 24 24 144 0 0
+fn=memcpy
+0 862 26 6 143 0 0 119 15 15
+fn=mempcpy
+0 2443 26 6 384 2 1 305 11 11
+fn=memset
+0 1042 33 3 7 0 0 515 67 67
+fn=mmap
+0 108 4 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 1 0 1 0 0 0 0 0
+fn=open
+0 305 13 1 31 0 0 25 0 0
+fn=open_path
+0 2236 46 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 130 11 604 7 7 325 4 4
+fn=openaux
+0 231 38 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 24 9 74 4 4 16 3 3
+fn=read
+0 25 5 1 5 0 0 0 0 0
+fn=rindex
+0 105 9 3 6 2 1 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 1 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 1 0 2 0 0 0 0 0
+fn=sbrk
+0 17 5 2 5 0 0 2 1 1
+fn=strcmp
+0 110867 3 2 32622 70 20 0 0 0
+fn=strlen
+0 776 54 2 99 2 2 0 0 0
+fn=strsep
+0 5157 8 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 3 1 4 0 0 2 0 0
+summary: 1273787 3095 694 302365 6648 4096 100676 1095 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testI1Cache/template_valgrind_5245.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testI1Cache/template_valgrind_5245.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testI1Cache/template_valgrind_5245.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testL2Cache/cachegrind_5355.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testL2Cache/cachegrind_5355.txt
new file mode 100644
index 0000000000..ffef3a25c5
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testL2Cache/cachegrind_5355.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 16384 B, 16 B, direct-mapped
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+26 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+27 4 0 0 0 0 0 2 0 0
+28 5 0 0 3 0 0 1 0 0
+29 3 0 0 1 0 0 1 0 0
+30 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+33 3 0 0 0 0 0 2 0 0
+34 5 0 0 3 0 0 1 0 0
+35 2 0 0 2 0 0 0 0 0
+fn=A::c()
+18 4 0 0 0 0 0 2 0 0
+19 3 0 0 0 0 0 1 0 0
+20 3 0 0 0 0 0 1 0 0
+21 4 0 0 3 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 0 0 0 0 0 3 0 0
+41 9 0 0 5 0 0 1 0 0
+42 2 0 0 2 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 0 0 0 0 0 4 0 0
+45 3 0 0 2 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0
+fn=main
+48 5 1 1 0 0 0 3 0 0
+49 3 0 0 0 0 0 1 0 0
+50 3 0 0 0 0 0 1 0 0
+51 4 0 0 0 0 0 1 0 0
+52 3 0 0 0 0 0 1 0 0
+53 1 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 1 1 3 0 0 3 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 2 17 0 0
+fn=???
+0 718 79 79 300 55 52 185 12 12
+fn=_Exit
+0 8 1 1 1 1 1 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 12 12 14 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 1 5 2 2
+fn=__libc_csu_init
+0 25 3 3 7 0 0 7 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 2 2 12 1 1 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 3 10 1 1
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 4 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 15 15 403 28 28
+fn=_dl_debug_initialize
+0 76 3 3 24 2 2 4 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 12 12 134 2 2 43 3 3
+fn=_dl_fixup
+0 437 6 6 158 34 30 42 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 5 5 25 3 3 15 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525437 10 10 81620 1224 1217 27255 2 2
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 3 191 3 3
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5158 2 2 1384 15 11 798 2 2
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 23 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183682 36 36 47167 2860 2775 14356 753 744
+fn=_dl_runtime_resolve
+0 126 2 2 54 0 0 48 0 0
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 6 6 172 5 5 24 0 0
+fn=_dl_start
+0 397 17 17 48 14 14 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 395 13 13 108 16 16 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 1 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 4 4 18 5 5
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 1
+fn=call_init
+0 307 5 5 105 17 17 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68242 7 7 23556 162 159 5915 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 63 63 289 32 31 128 14 14
+fn=do_lookup_x
+0 326670 13 13 104430 1862 1624 46233 1 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1
+fn=index
+0 687 2 2 62 7 7 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3
+fn=init_tls
+0 86 4 4 22 2 2 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0
+fn=memcpy
+0 862 6 6 143 0 0 119 15 15
+fn=mempcpy
+0 2443 6 6 384 2 2 305 11 11
+fn=memset
+0 1042 3 3 7 0 0 515 67 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4
+fn=openaux
+0 231 2 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 105 3 3 6 2 2 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1
+fn=strcmp
+0 110867 2 2 32622 70 68 0 0 0
+fn=strlen
+0 776 2 2 99 2 2 0 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0
+summary: 1273787 700 700 302365 6648 6300 100676 1095 1085
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testL2Cache/template_cachegrind_5355.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testL2Cache/template_cachegrind_5355.txt
new file mode 100644
index 0000000000..3a320448b9
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testL2Cache/template_cachegrind_5355.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 16384 B, 16 B, direct-mapped
+cmd: XXXXXXXXXXXX/cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+26 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+27 4 0 0 0 0 0 2 0 0
+28 5 0 0 3 0 0 1 0 0
+29 3 0 0 1 0 0 1 0 0
+30 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+33 3 0 0 0 0 0 2 0 0
+34 5 0 0 3 0 0 1 0 0
+35 2 0 0 2 0 0 0 0 0
+fn=A::c()
+18 4 0 0 0 0 0 2 0 0
+19 3 0 0 0 0 0 1 0 0
+20 3 0 0 0 0 0 1 0 0
+21 4 0 0 3 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 0 0 0 0 0 3 0 0
+41 9 0 0 5 0 0 1 0 0
+42 2 0 0 2 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 0 0 0 0 0 4 0 0
+45 3 0 0 2 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0
+fn=main
+48 5 1 1 0 0 0 3 0 0
+49 3 0 0 0 0 0 1 0 0
+50 3 0 0 0 0 0 1 0 0
+51 4 0 0 0 0 0 1 0 0
+52 3 0 0 0 0 0 1 0 0
+53 1 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 1 1 3 0 0 3 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 2 17 0 0
+fn=???
+0 718 79 79 300 55 52 185 12 12
+fn=_Exit
+0 8 1 1 1 1 1 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 12 12 14 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 1 5 2 2
+fn=__libc_csu_init
+0 25 3 3 7 0 0 7 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 2 2 12 1 1 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 3 10 1 1
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 4 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 15 15 403 28 28
+fn=_dl_debug_initialize
+0 76 3 3 24 2 2 4 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 12 12 134 2 2 43 3 3
+fn=_dl_fixup
+0 437 6 6 158 34 30 42 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 5 5 25 3 3 15 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525437 10 10 81620 1224 1217 27255 2 2
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 3 191 3 3
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5158 2 2 1384 15 11 798 2 2
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 23 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183682 36 36 47167 2860 2775 14356 753 744
+fn=_dl_runtime_resolve
+0 126 2 2 54 0 0 48 0 0
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 6 6 172 5 5 24 0 0
+fn=_dl_start
+0 397 17 17 48 14 14 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 395 13 13 108 16 16 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 1 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 4 4 18 5 5
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 1
+fn=call_init
+0 307 5 5 105 17 17 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68242 7 7 23556 162 159 5915 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 63 63 289 32 31 128 14 14
+fn=do_lookup_x
+0 326670 13 13 104430 1862 1624 46233 1 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1
+fn=index
+0 687 2 2 62 7 7 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3
+fn=init_tls
+0 86 4 4 22 2 2 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0
+fn=memcpy
+0 862 6 6 143 0 0 119 15 15
+fn=mempcpy
+0 2443 6 6 384 2 2 305 11 11
+fn=memset
+0 1042 3 3 7 0 0 515 67 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4
+fn=openaux
+0 231 2 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 105 3 3 6 2 2 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1
+fn=strcmp
+0 110867 2 2 32622 70 68 0 0 0
+fn=strlen
+0 776 2 2 99 2 2 0 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0
+summary: 1273787 700 700 302365 6648 6300 100676 1095 1085
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testL2Cache/template_valgrind_5355.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testL2Cache/template_valgrind_5355.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testL2Cache/template_valgrind_5355.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testMethodLabel/cachegrind_4809.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testMethodLabel/cachegrind_4809.txt
new file mode 100644
index 0000000000..69564e6599
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testMethodLabel/cachegrind_4809.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+26 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+27 4 0 0 0 0 0 2 0 0
+28 5 0 0 3 0 0 1 0 0
+29 3 0 0 1 0 0 1 0 0
+30 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+33 3 0 0 0 0 0 2 0 0
+34 5 0 0 3 0 0 1 0 0
+35 2 0 0 2 0 0 0 0 0
+fn=A::c()
+18 4 0 0 0 0 0 2 0 0
+19 3 0 0 0 0 0 1 0 0
+20 3 0 0 0 0 0 1 0 0
+21 4 0 0 3 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 0 0 0 0 0 3 0 0
+41 9 0 0 5 0 0 1 0 0
+42 2 0 0 2 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 0 0 0 0 0 4 0 0
+45 3 0 0 2 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0
+fn=main
+48 5 1 1 0 0 0 3 0 0
+49 3 0 0 0 0 0 1 0 0
+50 3 0 0 0 0 0 1 0 0
+51 4 0 0 0 0 0 1 0 0
+52 3 0 0 0 0 0 1 0 0
+53 1 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 1 1 3 0 0 3 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 0 17 0 0
+fn=???
+0 718 79 74 300 55 11 185 12 8
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 12 9 14 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 2 1
+fn=__libc_csu_init
+0 25 3 3 7 0 0 7 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 2 2 12 1 1 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 0 10 1 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 0 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 15 15 403 28 28
+fn=_dl_debug_initialize
+0 76 3 3 24 2 1 4 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 12 12 134 2 0 43 3 0
+fn=_dl_fixup
+0 437 6 6 158 34 1 42 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 5 5 25 3 0 15 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525437 10 10 81620 1224 1065 27255 2 0
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 2 191 3 2
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5158 2 2 1384 15 0 798 2 2
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 23 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183682 36 36 47167 2860 2097 14356 753 490
+fn=_dl_runtime_resolve
+0 126 2 2 54 0 0 48 0 0
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 6 6 172 5 0 24 0 0
+fn=_dl_start
+0 397 17 16 48 14 12 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 395 13 13 108 16 15 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 4 1 18 5 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 0
+fn=call_init
+0 307 5 5 105 17 0 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68242 7 7 23556 162 99 5915 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 63 63 289 32 19 128 14 14
+fn=do_lookup_x
+0 326670 13 13 104430 1862 504 46233 1 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1
+fn=index
+0 687 2 2 62 7 7 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3
+fn=init_tls
+0 86 4 4 22 2 1 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0
+fn=memcpy
+0 862 6 6 143 0 0 119 15 15
+fn=mempcpy
+0 2443 6 6 384 2 1 305 11 11
+fn=memset
+0 1042 3 3 7 0 0 515 67 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4
+fn=openaux
+0 231 2 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 105 3 3 6 2 1 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1
+fn=strcmp
+0 110867 2 2 32622 70 20 0 0 0
+fn=strlen
+0 776 2 2 99 2 2 0 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0
+summary: 1273787 700 694 302365 6648 4096 100676 1095 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testMethodLabel/template_cachegrind_4809.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testMethodLabel/template_cachegrind_4809.txt
new file mode 100644
index 0000000000..6ebabc9785
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testMethodLabel/template_cachegrind_4809.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: XXXXXXXXXXXX/cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+26 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+27 4 0 0 0 0 0 2 0 0
+28 5 0 0 3 0 0 1 0 0
+29 3 0 0 1 0 0 1 0 0
+30 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+33 3 0 0 0 0 0 2 0 0
+34 5 0 0 3 0 0 1 0 0
+35 2 0 0 2 0 0 0 0 0
+fn=A::c()
+18 4 0 0 0 0 0 2 0 0
+19 3 0 0 0 0 0 1 0 0
+20 3 0 0 0 0 0 1 0 0
+21 4 0 0 3 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 0 0 0 0 0 3 0 0
+41 9 0 0 5 0 0 1 0 0
+42 2 0 0 2 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 0 0 0 0 0 4 0 0
+45 3 0 0 2 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0
+fn=main
+48 5 1 1 0 0 0 3 0 0
+49 3 0 0 0 0 0 1 0 0
+50 3 0 0 0 0 0 1 0 0
+51 4 0 0 0 0 0 1 0 0
+52 3 0 0 0 0 0 1 0 0
+53 1 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 1 1 3 0 0 3 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 0 17 0 0
+fn=???
+0 718 79 74 300 55 11 185 12 8
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 12 9 14 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 2 1
+fn=__libc_csu_init
+0 25 3 3 7 0 0 7 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 2 2 12 1 1 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 0 10 1 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 0 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 15 15 403 28 28
+fn=_dl_debug_initialize
+0 76 3 3 24 2 1 4 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 12 12 134 2 0 43 3 0
+fn=_dl_fixup
+0 437 6 6 158 34 1 42 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 5 5 25 3 0 15 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525437 10 10 81620 1224 1065 27255 2 0
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 2 191 3 2
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5158 2 2 1384 15 0 798 2 2
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 23 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183682 36 36 47167 2860 2097 14356 753 490
+fn=_dl_runtime_resolve
+0 126 2 2 54 0 0 48 0 0
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 6 6 172 5 0 24 0 0
+fn=_dl_start
+0 397 17 16 48 14 12 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 395 13 13 108 16 15 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 4 1 18 5 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 0
+fn=call_init
+0 307 5 5 105 17 0 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68242 7 7 23556 162 99 5915 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 63 63 289 32 19 128 14 14
+fn=do_lookup_x
+0 326670 13 13 104430 1862 504 46233 1 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1
+fn=index
+0 687 2 2 62 7 7 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3
+fn=init_tls
+0 86 4 4 22 2 1 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0
+fn=memcpy
+0 862 6 6 143 0 0 119 15 15
+fn=mempcpy
+0 2443 6 6 384 2 1 305 11 11
+fn=memset
+0 1042 3 3 7 0 0 515 67 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4
+fn=openaux
+0 231 2 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 105 3 3 6 2 1 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1
+fn=strcmp
+0 110867 2 2 32622 70 20 0 0 0
+fn=strlen
+0 776 2 2 99 2 2 0 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0
+summary: 1273787 700 694 302365 6648 4096 100676 1095 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testMethodLabel/template_valgrind_4809.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testMethodLabel/template_valgrind_4809.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testMethodLabel/template_valgrind_4809.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNestedMethodLabel/cachegrind_4864.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNestedMethodLabel/cachegrind_4864.txt
new file mode 100644
index 0000000000..69564e6599
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNestedMethodLabel/cachegrind_4864.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+26 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+27 4 0 0 0 0 0 2 0 0
+28 5 0 0 3 0 0 1 0 0
+29 3 0 0 1 0 0 1 0 0
+30 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+33 3 0 0 0 0 0 2 0 0
+34 5 0 0 3 0 0 1 0 0
+35 2 0 0 2 0 0 0 0 0
+fn=A::c()
+18 4 0 0 0 0 0 2 0 0
+19 3 0 0 0 0 0 1 0 0
+20 3 0 0 0 0 0 1 0 0
+21 4 0 0 3 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 0 0 0 0 0 3 0 0
+41 9 0 0 5 0 0 1 0 0
+42 2 0 0 2 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 0 0 0 0 0 4 0 0
+45 3 0 0 2 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0
+fn=main
+48 5 1 1 0 0 0 3 0 0
+49 3 0 0 0 0 0 1 0 0
+50 3 0 0 0 0 0 1 0 0
+51 4 0 0 0 0 0 1 0 0
+52 3 0 0 0 0 0 1 0 0
+53 1 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 1 1 3 0 0 3 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 0 17 0 0
+fn=???
+0 718 79 74 300 55 11 185 12 8
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 12 9 14 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 2 1
+fn=__libc_csu_init
+0 25 3 3 7 0 0 7 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 2 2 12 1 1 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 0 10 1 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 0 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 15 15 403 28 28
+fn=_dl_debug_initialize
+0 76 3 3 24 2 1 4 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 12 12 134 2 0 43 3 0
+fn=_dl_fixup
+0 437 6 6 158 34 1 42 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 5 5 25 3 0 15 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525437 10 10 81620 1224 1065 27255 2 0
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 2 191 3 2
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5158 2 2 1384 15 0 798 2 2
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 23 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183682 36 36 47167 2860 2097 14356 753 490
+fn=_dl_runtime_resolve
+0 126 2 2 54 0 0 48 0 0
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 6 6 172 5 0 24 0 0
+fn=_dl_start
+0 397 17 16 48 14 12 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 395 13 13 108 16 15 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 4 1 18 5 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 0
+fn=call_init
+0 307 5 5 105 17 0 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68242 7 7 23556 162 99 5915 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 63 63 289 32 19 128 14 14
+fn=do_lookup_x
+0 326670 13 13 104430 1862 504 46233 1 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1
+fn=index
+0 687 2 2 62 7 7 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3
+fn=init_tls
+0 86 4 4 22 2 1 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0
+fn=memcpy
+0 862 6 6 143 0 0 119 15 15
+fn=mempcpy
+0 2443 6 6 384 2 1 305 11 11
+fn=memset
+0 1042 3 3 7 0 0 515 67 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4
+fn=openaux
+0 231 2 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 105 3 3 6 2 1 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1
+fn=strcmp
+0 110867 2 2 32622 70 20 0 0 0
+fn=strlen
+0 776 2 2 99 2 2 0 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0
+summary: 1273787 700 694 302365 6648 4096 100676 1095 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNestedMethodLabel/template_cachegrind_4864.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNestedMethodLabel/template_cachegrind_4864.txt
new file mode 100644
index 0000000000..6ebabc9785
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNestedMethodLabel/template_cachegrind_4864.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: XXXXXXXXXXXX/cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+26 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+27 4 0 0 0 0 0 2 0 0
+28 5 0 0 3 0 0 1 0 0
+29 3 0 0 1 0 0 1 0 0
+30 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+33 3 0 0 0 0 0 2 0 0
+34 5 0 0 3 0 0 1 0 0
+35 2 0 0 2 0 0 0 0 0
+fn=A::c()
+18 4 0 0 0 0 0 2 0 0
+19 3 0 0 0 0 0 1 0 0
+20 3 0 0 0 0 0 1 0 0
+21 4 0 0 3 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 0 0 0 0 0 3 0 0
+41 9 0 0 5 0 0 1 0 0
+42 2 0 0 2 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 0 0 0 0 0 4 0 0
+45 3 0 0 2 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0
+fn=main
+48 5 1 1 0 0 0 3 0 0
+49 3 0 0 0 0 0 1 0 0
+50 3 0 0 0 0 0 1 0 0
+51 4 0 0 0 0 0 1 0 0
+52 3 0 0 0 0 0 1 0 0
+53 1 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 1 1 3 0 0 3 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 0 17 0 0
+fn=???
+0 718 79 74 300 55 11 185 12 8
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 12 9 14 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 2 1
+fn=__libc_csu_init
+0 25 3 3 7 0 0 7 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 2 2 12 1 1 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 0 10 1 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 0 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 15 15 403 28 28
+fn=_dl_debug_initialize
+0 76 3 3 24 2 1 4 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 12 12 134 2 0 43 3 0
+fn=_dl_fixup
+0 437 6 6 158 34 1 42 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 5 5 25 3 0 15 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525437 10 10 81620 1224 1065 27255 2 0
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 2 191 3 2
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5158 2 2 1384 15 0 798 2 2
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 23 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183682 36 36 47167 2860 2097 14356 753 490
+fn=_dl_runtime_resolve
+0 126 2 2 54 0 0 48 0 0
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 6 6 172 5 0 24 0 0
+fn=_dl_start
+0 397 17 16 48 14 12 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 395 13 13 108 16 15 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 4 1 18 5 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 0
+fn=call_init
+0 307 5 5 105 17 0 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68242 7 7 23556 162 99 5915 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 63 63 289 32 19 128 14 14
+fn=do_lookup_x
+0 326670 13 13 104430 1862 504 46233 1 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1
+fn=index
+0 687 2 2 62 7 7 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3
+fn=init_tls
+0 86 4 4 22 2 1 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0
+fn=memcpy
+0 862 6 6 143 0 0 119 15 15
+fn=mempcpy
+0 2443 6 6 384 2 1 305 11 11
+fn=memset
+0 1042 3 3 7 0 0 515 67 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4
+fn=openaux
+0 231 2 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 105 3 3 6 2 1 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1
+fn=strcmp
+0 110867 2 2 32622 70 20 0 0 0
+fn=strlen
+0 776 2 2 99 2 2 0 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0
+summary: 1273787 700 694 302365 6648 4096 100676 1095 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNestedMethodLabel/template_valgrind_4864.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNestedMethodLabel/template_valgrind_4864.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNestedMethodLabel/template_valgrind_4864.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNoExec/cachegrind_5670.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNoExec/cachegrind_5670.txt
new file mode 100644
index 0000000000..5b1f31c6ef
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNoExec/cachegrind_5670.txt
@@ -0,0 +1,244 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/multiProcTest/Debug/multiProcTest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/multiProcTest/Debug/../parent.cpp
+fn=A::A()
+8 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+18 4 0 0 0 0 0 2 0 0
+19 5 0 0 3 0 0 1 0 0
+20 3 1 1 1 0 0 1 0 0
+21 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+24 3 0 0 0 0 0 2 0 0
+25 5 0 0 3 0 0 1 0 0
+26 2 0 0 2 0 0 0 0 0
+fn=A::c()
+9 4 0 0 0 0 0 2 0 0
+10 3 0 0 0 0 0 1 0 0
+11 3 0 0 0 0 0 1 0 0
+12 4 0 0 3 0 0 0 0 0
+13 2 0 0 2 0 0 0 0 0
+fn=main
+31 3 0 0 0 0 0 1 0 0
+32 5 1 1 0 0 0 1 0 0
+33 3 0 0 0 0 0 1 0 0
+34 4 0 0 0 0 0 1 0 0
+40 1 0 0 0 0 0 0 0 0
+41 2 0 0 2 0 0 0 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 0 17 0 0
+fn=???
+0 723 79 74 303 53 10 187 12 8
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 11 8 14 0 0
+fn=_IO_list_lock
+0 12 2 2 6 1 1 1 0 0
+fn=_IO_list_unlock
+0 11 1 1 4 0 0 2 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 2 1
+fn=__libc_csu_init
+0 25 2 2 7 0 0 7 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 2 2 12 0 0 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 0 10 1 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 0 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 14 14 403 28 28
+fn=_dl_debug_initialize
+0 76 3 3 24 2 1 4 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 12 12 134 2 0 43 3 0
+fn=_dl_fixup
+0 511 6 6 185 34 2 49 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 5 5 25 3 0 15 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525566 10 10 81654 1223 1065 27278 2 0
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 2 191 3 2
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5288 2 2 1419 15 0 818 2 2
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 23 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183718 36 36 47179 2861 2100 14356 753 490
+fn=_dl_runtime_resolve
+0 147 2 2 63 0 0 56 0 0
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 6 6 172 5 0 24 0 0
+fn=_dl_start
+0 397 17 16 48 14 12 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 395 13 13 108 16 15 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 4 1 18 5 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 0
+fn=call_init
+0 307 5 5 105 17 0 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68308 7 7 23580 165 102 5922 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 63 63 289 32 19 128 14 14
+fn=do_lookup_x
+0 327134 13 13 104586 1864 506 46308 1 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4
+fn=fork
+0 45 6 6 11 1 1 9 0 0
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1
+fn=index
+0 723 2 2 66 7 7 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3
+fn=init_tls
+0 86 4 4 22 3 1 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0
+fn=memcpy
+0 862 6 6 143 0 0 119 15 15
+fn=mempcpy
+0 2443 6 6 384 2 1 305 11 11
+fn=memset
+0 1042 3 3 7 0 0 515 67 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4
+fn=openaux
+0 231 2 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 123 3 3 7 3 1 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1
+fn=strcmp
+0 111123 2 2 32706 73 22 0 0 0
+fn=strlen
+0 800 2 2 103 2 2 0 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0
+summary: 1275078 708 702 302765 6655 4105 100816 1095 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNoExec/template_cachegrind_5670.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNoExec/template_cachegrind_5670.txt
new file mode 100644
index 0000000000..2c6ddb24af
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNoExec/template_cachegrind_5670.txt
@@ -0,0 +1,244 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: XXXXXXXXXXXX/multiProcTest/Debug/multiProcTest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=XXXXXXXXXXXX/multiProcTest/Debug/../parent.cpp
+fn=A::A()
+8 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+18 4 0 0 0 0 0 2 0 0
+19 5 0 0 3 0 0 1 0 0
+20 3 1 1 1 0 0 1 0 0
+21 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+24 3 0 0 0 0 0 2 0 0
+25 5 0 0 3 0 0 1 0 0
+26 2 0 0 2 0 0 0 0 0
+fn=A::c()
+9 4 0 0 0 0 0 2 0 0
+10 3 0 0 0 0 0 1 0 0
+11 3 0 0 0 0 0 1 0 0
+12 4 0 0 3 0 0 0 0 0
+13 2 0 0 2 0 0 0 0 0
+fn=main
+31 3 0 0 0 0 0 1 0 0
+32 5 1 1 0 0 0 1 0 0
+33 3 0 0 0 0 0 1 0 0
+34 4 0 0 0 0 0 1 0 0
+40 1 0 0 0 0 0 0 0 0
+41 2 0 0 2 0 0 0 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 0 17 0 0
+fn=???
+0 723 79 74 303 53 10 187 12 8
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 11 8 14 0 0
+fn=_IO_list_lock
+0 12 2 2 6 1 1 1 0 0
+fn=_IO_list_unlock
+0 11 1 1 4 0 0 2 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 2 1
+fn=__libc_csu_init
+0 25 2 2 7 0 0 7 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 2 2 12 0 0 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 0 10 1 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 0 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 14 14 403 28 28
+fn=_dl_debug_initialize
+0 76 3 3 24 2 1 4 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 12 12 134 2 0 43 3 0
+fn=_dl_fixup
+0 511 6 6 185 34 2 49 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 5 5 25 3 0 15 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525566 10 10 81654 1223 1065 27278 2 0
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 2 191 3 2
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5288 2 2 1419 15 0 818 2 2
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 23 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183718 36 36 47179 2861 2100 14356 753 490
+fn=_dl_runtime_resolve
+0 147 2 2 63 0 0 56 0 0
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 6 6 172 5 0 24 0 0
+fn=_dl_start
+0 397 17 16 48 14 12 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 395 13 13 108 16 15 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 4 1 18 5 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 0
+fn=call_init
+0 307 5 5 105 17 0 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68308 7 7 23580 165 102 5922 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 63 63 289 32 19 128 14 14
+fn=do_lookup_x
+0 327134 13 13 104586 1864 506 46308 1 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4
+fn=fork
+0 45 6 6 11 1 1 9 0 0
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1
+fn=index
+0 723 2 2 66 7 7 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3
+fn=init_tls
+0 86 4 4 22 3 1 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0
+fn=memcpy
+0 862 6 6 143 0 0 119 15 15
+fn=mempcpy
+0 2443 6 6 384 2 1 305 11 11
+fn=memset
+0 1042 3 3 7 0 0 515 67 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4
+fn=openaux
+0 231 2 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 123 3 3 7 3 1 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1
+fn=strcmp
+0 111123 2 2 32706 73 22 0 0 0
+fn=strlen
+0 800 2 2 103 2 2 0 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0
+summary: 1275078 708 702 302765 6655 4105 100816 1095 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNoExec/template_valgrind_5670.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNoExec/template_valgrind_5670.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNoExec/template_valgrind_5670.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNumFunctions/cachegrind_4589.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNumFunctions/cachegrind_4589.txt
new file mode 100644
index 0000000000..69564e6599
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNumFunctions/cachegrind_4589.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+26 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+27 4 0 0 0 0 0 2 0 0
+28 5 0 0 3 0 0 1 0 0
+29 3 0 0 1 0 0 1 0 0
+30 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+33 3 0 0 0 0 0 2 0 0
+34 5 0 0 3 0 0 1 0 0
+35 2 0 0 2 0 0 0 0 0
+fn=A::c()
+18 4 0 0 0 0 0 2 0 0
+19 3 0 0 0 0 0 1 0 0
+20 3 0 0 0 0 0 1 0 0
+21 4 0 0 3 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 0 0 0 0 0 3 0 0
+41 9 0 0 5 0 0 1 0 0
+42 2 0 0 2 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 0 0 0 0 0 4 0 0
+45 3 0 0 2 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0
+fn=main
+48 5 1 1 0 0 0 3 0 0
+49 3 0 0 0 0 0 1 0 0
+50 3 0 0 0 0 0 1 0 0
+51 4 0 0 0 0 0 1 0 0
+52 3 0 0 0 0 0 1 0 0
+53 1 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 1 1 3 0 0 3 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 0 17 0 0
+fn=???
+0 718 79 74 300 55 11 185 12 8
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 12 9 14 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 2 1
+fn=__libc_csu_init
+0 25 3 3 7 0 0 7 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 2 2 12 1 1 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 0 10 1 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 0 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 15 15 403 28 28
+fn=_dl_debug_initialize
+0 76 3 3 24 2 1 4 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 12 12 134 2 0 43 3 0
+fn=_dl_fixup
+0 437 6 6 158 34 1 42 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 5 5 25 3 0 15 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525437 10 10 81620 1224 1065 27255 2 0
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 2 191 3 2
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5158 2 2 1384 15 0 798 2 2
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 23 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183682 36 36 47167 2860 2097 14356 753 490
+fn=_dl_runtime_resolve
+0 126 2 2 54 0 0 48 0 0
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 6 6 172 5 0 24 0 0
+fn=_dl_start
+0 397 17 16 48 14 12 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 395 13 13 108 16 15 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 4 1 18 5 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 0
+fn=call_init
+0 307 5 5 105 17 0 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68242 7 7 23556 162 99 5915 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 63 63 289 32 19 128 14 14
+fn=do_lookup_x
+0 326670 13 13 104430 1862 504 46233 1 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1
+fn=index
+0 687 2 2 62 7 7 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3
+fn=init_tls
+0 86 4 4 22 2 1 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0
+fn=memcpy
+0 862 6 6 143 0 0 119 15 15
+fn=mempcpy
+0 2443 6 6 384 2 1 305 11 11
+fn=memset
+0 1042 3 3 7 0 0 515 67 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4
+fn=openaux
+0 231 2 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 105 3 3 6 2 1 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1
+fn=strcmp
+0 110867 2 2 32622 70 20 0 0 0
+fn=strlen
+0 776 2 2 99 2 2 0 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0
+summary: 1273787 700 694 302365 6648 4096 100676 1095 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNumFunctions/template_cachegrind_4589.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNumFunctions/template_cachegrind_4589.txt
new file mode 100644
index 0000000000..6ebabc9785
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNumFunctions/template_cachegrind_4589.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: XXXXXXXXXXXX/cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+26 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+27 4 0 0 0 0 0 2 0 0
+28 5 0 0 3 0 0 1 0 0
+29 3 0 0 1 0 0 1 0 0
+30 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+33 3 0 0 0 0 0 2 0 0
+34 5 0 0 3 0 0 1 0 0
+35 2 0 0 2 0 0 0 0 0
+fn=A::c()
+18 4 0 0 0 0 0 2 0 0
+19 3 0 0 0 0 0 1 0 0
+20 3 0 0 0 0 0 1 0 0
+21 4 0 0 3 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 0 0 0 0 0 3 0 0
+41 9 0 0 5 0 0 1 0 0
+42 2 0 0 2 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 0 0 0 0 0 4 0 0
+45 3 0 0 2 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0
+fn=main
+48 5 1 1 0 0 0 3 0 0
+49 3 0 0 0 0 0 1 0 0
+50 3 0 0 0 0 0 1 0 0
+51 4 0 0 0 0 0 1 0 0
+52 3 0 0 0 0 0 1 0 0
+53 1 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 1 1 3 0 0 3 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 0 17 0 0
+fn=???
+0 718 79 74 300 55 11 185 12 8
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 12 9 14 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 2 1
+fn=__libc_csu_init
+0 25 3 3 7 0 0 7 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 2 2 12 1 1 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 0 10 1 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 0 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 15 15 403 28 28
+fn=_dl_debug_initialize
+0 76 3 3 24 2 1 4 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 12 12 134 2 0 43 3 0
+fn=_dl_fixup
+0 437 6 6 158 34 1 42 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 5 5 25 3 0 15 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525437 10 10 81620 1224 1065 27255 2 0
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 2 191 3 2
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5158 2 2 1384 15 0 798 2 2
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 23 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183682 36 36 47167 2860 2097 14356 753 490
+fn=_dl_runtime_resolve
+0 126 2 2 54 0 0 48 0 0
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 6 6 172 5 0 24 0 0
+fn=_dl_start
+0 397 17 16 48 14 12 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 395 13 13 108 16 15 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 4 1 18 5 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 0
+fn=call_init
+0 307 5 5 105 17 0 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68242 7 7 23556 162 99 5915 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 63 63 289 32 19 128 14 14
+fn=do_lookup_x
+0 326670 13 13 104430 1862 504 46233 1 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1
+fn=index
+0 687 2 2 62 7 7 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3
+fn=init_tls
+0 86 4 4 22 2 1 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0
+fn=memcpy
+0 862 6 6 143 0 0 119 15 15
+fn=mempcpy
+0 2443 6 6 384 2 1 305 11 11
+fn=memset
+0 1042 3 3 7 0 0 515 67 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4
+fn=openaux
+0 231 2 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 105 3 3 6 2 1 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1
+fn=strcmp
+0 110867 2 2 32622 70 20 0 0 0
+fn=strlen
+0 776 2 2 99 2 2 0 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0
+summary: 1273787 700 694 302365 6648 4096 100676 1095 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNumFunctions/template_valgrind_4589.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNumFunctions/template_valgrind_4589.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNumFunctions/template_valgrind_4589.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNumPIDs/cachegrind_4478.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNumPIDs/cachegrind_4478.txt
new file mode 100644
index 0000000000..69564e6599
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNumPIDs/cachegrind_4478.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+26 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+27 4 0 0 0 0 0 2 0 0
+28 5 0 0 3 0 0 1 0 0
+29 3 0 0 1 0 0 1 0 0
+30 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+33 3 0 0 0 0 0 2 0 0
+34 5 0 0 3 0 0 1 0 0
+35 2 0 0 2 0 0 0 0 0
+fn=A::c()
+18 4 0 0 0 0 0 2 0 0
+19 3 0 0 0 0 0 1 0 0
+20 3 0 0 0 0 0 1 0 0
+21 4 0 0 3 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 0 0 0 0 0 3 0 0
+41 9 0 0 5 0 0 1 0 0
+42 2 0 0 2 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 0 0 0 0 0 4 0 0
+45 3 0 0 2 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0
+fn=main
+48 5 1 1 0 0 0 3 0 0
+49 3 0 0 0 0 0 1 0 0
+50 3 0 0 0 0 0 1 0 0
+51 4 0 0 0 0 0 1 0 0
+52 3 0 0 0 0 0 1 0 0
+53 1 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0
+fl=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/target/work/data/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 1 1 3 0 0 3 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 0 17 0 0
+fn=???
+0 718 79 74 300 55 11 185 12 8
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 12 9 14 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 2 1
+fn=__libc_csu_init
+0 25 3 3 7 0 0 7 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 2 2 12 1 1 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 0 10 1 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 0 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 15 15 403 28 28
+fn=_dl_debug_initialize
+0 76 3 3 24 2 1 4 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 12 12 134 2 0 43 3 0
+fn=_dl_fixup
+0 437 6 6 158 34 1 42 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 5 5 25 3 0 15 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525437 10 10 81620 1224 1065 27255 2 0
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 2 191 3 2
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5158 2 2 1384 15 0 798 2 2
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 23 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183682 36 36 47167 2860 2097 14356 753 490
+fn=_dl_runtime_resolve
+0 126 2 2 54 0 0 48 0 0
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 6 6 172 5 0 24 0 0
+fn=_dl_start
+0 397 17 16 48 14 12 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 395 13 13 108 16 15 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 4 1 18 5 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 0
+fn=call_init
+0 307 5 5 105 17 0 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68242 7 7 23556 162 99 5915 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 63 63 289 32 19 128 14 14
+fn=do_lookup_x
+0 326670 13 13 104430 1862 504 46233 1 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1
+fn=index
+0 687 2 2 62 7 7 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3
+fn=init_tls
+0 86 4 4 22 2 1 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0
+fn=memcpy
+0 862 6 6 143 0 0 119 15 15
+fn=mempcpy
+0 2443 6 6 384 2 1 305 11 11
+fn=memset
+0 1042 3 3 7 0 0 515 67 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4
+fn=openaux
+0 231 2 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 105 3 3 6 2 1 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1
+fn=strcmp
+0 110867 2 2 32622 70 20 0 0 0
+fn=strlen
+0 776 2 2 99 2 2 0 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0
+summary: 1273787 700 694 302365 6648 4096 100676 1095 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNumPIDs/template_cachegrind_4478.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNumPIDs/template_cachegrind_4478.txt
new file mode 100644
index 0000000000..6ebabc9785
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNumPIDs/template_cachegrind_4478.txt
@@ -0,0 +1,250 @@
+desc: I1 cache: 32768 B, 64 B, 8-way associative
+desc: D1 cache: 32768 B, 64 B, 8-way associative
+desc: L2 cache: 6291456 B, 64 B, 24-way associative
+cmd: XXXXXXXXXXXX/cpptest/Debug/cpptest
+events: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.cpp
+fn=A::A()
+17 7 1 1 3 0 0 3 0 0
+fn=A::B::B()
+26 7 1 1 3 0 0 3 0 0
+fn=A::B::d()
+27 4 0 0 0 0 0 2 0 0
+28 5 0 0 3 0 0 1 0 0
+29 3 0 0 1 0 0 1 0 0
+30 2 0 0 2 0 0 0 0 0
+fn=A::B::e()
+33 3 0 0 0 0 0 2 0 0
+34 5 0 0 3 0 0 1 0 0
+35 2 0 0 2 0 0 0 0 0
+fn=A::c()
+18 4 0 0 0 0 0 2 0 0
+19 3 0 0 0 0 0 1 0 0
+20 3 0 0 0 0 0 1 0 0
+21 4 0 0 3 0 0 0 0 0
+22 2 0 0 2 0 0 0 0 0
+fn=Foo::bar(int)
+40 5 0 0 0 0 0 3 0 0
+41 9 0 0 5 0 0 1 0 0
+42 2 0 0 2 0 0 0 0 0
+fn=Foo::baz(int, int)
+44 5 0 0 0 0 0 4 0 0
+45 3 0 0 2 0 0 0 0 0
+46 2 0 0 2 0 0 0 0 0
+fn=main
+48 5 1 1 0 0 0 3 0 0
+49 3 0 0 0 0 0 1 0 0
+50 3 0 0 0 0 0 1 0 0
+51 4 0 0 0 0 0 1 0 0
+52 3 0 0 0 0 0 1 0 0
+53 1 0 0 0 0 0 0 0 0
+54 2 0 0 2 0 0 0 0 0
+fl=XXXXXXXXXXXX/cpptest/Debug/../cpptest.h
+fn=Foo::Foo()
+16 7 1 1 3 0 0 3 0 0
+fl=???
+fn=(below main)
+0 57 4 4 17 2 0 17 0 0
+fn=???
+0 718 79 74 300 55 11 185 12 8
+fn=_Exit
+0 8 1 1 1 1 0 0 0 0
+fn=_IO_cleanup
+0 53 3 3 15 1 1 9 0 0
+fn=_IO_flush_all_lockp
+0 82 7 7 22 12 9 14 0 0
+fn=__cxa_atexit
+0 75 3 3 15 0 0 24 1 1
+fn=__cxa_finalize
+0 279 6 6 72 1 1 28 0 0
+fn=__init_misc
+0 24 2 2 7 1 0 5 2 1
+fn=__libc_csu_init
+0 25 3 3 7 0 0 7 0 0
+fn=__libc_fini
+0 6 0 0 3 0 0 1 0 0
+fn=__libc_global_ctors
+0 13 2 2 4 1 1 2 0 0
+fn=__libc_memalign
+0 1076 4 4 210 0 0 206 0 0
+fn=__new_exitfn
+0 111 6 6 30 5 5 10 0 0
+fn=__sigjmp_save
+0 9 0 0 2 0 0 2 0 0
+fn=__sigsetjmp
+0 246 5 5 64 0 0 104 1 1
+fn=__unregister_atfork
+0 32 2 2 12 1 1 4 0 0
+fn=_dl_add_to_slotinfo
+0 40 4 4 16 4 0 10 1 0
+fn=_dl_allocate_tls_init
+0 133 8 8 44 4 0 18 1 1
+fn=_dl_allocate_tls_storage
+0 267 3 3 7 0 0 229 28 28
+fn=_dl_cache_libcmp
+0 3198 5 5 431 26 26 0 0 0
+fn=_dl_catch_error
+0 432 3 3 144 0 0 204 2 2
+fn=_dl_check_all_versions
+0 124 3 3 19 0 0 11 0 0
+fn=_dl_check_map_versions
+0 3224 15 15 1055 15 15 403 28 28
+fn=_dl_debug_initialize
+0 76 3 3 24 2 1 4 0 0
+fn=_dl_debug_state
+0 2 0 0 2 0 0 0 0 0
+fn=_dl_determine_tlsoffset
+0 101 6 6 20 1 1 11 0 0
+fn=_dl_discover_osversion
+0 87 4 4 12 1 1 4 1 1
+fn=_dl_fini
+0 409 12 12 134 2 0 43 3 0
+fn=_dl_fixup
+0 437 6 6 158 34 1 42 0 0
+fn=_dl_important_hwcaps
+0 257 16 16 49 0 0 38 3 3
+fn=_dl_init
+0 104 5 5 25 3 0 15 0 0
+fn=_dl_init_paths
+0 1752 17 17 249 1 1 42 3 3
+fn=_dl_initial_error_catch_tsd
+0 26 1 1 13 0 0 0 0 0
+fn=_dl_load_cache_lookup
+0 1051 13 13 218 30 30 66 0 0
+fn=_dl_lookup_symbol_x
+0 525437 10 10 81620 1224 1065 27255 2 0
+fn=_dl_map_object
+0 2229 23 23 566 1 1 331 9 9
+fn=_dl_map_object_deps
+0 2706 28 28 517 3 2 191 3 2
+fn=_dl_map_object_from_fd
+0 4446 46 46 936 47 47 459 55 55
+fn=_dl_name_match_p
+0 5158 2 2 1384 15 0 798 2 2
+fn=_dl_new_object
+0 1241 13 13 237 8 8 231 36 36
+fn=_dl_next_ld_env_entry
+0 296 2 2 102 23 23 2 0 0
+fn=_dl_next_tls_modid
+0 16 1 1 6 0 0 2 0 0
+fn=_dl_protect_relro
+0 80 2 2 24 0 0 8 0 0
+fn=_dl_receive_error
+0 28 2 2 10 0 0 12 0 0
+fn=_dl_relocate_object
+0 183682 36 36 47167 2860 2097 14356 753 490
+fn=_dl_runtime_resolve
+0 126 2 2 54 0 0 48 0 0
+fn=_dl_setup_hash
+0 203 2 2 49 10 10 42 1 1
+fn=_dl_sort_fini
+0 666 6 6 172 5 0 24 0 0
+fn=_dl_start
+0 397 17 16 48 14 12 40 12 12
+fn=_dl_sysdep_read_whole_file
+0 42 3 3 6 0 0 9 0 0
+fn=_dl_sysdep_start
+0 395 13 13 108 16 15 27 2 2
+fn=_dl_sysdep_start_cleanup
+0 1 0 0 1 0 0 0 0 0
+fn=_dl_unload_cache
+0 10 0 0 3 0 0 2 0 0
+fn=_dl_vdso_vsym
+0 16 1 1 6 1 0 0 0 0
+fn=_fxstat
+0 60 1 1 6 0 0 0 0 0
+fn=_init
+0 136 9 9 22 4 1 18 5 4
+fn=_setjmp
+0 2 1 1 0 0 0 0 0 0
+fn=_xstat
+0 199 1 1 16 0 0 13 0 0
+fn=access
+0 11 1 1 1 0 0 1 0 0
+fn=brk
+0 11 1 1 1 0 0 1 1 1
+fn=bsearch
+0 3388 3 3 416 0 0 585 1 0
+fn=call_init
+0 307 5 5 105 17 0 60 0 0
+fn=calloc
+0 126 2 2 0 0 0 0 0 0
+fn=check_match.8652
+0 68242 7 7 23556 162 99 5915 0 0
+fn=close
+0 30 0 0 6 0 0 0 0 0
+fn=dl_main
+0 1126 63 63 289 32 19 128 14 14
+fn=do_lookup_x
+0 326670 13 13 104430 1862 504 46233 1 0
+fn=do_preload
+0 28 3 3 7 0 0 9 0 0
+fn=exit
+0 76 4 4 11 1 1 10 0 0
+fn=expand_dynamic_string_token
+0 32 3 3 6 0 0 9 0 0
+fn=fillin_rpath
+0 513 16 16 94 0 0 85 4 4
+fn=handle_intel
+0 195 4 4 26 0 0 45 1 1
+fn=index
+0 687 2 2 62 7 7 0 0 0
+fn=init_cacheinfo
+0 106 8 8 4 0 0 10 3 3
+fn=init_tls
+0 86 4 4 22 2 1 14 0 0
+fn=intel_02_known_compare
+0 1218 1 1 528 20 20 0 0 0
+fn=intel_check_word
+0 921 7 7 95 0 0 146 1 1
+fn=local_strdup
+0 68 1 1 8 0 0 16 0 0
+fn=malloc
+0 114 0 0 0 0 0 0 0 0
+fn=map_doit
+0 15 2 2 6 0 0 4 0 0
+fn=match_symbol
+0 1251 4 4 465 24 24 144 0 0
+fn=memcpy
+0 862 6 6 143 0 0 119 15 15
+fn=mempcpy
+0 2443 6 6 384 2 1 305 11 11
+fn=memset
+0 1042 3 3 7 0 0 515 67 67
+fn=mmap
+0 108 2 2 18 0 0 0 0 0
+fn=mprotect
+0 45 1 1 9 0 0 0 0 0
+fn=munmap
+0 5 0 0 1 0 0 0 0 0
+fn=open
+0 305 1 1 31 0 0 25 0 0
+fn=open_path
+0 2236 14 14 802 0 0 239 1 1
+fn=open_verify
+0 1879 11 11 604 7 7 325 4 4
+fn=openaux
+0 231 2 2 88 0 0 44 1 1
+fn=process_envvars
+0 230 9 9 74 4 4 16 3 3
+fn=read
+0 25 1 1 5 0 0 0 0 0
+fn=rindex
+0 105 3 3 6 2 1 0 0 0
+fn=rtld_lock_default_lock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=rtld_lock_default_unlock_recursive
+0 2 0 0 2 0 0 0 0 0
+fn=sbrk
+0 17 2 2 5 0 0 2 1 1
+fn=strcmp
+0 110867 2 2 32622 70 20 0 0 0
+fn=strlen
+0 776 2 2 99 2 2 0 0 0
+fn=strsep
+0 5157 3 3 821 0 0 8 0 0
+fn=uname
+0 5 1 1 1 0 0 0 0 0
+fn=version_check_doit
+0 10 1 1 4 0 0 2 0 0
+summary: 1273787 700 694 302365 6648 4096 100676 1095 817
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNumPIDs/template_valgrind_4478.txt b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNumPIDs/template_valgrind_4478.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/valgrindFiles/testNumPIDs/template_valgrind_4478.txt

Back to the top