[gentoo-commits] proj/auto-numerical-bench:master commit in: app-benchmarks/autobench/files/python/btl/libs/BLAS/, ...

[Andrea Arteaga]

commit:     f3e79601c542eac23afe8fbae826381d60b8aa3d
Author:     spiros <andyspiros <AT> gmail <DOT> com>
AuthorDate: Tue Jul  5 22:37:42 2011 +0000
Commit:     Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
CommitDate: Tue Jul  5 22:37:42 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/auto-numerical-bench.git;a=commit;h=f3e79601

Added support for FFTW. Some work on btl and reports. Example input
files updated.

---
 .../autobench/files/python/basemodule.py           |    5 +-
 app-benchmarks/autobench/files/python/blastests.in |    7 +-
 .../actions/action_fftw_1d_backward_estimate.hh    |   94 ++++++++++++++++++++
 .../btl/actions/action_fftw_1d_backward_measure.hh |   94 ++++++++++++++++++++
 .../btl/actions/action_fftw_1d_forward_estimate.hh |   94 ++++++++++++++++++++
 .../btl/actions/action_fftw_1d_forward_measure.hh  |   94 ++++++++++++++++++++
 .../files/python/btl/actions/fftw_actions.hh       |    9 ++
 .../files/python/btl/libs/BLAS/c_interface_base.h  |    1 -
 .../files/python/btl/libs/FFTW/fftw_interface.hh   |   62 +++++++++++++
 .../autobench/files/python/btl/libs/FFTW/main.cpp  |   45 +++++++++
 app-benchmarks/autobench/files/python/btlbase.py   |    3 +-
 .../autobench/files/python/cblastests.in           |    6 +-
 app-benchmarks/autobench/files/python/fftw.py      |   57 ++++++++++++
 .../autobench/files/python/htmlreport.py           |    3 +-
 .../autobench/files/python/lapacktests.in          |    5 +-
 15 files changed, 569 insertions(+), 10 deletions(-)

diff --git a/app-benchmarks/autobench/files/python/basemodule.py b/app-benchmarks/autobench/files/python/basemodule.py
index e405032..b7ea426 100644
--- a/app-benchmarks/autobench/files/python/basemodule.py
+++ b/app-benchmarks/autobench/files/python/basemodule.py
@@ -40,7 +40,6 @@ class BaseModule:
         self._parse_args(passargs)
         
     # Alternatives-2 version
-    
     def get_impls(self, root):
         output = sp.Popen(
           ['eselect', '--no-color', '--brief', self.libname, 'list'],
@@ -101,6 +100,8 @@ class BaseModule:
                     x,y = np.loadtxt(newresults[test][impl], unpack=True)
                     plotf(x,y, label=impl, hold=True)
                 plt.legend(loc='best')
+                plt.xlabel('size')
+                plt.ylabel('MFlops')
                 plt.grid(True)
             fname = pjoin(cfg.reportdir, 'summary.png')
             plt.savefig(fname, format='png')
@@ -115,6 +116,8 @@ class BaseModule:
                     x,y = np.loadtxt(newresults[test][impl], unpack=True)
                     plotf(x,y, label=impl, hold=True)
                 plt.legend(loc='best')
+                plt.xlabel('size')
+                plt.ylabel('MFlops')
                 plt.grid(True)
                 fname = pjoin(cfg.reportdir, test+".png")
                 plt.savefig(fname, format='png')

diff --git a/app-benchmarks/autobench/files/python/blastests.in b/app-benchmarks/autobench/files/python/blastests.in
index 3b80df7..1ebea85 100644
--- a/app-benchmarks/autobench/files/python/blastests.in
+++ b/app-benchmarks/autobench/files/python/blastests.in
@@ -1,2 +1,5 @@
-eigen-O2 dev-cpp/eigen-3.0.0-r1 CXX=g++ CXXFLAGS='-O2 -march=native'
-eigen-O3 dev-cpp/eigen-3.0.0-r1 CXX=g++ CXXFLAGS='-O3 -march=native'
+#blas-reference sci-libs/blas-reference-3.3.1-r1 FFLAGS=-O3
+acml sci-libs/acml-4.4.0-r1
+#goto sci-libs/gotoblas2-1.13 CFLAGS=-O3 USE='incblas'
+#atlas sci-libs/atlas-3.8.4 CFLAGS=-O3 FFLAGS=-O3
+#openblas sci-libs/openblas CFLAGS=-O3 USE=incblas

diff --git a/app-benchmarks/autobench/files/python/btl/actions/action_fftw_1d_backward_estimate.hh b/app-benchmarks/autobench/files/python/btl/actions/action_fftw_1d_backward_estimate.hh
new file mode 100644
index 0000000..eda5468
--- /dev/null
+++ b/app-benchmarks/autobench/files/python/btl/actions/action_fftw_1d_backward_estimate.hh
@@ -0,0 +1,94 @@
+#ifndef ACTION_FFTW_1D_BACKWARD_ESTIMATE
+#define ACTION_FFTW_1D_BACKWARD_ESTIMATE
+#include "utilities.h"
+#include "STL_interface.hh"
+#include <string>
+#include <cmath>
+#include "init/init_function.hh"
+#include "init/init_vector.hh"
+
+using namespace std;
+
+template<class Interface>
+class Action_FFTW_1D_Backward_Estimate {
+
+public :
+
+  // Ctor
+
+	Action_FFTW_1D_Backward_Estimate( int size ):_size(size)
+  {
+    MESSAGE("Action_FFTW_1D_Backward_Estimate Ctor");
+
+    // STL vector initialization
+
+    init_vector<pseudo_random>(X_stl,_size);
+    init_vector<null_function>(Y_stl,_size);
+
+    // generic matrix and vector initialization
+
+    Interface::vector_from_stl(X,X_stl);
+    Interface::vector_from_stl(Y,Y_stl);
+
+	  Interface::fftw_init_plan(p,_size, X, Y, FFTW_FORWARD, FFTW_MEASURE);
+
+  }
+
+  // invalidate copy ctor
+
+	Action_FFTW_1D_Backward_Estimate( const  Action_FFTW_1D_Backward_Estimate & )
+  {
+    INFOS("illegal call to Action_FFTW_1D_Backward_Estimate Copy Ctor");
+    exit(1);
+  }
+
+  // Dtor
+
+  ~Action_FFTW_1D_Backward_Estimate( void ){
+
+    MESSAGE("Action_FFTW_1D_Backward_Estimate Dtor");
+
+    // deallocation
+
+    Interface::free_vector(X);
+    Interface::free_vector(Y);
+  }
+
+  // action name
+
+  static inline std::string name( void )
+  {
+    return "FFTW_1D_Backward_Estimate_"+Interface::name();
+  }
+
+  double nb_op_base( void ){
+	const static double log_2 = log(2.);
+    return _size * log(_size)/log_2;
+  }
+
+  inline void initialize( void ){
+  }
+
+  inline void calculate( void ) {
+    BTL_ASM_COMMENT("mybegin FFTW_1D_Backward_Estimate");
+    Interface::fftw_run(p);
+    BTL_ASM_COMMENT("myend FFTW_1D_Backward_Estimate");
+  }
+
+  void check_result( void ){
+  }
+
+private :
+
+  typename Interface::stl_vector X_stl;
+  typename Interface::stl_vector Y_stl;
+
+  typename Interface::gene_vector X;
+  typename Interface::gene_vector Y;
+
+  typename Interface::plan p;
+
+  int _size;
+};
+
+#endif // ACTION_FFTW_1D_BACKWARD_ESTIMATE

diff --git a/app-benchmarks/autobench/files/python/btl/actions/action_fftw_1d_backward_measure.hh b/app-benchmarks/autobench/files/python/btl/actions/action_fftw_1d_backward_measure.hh
new file mode 100644
index 0000000..e204423
--- /dev/null
+++ b/app-benchmarks/autobench/files/python/btl/actions/action_fftw_1d_backward_measure.hh
@@ -0,0 +1,94 @@
+#ifndef ACTION_FFTW_1D_BACKWARD_MEASURE
+#define ACTION_FFTW_1D_BACKWARD_MEASURE
+#include "utilities.h"
+#include "STL_interface.hh"
+#include <string>
+#include <cmath>
+#include "init/init_function.hh"
+#include "init/init_vector.hh"
+
+using namespace std;
+
+template<class Interface>
+class Action_FFTW_1D_Backward_Measure {
+
+public :
+
+  // Ctor
+
+	Action_FFTW_1D_Backward_Measure( int size ):_size(size)
+  {
+    MESSAGE("Action_FFTW_1D_Backward_Measure Ctor");
+
+    // STL vector initialization
+
+    init_vector<pseudo_random>(X_stl,_size);
+    init_vector<null_function>(Y_stl,_size);
+
+    // generic matrix and vector initialization
+
+    Interface::vector_from_stl(X,X_stl);
+    Interface::vector_from_stl(Y,Y_stl);
+
+	  Interface::fftw_init_plan(p,_size, X, Y, FFTW_FORWARD, FFTW_MEASURE);
+
+  }
+
+  // invalidate copy ctor
+
+	Action_FFTW_1D_Backward_Measure( const  Action_FFTW_1D_Backward_Measure & )
+  {
+    INFOS("illegal call to Action_FFTW_1D_Backward_Measure Copy Ctor");
+    exit(1);
+  }
+
+  // Dtor
+
+  ~Action_FFTW_1D_Backward_Measure( void ){
+
+    MESSAGE("Action_FFTW_1D_Backward_Measure Dtor");
+
+    // deallocation
+
+    Interface::free_vector(X);
+    Interface::free_vector(Y);
+  }
+
+  // action name
+
+  static inline std::string name( void )
+  {
+    return "FFTW_1D_Backward_Measure_"+Interface::name();
+  }
+
+  double nb_op_base( void ){
+	const static double log_2 = log(2.);
+    return _size * log(_size)/log_2;
+  }
+
+  inline void initialize( void ){
+  }
+
+  inline void calculate( void ) {
+    BTL_ASM_COMMENT("mybegin FFTW_1D_Backward_Measure");
+    Interface::fftw_run(p);
+    BTL_ASM_COMMENT("myend FFTW_1D_Backward_Measure");
+  }
+
+  void check_result( void ){
+  }
+
+private :
+
+  typename Interface::stl_vector X_stl;
+  typename Interface::stl_vector Y_stl;
+
+  typename Interface::gene_vector X;
+  typename Interface::gene_vector Y;
+
+  typename Interface::plan p;
+
+  int _size;
+};
+
+#endif // ACTION_FFTW_1D_BACKWARD_MEASURE

diff --git a/app-benchmarks/autobench/files/python/btl/actions/action_fftw_1d_forward_estimate.hh b/app-benchmarks/autobench/files/python/btl/actions/action_fftw_1d_forward_estimate.hh
new file mode 100644
index 0000000..efd8743
--- /dev/null
+++ b/app-benchmarks/autobench/files/python/btl/actions/action_fftw_1d_forward_estimate.hh
@@ -0,0 +1,94 @@
+#ifndef ACTION_FFTW_1D_FORWARD_ESTIMATE
+#define ACTION_FFTW_1D_FORWARD_ESTIMATE
+#include "utilities.h"
+#include "STL_interface.hh"
+#include <string>
+#include <cmath>
+#include "init/init_function.hh"
+#include "init/init_vector.hh"
+
+using namespace std;
+
+template<class Interface>
+class Action_FFTW_1D_Forward_Estimate {
+
+public :
+
+  // Ctor
+
+	Action_FFTW_1D_Forward_Estimate( int size ):_size(size)
+  {
+    MESSAGE("Action_FFTW_1D_Forward_Estimate Ctor");
+
+    // STL vector initialization
+
+    init_vector<pseudo_random>(X_stl,_size);
+    init_vector<null_function>(Y_stl,_size);
+
+    // generic matrix and vector initialization
+
+    Interface::vector_from_stl(X,X_stl);
+    Interface::vector_from_stl(Y,Y_stl);
+
+	  Interface::fftw_init_plan(p,_size, X, Y, FFTW_FORWARD, FFTW_MEASURE);
+
+  }
+
+  // invalidate copy ctor
+
+	Action_FFTW_1D_Forward_Estimate( const  Action_FFTW_1D_Forward_Estimate & )
+  {
+    INFOS("illegal call to Action_FFTW_1D_Forward_Estimate Copy Ctor");
+    exit(1);
+  }
+
+  // Dtor
+
+  ~Action_FFTW_1D_Forward_Estimate( void ){
+
+    MESSAGE("Action_FFTW_1D_Forward_Estimate Dtor");
+
+    // deallocation
+
+    Interface::free_vector(X);
+    Interface::free_vector(Y);
+  }
+
+  // action name
+
+  static inline std::string name( void )
+  {
+    return "FFTW_1D_Forward_Estimate_"+Interface::name();
+  }
+
+  double nb_op_base( void ){
+	const static double log_2 = log(2.);
+    return _size * log(_size)/log_2;
+  }
+
+  inline void initialize( void ){
+  }
+
+  inline void calculate( void ) {
+    BTL_ASM_COMMENT("mybegin FFTW_1D_Forward_Estimate");
+    Interface::fftw_run(p);
+    BTL_ASM_COMMENT("myend FFTW_1D_Forward_Estimate");
+  }
+
+  void check_result( void ){
+  }
+
+private :
+
+  typename Interface::stl_vector X_stl;
+  typename Interface::stl_vector Y_stl;
+
+  typename Interface::gene_vector X;
+  typename Interface::gene_vector Y;
+
+  typename Interface::plan p;
+
+  int _size;
+};
+
+#endif // ACTION_FFTW_1D_FORWARD_ESTIMATE

diff --git a/app-benchmarks/autobench/files/python/btl/actions/action_fftw_1d_forward_measure.hh b/app-benchmarks/autobench/files/python/btl/actions/action_fftw_1d_forward_measure.hh
new file mode 100644
index 0000000..2697230
--- /dev/null
+++ b/app-benchmarks/autobench/files/python/btl/actions/action_fftw_1d_forward_measure.hh
@@ -0,0 +1,94 @@
+#ifndef ACTION_FFTW_1D_FORWARD_MEASURE
+#define ACTION_FFTW_1D_FORWARD_MEASURE
+#include "utilities.h"
+#include "STL_interface.hh"
+#include <string>
+#include <cmath>
+#include "init/init_function.hh"
+#include "init/init_vector.hh"
+
+using namespace std;
+
+template<class Interface>
+class Action_FFTW_1D_Forward_Measure {
+
+public :
+
+  // Ctor
+
+	Action_FFTW_1D_Forward_Measure( int size ):_size(size)
+  {
+    MESSAGE("Action_FFTW_1D_Forward_Measure Ctor");
+
+    // STL vector initialization
+
+    init_vector<pseudo_random>(X_stl,_size);
+    init_vector<null_function>(Y_stl,_size);
+
+    // generic matrix and vector initialization
+
+    Interface::vector_from_stl(X,X_stl);
+    Interface::vector_from_stl(Y,Y_stl);
+
+	  Interface::fftw_init_plan(p,_size, X, Y, FFTW_FORWARD, FFTW_MEASURE);
+
+  }
+
+  // invalidate copy ctor
+
+	Action_FFTW_1D_Forward_Measure( const  Action_FFTW_1D_Forward_Measure & )
+  {
+    INFOS("illegal call to Action_FFTW_1D_Forward_Measure Copy Ctor");
+    exit(1);
+  }
+
+  // Dtor
+
+  ~Action_FFTW_1D_Forward_Measure( void ){
+
+    MESSAGE("Action_FFTW_1D_Forward_Measure Dtor");
+
+    // deallocation
+
+    Interface::free_vector(X);
+    Interface::free_vector(Y);
+  }
+
+  // action name
+
+  static inline std::string name( void )
+  {
+    return "FFTW_1D_Forward_Measure_"+Interface::name();
+  }
+
+  double nb_op_base( void ){
+	const static double log_2 = log(2.);
+    return _size * log(_size)/log_2;
+  }
+
+  inline void initialize( void ){
+  }
+
+  inline void calculate( void ) {
+    BTL_ASM_COMMENT("mybegin FFTW_1D_Forward_Measure");
+    Interface::fftw_run(p);
+    BTL_ASM_COMMENT("myend FFTW_1D_Forward_Measure");
+  }
+
+  void check_result( void ){
+  }
+
+private :
+
+  typename Interface::stl_vector X_stl;
+  typename Interface::stl_vector Y_stl;
+
+  typename Interface::gene_vector X;
+  typename Interface::gene_vector Y;
+
+  typename Interface::plan p;
+
+  int _size;
+};
+
+#endif // ACTION_FFTW_1D_FORWARD_MEASURE

diff --git a/app-benchmarks/autobench/files/python/btl/actions/fftw_actions.hh b/app-benchmarks/autobench/files/python/btl/actions/fftw_actions.hh
new file mode 100644
index 0000000..3aced22
--- /dev/null
+++ b/app-benchmarks/autobench/files/python/btl/actions/fftw_actions.hh
@@ -0,0 +1,9 @@
+#ifndef ACTION_FFTW
+#define ACTION_FFTW
+
+#include "action_fftw_1d_forward_measure.hh"
+#include "action_fftw_1d_forward_estimate.hh"
+#include "action_fftw_1d_backward_measure.hh"
+#include "action_fftw_1d_backward_estimate.hh"
+
+#endif // ACTION_FFTW

diff --git a/app-benchmarks/autobench/files/python/btl/libs/BLAS/c_interface_base.h b/app-benchmarks/autobench/files/python/btl/libs/BLAS/c_interface_base.h
index 515d8dc..7646b1a 100644
--- a/app-benchmarks/autobench/files/python/btl/libs/BLAS/c_interface_base.h
+++ b/app-benchmarks/autobench/files/python/btl/libs/BLAS/c_interface_base.h
@@ -1,4 +1,3 @@
-
 #ifndef BTL_C_INTERFACE_BASE_H
 #define BTL_C_INTERFACE_BASE_H
 

diff --git a/app-benchmarks/autobench/files/python/btl/libs/FFTW/fftw_interface.hh b/app-benchmarks/autobench/files/python/btl/libs/FFTW/fftw_interface.hh
new file mode 100644
index 0000000..db62519
--- /dev/null
+++ b/app-benchmarks/autobench/files/python/btl/libs/FFTW/fftw_interface.hh
@@ -0,0 +1,62 @@
+#ifndef BTL_FFTW_INTERFACE_H
+#define BTL_FFTW_INTERFACE_H
+
+#include <complex>
+#include <fftw3.h>
+#include <vector>
+
+class fftw_interface
+{
+public:
+
+	static inline std::string name()
+	{
+		return std::string("fftw");
+	}
+
+	typedef std::complex<double> real_type;
+	typedef std::vector<std::complex<double> > stl_vector;
+
+	typedef fftw_complex* gene_vector;
+
+	typedef fftw_plan plan;
+
+	static inline void free_vector(gene_vector & B){
+		fftw_free(B);
+	}
+
+	static inline void vector_from_stl(gene_vector & B, stl_vector & B_stl){
+		int N = B_stl.size();
+		B = (gene_vector) fftw_malloc(sizeof(fftw_complex) * N);
+		std::complex<double>* B_cplx = reinterpret_cast<std::complex<double>* >(B);
+
+		for (int i=0;i<N;i++)
+			B_cplx[i] = B_stl[i];
+	}
+
+	static inline void vector_to_stl(gene_vector & B, stl_vector & B_stl){
+		int N = B_stl.size();
+		std::complex<double>* B_cplx = reinterpret_cast<std::complex<double>* >(B);
+		for (int i=0;i<N;i++)
+			B_stl[i] = B_cplx[i];
+	}
+
+	static inline void copy_vector(const gene_vector & source, gene_vector & cible, int N){
+		for (int i=0;i<N;i++) {
+			cible[i][0]=source[i][0];
+			cible[i][1]=source[i][1];
+		}
+	}
+
+	/* Begin FFTW operations */
+
+	static inline void fftw_init_plan(plan & p, const int & N, gene_vector & x, gene_vector & y, const int & sign, const int & flags){
+		p = fftw_plan_dft_1d(N, x, y, sign, flags);
+	}
+
+	static inline void fftw_run(plan & p){
+		fftw_execute(p);
+	}
+};
+
+#endif // BTL_FFTW_INTERFACE_H

diff --git a/app-benchmarks/autobench/files/python/btl/libs/FFTW/main.cpp b/app-benchmarks/autobench/files/python/btl/libs/FFTW/main.cpp
new file mode 100644
index 0000000..8f667d1
--- /dev/null
+++ b/app-benchmarks/autobench/files/python/btl/libs/FFTW/main.cpp
@@ -0,0 +1,45 @@
+#include "utilities.h"
+#include "bench.hh"
+#include "fftw_interface.hh"
+#include "fftw_actions.hh"
+
+#include <string>
+
+BTL_MAIN;
+
+int main(int argv, char **argc)
+{
+  bool
+  fftw_1d_forward_measure = false,
+  fftw_1d_forward_estimate = false,
+  fftw_1d_backward_measure = false,
+  fftw_1d_backward_estimate = false
+  ;
+
+
+  for (int i = 1; i < argv; ++i) {
+    std::string arg = argc[i];
+    if (arg == "fftw_1d_forward_measure" || arg == "all") fftw_1d_forward_measure = true;
+    if (arg == "fftw_1d_forward_estimate" || arg == "all") fftw_1d_forward_estimate = true;
+    if (arg == "fftw_1d_backward_measure" || arg == "all") fftw_1d_backward_measure = true;
+    if (arg == "fftw_1d_backward_estimate" || arg == "all") fftw_1d_backward_estimate = true;
+  }
+
+
+  if (fftw_1d_forward_measure)
+  bench<Action_FFTW_1D_Forward_Measure<fftw_interface> >(MIN_MV,MAX_MV,NB_POINT);
+
+  if (fftw_1d_forward_estimate)
+  bench<Action_FFTW_1D_Forward_Estimate<fftw_interface> >(MIN_MV,MAX_MV,NB_POINT);
+
+  if (fftw_1d_backward_measure)
+  bench<Action_FFTW_1D_Backward_Measure<fftw_interface> >(MIN_MV,MAX_MV,NB_POINT);
+
+  if (fftw_1d_backward_estimate)
+  bench<Action_FFTW_1D_Backward_Estimate<fftw_interface> >(MIN_MV,MAX_MV,NB_POINT);
+
+
+  return 0;
+}
+
+

diff --git a/app-benchmarks/autobench/files/python/btlbase.py b/app-benchmarks/autobench/files/python/btlbase.py
index 1bcc529..fc99fe2 100644
--- a/app-benchmarks/autobench/files/python/btlbase.py
+++ b/app-benchmarks/autobench/files/python/btlbase.py
@@ -41,6 +41,7 @@ class BTLTest(basemodule.BaseTest):
         
         # Defines
         defines = ['NDEBUG'] + self._btl_defines()
+        defines = self._btl_defines()
         
         # Flags
         flags = []
@@ -103,7 +104,7 @@ class BTLTest(basemodule.BaseTest):
         
         # Open pipe
         logfile = file(pjoin(self.logdir, 'btlrun.log'), 'w')
-        args = [exe] + self.tests
+        args = [exe] + list(self.tests)
         logfile.write(' '.join([n+'='+v for n,v in self.runenv.items()]) + ' ')
         logfile.write(' '.join(args) + '\n')
         logfile.write(80*'-' + '\n')

diff --git a/app-benchmarks/autobench/files/python/cblastests.in b/app-benchmarks/autobench/files/python/cblastests.in
index c1b41ea..b96a6f5 100644
--- a/app-benchmarks/autobench/files/python/cblastests.in
+++ b/app-benchmarks/autobench/files/python/cblastests.in
@@ -1,2 +1,4 @@
-gsl-gcc gsl-1.15-r1 CC=gcc CFLAGS=-O2
-gsl-icc gsl-1.15-r1 CC=gcc CFLAGS=-O3
+cblas-reference sci-libs/cblas-reference-20110218 CFLAGS=-O3
+gsl gsl-1.15-r1 CC=gcc CFLAGS=-O3
+goto sci-libs/gotoblas2-1.13 CFLAGS=-O3 USE='incblas'
+openblas sci-libs/openblas CFLAGS=-O3 USE=incblas

diff --git a/app-benchmarks/autobench/files/python/fftw.py b/app-benchmarks/autobench/files/python/fftw.py
new file mode 100644
index 0000000..d589509
--- /dev/null
+++ b/app-benchmarks/autobench/files/python/fftw.py
@@ -0,0 +1,57 @@
+import os, btlbase
+
+class Module(btlbase.BTLBase):
+    def _initialize(self):
+        self.libname = "fftw"
+        self.avail = (
+          "FFTW_1D_Forward_Measure", "FFTW_1D_Forward_Estimate",
+          "FFTW_1D_Backward_Measure", "FFTW_1D_Backward_Estimate"
+        )
+    
+    def _parse_args(self, args):     
+        # Parse arguments
+        tests = []
+        for i in args:
+            if i in self.avail:
+                tests.append(i)
+                continue
+            raise Exception("Argument not recognized: " + i)
+        
+        # Sort tests
+        self.tests = [i for i in self.avail if i in tests]
+        
+        # If no test is specified, run everything
+        if len(self.tests) == 0:
+            self.tests = self.avail
+        
+        btlbase.BTLBase._parse_args(self, args)
+        
+    @staticmethod
+    def get_impls(root):
+        return ['fftw', 'fftw_threads']
+    
+    @staticmethod
+    def _testClass():
+        return FFTWTest
+    
+    
+    
+class FFTWTest(btlbase.BTLTest):
+        
+    def _get_flags(self):
+        if self.impl == 'fftw':
+            return ['-lfftw3', '-lm', '-g3']
+        elif self.impl == 'fftw_threads':
+            return ['-lfftw3_threads', '-lm']
+        
+    @staticmethod
+    def _btl_source():
+        return "libs/FFTW/main.cpp"
+    
+    @staticmethod
+    def _btl_includes():
+        return ["libs/FFTW"]
+    
+    @staticmethod
+    def _btl_defines():
+        return []
\ No newline at end of file

diff --git a/app-benchmarks/autobench/files/python/htmlreport.py b/app-benchmarks/autobench/files/python/htmlreport.py
index 8241bdc..cb51da2 100644
--- a/app-benchmarks/autobench/files/python/htmlreport.py
+++ b/app-benchmarks/autobench/files/python/htmlreport.py
@@ -42,10 +42,11 @@ h1, h2, .plot, .descr, .date {
         if descr.strip() != '': 
             self.content += '<p class="descr">' + descr + '</p>'
         self.content += '<div class="plot">'
+        self.content += '<a href="' + image + '">' 
         self.content += '<img src="' + image + '" alt="' + alt + '"'
         if width is not None:
             self.content += ' style="width:' + str(width) + '"'
-        self.content += ' />'
+        self.content += ' /></a>'
         self.content += '</div>'
         self.content += '</div>'
         

diff --git a/app-benchmarks/autobench/files/python/lapacktests.in b/app-benchmarks/autobench/files/python/lapacktests.in
index 1dfcfb6..24c6f71 100644
--- a/app-benchmarks/autobench/files/python/lapacktests.in
+++ b/app-benchmarks/autobench/files/python/lapacktests.in
@@ -1,2 +1,3 @@
-reference-O2 sci-libs/lapack-reference-3.3.1-r1 FFLAGS=-O2
-reference-O3 sci-libs/lapack-reference-3.3.1-r1 FFLAGS=-O3
+#lapack-reference sci-libs/lapack-reference-3.3.1-r1 FFLAGS=-O3 CFLAGS=-O3
+atlas sci-libs/atlas-3.8.4 CFLAGS=-O3 FFLAGS=-O3
+acml sci-libs/acml-4.4.0-r1