From b2910fa0bda18a95c89ea5e50e1ae6d2594ca6b1 Mon Sep 17 00:00:00 2001 From: Lukas Rothenberger Date: Thu, 20 Jun 2024 10:08:24 +0200 Subject: [PATCH 1/5] feat: discopop_config_provider: add --full argument --- CMakeLists.txt | 8 ++++++++ .../ConfigProvider/ConfigProviderArguments.py | 1 + discopop_library/ConfigProvider/__main__.py | 3 +++ .../ConfigProvider/config_provider.py | 15 +++++++++++---- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7057db4d1..aad81af49 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,6 +86,14 @@ file(APPEND "${DiscoPoP_SOURCE_DIR}/discopop_library/ConfigProvider/assets/build file(APPEND "${DiscoPoP_SOURCE_DIR}/discopop_library/ConfigProvider/assets/build_config.py" "DP_SOURCE=\"${DiscoPoP_SOURCE_DIR}\"\n") file(APPEND "${DiscoPoP_SOURCE_DIR}/discopop_library/ConfigProvider/assets/build_config.py" "LLVM_BIN_DIR=\"${LLVM_TOOLS_BINARY_DIR}\"\n") file(APPEND "${DiscoPoP_SOURCE_DIR}/discopop_library/ConfigProvider/assets/build_config.py" "PYTHON_EXECUTABLE=\"${Python3_EXECUTABLE}\"\n") +file(APPEND "${DiscoPoP_SOURCE_DIR}/discopop_library/ConfigProvider/assets/build_config.py" "DP_HYBRID_PROFILING=\"${DP_HYBRID_PROFILING}\"\n") +file(APPEND "${DiscoPoP_SOURCE_DIR}/discopop_library/ConfigProvider/assets/build_config.py" "DP_PTHREAD_COMPATIBILITY_MODE=\"${DP_PTHREAD_COMPATIBILITY_MODE}\"\n") +file(APPEND "${DiscoPoP_SOURCE_DIR}/discopop_library/ConfigProvider/assets/build_config.py" "DP_RTLIB_VERBOSE=\"${DP_RTLIB_VERBOSE}\"\n") +file(APPEND "${DiscoPoP_SOURCE_DIR}/discopop_library/ConfigProvider/assets/build_config.py" "DP_NUM_WORKERS=\"${DP_NUM_WORKERS}\"\n") +file(APPEND "${DiscoPoP_SOURCE_DIR}/discopop_library/ConfigProvider/assets/build_config.py" "DP_INTERNAL_TIMER=\"${DP_INTERNAL_TIMER}\"\n") +file(APPEND "${DiscoPoP_SOURCE_DIR}/discopop_library/ConfigProvider/assets/build_config.py" "DP_MEMORY_REGION_DEALIASING=\"${DP_MEMORY_REGION_DEALIASING}\"\n") +file(APPEND "${DiscoPoP_SOURCE_DIR}/discopop_library/ConfigProvider/assets/build_config.py" "DP_STACK_ACCESS_DETECTION=\"${DP_STACK_ACCESS_DETECTION}\"\n") +file(APPEND "${DiscoPoP_SOURCE_DIR}/discopop_library/ConfigProvider/assets/build_config.py" "DP_CALLSTACK_PROFILING=\"${DP_CALLSTACK_PROFILING}\"\n") # install DiscoPoP python modules find_package(Python3 REQUIRED COMPONENTS Interpreter) diff --git a/discopop_library/ConfigProvider/ConfigProviderArguments.py b/discopop_library/ConfigProvider/ConfigProviderArguments.py index 3320d788b..fe9ec0937 100644 --- a/discopop_library/ConfigProvider/ConfigProviderArguments.py +++ b/discopop_library/ConfigProvider/ConfigProviderArguments.py @@ -15,6 +15,7 @@ class ConfigProviderArguments(object): return_dp_build_dir: bool return_dp_source_dir: bool return_llvm_bin_dir: bool + return_full_config: bool return_version_string: bool def __post_init__(self): diff --git a/discopop_library/ConfigProvider/__main__.py b/discopop_library/ConfigProvider/__main__.py index cdc4a294f..a46eb1f00 100644 --- a/discopop_library/ConfigProvider/__main__.py +++ b/discopop_library/ConfigProvider/__main__.py @@ -23,6 +23,8 @@ def parse_args() -> ConfigProviderArguments: help="Return the path to the DiscoPoP source directory") mutually_exclusive.add_argument("--llvm-bin-dir", action="store_true", help="Return the path to the LLVM bin directory") + mutually_exclusive.add_argument("-f", "--full", action="store_true", + help="Return the full configuration") mutually_exclusive.add_argument("-v", "--version", action="store_true", help="Return the version string of the DiscoPoP library") # EXPERIMENTAL FLAGS: @@ -34,6 +36,7 @@ def parse_args() -> ConfigProviderArguments: return_dp_build_dir=arguments.dp_build_dir, return_dp_source_dir=arguments.dp_source_dir, return_llvm_bin_dir=arguments.llvm_bin_dir, + return_full_config=arguments.full, return_version_string=arguments.version, ) diff --git a/discopop_library/ConfigProvider/config_provider.py b/discopop_library/ConfigProvider/config_provider.py index 64c36c41e..114f1b026 100644 --- a/discopop_library/ConfigProvider/config_provider.py +++ b/discopop_library/ConfigProvider/config_provider.py @@ -7,7 +7,7 @@ # directory for details. from discopop_library.ConfigProvider.ConfigProviderArguments import ConfigProviderArguments -from discopop_library.ConfigProvider.assets.build_config import DP_BUILD, DP_SOURCE, LLVM_BIN_DIR # type: ignore +from discopop_library.ConfigProvider.assets import build_config # DP_BUILD, DP_SOURCE, LLVM_BIN_DIR # type: ignore from discopop_library.global_data.version.utils import get_version @@ -15,11 +15,18 @@ def run(arguments: ConfigProviderArguments) -> str: """Returns the contents of the written build_config.txt""" if arguments.return_dp_build_dir: - return DP_BUILD # type: ignore + return build_config.DP_BUILD # type: ignore elif arguments.return_dp_source_dir: - return DP_SOURCE # type: ignore + return build_config.DP_SOURCE # type: ignore elif arguments.return_llvm_bin_dir: - return LLVM_BIN_DIR # type: ignore + return build_config.LLVM_BIN_DIR # type: ignore + elif arguments.return_full_config: + ret_str = "" + for name in [n for n in build_config.__dict__ if not n.startswith("_")]: + if len(ret_str) != 0: + ret_str += "\n" + ret_str += name +": " + build_config.__dict__[name] + return ret_str elif arguments.return_version_string: return get_version() else: From 29a8c348d739e17d1f99f8fd76e3fa12d8946c49 Mon Sep 17 00:00:00 2001 From: Lukas Rothenberger Date: Thu, 20 Jun 2024 10:27:30 +0200 Subject: [PATCH 2/5] doc: print discopop configuration during CMake build --- CMakeLists.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index aad81af49..15a898200 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,7 @@ endif() # Print DiscoPoP version to be installed file(READ ${CMAKE_CURRENT_LIST_DIR}/discopop_library/global_data/version/VERSION DiscoPoP_VERSION) +string(REGEX REPLACE "\n$" "" DiscoPoP_VERSION "${DiscoPoP_VERSION}") message(STATUS "DiscoPoP version: ${DiscoPoP_VERSION}") if(NOT ${LLVM_DIST_PATH} STREQUAL "") @@ -82,6 +83,7 @@ file(APPEND "${DiscoPoP_BINARY_DIR}/build_config.txt" "PYTHON_EXECUTABLE=${Pytho # save build_config.py to discopop_library/ConfigProvider/assets for easy accessibility and global use file(REMOVE "${DiscoPoP_SOURCE_DIR}/discopop_library/ConfigProvider/assets/build_config.py") file(TOUCH "${DiscoPoP_SOURCE_DIR}/discopop_library/ConfigProvider/assets/build_config.py") +file(APPEND "${DiscoPoP_SOURCE_DIR}/discopop_library/ConfigProvider/assets/build_config.py" "DP_VERSION=\"${DiscoPoP_VERSION}\"\n") file(APPEND "${DiscoPoP_SOURCE_DIR}/discopop_library/ConfigProvider/assets/build_config.py" "DP_BUILD=\"${DiscoPoP_BINARY_DIR}\"\n") file(APPEND "${DiscoPoP_SOURCE_DIR}/discopop_library/ConfigProvider/assets/build_config.py" "DP_SOURCE=\"${DiscoPoP_SOURCE_DIR}\"\n") file(APPEND "${DiscoPoP_SOURCE_DIR}/discopop_library/ConfigProvider/assets/build_config.py" "LLVM_BIN_DIR=\"${LLVM_TOOLS_BINARY_DIR}\"\n") @@ -95,6 +97,12 @@ file(APPEND "${DiscoPoP_SOURCE_DIR}/discopop_library/ConfigProvider/assets/build file(APPEND "${DiscoPoP_SOURCE_DIR}/discopop_library/ConfigProvider/assets/build_config.py" "DP_STACK_ACCESS_DETECTION=\"${DP_STACK_ACCESS_DETECTION}\"\n") file(APPEND "${DiscoPoP_SOURCE_DIR}/discopop_library/ConfigProvider/assets/build_config.py" "DP_CALLSTACK_PROFILING=\"${DP_CALLSTACK_PROFILING}\"\n") +# print DiscoPoP configuration +file(READ ${DiscoPoP_SOURCE_DIR}/discopop_library/ConfigProvider/assets/build_config.py DiscoPoP_CONFIGURATION) +string(REGEX REPLACE "\n$" "" DiscoPoP_CONFIGURATION "${DiscoPoP_CONFIGURATION}") +string(REGEX REPLACE "\n" "\n " DiscoPoP_CONFIGURATION "${DiscoPoP_CONFIGURATION}") +message(STATUS "DiscoPoP configuration:\n ${DiscoPoP_CONFIGURATION}") + # install DiscoPoP python modules find_package(Python3 REQUIRED COMPONENTS Interpreter) From 9e788d580ed8e019eda3a9c888be53f89f8a081e Mon Sep 17 00:00:00 2001 From: Lukas Rothenberger Date: Thu, 20 Jun 2024 10:44:10 +0200 Subject: [PATCH 3/5] doc: print warnings for settings which negatively impact profiling speed --- DiscoPoP/CMakeLists.txt | 5 +++-- rtlib/CMakeLists.txt | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/DiscoPoP/CMakeLists.txt b/DiscoPoP/CMakeLists.txt index 7519d5bb9..abc5162c5 100644 --- a/DiscoPoP/CMakeLists.txt +++ b/DiscoPoP/CMakeLists.txt @@ -19,10 +19,11 @@ add_llvm_library(LLVMDiscoPoP MODULE # forward compiler flags if(DEFINED DP_HYBRID_PROFILING) - message("Defined DP_HYBRID_PROFILING=" ${DP_HYBRID_PROFILING}) target_compile_definitions(LLVMDiscoPoP PUBLIC DP_HYBRID_PROFILING=${DP_HYBRID_PROFILING}) + if(${DP_HYBRID_PROFILING} EQUAL 0) + message(STATUS "WARNING: DiscoPoP configuration: DP_HYBRID_PROFILING disabled. Reduces profiling speed.") + endif() else() target_compile_definitions(LLVMDiscoPoP PUBLIC DP_HYBRID_PROFILING=1) - message("Default defined DP_HYBRID_PROFILING=1") endif() # end of compiler flags \ No newline at end of file diff --git a/rtlib/CMakeLists.txt b/rtlib/CMakeLists.txt index 29770a50d..3c97e6820 100644 --- a/rtlib/CMakeLists.txt +++ b/rtlib/CMakeLists.txt @@ -53,6 +53,7 @@ add_library(DiscoPoP_RT STATIC if(DEFINED DP_PTHREAD_COMPATIBILITY_MODE) if(NOT ${DP_PTHREAD_COMPATIBILITY_MODE} EQUAL 0) target_compile_definitions(DiscoPoP_RT PUBLIC DP_PTHREAD_COMPATIBILITY_MODE=${DP_PTHREAD_COMPATIBILITY_MODE}) + message(STATUS "WARNING: DiscoPoP configuration: DP_PTHREAD_COMPATIBILITY_MODE enabled. Reduces profiling speed.") endif() endif() @@ -69,24 +70,28 @@ endif() if(DEFINED DP_INTERNAL_TIMER) if(NOT ${DP_INTERNAL_TIMER} EQUAL 0) target_compile_definitions(DiscoPoP_RT PUBLIC DP_INTERNAL_TIMER=${DP_INTERNAL_TIMER}) + message(STATUS "WARNING: DiscoPoP configuration: DP_INTERNAL_TIMER enabled. Debug setting. Reduces profiling speed.") endif() endif() if(DEFINED DP_MEMORY_REGION_DEALIASING) if(NOT ${DP_MEMORY_REGION_DEALIASING} EQUAL 0) target_compile_definitions(DiscoPoP_RT PUBLIC DP_MEMORY_REGION_DEALIASING=${DP_MEMORY_REGION_DEALIASING}) + message(STATUS "WARNING: DiscoPoP configuration: DP_MEMORY_REGION_DEALIASING enabled. Reduces profiling speed.") endif() endif() if(DEFINED DP_STACK_ACCESS_DETECTION) if(NOT ${DP_STACK_ACCESS_DETECTION} EQUAL 0) target_compile_definitions(DiscoPoP_RT PUBLIC DP_STACK_ACCESS_DETECTION=${DP_STACK_ACCESS_DETECTION}) + message(STATUS "WARNING: DiscoPoP configuration: DP_STACK_ACCESS_DETECTION enabled. Reduces profiling speed.") endif() endif() if(DEFINED DP_CALLSTACK_PROFILING) if(NOT ${DP_CALLSTACK_PROFILING} EQUAL 0) target_compile_definitions(DiscoPoP_RT PUBLIC DP_CALLSTACK_PROFILING=${DP_CALLSTACK_PROFILING}) + message(STATUS "WARNING: DiscoPoP configuration: DP_CALLSTACK_PROFILING enabled. Reduces profiling speed.") endif() endif() From e78b325cae7a24ec5196be90191a426eea737f1f Mon Sep 17 00:00:00 2001 From: Lukas Rothenberger Date: Thu, 20 Jun 2024 11:09:33 +0200 Subject: [PATCH 4/5] fix: minor --- .../ConfigProvider/config_provider.py | 21 ++++++++++++------- discopop_library/PatchGenerator/__main__.py | 12 +++++++++-- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/discopop_library/ConfigProvider/config_provider.py b/discopop_library/ConfigProvider/config_provider.py index 114f1b026..e78ce7e97 100644 --- a/discopop_library/ConfigProvider/config_provider.py +++ b/discopop_library/ConfigProvider/config_provider.py @@ -6,8 +6,10 @@ # the 3-Clause BSD License. See the LICENSE file in the package base # directory for details. +import os +from pathlib import Path from discopop_library.ConfigProvider.ConfigProviderArguments import ConfigProviderArguments -from discopop_library.ConfigProvider.assets import build_config # DP_BUILD, DP_SOURCE, LLVM_BIN_DIR # type: ignore +from discopop_library.ConfigProvider.assets.build_config import DP_BUILD, DP_SOURCE, LLVM_BIN_DIR # type: ignore from discopop_library.global_data.version.utils import get_version @@ -15,17 +17,20 @@ def run(arguments: ConfigProviderArguments) -> str: """Returns the contents of the written build_config.txt""" if arguments.return_dp_build_dir: - return build_config.DP_BUILD # type: ignore + return DP_BUILD # type: ignore elif arguments.return_dp_source_dir: - return build_config.DP_SOURCE # type: ignore + return DP_SOURCE # type: ignore elif arguments.return_llvm_bin_dir: - return build_config.LLVM_BIN_DIR # type: ignore + return LLVM_BIN_DIR # type: ignore elif arguments.return_full_config: ret_str = "" - for name in [n for n in build_config.__dict__ if not n.startswith("_")]: - if len(ret_str) != 0: - ret_str += "\n" - ret_str += name +": " + build_config.__dict__[name] + assets_path = os.path.join(Path(__file__).parent.absolute(), "assets", "build_config.py") + with open(assets_path, "r") as f: + for line in f.readlines(): + ret_str += line + # remove trailing \n + if ret_str[-1] == "\n": + ret_str = ret_str[:-1] return ret_str elif arguments.return_version_string: return get_version() diff --git a/discopop_library/PatchGenerator/__main__.py b/discopop_library/PatchGenerator/__main__.py index 1eca7ddd9..9aac4ad38 100644 --- a/discopop_library/PatchGenerator/__main__.py +++ b/discopop_library/PatchGenerator/__main__.py @@ -49,14 +49,22 @@ def parse_args() -> PatchGeneratorArguments: # determine DP build path arguments.dp_build_path = run_config_provider( ConfigProviderArguments( - return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, return_version_string=False + return_dp_build_dir=True, + return_dp_source_dir=False, + return_llvm_bin_dir=False, + return_full_config=False, + return_version_string=False, ) ) # determine LLVM_BIN_DIR llvm_bin_dir = run_config_provider( ConfigProviderArguments( - return_dp_build_dir=False, return_dp_source_dir=False, return_llvm_bin_dir=True, return_version_string=False + return_dp_build_dir=False, + return_dp_source_dir=False, + return_llvm_bin_dir=True, + return_full_config=False, + return_version_string=False, ) ) # determine CC From 27c8eb84707b174bd837c7cf96c856169c45db50 Mon Sep 17 00:00:00 2001 From: Lukas Rothenberger Date: Thu, 20 Jun 2024 11:26:24 +0200 Subject: [PATCH 5/5] fix: add missing arguments --- test/do_all/backwards_array_access/test.py | 1 + test/do_all/calls/LULESH_proxy/test.py | 1 + test/do_all/calls/above_nesting_level_3/test.py | 1 + test/do_all/calls/allowing/test.py | 1 + test/do_all/calls/allowing_2/test.py | 1 + test/do_all/calls/preventing/simple/test.py | 1 + test/do_all/calls/second_order/allowing/test.py | 1 + test/do_all/calls/second_order/allowing_2/test.py | 1 + test/do_all/calls/second_order/preventing/test.py | 1 + test/do_all/calls/second_order/preventing_2/test.py | 1 + test/do_all/daxpy/test.py | 1 + test/do_all/negative/nested/OMPSCR/c_Mandelbrot/test.py | 1 + .../global_vars/miniFE_CSRMatrix_proxy/global_arrays/test.py | 1 + .../global_vars/miniFE_CSRMatrix_proxy/global_struct/test.py | 1 + .../global_vars/miniFE_CSRMatrix_proxy/global_vectors/test.py | 1 + .../miniFE_CSRMatrix_proxy/global_vectors_and_struct/test.py | 1 + test/do_all/simple/nested/depth_2/negative/test.py | 1 + .../simple/nested/depth_2/positive/both_loops_doall/test.py | 1 + .../simple/nested/depth_2/positive/inner_loop_doall/test.py | 1 + .../simple/nested/depth_2/positive/outer_loop_doall/test.py | 1 + test/do_all/simple/not_nested/negative/minimal/test.py | 1 + test/do_all/simple/not_nested/negative/stack_access/test.py | 1 + test/do_all/simple/not_nested/positive/test.py | 1 + test/do_all/stack_access/nested/positive/test.py | 1 + test/do_all/stack_access/various/case_0/test.py | 1 + test/do_all/stack_access/various/case_1/test.py | 1 + test/do_all/stack_access/various/case_2/test.py | 1 + test/do_all/stack_access/various/case_3/test.py | 1 + test/do_all/stack_access/various/case_4/test.py | 1 + test/do_all/stack_access/various/case_5/test.py | 1 + .../miniFE_CSRMatrix_proxy/access_outside_struct/test.py | 1 + .../positive/miniFE_CSRMatrix_proxy/std_data_types/test.py | 1 + .../positive/miniFE_CSRMatrix_proxy/template_data_types/test.py | 1 + .../loop_collapse/negative/outer_loop_doall_only/test.py | 1 + test/optimizer/loop_collapse/negative/simple_1/test.py | 1 + test/optimizer/loop_collapse/positive/simple_1/test.py | 1 + .../positive/nested/OMPSCR/c_Mandelbrot/test.py | 1 + 37 files changed, 37 insertions(+) diff --git a/test/do_all/backwards_array_access/test.py b/test/do_all/backwards_array_access/test.py index 736e815a8..9b49d9e0c 100644 --- a/test/do_all/backwards_array_access/test.py +++ b/test/do_all/backwards_array_access/test.py @@ -19,6 +19,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/calls/LULESH_proxy/test.py b/test/do_all/calls/LULESH_proxy/test.py index acd126eea..2b5acc8fc 100644 --- a/test/do_all/calls/LULESH_proxy/test.py +++ b/test/do_all/calls/LULESH_proxy/test.py @@ -21,6 +21,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/calls/above_nesting_level_3/test.py b/test/do_all/calls/above_nesting_level_3/test.py index 999c59d34..d11aac7fd 100644 --- a/test/do_all/calls/above_nesting_level_3/test.py +++ b/test/do_all/calls/above_nesting_level_3/test.py @@ -19,6 +19,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/calls/allowing/test.py b/test/do_all/calls/allowing/test.py index bfc3afb53..c32e4b3f8 100644 --- a/test/do_all/calls/allowing/test.py +++ b/test/do_all/calls/allowing/test.py @@ -19,6 +19,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/calls/allowing_2/test.py b/test/do_all/calls/allowing_2/test.py index 1419ca8e3..3bad81fc8 100644 --- a/test/do_all/calls/allowing_2/test.py +++ b/test/do_all/calls/allowing_2/test.py @@ -19,6 +19,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/calls/preventing/simple/test.py b/test/do_all/calls/preventing/simple/test.py index ed4dc841a..72a524fca 100644 --- a/test/do_all/calls/preventing/simple/test.py +++ b/test/do_all/calls/preventing/simple/test.py @@ -20,6 +20,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/calls/second_order/allowing/test.py b/test/do_all/calls/second_order/allowing/test.py index bfc3afb53..c32e4b3f8 100644 --- a/test/do_all/calls/second_order/allowing/test.py +++ b/test/do_all/calls/second_order/allowing/test.py @@ -19,6 +19,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/calls/second_order/allowing_2/test.py b/test/do_all/calls/second_order/allowing_2/test.py index bfc3afb53..c32e4b3f8 100644 --- a/test/do_all/calls/second_order/allowing_2/test.py +++ b/test/do_all/calls/second_order/allowing_2/test.py @@ -19,6 +19,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/calls/second_order/preventing/test.py b/test/do_all/calls/second_order/preventing/test.py index ed4dc841a..72a524fca 100644 --- a/test/do_all/calls/second_order/preventing/test.py +++ b/test/do_all/calls/second_order/preventing/test.py @@ -20,6 +20,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/calls/second_order/preventing_2/test.py b/test/do_all/calls/second_order/preventing_2/test.py index ed4dc841a..72a524fca 100644 --- a/test/do_all/calls/second_order/preventing_2/test.py +++ b/test/do_all/calls/second_order/preventing_2/test.py @@ -20,6 +20,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/daxpy/test.py b/test/do_all/daxpy/test.py index df0fd81b2..27c8cb42a 100644 --- a/test/do_all/daxpy/test.py +++ b/test/do_all/daxpy/test.py @@ -19,6 +19,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/negative/nested/OMPSCR/c_Mandelbrot/test.py b/test/do_all/negative/nested/OMPSCR/c_Mandelbrot/test.py index f948a67e3..e81ffe275 100644 --- a/test/do_all/negative/nested/OMPSCR/c_Mandelbrot/test.py +++ b/test/do_all/negative/nested/OMPSCR/c_Mandelbrot/test.py @@ -21,6 +21,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_arrays/test.py b/test/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_arrays/test.py index 41d5dd67b..90f26614f 100644 --- a/test/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_arrays/test.py +++ b/test/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_arrays/test.py @@ -21,6 +21,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_struct/test.py b/test/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_struct/test.py index 6ca056be8..9ac06cc0e 100644 --- a/test/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_struct/test.py +++ b/test/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_struct/test.py @@ -21,6 +21,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_vectors/test.py b/test/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_vectors/test.py index 6ca056be8..9ac06cc0e 100644 --- a/test/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_vectors/test.py +++ b/test/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_vectors/test.py @@ -21,6 +21,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_vectors_and_struct/test.py b/test/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_vectors_and_struct/test.py index 6ca056be8..9ac06cc0e 100644 --- a/test/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_vectors_and_struct/test.py +++ b/test/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_vectors_and_struct/test.py @@ -21,6 +21,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/simple/nested/depth_2/negative/test.py b/test/do_all/simple/nested/depth_2/negative/test.py index 970ce22a8..984b230cd 100644 --- a/test/do_all/simple/nested/depth_2/negative/test.py +++ b/test/do_all/simple/nested/depth_2/negative/test.py @@ -21,6 +21,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/simple/nested/depth_2/positive/both_loops_doall/test.py b/test/do_all/simple/nested/depth_2/positive/both_loops_doall/test.py index 2337b56b0..f44777578 100644 --- a/test/do_all/simple/nested/depth_2/positive/both_loops_doall/test.py +++ b/test/do_all/simple/nested/depth_2/positive/both_loops_doall/test.py @@ -21,6 +21,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/simple/nested/depth_2/positive/inner_loop_doall/test.py b/test/do_all/simple/nested/depth_2/positive/inner_loop_doall/test.py index a2a587cbd..8f5d8a95b 100644 --- a/test/do_all/simple/nested/depth_2/positive/inner_loop_doall/test.py +++ b/test/do_all/simple/nested/depth_2/positive/inner_loop_doall/test.py @@ -21,6 +21,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/simple/nested/depth_2/positive/outer_loop_doall/test.py b/test/do_all/simple/nested/depth_2/positive/outer_loop_doall/test.py index 0c422d254..446df6b11 100644 --- a/test/do_all/simple/nested/depth_2/positive/outer_loop_doall/test.py +++ b/test/do_all/simple/nested/depth_2/positive/outer_loop_doall/test.py @@ -21,6 +21,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/simple/not_nested/negative/minimal/test.py b/test/do_all/simple/not_nested/negative/minimal/test.py index ed4dc841a..72a524fca 100644 --- a/test/do_all/simple/not_nested/negative/minimal/test.py +++ b/test/do_all/simple/not_nested/negative/minimal/test.py @@ -20,6 +20,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/simple/not_nested/negative/stack_access/test.py b/test/do_all/simple/not_nested/negative/stack_access/test.py index 72be26480..88d261028 100644 --- a/test/do_all/simple/not_nested/negative/stack_access/test.py +++ b/test/do_all/simple/not_nested/negative/stack_access/test.py @@ -20,6 +20,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/simple/not_nested/positive/test.py b/test/do_all/simple/not_nested/positive/test.py index f4cc6232c..c38f26d39 100644 --- a/test/do_all/simple/not_nested/positive/test.py +++ b/test/do_all/simple/not_nested/positive/test.py @@ -21,6 +21,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/stack_access/nested/positive/test.py b/test/do_all/stack_access/nested/positive/test.py index 975dfeb9f..8579f87cb 100644 --- a/test/do_all/stack_access/nested/positive/test.py +++ b/test/do_all/stack_access/nested/positive/test.py @@ -21,6 +21,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/stack_access/various/case_0/test.py b/test/do_all/stack_access/various/case_0/test.py index bfc3afb53..c32e4b3f8 100644 --- a/test/do_all/stack_access/various/case_0/test.py +++ b/test/do_all/stack_access/various/case_0/test.py @@ -19,6 +19,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/stack_access/various/case_1/test.py b/test/do_all/stack_access/various/case_1/test.py index 2f1e09285..ee32eda09 100644 --- a/test/do_all/stack_access/various/case_1/test.py +++ b/test/do_all/stack_access/various/case_1/test.py @@ -19,6 +19,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/stack_access/various/case_2/test.py b/test/do_all/stack_access/various/case_2/test.py index bfc3afb53..c32e4b3f8 100644 --- a/test/do_all/stack_access/various/case_2/test.py +++ b/test/do_all/stack_access/various/case_2/test.py @@ -19,6 +19,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/stack_access/various/case_3/test.py b/test/do_all/stack_access/various/case_3/test.py index 1419ca8e3..3bad81fc8 100644 --- a/test/do_all/stack_access/various/case_3/test.py +++ b/test/do_all/stack_access/various/case_3/test.py @@ -19,6 +19,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/stack_access/various/case_4/test.py b/test/do_all/stack_access/various/case_4/test.py index 2f1e09285..ee32eda09 100644 --- a/test/do_all/stack_access/various/case_4/test.py +++ b/test/do_all/stack_access/various/case_4/test.py @@ -19,6 +19,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/stack_access/various/case_5/test.py b/test/do_all/stack_access/various/case_5/test.py index 9c61dd76f..6eebd577b 100644 --- a/test/do_all/stack_access/various/case_5/test.py +++ b/test/do_all/stack_access/various/case_5/test.py @@ -19,6 +19,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/struct/positive/miniFE_CSRMatrix_proxy/access_outside_struct/test.py b/test/do_all/struct/positive/miniFE_CSRMatrix_proxy/access_outside_struct/test.py index b32822e57..af9cf5fa5 100644 --- a/test/do_all/struct/positive/miniFE_CSRMatrix_proxy/access_outside_struct/test.py +++ b/test/do_all/struct/positive/miniFE_CSRMatrix_proxy/access_outside_struct/test.py @@ -21,6 +21,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/struct/positive/miniFE_CSRMatrix_proxy/std_data_types/test.py b/test/do_all/struct/positive/miniFE_CSRMatrix_proxy/std_data_types/test.py index 6ca056be8..9ac06cc0e 100644 --- a/test/do_all/struct/positive/miniFE_CSRMatrix_proxy/std_data_types/test.py +++ b/test/do_all/struct/positive/miniFE_CSRMatrix_proxy/std_data_types/test.py @@ -21,6 +21,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/do_all/struct/positive/miniFE_CSRMatrix_proxy/template_data_types/test.py b/test/do_all/struct/positive/miniFE_CSRMatrix_proxy/template_data_types/test.py index 7c8eea68a..51b03296f 100644 --- a/test/do_all/struct/positive/miniFE_CSRMatrix_proxy/template_data_types/test.py +++ b/test/do_all/struct/positive/miniFE_CSRMatrix_proxy/template_data_types/test.py @@ -21,6 +21,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/optimizer/loop_collapse/negative/outer_loop_doall_only/test.py b/test/optimizer/loop_collapse/negative/outer_loop_doall_only/test.py index 64e4d6b57..96532cf9d 100644 --- a/test/optimizer/loop_collapse/negative/outer_loop_doall_only/test.py +++ b/test/optimizer/loop_collapse/negative/outer_loop_doall_only/test.py @@ -19,6 +19,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/optimizer/loop_collapse/negative/simple_1/test.py b/test/optimizer/loop_collapse/negative/simple_1/test.py index 64e4d6b57..96532cf9d 100644 --- a/test/optimizer/loop_collapse/negative/simple_1/test.py +++ b/test/optimizer/loop_collapse/negative/simple_1/test.py @@ -19,6 +19,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/optimizer/loop_collapse/positive/simple_1/test.py b/test/optimizer/loop_collapse/positive/simple_1/test.py index a5c931de5..67be2c441 100644 --- a/test/optimizer/loop_collapse/positive/simple_1/test.py +++ b/test/optimizer/loop_collapse/positive/simple_1/test.py @@ -19,6 +19,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) ) diff --git a/test/reduction_pattern/positive/nested/OMPSCR/c_Mandelbrot/test.py b/test/reduction_pattern/positive/nested/OMPSCR/c_Mandelbrot/test.py index 36e2b2e17..7f127483f 100644 --- a/test/reduction_pattern/positive/nested/OMPSCR/c_Mandelbrot/test.py +++ b/test/reduction_pattern/positive/nested/OMPSCR/c_Mandelbrot/test.py @@ -21,6 +21,7 @@ def test(self): return_dp_build_dir=True, return_dp_source_dir=False, return_llvm_bin_dir=False, + return_full_config=False, return_version_string=False, ) )