- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(floating_point): Implemented Linear_Form::intervalize ( still not compiling,
by Fabio Bossi 21 Jul '10

21 Jul '10

Module: ppl/ppl Branch: floating_point Commit: 4c1245f7e89c21d15863001bbc4e5bd9a3cce348 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4c1245f7e89c… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Wed Jul 21 15:18:30 2010 +0200 Implemented Linear_Form::intervalize (still not compiling, probably due to some sort of cyclic dependency problem between Grid and Box). --- src/Linear_Form.defs.hh | 3 +++ src/Linear_Form.templates.hh | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/src/Linear_Form.defs.hh b/src/Linear_Form.defs.hh index c80b605..f7ed492 100644 --- a/src/Linear_Form.defs.hh +++ b/src/Linear_Form.defs.hh @@ -26,6 +26,7 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "Linear_Form.types.hh" #include "Linear_Expression.types.hh" #include "Variable.defs.hh" +#include "Box.types.hh" #include <vector> namespace Parma_Polyhedra_Library { @@ -329,6 +330,8 @@ public: void relative_error(Floating_Point_Format analyzed_format, Linear_Form& result) const; + void intervalize(const Box<C>& store, C& result) const; + private: //! The generic coefficient equal to the singleton zero. static C zero; diff --git a/src/Linear_Form.templates.hh b/src/Linear_Form.templates.hh index 83e7c1f..666207e 100644 --- a/src/Linear_Form.templates.hh +++ b/src/Linear_Form.templates.hh @@ -24,6 +24,7 @@ site: http://www.cs.unipr.it/ppl/ . */ #define PPL_Linear_Form_templates_hh 1 #include "Linear_Expression.defs.hh" +#include "Box.defs.hh" #include <stdexcept> #include <iostream> @@ -445,6 +446,22 @@ Linear_Form<C>::relative_error( return; } +template <typename C> +void +Linear_Form<C>::intervalize(const Box<C>& store, C& result) const { + result = C(inhomogeneous_term()); + dimension_type dimension = space_dimension(); + assert(dimension <= store.space_dimension()); + for (dimension_type i = 0; i < dimension; ++i) { + C current_addend = coefficient(Variable(i)); + const C& curr_int = store.get_interval(Variable(i)); + current_addend *= curr_int; + result += current_addend; + } + + return; +} + /*! \relates Parma_Polyhedra_Library::Linear_Form */ template <typename C> std::ostream&

1 0

[GIT] ppl/ppl(floating_point): Fixed iostream inclusion.
by Fabio Bossi 21 Jul '10

21 Jul '10

Module: ppl/ppl Branch: floating_point Commit: 62fcf8c0d4beb9d94c555f6c0310a4030b5f2312 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=62fcf8c0d4be… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Wed Jul 21 14:35:04 2010 +0200 Fixed iostream inclusion. --- src/Concrete_Expression.cc | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/src/Concrete_Expression.cc b/src/Concrete_Expression.cc index b06e439..e2416fd 100644 --- a/src/Concrete_Expression.cc +++ b/src/Concrete_Expression.cc @@ -21,9 +21,7 @@ For the most up-to-date information see the Parma Polyhedra Library site: http://www.cs.unipr.it/ppl/ . */ #include <ppl-config.h> -#ifndef NDEBUG -#include <stdio> -#endif +#include <iostream> #include "Concrete_Expression.defs.hh"

1 0

[GIT] ppl/ppl(floating_point): Fixed error in the use of NDEBUG.
by Fabio Bossi 21 Jul '10

21 Jul '10

Module: ppl/ppl Branch: floating_point Commit: df4645ba455fac92547b0bd050d43b20edeadfcb URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=df4645ba455f… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Wed Jul 21 14:31:34 2010 +0200 Fixed error in the use of NDEBUG. --- src/Concrete_Expression.cc | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Concrete_Expression.cc b/src/Concrete_Expression.cc index cc7b34d..b06e439 100644 --- a/src/Concrete_Expression.cc +++ b/src/Concrete_Expression.cc @@ -21,7 +21,7 @@ For the most up-to-date information see the Parma Polyhedra Library site: http://www.cs.unipr.it/ppl/ . */ #include <ppl-config.h> -#ifdef NDEBUG +#ifndef NDEBUG #include <stdio> #endif @@ -37,7 +37,7 @@ PPL::Concrete_Expression_Type::OK() const { && impl.bounded_integer_type_width != BITS_32 && impl.bounded_integer_type_width != BITS_64 && impl.bounded_integer_type_width != BITS_128) { -#ifdef NDEBUG +#ifndef NDEBUG std::cerr << "bounded integer type has illegal width " << impl.bounded_integer_type_width << std::endl; @@ -47,7 +47,7 @@ PPL::Concrete_Expression_Type::OK() const { if (impl.bounded_integer_type_representation != UNSIGNED && impl.bounded_integer_type_representation != SIGNED_2_COMPLEMENT) { -#ifdef NDEBUG +#ifndef NDEBUG std::cerr << "bounded integer type has illegal representation " << impl.bounded_integer_type_representation << std::endl; @@ -58,7 +58,7 @@ PPL::Concrete_Expression_Type::OK() const { if (impl.bounded_integer_type_overflow != OVERFLOW_WRAPS && impl.bounded_integer_type_overflow != OVERFLOW_UNDEFINED && impl.bounded_integer_type_overflow != OVERFLOW_IMPOSSIBLE) { -#ifdef NDEBUG +#ifndef NDEBUG std::cerr << "bounded integer type has illegal overflow " << impl.bounded_integer_type_overflow << std::endl; @@ -67,7 +67,7 @@ PPL::Concrete_Expression_Type::OK() const { } if (impl.floating_point_format != IEEE754_HALF) { -#ifdef NDEBUG +#ifndef NDEBUG std::cerr << "bounded integer type has illegal (unused) fp format " << impl.floating_point_format << std::endl; @@ -83,7 +83,7 @@ PPL::Concrete_Expression_Type::OK() const { && impl.floating_point_format != IBM_SINGLE && impl.floating_point_format != IEEE754_QUAD && impl.floating_point_format != INTEL_DOUBLE_EXTENDED) { -#ifdef NDEBUG +#ifndef NDEBUG std::cerr << "floating point type has illegal format " << impl.floating_point_format << std::endl; @@ -101,7 +101,7 @@ PPL::Concrete_Expression_Type::OK() const { } if (impl.bounded_integer_type_representation != SIGNED_2_COMPLEMENT) { -#ifdef NDEBUG +#ifndef NDEBUG std::cerr << "floating point type has illegal (unused) bi representation " << impl.bounded_integer_type_representation << std::endl; @@ -110,7 +110,7 @@ PPL::Concrete_Expression_Type::OK() const { } if (impl.bounded_integer_type_overflow != OVERFLOW_IMPOSSIBLE) { -#ifdef NDEBUG +#ifndef NDEBUG std::cerr << "floating point type has illegal (unused) bi overflow " << impl.bounded_integer_type_overflow << std::endl;

1 0

[GIT] ppl/ppl(floating_point): Implemented Linear_Form::overflows and
by Fabio Bossi 21 Jul '10

21 Jul '10

Module: ppl/ppl Branch: floating_point Commit: c85b888fd3f403f17df903db4016411d2c199196 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c85b888fd3f4… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Wed Jul 21 13:35:29 2010 +0200 Implemented Linear_Form::overflows and Linear_Form::relative_error. --- src/Linear_Form.defs.hh | 7 ++++ src/Linear_Form.inlines.hh | 16 +++++++++ src/Linear_Form.templates.hh | 70 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 93 insertions(+), 0 deletions(-) diff --git a/src/Linear_Form.defs.hh b/src/Linear_Form.defs.hh index c58fbbc..c80b605 100644 --- a/src/Linear_Form.defs.hh +++ b/src/Linear_Form.defs.hh @@ -322,6 +322,13 @@ public: //! Swaps \p *this with \p y. void swap(Linear_Form& y); + // Floating point analysis related methods. + + bool overflows() const; + + void relative_error(Floating_Point_Format analyzed_format, + Linear_Form& result) const; + private: //! The generic coefficient equal to the singleton zero. static C zero; diff --git a/src/Linear_Form.inlines.hh b/src/Linear_Form.inlines.hh index 60f03de..43ca4e6 100644 --- a/src/Linear_Form.inlines.hh +++ b/src/Linear_Form.inlines.hh @@ -204,6 +204,22 @@ Linear_Form<C>::ascii_load(std::istream& s) { return false; } +// Floating point analysis related methods. +template <typename C> +inline bool +Linear_Form<C>::overflows() const { + if (!inhomogeneous_term().is_bounded()) + return true; + + dimension_type dimension = space_dimension(); + for (dimension_type i = 0; i < dimension; ++i) { + if (!coefficient(Variable(i)).is_bounded()) + return true; + } + + return false; +} + } // namespace Parma_Polyhedra_Library diff --git a/src/Linear_Form.templates.hh b/src/Linear_Form.templates.hh index 9c39fc3..83e7c1f 100644 --- a/src/Linear_Form.templates.hh +++ b/src/Linear_Form.templates.hh @@ -375,6 +375,76 @@ Linear_Form<C>::OK() const { return true; } +// Floating point analysis related methods. +template <typename C> +void +Linear_Form<C>::relative_error( + const Floating_Point_Format analyzed_format, + Linear_Form& result) const { + typedef typename C::boundary_type analyzer_format; + + // Get the necessary information on the analyzed's format. + unsigned int f_base; + unsigned int f_mantissa_bits; + switch (analyzed_format) { + case IEEE754_HALF: + f_base = float_ieee754_half::BASE; + f_mantissa_bits = float_ieee754_half::MANTISSA_BITS; + break; + case IEEE754_SINGLE: + f_base = float_ieee754_single::BASE; + f_mantissa_bits = float_ieee754_single::MANTISSA_BITS; + break; + case IEEE754_DOUBLE: + f_base = float_ieee754_double::BASE; + f_mantissa_bits = float_ieee754_double::MANTISSA_BITS; + break; + case IBM_SINGLE: + f_base = float_ibm_single::BASE; + f_mantissa_bits = float_ibm_single::MANTISSA_BITS; + break; + case IEEE754_QUAD: + f_base = float_ieee754_quad::BASE; + f_mantissa_bits = float_ieee754_quad::MANTISSA_BITS; + break; + case INTEL_DOUBLE_EXTENDED: + f_base = float_intel_double_extended::BASE; + f_mantissa_bits = float_intel_double_extended::MANTISSA_BITS; + break; + } + + C error_propagator; + analyzer_format lb = -pow(f_base, + -static_cast<analyzer_format>(f_mantissa_bits)); + error_propagator.build(i_constraint(GREATER_OR_EQUAL, lb), + i_constraint(LESS_OR_EQUAL, -lb)); + + // Handle the inhomogeneous term. + const C* current_term = &inhomogeneous_term(); + assert(current_term->is_bounded()); + + C current_multiplier(std::max(std::abs(current_term->lower()), + std::abs(current_term->upper()))); + Linear_Form current_result_term(current_multiplier); + current_result_term *= error_propagator; + result = Linear_Form(current_result_term); + + // Handle the other terms. + dimension_type dimension = space_dimension(); + for (dimension_type i = 0; i < dimension; ++i) { + current_term = &coefficient(Variable(i)); + assert(current_term->is_bounded()); + current_multiplier = C(std::max(std::abs(current_term->lower()), + std::abs(current_term->upper()))); + current_result_term = Linear_Form(Variable(i)); + current_result_term *= current_multiplier; + current_result_term *= error_propagator; + result += current_result_term; + } + + return; +} + /*! \relates Parma_Polyhedra_Library::Linear_Form */ template <typename C> std::ostream&

1 0

[GIT] ppl/ppl(floating_point): Do not const-qualify by-copy parameters in declarations.
by Fabio Bossi 21 Jul '10

21 Jul '10

Module: ppl/ppl Branch: floating_point Commit: 152569b0c53bb429e915bfa37b6bf1c7a0ea2fdb URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=152569b0c53b… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Wed Jul 21 12:36:33 2010 +0200 Do not const-qualify by-copy parameters in declarations. --- src/Float.defs.hh | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/Float.defs.hh b/src/Float.defs.hh index d2f2678..21270da 100644 --- a/src/Float.defs.hh +++ b/src/Float.defs.hh @@ -361,8 +361,7 @@ public: #endif template <typename FP_Interval_Type> -FP_Interval_Type compute_absolute_error(const Floating_Point_Format - analyzed_format); +FP_Interval_Type compute_absolute_error(Floating_Point_Format analyzed_format); template <typename FP_Interval_Type, Floating_Point_Format> class absolute_error;

1 0

[GIT] ppl/ppl(floating_point): Added class absolute_error.
by Fabio Bossi 21 Jul '10

21 Jul '10

Module: ppl/ppl Branch: floating_point Commit: 7421b099f14c21bd61400d345201e92022d836aa URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7421b099f14c… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Wed Jul 21 12:01:17 2010 +0200 Added class absolute_error. --- src/Float.defs.hh | 59 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 55 insertions(+), 4 deletions(-) diff --git a/src/Float.defs.hh b/src/Float.defs.hh index fff7b68..d2f2678 100644 --- a/src/Float.defs.hh +++ b/src/Float.defs.hh @@ -364,11 +364,62 @@ template <typename FP_Interval_Type> FP_Interval_Type compute_absolute_error(const Floating_Point_Format analyzed_format); -// TODO. -/* +template <typename FP_Interval_Type, Floating_Point_Format> +class absolute_error; + +template <typename FP_Interval_Type> +class absolute_error<FP_Interval_Type, IEEE754_HALF> { + static const FP_Interval_Type value; +}; + +template <typename FP_Interval_Type> +const FP_Interval_Type absolute_error<FP_Interval_Type, IEEE754_HALF>::value = + compute_absolute_error<FP_Interval_Type>(IEEE754_HALF); + +template <typename FP_Interval_Type> +class absolute_error<FP_Interval_Type, IEEE754_SINGLE> { + static const FP_Interval_Type value; +}; + +template <typename FP_Interval_Type> +const FP_Interval_Type absolute_error<FP_Interval_Type, IEEE754_SINGLE>::value = + compute_absolute_error<FP_Interval_Type>(IEEE754_SINGLE); + +template <typename FP_Interval_Type> +class absolute_error<FP_Interval_Type, IEEE754_DOUBLE> { + static const FP_Interval_Type value; +}; + +template <typename FP_Interval_Type> +const FP_Interval_Type absolute_error<FP_Interval_Type, IEEE754_DOUBLE>::value = + compute_absolute_error<FP_Interval_Type>(IEEE754_DOUBLE); + +template <typename FP_Interval_Type> +class absolute_error<FP_Interval_Type, IBM_SINGLE> { + static const FP_Interval_Type value; +}; + +template <typename FP_Interval_Type> +const FP_Interval_Type absolute_error<FP_Interval_Type, IBM_SINGLE>::value = + compute_absolute_error<FP_Interval_Type>(IBM_SINGLE); + +template <typename FP_Interval_Type> +class absolute_error<FP_Interval_Type, IEEE754_QUAD> { + static const FP_Interval_Type value; +}; + +template <typename FP_Interval_Type> +const FP_Interval_Type absolute_error<FP_Interval_Type, IEEE754_QUAD>::value = + compute_absolute_error<FP_Interval_Type>(IEEE754_QUAD); + +template <typename FP_Interval_Type> +class absolute_error<FP_Interval_Type, INTEL_DOUBLE_EXTENDED> { + static const FP_Interval_Type value; +}; + template <typename FP_Interval_Type> -FP_Interval_Type absolute_error = compute_absolute_error(); -*/ +const FP_Interval_Type absolute_error<FP_Interval_Type, INTEL_DOUBLE_EXTENDED>::value = + compute_absolute_error<FP_Interval_Type>(INTEL_DOUBLE_EXTENDED); } // namespace Parma_Polyhedra_Library

1 0

[GIT] ppl/ppl(floating_point): Implemented compute_absolute_error.
by Fabio Bossi 21 Jul '10

21 Jul '10

Module: ppl/ppl Branch: floating_point Commit: 95846dca5e7fe0afec95c2489192e4f3eab81f61 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=95846dca5e7f… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Wed Jul 21 10:54:28 2010 +0200 Implemented compute_absolute_error. --- src/Float.defs.hh | 12 +++++++ src/Float.templates.hh | 87 ++++++++++++++++++++++++++++++++++++++++++++++++ src/Makefile.am | 1 + 3 files changed, 100 insertions(+), 0 deletions(-) diff --git a/src/Float.defs.hh b/src/Float.defs.hh index 1e3e413..fff7b68 100644 --- a/src/Float.defs.hh +++ b/src/Float.defs.hh @@ -23,6 +23,7 @@ site: http://www.cs.unipr.it/ppl/ . */ #ifndef PPL_Float_defs_hh #define PPL_Float_defs_hh 1 +#include "globals.types.hh" #include "meta_programming.hh" #include "compiler.hh" #include <gmp.h> @@ -359,8 +360,19 @@ public: }; #endif +template <typename FP_Interval_Type> +FP_Interval_Type compute_absolute_error(const Floating_Point_Format + analyzed_format); + +// TODO. +/* +template <typename FP_Interval_Type> +FP_Interval_Type absolute_error = compute_absolute_error(); +*/ + } // namespace Parma_Polyhedra_Library #include "Float.inlines.hh" +#include "Float.templates.hh" #endif // !defined(PPL_Float_defs_hh) diff --git a/src/Float.templates.hh b/src/Float.templates.hh new file mode 100644 index 0000000..5cc53fc --- /dev/null +++ b/src/Float.templates.hh @@ -0,0 +1,87 @@ +/* IEC 559 floating point format related functions: + non-inline template functions. + Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it> + +This file is part of the Parma Polyhedra Library (PPL). + +The PPL is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. + +The PPL is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software Foundation, +Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. + +For the most up-to-date information see the Parma Polyhedra Library +site: http://www.cs.unipr.it/ppl/ . */ + +#ifndef PPL_Float_templates_hh +#define PPL_Float_Templates_hh 1 + +#include <cmath> + +namespace Parma_Polyhedra_Library { + +template <typename FP_Interval_Type> +FP_Interval_Type compute_absolute_error( + const Floating_Point_Format analyzed_format) { + typedef typename FP_Interval_Type::boundary_type analyzer_format; + + // Get the necessary information on the analyzed's format. + unsigned int f_base; + int f_exponent_bias; + unsigned int f_mantissa_bits; + switch (analyzed_format) { + case IEEE754_HALF: + f_base = float_ieee754_half::BASE; + f_exponent_bias = float_ieee754_half::EXPONENT_BIAS; + f_mantissa_bits = float_ieee754_half::MANTISSA_BITS; + break; + case IEEE754_SINGLE: + f_base = float_ieee754_single::BASE; + f_exponent_bias = float_ieee754_single::EXPONENT_BIAS; + f_mantissa_bits = float_ieee754_single::MANTISSA_BITS; + break; + case IEEE754_DOUBLE: + f_base = float_ieee754_double::BASE; + f_exponent_bias = float_ieee754_double::EXPONENT_BIAS; + f_mantissa_bits = float_ieee754_double::MANTISSA_BITS; + break; + case IBM_SINGLE: + f_base = float_ibm_single::BASE; + f_exponent_bias = float_ibm_single::EXPONENT_BIAS; + f_mantissa_bits = float_ibm_single::MANTISSA_BITS; + break; + case IEEE754_QUAD: + f_base = float_ieee754_quad::BASE; + f_exponent_bias = float_ieee754_quad::EXPONENT_BIAS; + f_mantissa_bits = float_ieee754_quad::MANTISSA_BITS; + break; + case INTEL_DOUBLE_EXTENDED: + f_base = float_intel_double_extended::BASE; + f_exponent_bias = float_intel_double_extended::EXPONENT_BIAS; + f_mantissa_bits = float_intel_double_extended::MANTISSA_BITS; + break; + } + + analyzer_format omega = std::max( + static_cast<analyzer_format>(pow(f_base, + static_cast<analyzer_format>(1) - + f_exponent_bias - f_mantissa_bits)), + std::numeric_limits<analyzer_format>::denorm_min()); + + FP_Interval_Type result; + result.build(i_constraint(GREATER_OR_EQUAL, -omega), + i_constraint(LESS_OR_EQUAL, omega)); + return result; +} + +} // namespace Parma_Polyhedra_Library + +#endif // !defined(PPL_Float_Templates_hh) diff --git a/src/Makefile.am b/src/Makefile.am index 62efcad..e4dbcb7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -182,6 +182,7 @@ Octagonal_Shape.types.hh \ fpu.types.hh \ Float.defs.hh \ Float.inlines.hh \ +Float.templates.hh \ C_Integer.hh \ fpu.defs.hh \ fpu-c99.inlines.hh \

1 0

[GIT] ppl/ppl(floating_point): Fixed Concrete_Expression. cc so that it compiles
by Fabio Bossi 21 Jul '10

21 Jul '10

Module: ppl/ppl Branch: floating_point Commit: 14cd19f366e8c39a409d2d8fa16653e1774714d8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=14cd19f366e8… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Wed Jul 21 10:52:39 2010 +0200 Fixed Concrete_Expression.cc so that it compiles with NDEBUG activated. --- src/Concrete_Expression.cc | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/Concrete_Expression.cc b/src/Concrete_Expression.cc index 126a1a0..cc7b34d 100644 --- a/src/Concrete_Expression.cc +++ b/src/Concrete_Expression.cc @@ -21,6 +21,9 @@ For the most up-to-date information see the Parma Polyhedra Library site: http://www.cs.unipr.it/ppl/ . */ #include <ppl-config.h> +#ifdef NDEBUG +#include <stdio> +#endif #include "Concrete_Expression.defs.hh" @@ -34,7 +37,7 @@ PPL::Concrete_Expression_Type::OK() const { && impl.bounded_integer_type_width != BITS_32 && impl.bounded_integer_type_width != BITS_64 && impl.bounded_integer_type_width != BITS_128) { -#ifndef NDEBUG +#ifdef NDEBUG std::cerr << "bounded integer type has illegal width " << impl.bounded_integer_type_width << std::endl; @@ -44,7 +47,7 @@ PPL::Concrete_Expression_Type::OK() const { if (impl.bounded_integer_type_representation != UNSIGNED && impl.bounded_integer_type_representation != SIGNED_2_COMPLEMENT) { -#ifndef NDEBUG +#ifdef NDEBUG std::cerr << "bounded integer type has illegal representation " << impl.bounded_integer_type_representation << std::endl; @@ -55,7 +58,7 @@ PPL::Concrete_Expression_Type::OK() const { if (impl.bounded_integer_type_overflow != OVERFLOW_WRAPS && impl.bounded_integer_type_overflow != OVERFLOW_UNDEFINED && impl.bounded_integer_type_overflow != OVERFLOW_IMPOSSIBLE) { -#ifndef NDEBUG +#ifdef NDEBUG std::cerr << "bounded integer type has illegal overflow " << impl.bounded_integer_type_overflow << std::endl; @@ -64,7 +67,7 @@ PPL::Concrete_Expression_Type::OK() const { } if (impl.floating_point_format != IEEE754_HALF) { -#ifndef NDEBUG +#ifdef NDEBUG std::cerr << "bounded integer type has illegal (unused) fp format " << impl.floating_point_format << std::endl; @@ -80,7 +83,7 @@ PPL::Concrete_Expression_Type::OK() const { && impl.floating_point_format != IBM_SINGLE && impl.floating_point_format != IEEE754_QUAD && impl.floating_point_format != INTEL_DOUBLE_EXTENDED) { -#ifndef NDEBUG +#ifdef NDEBUG std::cerr << "floating point type has illegal format " << impl.floating_point_format << std::endl; @@ -89,7 +92,7 @@ PPL::Concrete_Expression_Type::OK() const { } if (impl.bounded_integer_type_width != BITS_128) { -#ifndef NDEBUG +#ifdef NDEBUG std::cerr << "floating point type has illegal (unused) bi width " << impl.bounded_integer_type_width << std::endl; @@ -98,7 +101,7 @@ PPL::Concrete_Expression_Type::OK() const { } if (impl.bounded_integer_type_representation != SIGNED_2_COMPLEMENT) { -#ifndef NDEBUG +#ifdef NDEBUG std::cerr << "floating point type has illegal (unused) bi representation " << impl.bounded_integer_type_representation << std::endl; @@ -107,7 +110,7 @@ PPL::Concrete_Expression_Type::OK() const { } if (impl.bounded_integer_type_overflow != OVERFLOW_IMPOSSIBLE) { -#ifndef NDEBUG +#ifdef NDEBUG std::cerr << "floating point type has illegal (unused) bi overflow " << impl.bounded_integer_type_overflow << std::endl;

1 0

[GIT] ppl/ppl(sparse_matrices): New commits
by Roberto Bagnara 21 Jul '10

21 Jul '10

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=109c913c02d1… Merge: 31eb3edd5909fd3fe9c13c6dbae2355c3949a692 75de3adbd70ca2f2d42112a53e719c27cbea4731 Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Wed Jul 21 09:11:46 2010 +0200 Merge branch 'master' into sparse_matrices Conflicts: CREDITS configure.ac src/MIP_Problem.cc src/MIP_Problem.defs.hh URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=75de3adbd70c… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Jul 3 12:03:09 2010 +0200 Version number bumped. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=16cbdda5d7d3… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Jun 28 09:36:56 2010 +0200 Improved specification and implementation of erase_artificials(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e23face68ebf… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Jun 28 08:48:32 2010 +0200 Use PPL_ASSERT() instead of plain assert(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=40ab909d8ec6… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Jun 26 21:40:44 2010 +0200 Improved MIP_Problem preprocessing phase and solved an efficiency bug. Rewritten private methods parse_constraints(), merge_split_variable() and process_pending_constraints(): specification clarified and implementation improved to avoid allocating more tableau rows and columns than needed. This results in an overall speedup, in particular when solving problems incrementally. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3e33e00ded13… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Jun 17 16:29:18 2010 +0200 Updated from Libtool 2.2.10. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=044730210d62… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Jun 17 16:20:34 2010 +0200 Added missing argument names. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7e35772519cb… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Tue Jun 15 20:56:50 2010 +0200 Put aside changes related to Floating_Point and Linear_Form classes. These will not enter release 0.11. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=24d6f3e03340… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon May 10 14:04:20 2010 +0200 Moved Katy Dobson to the list of past contributors. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e452159271ab… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri May 7 08:44:28 2010 +0200 Fixed comment. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d7c20fa14445… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri May 7 07:49:16 2010 +0200 Removed current implementation of PPL_{LT,GT}_SILENT: the cure was worse than the disease. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f9182bb6ab09… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri May 7 07:20:52 2010 +0200 Avoid temporary in smod_2exp. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=df9bcf9e4ed2… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri May 7 06:11:49 2010 +0200 Better/canonical way to avoid gcc warning. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=258de934add2… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Tue May 4 13:11:29 2010 +0200 Revert "Optimized smod_2exp_signed_int." This reverts commit 21d120a07448821720acd415213f9b08a9a14338. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=21d120a07448… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Tue May 4 13:07:37 2010 +0200 Optimized smod_2exp_signed_int. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b07586183751… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Sat Apr 17 12:00:38 2010 +0200 Refuse to compile on (very obsolete) architectures that are not using two's complement. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=140b42a24737… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Apr 23 08:33:56 2010 +0200 Version number bumped. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b75b69c4ea3e… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Apr 23 00:51:39 2010 +0200 Put under git control. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d882d4ea5dbe… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Apr 22 23:59:57 2010 +0200 Added class Partial_Function to the PPL library. Java, Prolog and OCaml interfaces now use an object of this Partial_Function class when mapping the space dimensions of teh vector space. Some of the consistency checks that were performed by other variants of Partial_Function are now only done when in debugging mode. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5b80536886e3… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Apr 22 15:20:33 2010 +0200 Fixed expected results for tests/Octagonal_Shape/writeoctagon1.cc URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c976419bcc8f… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Apr 22 14:42:20 2010 +0200 Use a C++ object to encode a Partial_Function in the Java interface. Current implementation is based on a copy of the Partial_Function type used in C++ tests: we should consider whether or not it would be appropriate to have this Partial_Function type as a first class PPL object. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=64faa9223236… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Apr 22 10:17:09 2010 +0200 Version number bumped. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c30a06c1bbee… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Apr 22 10:05:12 2010 +0200 Modified signature of method maps() in Java Partial_Function interface. Modified test implementation in tests/Test_Partial_Function.java accordingly (note though that TreeMap still uses Long objects). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=212a7409b929… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Apr 21 18:55:53 2010 +0200 Version number bumped. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a04daee5e4dc… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Apr 21 18:54:32 2010 +0200 Fixed the printing of equality constraints. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9088b000d17c… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Apr 19 19:33:08 2010 +0200 Version number bumped. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4fd40ebc37d0… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Apr 19 19:19:42 2010 +0200 Added $(noinst_HEADERS) to BUILT_SOURCES so as to build ppl.hh early when !BUILD_CXX_INTERFACE. (Thanks to Ralf Wildenhues who identified the problem and to Sebastian Pop who reported a parallel build failure due to it.)

1 0

[GIT] ppl/ppl(sparse_matrices): MIP_Problem: drop optimizations meant for sparse implementations that are about to be removed .
by Marco Poletti 21 Jul '10

21 Jul '10

Module: ppl/ppl Branch: sparse_matrices Commit: 31eb3edd5909fd3fe9c13c6dbae2355c3949a692 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=31eb3edd5909… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Jul 20 18:08:22 2010 +0200 MIP_Problem: drop optimizations meant for sparse implementations that are about to be removed. --- src/MIP_Problem.cc | 102 ---------------------------------------------------- 1 files changed, 0 insertions(+), 102 deletions(-) diff --git a/src/MIP_Problem.cc b/src/MIP_Problem.cc index 0eca841..2a1cbf0 100644 --- a/src/MIP_Problem.cc +++ b/src/MIP_Problem.cc @@ -718,11 +718,6 @@ PPL::MIP_Problem::process_pending_constraints() { typedef process_pending_constraints_helper_struct buffer_element_t; -#ifdef PPL_SPARSE_BACKEND_SLOW_RANDOM_READS - // Used to optimize access to tableau_k. - std::vector<std::pair<dimension_type, dimension_type> > vars_in_base; -#endif - // Used to improve performance, ordering writes to tableau_k. std::vector<buffer_element_t> buffer; @@ -733,64 +728,6 @@ PPL::MIP_Problem::process_pending_constraints() { // Copy the original constraint in the tableau. matrix_row_reference_type tableau_k = tableau[--k]; -#ifdef PPL_SPARSE_BACKEND_SLOW_RANDOM_WRITES - const Constraint& cs_i = input_cs[i]; - for (dimension_type sd = cs_i.space_dimension(); sd-- > 0; ) { - const Coefficient& current_coefficient = - cs_i.coefficient(Variable(sd)); - // The test against 0 is not needed, but improves performance. - if (current_coefficient != 0) { - buffer.push_back(buffer_element_t(mapping[sd + 1].first, - &current_coefficient, false)); - // Split if needed. - if (mapping[sd + 1].second != 0) - buffer.push_back(buffer_element_t(mapping[sd + 1].second, - &current_coefficient, true)); - } - } - const Coefficient& cs_i_inhomogeneous_term = cs_i.inhomogeneous_term(); - // The test against 0 is not needed, but improves performance. - if (cs_i_inhomogeneous_term != 0) { - buffer.push_back(buffer_element_t(mapping[0].first, - &cs_i_inhomogeneous_term, false)); - // Split if needed. - if (mapping[0].second != 0) - buffer.push_back(buffer_element_t(mapping[0].second, - &cs_i_inhomogeneous_term, true)); - } - - // Add the slack variable, if needed. - if (cs_i.is_inequality()) { - buffer.push_back(buffer_element_t(--slack_index, &(Coefficient_one()), - true)); - // If the constraint is already satisfied, we will not use artificial - // variables to compute a feasible base: this to speed up - // the algorithm. - if (satisfied_ineqs[i]) { - base[k] = slack_index; - worked_out_row[k] = true; - } - } - { - std::sort(buffer.begin(), buffer.end()); - // Dump map content into tableau_k. - std::vector<buffer_element_t>::iterator j = buffer.begin(); - std::vector<buffer_element_t>::iterator j_end = buffer.end(); - if (j != j_end) { - matrix_row_iterator itr; - tableau_k.find_create_assign(j->index, *(j->data), itr); - if (j->toggle_sign) - neg_assign(itr->second); - ++j; - for ( ; j != j_end; ++j) { - tableau_k.find_create_hint_assign(j->index, *(j->data), itr); - if (j->toggle_sign) - neg_assign(itr->second); - } - } - buffer.clear(); - } -#else // defined(PPL_SPARSE_BACKEND_SLOW_RANDOM_WRITES) const Constraint& cs_i = input_cs[i]; for (dimension_type sd = cs_i.space_dimension(); sd-- > 0; ) { const Coefficient& current_coefficient = @@ -824,50 +761,11 @@ PPL::MIP_Problem::process_pending_constraints() { worked_out_row[k] = true; } } -#endif // defined(PPL_SPARSE_BACKEND_SLOW_RANDOM_WRITES) - - -#ifdef PPL_SPARSE_BACKEND_SLOW_RANDOM_READS - // We need to sort accesses by base[j], not by j. - - for (dimension_type j = base_size; j-- > 0; ) - if (base[j] != 0 && j != k) - vars_in_base.push_back(std::make_pair(base[j], j)); - - std::sort(vars_in_base.begin(), vars_in_base.end()); - - std::vector< std::pair<dimension_type, dimension_type> >::iterator j - = vars_in_base.begin(); - std::vector< std::pair<dimension_type, dimension_type> >::iterator j_end - = vars_in_base.end(); - matrix_row_const_iterator itr = tableau_k.begin(); - matrix_row_const_iterator itr_end = tableau_k.end(); - while (j != j_end && itr != itr_end) { - if (itr->first < j->first) - tableau_k.lower_bound_hint_assign(j->first, itr); - else - if (itr->first > j->first) - ++j; - else { - PPL_ASSERT(itr->first == j->first); - if (k != j->second && itr->second != 0) { - linear_combine(tableau_k, tableau[j->second], base[j->second]); - // linear_combine() invalidates itr and itr_end. - tableau_k.lower_bound_assign(j->first, itr); - itr_end = tableau_k.end(); - } else - ++itr; - ++j; - } - } - vars_in_base.clear(); -#else // defined(PPL_SPARSE_BACKEND_SLOW_RANDOM_READS) for (dimension_type j = base_size; j-- > 0; ) if (k != j && base[j] != 0 && tableau_k.get(base[j]) != 0) linear_combine(tableau_k, tableau[j], base[j]); -#endif // defined(PPL_SPARSE_BACKEND_SLOW_RANDOM_READS) } // We negate the row if tableau[i][0] <= 0 to get the inhomogeneous term > 0.

1 0