diff options
Diffstat (limited to 'eigen/bench/btl/generic_bench')
9 files changed, 62 insertions, 20 deletions
diff --git a/eigen/bench/btl/generic_bench/bench.hh b/eigen/bench/btl/generic_bench/bench.hh index 005c363..7b7b951 100644 --- a/eigen/bench/btl/generic_bench/bench.hh +++ b/eigen/bench/btl/generic_bench/bench.hh @@ -102,8 +102,8 @@ BTL_DONT_INLINE void bench( int size_min, int size_max, int nb_point ) // merge the two data std::vector<int> newSizes; std::vector<double> newFlops; - int i=0; - int j=0; + unsigned int i=0; + unsigned int j=0; while (i<tab_sizes.size() && j<oldSizes.size()) { if (tab_sizes[i] == oldSizes[j]) diff --git a/eigen/bench/btl/generic_bench/bench_parameter.hh b/eigen/bench/btl/generic_bench/bench_parameter.hh index 4c355cd..2b01149 100644 --- a/eigen/bench/btl/generic_bench/bench_parameter.hh +++ b/eigen/bench/btl/generic_bench/bench_parameter.hh @@ -29,11 +29,11 @@ // min vector size for axpy bench #define MIN_AXPY 5 // max vector size for axpy bench -#define MAX_AXPY 1000000 +#define MAX_AXPY 3000000 // min matrix size for matrix vector product bench #define MIN_MV 5 // max matrix size for matrix vector product bench -#define MAX_MV 3000 +#define MAX_MV 5000 // min matrix size for matrix matrix product bench #define MIN_MM 5 // max matrix size for matrix matrix product bench diff --git a/eigen/bench/btl/generic_bench/btl.hh b/eigen/bench/btl/generic_bench/btl.hh index 86a8438..706b00f 100644 --- a/eigen/bench/btl/generic_bench/btl.hh +++ b/eigen/bench/btl/generic_bench/btl.hh @@ -171,7 +171,7 @@ public: if (_config!=NULL) { std::vector<BtlString> config = BtlString(_config).split(" \t\n"); - for (int i = 0; i<config.size(); i++) + for (unsigned int i = 0; i<config.size(); i++) { if (config[i].beginsWith("-a")) { @@ -219,7 +219,7 @@ public: return false; BtlString name(_name); - for (int i=0; i<Instance.m_selectedActionNames.size(); ++i) + for (unsigned int i=0; i<Instance.m_selectedActionNames.size(); ++i) if (name.contains(Instance.m_selectedActionNames[i])) return false; diff --git a/eigen/bench/btl/generic_bench/init/init_function.hh b/eigen/bench/btl/generic_bench/init/init_function.hh index 7b3bdba..e467cb6 100644 --- a/eigen/bench/btl/generic_bench/init/init_function.hh +++ b/eigen/bench/btl/generic_bench/init/init_function.hh @@ -30,23 +30,23 @@ double simple_function(int index_i, int index_j) return index_i+index_j; } -double pseudo_random(int index) +double pseudo_random(int /*index*/) { return std::rand()/double(RAND_MAX); } -double pseudo_random(int index_i, int index_j) +double pseudo_random(int /*index_i*/, int /*index_j*/) { return std::rand()/double(RAND_MAX); } -double null_function(int index) +double null_function(int /*index*/) { return 0.0; } -double null_function(int index_i, int index_j) +double null_function(int /*index_i*/, int /*index_j*/) { return 0.0; } diff --git a/eigen/bench/btl/generic_bench/init/init_matrix.hh b/eigen/bench/btl/generic_bench/init/init_matrix.hh index 67cbd20..6382d30 100644 --- a/eigen/bench/btl/generic_bench/init/init_matrix.hh +++ b/eigen/bench/btl/generic_bench/init/init_matrix.hh @@ -29,7 +29,7 @@ BTL_DONT_INLINE void init_row(Vector & X, int size, int row){ X.resize(size); - for (int j=0;j<X.size();j++){ + for (unsigned int j=0;j<X.size();j++){ X[j]=typename Vector::value_type(init_function(row,j)); } } @@ -42,7 +42,7 @@ BTL_DONT_INLINE void init_row(Vector & X, int size, int row){ template<double init_function(int,int),class Vector> BTL_DONT_INLINE void init_matrix(Vector & A, int size){ A.resize(size); - for (int row=0; row<A.size() ; row++){ + for (unsigned int row=0; row<A.size() ; row++){ init_row<init_function>(A[row],size,row); } } @@ -50,11 +50,11 @@ BTL_DONT_INLINE void init_matrix(Vector & A, int size){ template<double init_function(int,int),class Matrix> BTL_DONT_INLINE void init_matrix_symm(Matrix& A, int size){ A.resize(size); - for (int row=0; row<A.size() ; row++) + for (unsigned int row=0; row<A.size() ; row++) A[row].resize(size); - for (int row=0; row<A.size() ; row++){ + for (unsigned int row=0; row<A.size() ; row++){ A[row][row] = init_function(row,row); - for (int col=0; col<row ; col++){ + for (unsigned int col=0; col<row ; col++){ double x = init_function(row,col); A[row][col] = A[col][row] = x; } diff --git a/eigen/bench/btl/generic_bench/init/init_vector.hh b/eigen/bench/btl/generic_bench/init/init_vector.hh index efaf0c9..518e87d 100644 --- a/eigen/bench/btl/generic_bench/init/init_vector.hh +++ b/eigen/bench/btl/generic_bench/init/init_vector.hh @@ -29,7 +29,7 @@ void init_vector(Vector & X, int size){ X.resize(size); - for (int i=0;i<X.size();i++){ + for (unsigned int i=0;i<X.size();i++){ X[i]=typename Vector::value_type(init_function(i)); } } diff --git a/eigen/bench/btl/generic_bench/timers/portable_perf_analyzer.hh b/eigen/bench/btl/generic_bench/timers/portable_perf_analyzer.hh index fc0f316..5e579fb 100644 --- a/eigen/bench/btl/generic_bench/timers/portable_perf_analyzer.hh +++ b/eigen/bench/btl/generic_bench/timers/portable_perf_analyzer.hh @@ -78,7 +78,7 @@ public: // time measurement action.calculate(); _chronos.start(); - for (int ii=0;ii<_nb_calc;ii++) + for (unsigned int ii=0;ii<_nb_calc;ii++) { action.calculate(); } diff --git a/eigen/bench/btl/generic_bench/timers/portable_timer.hh b/eigen/bench/btl/generic_bench/timers/portable_timer.hh index e6ad309..c199811 100644 --- a/eigen/bench/btl/generic_bench/timers/portable_timer.hh +++ b/eigen/bench/btl/generic_bench/timers/portable_timer.hh @@ -34,7 +34,7 @@ // timer -------------------------------------------------------------------// // A timer object measures CPU time. -#ifdef _MSC_VER +#if defined(_MSC_VER) #define NOMINMAX #include <windows.h> @@ -87,6 +87,48 @@ }; // Portable_Timer +#elif defined(__APPLE__) +#include <CoreServices/CoreServices.h> +#include <mach/mach_time.h> + + +class Portable_Timer +{ + public: + + Portable_Timer() + { + } + + void start() + { + m_start_time = double(mach_absolute_time())*1e-9;; + + } + + void stop() + { + m_stop_time = double(mach_absolute_time())*1e-9;; + + } + + double elapsed() + { + return user_time(); + } + + double user_time() + { + return m_stop_time - m_start_time; + } + + +private: + + double m_stop_time, m_start_time; + +}; // Portable_Timer (Apple) + #else #include <sys/time.h> @@ -138,7 +180,7 @@ private: int m_clkid; double m_stop_time, m_start_time; -}; // Portable_Timer +}; // Portable_Timer (Linux) #endif diff --git a/eigen/bench/btl/generic_bench/utils/size_lin_log.hh b/eigen/bench/btl/generic_bench/utils/size_lin_log.hh index bca3932..bbc9f54 100644 --- a/eigen/bench/btl/generic_bench/utils/size_lin_log.hh +++ b/eigen/bench/btl/generic_bench/utils/size_lin_log.hh @@ -23,7 +23,7 @@ #include "size_log.hh" template<class Vector> -void size_lin_log(const int nb_point, const int size_min, const int size_max, Vector & X) +void size_lin_log(const int nb_point, const int /*size_min*/, const int size_max, Vector & X) { int ten=10; int nine=9; |