amd/blis
1
0
Fork 0
mirror of https://github.com/amd/blis.git synced 2026-05-12 01:59:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code Cleanup done; Test code updated to add performance measurement

Browse Source 
Change-Id: I639f22659c22226fbd81e1669e4372f200ab5129
This commit is contained in:
Chithra Sankar
2019-07-26 12:22:43 +05:30
committed by dzambare
parent c04966262b
commit ea563b2259
8 changed files with 974 additions and 3810 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
testcpp/Makefile
View File

@@ -115,7 +115,11 @@ CINCFLAGS := -I$(INC_PATH)
CXX = g++
# Use the CFLAGS for the configuration family.
<<<<<<< HEAD
override CFLAGS += $(call get-sandbox-cxxflags-for,$(CONFIG_NAME))
=======
override CFLAGS += $(call get-user-cflags-for,$(CONFIG_NAME))
>>>>>>> Code Cleanup done; Test code updated to add performance measurement
# Add local header paths to CFLAGS
#CFLAGS = -O0 -g -Wall
@@ -136,6 +140,7 @@ LIBBLIS_LINK := $(LIB_PATH)/$(LIBBLIS_L)
# Complete list of possible targets when defining 'all':
#
<<<<<<< HEAD
# blis
#
all: blis
@@ -182,6 +187,103 @@ blis: test_asum_blis.x \
test_trsm_blis.x \
test_trsv_blis.x
=======
# blis openblas atlas mkl mac essl
#
#all: blis openblas atlas mkl
all: blis openblas mkl
blis: test_gemm_blis.x \
test_gemm1_blis.x
openblas: \
test_dotv_openblas.x \
test_axpyv_openblas.x \
test_gemv_openblas.x \
test_ger_openblas.x \
test_hemv_openblas.x \
test_her_openblas.x \
test_her2_openblas.x \
test_trmv_openblas.x \
test_trsv_openblas.x \
\
test_gemm_openblas.x \
test_hemm_openblas.x \
test_herk_openblas.x \
test_her2k_openblas.x \
test_trmm_openblas.x \
test_trsm_openblas.x
atlas: \
test_dotv_atlas.x \
test_axpyv_atlas.x \
test_gemv_atlas.x \
test_ger_atlas.x \
test_hemv_atlas.x \
test_her_atlas.x \
test_her2_atlas.x \
test_trmv_atlas.x \
test_trsv_atlas.x \
\
test_gemm_atlas.x \
test_hemm_atlas.x \
test_herk_atlas.x \
test_her2k_atlas.x \
test_trmm_atlas.x \
test_trsm_atlas.x
mkl: test_dotv_mkl.x \
test_axpyv_mkl.x \
test_gemv_mkl.x \
test_ger_mkl.x \
test_hemv_mkl.x \
test_her_mkl.x \
test_her2_mkl.x \
test_trmv_mkl.x \
test_trsv_mkl.x \
\
test_gemm_mkl.x \
test_hemm_mkl.x \
test_herk_mkl.x \
test_her2k_mkl.x \
test_trmm_mkl.x \
test_trsm_mkl.x
essl: test_dotv_essl.x \
test_axpyv_essl.x \
test_gemv_essl.x \
test_ger_essl.x \
test_hemv_essl.x \
test_her_essl.x \
test_her2_essl.x \
test_trmv_essl.x \
test_trsv_essl.x \
\
test_gemm_essl.x \
test_hemm_essl.x \
test_herk_essl.x \
test_her2k_essl.x \
test_trmm_essl.x \
test_trsm_essl.x
mac: test_dotv_mac.x \
test_axpyv_mac.x \
test_gemv_mac.x \
test_ger_mac.x \
test_hemv_mac.x \
test_her_mac.x \
test_her2_mac.x \
test_trmv_mac.x \
test_trsv_mac.x \
\
test_gemm_mac.x \
test_hemm_mac.x \
test_herk_mac.x \
test_her2k_mac.x \
test_trmm_mac.x \
test_trsm_mac.x
>>>>>>> Code Cleanup done; Test code updated to add performance measurement
# --Object file rules --
@@ -190,7 +292,11 @@ $(TEST_OBJ_PATH)/%.o: $(TEST_SRC_PATH)/%.cc
$(CXX) $(CFLAGS) -c $< -o $@
test_%_blis.o: test_%.cc
<<<<<<< HEAD
@$(CXX) $(CFLAGS) -c $< -o $@
=======
$(CXX) $(CFLAGS) -c $< -o $@
>>>>>>> Code Cleanup done; Test code updated to add performance measurement
# -- Executable file rules --

35
testcpp/test.sh
View File

@@ -1,3 +1,4 @@
<<<<<<< HEAD
echo Build BLIS CPP Template tests
make clean
@@ -44,3 +45,37 @@ echo Run tests
./test_trmm_blis.x
./test_trsm_blis.x
./test_trsv_blis.x
=======
CWD=$(pwd)
echo $CWD
make clean
make blis CFLAGS+="-DFLOAT"
numactl -C 1 ./test_gemm1_blis.x
make clean
make blis CFLAGS+="-DDOUBLE"
numactl -C 1 ./test_gemm1_blis.x
make clean
make blis CFLAGS+="-DSCOMPLEX"
numactl -C 1 ./test_gemm1_blis.x
make clean
make blis CFLAGS+="-DDCOMPLEX"
numactl -C 1 ./test_gemm1_blis.x
cd ../test/
CWD=$(pwd)
echo $CWD
make clean
make blis CFLAGS+="-DFLOAT"
numactl -C 1 ./test_gemm_blis.x
make clean
make blis CFLAGS+="-DDOUBLE"
numactl -C 1 ./test_gemm_blis.x
make clean
make blis CFLAGS+="-DSCOMPLEX"
numactl -C 1 ./test_gemm_blis.x
make clean
make blis CFLAGS+="-DDCOMPLEX"
numactl -C 1 ./test_gemm_blis.x
>>>>>>> Code Cleanup done; Test code updated to add performance measurement

84
testcpp/test_gemm.cc
View File

@@ -33,8 +33,14 @@
#include <complex>
#include <iostream>
<<<<<<< HEAD
#include "blis.hh"
#include "test.hh"
=======
#include <string.h>
#include <unistd.h>
#include "blis.hh"
>>>>>>> Code Cleanup done; Test code updated to add performance measurement
using namespace blis;
using namespace std;
@@ -154,10 +160,88 @@ void test_gemm( )
// -----------------------------------------------------------------------------
int main( int argc, char** argv )
{
<<<<<<< HEAD
test_gemm<double>( );
test_gemm<float>( );
test_gemm<complex<float>>( );
test_gemm<complex<double>>( );
return 0;
=======
int M, N, K, lda, ldb, ldc;
double a_d[DIM * DIM] = { 1.111, 2.222, 3.333, 4.444 };
double b_d[DIM * DIM] = { 5.555, 6.666, 7.777, 8.888 };
double c_d[DIM * DIM];
double alpha_d, beta_d;
float a_f[DIM * DIM] = { 1.1, 2.2, 3.3, 4.4 };
float b_f[DIM * DIM] = { 5.5, 6.6, 7.7, 8.8 };
float c_f[DIM * DIM];
float alpha_f, beta_f;
std::complex<float> a_c[DIM * DIM]={{1, 2},{3, 4},{5,6},{7,8}};
std::complex<float> b_c[DIM * DIM]={{1, 2},{3, 4},{5,6},{7,8}};
std::complex<float> c_c[DIM * DIM];
std::complex<float> alpha_c, beta_c;
std::complex<double> a_z[DIM * DIM]={{1.1, 2.2},{3.3, 4.4},{5.5,6.6},{7.7,8.8}};
std::complex<double> b_z[DIM * DIM]={{1.1, 2.2},{3.3, 4.4},{5.5,6.6},{7.7,8.8}};
std::complex<double> c_z[DIM * DIM];
std::complex<double> alpha_z, beta_z;
M = DIM;
N = M;
K = M;
lda = M;
ldb = K;
ldc = M;
alpha_d = 1.0;
beta_d = 0.0;
alpha_f = 1.0;
beta_f = 0.0;
alpha_c = {1.0,1.0};
beta_c = {0.0,0.0};
alpha_z = {1.0,1.0};
beta_z = {0.0,0.0};
/*cblis_sgemm*/
cout<<"a_f= \n";
print_matrix<float>(a_f , M , K);
cout<<"b_f= \n";
print_matrix<float>(b_f , K , N);
blis::gemm(CblasRowMajor, CblasNoTrans, CblasNoTrans, M, N, K, alpha_f, a_f,
lda, b_f, ldb, beta_f, c_f, ldc);
cout<<"c_f= \n";
print_matrix<float>(c_f , M , N);
/*cblis_dgemm*/
printf("a_d = \n");
print_matrix<double>(a_d , M , K);
printf("b_d = \n");
print_matrix<double>(b_d , K , N);
blis::gemm(CblasRowMajor, CblasNoTrans, CblasNoTrans, M, N, K, alpha_d, a_d,
lda, b_d, ldb, beta_d, c_d, ldc);
printf("c_d = \n");
print_matrix<double>(c_d , M , N);
/*cblis_cgemm*/
printf("a_c = \n");
print_matrix<std::complex<float>>(a_c , M , K);
printf("b_c = \n");
print_matrix<std::complex<float>>(b_c , K , N);
blis::gemm(CblasRowMajor, CblasNoTrans, CblasNoTrans, M, N, K, alpha_c, a_c,
lda, b_c, ldb, beta_c, c_c, ldc);
printf("c_c = \n");
print_matrix<std::complex<float>>(c_c , M , N);
/*cblis_zgemm*/
printf("a_z = \n");
print_matrix<std::complex<double>>(a_z , M , K);
printf("b_z = \n");
print_matrix<std::complex<double>>(b_z , K , N);
blis::gemm(CblasRowMajor, CblasNoTrans, CblasNoTrans, M, N, K, alpha_z, a_z,
lda, b_z, ldb, beta_z, c_z, ldc);
printf("c_z = \n");
print_matrix<std::complex<double>>(c_z , M , N);
return 0;
>>>>>>> Code Cleanup done; Test code updated to add performance measurement
}

421
testcpp/test_gemm1.cc Normal file
View File

@@ -0,0 +1,421 @@
/*
BLIS
An object-based framework for developing high-performance BLAS-like
libraries.
Copyright (C) 2014, The University of Texas at Austin
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
- Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
- Neither the name of The University of Texas nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <complex>
#include <stdio.h>
#include <iostream>
#include <string.h>
#include <unistd.h>
#include "blis.hh"
using namespace std;
//#define FILE_IN_OUT // File based input matrix dimensions
#define PRINT
int main( int argc, char** argv )
{
obj_t a, b, c;
obj_t c_save;
obj_t alpha, beta;
dim_t m, n, k;
dim_t p;
dim_t p_begin, p_end, p_inc;
int m_input, n_input, k_input;
num_t dt;
int r, n_repeats;
trans_t transa;
trans_t transb;
// f77_char f77_transa;
// f77_char f77_transb;
double dtime;
double dtime_save;
double gflops;
#ifdef FILE_IN_OUT
FILE* fin = NULL;
FILE* fout = NULL;
char gemm = 's';
#endif
//bli_init();
//bli_error_checking_level_set( BLIS_NO_ERROR_CHECKING );
n_repeats = 100;
#ifndef PRINT
p_begin = 200;
p_end = 2000;
p_inc = 200;
m_input = -1;
n_input = -1;
k_input = -1;
#else
p_begin = 16;
p_end = 16;
p_inc = 1;
m_input = 5;
k_input = 6;
n_input = 4;
#endif
#ifdef FLOAT
dt = BLIS_FLOAT;
#elif defined DOUBLE
dt = BLIS_DOUBLE;
#elif defined SCOMPLEX
dt = BLIS_SCOMPLEX;
#elif defined DCOMPLEX
dt = BLIS_DCOMPLEX;
#endif
transa = BLIS_NO_TRANSPOSE;
transb = BLIS_NO_TRANSPOSE;
// bli_param_map_blis_to_netlib_trans( transa, &f77_transa );
// bli_param_map_blis_to_netlib_trans( transb, &f77_transb );
#ifdef FILE_IN_OUT
if (argc < 3)
{
printf("Usage: ./test_gemm_XX.x input.csv output.csv\n");
exit(1);
}
fin = fopen(argv[1], "r");
if (fin == NULL)
{
printf("Error opening the file %s\n", argv[1]);
exit(1);
}
fout = fopen(argv[2], "w");
if (fout == NULL)
{
printf("Error opening output file %s\n", argv[2]);
exit(1);
}
fprintf(fout, "m\t k\t n\t cs_a\t cs_b\t cs_c\t gflops\t GEMM_Algo\n");
printf("~~~~~~~~~~_BLAS\t m\t k\t n\t cs_a\t cs_b\t cs_c \t gflops\t GEMM_Algo\n");
inc_t cs_a;
inc_t cs_b;
inc_t cs_c;
while (fscanf(fin, "%ld %ld %ld %ld %ld %ld\n", &m, &k, &n, &cs_a, &cs_b, &cs_c) == 6)
{
if ((m > cs_a) || (k > cs_b) || (m > cs_c)) continue; // leading dimension should be greater than number of rows
bli_obj_create( dt, 1, 1, 0, 0, &alpha);
bli_obj_create( dt, 1, 1, 0, 0, &beta );
bli_obj_create( dt, m, k, 1, cs_a, &a );
bli_obj_create( dt, k, n, 1, cs_b, &b );
bli_obj_create( dt, m, n, 1, cs_c, &c );
bli_obj_create( dt, m, n, 1, cs_c, &c_save );
bli_obj_set_conjtrans( transa, &a);
bli_obj_set_conjtrans( transb, &b);
//bli_setsc( 0.0, -1, &alpha );
//bli_setsc( 0.0, 1, &beta );
bli_setsc( -1, 0.0, &alpha );
bli_setsc( 1, 0.0, &beta );
// printf("%1.1f %1.1f\n", *((double *)bli_obj_buffer_for_const(BLIS_FLOAT, &alpha)), *((double *)bli_obj_buffer_for_const(BLIS_FLOAT, &beta)));
#else
for ( p = p_begin; p <= p_end; p += p_inc )
{
if ( m_input < 0 ) m = p * ( dim_t )abs(m_input);
else m = ( dim_t ) m_input;
if ( n_input < 0 ) n = p * ( dim_t )abs(n_input);
else n = ( dim_t ) n_input;
if ( k_input < 0 ) k = p * ( dim_t )abs(k_input);
else k = ( dim_t ) k_input;
bli_obj_create( dt, 1, 1, 0, 0, &alpha );
bli_obj_create( dt, 1, 1, 0, 0, &beta );
bli_obj_create( dt, m, k, 0, 0, &a );
bli_obj_create( dt, k, n, 0, 0, &b );
bli_obj_create( dt, m, n, 0, 0, &c );
bli_obj_create( dt, m, n, 0, 0, &c_save );
bli_randm( &a );
bli_randm( &b );
bli_randm( &c );
bli_obj_set_conjtrans( transa, &a );
bli_obj_set_conjtrans( transb, &b );
bli_setsc( (0.9/1.0), 0.2, &alpha );
bli_setsc( -(1.1/1.0), 0.3, &beta );
#endif
bli_copym( &c, &c_save );
dtime_save = DBL_MAX;
for ( r = 0; r < n_repeats; ++r )
{
bli_copym( &c_save, &c );
dtime = bli_clock();
#ifdef PRINT
bli_printm( "a", &a, "%4.1f", "" );
bli_printm( "b", &b, "%4.1f", "" );
bli_printm( "c", &c, "%4.1f", "" );
#endif
#if 0
bli_gemm( &alpha,
&a,
&b,
&beta,
&c );
#else
if ( bli_is_float( dt ) )
{
int M = bli_obj_length( &c );
int K = bli_obj_width_after_trans( &a );
int N = bli_obj_width( &c );
int lda = bli_obj_col_stride( &a );
int ldb = bli_obj_col_stride( &b );
int ldc = bli_obj_col_stride( &c );
float* alphap = (float *)bli_obj_buffer( &alpha );
float* ap = (float *)bli_obj_buffer( &a );
float* bp = (float *)bli_obj_buffer( &b );
float* betap = (float *)bli_obj_buffer( &beta );
float* cp = (float *)bli_obj_buffer( &c );
blis::gemm(CblasColMajor, CblasNoTrans, CblasNoTrans, M, N, K, *alphap, ap,
lda, bp, ldb, *betap, cp, ldc);
#if 0
sgemm_( &f77_transa,
&f77_transb,
&mm,
&nn,
&kk,
alphap,
ap, &lda,
bp, &ldb,
betap,
cp, &ldc );
#endif
}
else if ( bli_is_double( dt ) )
{
int M = bli_obj_length( &c );
int K = bli_obj_width_after_trans( &a );
int N = bli_obj_width( &c );
int lda = bli_obj_col_stride( &a );
int ldb = bli_obj_col_stride( &b );
int ldc = bli_obj_col_stride( &c );
double* alphap = (double*)bli_obj_buffer( &alpha );
double* ap = (double*)bli_obj_buffer( &a );
double* bp = (double*)bli_obj_buffer( &b );
double* betap = (double*)bli_obj_buffer( &beta );
double* cp = (double*)bli_obj_buffer( &c );
blis::gemm(CblasColMajor, CblasNoTrans, CblasNoTrans, M, N, K, *alphap, ap,
lda, bp, ldb, *betap, cp, ldc);
#if 0
dgemm_( &f77_transa,
&f77_transb,
&mm,
&nn,
&kk,
alphap,
ap, &lda,
bp, &ldb,
betap,
cp, &ldc );
#endif
}
else if ( bli_is_scomplex( dt ) )
{
int M = bli_obj_length( &c );
int K = bli_obj_width_after_trans( &a );
int N = bli_obj_width( &c );
int lda = bli_obj_col_stride( &a );
int ldb = bli_obj_col_stride( &b );
int ldc = bli_obj_col_stride( &c );
std::complex<float>* alphap = (std::complex<float>*)bli_obj_buffer( &alpha );
std::complex<float>* ap = (std::complex<float>*)bli_obj_buffer( &a );
std::complex<float>* bp = (std::complex<float>*)bli_obj_buffer( &b );
std::complex<float>* betap = (std::complex<float>*)bli_obj_buffer( &beta );
std::complex<float>* cp = (std::complex<float>*)bli_obj_buffer( &c );
blis::gemm(CblasColMajor, CblasNoTrans, CblasNoTrans, M, N, K, *alphap, ap,
lda, bp, ldb, *betap, cp, ldc);
#if 0
cgemm_( &f77_transa,
&f77_transb,
&mm,
&nn,
&kk,
alphap,
ap, &lda,
bp, &ldb,
betap,
cp, &ldc );
#endif
}
else if ( bli_is_dcomplex( dt ) )
{
f77_int M = bli_obj_length( &c );
f77_int K = bli_obj_width_after_trans( &a );
f77_int N = bli_obj_width( &c );
f77_int lda = bli_obj_col_stride( &a );
f77_int ldb = bli_obj_col_stride( &b );
f77_int ldc = bli_obj_col_stride( &c );
std::complex<double>* alphap = (std::complex<double>*)bli_obj_buffer( &alpha );
std::complex<double>* ap = (std::complex<double>*)bli_obj_buffer( &a );
std::complex<double>* bp = (std::complex<double>*)bli_obj_buffer( &b );
std::complex<double>* betap = (std::complex<double>*)bli_obj_buffer( &beta );
std::complex<double>* cp = (std::complex<double>*)bli_obj_buffer( &c );
blis::gemm(CblasColMajor, CblasNoTrans, CblasNoTrans, M, N, K, *alphap, ap,
lda, bp, ldb, *betap, cp, ldc);
#if 0
zgemm_( &f77_transa,
&f77_transb,
&mm,
&nn,
&kk,
alphap,
ap, &lda,
bp, &ldb,
betap,
cp, &ldc );
#endif
}
#endif
#ifdef PRINT
bli_printm( "c after", &c, "%4.1f", "" );
exit(1);
#endif
dtime_save = bli_clock_min_diff( dtime_save, dtime );
}
gflops = ( 2.0 * m * k * n ) / ( dtime_save * 1.0e9 );
if ( bli_is_complex( dt ) ) gflops *= 4.0;
#ifdef BLIS
printf( "data_gemm_blis" );
#else
//printf( "data_gemm_%s", BLAS );
#endif
#ifdef FILE_IN_OUT
if ( bli_is_double( dt ) ) {
if (((m * n) < (BLIS_SMALL_MATRIX_THRES * BLIS_SMALL_MATRIX_THRES/4)) || ((m < (BLIS_SMALL_M_RECT_MATRIX_THRES/2) ) && (k < (BLIS_SMALL_K_RECT_MATRIX_THRES/2) )))
gemm = 'S'; // small gemm
else gemm = 'N'; // Normal blis gemm
}
else if (bli_is_float( dt )) {
if (((m * n) < (BLIS_SMALL_MATRIX_THRES * BLIS_SMALL_MATRIX_THRES)) || ((m < BLIS_SMALL_M_RECT_MATRIX_THRES) && (k < BLIS_SMALL_K_RECT_MATRIX_THRES)))
gemm = 'S'; // small gemm
else gemm = 'N'; // normal blis gemm
}
printf("%6lu \t %4lu \t %4lu \t %4lu \t %4lu \t %4lu \t %6.3f \t %c\n", \
( unsigned long )m,
( unsigned long )k,
( unsigned long )n, (unsigned long)cs_a, (unsigned long)cs_b, (unsigned long)cs_c, gflops, gemm );
fprintf(fout, "%6lu \t %4lu \t %4lu \t %4lu \t %4lu \t %4lu \t %6.3f \t %c\n", \
( unsigned long )m,
( unsigned long )k,
( unsigned long )n, (unsigned long)cs_a, (unsigned long)cs_b, (unsigned long)cs_c, gflops, gemm );
fflush(fout);
#else
printf( "( %2lu, 1:4 ) = [ %4lu %4lu %4lu %7.2f ];\n",
( unsigned long )(p - p_begin + 1)/p_inc + 1,
( unsigned long )m,
( unsigned long )k,
( unsigned long )n, gflops );
#endif
bli_obj_free( &alpha );
bli_obj_free( &beta );
bli_obj_free( &a );
bli_obj_free( &b );
bli_obj_free( &c );
bli_obj_free( &c_save );
}
//bli_finalize();
#ifdef FILE_IN_OUT
fclose(fin);
fclose(fout);
#endif
return 0;
}