Use other mechanism to determine whether an edge is already copied or not.
[libfirm] / heuristical.c
index 473079c..2ee5170 100644 (file)
@@ -18,6 +18,9 @@ static pbqp_node **node_buckets[4];
 static pbqp_node **reduced_bucket = NULL;
 static int         buckets_filled = 0;
 
+/* Forward declarations. */
+static void apply_Brute_Force(pbqp *pbqp);
+
 static void insert_into_edge_bucket(pbqp_edge *edge)
 {
        if (edge_bucket_contains(edge_bucket, edge)) {
@@ -489,14 +492,8 @@ static void back_propagate(pbqp *pbqp)
        }
 }
 
-void solve_pbqp_heuristical(pbqp *pbqp)
+static void apply_heuristic_reductions(pbqp *pbqp)
 {
-       /* Reduce nodes degree ... */
-       initial_simplify_edges(pbqp);
-
-       /* ... and put node into bucket representing their degree. */
-       fill_node_buckets(pbqp);
-
        for (;;) {
                if (edge_bucket_get_length(edge_bucket) > 0) {
                        apply_edge(pbqp);
@@ -507,9 +504,20 @@ void solve_pbqp_heuristical(pbqp *pbqp)
                } else if (node_bucket_get_length(node_buckets[3]) > 0) {
                        apply_RN(pbqp);
                } else {
-                       break;
+                       return;
                }
        }
+}
+
+void solve_pbqp_heuristical(pbqp *pbqp)
+{
+       /* Reduce nodes degree ... */
+       initial_simplify_edges(pbqp);
+
+       /* ... and put node into bucket representing their degree. */
+       fill_node_buckets(pbqp);
+
+       apply_heuristic_reductions(pbqp);
 
        pbqp->solution = determine_solution(pbqp->dump_file);
 
@@ -534,6 +542,8 @@ void apply_RI(pbqp *pbqp)
        int          is_src     = edge->src == node;
        pbqp_node   *other_node;
 
+       assert(pbqp_node_get_degree(node) == 1);
+
        if (is_src) {
                other_node = edge->tgt;
        } else {
@@ -594,6 +604,7 @@ void apply_RII(pbqp *pbqp)
        unsigned     node_len;
 
        assert(pbqp);
+       assert(pbqp_node_get_degree(node) == 2);
 
        if (src_is_src) {
                src_node = src_edge->tgt;
@@ -702,12 +713,56 @@ void apply_RII(pbqp *pbqp)
        simplify_edge(pbqp, edge);
 }
 
-void apply_RN(pbqp *pbqp)
+static void select_alternative(pbqp_node *node, unsigned selected_index)
+{
+       unsigned  edge_index;
+       unsigned  node_index;
+       unsigned  node_len;
+       vector   *node_vec;
+       unsigned  max_degree = pbqp_node_get_degree(node);
+
+       assert(node);
+       node->solution = selected_index;
+       node_vec = node->costs;
+       node_len = node_vec->len;
+       assert(selected_index < node_len);
+
+       /* Set all other costs to infinity. */
+       for (node_index = 0; node_index < node_len; ++node_index) {
+               if (node_index != selected_index) {
+                       node_vec->entries[node_index].data = INF_COSTS;
+               }
+       }
+
+       /* Add all incident edges to edge bucket, since they are now independent. */
+       for (edge_index = 0; edge_index < max_degree; ++edge_index) {
+               insert_into_edge_bucket(node->edges[edge_index]);
+       }
+}
+
+static pbqp_node *get_node_with_max_degree(void)
 {
        pbqp_node  **bucket       = node_buckets[3];
        unsigned     bucket_len   = node_bucket_get_length(bucket);
        unsigned     bucket_index;
-       pbqp_node   *node         = NULL;
+       unsigned     max_degree   = 0;
+       pbqp_node   *result       = NULL;
+
+       for (bucket_index = 0; bucket_index < bucket_len; ++bucket_index) {
+               pbqp_node *candidate = bucket[bucket_index];
+               unsigned   degree    = pbqp_node_get_degree(candidate);
+
+               if (degree > max_degree) {
+                       result = candidate;
+                       max_degree = degree;
+               }
+       }
+
+       return result;
+}
+
+static unsigned get_local_minimal_alternative(pbqp *pbqp, pbqp_node *node)
+{
        pbqp_edge   *edge;
        vector      *node_vec;
        vector      *vec;
@@ -721,28 +776,10 @@ void apply_RN(pbqp *pbqp)
        int          is_src;
 
        assert(pbqp);
-
-       /* Search for node with maximum degree. */
-       for (bucket_index = 0; bucket_index < bucket_len; ++bucket_index) {
-               pbqp_node *candidate = bucket[bucket_index];
-               unsigned   degree    = pbqp_node_get_degree(candidate);
-
-               if (degree > max_degree) {
-                       node = candidate;
-                       max_degree = degree;
-               }
-       }
        assert(node);
        node_vec = node->costs;
        node_len = node_vec->len;
 
-       if (pbqp->dump_file) {
-               char     txt[100];
-               sprintf(txt, "RN-Reduction of Node n%d", node->index);
-               dump_section(pbqp->dump_file, 2, txt);
-               pbqp_dump_graph(pbqp);
-       }
-
        for (node_index = 0; node_index < node_len; ++node_index) {
                num value = node_vec->entries[node_index].data;
 
@@ -770,101 +807,167 @@ void apply_RN(pbqp *pbqp)
                }
        }
 
+       return min_index;
+}
+
+void apply_RN(pbqp *pbqp)
+{
+       pbqp_node   *node         = NULL;
+       unsigned     min_index    = 0;
+
+       assert(pbqp);
+
+       /* We want to reduce a node with maximum degree. */
+       node = get_node_with_max_degree();
+       assert(node);
+       assert(pbqp_node_get_degree(node) > 2);
+
+       if (pbqp->dump_file) {
+               char     txt[100];
+               sprintf(txt, "RN-Reduction of Node n%d", node->index);
+               dump_section(pbqp->dump_file, 2, txt);
+               pbqp_dump_graph(pbqp);
+       }
+
+       min_index = get_local_minimal_alternative(pbqp, node);
+
        if (pbqp->dump_file) {
                fprintf(pbqp->dump_file, "node n%d is set to %d<br><br>\n",
                                        node->index, min_index);
-               fprintf(pbqp->dump_file, "Minimal cost of RN reduction: %lld<br>\n",
-                                                       min);
        }
 
-       node->solution = min_index;
-
        /* Now that we found the local minimum set all other costs to infinity. */
-       for (node_index = 0; node_index < node_len; ++node_index) {
-               if (node_index != min_index) {
-                       node_vec->entries[node_index].data = INF_COSTS;
-               }
-       }
+       select_alternative(node, min_index);
+}
 
-       /* Add all incident edges to edge bucket, since they are now independent. */
-       for (edge_index = 0; edge_index < max_degree; ++edge_index) {
-               insert_into_edge_bucket(node->edges[edge_index]);
+static void apply_brute_force_reductions(pbqp *pbqp)
+{
+       for (;;) {
+               if (edge_bucket_get_length(edge_bucket) > 0) {
+                       apply_edge(pbqp);
+               } else if (node_bucket_get_length(node_buckets[1]) > 0) {
+                       apply_RI(pbqp);
+               } else if (node_bucket_get_length(node_buckets[2]) > 0) {
+                       apply_RII(pbqp);
+               } else if (node_bucket_get_length(node_buckets[3]) > 0) {
+                       apply_Brute_Force(pbqp);
+               } else {
+                       return;
+               }
        }
 }
 
-void apply_Brute_Force(pbqp *pbqp)
+static unsigned get_minimal_alternative(pbqp *pbqp, pbqp_node *node)
 {
-       pbqp_node  **bucket       = node_buckets[3];
-       unsigned     bucket_len   = node_bucket_get_length(bucket);
-       unsigned     bucket_index;
-       pbqp_node   *node         = NULL;
-       pbqp_edge   *edge;
        vector      *node_vec;
-       vector      *vec;
-       pbqp_matrix *mat;
-       unsigned     edge_index;
-       unsigned     max_degree   = 0;
        unsigned     node_index;
        unsigned     node_len;
        unsigned     min_index    = 0;
        num          min          = INF_COSTS;
-       int          is_src;
+       unsigned     bucket_index;
 
        assert(pbqp);
+       assert(node);
+       node_vec     = node->costs;
+       node_len     = node_vec->len;
+       bucket_index = node->bucket_index;
 
-       /* Search for node with maximum degree. */
-       for (bucket_index = 0; bucket_index < bucket_len; ++bucket_index) {
-               pbqp_node *candidate = bucket[bucket_index];
-               unsigned   degree    = pbqp_node_get_degree(candidate);
+       for (node_index = 0; node_index < node_len; ++node_index) {
+               pbqp_node_bucket bucket_deg3;
+               num              value;
+               unsigned         bucket_0_length;
+               unsigned         bucket_red_length;
 
-               if (degree > max_degree) {
-                       node = candidate;
-                       max_degree = degree;
-               }
-       }
-       assert(node);
-       node_vec = node->costs;
-       node_len = node_vec->len;
+               /* Some node buckets and the edge bucket should be empty. */
+               assert(node_bucket_get_length(node_buckets[1]) == 0);
+               assert(node_bucket_get_length(node_buckets[2]) == 0);
+               assert(edge_bucket_get_length(edge_bucket)     == 0);
 
-       if (pbqp->dump_file) {
-               char     txt[100];
-               sprintf(txt, "RN-Reduction of Node n%d", node->index);
-               dump_section(pbqp->dump_file, 2, txt);
-               pbqp_dump_graph(pbqp);
-       }
+               /* char *tmp = obstack_finish(&pbqp->obstack); */
 
-       for (node_index = 0; node_index < node_len; ++node_index) {
-               num value = node_vec->entries[node_index].data;
+               /* Save current PBQP state. */
+               node_bucket_deep_copy(pbqp, &bucket_deg3, node_buckets[3]);
+               bucket_0_length   = node_bucket_get_length(node_buckets[0]);
+               bucket_red_length = node_bucket_get_length(reduced_bucket);
 
-               /* TODO Copy PBQP */
+               /* Select alternative and solve PBQP recursively. */
+               select_alternative(node_buckets[3][bucket_index], node_index);
+               apply_brute_force_reductions(pbqp);
 
+               value = determine_solution(pbqp->dump_file);
 
                if (value < min) {
                        min = value;
                        min_index = node_index;
                }
+
+               /* Some node buckets and the edge bucket should still be empty. */
+               assert(node_bucket_get_length(node_buckets[1]) == 0);
+               assert(node_bucket_get_length(node_buckets[2]) == 0);
+               assert(edge_bucket_get_length(edge_bucket)     == 0);
+
+               /* Clear modified buckets... */
+               node_bucket_shrink(&node_buckets[3], 0);
+
+               /* ... and restore old PBQP state. */
+               node_bucket_shrink(&node_buckets[0], bucket_0_length);
+               node_bucket_shrink(&reduced_bucket, bucket_red_length);
+               node_bucket_copy(&node_buckets[3], bucket_deg3);
+
+               /* Free copies. */
+               /* obstack_free(&pbqp->obstack, tmp); */
+               node_bucket_free(&bucket_deg3);
        }
 
+       return min_index;
+}
+
+void apply_Brute_Force(pbqp *pbqp)
+{
+       pbqp_node   *node         = NULL;
+       unsigned     min_index    = 0;
+
+       assert(pbqp);
+
+       /* We want to reduce a node with maximum degree. */
+       node = get_node_with_max_degree();
+       assert(node);
+       assert(pbqp_node_get_degree(node) > 2);
+
+       if (pbqp->dump_file) {
+               char     txt[100];
+               sprintf(txt, "BF-Reduction of Node n%d", node->index);
+               dump_section(pbqp->dump_file, 2, txt);
+               pbqp_dump_graph(pbqp);
+       }
+
+       min_index = get_minimal_alternative(pbqp, node);
+
        if (pbqp->dump_file) {
                fprintf(pbqp->dump_file, "node n%d is set to %d<br><br>\n",
                                        node->index, min_index);
-               fprintf(pbqp->dump_file, "Minimal cost of RN reduction: %lld<br>\n",
-                                                       min);
        }
 
-       node->solution = min_index;
+       /* Now that we found the minimum set all other costs to infinity. */
+       select_alternative(node, min_index);
+}
 
-       /* Now that we found the local minimum set all other costs to infinity. */
-       for (node_index = 0; node_index < node_len; ++node_index) {
-               if (node_index != min_index) {
-                       node_vec->entries[node_index].data = INF_COSTS;
-               }
-       }
+void solve_pbqp_brute_force(pbqp *pbqp)
+{
+       /* Reduce nodes degree ... */
+       initial_simplify_edges(pbqp);
 
-       /* Add all incident edges to edge bucket, since they are now independent. */
-       for (edge_index = 0; edge_index < max_degree; ++edge_index) {
-               insert_into_edge_bucket(node->edges[edge_index]);
-       }
+       /* ... and put node into bucket representing their degree. */
+       fill_node_buckets(pbqp);
+
+       apply_brute_force_reductions(pbqp);
+
+       pbqp->solution = determine_solution(pbqp->dump_file);
+
+       /* Solve reduced nodes. */
+       back_propagate(pbqp);
+
+       free_buckets();
 }
 
 void back_propagate_RI(pbqp *pbqp, pbqp_node *node)