From 52392932dc1ea3c16220cc4e6978efcb2f5f0616 Mon Sep 17 00:00:00 2001 From: "Field G. Van Zee" Date: Tue, 13 Nov 2018 22:23:38 +0000 Subject: [PATCH] Minor fixes to test/3m4m drivers. Details: - Cleanups to Makefile to allow all test drivers to be built for OpenBLAS and MKL in addition to BLIS. - Fixed copy-paste typos in test_hemm in calls to ssymm_() and dsymm_(). - Fixed incorrect types for betap in BLAS cpp macro branch of test_herk.c. --- test/3m4m/Makefile | 178 ++++++++++++++++++++++++++---------------- test/3m4m/test_hemm.c | 4 +- test/3m4m/test_herk.c | 4 +- 3 files changed, 115 insertions(+), 71 deletions(-) diff --git a/test/3m4m/Makefile b/test/3m4m/Makefile index 7582c70ec..b129ab020 100644 --- a/test/3m4m/Makefile +++ b/test/3m4m/Makefile @@ -201,9 +201,9 @@ STR_ST := -DTHR_STR=\"st\" STR_MT := -DTHR_STR=\"mt\" # Problem size specification -PDEF_ST := -DP_BEGIN=96 \ +PDEF_ST := -DP_BEGIN=40 \ -DP_END=2000 \ - -DP_INC=96 + -DP_INC=40 PDEF_MT := -DP_BEGIN=192 \ -DP_END=3000 \ @@ -215,28 +215,47 @@ PDEF_MT := -DP_BEGIN=192 \ # --- Targets/rules ------------------------------------------------------------ # -all: all-st all-mt -blis: blis-st blis-mt -blis-nat: blis-nat-st blis-nat-mt -openblas: openblas-st openblas-mt -mkl: mkl-st mkl-mt +all: all-st all-mt +blis: blis-st blis-mt +openblas: openblas-st openblas-mt +mkl: mkl-st mkl-mt -all-st: blis-st openblas-st mkl-st -all-mt: blis-mt openblas-mt mkl-mt +all-st: blis-st openblas-st mkl-st +all-mt: blis-mt openblas-mt mkl-mt -blis-st: blis-gemm-st -blis-mt: blis-gemm-mt +blis-st: blis-nat-st +blis-mt: blis-nat-mt -openblas-st: openblas-gemm-st -openblas-mt: openblas-gemm-mt +blis-ind: blis-ind-st blis-ind-mt +blis-nat: blis-nat-st blis-nat-mt -mkl-st: mkl-gemm-st -mkl-mt: mkl-gemm-mt +blis-ind-st: \ + test_cgemm_3mhw_blis_st.x \ + test_zgemm_3mhw_blis_st.x \ + test_cgemm_3m1_blis_st.x \ + test_zgemm_3m1_blis_st.x \ + test_cgemm_4mhw_blis_st.x \ + test_zgemm_4mhw_blis_st.x \ + test_cgemm_4m1b_blis_st.x \ + test_zgemm_4m1b_blis_st.x \ + test_cgemm_4m1a_blis_st.x \ + test_zgemm_4m1a_blis_st.x \ + test_cgemm_1m_blis_st.x \ + test_zgemm_1m_blis_st.x -blis-gemm-st: blis-gemm-nat-st \ - blis-gemm-ind-st -blis-gemm-mt: blis-gemm-nat-mt \ - blis-gemm-ind-mt +blis-ind-mt: \ + test_cgemm_3mhw_blis_mt.x \ + test_zgemm_3mhw_blis_mt.x \ + test_cgemm_3m1_blis_mt.x \ + test_zgemm_3m1_blis_mt.x \ + test_cgemm_4mhw_blis_mt.x \ + test_zgemm_4mhw_blis_mt.x \ + test_cgemm_4m1b_blis_mt.x \ + test_zgemm_4m1b_blis_mt.x \ + test_cgemm_4m1a_blis_mt.x \ + test_zgemm_4m1a_blis_mt.x \ + test_cgemm_1m_blis_mt.x \ + test_zgemm_1m_blis_mt.x blis-nat-st: \ test_sgemm_asm_blis_st.x \ @@ -282,69 +301,94 @@ blis-nat-mt: \ test_ctrsm_asm_blis_mt.x \ test_ztrsm_asm_blis_mt.x -blis-gemm-nat-st: \ - test_sgemm_asm_blis_st.x \ - test_dgemm_asm_blis_st.x \ - test_cgemm_asm_blis_st.x \ - test_zgemm_asm_blis_st.x - -blis-gemm-nat-mt: \ - test_sgemm_asm_blis_mt.x \ - test_dgemm_asm_blis_mt.x \ - test_cgemm_asm_blis_mt.x \ - test_zgemm_asm_blis_mt.x - -blis-gemm-ind-st: \ - test_cgemm_3mhw_blis_st.x \ - test_zgemm_3mhw_blis_st.x \ - test_cgemm_3m1_blis_st.x \ - test_zgemm_3m1_blis_st.x \ - test_cgemm_4mhw_blis_st.x \ - test_zgemm_4mhw_blis_st.x \ - test_cgemm_4m1b_blis_st.x \ - test_zgemm_4m1b_blis_st.x \ - test_cgemm_4m1a_blis_st.x \ - test_zgemm_4m1a_blis_st.x \ - test_cgemm_1m_blis_st.x \ - test_zgemm_1m_blis_st.x - -blis-gemm-ind-mt: \ - test_cgemm_3mhw_blis_mt.x \ - test_zgemm_3mhw_blis_mt.x \ - test_cgemm_3m1_blis_mt.x \ - test_zgemm_3m1_blis_mt.x \ - test_cgemm_4mhw_blis_mt.x \ - test_zgemm_4mhw_blis_mt.x \ - test_cgemm_4m1b_blis_mt.x \ - test_zgemm_4m1b_blis_mt.x \ - test_cgemm_4m1a_blis_mt.x \ - test_zgemm_4m1a_blis_mt.x \ - test_cgemm_1m_blis_mt.x \ - test_zgemm_1m_blis_mt.x - -openblas-gemm-st: \ +openblas-st: \ test_sgemm_openblas_st.x \ test_dgemm_openblas_st.x \ test_cgemm_openblas_st.x \ - test_zgemm_openblas_st.x + test_zgemm_openblas_st.x \ + test_shemm_openblas_st.x \ + test_dhemm_openblas_st.x \ + test_chemm_openblas_st.x \ + test_zhemm_openblas_st.x \ + test_sherk_openblas_st.x \ + test_dherk_openblas_st.x \ + test_cherk_openblas_st.x \ + test_zherk_openblas_st.x \ + test_strmm_openblas_st.x \ + test_dtrmm_openblas_st.x \ + test_ctrmm_openblas_st.x \ + test_ztrmm_openblas_st.x \ + test_strsm_openblas_st.x \ + test_dtrsm_openblas_st.x \ + test_ctrsm_openblas_st.x \ + test_ztrsm_openblas_st.x -openblas-gemm-mt: \ +openblas-mt: \ test_sgemm_openblas_mt.x \ test_dgemm_openblas_mt.x \ test_cgemm_openblas_mt.x \ - test_zgemm_openblas_mt.x + test_zgemm_openblas_mt.x \ + test_shemm_openblas_mt.x \ + test_dhemm_openblas_mt.x \ + test_chemm_openblas_mt.x \ + test_zhemm_openblas_mt.x \ + test_sherk_openblas_mt.x \ + test_dherk_openblas_mt.x \ + test_cherk_openblas_mt.x \ + test_zherk_openblas_mt.x \ + test_strmm_openblas_mt.x \ + test_dtrmm_openblas_mt.x \ + test_ctrmm_openblas_mt.x \ + test_ztrmm_openblas_mt.x \ + test_strsm_openblas_mt.x \ + test_dtrsm_openblas_mt.x \ + test_ctrsm_openblas_mt.x \ + test_ztrsm_openblas_mt.x -mkl-gemm-st: \ +mkl-st: \ test_sgemm_mkl_st.x \ test_dgemm_mkl_st.x \ test_cgemm_mkl_st.x \ - test_zgemm_mkl_st.x + test_zgemm_mkl_st.x \ + test_shemm_mkl_st.x \ + test_dhemm_mkl_st.x \ + test_chemm_mkl_st.x \ + test_zhemm_mkl_st.x \ + test_sherk_mkl_st.x \ + test_dherk_mkl_st.x \ + test_cherk_mkl_st.x \ + test_zherk_mkl_st.x \ + test_strmm_mkl_st.x \ + test_dtrmm_mkl_st.x \ + test_ctrmm_mkl_st.x \ + test_ztrmm_mkl_st.x \ + test_strsm_mkl_st.x \ + test_dtrsm_mkl_st.x \ + test_ctrsm_mkl_st.x \ + test_ztrsm_mkl_st.x -mkl-gemm-mt: \ +mkl-mt: \ test_sgemm_mkl_mt.x \ test_dgemm_mkl_mt.x \ test_cgemm_mkl_mt.x \ - test_zgemm_mkl_mt.x + test_zgemm_mkl_mt.x \ + test_shemm_mkl_mt.x \ + test_dhemm_mkl_mt.x \ + test_chemm_mkl_mt.x \ + test_zhemm_mkl_mt.x \ + test_sherk_mkl_mt.x \ + test_dherk_mkl_mt.x \ + test_cherk_mkl_mt.x \ + test_zherk_mkl_mt.x \ + test_strmm_mkl_mt.x \ + test_dtrmm_mkl_mt.x \ + test_ctrmm_mkl_mt.x \ + test_ztrmm_mkl_mt.x \ + test_strsm_mkl_mt.x \ + test_dtrsm_mkl_mt.x \ + test_ctrsm_mkl_mt.x \ + test_ztrsm_mkl_mt.x + diff --git a/test/3m4m/test_hemm.c b/test/3m4m/test_hemm.c index 860ae4c31..cf640b4f6 100644 --- a/test/3m4m/test_hemm.c +++ b/test/3m4m/test_hemm.c @@ -208,7 +208,7 @@ int main( int argc, char** argv ) float* betap = bli_obj_buffer( &beta ); float* cp = bli_obj_buffer( &c ); - shemm_( &f77_side, + ssymm_( &f77_side, &f77_uploa, &mm, &nn, @@ -231,7 +231,7 @@ int main( int argc, char** argv ) double* betap = bli_obj_buffer( &beta ); double* cp = bli_obj_buffer( &c ); - dhemm_( &f77_side, + dsymm_( &f77_side, &f77_uploa, &mm, &nn, diff --git a/test/3m4m/test_herk.c b/test/3m4m/test_herk.c index 66a057a59..6616ffe9f 100644 --- a/test/3m4m/test_herk.c +++ b/test/3m4m/test_herk.c @@ -242,7 +242,7 @@ int main( int argc, char** argv ) f77_int ldc = bli_obj_col_stride( &c ); float* alphap = bli_obj_buffer( &alpha ); scomplex* ap = bli_obj_buffer( &a ); - scomplex* betap = bli_obj_buffer( &beta ); + float* betap = bli_obj_buffer( &beta ); scomplex* cp = bli_obj_buffer( &c ); cherk_( &f77_uploc, @@ -262,7 +262,7 @@ int main( int argc, char** argv ) f77_int ldc = bli_obj_col_stride( &c ); double* alphap = bli_obj_buffer( &alpha ); dcomplex* ap = bli_obj_buffer( &a ); - dcomplex* betap = bli_obj_buffer( &beta ); + double* betap = bli_obj_buffer( &beta ); dcomplex* cp = bli_obj_buffer( &c ); zherk_( &f77_uploc,