summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--samples/blastests.xml82
-rw-r--r--samples/cblastests.xml103
-rw-r--r--samples/fftwtests.xml69
-rw-r--r--samples/lapacketests.xml45
-rw-r--r--samples/lapacktests.xml5
-rw-r--r--samples/openblas.xml34
-rw-r--r--samples/scalapacktests.xml39
7 files changed, 192 insertions, 185 deletions
diff --git a/samples/blastests.xml b/samples/blastests.xml
index 3068ec9..c9f45c2 100644
--- a/samples/blastests.xml
+++ b/samples/blastests.xml
@@ -1,38 +1,44 @@
-<tests>
-
- <test id="reference">
- <pkg>sci-libs/blas-reference-20120423</pkg>
- <emergeenv>
- <var name="FFLAGS">-O3</var>
- </emergeenv>
- </test>
-
- <test id="atlas">
- <pkg>sci-libs/atlas-3.10.0</pkg>
- <emergeenv>
- <var name="USE">threads</var>
- </emergeenv>
- </test>
-
- <test id="eigen">
- <pkg>dev-cpp/eigen-3.1.1-r1</pkg>
- <emergeenv>
- <var name="CXXFLAGS">-O3</var>
- </emergeenv>
- </test>
-
- <test id="openblas">
- <pkg>sci-libs/openblas-0.2.2</pkg>
- <emergeenv>
- <var name="FFLAGS">-O3</var>
- <var name="CFLAGS">-O3</var>
- <var name="USE">-openmp threads</var>
- </emergeenv>
- </test>
-
- <test id="mkl">
- <pkg>sci-libs/mkl-10.3.7.256</pkg>
- <skip>mkl32*</skip>
- </test>
-
-</tests>
+<numbench>
+
+ <operations module="blas">axpy matrix_vector matrix_matrix aat</operations>
+
+ <testcases>
+
+ <case id="reference">
+ <pkg>sci-libs/blas-reference-20120423</pkg>
+ <emergeenv>
+ <var name="FFLAGS">-O3</var>
+ </emergeenv>
+ </case>
+
+ <case id="atlas">
+ <pkg>sci-libs/atlas-3.10.0</pkg>
+ <emergeenv>
+ <var name="USE">threads</var>
+ </emergeenv>
+ </case>
+
+ <case id="eigen">
+ <pkg>dev-cpp/eigen-3.1.1-r1</pkg>
+ <emergeenv>
+ <var name="CXXFLAGS">-O3</var>
+ </emergeenv>
+ </case>
+
+ <case id="openblas">
+ <pkg>sci-libs/openblas-0.2.3</pkg>
+ <emergeenv>
+ <var name="FFLAGS">-O3</var>
+ <var name="CFLAGS">-O3</var>
+ <var name="USE">-openmp threads</var>
+ </emergeenv>
+ </case>
+
+ <case id="mkl">
+ <pkg>sci-libs/mkl-10.3.7.256</pkg>
+ <skip>mkl32*</skip>
+ </case>
+
+ </testcases>
+
+</numbench>
diff --git a/samples/cblastests.xml b/samples/cblastests.xml
index 1b9bc2d..9a08eef 100644
--- a/samples/cblastests.xml
+++ b/samples/cblastests.xml
@@ -1,62 +1,41 @@
-<tests>
-
- <test id="reference">
- <pkg>sci-libs/cblas-reference-20110218</pkg>
- <emergeenv>
- <var name="FFLAGS">-O3</var>
- </emergeenv>
- </test>
-
- <test id="atlas">
- <pkg>sci-libs/atlas-3.9.68</pkg>
- <emergeenv>
- <var name="USE">threads</var>
- </emergeenv>
- </test>
-
- <test id="openblas1">
- <pkg>sci-libs/openblas-9999</pkg>
- <emergeenv>
- <var name="TARGET">NEHALEM</var>
- <var name="FFLAGS">-O3</var>
- <var name="CFLAGS">-O3</var>
- <var name="USE">incblas</var>
- </emergeenv>
- <runenv>
- <var name="OPENBLAS_NUM_THREADS">1</var>
- </runenv>
- </test>
-
- <test id="openblas2">
- <pkg>sci-libs/openblas-9999</pkg>
- <emergeenv>
- <var name="TARGET">NEHALEM</var>
- <var name="FFLAGS">-O3</var>
- <var name="CFLAGS">-O3</var>
- <var name="USE">incblas</var>
- </emergeenv>
- <runenv>
- <var name="OPENBLAS_NUM_THREADS">2</var>
- </runenv>
- </test>
-
- <test id="openblas4">
- <pkg>sci-libs/openblas-9999</pkg>
- <emergeenv>
- <var name="TARGET">NEHALEM</var>
- <var name="FFLAGS">-O3</var>
- <var name="CFLAGS">-O3</var>
- <var name="USE">incblas</var>
- </emergeenv>
- <runenv>
- <var name="OPENBLAS_NUM_THREADS">4</var>
- </runenv>
- </test>
-
- <test id="mkl">
- <pkg>sci-libs/mkl-10.3.7.256</pkg>
- <skip>mkl32*</skip>
- <skip>*int64*</skip>
- </test>
-
-</tests>
+<numbench>
+
+ <operations module="cblas">axpy matrix_vector matrix_matrix aat</operations>
+
+ <testcases>
+
+ <case id="reference">
+ <pkg>sci-libs/cblas-reference-20110218</pkg>
+ <emergeenv>
+ <var name="FFLAGS">-O3</var>
+ </emergeenv>
+ </case>
+
+ <case id="atlas">
+ <pkg>sci-libs/atlas-3.10.0</pkg>
+ <emergeenv>
+ <var name="USE">threads</var>
+ </emergeenv>
+ </case>
+
+ <case id="openblas1">
+ <pkg>sci-libs/openblas-0.2.3</pkg>
+ <emergeenv>
+ <var name="FFLAGS">-O3</var>
+ <var name="CFLAGS">-O3</var>
+ <var name="USE">incblas</var>
+ </emergeenv>
+ <runenv>
+ <var name="OPENBLAS_NUM_THREADS">1</var>
+ </runenv>
+ </case>
+
+ <case id="mkl">
+ <pkg>sci-libs/mkl-10.3.7.256</pkg>
+ <skip>mkl32*</skip>
+ <skip>*int64*</skip>
+ </case>
+
+ </testcases>
+
+</numbench>
diff --git a/samples/fftwtests.xml b/samples/fftwtests.xml
index 7791931..e4a489d 100644
--- a/samples/fftwtests.xml
+++ b/samples/fftwtests.xml
@@ -1,31 +1,38 @@
-<tests>
-
- <test id="fftw-O0">
- <pkg>sci-libs/fftw-3.3-r2</pkg>
- <emergeenv>
- <var name="CFLAGS">-O0</var>
- </emergeenv>
- </test>
-
- <test id="fftw-O1">
- <pkg>sci-libs/fftw-3.3-r2</pkg>
- <emergeenv>
- <var name="CFLAGS">-O1</var>
- </emergeenv>
- </test>
-
- <test id="fftw-O2">
- <pkg>sci-libs/fftw-3.3-r2</pkg>
- <emergeenv>
- <var name="CFLAGS">-O2</var>
- </emergeenv>
- </test>
-
- <test id="fftw-O3">
- <pkg>sci-libs/fftw-3.3-r2</pkg>
- <emergeenv>
- <var name="CFLAGS">-O3</var>
- </emergeenv>
- </test>
-
-</tests>
+<numbench>
+
+ <operations module="fftw"></operations>
+
+
+ <testcases>
+
+ <case id="fftw-O0">
+ <pkg>sci-libs/fftw-3.3.2</pkg>
+ <emergeenv>
+ <var name="CFLAGS">-O0</var>
+ </emergeenv>
+ </case>
+
+ <case id="fftw-O1">
+ <pkg>sci-libs/fftw-3.3.2</pkg>
+ <emergeenv>
+ <var name="CFLAGS">-O1</var>
+ </emergeenv>
+ </case>
+
+ <case id="fftw-O2">
+ <pkg>sci-libs/fftw-3.3.2</pkg>
+ <emergeenv>
+ <var name="CFLAGS">-O2</var>
+ </emergeenv>
+ </case>
+
+ <case id="fftw-O3">
+ <pkg>sci-libs/fftw-3.3.2</pkg>
+ <emergeenv>
+ <var name="CFLAGS">-O3</var>
+ </emergeenv>
+ </case>
+
+ </testcases>
+
+</numbench>
diff --git a/samples/lapacketests.xml b/samples/lapacketests.xml
index 9a536a0..796829e 100644
--- a/samples/lapacketests.xml
+++ b/samples/lapacketests.xml
@@ -1,23 +1,28 @@
-<tests>
+<numbench>
- <test id="reference-openblas">
- <pkg>sci-libs/lapacke-reference-3.4.1</pkg>
- <emergeenv>
- <var name="FFLAGS">-O3</var>
- <var name="ACCEPT_KEYWORDS">**</var>
- </emergeenv>
- <required name="blas">openblas-threads</required>
- <runenv>
- <var name="LD_DEBUG">all</var>
- </runenv>
- </test>
+ <operations module="lapacke">lu_decomp svd_decomp qr_decomp</operations>
- <test id="mkl">
- <pkg>sci-libs/mkl-10.3.7.256</pkg>
- <skip>mkl32*</skip>
- <skip>*int64*</skip>
- <skip>*openmp</skip>
- <skip>*dynamic*</skip>
- </test>
+ <testcases>
-</tests>
+ <case id="reference-openblas">
+ <pkg>sci-libs/lapacke-reference-3.4.1</pkg>
+ <emergeenv>
+ <var name="FFLAGS">-O3</var>
+ <var name="ACCEPT_KEYWORDS">**</var>
+ </emergeenv>
+ <runenv>
+ <var name="LD_DEBUG">all</var>
+ </runenv>
+ </case>
+
+ <case id="mkl">
+ <pkg>sci-libs/mkl-10.3.7.256</pkg>
+ <skip>mkl32*</skip>
+ <skip>*int64*</skip>
+ <skip>*openmp</skip>
+ <skip>*dynamic*</skip>
+ </case>
+
+ </testcases>
+
+</numbench>
diff --git a/samples/lapacktests.xml b/samples/lapacktests.xml
index 91194eb..2c7741b 100644
--- a/samples/lapacktests.xml
+++ b/samples/lapacktests.xml
@@ -14,12 +14,11 @@
<testcases>
- <case id="reference-openblas">
+ <case id="reference">
<pkg>sci-libs/lapack-reference-3.4.1</pkg>
<emergeenv>
<var name="FFLAGS">-O3</var>
</emergeenv>
- <required name="blas">openblas</required>
</case>
<case id="atlas">
@@ -39,7 +38,7 @@
<case id="acml">
<pkg>sci-libs/acml-5.1.0</pkg>
</case>
-
+
</testcases>
</numbench>
diff --git a/samples/openblas.xml b/samples/openblas.xml
index 8eef44e..39c0e81 100644
--- a/samples/openblas.xml
+++ b/samples/openblas.xml
@@ -4,7 +4,7 @@
<testcases>
<case id="openblas-gcc-threads">
- <pkg>sci-libs/openblas-0.2.2</pkg>
+ <pkg>sci-libs/openblas-0.2.3</pkg>
<emergeenv>
<var name="FC">gfortran</var>
<var name="CC">gcc</var>
@@ -15,7 +15,7 @@
</case>
<case id="openblas-gcc-openmp">
- <pkg>sci-libs/openblas-0.2.2</pkg>
+ <pkg>sci-libs/openblas-0.2.3</pkg>
<emergeenv>
<var name="FC">gfortran</var>
<var name="CC">gcc</var>
@@ -24,10 +24,10 @@
<var name="USE">openmp -threads</var>
</emergeenv>
</case>
-
-
+
+
<case id="openblas-icc-threads">
- <pkg>sci-libs/openblas-0.2.2</pkg>
+ <pkg>sci-libs/openblas-0.2.3</pkg>
<emergeenv>
<var name="FC">ifort</var>
<var name="CC">icc</var>
@@ -36,9 +36,9 @@
<var name="USE">-openmp threads</var>
</emergeenv>
</case>
-
+
<case id="openblas-icc-openmp">
- <pkg>sci-libs/openblas-0.2.2</pkg>
+ <pkg>sci-libs/openblas-0.2.3</pkg>
<emergeenv>
<var name="FC">ifort</var>
<var name="CC">icc</var>
@@ -47,10 +47,10 @@
<var name="USE">openmp -threads</var>
</emergeenv>
</case>
-
-
+
+
<case id="openblas-clang-threads">
- <pkg>sci-libs/openblas-0.2.2</pkg>
+ <pkg>sci-libs/openblas-0.2.3</pkg>
<emergeenv>
<var name="FC">clang</var>
<var name="CC">clang</var>
@@ -59,9 +59,9 @@
<var name="USE">-openmp threads</var>
</emergeenv>
</case>
-
+
<case id="openblas-clang-openmp">
- <pkg>sci-libs/openblas-0.2.2</pkg>
+ <pkg>sci-libs/openblas-0.2.3</pkg>
<emergeenv>
<var name="FC">clang</var>
<var name="CC">clang</var>
@@ -70,10 +70,10 @@
<var name="USE">openmp -threads</var>
</emergeenv>
</case>
-
-
+
+
<case id="openblas-ekopath-threads">
- <pkg>sci-libs/openblas-0.2.2</pkg>
+ <pkg>sci-libs/openblas-0.2.3</pkg>
<emergeenv>
<var name="FC">pathf90</var>
<var name="CC">pathcc</var>
@@ -82,9 +82,9 @@
<var name="USE">-openmp threads</var>
</emergeenv>
</case>
-
+
<case id="openblas-ekopath-openmp">
- <pkg>sci-libs/openblas-0.2.2</pkg>
+ <pkg>sci-libs/openblas-0.2.3</pkg>
<emergeenv>
<var name="FC">pathf90</var>
<var name="CC">pathcc</var>
diff --git a/samples/scalapacktests.xml b/samples/scalapacktests.xml
index cadf14b..fda1bcb 100644
--- a/samples/scalapacktests.xml
+++ b/samples/scalapacktests.xml
@@ -1,17 +1,28 @@
-<tests>
+<numbench>
- <test id="reference-O3">
- <pkg>sci-libs/scalapack-2.0.1</pkg>
- <emergeenv>
- <var name="FFLAGS">-O3</var>
- </emergeenv>
- </test>
+ <operations module="scalapack">
+ axpy
+ matrix_vector
+ cholesky
+ svd_decomp
+ </operations>
- <test id="reference-O1">
- <pkg>sci-libs/scalapack-2.0.1</pkg>
- <emergeenv>
- <var name="FFLAGS">-O1</var>
- </emergeenv>
- </test>
+ <testcases>
-</tests>
+ <case id="reference-O3">
+ <pkg>sci-libs/scalapack-2.0.2</pkg>
+ <emergeenv>
+ <var name="FFLAGS">-O3</var>
+ </emergeenv>
+ </case>
+
+ <case id="reference-O1">
+ <pkg>sci-libs/scalapack-2.0.2</pkg>
+ <emergeenv>
+ <var name="FFLAGS">-O1</var>
+ </emergeenv>
+ </case>
+
+ </testcases>
+
+</numbench>