discopop 3.2.0__tar.gz → 3.2.1__tar.gz

{discopop-3.2.0/discopop.egg-info → discopop-3.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: discopop
-Version: 3.2.0
+Version: 3.2.1
 Summary: DiscoPoP is a tool that helps software developers parallelize their programs with threads. It discovers potential parallelism in a sequential program and makes recommendations on how to exploit it.
 Home-page: https://www.discopop.tu-darmstadt.de/
 Author: TU Darmstadt and Iowa State University

{discopop-3.2.0 → discopop-3.2.1/discopop.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: discopop
-Version: 3.2.0
+Version: 3.2.1
 Summary: DiscoPoP is a tool that helps software developers parallelize their programs with threads. It discovers potential parallelism in a sequential program and makes recommendations on how to exploit it.
 Home-page: https://www.discopop.tu-darmstadt.de/
 Author: TU Darmstadt and Iowa State University

{discopop-3.2.0 → discopop-3.2.1}/discopop.egg-info/SOURCES.txt

@@ -286,94 +286,111 @@ discopop_library/result_classes/OptimizerOutputPattern.py
 discopop_library/result_classes/PatternStorage.py
 discopop_library/result_classes/__init__.py
 test/__init__.py
-test/do_all/__init__.py
-test/do_all/backwards_array_access/__init__.py
-test/do_all/backwards_array_access/test.py
-test/do_all/calls/__init__.py
-test/do_all/calls/allowing/__init__.py
-test/do_all/calls/allowing/test.py
-test/do_all/calls/preventing/__init__.py
-test/do_all/calls/preventing/simple/__init__.py
-test/do_all/calls/preventing/simple/test.py
-test/do_all/calls/second_order/__init__.py
-test/do_all/calls/second_order/allowing/__init__.py
-test/do_all/calls/second_order/allowing/test.py
-test/do_all/calls/second_order/allowing_2/__init__.py
-test/do_all/calls/second_order/allowing_2/test.py
-test/do_all/calls/second_order/preventing/__init__.py
-test/do_all/calls/second_order/preventing/test.py
-test/do_all/calls/second_order/preventing_2/__init__.py
-test/do_all/calls/second_order/preventing_2/test.py
-test/do_all/daxpy/__init__.py
-test/do_all/daxpy/test.py
-test/do_all/negative/__init__.py
-test/do_all/negative/nested/__init__.py
-test/do_all/negative/nested/OMPSCR/__init__.py
-test/do_all/simple/__init__.py
-test/do_all/simple/global_vars/__init__.py
-test/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/__init__.py
-test/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_arrays/__init__.py
-test/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_arrays/test.py
-test/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_struct/__init__.py
-test/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_struct/test.py
-test/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_vectors/__init__.py
-test/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_vectors/test.py
-test/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_vectors_and_struct/__init__.py
-test/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_vectors_and_struct/test.py
-test/do_all/simple/nested/__init__.py
-test/do_all/simple/nested/depth_2/__init__.py
-test/do_all/simple/nested/depth_2/positive/__init__.py
-test/do_all/simple/nested/depth_2/positive/both_loops_doall/__init__.py
-test/do_all/simple/nested/depth_2/positive/both_loops_doall/test.py
-test/do_all/simple/nested/depth_2/positive/inner_loop_doall/__init__.py
-test/do_all/simple/nested/depth_2/positive/inner_loop_doall/test.py
-test/do_all/simple/nested/depth_2/positive/outer_loop_doall/__init__.py
-test/do_all/simple/nested/depth_2/positive/outer_loop_doall/test.py
-test/do_all/simple/not_nested/__init__.py
-test/do_all/simple/not_nested/negative/__init__.py
-test/do_all/simple/not_nested/negative/minimal/__init__.py
-test/do_all/simple/not_nested/negative/minimal/test.py
-test/do_all/simple/not_nested/negative/stack_access/__init__.py
-test/do_all/simple/not_nested/negative/stack_access/test.py
-test/do_all/simple/not_nested/positive/__init__.py
-test/do_all/simple/not_nested/positive/test.py
-test/do_all/stack_access/__init__.py
-test/do_all/stack_access/nested/__init__.py
-test/do_all/stack_access/nested/positive/__init__.py
-test/do_all/stack_access/nested/positive/test.py
-test/do_all/stack_access/various/__init__.py
-test/do_all/stack_access/various/case_0/__init__.py
-test/do_all/stack_access/various/case_0/test.py
-test/do_all/stack_access/various/case_1/__init__.py
-test/do_all/stack_access/various/case_1/test.py
-test/do_all/stack_access/various/case_2/__init__.py
-test/do_all/stack_access/various/case_2/test.py
-test/do_all/stack_access/various/case_3/__init__.py
-test/do_all/stack_access/various/case_3/test.py
-test/do_all/stack_access/various/case_4/__init__.py
-test/do_all/stack_access/various/case_4/test.py
-test/do_all/stack_access/various/case_5/__init__.py
-test/do_all/stack_access/various/case_5/test.py
-test/do_all/struct/__init__.py
-test/do_all/struct/positive/__init__.py
-test/do_all/struct/positive/miniFE_CSRMatrix_proxy/__init__.py
-test/do_all/struct/positive/miniFE_CSRMatrix_proxy/access_outside_struct/__init__.py
-test/do_all/struct/positive/miniFE_CSRMatrix_proxy/access_outside_struct/test.py
-test/do_all/struct/positive/miniFE_CSRMatrix_proxy/std_data_types/__init__.py
-test/do_all/struct/positive/miniFE_CSRMatrix_proxy/std_data_types/test.py
-test/do_all/struct/positive/miniFE_CSRMatrix_proxy/template_data_types/__init__.py
-test/do_all/struct/positive/miniFE_CSRMatrix_proxy/template_data_types/test.py
-test/optimizer/__init__.py
-test/optimizer/loop_collapse/__init__.py
-test/optimizer/loop_collapse/positive/__init__.py
-test/optimizer/loop_collapse/positive/simple_1/__init__.py
-test/optimizer/loop_collapse/positive/simple_1/test.py
-test/reduction_pattern/__init__.py
-test/reduction_pattern/positive/__init__.py
-test/reduction_pattern/positive/nested/__init__.py
-test/reduction_pattern/positive/nested/OMPSCR/__init__.py
-test/reduction_pattern/positive/nested/OMPSCR/c_Mandelbrot/__init__.py
-test/reduction_pattern/positive/nested/OMPSCR/c_Mandelbrot/test.py
+test/end_to_end/__init__.py
+test/end_to_end/do_all/__init__.py
+test/end_to_end/do_all/backwards_array_access/__init__.py
+test/end_to_end/do_all/backwards_array_access/test.py
+test/end_to_end/do_all/calls/__init__.py
+test/end_to_end/do_all/calls/above_nesting_level_3/__init__.py
+test/end_to_end/do_all/calls/above_nesting_level_3/test.py
+test/end_to_end/do_all/calls/allowing/__init__.py
+test/end_to_end/do_all/calls/allowing/test.py
+test/end_to_end/do_all/calls/allowing_2/__init__.py
+test/end_to_end/do_all/calls/allowing_2/test.py
+test/end_to_end/do_all/calls/complex/__init__.py
+test/end_to_end/do_all/calls/complex/test.py
+test/end_to_end/do_all/calls/preventing/__init__.py
+test/end_to_end/do_all/calls/preventing/simple/__init__.py
+test/end_to_end/do_all/calls/preventing/simple/test.py
+test/end_to_end/do_all/calls/second_order/__init__.py
+test/end_to_end/do_all/calls/second_order/allowing/__init__.py
+test/end_to_end/do_all/calls/second_order/allowing/test.py
+test/end_to_end/do_all/calls/second_order/allowing_2/__init__.py
+test/end_to_end/do_all/calls/second_order/allowing_2/test.py
+test/end_to_end/do_all/calls/second_order/preventing/__init__.py
+test/end_to_end/do_all/calls/second_order/preventing/test.py
+test/end_to_end/do_all/calls/second_order/preventing_2/__init__.py
+test/end_to_end/do_all/calls/second_order/preventing_2/test.py
+test/end_to_end/do_all/daxpy/__init__.py
+test/end_to_end/do_all/daxpy/test.py
+test/end_to_end/do_all/negative/__init__.py
+test/end_to_end/do_all/negative/nested/__init__.py
+test/end_to_end/do_all/negative/nested/OMPSCR/__init__.py
+test/end_to_end/do_all/simple/__init__.py
+test/end_to_end/do_all/simple/global_vars/__init__.py
+test/end_to_end/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/__init__.py
+test/end_to_end/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_arrays/__init__.py
+test/end_to_end/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_arrays/test.py
+test/end_to_end/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_struct/__init__.py
+test/end_to_end/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_struct/test.py
+test/end_to_end/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_vectors/__init__.py
+test/end_to_end/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_vectors/test.py
+test/end_to_end/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_vectors_and_struct/__init__.py
+test/end_to_end/do_all/simple/global_vars/miniFE_CSRMatrix_proxy/global_vectors_and_struct/test.py
+test/end_to_end/do_all/simple/nested/__init__.py
+test/end_to_end/do_all/simple/nested/depth_2/__init__.py
+test/end_to_end/do_all/simple/nested/depth_2/positive/__init__.py
+test/end_to_end/do_all/simple/nested/depth_2/positive/both_loops_doall/__init__.py
+test/end_to_end/do_all/simple/nested/depth_2/positive/both_loops_doall/test.py
+test/end_to_end/do_all/simple/not_nested/__init__.py
+test/end_to_end/do_all/simple/not_nested/negative/__init__.py
+test/end_to_end/do_all/simple/not_nested/negative/minimal/__init__.py
+test/end_to_end/do_all/simple/not_nested/negative/minimal/test.py
+test/end_to_end/do_all/simple/not_nested/negative/stack_access/__init__.py
+test/end_to_end/do_all/simple/not_nested/negative/stack_access/test.py
+test/end_to_end/do_all/simple/not_nested/positive/__init__.py
+test/end_to_end/do_all/simple/not_nested/positive/test.py
+test/end_to_end/do_all/stack_access/__init__.py
+test/end_to_end/do_all/stack_access/nested/__init__.py
+test/end_to_end/do_all/stack_access/nested/positive/__init__.py
+test/end_to_end/do_all/stack_access/nested/positive/test.py
+test/end_to_end/do_all/stack_access/various/__init__.py
+test/end_to_end/do_all/stack_access/various/case_0/__init__.py
+test/end_to_end/do_all/stack_access/various/case_0/test.py
+test/end_to_end/do_all/stack_access/various/case_1/__init__.py
+test/end_to_end/do_all/stack_access/various/case_1/test.py
+test/end_to_end/do_all/stack_access/various/case_2/__init__.py
+test/end_to_end/do_all/stack_access/various/case_2/test.py
+test/end_to_end/do_all/stack_access/various/case_3/__init__.py
+test/end_to_end/do_all/stack_access/various/case_3/test.py
+test/end_to_end/do_all/stack_access/various/case_5/__init__.py
+test/end_to_end/do_all/stack_access/various/case_5/test.py
+test/end_to_end/do_all/struct/__init__.py
+test/end_to_end/do_all/struct/positive/__init__.py
+test/end_to_end/do_all/struct/positive/miniFE_CSRMatrix_proxy/__init__.py
+test/end_to_end/do_all/struct/positive/miniFE_CSRMatrix_proxy/access_outside_struct/__init__.py
+test/end_to_end/do_all/struct/positive/miniFE_CSRMatrix_proxy/access_outside_struct/test.py
+test/end_to_end/do_all/struct/positive/miniFE_CSRMatrix_proxy/std_data_types/__init__.py
+test/end_to_end/do_all/struct/positive/miniFE_CSRMatrix_proxy/std_data_types/test.py
+test/end_to_end/do_all/struct/positive/miniFE_CSRMatrix_proxy/template_data_types/__init__.py
+test/end_to_end/do_all/struct/positive/miniFE_CSRMatrix_proxy/template_data_types/test.py
+test/end_to_end/optimizer/__init__.py
+test/end_to_end/optimizer/loop_collapse/__init__.py
+test/end_to_end/optimizer/loop_collapse/positive/__init__.py
+test/end_to_end/optimizer/loop_collapse/positive/simple_1/__init__.py
+test/end_to_end/optimizer/loop_collapse/positive/simple_1/test.py
+test/end_to_end/reduction_pattern/__init__.py
+test/end_to_end/reduction_pattern/positive/__init__.py
+test/end_to_end/reduction_pattern/positive/nested/__init__.py
+test/end_to_end/reduction_pattern/positive/nested/OMPSCR/__init__.py
+test/end_to_end/reduction_pattern/positive/nested/OMPSCR/c_Mandelbrot/__init__.py
+test/end_to_end/reduction_pattern/positive/nested/OMPSCR/c_Mandelbrot/test.py
 test/utils/__init__.py
+test/utils/existence/__init__.py
+test/utils/existence/existence_utils.py
 test/utils/validator_classes/DoAllInfoForValidation.py
-test/utils/validator_classes/__init__.py
+test/utils/validator_classes/__init__.py
+test/wip_end_to_end/__init__.py
+test/wip_end_to_end/do_all/__init__.py
+test/wip_end_to_end/do_all/simple/__init__.py
+test/wip_end_to_end/do_all/simple/nested/__init__.py
+test/wip_end_to_end/do_all/simple/nested/depth_2/__init__.py
+test/wip_end_to_end/do_all/simple/nested/depth_2/positive/__init__.py
+test/wip_end_to_end/do_all/simple/nested/depth_2/positive/inner_loop_doall/__init__.py
+test/wip_end_to_end/do_all/simple/nested/depth_2/positive/inner_loop_doall/test.py
+test/wip_end_to_end/do_all/simple/nested/depth_2/positive/outer_loop_doall/__init__.py
+test/wip_end_to_end/do_all/simple/nested/depth_2/positive/outer_loop_doall/test.py
+test/wip_end_to_end/do_all/stack_access/__init__.py
+test/wip_end_to_end/do_all/stack_access/various/__init__.py
+test/wip_end_to_end/do_all/stack_access/various/case_4/__init__.py
+test/wip_end_to_end/do_all/stack_access/various/case_4/test.py

{discopop-3.2.0 → discopop-3.2.1}/discopop_explorer/PEGraphX.py

@@ -142,6 +142,10 @@ class Dependency:
     sink_line: Optional[LineID] = None
     intra_iteration: bool = False
     intra_iteration_level: int = -1
+    metadata_intra_iteration_dep: Optional[List[LineID]] = None
+    metadata_inter_iteration_dep: Optional[List[LineID]] = None
+    metadata_intra_call_dep: Optional[List[LineID]] = None
+    metadata_inter_call_dep: Optional[List[LineID]] = None
 
     def __init__(self, type: EdgeType):
         self.etype = type
@@ -208,7 +212,9 @@ class Node:
         return LineID(f"{self.file_id}:{self.end_line}")
 
     def contains_line(self, other_line) -> bool:
-        if other_line == "GlobalVar":
+        if other_line == "GlobalVar" or other_line == "LineNotFound":
+            return False
+        if not ":" in other_line:
             return False
         other_file_id = int(other_line.split(":")[0])
         other_line_num = int(other_line.split(":")[1])
@@ -567,6 +573,33 @@ def parse_dependency(dep: DependenceItem) -> Dependency:
         d.dtype = DepType[dep.type]
     d.var_name = dep.var_name
     d.memory_region = dep.memory_region
+    # parse metadata
+    if ";" in dep.metadata:
+        for md in dep.metadata.split(";"):
+            if len(md) == 0:
+                continue
+            md_type = md[: md.index(":")]
+            md_raw_values = md[md.index(":") + 1 :]
+            md_values = [tmp for tmp in md_raw_values.split(",") if len(tmp) > 0]
+
+            if md_type == "intra_iteration_dep":
+                if d.metadata_intra_iteration_dep is None:
+                    d.metadata_intra_iteration_dep = []
+                d.metadata_intra_iteration_dep += md_values
+            elif md_type == "inter_iteration_dep":
+                if d.metadata_inter_iteration_dep is None:
+                    d.metadata_inter_iteration_dep = []
+                d.metadata_inter_iteration_dep += md_values
+            elif md_type == "intra_call_dep":
+                if d.metadata_intra_call_dep is None:
+                    d.metadata_intra_call_dep = []
+                d.metadata_intra_call_dep += md_values
+            elif md_type == "inter_call_dep":
+                if d.metadata_inter_call_dep is None:
+                    d.metadata_inter_call_dep = []
+                d.metadata_inter_call_dep += md_values
+            else:
+                raise ValueError("Unknown metadata type: ", md_type)
     return d
 
 

{discopop-3.2.0 → discopop-3.2.1}/discopop_explorer/parser.py

@@ -31,6 +31,7 @@ class DependenceItem(object):
     type: Any
     var_name: Any
     memory_region: Any
+    metadata: Any
     # TODO improve typing
 
 
@@ -154,17 +155,21 @@ def __parse_dep_file(dep_fd, output_path: str) -> Tuple[List[DependenceItem], Li
             var_str = "" if len(source_fields) == 1 else source_fields[1]
             var_name = ""
             aa_var_name = ""
+            metadata = ""
             if len(var_str) > 0:
                 if "(" in var_str:
                     split_var_str = var_str.split("(")
                     var_name = split_var_str[0]
                     aa_var_name = split_var_str[1][
-                        :-1
+                        : split_var_str[1].index(")")
                     ]  # name of the allocated variable which is accessed, i.e. variable name after anti aliasing
+                    metadata_str = split_var_str[1][split_var_str[1].index(")") + 1 :]
+                    if "[" in metadata_str:
+                        metadata = metadata_str[1:-1]
                 else:
                     # compatibility with results created without alias analysis
                     var_name = var_str
-            dependencies_list.append(DependenceItem(sink, source_fields[0], type, var_name, aa_var_name))
+            dependencies_list.append(DependenceItem(sink, source_fields[0], type, var_name, aa_var_name, metadata))
 
     return dependencies_list, loop_data_list
 

{discopop-3.2.0 → discopop-3.2.1}/discopop_explorer/pattern_detectors/do_all_detector.py

@@ -146,6 +146,12 @@ def __detect_do_all(pet: PEGraphX, root_loop: LoopNode) -> bool:
     for v in root_children_loops:
         loop_start_lines.append(v.start_position())
     fp, p, lp, s, r = classify_loop_variables(pet, root_loop)
+
+    # get parents of root_loop
+    parent_loops = __get_parent_loops(pet, root_loop)
+    parent_function_lineid = pet.get_parent_function(root_loop).start_position()
+    called_functions_lineids = __get_called_functions(pet, root_loop)
+
     # get variables which are defined inside the loop
     defined_inside_loop: List[Tuple[Variable, Set[MemoryRegion]]] = []
     tmp_loop_variables = pet.get_variables(root_children_cus)
@@ -182,6 +188,9 @@ def __detect_do_all(pet: PEGraphX, root_loop: LoopNode) -> bool:
                 p,
                 lp,
                 defined_inside_loop,
+                parent_loops,
+                parent_function_lineid,
+                called_functions_lineids,
             ):
                 # if pet.depends_ignore_readonly(subnodes[i], subnodes[j], root_loop):
                 return False
@@ -204,6 +213,9 @@ def __check_loop_dependencies(
     privates: List[Variable],
     last_privates: List[Variable],
     defined_inside_loop: List[Tuple[Variable, Set[MemoryRegion]]],
+    parent_loops: List[LineID],
+    parent_function_lineid: LineID,
+    called_functions_lineids: List[LineID],
 ) -> bool:
     """Returns True, if dependencies between the respective subgraphs chave been found.
     Returns False otherwise, which results in the potential suggestion of a Do-All pattern."""
@@ -228,6 +240,9 @@ def __check_loop_dependencies(
 
     for source, target, dep in deps:
 
+        if root_loop.start_position() == "1:153":
+            pass
+
         # todo: move this calculation to the innermost point possible to reduce computation costs
         # get metadata for dependency
         dep_source_nesting_level = __calculate_nesting_level(pet, root_loop, source)
@@ -265,28 +280,6 @@ def __check_loop_dependencies(
                     else:
                         return True
 
-        #                    # dep within the loop. not problematic, if intra_iteration_level == 0
-        #                    if dep.intra_iteration_level == 0:
-        #                        pass
-        #                    else:
-        #                        # might be problematic
-        #                        # check if source and target in children loops
-        #                        contained_in_nested_loop = False
-        #                        for nested_loop in [l for l in root_children_loops if l != root_loop]:
-        #                            nested_children = pet.subtree_of_type(nested_loop, (CUNode, LoopNode))
-        #                            nested_children_cus = [cast(CUNode, cu) for cu in nested_children if cu.type == NodeType.CU]
-        #                            if pet.node_at(source) in nested_children_cus and pet.node_at(target) in nested_children_cus:
-        #                                contained_in_nested_loop = True
-        #                        if not contained_in_nested_loop:
-        #                            # problematic
-        #                            return True
-
-        #                else:
-        #                    # dep could belong to a parent loop
-        #                    if root_loop.get_nesting_level(pet) > 1 and dep.intra_iteration_level > 0:
-        #                        # dep belongs to parent loop. Can not be ignored for the inner loop
-        #                        return True
-
         elif dep.dtype == DepType.WAR:
             # check WAR dependencies
             # WAR problematic, if it is not an intra-iteration WAR and the variable is not private or firstprivate
@@ -348,3 +341,48 @@ def __calculate_nesting_level(pet: PEGraphX, root_loop: LoopNode, cu_node_id: st
         # add new parents to the queue
         for in_child_edge in pet.in_edges(cast(NodeID, current_node_id), EdgeType.CHILD):
             potential_parents.append((in_child_edge[0], nesting_level + 1))
+
+
+def __get_parent_loops(pet: PEGraphX, root_loop: LoopNode):
+    """duplicates exists: do_all_detector <-> reduction_detector !"""
+    parents: List[NodeID] = []
+    queue = [root_loop.id]
+    visited: Set[NodeID] = set()
+    while queue:
+        current = queue.pop()
+        visited.add(current)
+        if type(pet.node_at(current)) == LoopNode:
+            parents.append(current)
+
+        # process incoming child edges
+        for s, t, e in pet.in_edges(current, EdgeType.CHILD):
+            if s not in visited and s not in queue:
+                queue.append(s)
+        # process incoming call edges
+        for s, t, e in pet.in_edges(current, EdgeType.CALLSNODE):
+            if s not in visited and s not in queue:
+                queue.append(s)
+
+    parents.remove(root_loop.id)
+    return [pet.node_at(p).start_position() for p in parents]
+
+
+def __get_called_functions(pet: PEGraphX, root_loop: LoopNode) -> List[LineID]:
+    """duplicates exists: do_all_detector <-> reduction_detector !"""
+    # identify children CUs without following function calls
+    called_functions: Set[NodeID] = set()
+    queue = [root_loop.id]
+    visited: Set[NodeID] = set()
+    while queue:
+        current = queue.pop()
+        visited.add(current)
+        # get called functions
+        for s, t, e in pet.out_edges(current, EdgeType.CALLSNODE):
+            called_functions.add(t)
+        # add children to queue
+        for s, t, e in pet.out_edges(current, EdgeType.CHILD):
+            if t not in queue and t not in visited:
+                queue.append(t)
+
+    # convert node ids of called functions to line ids
+    return [pet.node_at(n).start_position() for n in called_functions]

{discopop-3.2.0 → discopop-3.2.1}/discopop_explorer/pattern_detectors/reduction_detector.py

@@ -8,7 +8,7 @@
 
 
 from multiprocessing import Pool
-from typing import List, cast
+from typing import List, cast, Set
 
 from alive_progress import alive_bar  # type: ignore
 
@@ -22,6 +22,7 @@ from ..PEGraphX import (
     LineID,
     DepType,
     EdgeType,
+    NodeID,
 )
 from ..utils import filter_for_hotspots, is_reduction_var, classify_loop_variables
 from ..variable import Variable
@@ -136,6 +137,11 @@ def __detect_reduction(pet: PEGraphX, root: LoopNode) -> bool:
     reduction_var_names = [v.name for v in reduction_vars]
     fp, p, lp, s, r = classify_loop_variables(pet, root)
 
+    # get parents of loop
+    parent_loops = __get_parent_loops(pet, root)
+    parent_function_lineid = pet.get_parent_function(root).start_position()
+    called_functions_lineids = __get_called_functions(pet, root)
+
     if __check_loop_dependencies(
         pet,
         root,
@@ -146,6 +152,9 @@ def __detect_reduction(pet: PEGraphX, root: LoopNode) -> bool:
         fp,
         p,
         lp,
+        parent_loops,
+        parent_function_lineid,
+        called_functions_lineids,
     ):
         return False
 
@@ -167,6 +176,9 @@ def __check_loop_dependencies(
     first_privates: List[Variable],
     privates: List[Variable],
     last_privates: List[Variable],
+    parent_loops: List[LineID],
+    parent_function_lineid: LineID,
+    called_functions_lineids: List[LineID],
 ) -> bool:
     """Returns True, if dependencies between the respective subgraphs chave been found.
     Returns False otherwise, which results in the potential suggestion of a Reduction pattern."""
@@ -229,3 +241,48 @@ def __check_loop_dependencies(
 
     # no problem found. Potentially suggest reduction
     return False
+
+
+def __get_parent_loops(pet: PEGraphX, root_loop: LoopNode):
+    """duplicates exists: do_all_detector <-> reduction_detector !"""
+    parents: List[NodeID] = []
+    queue = [root_loop.id]
+    visited: Set[NodeID] = set()
+    while queue:
+        current = queue.pop()
+        visited.add(current)
+        if type(pet.node_at(current)) == LoopNode:
+            parents.append(current)
+
+        # process incoming child edges
+        for s, t, e in pet.in_edges(current, EdgeType.CHILD):
+            if s not in visited and s not in queue:
+                queue.append(s)
+        # process incoming call edges
+        for s, t, e in pet.in_edges(current, EdgeType.CALLSNODE):
+            if s not in visited and s not in queue:
+                queue.append(s)
+
+    parents.remove(root_loop.id)
+    return [pet.node_at(p).start_position() for p in parents]
+
+
+def __get_called_functions(pet: PEGraphX, root_loop: LoopNode) -> List[LineID]:
+    """duplicates exists: do_all_detector <-> reduction_detector !"""
+    # identify children CUs without following function calls
+    called_functions: Set[NodeID] = set()
+    queue = [root_loop.id]
+    visited: Set[NodeID] = set()
+    while queue:
+        current = queue.pop()
+        visited.add(current)
+        # get called functions
+        for s, t, e in pet.out_edges(current, EdgeType.CALLSNODE):
+            called_functions.add(t)
+        # add children to queue
+        for s, t, e in pet.out_edges(current, EdgeType.CHILD):
+            if t not in queue and t not in visited:
+                queue.append(t)
+
+    # convert node ids of called functions to line ids
+    return [pet.node_at(n).start_position() for n in called_functions]

{discopop-3.2.0 → discopop-3.2.1}/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):

{discopop-3.2.0 → discopop-3.2.1}/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,
     )
 

{discopop-3.2.0 → discopop-3.2.1}/discopop_library/ConfigProvider/config_provider.py

@@ -6,6 +6,8 @@
 # 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.build_config import DP_BUILD, DP_SOURCE, LLVM_BIN_DIR  # type: ignore
 from discopop_library.global_data.version.utils import get_version
@@ -20,6 +22,16 @@ def run(arguments: ConfigProviderArguments) -> str:
         return DP_SOURCE  # type: ignore
     elif arguments.return_llvm_bin_dir:
         return LLVM_BIN_DIR  # type: ignore
+    elif arguments.return_full_config:
+        ret_str = ""
+        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()
     else:

{discopop-3.2.0 → discopop-3.2.1}/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

discopop-3.2.1/discopop_library/global_data/version/VERSION

@@ -0,0 +1 @@
+3.2.1

{discopop-3.2.0 → discopop-3.2.1}/requirements.txt

@@ -52,7 +52,7 @@ six==1.16.0
 sympy==1.12
 sympy-plot-backends==2.4.3
 tomli==2.0.1
-tqdm==4.66.1
+tqdm==4.66.3
 typing_extensions==4.7.1
 typish==1.9.3
 zipp==3.16.2