From 8233de8b69daf5d15daf3102b1788c833b56779c Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Sat, 12 Jul 2008 12:14:08 +0000 Subject: various minor updates in the benchmark suite like non inlining of some functions as well as the experimental C code used to design efficient eigen's matrix vector products. --- bench/btl/CMakeLists.txt | 2 - bench/btl/actions/action_matrix_vector_product.hh | 18 +- bench/btl/data/order_lib | 5 +- bench/btl/generic_bench/bench.hh | 6 +- bench/btl/generic_bench/bench_parameter.hh | 2 +- bench/btl/generic_bench/btl.hh | 30 +- bench/btl/generic_bench/init/init_matrix.hh | 16 +- bench/btl/generic_bench/static/bench_static.hh | 4 +- .../generic_bench/timers/portable_perf_analyzer.hh | 4 +- bench/btl/libs/C/CMakeLists.txt | 1 + bench/btl/libs/eigen2/eigen2_interface.hh | 11 +- bench/btl/libs/eigen2/main.cpp | 4 +- bench/btl/libs/hand_vec/hand_vec_interface.hh | 515 +++++++++++++++++---- 13 files changed, 493 insertions(+), 125 deletions(-) (limited to 'bench/btl') diff --git a/bench/btl/CMakeLists.txt b/bench/btl/CMakeLists.txt index 17931f988..600fc38f1 100644 --- a/bench/btl/CMakeLists.txt +++ b/bench/btl/CMakeLists.txt @@ -46,8 +46,6 @@ MACRO(BTL_ADD_BENCH targetname) OPTION(BUILD_${targetname} "Build benchmark ${targetname}" ${_last_var}) - message(STATUS ${targetname} " : " ${ARGN} " => " ${_sources} " => " ${_last_var}) - IF(BUILD_${targetname}) ADD_EXECUTABLE(${targetname} ${_sources}) ADD_TEST(${targetname} "${targetname}") diff --git a/bench/btl/actions/action_matrix_vector_product.hh b/bench/btl/actions/action_matrix_vector_product.hh index ee9110d06..7e490abe3 100644 --- a/bench/btl/actions/action_matrix_vector_product.hh +++ b/bench/btl/actions/action_matrix_vector_product.hh @@ -35,7 +35,7 @@ public : // Ctor - Action_matrix_vector_product( int size ):_size(size) + BTL_DONT_INLINE Action_matrix_vector_product( int size ):_size(size) { MESSAGE("Action_matrix_vector_product Ctor"); @@ -68,7 +68,7 @@ public : // Dtor - ~Action_matrix_vector_product( void ){ + BTL_DONT_INLINE ~Action_matrix_vector_product( void ){ MESSAGE("Action_matrix_vector_product Dtor"); @@ -95,7 +95,7 @@ public : return 2.0*_size*_size; } - inline void initialize( void ){ + BTL_DONT_INLINE void initialize( void ){ Interface::copy_matrix(A_ref,A,_size); Interface::copy_vector(B_ref,B,_size); @@ -103,13 +103,13 @@ public : } - inline void calculate( void ) { - + BTL_DONT_INLINE void calculate( void ) { + asm("#begin matrix_vector_product"); Interface::matrix_vector_product(A,B,X,_size); - + asm("#end matrix_vector_product"); } - void check_result( void ){ + BTL_DONT_INLINE void check_result( void ){ // calculation check @@ -120,9 +120,9 @@ public : typename Interface::real_type error= STL_interface::norm_diff(X_stl,resu_stl); - if (error>1.e-6){ + if (error>1.e-5){ INFOS("WRONG CALCULATION...residual=" << error); - exit(0); +// exit(0); } } diff --git a/bench/btl/data/order_lib b/bench/btl/data/order_lib index 5ea998a2e..ccbaab12e 100644 --- a/bench/btl/data/order_lib +++ b/bench/btl/data/order_lib @@ -1,8 +1,11 @@ +eigen2_SSE eigen2 -C_BLAS +INTEL_MKL +ATLAS STL C gmm +mtl4 ublas blitz F77 diff --git a/bench/btl/generic_bench/bench.hh b/bench/btl/generic_bench/bench.hh index 484b526e3..cace2695d 100644 --- a/bench/btl/generic_bench/bench.hh +++ b/bench/btl/generic_bench/bench.hh @@ -36,11 +36,13 @@ using namespace std; template class Perf_Analyzer, class Action> -void bench( int size_min, int size_max, int nb_point ) +BTL_DONT_INLINE void bench( int size_min, int size_max, int nb_point ) { if (BtlConfig::skipAction(Action::name())) return; + BTL_DISABLE_SSE_EXCEPTIONS(); + string filename="bench_"+Action::name()+".dat"; INFOS("starting " < -void bench( int size_min, int size_max, int nb_point ){ +BTL_DONT_INLINE void bench( int size_min, int size_max, int nb_point ){ // if the rdtsc is not available : bench(size_min,size_max,nb_point); diff --git a/bench/btl/generic_bench/bench_parameter.hh b/bench/btl/generic_bench/bench_parameter.hh index e4e145ea0..e2db997fd 100644 --- a/bench/btl/generic_bench/bench_parameter.hh +++ b/bench/btl/generic_bench/bench_parameter.hh @@ -48,6 +48,6 @@ #define DEFAULT_NB_SAMPLE 1000 // how many times we run a single bench (keep the best perf) -#define NB_TRIES 4 +#define NB_TRIES 3 #endif diff --git a/bench/btl/generic_bench/btl.hh b/bench/btl/generic_bench/btl.hh index 5b561b676..784702432 100644 --- a/bench/btl/generic_bench/btl.hh +++ b/bench/btl/generic_bench/btl.hh @@ -26,6 +26,31 @@ #include #include "utilities.h" +#if (defined __GNUC__) +#define BTL_ALWAYS_INLINE __attribute__((always_inline)) inline +#else +#define BTL_ALWAYS_INLINE inline +#endif + +#if (defined __GNUC__) +#define BTL_DONT_INLINE __attribute__((noinline)) +#else +#define BTL_DONT_INLINE +#endif + +#ifndef __INTEL_COMPILER +#define BTL_DISABLE_SSE_EXCEPTIONS() { \ + int aux; \ + asm( \ + "stmxcsr %[aux] \n\t" \ + "orl $32832, %[aux] \n\t" \ + "ldmxcsr %[aux] \n\t" \ + : : [aux] "m" (aux)); \ +} +#else +#define DISABLE_SSE_EXCEPTIONS() +#endif + /** Enhanced std::string */ class BtlString : public std::string @@ -161,13 +186,14 @@ public: } } } + + BTL_DISABLE_SSE_EXCEPTIONS(); } - static bool skipAction(const std::string& name) + BTL_DONT_INLINE static bool skipAction(const std::string& name) { if (Instance.m_runSingleAction) { - std::cout << "Instance.m_singleActionName = " << Instance.m_singleActionName << "\n"; return !BtlString(name).contains(Instance.m_singleActionName); } diff --git a/bench/btl/generic_bench/init/init_matrix.hh b/bench/btl/generic_bench/init/init_matrix.hh index 27f8b42aa..6b57504c0 100644 --- a/bench/btl/generic_bench/init/init_matrix.hh +++ b/bench/btl/generic_bench/init/init_matrix.hh @@ -1,14 +1,14 @@ //===================================================== // File : init_matrix.hh -// Author : L. Plagne +// Author : L. Plagne // Copyright (C) EDF R&D, lun sep 30 14:23:19 CEST 2002 //===================================================== -// +// // This program 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 2 // of the License, or (at your option) any later version. -// +// // This program 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 @@ -16,7 +16,7 @@ // 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// +// #ifndef INIT_MATRIX_HH #define INIT_MATRIX_HH @@ -25,7 +25,7 @@ // [] operator for setting element // value_type defined template -void init_row(Vector & X, int size, int row){ +BTL_DONT_INLINE void init_row(Vector & X, int size, int row){ X.resize(size); @@ -40,14 +40,14 @@ void init_row(Vector & X, int size, int row){ // resize() method // [] operator for setting rows template -void init_matrix(Vector & A, int size){ +BTL_DONT_INLINE void init_matrix(Vector & A, int size){ A.resize(size); for (int row=0; row(A[row],size,row); } - - + + } #endif diff --git a/bench/btl/generic_bench/static/bench_static.hh b/bench/btl/generic_bench/static/bench_static.hh index 0bc0d441e..cdb645fc2 100644 --- a/bench/btl/generic_bench/static/bench_static.hh +++ b/bench/btl/generic_bench/static/bench_static.hh @@ -34,7 +34,7 @@ using namespace std; template class Perf_Analyzer, template class Action, template class Interface> -void bench_static(void) +BTL_DONT_INLINE void bench_static(void) { if (BtlConfig::skipAction(Action >::name())) return; @@ -55,7 +55,7 @@ void bench_static(void) // default Perf Analyzer template class Action, template class Interface> -void bench_static(void) +BTL_DONT_INLINE void bench_static(void) { bench_static(); //bench_static(); diff --git a/bench/btl/generic_bench/timers/portable_perf_analyzer.hh b/bench/btl/generic_bench/timers/portable_perf_analyzer.hh index 709f0de5d..d716154fd 100644 --- a/bench/btl/generic_bench/timers/portable_perf_analyzer.hh +++ b/bench/btl/generic_bench/timers/portable_perf_analyzer.hh @@ -40,7 +40,7 @@ public: - inline double eval_mflops(int size) + BTL_DONT_INLINE double eval_mflops(int size) { Action action(size); @@ -70,7 +70,7 @@ public: return action.nb_op_base()/(time_action*1000000.0); } - double time_calculate(Action & action) + BTL_DONT_INLINE double time_calculate(Action & action) { // time measurement _chronos.start(); diff --git a/bench/btl/libs/C/CMakeLists.txt b/bench/btl/libs/C/CMakeLists.txt index d3d2312d8..2bce21e8d 100644 --- a/bench/btl/libs/C/CMakeLists.txt +++ b/bench/btl/libs/C/CMakeLists.txt @@ -1,2 +1,3 @@ include_directories(${PROJECT_SOURCE_DIR}/libs/f77) btl_add_bench(btl_C main.cpp) +# set_target_properties(btl_C PROPERTIES COMPILE_FLAGS "-fpeel-loops") \ No newline at end of file diff --git a/bench/btl/libs/eigen2/eigen2_interface.hh b/bench/btl/libs/eigen2/eigen2_interface.hh index 8c4270e8c..fa7f759b2 100644 --- a/bench/btl/libs/eigen2/eigen2_interface.hh +++ b/bench/btl/libs/eigen2/eigen2_interface.hh @@ -20,6 +20,7 @@ #include #include +#include "btl.hh" using namespace Eigen; @@ -52,7 +53,7 @@ public : static void free_vector(gene_vector & B) {} - static inline void matrix_from_stl(gene_matrix & A, stl_matrix & A_stl){ + static BTL_DONT_INLINE void matrix_from_stl(gene_matrix & A, stl_matrix & A_stl){ A.resize(A_stl[0].size(), A_stl.size()); for (int j=0; j > >(MIN_MV,MAX_MV,NB_POINT); - bench > >(MIN_MV,MAX_MV,NB_POINT); - bench > >(MIN_AXPY,MAX_AXPY,NB_POINT); +// bench > >(MIN_MV,MAX_MV,NB_POINT); +// bench > >(MIN_AXPY,MAX_AXPY,NB_POINT); // bench > >(MIN_MM,MAX_MM,NB_POINT); // bench > >(MIN_MM,MAX_MM,NB_POINT); // bench > >(MIN_MM,MAX_MM,NB_POINT); diff --git a/bench/btl/libs/hand_vec/hand_vec_interface.hh b/bench/btl/libs/hand_vec/hand_vec_interface.hh index 5291aac55..538c03ba6 100755 --- a/bench/btl/libs/hand_vec/hand_vec_interface.hh +++ b/bench/btl/libs/hand_vec/hand_vec_interface.hh @@ -68,140 +68,477 @@ public : #endif } - static inline void matrix_vector_product(const gene_matrix & A, const gene_vector & B, gene_vector & X, int N) +static inline void matrix_vector_product(const gene_matrix & A, const gene_vector & B, gene_vector & X, int N) { + asm("#begin matrix_vector_product"); int AN = (N/PacketSize)*PacketSize; + int ANP = (AN/(4*PacketSize))*4*PacketSize; + int bound = (N/4)*4; for (int i=0;i0) { - bool aligned = (iN % PacketSize) == 0; - if (aligned) +// int aligned0 = (iN0 % PacketSize); + int aligned1 = (iN1 % PacketSize); + + if (aligned1==0) { - #ifdef PEELING - int ANP = (AN/(8*PacketSize))*8*PacketSize; - for (int j = 0;j0) + { + bool aligned0 = (iN0 % PacketSize) == 0; + if (aligned0) + for (int j = 0;j0) +// { +// bool aligned0 = (iN0 % PacketSize) == 0; +// bool aligned1 = (iN1 % PacketSize) == 0; +// +// if (aligned0 && aligned1) +// { +// for (int j = 0;j0) +// { +// bool aligned0 = (iN0 % PacketSize) == 0; +// if (aligned0) +// for (int j = 0;j0) +// { +// bool aligned = (iN % PacketSize) == 0; +// if (aligned) +// { +// #ifdef PEELING +// Packet A0, A1, A2, X0, X1, X2; +// int ANP = (AN/(8*PacketSize))*8*PacketSize; +// for (int j = 0;j0) { - bool aligned = (iN % PacketSize) == 0; - if (aligned) + int align1 = (iN1 % PacketSize); + if (align1==0) { - #ifdef PEELING - int ANP = (AN/(8*PacketSize))*8*PacketSize; - for (int j = 0;j0) + { + if (iN0 % PacketSize==0) + for (int j = 0;j0) +// { +// bool aligned = (iN % PacketSize) == 0; +// if (aligned) +// { +// #ifdef PEELING +// int ANP = (AN/(8*PacketSize))*8*PacketSize; +// for (int j = 0;j0) -- cgit v1.2.3