From 0d16d952dc4c6396dd7d3dd25c2b727f67c4debb Mon Sep 17 00:00:00 2001 From: Edward Smyth Date: Mon, 28 Aug 2023 15:29:58 -0400 Subject: [PATCH] BLIS: DTL enhancements Several improvements to BLIS DTL functionality - For APIs that report performance statistics, test for time=0.0 before dividing by time when calculating GFLOPS. - Call AOCL_DTL_TRACE_EXIT in the parameter checking functions inlined from ./frame/compat/check/bla_*_check.h - Correct flop count for complex routines. AMD-Internal: [CPUPL-3736] Change-Id: Icc515d88810dd79e66e22ea8c47d84649ca9f768 --- aocl_dtl/aocldtl_blis.c | 72 ++++++++++++---- aocl_dtl/aocldtl_blis.h | 28 +++--- frame/compat/bla_gemm.c | 22 ++--- frame/compat/bla_gemm_amd.c | 60 ++++++------- frame/compat/bla_gemmt.c | 8 +- frame/compat/bla_nrm2.c | 2 +- frame/compat/bla_trsm_amd.c | 117 +++++++++++++------------- frame/compat/check/bla_gemm3m_check.h | 5 ++ frame/compat/check/bla_gemm_check.h | 6 ++ frame/compat/check/bla_gemmt_check.h | 6 ++ frame/compat/check/bla_gemv_check.h | 5 ++ frame/compat/check/bla_ger_check.h | 5 ++ frame/compat/check/bla_hemm_check.h | 5 ++ frame/compat/check/bla_hemv_check.h | 5 ++ frame/compat/check/bla_her2_check.h | 5 ++ frame/compat/check/bla_her2k_check.h | 5 ++ frame/compat/check/bla_her_check.h | 5 ++ frame/compat/check/bla_herk_check.h | 5 ++ frame/compat/check/bla_syr2k_check.h | 5 ++ frame/compat/check/bla_syrk_check.h | 5 ++ frame/compat/check/bla_trmm_check.h | 5 ++ frame/compat/check/bla_trmv_check.h | 5 ++ frame/compat/check/bla_trsm_check.h | 59 ++++++++++++- 23 files changed, 313 insertions(+), 132 deletions(-) diff --git a/aocl_dtl/aocldtl_blis.c b/aocl_dtl/aocldtl_blis.c index 078da3b5d..b9d74242a 100755 --- a/aocl_dtl/aocldtl_blis.c +++ b/aocl_dtl/aocldtl_blis.c @@ -92,6 +92,7 @@ void AOCL_DTL_log_gemm_sizes(int8 loglevel, } void AOCL_DTL_log_gemm_stats(int8 loglevel, + char dt_type, const f77_int m, const f77_int n, const f77_int k) @@ -99,33 +100,52 @@ void AOCL_DTL_log_gemm_stats(int8 loglevel, char buffer[256]; double flops = 2.0 * m * n * k; + if (dt_type == 'c' || dt_type == 'C' || dt_type == 'z' || dt_type == 'Z') + { + flops = 4.0 * flops; + } // Execution time is in micro seconds. Double execution_time = AOCL_DTL_get_time_spent(); - sprintf(buffer, " nt=%ld %.3f ms %0.3f GFLOPS", - AOCL_get_requested_threads_count(), - execution_time/1000.0, - flops/(execution_time * 1e3)); + if (execution_time != 0.0) + sprintf(buffer, " nt=%ld %.3f ms %0.3f GFLOPS", + AOCL_get_requested_threads_count(), + execution_time/1000.0, + flops/(execution_time * 1e3)); + else + sprintf(buffer, " nt=%ld %.3f ms", + AOCL_get_requested_threads_count(), + execution_time/1000.0); DTL_Trace(loglevel, TRACE_TYPE_RAW, NULL, NULL, 0, buffer); } void AOCL_DTL_log_gemmt_stats(int8 loglevel, + char dt_type, const f77_int n, const f77_int k) { char buffer[256]; double flops = n * n * k; + if (dt_type == 'c' || dt_type == 'C' || dt_type == 'z' || dt_type == 'Z') + { + flops = 4.0 * flops; + } // Execution time is in micro seconds. Double execution_time = AOCL_DTL_get_time_spent(); - sprintf(buffer, " nt=%ld %.3f ms %0.3f GFLOPS", - AOCL_get_requested_threads_count(), - execution_time/1000.0, - flops/(execution_time * 1e3)); + if (execution_time != 0.0) + sprintf(buffer, " nt=%ld %.3f ms %0.3f GFLOPS", + AOCL_get_requested_threads_count(), + execution_time/1000.0, + flops/(execution_time * 1e3)); + else + sprintf(buffer, " nt=%ld %.3f ms", + AOCL_get_requested_threads_count(), + execution_time/1000.0); DTL_Trace(loglevel, TRACE_TYPE_RAW, NULL, NULL, 0, buffer); } @@ -164,6 +184,7 @@ void AOCL_DTL_log_trsm_sizes(int8 loglevel, } void AOCL_DTL_log_trsm_stats(int8 loglevel, + char dt_type, f77_char side, const f77_int m, const f77_int n) @@ -179,14 +200,23 @@ void AOCL_DTL_log_trsm_stats(int8 loglevel, { flops = 1.0 * m * n * n; } + if (dt_type == 'c' || dt_type == 'C' || dt_type == 'z' || dt_type == 'Z') + { + flops = 4.0 * flops; + } // Execution time is in micro seconds. Double execution_time = AOCL_DTL_get_time_spent(); - sprintf(buffer, " nt=%ld %.3f ms %0.3f GFLOPS", - AOCL_get_requested_threads_count(), - execution_time/1000.0, - flops/(execution_time * 1e3)); + if (execution_time != 0.0) + sprintf(buffer, " nt=%ld %.3f ms %0.3f GFLOPS", + AOCL_get_requested_threads_count(), + execution_time/1000.0, + flops/(execution_time * 1e3)); + else + sprintf(buffer, " nt=%ld %.3f ms", + AOCL_get_requested_threads_count(), + execution_time/1000.0); DTL_Trace(loglevel, TRACE_TYPE_RAW, NULL, NULL, 0, buffer); } @@ -698,19 +728,29 @@ void AOCL_DTL_log_nrm2_sizes(int8 loglevel, } void AOCL_DTL_log_nrm2_stats(int8 loglevel, + char dt_type, const f77_int n) { char buffer[256]; double flops = 2.0 * n; + if (dt_type == 'c' || dt_type == 'C' || dt_type == 'z' || dt_type == 'Z') + { + flops = 2.0 * flops; + } // Execution time is in micro seconds. Double execution_time = AOCL_DTL_get_time_spent(); - sprintf(buffer, " nt=%ld %.3f ms %0.3f GFLOPS", - AOCL_get_requested_threads_count(), - execution_time/1000.0, - flops/(execution_time * 1e3)); + if (execution_time != 0.0) + sprintf(buffer, " nt=%ld %.3f ms %0.3f GFLOPS", + AOCL_get_requested_threads_count(), + execution_time/1000.0, + flops/(execution_time * 1e3)); + else + sprintf(buffer, " nt=%ld %.3f ms", + AOCL_get_requested_threads_count(), + execution_time/1000.0); DTL_Trace(loglevel, TRACE_TYPE_RAW, NULL, NULL, 0, buffer); } diff --git a/aocl_dtl/aocldtl_blis.h b/aocl_dtl/aocldtl_blis.h index 924dcc744..e01d80efd 100755 --- a/aocl_dtl/aocldtl_blis.h +++ b/aocl_dtl/aocldtl_blis.h @@ -33,11 +33,13 @@ void AOCL_DTL_log_gemm_sizes(int8 loglevel, int line); void AOCL_DTL_log_gemm_stats(int8 loglevel, + char dt_type, const f77_int m, const f77_int n, const f77_int k); void AOCL_DTL_log_trsm_stats(int8 loglevel, + char dt_type, f77_char side, const f77_int m, const f77_int n); @@ -74,6 +76,7 @@ void AOCL_DTL_log_gemmt_sizes(int8 loglevel, int line); void AOCL_DTL_log_gemmt_stats(int8 loglevel, + char dt_type, const f77_int n, const f77_int k); @@ -253,6 +256,7 @@ void AOCL_DTL_log_nrm2_sizes( int8 loglevel, int line); void AOCL_DTL_log_nrm2_stats(int8 loglevel, + char dt_type, const f77_int n); void AOCL_DTL_log_amax_sizes ( int8 loglevel, @@ -401,22 +405,22 @@ void AOCL_DTL_log_trmm_sizes(int8 loglevel, AOCL_DTL_log_gemm_sizes(loglevel, dt, transa, transb, m, n, k, alpha, lda, ldb, beta, ldc, \ __FILE__, __FUNCTION__, __LINE__); -#define AOCL_DTL_LOG_GEMM_STATS(loglevel, m, n, k) \ +#define AOCL_DTL_LOG_GEMM_STATS(loglevel, dt_type, m, n, k) \ if (gbIsLoggingEnabled) \ - AOCL_DTL_log_gemm_stats(loglevel, m, n, k); + AOCL_DTL_log_gemm_stats(loglevel, dt_type, m, n, k); -#define AOCL_DTL_LOG_GEMMT_STATS(loglevel, n, k) \ +#define AOCL_DTL_LOG_GEMMT_STATS(loglevel, dt_type, n, k) \ if (gbIsLoggingEnabled) \ - AOCL_DTL_log_gemmt_stats(loglevel, n, k); + AOCL_DTL_log_gemmt_stats(loglevel, dt_type, n, k); #define AOCL_DTL_LOG_TRSM_INPUTS(loglevel, dt, side, uploa, transa, diaga, m, n, alpha, lda, ldb) \ if (gbIsLoggingEnabled) \ AOCL_DTL_log_trsm_sizes(loglevel, dt, side, uploa, transa, diaga, m, n, alpha, lda, ldb, \ __FILE__, __FUNCTION__, __LINE__); -#define AOCL_DTL_LOG_TRSM_STATS(loglevel, side, m, n) \ +#define AOCL_DTL_LOG_TRSM_STATS(loglevel, dt_type, side, m, n) \ if (gbIsLoggingEnabled) \ - AOCL_DTL_log_trsm_stats(loglevel, side, m, n); + AOCL_DTL_log_trsm_stats(loglevel, dt_type, side, m, n); #define AOCL_DTL_LOG_GEMMT_INPUTS(loglevel, dt, uplo, transa, transb, n, k, alpha, lda, ldb, beta, ldc) \ if (gbIsLoggingEnabled) \ @@ -480,9 +484,9 @@ void AOCL_DTL_log_trmm_sizes(int8 loglevel, if (gbIsLoggingEnabled) \ AOCL_DTL_log_nrm2_sizes(loglevel, dt_type, n, incx, __FILE__,__FUNCTION__,__LINE__); -#define AOCL_DTL_LOG_NRM2_STATS(loglevel, n) \ +#define AOCL_DTL_LOG_NRM2_STATS(loglevel, dt_type, n) \ if (gbIsLoggingEnabled) \ - AOCL_DTL_log_nrm2_stats(loglevel, n); + AOCL_DTL_log_nrm2_stats(loglevel, dt_type, n); #define AOCL_DTL_LOG_HEMV_INPUTS(loglevel, dt_type, uploa, m, alpha, lda, incx, beta, incy) \ if (gbIsLoggingEnabled) \ @@ -555,15 +559,15 @@ void AOCL_DTL_log_trmm_sizes(int8 loglevel, #define AOCL_DTL_LOG_GEMM_INPUTS(loglevel, dt, transa, transb, m, n, k, alpha, lda, ldb, beta, ldc) -#define AOCL_DTL_LOG_GEMM_STATS(loglevel, m, n, k) +#define AOCL_DTL_LOG_GEMM_STATS(loglevel, dt_type, m, n, k) #define AOCL_DTL_LOG_TRSM_INPUTS(loglevel, dt, side, uploa, transa, diaga, m, n, alpha, lda, ldb) -#define AOCL_DTL_LOG_TRSM_STATS(loglevel, side, m, n) +#define AOCL_DTL_LOG_TRSM_STATS(loglevel, dt_type, side, m, n) #define AOCL_DTL_LOG_GEMMT_INPUTS(loglevel, dt, uplo, transa, transb, n, k, alpha, lda, ldb, beta, ldc) -#define AOCL_DTL_LOG_GEMMT_STATS(loglevel, n, k) +#define AOCL_DTL_LOG_GEMMT_STATS(loglevel, dt_type, n, k) #define AOCL_DTL_LOG_HEMM_INPUTS(loglevel, dt_type, side, uplo, m, n, alpha, lda, ldb, beta, ldc) @@ -589,7 +593,7 @@ void AOCL_DTL_log_trmm_sizes(int8 loglevel, #define AOCL_DTL_LOG_NRM2_INPUTS(loglevel, dt_type, n, incx) -#define AOCL_DTL_LOG_NRM2_STATS(loglevel, n) +#define AOCL_DTL_LOG_NRM2_STATS(loglevel, dt_type, n) #define AOCL_DTL_LOG_HEMV_INPUTS(loglevel, dt_type, uploa, m, alpha, lda, incx, beta, incy) diff --git a/frame/compat/bla_gemm.c b/frame/compat/bla_gemm.c index e7576096c..b3d322370 100644 --- a/frame/compat/bla_gemm.c +++ b/frame/compat/bla_gemm.c @@ -91,7 +91,7 @@ void PASTEF77S(ch,blasname) \ if ( *m == 0 || *n == 0 || (( PASTEMAC(ch,eq0)( *alpha ) || *k == 0) \ && PASTEMAC(ch,eq1)( *beta ) )) \ { \ - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); \ + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *m, *n, *k); \ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ /* Finalize BLIS. */ \ bli_finalize_auto(); \ @@ -117,7 +117,7 @@ void PASTEF77S(ch,blasname) \ NULL, NULL \ ); \ \ - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); \ + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *m, *n, *k); \ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ /* Finalize BLIS. */ \ bli_finalize_auto(); \ @@ -158,7 +158,7 @@ void PASTEF77S(ch,blasname) \ NULL \ ); \ \ - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k);\ + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *m, *n, *k);\ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ /* Finalize BLIS. */ \ bli_finalize_auto(); \ @@ -235,7 +235,7 @@ void PASTEF77S(ch,blasname) \ if ( *m == 0 || *n == 0 || (( PASTEMAC(ch,eq0)( *alpha ) || *k == 0) \ && PASTEMAC(ch,eq1)( *beta ) )) \ { \ - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); \ + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *m, *n, *k); \ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ /* Finalize BLIS. */ \ bli_finalize_auto(); \ @@ -261,7 +261,7 @@ void PASTEF77S(ch,blasname) \ NULL, NULL \ ); \ \ - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); \ + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *m, *n, *k); \ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ /* Finalize BLIS. */ \ bli_finalize_auto(); \ @@ -315,7 +315,7 @@ void PASTEF77S(ch,blasname) \ NULL \ ); \ } \ - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); \ + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *m, *n, *k); \ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ /* Finalize BLIS. */ \ bli_finalize_auto(); \ @@ -351,7 +351,7 @@ void PASTEF77S(ch,blasname) \ NULL \ ); \ } \ - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); \ + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *m, *n, *k); \ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ /* Finalize BLIS. */ \ bli_finalize_auto(); \ @@ -390,7 +390,7 @@ void PASTEF77S(ch,blasname) \ NULL \ ); \ \ - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); \ + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *m, *n, *k); \ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ /* Finalize BLIS. */ \ bli_finalize_auto(); \ @@ -463,7 +463,7 @@ void dzgemm_ if ( *m == 0 || *n == 0 || (( PASTEMAC(z,eq0)( *alpha ) || *k == 0) && PASTEMAC(z,eq1)( *beta ) )) { - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(z), *m, *n, *k); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); /* Finalize BLIS. */ bli_finalize_auto(); @@ -489,7 +489,7 @@ void dzgemm_ NULL, NULL ); - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(z), *m, *n, *k); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); /* Finalize BLIS. */ bli_finalize_auto(); @@ -542,7 +542,7 @@ void dzgemm_ bli_gemmnat(&alphao, &ao, &bo, &betao, &co, NULL, NULL); - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(z), *m, *n, *k); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); /* Finalize BLIS. */ bli_finalize_auto(); diff --git a/frame/compat/bla_gemm_amd.c b/frame/compat/bla_gemm_amd.c index 0cb0afa40..decd7e1aa 100644 --- a/frame/compat/bla_gemm_amd.c +++ b/frame/compat/bla_gemm_amd.c @@ -91,7 +91,7 @@ void PASTEF77S(ch,blasname) \ if ( *m == 0 || *n == 0 || (( PASTEMAC(ch,eq0)( *alpha ) || *k == 0) \ && PASTEMAC(ch,eq1)( *beta ) )) \ { \ - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); \ + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *m, *n, *k); \ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ /* Finalize BLIS. */ \ bli_finalize_auto(); \ @@ -117,7 +117,7 @@ void PASTEF77S(ch,blasname) \ NULL, NULL \ ); \ \ - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); \ + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *m, *n, *k); \ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ /* Finalize BLIS. */ \ bli_finalize_auto(); \ @@ -158,7 +158,7 @@ void PASTEF77S(ch,blasname) \ NULL \ ); \ \ - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k);\ + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *m, *n, *k);\ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ /* Finalize BLIS. */ \ bli_finalize_auto(); \ @@ -236,7 +236,7 @@ void PASTEF77S(ch,blasname) \ if ( *m == 0 || *n == 0 || (( PASTEMAC(ch,eq0)( *alpha ) || *k == 0) \ && PASTEMAC(ch,eq1)( *beta ) )) \ { \ - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); \ + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *m, *n, *k); \ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ /* Finalize BLIS. */ \ bli_finalize_auto(); \ @@ -262,7 +262,7 @@ void PASTEF77S(ch,blasname) \ NULL, NULL \ ); \ \ - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); \ + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *m, *n, *k); \ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ /* Finalize BLIS. */ \ bli_finalize_auto(); \ @@ -316,7 +316,7 @@ void PASTEF77S(ch,blasname) \ NULL \ ); \ } \ - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); \ + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *m, *n, *k); \ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ /* Finalize BLIS. */ \ bli_finalize_auto(); \ @@ -352,7 +352,7 @@ void PASTEF77S(ch,blasname) \ NULL \ ); \ } \ - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); \ + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *m, *n, *k); \ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ /* Finalize BLIS. */ \ bli_finalize_auto(); \ @@ -391,7 +391,7 @@ void PASTEF77S(ch,blasname) \ NULL \ ); \ \ - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); \ + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *m, *n, *k); \ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ /* Finalize BLIS. */ \ bli_finalize_auto(); \ @@ -461,7 +461,7 @@ void dgemm_blis_impl /* Quick return if possible. */ if ( *m == 0 || *n == 0 || ((*alpha == 0.0 || *k == 0) && *beta == 1.0)) { - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(d), *m, *n, *k); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); /* Finalize BLIS. */ bli_finalize_auto(); @@ -487,7 +487,7 @@ void dgemm_blis_impl NULL, NULL ); - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(d), *m, *n, *k); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); /* Finalize BLIS. */ bli_finalize_auto(); @@ -555,7 +555,7 @@ void dgemm_blis_impl NULL ); - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(d), *m, *n, *k); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); /* Finalize BLIS. */ bli_finalize_auto(); @@ -571,7 +571,7 @@ void dgemm_blis_impl (double*)beta, c, *ldc ); - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(d), *m, *n, *k); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); /* Finalize BLIS */ bli_finalize_auto(); @@ -609,7 +609,7 @@ void dgemm_blis_impl ); } - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(d), *m, *n, *k); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); /* Finalize BLIS */ bli_finalize_auto(); @@ -645,7 +645,7 @@ void dgemm_blis_impl ((void*)0) ); } - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(d), *m, *n, *k); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); /* Finalize BLIS */ bli_finalize_auto(); @@ -698,7 +698,7 @@ void dgemm_blis_impl NULL, NULL ); - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(d), *m, *n, *k); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); /* Finalize BLIS. */ @@ -741,7 +741,7 @@ void dgemm_blis_impl if (status == BLIS_SUCCESS) { - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(d), *m, *n, *k); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); /* Finalize BLIS. */ bli_finalize_auto(); @@ -754,7 +754,7 @@ void dgemm_blis_impl err_t status = bli_gemmsup(&alphao, &ao, &bo, &betao, &co, NULL, NULL); if (status == BLIS_SUCCESS) { - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(d), *m, *n, *k); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); /* Finalize BLIS */ bli_finalize_auto(); @@ -776,7 +776,7 @@ void dgemm_blis_impl /* NULL */ /* ); */ - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(d), *m, *n, *k); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); /* Finalize BLIS. */ bli_finalize_auto(); @@ -843,7 +843,7 @@ void zgemm_blis_impl if ( *m == 0 || *n == 0 || (( PASTEMAC(z,eq0)( *alpha ) || *k == 0) && PASTEMAC(z,eq1)( *beta ) )) { - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(z), *m, *n, *k); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); /* Finalize BLIS. */ bli_finalize_auto(); @@ -869,7 +869,7 @@ void zgemm_blis_impl NULL, NULL ); - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(z), *m, *n, *k); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); /* Finalize BLIS. */ bli_finalize_auto(); @@ -928,7 +928,7 @@ void zgemm_blis_impl ); } - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(z), *m, *n, *k); bli_finalize_auto(); return; } @@ -965,7 +965,7 @@ void zgemm_blis_impl ); } - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(z), *m, *n, *k); bli_finalize_auto(); return; } @@ -1019,7 +1019,7 @@ void zgemm_blis_impl NULL ); - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(z), *m, *n, *k); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); /* Finalize BLIS. */ bli_finalize_auto(); @@ -1044,7 +1044,7 @@ void zgemm_blis_impl c, *ldc ); - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(z), *m, *n, *k); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); /* Finalize BLIS */ bli_finalize_auto(); @@ -1108,7 +1108,7 @@ void zgemm_blis_impl if (status == BLIS_SUCCESS) { - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(z), *m, *n, *k); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); /* Finalize BLIS. */ bli_finalize_auto(); @@ -1120,7 +1120,7 @@ void zgemm_blis_impl err_t status = bli_gemmsup(&alphao, &ao, &bo, &betao, &co, NULL, NULL); if (status == BLIS_SUCCESS) { - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(z), *m, *n, *k); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); /* Finalize BLIS. */ bli_finalize_auto(); @@ -1130,7 +1130,7 @@ void zgemm_blis_impl // fall back on native path when zgemm is not handled in sup path. bli_gemmnat(&alphao, &ao, &bo, &betao, &co, NULL, NULL); - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(z), *m, *n, *k); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); /* Finalize BLIS. */ bli_finalize_auto(); @@ -1200,7 +1200,7 @@ void dzgemm_blis_impl if ( *m == 0 || *n == 0 || (( PASTEMAC(z,eq0)( *alpha ) || *k == 0) && PASTEMAC(z,eq1)( *beta ) )) { - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(z), *m, *n, *k); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); /* Finalize BLIS. */ bli_finalize_auto(); @@ -1226,7 +1226,7 @@ void dzgemm_blis_impl NULL, NULL ); - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(z), *m, *n, *k); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); /* Finalize BLIS. */ bli_finalize_auto(); @@ -1278,7 +1278,7 @@ void dzgemm_blis_impl // fall back on native path when zgemm is not handled in sup path. bli_gemmnat(&alphao, &ao, &bo, &betao, &co, NULL, NULL); - AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *m, *n, *k); + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(z), *m, *n, *k); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); /* Finalize BLIS. */ bli_finalize_auto(); diff --git a/frame/compat/bla_gemmt.c b/frame/compat/bla_gemmt.c index e2a25321e..815cab737 100644 --- a/frame/compat/bla_gemmt.c +++ b/frame/compat/bla_gemmt.c @@ -89,7 +89,7 @@ void PASTEF77S(ch,blasname) \ if ( *n == 0 || (( PASTEMAC(ch,eq0)( *alpha ) || *k == 0) \ && PASTEMAC(ch,eq1)( *beta ) )) \ { \ - AOCL_DTL_LOG_GEMMT_STATS(AOCL_DTL_LEVEL_TRACE_1, *n, *k); \ + AOCL_DTL_LOG_GEMMT_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *n, *k); \ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ /* Finalize BLIS. */ \ bli_finalize_auto(); \ @@ -130,7 +130,7 @@ void PASTEF77S(ch,blasname) \ NULL \ ); \ \ - AOCL_DTL_LOG_GEMMT_STATS(AOCL_DTL_LEVEL_TRACE_1, *n, *k); \ + AOCL_DTL_LOG_GEMMT_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *n, *k); \ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1) \ /* Finalize BLIS. */ \ bli_finalize_auto(); \ @@ -203,7 +203,7 @@ void PASTEF77S(ch,blasname) \ if ( *n == 0 || (( PASTEMAC(ch,eq0)( *alpha ) || *k == 0) \ && PASTEMAC(ch,eq1)( *beta ) )) \ { \ - AOCL_DTL_LOG_GEMMT_STATS(AOCL_DTL_LEVEL_TRACE_1, *n, *k); \ + AOCL_DTL_LOG_GEMMT_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *n, *k); \ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ /* Finalize BLIS. */ \ bli_finalize_auto(); \ @@ -263,7 +263,7 @@ void PASTEF77S(ch,blasname) \ NULL \ ); \ \ - AOCL_DTL_LOG_GEMMT_STATS(AOCL_DTL_LEVEL_TRACE_1, *n, *k); \ + AOCL_DTL_LOG_GEMMT_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *n, *k); \ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO) \ /* Finalize BLIS. */ \ bli_finalize_auto(); \ diff --git a/frame/compat/bla_nrm2.c b/frame/compat/bla_nrm2.c index e17baf282..89a17f7f8 100755 --- a/frame/compat/bla_nrm2.c +++ b/frame/compat/bla_nrm2.c @@ -75,7 +75,7 @@ ftype_r PASTEF772S(chr,chx,blasname) \ NULL \ ); \ \ - AOCL_DTL_LOG_NRM2_STATS(AOCL_DTL_LEVEL_TRACE_1, *n); \ + AOCL_DTL_LOG_NRM2_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(chx), *n); \ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1) \ /* Finalize BLIS. */ \ bli_finalize_auto(); \ diff --git a/frame/compat/bla_trsm_amd.c b/frame/compat/bla_trsm_amd.c index 382989b62..0e627f783 100644 --- a/frame/compat/bla_trsm_amd.c +++ b/frame/compat/bla_trsm_amd.c @@ -58,7 +58,10 @@ void PASTEF77S(ch,blasname) \ ftype* b, const f77_int* ldb \ ) \ { \ - AOCL_DTL_TRACE_ENTRY(AOCL_DTL_LEVEL_INFO) \ + AOCL_DTL_TRACE_ENTRY(AOCL_DTL_LEVEL_INFO) \ + AOCL_DTL_LOG_TRSM_INPUTS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), \ + *side, *uploa,*transa, *diaga, *m, *n, \ + (void*)alpha,*lda, *ldb); \ \ side_t blis_side; \ uplo_t blis_uploa; \ @@ -89,7 +92,7 @@ void PASTEF77S(ch,blasname) \ /* Quick return if possible. */ \ if ( *m == 0 || *n == 0 ) \ { \ - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); \ + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *side, *m, *n); \ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); \ /* Finalize BLIS. */ \ bli_finalize_auto(); \ @@ -124,7 +127,7 @@ void PASTEF77S(ch,blasname) \ (ftype*) b, rs_b, cs_b, \ NULL, NULL \ ); \ - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); \ + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *side, *m, *n); \ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1) \ /* Finalize BLIS. */ \ bli_finalize_auto(); \ @@ -147,7 +150,7 @@ void PASTEF77S(ch,blasname) \ NULL \ ); \ \ - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); \ + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *side, *m, *n); \ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO) \ /* Finalize BLIS. */ \ bli_finalize_auto(); \ @@ -219,7 +222,7 @@ void PASTEF77S(ch,blasname) \ /* Quick return if possible. */ \ if ( *m == 0 || *n == 0 ) \ { \ - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); \ + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *side, *m, *n); \ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); \ /* Finalize BLIS. */ \ bli_finalize_auto(); \ @@ -255,7 +258,7 @@ void PASTEF77S(ch,blasname) \ (ftype*) b, rs_b, cs_b, \ NULL, NULL \ ); \ - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); \ + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *side, *m, *n); \ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1) \ /* Finalize BLIS. */ \ bli_finalize_auto(); \ @@ -304,7 +307,7 @@ void PASTEF77S(ch,blasname) \ (ftype*)b, rs_b, \ NULL \ ); \ - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); \ + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *side, *m, *n); \ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO) \ return; \ } \ @@ -321,7 +324,7 @@ void PASTEF77S(ch,blasname) \ (ftype*)b, rs_b, \ NULL \ ); \ - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); \ + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *side, *m, *n); \ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO) \ return; \ } \ @@ -347,7 +350,7 @@ void PASTEF77S(ch,blasname) \ PASTEMAC(ch,invscals)( a_conj, b[indx] ); \ } \ }\ - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); \ + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *side, *m, *n); \ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO) \ return; \ } \ @@ -371,7 +374,7 @@ void PASTEF77S(ch,blasname) \ (ftype*)a, cs_a, rs_a, \ (ftype*)b, cs_b, \ NULL); \ - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); \ + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *side, *m, *n); \ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO) \ return; \ } \ @@ -390,7 +393,7 @@ void PASTEF77S(ch,blasname) \ (ftype*)a, cs_a, rs_a, \ (ftype*)b, cs_b, \ NULL); \ - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); \ + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *side, *m, *n); \ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO) \ return; \ } \ @@ -416,7 +419,7 @@ void PASTEF77S(ch,blasname) \ PASTEMAC(ch,invscals)( a_conj, b[indx*cs_b] ); \ }\ } \ - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); \ + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *side, *m, *n); \ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO) \ return; \ } \ @@ -453,7 +456,7 @@ void PASTEF77S(ch,blasname) \ NULL \ ); \ \ - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); \ + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(ch), *side, *m, *n); \ AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO) \ /* Finalize BLIS. */ \ bli_finalize_auto(); \ @@ -491,7 +494,7 @@ void strsm_blis_impl ) { AOCL_DTL_TRACE_ENTRY(AOCL_DTL_LEVEL_INFO) - AOCL_DTL_LOG_TRSM_INPUTS(AOCL_DTL_LEVEL_TRACE_1, 's', + AOCL_DTL_LOG_TRSM_INPUTS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(s), *side, *uploa,*transa, *diaga, *m, *n, (void*)alpha,*lda, *ldb); @@ -523,7 +526,7 @@ void strsm_blis_impl /* Quick return if possible. */ if ( *m == 0 || *n == 0 ) { - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(s), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); /* Finalize BLIS. */ bli_finalize_auto(); @@ -559,7 +562,7 @@ void strsm_blis_impl (float*) b, rs_b, cs_b, NULL, NULL ); - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(s), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1) /* Finalize BLIS. */ bli_finalize_auto(); @@ -583,7 +586,7 @@ void strsm_blis_impl (float*)b, rs_b, NULL ); - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(s), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); return; } @@ -600,7 +603,7 @@ void strsm_blis_impl (float*)b, rs_b, NULL ); - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(s), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); return; } @@ -625,7 +628,7 @@ void strsm_blis_impl b[indx] = ( inva * b[indx] ); } } - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(s), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); return; } @@ -652,7 +655,7 @@ void strsm_blis_impl (float*)b, cs_b, NULL ); - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(s), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); return; } @@ -674,7 +677,7 @@ void strsm_blis_impl (float*)b, cs_b, NULL ); - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(s), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); return; } @@ -699,7 +702,7 @@ void strsm_blis_impl b[indx*cs_b] = (inva * b[indx*cs_b] ); } } - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(s), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); return; } @@ -751,7 +754,7 @@ void strsm_blis_impl ); if (status == BLIS_SUCCESS) { - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(s), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); /* Finalize BLIS. */ bli_finalize_auto(); @@ -771,7 +774,7 @@ void strsm_blis_impl NULL ); - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(s), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO) /* Finalize BLIS. */ bli_finalize_auto(); @@ -807,7 +810,7 @@ void dtrsm_blis_impl ) { AOCL_DTL_TRACE_ENTRY(AOCL_DTL_LEVEL_INFO) - AOCL_DTL_LOG_TRSM_INPUTS(AOCL_DTL_LEVEL_TRACE_1, 'd', + AOCL_DTL_LOG_TRSM_INPUTS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(d), *side, *uploa,*transa, *diaga, *m, *n, (void*)alpha,*lda, *ldb); @@ -839,7 +842,7 @@ void dtrsm_blis_impl /* Quick return if possible. */ if ( *m == 0 || *n == 0 ) { - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(d), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); /* Finalize BLIS. */ bli_finalize_auto(); @@ -875,7 +878,7 @@ void dtrsm_blis_impl (double*) b, rs_b, cs_b, NULL, NULL ); - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(d), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1) /* Finalize BLIS. */ bli_finalize_auto(); @@ -899,7 +902,7 @@ void dtrsm_blis_impl (double*)b, rs_b, NULL ); - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(d), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); return; } @@ -916,7 +919,7 @@ void dtrsm_blis_impl (double*)b, rs_b, NULL ); - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(d), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); return; } @@ -941,7 +944,7 @@ void dtrsm_blis_impl b[indx] = ( inva * b[indx] ); } } - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(d), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); return; } @@ -968,7 +971,7 @@ void dtrsm_blis_impl (double*)b, cs_b, NULL ); - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(d), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); return; } @@ -990,7 +993,7 @@ void dtrsm_blis_impl (double*)b, cs_b, NULL ); - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(d), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); return; } @@ -1015,7 +1018,7 @@ void dtrsm_blis_impl b[indx*cs_b] = (inva * b[indx*cs_b] ); } } - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(d), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); return; } @@ -1137,7 +1140,7 @@ void dtrsm_blis_impl } if (status == BLIS_SUCCESS) { - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(d), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); /* Finalize BLIS. */ bli_finalize_auto(); @@ -1155,7 +1158,7 @@ void dtrsm_blis_impl NULL, NULL ); - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(d), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO) /* Finalize BLIS. */ bli_finalize_auto(); @@ -1192,7 +1195,7 @@ void ztrsm_blis_impl ) { AOCL_DTL_TRACE_ENTRY(AOCL_DTL_LEVEL_INFO) - AOCL_DTL_LOG_TRSM_INPUTS(AOCL_DTL_LEVEL_TRACE_1, 'z', + AOCL_DTL_LOG_TRSM_INPUTS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(z), *side, *uploa,*transa, *diaga, *m, *n, (void*)alpha,*lda, *ldb); @@ -1224,7 +1227,7 @@ void ztrsm_blis_impl /* Quick return if possible. */ if ( *m == 0 || *n == 0 ) { - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(z), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); /* Finalize BLIS. */ bli_finalize_auto(); @@ -1260,7 +1263,7 @@ void ztrsm_blis_impl (dcomplex*) b, rs_b, cs_b, NULL, NULL ); - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(z), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1) /* Finalize BLIS. */ bli_finalize_auto(); @@ -1284,7 +1287,7 @@ void ztrsm_blis_impl (dcomplex*)b, rs_b, NULL ); - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(z), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); return; } @@ -1301,7 +1304,7 @@ void ztrsm_blis_impl (dcomplex*)b, rs_b, NULL ); - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(z), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); return; } @@ -1356,7 +1359,7 @@ void ztrsm_blis_impl } - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(z), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); return; } @@ -1383,7 +1386,7 @@ void ztrsm_blis_impl (dcomplex*)b, cs_b, NULL ); - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(z), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); return; } @@ -1405,7 +1408,7 @@ void ztrsm_blis_impl (dcomplex*)b, cs_b, NULL ); - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(z), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); return; } @@ -1459,7 +1462,7 @@ void ztrsm_blis_impl } } - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(z), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); return; @@ -1514,7 +1517,7 @@ void ztrsm_blis_impl ); if (status == BLIS_SUCCESS) { - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(z), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); /* Finalize BLIS. */ bli_finalize_auto(); @@ -1534,7 +1537,7 @@ void ztrsm_blis_impl NULL ); - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(z), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO) /* Finalize BLIS. */ bli_finalize_auto(); @@ -1571,7 +1574,7 @@ void ctrsm_blis_impl ) { AOCL_DTL_TRACE_ENTRY(AOCL_DTL_LEVEL_INFO) - AOCL_DTL_LOG_TRSM_INPUTS(AOCL_DTL_LEVEL_TRACE_1, 'c', + AOCL_DTL_LOG_TRSM_INPUTS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(c), *side, *uploa,*transa, *diaga, *m, *n, (void*)alpha,*lda, *ldb); @@ -1603,7 +1606,7 @@ void ctrsm_blis_impl /* Quick return if possible. */ if ( *m == 0 || *n == 0 ) { - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(c), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); /* Finalize BLIS. */ bli_finalize_auto(); @@ -1639,7 +1642,7 @@ void ctrsm_blis_impl (scomplex*) b, rs_b, cs_b, NULL, NULL ); - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(c), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1) /* Finalize BLIS. */ bli_finalize_auto(); @@ -1663,7 +1666,7 @@ void ctrsm_blis_impl (scomplex*)b, rs_b, NULL ); - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(c), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); return; } @@ -1680,7 +1683,7 @@ void ctrsm_blis_impl (scomplex*)b, rs_b, NULL ); - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(c), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); return; } @@ -1734,7 +1737,7 @@ void ctrsm_blis_impl } } - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(c), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); return; @@ -1762,7 +1765,7 @@ void ctrsm_blis_impl (scomplex*)b, cs_b, NULL ); - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(c), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); return; } @@ -1784,7 +1787,7 @@ void ctrsm_blis_impl (scomplex*)b, cs_b, NULL ); - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(c), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); return; } @@ -1838,7 +1841,7 @@ void ctrsm_blis_impl } } - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(c), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); return; } @@ -1891,7 +1894,7 @@ void ctrsm_blis_impl ); if (status == BLIS_SUCCESS) { - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(c), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO); /* Finalize BLIS. */ bli_finalize_auto(); @@ -1911,7 +1914,7 @@ void ctrsm_blis_impl NULL ); - AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *side, *m, *n); + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *MKSTR(c), *side, *m, *n); AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_INFO) /* Finalize BLIS. */ bli_finalize_auto(); diff --git a/frame/compat/check/bla_gemm3m_check.h b/frame/compat/check/bla_gemm3m_check.h index b5a2887ce..ffb70bbdd 100644 --- a/frame/compat/check/bla_gemm3m_check.h +++ b/frame/compat/check/bla_gemm3m_check.h @@ -78,6 +78,11 @@ bli_string_mkupper( func_str ); \ \ PASTE_XERBLA( func_str, &info, (ftnlen)6 ); \ +\ + AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ +\ + /* Finalize BLIS. */ \ + bli_finalize_auto(); \ \ return; \ } \ diff --git a/frame/compat/check/bla_gemm_check.h b/frame/compat/check/bla_gemm_check.h index 8b68b22e0..ca2add8bc 100644 --- a/frame/compat/check/bla_gemm_check.h +++ b/frame/compat/check/bla_gemm_check.h @@ -79,6 +79,12 @@ bli_string_mkupper( func_str ); \ \ PASTE_XERBLA( func_str, &info, (ftnlen)6 ); \ +\ + AOCL_DTL_LOG_GEMM_STATS(AOCL_DTL_LEVEL_TRACE_1, *dt_str, *m, *n, *k); \ + AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ +\ + /* Finalize BLIS. */ \ + bli_finalize_auto(); \ \ return; \ } \ diff --git a/frame/compat/check/bla_gemmt_check.h b/frame/compat/check/bla_gemmt_check.h index fb81c7073..5ba66ee00 100644 --- a/frame/compat/check/bla_gemmt_check.h +++ b/frame/compat/check/bla_gemmt_check.h @@ -82,6 +82,12 @@ bli_string_mkupper( func_str ); \ \ PASTE_XERBLA( func_str, &info, (ftnlen)6 ); \ +\ + AOCL_DTL_LOG_GEMMT_STATS(AOCL_DTL_LEVEL_TRACE_1, *dt_str, *n, *k); \ + AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ +\ + /* Finalize BLIS. */ \ + bli_finalize_auto(); \ \ return; \ } \ diff --git a/frame/compat/check/bla_gemv_check.h b/frame/compat/check/bla_gemv_check.h index 33b0665f5..6d93cc7ee 100644 --- a/frame/compat/check/bla_gemv_check.h +++ b/frame/compat/check/bla_gemv_check.h @@ -64,6 +64,11 @@ bli_string_mkupper( func_str ); \ \ PASTE_XERBLA( func_str, &info, (ftnlen)6 ); \ +\ + AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ +\ + /* Finalize BLIS. */ \ + bli_finalize_auto(); \ \ return; \ } \ diff --git a/frame/compat/check/bla_ger_check.h b/frame/compat/check/bla_ger_check.h index cd2f4c8de..17719702c 100644 --- a/frame/compat/check/bla_ger_check.h +++ b/frame/compat/check/bla_ger_check.h @@ -59,6 +59,11 @@ bli_string_mkupper( func_str ); \ \ PASTE_XERBLA( func_str, &info, (ftnlen)6 ); \ +\ + AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ +\ + /* Finalize BLIS. */ \ + bli_finalize_auto(); \ \ return; \ } \ diff --git a/frame/compat/check/bla_hemm_check.h b/frame/compat/check/bla_hemm_check.h index 342f485f9..f2a9879aa 100644 --- a/frame/compat/check/bla_hemm_check.h +++ b/frame/compat/check/bla_hemm_check.h @@ -72,6 +72,11 @@ bli_string_mkupper( func_str ); \ \ PASTE_XERBLA( func_str, &info, (ftnlen)6 ); \ +\ + AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ +\ + /* Finalize BLIS. */ \ + bli_finalize_auto(); \ \ return; \ } \ diff --git a/frame/compat/check/bla_hemv_check.h b/frame/compat/check/bla_hemv_check.h index 716d434f2..e000df953 100644 --- a/frame/compat/check/bla_hemv_check.h +++ b/frame/compat/check/bla_hemv_check.h @@ -61,6 +61,11 @@ bli_string_mkupper( func_str ); \ \ PASTE_XERBLA( func_str, &info, (ftnlen)6 ); \ +\ + AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ +\ + /* Finalize BLIS. */ \ + bli_finalize_auto(); \ \ return; \ } \ diff --git a/frame/compat/check/bla_her2_check.h b/frame/compat/check/bla_her2_check.h index f9e100612..a3bc1f8c7 100644 --- a/frame/compat/check/bla_her2_check.h +++ b/frame/compat/check/bla_her2_check.h @@ -61,6 +61,11 @@ bli_string_mkupper( func_str ); \ \ PASTE_XERBLA( func_str, &info, (ftnlen)6 ); \ +\ + AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ +\ + /* Finalize BLIS. */ \ + bli_finalize_auto(); \ \ return; \ } \ diff --git a/frame/compat/check/bla_her2k_check.h b/frame/compat/check/bla_her2k_check.h index 631977d24..67df79cc1 100644 --- a/frame/compat/check/bla_her2k_check.h +++ b/frame/compat/check/bla_her2k_check.h @@ -72,6 +72,11 @@ bli_string_mkupper( func_str ); \ \ PASTE_XERBLA( func_str, &info, (ftnlen)6 ); \ +\ + AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ +\ + /* Finalize BLIS. */ \ + bli_finalize_auto(); \ \ return; \ } \ diff --git a/frame/compat/check/bla_her_check.h b/frame/compat/check/bla_her_check.h index 4120f8bf9..1a30961fe 100644 --- a/frame/compat/check/bla_her_check.h +++ b/frame/compat/check/bla_her_check.h @@ -59,6 +59,11 @@ bli_string_mkupper( func_str ); \ \ PASTE_XERBLA( func_str, &info, (ftnlen)6 ); \ +\ + AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ +\ + /* Finalize BLIS. */ \ + bli_finalize_auto(); \ \ return; \ } \ diff --git a/frame/compat/check/bla_herk_check.h b/frame/compat/check/bla_herk_check.h index dca231441..39ef7e529 100644 --- a/frame/compat/check/bla_herk_check.h +++ b/frame/compat/check/bla_herk_check.h @@ -70,6 +70,11 @@ bli_string_mkupper( func_str ); \ \ PASTE_XERBLA( func_str, &info, (ftnlen)6 ); \ +\ + AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ +\ + /* Finalize BLIS. */ \ + bli_finalize_auto(); \ \ return; \ } \ diff --git a/frame/compat/check/bla_syr2k_check.h b/frame/compat/check/bla_syr2k_check.h index 66bffae1b..cf420f704 100644 --- a/frame/compat/check/bla_syr2k_check.h +++ b/frame/compat/check/bla_syr2k_check.h @@ -77,6 +77,11 @@ bli_string_mkupper( func_str ); \ \ PASTE_XERBLA( func_str, &info, (ftnlen)6 ); \ +\ + AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ +\ + /* Finalize BLIS. */ \ + bli_finalize_auto(); \ \ return; \ } \ diff --git a/frame/compat/check/bla_syrk_check.h b/frame/compat/check/bla_syrk_check.h index 8a42eaae3..bdbd43dfc 100644 --- a/frame/compat/check/bla_syrk_check.h +++ b/frame/compat/check/bla_syrk_check.h @@ -75,6 +75,11 @@ bli_string_mkupper( func_str ); \ \ PASTE_XERBLA( func_str, &info, (ftnlen)6 ); \ +\ + AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ +\ + /* Finalize BLIS. */ \ + bli_finalize_auto(); \ \ return; \ } \ diff --git a/frame/compat/check/bla_trmm_check.h b/frame/compat/check/bla_trmm_check.h index af9d8ce49..4cb050da2 100644 --- a/frame/compat/check/bla_trmm_check.h +++ b/frame/compat/check/bla_trmm_check.h @@ -81,6 +81,11 @@ bli_string_mkupper( func_str ); \ \ PASTE_XERBLA( func_str, &info, (ftnlen)6 ); \ +\ + AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ +\ + /* Finalize BLIS. */ \ + bli_finalize_auto(); \ \ return; \ } \ diff --git a/frame/compat/check/bla_trmv_check.h b/frame/compat/check/bla_trmv_check.h index e4577738f..b1fb4faf8 100644 --- a/frame/compat/check/bla_trmv_check.h +++ b/frame/compat/check/bla_trmv_check.h @@ -70,6 +70,11 @@ bli_string_mkupper( func_str ); \ \ PASTE_XERBLA( func_str, &info, (ftnlen)6 ); \ +\ + AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ +\ + /* Finalize BLIS. */ \ + bli_finalize_auto(); \ \ return; \ } \ diff --git a/frame/compat/check/bla_trsm_check.h b/frame/compat/check/bla_trsm_check.h index 2372770bc..2ab7bca1f 100644 --- a/frame/compat/check/bla_trsm_check.h +++ b/frame/compat/check/bla_trsm_check.h @@ -33,4 +33,61 @@ */ -#define bla_trsm_check bla_trmm_check +#define bla_trsm_check( dt_str, op_str, sidea, uploa, transa, diaga, m, n, lda, ldb ) \ +{ \ + f77_int info = 0; \ + f77_int left, right; \ + f77_int lower, upper; \ + f77_int nota, ta, conja; \ + f77_int unita, nonua; \ + f77_int nrowa; \ +\ + left = PASTE_LSAME( sidea, "L", (ftnlen)1, (ftnlen)1 ); \ + right = PASTE_LSAME( sidea, "R", (ftnlen)1, (ftnlen)1 ); \ + lower = PASTE_LSAME( uploa, "L", (ftnlen)1, (ftnlen)1 ); \ + upper = PASTE_LSAME( uploa, "U", (ftnlen)1, (ftnlen)1 ); \ + nota = PASTE_LSAME( transa, "N", (ftnlen)1, (ftnlen)1 ); \ + ta = PASTE_LSAME( transa, "T", (ftnlen)1, (ftnlen)1 ); \ + conja = PASTE_LSAME( transa, "C", (ftnlen)1, (ftnlen)1 ); \ + unita = PASTE_LSAME( diaga, "U", (ftnlen)1, (ftnlen)1 ); \ + nonua = PASTE_LSAME( diaga, "N", (ftnlen)1, (ftnlen)1 ); \ +\ + if ( left ) { nrowa = *m; } \ + else { nrowa = *n; } \ +\ + if ( !left && !right ) \ + info = 1; \ + else if ( !lower && !upper ) \ + info = 2; \ + else if ( !nota && !ta && !conja ) \ + info = 3; \ + else if ( !unita && !nonua ) \ + info = 4; \ + else if ( *m < 0 ) \ + info = 5; \ + else if ( *n < 0 ) \ + info = 6; \ + else if ( *lda < bli_max( 1, nrowa ) ) \ + info = 9; \ + else if ( *ldb < bli_max( 1, *m ) ) \ + info = 11; \ +\ + if ( info != 0 ) \ + { \ + char func_str[ BLIS_MAX_BLAS_FUNC_STR_LENGTH ]; \ +\ + sprintf( func_str, "%s%-5s", dt_str, op_str ); \ +\ + bli_string_mkupper( func_str ); \ +\ + PASTE_XERBLA( func_str, &info, (ftnlen)6 ); \ +\ + AOCL_DTL_LOG_TRSM_STATS(AOCL_DTL_LEVEL_TRACE_1, *dt_str, *side, *m, *n); \ + AOCL_DTL_TRACE_EXIT(AOCL_DTL_LEVEL_TRACE_1); \ +\ + /* Finalize BLIS. */ \ + bli_finalize_auto(); \ +\ + return; \ + } \ +}