Commit 95df29f7 authored by Ondrej Vysocky's avatar Ondrej Vysocky
Browse files

Merge branch 'dev'

parents e96738e0 63f82afd
......@@ -7,7 +7,7 @@ The library originally developed for x86 systems (tested on HSW, BDW and KNL) bu
--------------------------------------------------------------------------------
# README Content #
--------------------------------------------------------------------------------
<!--> master branch links <!-->
<!--> master branch links
1. [Content of src folder](https://code.it4i.cz/vys0053/meric#1-content-of-src-folder)
2. [MERIC and TIMEPROF interface and Shared Score-P/MERIC API](https://code.it4i.cz/vys0053/meric#2-meric-and-timeprof-interface-and-shared-score-pmeric-api)
3. [MERIC binary instrumentation](https://code.it4i.cz/vys0053/meric#3-meric-binary-instrumentation)
......@@ -20,8 +20,8 @@ The library originally developed for x86 systems (tested on HSW, BDW and KNL) bu
10. [Using MERIC on D.A.V.I.D.E. system](https://code.it4i.cz/vys0053/meric#10-using-meric-on-cineca-davide-system)
11. [Tool for static tuning](https://code.it4i.cz/vys0053/meric#11-tool-for-static-tuning)
12. [Acknowledgement](https://code.it4i.cz/vys0053/meric#12-acknowledgement)
<!--> dev branch links
<!-->
<!--> dev branch links <!-->
1. [Content of src folder](https://code.it4i.cz/vys0053/meric/tree/dev#1-content-of-src-folder)
2. [MERIC and TIMEPROF interface and Shared Score-P/MERIC API](https://code.it4i.cz/vys0053/meric/tree/dev#2-meric-and-timeprof-interface-and-shared-score-pmeric-api)
3. [MERIC binary instrumentation](https://code.it4i.cz/vys0053/meric/tree/dev#3-meric-binary-instrumentation)
......@@ -34,7 +34,7 @@ The library originally developed for x86 systems (tested on HSW, BDW and KNL) bu
10. [Using MERIC on D.A.V.I.D.E. system](https://code.it4i.cz/vys0053/meric/tree/dev#10-using-meric-on-cineca-davide-system)
11. [Tool for static tuning](https://code.it4i.cz/vys0053/meric/tree/dev#11-tool-for-static-tuning)
12. [Acknowledgement](https://code.it4i.cz/vys0053/meric/tree/dev#12-acknowledgement)
<!-->
--------------------------------------------------------------------------------
# 1] Content of src folder #
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment