July 2009 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Added WEIGHT_BEGIN() macros and reset a few weights.
by Enea Zaffanella 14 Jul '09

14 Jul '09

Module: ppl/ppl Branch: master Commit: cd670303e2a9dcf9248ab316bc6b8e81163188a6 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=cd670303e2a9… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Tue Jul 14 14:59:48 2009 +0200 Added WEIGHT_BEGIN() macros and reset a few weights. --- src/MIP_Problem.cc | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/MIP_Problem.cc b/src/MIP_Problem.cc index 1d3819b..284ccb0 100644 --- a/src/MIP_Problem.cc +++ b/src/MIP_Problem.cc @@ -886,6 +886,7 @@ PPL::MIP_Problem::steepest_edge_float_entering_index() const { for (dimension_type j = tableau.num_columns() - 1; j-- > 1; ) { const Coefficient& cost_j = working_cost[j]; if (sgn(cost_j) == cost_sign) { + WEIGHT_BEGIN(); // We cannot compute the (exact) square root of abs(\Delta x_j). // The workaround is to compute the square of `cost[j]'. assign(challenger_num, cost_j); @@ -911,6 +912,7 @@ PPL::MIP_Problem::steepest_edge_float_entering_index() const { current_value = challenger_value; entering_index = j; } + WEIGHT_ADD_MUL(1, tableau_num_rows); } } return entering_index; @@ -925,6 +927,7 @@ PPL::MIP_Problem::steepest_edge_exact_entering_index() const { // The normalization factor for each coefficient in the tableau. std::vector<Coefficient> norm_factor(tableau_num_rows); { + WEIGHT_BEGIN(); // Compute the lcm of all the coefficients of variables in base. PPL_DIRTY_TEMP_COEFFICIENT(lcm_basis); lcm_basis = 1; @@ -937,8 +940,8 @@ PPL::MIP_Problem::steepest_edge_exact_entering_index() const { // `lcm_basis' will no longer be needed. lcm_basis *= lcm_basis; std::swap(squared_lcm_basis, lcm_basis); + WEIGHT_ADD_MUL(2, tableau_num_rows); } - WEIGHT_ADD_MUL(2, tableau_num_rows); // Defined here to avoid repeated (de-)allocations. PPL_DIRTY_TEMP_COEFFICIENT(challenger_num); @@ -954,6 +957,7 @@ PPL::MIP_Problem::steepest_edge_exact_entering_index() const { for (dimension_type j = tableau.num_columns() - 1; j-- > 1; ) { const Coefficient& cost_j = working_cost[j]; if (sgn(cost_j) == cost_sign) { + WEIGHT_BEGIN(); // We cannot compute the (exact) square root of abs(\Delta x_j). // The workaround is to compute the square of `cost[j]'. challenger_num = cost_j * cost_j; @@ -969,7 +973,6 @@ PPL::MIP_Problem::steepest_edge_exact_entering_index() const { add_mul_assign(challenger_den, scalar_value, scalar_value); } } - WEIGHT_ADD_MUL(2, tableau_num_rows); // Initialization during the first loop. if (entering_index == 0) { std::swap(current_num, challenger_num); @@ -985,6 +988,7 @@ PPL::MIP_Problem::steepest_edge_exact_entering_index() const { std::swap(current_den, challenger_den); entering_index = j; } + WEIGHT_ADD_MUL(1, tableau_num_rows); } } return entering_index; @@ -1015,6 +1019,7 @@ void PPL::MIP_Problem::linear_combine(Row& x, const Row& y, const dimension_type k) { + WEIGHT_BEGIN(); const dimension_type x_size = x.size(); PPL_ASSERT(x_size == y.size()); PPL_ASSERT(y[k] != 0 && x[k] != 0); @@ -1036,7 +1041,7 @@ PPL::MIP_Problem::linear_combine(Row& x, } x[k] = 0; x.normalize(); - WEIGHT_ADD_MUL(3, x_size); + WEIGHT_ADD_MUL(1, x_size); } // See pages 42-43 of [PapadimitriouS98]. @@ -1092,6 +1097,7 @@ PPL::MIP_Problem const Coefficient& t_ib = t_i[base[i]]; const int t_ie_sign = sgn(t_ie); if (t_ie_sign != 0 && t_ie_sign == sgn(t_ib)) { + WEIGHT_BEGIN(); const Row& t_e = tableau[exiting_base_index]; const Coefficient& t_ee = t_e[entering_var_index]; lcm_assign(lcm, t_ee, t_ie); @@ -1106,7 +1112,7 @@ PPL::MIP_Problem if (sign > 0 || (sign == 0 && base[i] < base[exiting_base_index])) exiting_base_index = i; - WEIGHT_ADD(7); + WEIGHT_ADD(1); } } return exiting_base_index; @@ -1162,6 +1168,7 @@ PPL::MIP_Problem::compute_simplex_using_steepest_edge_float() { // feasible region. pivot(entering_var_index, exiting_base_index); + WEIGHT_BEGIN(); // Now begins the objective function's value check to choose between // the `textbook' and the float `steepest-edge' technique. cost_sgn_coeff = working_cost[working_cost.size()-1]; @@ -1172,7 +1179,6 @@ PPL::MIP_Problem::compute_simplex_using_steepest_edge_float() { challenger *= current_den; abs_assign(current, cost_sgn_coeff); current *= current_num; - WEIGHT_ADD(2); #if PPL_NOISY_SIMPLEX ++num_iterations; if (num_iterations % 200 == 0) @@ -1200,6 +1206,7 @@ PPL::MIP_Problem::compute_simplex_using_steepest_edge_float() { if (cost_sgn_coeff < 0) neg_assign(current_num); abs_assign(current_den, cost_sgn_coeff); + WEIGHT_ADD(1); } } @@ -1230,7 +1237,6 @@ PPL::MIP_Problem::compute_simplex_using_exact_pricing() { if (exiting_base_index == tableau_num_rows) return false; - WEIGHT_ADD(1); // Check if the client has requested abandoning all expensive // computations. If so, the exception specified by the client // is thrown now.

1 0

[GIT] ppl/ppl(master): Added profiled weights.
by Abramo Bagnara 14 Jul '09

14 Jul '09

Module: ppl/ppl Branch: master Commit: 2947b482bb0ae45067ca7bcd3d57a73deb615f7e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2947b482bb0a… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Tue Jul 14 11:36:08 2009 +0200 Added profiled weights. --- src/conversion.cc | 15 ++++++++++----- src/globals.defs.hh | 3 +++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/conversion.cc b/src/conversion.cc index e122de9..7653b8c 100644 --- a/src/conversion.cc +++ b/src/conversion.cc @@ -403,10 +403,11 @@ PPL::Polyhedron::conversion(Linear_System& source, // that does not saturate the constraint `source_k'. dimension_type index_non_zero = 0; for ( ; index_non_zero < dest_num_rows; ++index_non_zero) { + WEIGHT_BEGIN(); Scalar_Products::assign(scalar_prod[index_non_zero], source_k, dest[index_non_zero]); - WEIGHT_ADD_MUL(1, source_num_columns); + WEIGHT_ADD_MUL(17, source_num_columns); if (scalar_prod[index_non_zero] != 0) // The generator does not saturate the constraint. break; @@ -416,8 +417,9 @@ PPL::Polyhedron::conversion(Linear_System& source, maybe_abandon(); } for (dimension_type i = index_non_zero + 1; i < dest_num_rows; ++i) { + WEIGHT_BEGIN(); Scalar_Products::assign(scalar_prod[i], source_k, dest[i]); - WEIGHT_ADD_MUL(1, source_num_columns); + WEIGHT_ADD_MUL(25, source_num_columns); // Check if the client has requested abandoning all expensive // computations. If so, the exception specified by the client // is thrown now. @@ -530,6 +532,7 @@ PPL::Polyhedron::conversion(Linear_System& source, normalized_sp_i, normalized_sp_o); Linear_Row& dest_i = dest[i]; + WEIGHT_BEGIN(); for (dimension_type c = dest_num_columns; c-- > 0; ) { Coefficient& dest_i_c = dest_i[c]; dest_i_c *= normalized_sp_o; @@ -538,7 +541,7 @@ PPL::Polyhedron::conversion(Linear_System& source, dest_i.strong_normalize(); scalar_prod[i] = 0; // `dest' has already been set as non-sorted. - WEIGHT_ADD_MUL(1, dest_num_columns); + WEIGHT_ADD_MUL(41, dest_num_columns); } // Check if the client has requested abandoning all expensive // computations. If so, the exception specified by the client @@ -702,6 +705,7 @@ PPL::Polyhedron::conversion(Linear_System& source, // Now we actually check for redundancy by computing // adjacency information. bool redundant = false; + WEIGHT_BEGIN(); for (dimension_type l = num_lines_or_equalities; l < bound; ++l) if (l != i && l != j @@ -712,7 +716,7 @@ PPL::Polyhedron::conversion(Linear_System& source, break; } assert(bound >= num_lines_or_equalities); - WEIGHT_ADD_MUL(1, bound - num_lines_or_equalities); + WEIGHT_ADD_MUL(15, bound - num_lines_or_equalities); if (!redundant) { // Adding the new ray to `dest' and the corresponding // saturation row to `sat'. @@ -740,11 +744,13 @@ PPL::Polyhedron::conversion(Linear_System& source, scalar_prod[j], normalized_sp_i, normalized_sp_o); + WEIGHT_BEGIN(); for (dimension_type c = dest_num_columns; c-- > 0; ) { Coefficient& new_row_c = new_row[c]; new_row_c = normalized_sp_i * dest[j][c]; sub_mul_assign(new_row_c, normalized_sp_o, dest[i][c]); } + WEIGHT_ADD_MUL(86, dest_num_columns); new_row.strong_normalize(); // Since we added a new generator to `dest', // we also add a new element to `scalar_prod'; @@ -758,7 +764,6 @@ PPL::Polyhedron::conversion(Linear_System& source, scalar_prod[dest_num_rows] = Coefficient_zero(); // Increment the number of generators. ++dest_num_rows; - WEIGHT_ADD_MUL(1, dest_num_columns); } // if (!redundant) } } diff --git a/src/globals.defs.hh b/src/globals.defs.hh index b36d575..65d3804 100644 --- a/src/globals.defs.hh +++ b/src/globals.defs.hh @@ -137,6 +137,7 @@ extern unsigned int in_assert; #if defined(NDEBUG) #if PPL_PROFILE_ADD_WEIGHT +#define WEIGHT_BEGIN() Weight_Profiler::begin() #define WEIGHT_ADD(delta) \ do { \ static Weight_Profiler wp__(__FILE__, __LINE__, delta); \ @@ -148,6 +149,7 @@ extern unsigned int in_assert; wp__.end(factor); \ } while(0) #else +#define WEIGHT_BEGIN() #define WEIGHT_ADD(delta) \ do { \ Weightwatch_Traits::weight += delta; \ @@ -158,6 +160,7 @@ extern unsigned int in_assert; } while(0) #endif #else +#define WEIGHT_BEGIN() #define WEIGHT_ADD(delta) \ do { \ if (!Implementation::in_assert) \

1 0

[GIT] ppl/ppl(master): Modified computational weight for propagate_constraints.
by Enea Zaffanella 14 Jul '09

14 Jul '09

Module: ppl/ppl Branch: master Commit: 232f4f623dad3dce67a0083dcd903454939f524a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=232f4f623dad… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Tue Jul 14 11:05:13 2009 +0200 Modified computational weight for propagate_constraints. --- src/Box.templates.hh | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Box.templates.hh b/src/Box.templates.hh index e9ace50..76379b8 100644 --- a/src/Box.templates.hh +++ b/src/Box.templates.hh @@ -2601,7 +2601,12 @@ void Box<ITV> ::propagate_constraints_no_check(const Constraint_System& cs, const dimension_type max_iterations) { - PPL_ASSERT(cs.space_dimension() <= space_dimension()); + const dimension_type space_dim = space_dimension(); + PPL_ASSERT(cs.space_dimension() <= space_dim); + + const Constraint_System::const_iterator cs_begin = cs.begin(); + const Constraint_System::const_iterator cs_end = cs.end(); + const dimension_type cs_size = std::distance(cs_begin, cs_end); Sequence copy; bool changed; @@ -2609,11 +2614,10 @@ Box<ITV> do { ++num_iterations; copy = seq; - for (Constraint_System::const_iterator i = cs.begin(), - cs_end = cs.end(); i != cs_end; ++i) + for (Constraint_System::const_iterator i = cs_begin; i != cs_end; ++i) propagate_constraint_no_check(*i); - WEIGHT_ADD(1); + WEIGHT_ADD_MUL(cs_size, space_dim); // Check if the client has requested abandoning all expensive // computations. If so, the exception specified by the client // is thrown now.

1 0

[GIT] ppl/ppl(master): Added tentative computational weights to MIP_Problem .
by Enea Zaffanella 14 Jul '09

14 Jul '09

Module: ppl/ppl Branch: master Commit: ae0073bd4dd5faec841dfe822fc917230da64996 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ae0073bd4dd5… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Tue Jul 14 09:18:37 2009 +0200 Added tentative computational weights to MIP_Problem. --- src/MIP_Problem.cc | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/MIP_Problem.cc b/src/MIP_Problem.cc index 3ace6bc..1d3819b 100644 --- a/src/MIP_Problem.cc +++ b/src/MIP_Problem.cc @@ -938,6 +938,7 @@ PPL::MIP_Problem::steepest_edge_exact_entering_index() const { lcm_basis *= lcm_basis; std::swap(squared_lcm_basis, lcm_basis); } + WEIGHT_ADD_MUL(2, tableau_num_rows); // Defined here to avoid repeated (de-)allocations. PPL_DIRTY_TEMP_COEFFICIENT(challenger_num); @@ -968,6 +969,7 @@ PPL::MIP_Problem::steepest_edge_exact_entering_index() const { add_mul_assign(challenger_den, scalar_value, scalar_value); } } + WEIGHT_ADD_MUL(2, tableau_num_rows); // Initialization during the first loop. if (entering_index == 0) { std::swap(current_num, challenger_num); @@ -1013,7 +1015,8 @@ void PPL::MIP_Problem::linear_combine(Row& x, const Row& y, const dimension_type k) { - PPL_ASSERT(x.size() == y.size()); + const dimension_type x_size = x.size(); + PPL_ASSERT(x_size == y.size()); PPL_ASSERT(y[k] != 0 && x[k] != 0); // Let g be the GCD between `x[k]' and `y[k]'. // For each i the following computes @@ -1021,7 +1024,7 @@ PPL::MIP_Problem::linear_combine(Row& x, PPL_DIRTY_TEMP_COEFFICIENT(normalized_x_k); PPL_DIRTY_TEMP_COEFFICIENT(normalized_y_k); normalize2(x[k], y[k], normalized_x_k, normalized_y_k); - for (dimension_type i = x.size(); i-- > 0; ) + for (dimension_type i = x_size; i-- > 0; ) if (i != k) { Coefficient& x_i = x[i]; x_i *= normalized_y_k; @@ -1033,6 +1036,7 @@ PPL::MIP_Problem::linear_combine(Row& x, } x[k] = 0; x.normalize(); + WEIGHT_ADD_MUL(3, x_size); } // See pages 42-43 of [PapadimitriouS98]. @@ -1102,6 +1106,7 @@ PPL::MIP_Problem if (sign > 0 || (sign == 0 && base[i] < base[exiting_base_index])) exiting_base_index = i; + WEIGHT_ADD(7); } } return exiting_base_index; @@ -1147,7 +1152,6 @@ PPL::MIP_Problem::compute_simplex_using_steepest_edge_float() { if (exiting_base_index == tableau_num_rows) return false; - WEIGHT_ADD(1); // Check if the client has requested abandoning all expensive // computations. If so, the exception specified by the client // is thrown now. @@ -1168,6 +1172,7 @@ PPL::MIP_Problem::compute_simplex_using_steepest_edge_float() { challenger *= current_den; abs_assign(current, cost_sgn_coeff); current *= current_num; + WEIGHT_ADD(2); #if PPL_NOISY_SIMPLEX ++num_iterations; if (num_iterations % 200 == 0)

1 0

[GIT] ppl/ppl(master): Fixed WEIGHT_ADD use.
by Abramo Bagnara 14 Jul '09

14 Jul '09

Module: ppl/ppl Branch: master Commit: 67572f7617f66e19237d74edd0bc4b64eab1f481 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=67572f7617f6… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Tue Jul 14 00:09:12 2009 +0200 Fixed WEIGHT_ADD use. --- src/conversion.cc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/conversion.cc b/src/conversion.cc index a2ce2ee..e122de9 100644 --- a/src/conversion.cc +++ b/src/conversion.cc @@ -406,7 +406,7 @@ PPL::Polyhedron::conversion(Linear_System& source, Scalar_Products::assign(scalar_prod[index_non_zero], source_k, dest[index_non_zero]); - WEIGHT_ADD(source_num_columns); + WEIGHT_ADD_MUL(1, source_num_columns); if (scalar_prod[index_non_zero] != 0) // The generator does not saturate the constraint. break; @@ -417,7 +417,7 @@ PPL::Polyhedron::conversion(Linear_System& source, } for (dimension_type i = index_non_zero + 1; i < dest_num_rows; ++i) { Scalar_Products::assign(scalar_prod[i], source_k, dest[i]); - WEIGHT_ADD(source_num_columns); + WEIGHT_ADD_MUL(1, source_num_columns); // Check if the client has requested abandoning all expensive // computations. If so, the exception specified by the client // is thrown now. @@ -538,7 +538,7 @@ PPL::Polyhedron::conversion(Linear_System& source, dest_i.strong_normalize(); scalar_prod[i] = 0; // `dest' has already been set as non-sorted. - WEIGHT_ADD_MUL(4, dest_num_columns); + WEIGHT_ADD_MUL(1, dest_num_columns); } // Check if the client has requested abandoning all expensive // computations. If so, the exception specified by the client @@ -712,7 +712,7 @@ PPL::Polyhedron::conversion(Linear_System& source, break; } assert(bound >= num_lines_or_equalities); - WEIGHT_ADD(bound - num_lines_or_equalities); + WEIGHT_ADD_MUL(1, bound - num_lines_or_equalities); if (!redundant) { // Adding the new ray to `dest' and the corresponding // saturation row to `sat'. @@ -758,7 +758,7 @@ PPL::Polyhedron::conversion(Linear_System& source, scalar_prod[dest_num_rows] = Coefficient_zero(); // Increment the number of generators. ++dest_num_rows; - WEIGHT_ADD_MUL(4, dest_num_columns); + WEIGHT_ADD_MUL(1, dest_num_columns); } // if (!redundant) } }

1 0

[GIT] ppl/ppl(master): WEIGHT_ADD moved.
by Roberto Bagnara 13 Jul '09

13 Jul '09

Module: ppl/ppl Branch: master Commit: c3b1c746d42b445c547a69c9132f1e4a317d7c9f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c3b1c746d42b… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Jul 13 22:32:16 2009 +0200 WEIGHT_ADD moved. --- src/conversion.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/conversion.cc b/src/conversion.cc index 1d8a373..a2ce2ee 100644 --- a/src/conversion.cc +++ b/src/conversion.cc @@ -406,10 +406,10 @@ PPL::Polyhedron::conversion(Linear_System& source, Scalar_Products::assign(scalar_prod[index_non_zero], source_k, dest[index_non_zero]); + WEIGHT_ADD(source_num_columns); if (scalar_prod[index_non_zero] != 0) // The generator does not saturate the constraint. break; - WEIGHT_ADD(source_num_columns); // Check if the client has requested abandoning all expensive // computations. If so, the exception specified by the client // is thrown now.

1 0

[GIT] ppl/ppl(master): Removed forgotten WEIGHT_ADD.
by Abramo Bagnara 13 Jul '09

13 Jul '09

Module: ppl/ppl Branch: master Commit: 4984c996e750f23886217af073b3b3e6cf1f9bee URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4984c996e750… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Mon Jul 13 22:16:04 2009 +0200 Removed forgotten WEIGHT_ADD. --- src/globals.inlines.hh | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/globals.inlines.hh b/src/globals.inlines.hh index fd1f749..bcba424 100644 --- a/src/globals.inlines.hh +++ b/src/globals.inlines.hh @@ -58,7 +58,6 @@ maybe_abandon() { if (Implementation::in_assert) return; #endif - WEIGHT_ADD(1); if (Weightwatch_Traits::check_function) Weightwatch_Traits::check_function(); if (const Throwable* p = abandon_expensive_computations)

1 0

[GIT] ppl/ppl(master): Don't compile Weight_Profiler if it's not used.
by Abramo Bagnara 13 Jul '09

13 Jul '09

Module: ppl/ppl Branch: master Commit: 61df49cc3d5fa606f95e15147058f01c423d5622 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=61df49cc3d5f… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Mon Jul 13 22:03:05 2009 +0200 Don't compile Weight_Profiler if it's not used. --- src/Weight_Profiler.cc | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/Weight_Profiler.cc b/src/Weight_Profiler.cc index 20a2a43..ec963ac 100644 --- a/src/Weight_Profiler.cc +++ b/src/Weight_Profiler.cc @@ -21,9 +21,11 @@ For the most up-to-date information see the Parma Polyhedra Library site: http://www.cs.unipr.it/ppl/ . */ #include <ppl-config.h> +#include "globals.defs.hh" + +#if PPL_PROFILE_ADD_WEIGHT #include <iostream> #include <cmath> -#include "globals.defs.hh" #include "Weight_Profiler.defs.hh" namespace Parma_Polyhedra_Library { @@ -72,3 +74,5 @@ struct timespec Weight_Profiler::stamp; double Weight_Profiler::adj = Weight_Profiler::tune_adj(); } // namespace Parma_Polyhedra_Library + +#endif

1 0

[GIT] ppl/ppl(master): Minor formatting improvements.
by Enea Zaffanella 13 Jul '09

13 Jul '09

Module: ppl/ppl Branch: master Commit: 27ce45ef5e475dff71a6597176a96d2730bcc920 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=27ce45ef5e47… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Jul 13 21:58:44 2009 +0200 Minor formatting improvements. --- src/Weight_Profiler.defs.hh | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/Weight_Profiler.defs.hh b/src/Weight_Profiler.defs.hh index 542156d..16b3c5a 100644 --- a/src/Weight_Profiler.defs.hh +++ b/src/Weight_Profiler.defs.hh @@ -44,34 +44,41 @@ public: stat[i].max = 0; } } + ~Weight_Profiler() { output_stats(); } + void output_stats(); + static void begin() { #ifndef NDEBUG - int r = -#endif - clock_gettime(CLOCK_THREAD_CPUTIME_ID, &stamp); + int r = clock_gettime(CLOCK_THREAD_CPUTIME_ID, &stamp); assert(r >= 0); +#else + clock_gettime(CLOCK_THREAD_CPUTIME_ID, &stamp); +#endif } + void end(unsigned int factor = 1) { - Weightwatch_Traits::weight += (Weightwatch_Traits::Threshold) delta * factor; + Weightwatch_Traits::weight + += (Weightwatch_Traits::Threshold) delta * factor; struct timespec start = stamp; begin(); double elapsed; if (stamp.tv_nsec >= start.tv_nsec) { - elapsed = (stamp.tv_nsec - start.tv_nsec) + + elapsed = (stamp.tv_nsec - start.tv_nsec) + (stamp.tv_sec - start.tv_sec) * 1e9; } else { - elapsed = (1000000000 - start.tv_nsec + stamp.tv_nsec ) + + elapsed = (1000000000 - start.tv_nsec + stamp.tv_nsec ) + (stamp.tv_sec - start.tv_sec - 1) * 1e9; } elapsed -= adj; double elapsed1 = elapsed / factor; - int i; - i = (elapsed1 < tmin || (tmax > 0 && elapsed1 > tmax)) ? DISCARDED : VALID; + int i = (elapsed1 < tmin || (tmax > 0 && elapsed1 > tmax)) + ? DISCARDED + : VALID; ++stat[i].samples; if (stat[i].count == 0) stat[i].min = stat[i].max = elapsed1; @@ -83,7 +90,9 @@ public: stat[i].ssum += elapsed * elapsed1; stat[i].count += factor; } + static double tune_adj(); + private: const char *file; int line; @@ -106,4 +115,4 @@ public: } -#endif +#endif // Weight_Profiler_defs_hh

1 0

Mark Mitchell - Graphite Merge Expected in Mid/Late July
by Roberto Bagnara 13 Jul '09

13 Jul '09

Let us be ready to release PPL 0.11 any time now: http://gcc.gnu.org/ml/gcc/2009-07/msg00104.html The Interval and CDS work will go into PPL 0.12. -- Prof. Roberto Bagnara Computer Science Group Department of Mathematics, University of Parma, Italy http://www.cs.unipr.it/~bagnara/ mailto:bagnara@cs.unipr.it

1 0