diff --git a/DEBIAN/postinst b/DEBIAN/postinst index 5f20ef6f6..ab067e4f7 100755 --- a/DEBIAN/postinst +++ b/DEBIAN/postinst @@ -18,7 +18,7 @@ LLVM_DIR=${DP_BUILD_DIR}/third_party/llvm-11.1.0 echo "Building DiscoPoP" cd ${DP_BUILD_DIR} cmake .. -DLLVM_DIST_PATH=${LLVM_DIR} -DIS_DEB_INSTALL="TRUE" -DDP_PTHREAD_COMPATIBILITY_MODE=0 -DDP_NUM_WORKERS=8 -DDP_RTLIB_VERBOSE=0 -DDP_MEMORY_REGION_DEALIASING=0 -DDP_BRANCH_TRACKING=0 -DDP_CALLSTACK_PROFILING=0 -DDP_STACK_ACCESS_DETECTION=0 -DDP_CALLSTACK_PROFILING_ENABLE_CUTOFF=1 -DDP_INTERNAL_TIMER=0 -DDP_HYBRID_PROFILING=1 -DDP_HYBRID_PROFILING_CUTOFF=0 -DDP_HYBRID_PROFILING_CUTOFF_IGNORE_PROBABILITY=1 -DDP_PROFILING_SAMPLING_PROBABILITY=0 -DDP_CALLTREE_PROFILING=1 -DDP_CALLTREE_PROFILING_METADATA_CUTOFF=5 -DDP_CALLTREE_PROFILING_METADATA_CUTOFF_IGNORE_PROBABILITY=1 -make -j +make -j 4 chmod -R 777 ${DP_DIR} diff --git a/README.md b/README.md index 51ccc421a..2831e632d 100644 --- a/README.md +++ b/README.md @@ -34,25 +34,25 @@ For a brief introduction to the command line tools, please refer to the [tools o For detailed information on the gathered and stored data as well as the tools themselves, please refer to [data](https://discopop-project.github.io/discopop/Data) and the pages of the individual tools in the [tools overview](https://discopop-project.github.io/discopop/Tools). ## TL;DR -This example installs DiscoPoP, instruments and builds the provided example, analyzes the results, and prints the identified parallelization suggestions to the console. +If you are interested in installing DiscoPoP as a `developer`, please refer to the [DiscoPoP setup wiki page](https://discopop-project.github.io/discopop/setup/discopop/). + +The following example installs DiscoPoP for `users`, instruments and builds the provided example, analyzes the results, and prints the identified parallelization suggestions to the console. In case any issues arise during the process, please refer to the detailed [setup instructions](https://discopop-project.github.io/discopop/Setup), contact us via GitHub messages, or get in contact by mail to [discopop-support@lists.parallel.informatik.tu-darmstadt.de](mailto:discopop-support@lists.parallel.informatik.tu-darmstadt.de). + +### Prerequisites +- Download `.deb` package from [latest Release](https://github.com/discopop-project/discopop/releases/latest) +### Example ``` -# setup DiscoPoP -git clone git@github.com:discopop-project/discopop.git -cd discopop -mkdir build && cd build -DP_BUILD=$(pwd) -cmake .. && make +# install package +sudo apt install ./.deb # instrument and build the example code -cd ../example -mkdir build && cd build && cmake -DCMAKE_CXX_COMPILER=${DP_BUILD}/scripts/CXX_wrapper.sh .. && make +cd /opt/DiscoPoP/example +mkdir build && cd build && cmake -DCMAKE_CXX_COMPILER=discopop_cxx .. && make # execute instrumented code ./cmake_example # identify parallel patterns cd .discopop discopop_explorer -# create applicable patches from patterns -discopop_patch_generator # print patches to the console for f in $(find patch_generator -maxdepth 1 -type d); do echo "SUGGESTION: $f" diff --git a/discopop_library/global_data/version/VERSION b/discopop_library/global_data/version/VERSION index fcdb2e109..1454f6ed4 100644 --- a/discopop_library/global_data/version/VERSION +++ b/discopop_library/global_data/version/VERSION @@ -1 +1 @@ -4.0.0 +4.0.1 diff --git a/docs/setup/discopop.md b/docs/setup/discopop.md index 521d1130c..d975dd30f 100644 --- a/docs/setup/discopop.md +++ b/docs/setup/discopop.md @@ -5,7 +5,16 @@ parent: Setup nav_order: 1 --- -# DiscoPoP Setup +# DiscoPoP Setup - Package +- Proposed method of installation for `users` of DiscoPoP +- Download the `.deb` package of choice from [releases](https://github.com/discopop-project/discopop/releases). + - Packages for different targets and configurations might become available in the future +- Install via a package manager of choice (example: `sudo apt install ./.deb`) +- Uninstall via a package manager of choice (example: `sudo apt remove discopop`) + + +# DiscoPoP Setup - Manual +- Proposed method of installation for `developers` of DiscoPoP ## Prerequisites - LLVM/clang version 11 - Python version 3.6 or greater @@ -47,5 +56,6 @@ where `` can consist of any combination of the following flags and ## Testing the installation To test the installation, it is possible to execute the provided set of unit tests. ``` -python -m unittest -v +cd +venv/bin/python -m unittest -v ``` diff --git a/test/end_to_end/do_all/calls/second_order/preventing_2/src/FileMapping.txt b/test/end_to_end/do_all/calls/second_order/preventing_2/src/FileMapping.txt new file mode 100644 index 000000000..e0d0aacbe --- /dev/null +++ b/test/end_to_end/do_all/calls/second_order/preventing_2/src/FileMapping.txt @@ -0,0 +1 @@ +1 /home/lukas/git/discopop/test/end_to_end/do_all/calls/second_order/preventing_2/src/code.cpp