From 075143dfd92194647da9022c1a58511b20fc11f3 Mon Sep 17 00:00:00 2001 From: "Field G. Van Zee" Date: Thu, 14 Feb 2019 18:52:45 -0600 Subject: [PATCH 01/17] Added support for IC loop parallelism to trsm. Details: - Parallelism within the IC loop (3rd loop around the microkernel) is now supported within the trsm operation. This is done via a new branch on each of the control and thread trees, which guide execution of a new trsm-only subproblem from within bli_trsm_blk_var1(). This trsm subproblem corresponds to the macrokernel computation on only the block of A that contains the diagonal (labeled as A11 in algorithms with FLAME-like partitioning), and the corresponding row panel of C. During the trsm subproblem, all threads within the JC communicator participate and parallelize along the JR loop, including any parallelism that was specified for the IC loop. (IR loop parallelism is not supported for trsm due to inter-iteration dependencies.) After this trsm subproblem is complete, a barrier synchronizes all participating threads and then they proceed to apply the prescribed BLIS_IC_NT (or equivalent) ways of parallelism (and any BLIS_JR_NT parallelism specified within) to the remaining gemm subproblem (the rank-k update that is performed using the newly updated row-panel of B). Thus, trsm now supports JC, IC, and JR loop parallelism. - Modified bli_trsm_l_cntl_create() to create the new "prenode" branch of the trsm_l cntl_t tree. The trsm_r tree was left unchanged, for now, since it is not currently used. (All trsm problems are cast in terms of left-side trsm.) - Updated bli_cntl_free_w_thrinfo() to be able to free the newly shaped trsm cntl_t trees. Fixed a potentially latent bug whereby a cntl_t subnode is only recursed upon if there existed a corresponding thrinfo_t node, which may not always exist (for problems too small to employ full parallelization due to the minimum granularity imposed by micropanels). - Updated other functions in frame/base/bli_cntl.c, such as bli_cntl_copy() and bli_cntl_mark_family(), to recurse on sub-prenodes if they exist. - Updated bli_thrinfo_free() to recurse into sub-nodes and prenodes when they exist, and added support for growing a prenode branch to bli_thrinfo_grow() via a corresponding set of help functions named with the _prenode() suffix. - Added a bszid_t field thrinfo_t nodes. This field comes in handy when debugging the allocation/release of thrinfo_t nodes, as it helps trace the "identity" of each nodes as it is created/destroyed. - Renamed bli_l3_thrinfo_print_paths() -> bli_l3_thrinfo_print_gemm_paths() and created a separate bli_l3_thrinfo_print_trsm_paths() function to print out the newly reconfigured thrinfo_t trees for the trsm operation. - Trival changes to bli_gemm_blk_var?.c and bli_trsm_blk_var?.c regarding variable declarations. - Removed subpart_t enum values BLIS_SUBPART1T, BLIS_SUBPART1B, BLIS_SUBPART1L, BLIS_SUBPART1R. Then added support for two new labels (semantically speaking): BLIS_SUBPART1A and BLIS_SUBPART1B, which represent the subpartition ahead of and behind, respectively, BLIS_SUBPART1. Updated check functions in bli_check.c accordingly. - Shuffled layering/APIs for bli_acquire_mpart_[mn]dim() and bli_acquire_mpart_t2b/b2t(), _l2r/r2l(). - Deprecated old functions in frame/3/bli_l3_thrinfo.c. --- frame/1m/packm/bli_packm_thrinfo.c | 3 + frame/1m/packm/bli_packm_thrinfo.h | 1 + frame/3/bli_l3_thrinfo.c | 343 +++++++++++++---- frame/3/bli_l3_thrinfo.h | 7 +- frame/3/gemm/bli_gemm_blk_var1.c | 10 +- frame/3/gemm/bli_gemm_blk_var2.c | 10 +- frame/3/gemm/bli_gemm_blk_var3.c | 11 +- frame/3/trsm/bli_trsm_blk_var1.c | 131 ++++++- frame/3/trsm/bli_trsm_blk_var2.c | 10 +- frame/3/trsm/bli_trsm_blk_var3.c | 11 +- frame/3/trsm/bli_trsm_cntl.c | 55 ++- frame/3/trsm/bli_trsm_int.c | 3 + frame/base/bli_check.c | 16 +- frame/base/bli_cntl.c | 87 ++++- frame/base/bli_cntl.h | 17 + frame/base/bli_part.c | 220 ++++++----- frame/base/bli_part.h | 47 ++- frame/base/bli_pool.c | 8 +- frame/base/bli_rntm.c | 7 +- frame/include/bli_type_defs.h | 7 +- frame/thread/bli_thrcomm_openmp.c | 14 +- frame/thread/bli_thrinfo.c | 567 ++++++++++++++++++++++------- frame/thread/bli_thrinfo.h | 72 +++- 23 files changed, 1253 insertions(+), 404 deletions(-) diff --git a/frame/1m/packm/bli_packm_thrinfo.c b/frame/1m/packm/bli_packm_thrinfo.c index 800fa3c7f..92162c422 100644 --- a/frame/1m/packm/bli_packm_thrinfo.c +++ b/frame/1m/packm/bli_packm_thrinfo.c @@ -42,6 +42,7 @@ void bli_packm_thrinfo_init dim_t ocomm_id, dim_t n_way, dim_t work_id, + bszid_t bszid, thrinfo_t* sub_node ) { @@ -51,6 +52,7 @@ void bli_packm_thrinfo_init ocomm, ocomm_id, n_way, work_id, FALSE, + BLIS_NO_PART, sub_node ); } @@ -66,6 +68,7 @@ void bli_packm_thrinfo_init_single &BLIS_SINGLE_COMM, 0, 1, 0, + BLIS_NO_PART, NULL ); } diff --git a/frame/1m/packm/bli_packm_thrinfo.h b/frame/1m/packm/bli_packm_thrinfo.h index 190d3f2d3..7d35cbc93 100644 --- a/frame/1m/packm/bli_packm_thrinfo.h +++ b/frame/1m/packm/bli_packm_thrinfo.h @@ -87,6 +87,7 @@ void bli_packm_thrinfo_init dim_t ocomm_id, dim_t n_way, dim_t work_id, + bszid_t bszid, thrinfo_t* sub_node ); diff --git a/frame/3/bli_l3_thrinfo.c b/frame/3/bli_l3_thrinfo.c index 5a6228609..1d876d50f 100644 --- a/frame/3/bli_l3_thrinfo.c +++ b/frame/3/bli_l3_thrinfo.c @@ -36,48 +36,6 @@ #include "blis.h" #include "assert.h" -#if 0 -thrinfo_t* bli_l3_thrinfo_create - ( - thrcomm_t* ocomm, - dim_t ocomm_id, - dim_t n_way, - dim_t work_id, - thrinfo_t* sub_node - ) -{ - return bli_thrinfo_create - ( - ocomm, ocomm_id, - n_way, - work_id, - TRUE, - sub_node - ); -} -#endif - -void bli_l3_thrinfo_init - ( - thrinfo_t* thread, - thrcomm_t* ocomm, - dim_t ocomm_id, - dim_t n_way, - dim_t work_id, - thrinfo_t* sub_node - ) -{ - bli_thrinfo_init - ( - thread, - ocomm, ocomm_id, - n_way, - work_id, - TRUE, - sub_node - ); -} - void bli_l3_thrinfo_init_single ( thrinfo_t* thread @@ -129,13 +87,14 @@ void bli_l3_thrinfo_create_root xx_way, work_id, TRUE, + bszid, NULL ); } // ----------------------------------------------------------------------------- -void bli_l3_thrinfo_print_paths +void bli_l3_thrinfo_print_gemm_paths ( thrinfo_t** threads ) @@ -159,26 +118,23 @@ void bli_l3_thrinfo_print_paths dim_t jr_way = bli_thread_n_way( jr_info ); dim_t ir_way = bli_thread_n_way( ir_info ); - dim_t gl_nt = bli_thread_num_threads( jc_info ); - dim_t jc_nt = bli_thread_num_threads( pc_info ); - dim_t pc_nt = bli_thread_num_threads( pb_info ); - dim_t pb_nt = bli_thread_num_threads( ic_info ); - dim_t ic_nt = bli_thread_num_threads( pa_info ); - dim_t pa_nt = bli_thread_num_threads( jr_info ); - dim_t jr_nt = bli_thread_num_threads( ir_info ); + dim_t jc_nt = bli_thread_num_threads( jc_info ); + dim_t pc_nt = bli_thread_num_threads( pc_info ); + dim_t pb_nt = bli_thread_num_threads( pb_info ); + dim_t ic_nt = bli_thread_num_threads( ic_info ); + dim_t pa_nt = bli_thread_num_threads( pa_info ); + dim_t jr_nt = bli_thread_num_threads( jr_info ); + dim_t ir_nt = bli_thread_num_threads( ir_info ); - printf( " gl jc kc pb ic pa jr ir\n" ); - printf( "xx_nt: %4lu %4lu %4lu %4lu %4lu %4lu %4lu %4lu\n", - ( unsigned long )gl_nt, + printf( " jc kc pb ic pa jr ir\n" ); + printf( "xx_nt: %4lu %4lu %4lu %4lu %4lu %4lu %4lu\n", ( unsigned long )jc_nt, ( unsigned long )pc_nt, ( unsigned long )pb_nt, ( unsigned long )ic_nt, ( unsigned long )pa_nt, ( unsigned long )jr_nt, - ( unsigned long )1 ); - printf( "\n" ); - printf( " jc kc pb ic pa jr ir\n" ); + ( unsigned long )ir_nt ); printf( "xx_way: %4lu %4lu %4lu %4lu %4lu %4lu %4lu\n", ( unsigned long )jc_way, ( unsigned long )pc_way, @@ -187,15 +143,15 @@ void bli_l3_thrinfo_print_paths ( unsigned long )pa_way, ( unsigned long )jr_way, ( unsigned long )ir_way ); - printf( "=================================================\n" ); + printf( "============================================\n" ); - dim_t gl_comm_id; dim_t jc_comm_id; dim_t pc_comm_id; dim_t pb_comm_id; dim_t ic_comm_id; dim_t pa_comm_id; dim_t jr_comm_id; + dim_t ir_comm_id; dim_t jc_work_id; dim_t pc_work_id; @@ -216,78 +172,78 @@ void bli_l3_thrinfo_print_paths // width, MR or NR). if ( !jc_info ) { - gl_comm_id = jc_comm_id = pc_comm_id = pb_comm_id = ic_comm_id = pa_comm_id = jr_comm_id = -1; + jc_comm_id = pc_comm_id = pb_comm_id = ic_comm_id = pa_comm_id = jr_comm_id = ir_comm_id = -1; jc_work_id = pc_work_id = pb_work_id = ic_work_id = pa_work_id = jr_work_id = ir_work_id = -1; } else { - gl_comm_id = bli_thread_ocomm_id( jc_info ); + jc_comm_id = bli_thread_ocomm_id( jc_info ); jc_work_id = bli_thread_work_id( jc_info ); pc_info = bli_thrinfo_sub_node( jc_info ); if ( !pc_info ) { - jc_comm_id = pc_comm_id = pb_comm_id = ic_comm_id = pa_comm_id = jr_comm_id = -1; + pc_comm_id = pb_comm_id = ic_comm_id = pa_comm_id = jr_comm_id = ir_comm_id = -1; pc_work_id = pb_work_id = ic_work_id = pa_work_id = jr_work_id = ir_work_id = -1; } else { - jc_comm_id = bli_thread_ocomm_id( pc_info ); + pc_comm_id = bli_thread_ocomm_id( pc_info ); pc_work_id = bli_thread_work_id( pc_info ); pb_info = bli_thrinfo_sub_node( pc_info ); if ( !pb_info ) { - pc_comm_id = pb_comm_id = ic_comm_id = pa_comm_id = jr_comm_id = -1; + pb_comm_id = ic_comm_id = pa_comm_id = jr_comm_id = ir_comm_id = -1; pb_work_id = ic_work_id = pa_work_id = jr_work_id = ir_work_id = -1; } else { - pc_comm_id = bli_thread_ocomm_id( pb_info ); + pb_comm_id = bli_thread_ocomm_id( pb_info ); pb_work_id = bli_thread_work_id( pb_info ); ic_info = bli_thrinfo_sub_node( pb_info ); if ( !ic_info ) { - pb_comm_id = ic_comm_id = pa_comm_id = jr_comm_id = -1; + ic_comm_id = pa_comm_id = jr_comm_id = ir_comm_id = -1; ic_work_id = pa_work_id = jr_work_id = ir_work_id = -1; } else { - pb_comm_id = bli_thread_ocomm_id( ic_info ); + ic_comm_id = bli_thread_ocomm_id( ic_info ); ic_work_id = bli_thread_work_id( ic_info ); pa_info = bli_thrinfo_sub_node( ic_info ); if ( !pa_info ) { - ic_comm_id = pa_comm_id = jr_comm_id = -1; + pa_comm_id = jr_comm_id = ir_comm_id = -1; pa_work_id = jr_work_id = ir_work_id = -1; } else { - ic_comm_id = bli_thread_ocomm_id( pa_info ); + pa_comm_id = bli_thread_ocomm_id( pa_info ); pa_work_id = bli_thread_work_id( pa_info ); jr_info = bli_thrinfo_sub_node( pa_info ); if ( !jr_info ) { - pa_comm_id = jr_comm_id = -1; + jr_comm_id = ir_comm_id = -1; jr_work_id = ir_work_id = -1; } else { - pa_comm_id = bli_thread_ocomm_id( jr_info ); + jr_comm_id = bli_thread_ocomm_id( jr_info ); jr_work_id = bli_thread_work_id( jr_info ); ir_info = bli_thrinfo_sub_node( jr_info ); if ( !ir_info ) { - jr_comm_id = -1; + ir_comm_id = -1; ir_work_id = -1; } else { - jr_comm_id = bli_thread_ocomm_id( ir_info ); + ir_comm_id = bli_thread_ocomm_id( ir_info ); ir_work_id = bli_thread_work_id( ir_info ); } } @@ -297,15 +253,16 @@ void bli_l3_thrinfo_print_paths } } - printf( " gl jc pb kc pa ic jr \n" ); + //printf( " gl jc pb kc pa ic jr \n" ); + //printf( " gl jc kc pb ic pa jr \n" ); printf( "comm ids: %4ld %4ld %4ld %4ld %4ld %4ld %4ld\n", - ( long )gl_comm_id, ( long )jc_comm_id, ( long )pc_comm_id, ( long )pb_comm_id, ( long )ic_comm_id, ( long )pa_comm_id, - ( long )jr_comm_id ); + ( long )jr_comm_id, + ( long )ir_comm_id ); printf( "work ids: %4ld %4ld %4ld %4ld %4ld %4ld %4ld\n", ( long )jc_work_id, ( long )pc_work_id, @@ -314,7 +271,241 @@ void bli_l3_thrinfo_print_paths ( long )pa_work_id, ( long )jr_work_id, ( long )ir_work_id ); - printf( "---------------------------------------\n" ); + printf( "--------------------------------------------\n" ); + } + +} + +// ----------------------------------------------------------------------------- +// ----------------------------------------------------------------------------- +// ----------------------------------------------------------------------------- + +void bli_l3_thrinfo_print_trsm_paths + ( + thrinfo_t** threads + ) +{ + dim_t n_threads = bli_thread_num_threads( threads[0] ); + dim_t gl_id; + + thrinfo_t* jc_info = threads[0]; + thrinfo_t* pc_info = bli_thrinfo_sub_node( jc_info ); + thrinfo_t* pb_info = bli_thrinfo_sub_node( pc_info ); + thrinfo_t* ic_info = bli_thrinfo_sub_node( pb_info ); + + thrinfo_t* pa_info = bli_thrinfo_sub_node( ic_info ); + thrinfo_t* jr_info = bli_thrinfo_sub_node( pa_info ); + thrinfo_t* ir_info = bli_thrinfo_sub_node( jr_info ); + thrinfo_t* pa_info0 = bli_thrinfo_sub_prenode( ic_info ); + thrinfo_t* jr_info0 = ( pa_info0 ? bli_thrinfo_sub_node( pa_info0 ) : NULL ); + thrinfo_t* ir_info0 = ( jr_info0 ? bli_thrinfo_sub_node( jr_info0 ) : NULL ); + + dim_t jc_way = bli_thread_n_way( jc_info ); + dim_t pc_way = bli_thread_n_way( pc_info ); + dim_t pb_way = bli_thread_n_way( pb_info ); + dim_t ic_way = bli_thread_n_way( ic_info ); + + dim_t pa_way = bli_thread_n_way( pa_info ); + dim_t jr_way = bli_thread_n_way( jr_info ); + dim_t ir_way = bli_thread_n_way( ir_info ); + dim_t pa_way0 = ( pa_info0 ? bli_thread_n_way( pa_info0 ) : -1 ); + dim_t jr_way0 = ( jr_info0 ? bli_thread_n_way( jr_info0 ) : -1 ); + dim_t ir_way0 = ( ir_info0 ? bli_thread_n_way( ir_info0 ) : -1 ); + + dim_t jc_nt = bli_thread_num_threads( jc_info ); + dim_t pc_nt = bli_thread_num_threads( pc_info ); + dim_t pb_nt = bli_thread_num_threads( pb_info ); + dim_t ic_nt = bli_thread_num_threads( ic_info ); + + dim_t pa_nt = bli_thread_num_threads( pa_info ); + dim_t jr_nt = bli_thread_num_threads( jr_info ); + dim_t ir_nt = bli_thread_num_threads( ir_info ); + dim_t pa_nt0 = ( pa_info0 ? bli_thread_num_threads( pa_info0 ) : -1 ); + dim_t jr_nt0 = ( jr_info0 ? bli_thread_num_threads( jr_info0 ) : -1 ); + dim_t ir_nt0 = ( ir_info0 ? bli_thread_num_threads( ir_info0 ) : -1 ); + + printf( " jc kc pb ic pa jr ir\n" ); + printf( "xx_nt: %4ld %4ld %4ld %4ld %2ld|%2ld %2ld|%2ld %2ld|%2ld\n", + ( long )jc_nt, + ( long )pc_nt, + ( long )pb_nt, + ( long )ic_nt, + ( long )pa_nt0, ( long )pa_nt, + ( long )jr_nt0, ( long )jr_nt, + ( long )ir_nt0, ( long )ir_nt ); + printf( "xx_way: %4ld %4ld %4ld %4ld %2ld|%2ld %2ld|%2ld %2ld|%2ld\n", + ( long )jc_way, + ( long )pc_way, + ( long )pb_way, + ( long )ic_way, + ( long )pa_way0, ( long )pa_way, + ( long )jr_way0, ( long )jr_way, + ( long )ir_way0, ( long )ir_way ); + printf( "==================================================\n" ); + + dim_t jc_comm_id; + dim_t pc_comm_id; + dim_t pb_comm_id; + dim_t ic_comm_id; + dim_t pa_comm_id0, pa_comm_id; + dim_t jr_comm_id0, jr_comm_id; + dim_t ir_comm_id0, ir_comm_id; + + dim_t jc_work_id; + dim_t pc_work_id; + dim_t pb_work_id; + dim_t ic_work_id; + dim_t pa_work_id0, pa_work_id; + dim_t jr_work_id0, jr_work_id; + dim_t ir_work_id0, ir_work_id; + + for ( gl_id = 0; gl_id < n_threads; ++gl_id ) + { + jc_info = threads[gl_id]; + + // NOTE: We must check each thrinfo_t pointer for NULLness. Certain threads + // may not fully build their thrinfo_t structures--specifically when the + // dimension being parallelized is not large enough for each thread to have + // even one unit of work (where as unit is usually a single micropanel's + // width, MR or NR). + if ( !jc_info ) + { + jc_comm_id = pc_comm_id = pb_comm_id = ic_comm_id = pa_comm_id = jr_comm_id = ir_comm_id = -1; + jc_work_id = pc_work_id = pb_work_id = ic_work_id = pa_work_id = jr_work_id = ir_work_id = -1; + } + else + { + jc_comm_id = bli_thread_ocomm_id( jc_info ); + jc_work_id = bli_thread_work_id( jc_info ); + pc_info = bli_thrinfo_sub_node( jc_info ); + + if ( !pc_info ) + { + pc_comm_id = pb_comm_id = ic_comm_id = pa_comm_id = jr_comm_id = ir_comm_id = -1; + pc_work_id = pb_work_id = ic_work_id = pa_work_id = jr_work_id = ir_work_id = -1; + } + else + { + pc_comm_id = bli_thread_ocomm_id( pc_info ); + pc_work_id = bli_thread_work_id( pc_info ); + pb_info = bli_thrinfo_sub_node( pc_info ); + + if ( !pb_info ) + { + pb_comm_id = ic_comm_id = pa_comm_id = jr_comm_id = ir_comm_id = -1; + pb_work_id = ic_work_id = pa_work_id = jr_work_id = ir_work_id = -1; + } + else + { + pb_comm_id = bli_thread_ocomm_id( pb_info ); + pb_work_id = bli_thread_work_id( pb_info ); + ic_info = bli_thrinfo_sub_node( pb_info ); + + if ( !ic_info ) + { + ic_comm_id = pa_comm_id = jr_comm_id = ir_comm_id = -1; + ic_work_id = pa_work_id = jr_work_id = ir_work_id = -1; + } + else + { + ic_comm_id = bli_thread_ocomm_id( ic_info ); + ic_work_id = bli_thread_work_id( ic_info ); + pa_info0 = bli_thrinfo_sub_prenode( ic_info ); + pa_info = bli_thrinfo_sub_node( ic_info ); + + // Prenode + if ( !pa_info0 ) + { + pa_comm_id0 = jr_comm_id0 = ir_comm_id0 = -1; + pa_work_id0 = jr_work_id0 = ir_work_id0 = -1; + } + else + { + pa_comm_id0 = bli_thread_ocomm_id( pa_info0 ); + pa_work_id0 = bli_thread_work_id( pa_info0 ); + jr_info0 = bli_thrinfo_sub_node( pa_info0 ); + + if ( !jr_info0 ) + { + jr_comm_id0 = ir_comm_id0 = -1; + jr_work_id0 = ir_work_id0 = -1; + } + else + { + jr_comm_id0 = bli_thread_ocomm_id( jr_info0 ); + jr_work_id0 = bli_thread_work_id( jr_info0 ); + ir_info0 = bli_thrinfo_sub_node( jr_info0 ); + + if ( !ir_info0 ) + { + ir_comm_id0 = -1; + ir_work_id0 = -1; + } + else + { + ir_comm_id0 = bli_thread_ocomm_id( ir_info0 ); + ir_work_id0 = bli_thread_work_id( ir_info0 ); + } + } + } + + // Main node + if ( !pa_info ) + { + pa_comm_id = jr_comm_id = ir_comm_id = -1; + pa_work_id = jr_work_id = ir_work_id = -1; + } + else + { + pa_comm_id = bli_thread_ocomm_id( pa_info ); + pa_work_id = bli_thread_work_id( pa_info ); + jr_info = bli_thrinfo_sub_node( pa_info ); + + if ( !jr_info ) + { + jr_comm_id = ir_comm_id = -1; + jr_work_id = ir_work_id = -1; + } + else + { + jr_comm_id = bli_thread_ocomm_id( jr_info ); + jr_work_id = bli_thread_work_id( jr_info ); + ir_info = bli_thrinfo_sub_node( jr_info ); + + if ( !ir_info ) + { + ir_comm_id = -1; + ir_work_id = -1; + } + else + { + ir_comm_id = bli_thread_ocomm_id( ir_info ); + ir_work_id = bli_thread_work_id( ir_info ); + } + } + } + } + } + } + } + + printf( "comm ids: %4ld %4ld %4ld %4ld %2ld|%2ld %2ld|%2ld %2ld|%2ld\n", + ( long )jc_comm_id, + ( long )pc_comm_id, + ( long )pb_comm_id, + ( long )ic_comm_id, + ( long )pa_comm_id0, ( long )pa_comm_id, + ( long )jr_comm_id0, ( long )jr_comm_id, + ( long )ir_comm_id0, ( long )ir_comm_id ); + printf( "work ids: %4ld %4ld %4ld %4ld %2ld|%2ld %2ld|%2ld %2ld|%2ld\n", + ( long )jc_work_id, + ( long )pc_work_id, + ( long )pb_work_id, + ( long )ic_work_id, + ( long )pa_work_id0, ( long )pa_work_id, + ( long )jr_work_id0, ( long )jr_work_id, + ( long )ir_work_id0, ( long )ir_work_id ); + printf( "--------------------------------------------------\n" ); } } diff --git a/frame/3/bli_l3_thrinfo.h b/frame/3/bli_l3_thrinfo.h index 72a4f77e2..15d8faed6 100644 --- a/frame/3/bli_l3_thrinfo.h +++ b/frame/3/bli_l3_thrinfo.h @@ -104,7 +104,12 @@ void bli_l3_thrinfo_create_root thrinfo_t** thread ); -void bli_l3_thrinfo_print_paths +void bli_l3_thrinfo_print_gemm_paths + ( + thrinfo_t** threads + ); + +void bli_l3_thrinfo_print_trsm_paths ( thrinfo_t** threads ); diff --git a/frame/3/gemm/bli_gemm_blk_var1.c b/frame/3/gemm/bli_gemm_blk_var1.c index 07c029c6a..b53711901 100644 --- a/frame/3/gemm/bli_gemm_blk_var1.c +++ b/frame/3/gemm/bli_gemm_blk_var1.c @@ -47,15 +47,11 @@ void bli_gemm_blk_var1 ) { obj_t a1, c1; - - dir_t direct; - - dim_t i; - dim_t b_alg; dim_t my_start, my_end; + dim_t b_alg; // Determine the direction in which to partition (forwards or backwards). - direct = bli_l3_direct( a, b, c, cntl ); + dir_t direct = bli_l3_direct( a, b, c, cntl ); // Prune any zero region that exists along the partitioning dimension. bli_l3_prune_unref_mparts_m( a, b, c, cntl ); @@ -68,7 +64,7 @@ void bli_gemm_blk_var1 ); // Partition along the m dimension. - for ( i = my_start; i < my_end; i += b_alg ) + for ( dim_t i = my_start; i < my_end; i += b_alg ) { // Determine the current algorithmic blocksize. b_alg = bli_determine_blocksize( direct, i, my_end, a, diff --git a/frame/3/gemm/bli_gemm_blk_var2.c b/frame/3/gemm/bli_gemm_blk_var2.c index 33431a836..cd5a833f6 100644 --- a/frame/3/gemm/bli_gemm_blk_var2.c +++ b/frame/3/gemm/bli_gemm_blk_var2.c @@ -47,15 +47,11 @@ void bli_gemm_blk_var2 ) { obj_t b1, c1; - - dir_t direct; - - dim_t i; - dim_t b_alg; dim_t my_start, my_end; + dim_t b_alg; // Determine the direction in which to partition (forwards or backwards). - direct = bli_l3_direct( a, b, c, cntl ); + dir_t direct = bli_l3_direct( a, b, c, cntl ); // Prune any zero region that exists along the partitioning dimension. bli_l3_prune_unref_mparts_n( a, b, c, cntl ); @@ -68,7 +64,7 @@ void bli_gemm_blk_var2 ); // Partition along the n dimension. - for ( i = my_start; i < my_end; i += b_alg ) + for ( dim_t i = my_start; i < my_end; i += b_alg ) { // Determine the current algorithmic blocksize. b_alg = bli_determine_blocksize( direct, i, my_end, b, diff --git a/frame/3/gemm/bli_gemm_blk_var3.c b/frame/3/gemm/bli_gemm_blk_var3.c index 8e787c5ca..0c236f6d1 100644 --- a/frame/3/gemm/bli_gemm_blk_var3.c +++ b/frame/3/gemm/bli_gemm_blk_var3.c @@ -46,24 +46,19 @@ void bli_gemm_blk_var3 ) { obj_t a1, b1; - - dir_t direct; - - dim_t i; dim_t b_alg; - dim_t k_trans; // Determine the direction in which to partition (forwards or backwards). - direct = bli_l3_direct( a, b, c, cntl ); + dir_t direct = bli_l3_direct( a, b, c, cntl ); // Prune any zero region that exists along the partitioning dimension. bli_l3_prune_unref_mparts_k( a, b, c, cntl ); // Query dimension in partitioning direction. - k_trans = bli_obj_width_after_trans( a ); + dim_t k_trans = bli_obj_width_after_trans( a ); // Partition along the k dimension. - for ( i = 0; i < k_trans; i += b_alg ) + for ( dim_t i = 0; i < k_trans; i += b_alg ) { // Determine the current algorithmic blocksize. b_alg = bli_l3_determine_kc( direct, i, k_trans, a, b, diff --git a/frame/3/trsm/bli_trsm_blk_var1.c b/frame/3/trsm/bli_trsm_blk_var1.c index 01ae6aff9..1bab54d5f 100644 --- a/frame/3/trsm/bli_trsm_blk_var1.c +++ b/frame/3/trsm/bli_trsm_blk_var1.c @@ -35,6 +35,8 @@ #include "blis.h" +//#define PRINT + void bli_trsm_blk_var1 ( obj_t* a, @@ -46,45 +48,131 @@ void bli_trsm_blk_var1 thrinfo_t* thread ) { - obj_t a1, c1; - - dir_t direct; - - dim_t i; - dim_t b_alg; dim_t my_start, my_end; + dim_t b_alg; // Determine the direction in which to partition (forwards or backwards). - direct = bli_l3_direct( a, b, c, cntl ); + dir_t direct = bli_l3_direct( a, b, c, cntl ); // Prune any zero region that exists along the partitioning dimension. bli_l3_prune_unref_mparts_m( a, b, c, cntl ); - // Determine the current thread's subpartition range. - bli_thread_range_mdim - ( - direct, thread, a, b, c, cntl, cntx, - &my_start, &my_end - ); + // Isolate the diagonal block A11 and its corresponding row panel C1. + const dim_t kc = bli_obj_width( a ); + obj_t a11, c1; + bli_acquire_mpart_mdim( direct, BLIS_SUBPART1, + 0, kc, a, &a11 ); + bli_acquire_mpart_mdim( direct, BLIS_SUBPART1, + 0, kc, c, &c1 ); - // Partition along the m dimension. - for ( i = my_start; i < my_end; i += b_alg ) + // All threads iterate over the entire diagonal block A11. + my_start = 0; my_end = kc; + +#ifdef PRINT + printf( "bli_trsm_blk_var1(): a11 is %d x %d at offsets (%3d, %3d)\n", + (int)bli_obj_length( &a11 ), (int)bli_obj_width( &a11 ), + (int)bli_obj_row_off( &a11 ), (int)bli_obj_col_off( &a11 ) ); + printf( "bli_trsm_blk_var1(): entering trsm subproblem loop.\n" ); +#endif + + // Partition along the m dimension for the trsm subproblem. + for ( dim_t i = my_start; i < my_end; i += b_alg ) { - // Determine the current algorithmic blocksize. - b_alg = bli_determine_blocksize( direct, i, my_end, a, + obj_t a11_1, c1_1; + + b_alg = bli_determine_blocksize( direct, i, my_end, &a11, bli_cntl_bszid( cntl ), cntx ); // Acquire partitions for A1 and C1. bli_acquire_mpart_mdim( direct, BLIS_SUBPART1, - i, b_alg, a, &a1 ); + i, b_alg, &a11, &a11_1 ); bli_acquire_mpart_mdim( direct, BLIS_SUBPART1, - i, b_alg, c, &c1 ); + i, b_alg, &c1, &c1_1 ); + +#ifdef PRINT + printf( "bli_trsm_blk_var1(): a11_1 is %d x %d at offsets (%3d, %3d)\n", + (int)bli_obj_length( &a11_1 ), (int)bli_obj_width( &a11_1 ), + (int)bli_obj_row_off( &a11_1 ), (int)bli_obj_col_off( &a11_1 ) ); +#endif // Perform trsm subproblem. bli_trsm_int ( &BLIS_ONE, - &a1, + &a11_1, + b, + &BLIS_ONE, + &c1_1, + cntx, + rntm, + bli_cntl_sub_prenode( cntl ), + bli_thrinfo_sub_prenode( thread ) + ); + } + +#ifdef PRINT + printf( "bli_trsm_blk_var1(): finishing trsm subproblem loop.\n" ); +#endif + + // We must execute a barrier here because the upcoming rank-k update + // requires the packed matrix B to be fully updated by the trsm + // subproblem. + bli_thread_obarrier( thread ); + + // Isolate the remaining part of the column panel matrix A, which we do by + // acquiring the subpartition ahead of A11 (that is, A21 or A01, depending + // on whether we are moving forwards or backwards, respectively). + obj_t ax1, cx1; + bli_acquire_mpart_mdim( direct, BLIS_SUBPART1A, + 0, kc, a, &ax1 ); + bli_acquire_mpart_mdim( direct, BLIS_SUBPART1A, + 0, kc, c, &cx1 ); + +#ifdef PRINT + printf( "bli_trsm_blk_var1(): ax1 is %d x %d at offsets (%3d, %3d)\n", + (int)bli_obj_length( &ax1 ), (int)bli_obj_width( &ax1 ), + (int)bli_obj_row_off( &ax1 ), (int)bli_obj_col_off( &ax1 ) ); +#endif + + // Determine the current thread's subpartition range for the gemm + // subproblem over Ax1. + bli_thread_range_mdim + ( + direct, thread, &ax1, b, &cx1, cntl, cntx, + &my_start, &my_end + ); + +#ifdef PRINT + printf( "bli_trsm_blk_var1(): entering gemm subproblem loop (%d->%d).\n", (int)my_start, (int)my_end ); +#endif + + // Partition along the m dimension for the gemm subproblem. + for ( dim_t i = my_start; i < my_end; i += b_alg ) + { + obj_t a11, c1; + + // Determine the current algorithmic blocksize. + b_alg = bli_determine_blocksize( direct, i, my_end, &ax1, + bli_cntl_bszid( cntl ), cntx ); + + // Acquire partitions for A1 and C1. + bli_acquire_mpart_mdim( direct, BLIS_SUBPART1, + i, b_alg, &ax1, &a11 ); + bli_acquire_mpart_mdim( direct, BLIS_SUBPART1, + i, b_alg, &cx1, &c1 ); + +#ifdef PRINT + printf( "bli_trsm_blk_var1(): a11 is %d x %d at offsets (%3d, %3d)\n", + (int)bli_obj_length( &a11 ), (int)bli_obj_width( &a11 ), + (int)bli_obj_row_off( &a11 ), (int)bli_obj_col_off( &a11 ) ); +#endif + + // Perform gemm subproblem. (Note that we use the same backend + // function as before, since we're calling the same macrokernel.) + bli_trsm_int + ( + &BLIS_ONE, + &a11, b, &BLIS_ONE, &c1, @@ -94,5 +182,8 @@ void bli_trsm_blk_var1 bli_thrinfo_sub_node( thread ) ); } +#ifdef PRINT + printf( "bli_trsm_blk_var1(): finishing gemm subproblem loop.\n" ); +#endif } diff --git a/frame/3/trsm/bli_trsm_blk_var2.c b/frame/3/trsm/bli_trsm_blk_var2.c index 1249d9674..c8330b801 100644 --- a/frame/3/trsm/bli_trsm_blk_var2.c +++ b/frame/3/trsm/bli_trsm_blk_var2.c @@ -47,15 +47,11 @@ void bli_trsm_blk_var2 ) { obj_t b1, c1; - - dir_t direct; - - dim_t i; - dim_t b_alg; dim_t my_start, my_end; + dim_t b_alg; // Determine the direction in which to partition (forwards or backwards). - direct = bli_l3_direct( a, b, c, cntl ); + dir_t direct = bli_l3_direct( a, b, c, cntl ); // Prune any zero region that exists along the partitioning dimension. bli_l3_prune_unref_mparts_n( a, b, c, cntl ); @@ -68,7 +64,7 @@ void bli_trsm_blk_var2 ); // Partition along the n dimension. - for ( i = my_start; i < my_end; i += b_alg ) + for ( dim_t i = my_start; i < my_end; i += b_alg ) { // Determine the current algorithmic blocksize. b_alg = bli_determine_blocksize( direct, i, my_end, b, diff --git a/frame/3/trsm/bli_trsm_blk_var3.c b/frame/3/trsm/bli_trsm_blk_var3.c index 0e5897cf4..ee7c2f9ac 100644 --- a/frame/3/trsm/bli_trsm_blk_var3.c +++ b/frame/3/trsm/bli_trsm_blk_var3.c @@ -46,24 +46,19 @@ void bli_trsm_blk_var3 ) { obj_t a1, b1; - - dir_t direct; - - dim_t i; dim_t b_alg; - dim_t k_trans; // Determine the direction in which to partition (forwards or backwards). - direct = bli_l3_direct( a, b, c, cntl ); + dir_t direct = bli_l3_direct( a, b, c, cntl ); // Prune any zero region that exists along the partitioning dimension. bli_l3_prune_unref_mparts_k( a, b, c, cntl ); // Query dimension in partitioning direction. - k_trans = bli_obj_width_after_trans( a ); + dim_t k_trans = bli_obj_width_after_trans( a ); // Partition along the k dimension. - for ( i = 0; i < k_trans; i += b_alg ) + for ( dim_t i = 0; i < k_trans; i += b_alg ) { // Determine the current algorithmic blocksize. b_alg = bli_trsm_determine_kc( direct, i, k_trans, a, b, diff --git a/frame/3/trsm/bli_trsm_cntl.c b/frame/3/trsm/bli_trsm_cntl.c index 8ae6f6da2..9b59cae61 100644 --- a/frame/3/trsm/bli_trsm_cntl.c +++ b/frame/3/trsm/bli_trsm_cntl.c @@ -69,7 +69,48 @@ cntl_t* bli_trsm_l_cntl_create const opid_t family = BLIS_TRSM; - // Create two nodes for the macro-kernel. + // + // Create nodes for packing A and the macro-kernel (gemm branch). + // + + cntl_t* gemm_cntl_bu_ke = bli_trsm_cntl_create_node + ( + rntm, // the thread's runtime structure + family, // the operation family + BLIS_MR, // needed for bli_thrinfo_rgrow() + NULL, // variant function pointer not used + NULL // no sub-node; this is the leaf of the tree. + ); + + cntl_t* gemm_cntl_bp_bu = bli_trsm_cntl_create_node + ( + rntm, + family, + BLIS_NR, // not used by macro-kernel, but needed for bli_thrinfo_rgrow() + macro_kernel_p, + gemm_cntl_bu_ke + ); + + // Create a node for packing matrix A. + cntl_t* gemm_cntl_packa = bli_packm_cntl_create_node + ( + rntm, + bli_trsm_packa, // trsm operation's packm function for A. + packa_fp, + BLIS_MR, + BLIS_MR, + TRUE, // do NOT invert diagonal + TRUE, // reverse iteration if upper? + FALSE, // reverse iteration if lower? + schema_a, // normally BLIS_PACKED_ROW_PANELS + BLIS_BUFFER_FOR_A_BLOCK, + gemm_cntl_bp_bu + ); + + // + // Create nodes for packing A and the macro-kernel (trsm branch). + // + cntl_t* trsm_cntl_bu_ke = bli_trsm_cntl_create_node ( rntm, // the thread's runtime structure @@ -92,7 +133,7 @@ cntl_t* bli_trsm_l_cntl_create cntl_t* trsm_cntl_packa = bli_packm_cntl_create_node ( rntm, - bli_trsm_packa, + bli_trsm_packa, // trsm operation's packm function for A. packa_fp, BLIS_MR, BLIS_MR, @@ -104,16 +145,24 @@ cntl_t* bli_trsm_l_cntl_create trsm_cntl_bp_bu ); + // ------------------------------------------------------------------------- + // Create a node for partitioning the m dimension by MC. + // NOTE: We attach the gemm sub-tree as the main branch. cntl_t* trsm_cntl_op_bp = bli_trsm_cntl_create_node ( rntm, family, BLIS_MC, bli_trsm_blk_var1, - trsm_cntl_packa + gemm_cntl_packa ); + // Attach the trsm sub-tree as the auxiliary "prenode" branch. + bli_cntl_set_sub_prenode( trsm_cntl_packa, trsm_cntl_op_bp ); + + // ------------------------------------------------------------------------- + // Create a node for packing matrix B. cntl_t* trsm_cntl_packb = bli_packm_cntl_create_node ( diff --git a/frame/3/trsm/bli_trsm_int.c b/frame/3/trsm/bli_trsm_int.c index b397a52dd..dc39e69e0 100644 --- a/frame/3/trsm/bli_trsm_int.c +++ b/frame/3/trsm/bli_trsm_int.c @@ -52,6 +52,9 @@ void bli_trsm_int obj_t c_local; trsm_var_oft f; + // Return early if the current control tree node is NULL. + if ( bli_cntl_is_null( cntl ) ) return; + // Check parameters. if ( bli_error_checking_is_enabled() ) bli_gemm_basic_check( alpha, a, b, beta, c, cntx ); diff --git a/frame/base/bli_check.c b/frame/base/bli_check.c index f98f1e685..f5b3aebec 100644 --- a/frame/base/bli_check.c +++ b/frame/base/bli_check.c @@ -684,10 +684,12 @@ err_t bli_check_valid_3x1_subpart( subpart_t part ) err_t e_val = BLIS_SUCCESS; if ( part != BLIS_SUBPART0 && - part != BLIS_SUBPART1T && + part != BLIS_SUBPART1AND0 && part != BLIS_SUBPART1 && - part != BLIS_SUBPART1B && - part != BLIS_SUBPART2 ) + part != BLIS_SUBPART1AND2 && + part != BLIS_SUBPART2 && + part != BLIS_SUBPART1A && + part != BLIS_SUBPART1B ) e_val = BLIS_INVALID_3x1_SUBPART; return e_val; @@ -698,10 +700,12 @@ err_t bli_check_valid_1x3_subpart( subpart_t part ) err_t e_val = BLIS_SUCCESS; if ( part != BLIS_SUBPART0 && - part != BLIS_SUBPART1L && + part != BLIS_SUBPART1AND0 && part != BLIS_SUBPART1 && - part != BLIS_SUBPART1R && - part != BLIS_SUBPART2 ) + part != BLIS_SUBPART1AND2 && + part != BLIS_SUBPART2 && + part != BLIS_SUBPART1A && + part != BLIS_SUBPART1B ) e_val = BLIS_INVALID_1x3_SUBPART; return e_val; diff --git a/frame/base/bli_cntl.c b/frame/base/bli_cntl.c index 9020ae8b4..e24e69125 100644 --- a/frame/base/bli_cntl.c +++ b/frame/base/bli_cntl.c @@ -59,6 +59,7 @@ cntl_t* bli_cntl_create_node bli_cntl_set_bszid( bszid, cntl ); bli_cntl_set_var_func( var_func, cntl ); bli_cntl_set_params( params, cntl ); + bli_cntl_set_sub_prenode( NULL, cntl ); bli_cntl_set_sub_node( sub_node, cntl ); // Query the address of the node's packed mem_t entry so we can initialize @@ -95,6 +96,7 @@ void bli_cntl_clear_node // actually is not needed, but we do it for debugging/completeness. bli_cntl_set_var_func( NULL, cntl ); bli_cntl_set_params( NULL, cntl ); + bli_cntl_set_sub_prenode( NULL, cntl ); bli_cntl_set_sub_node( NULL, cntl ); // Clearing these fields is potentially more important if the control @@ -126,14 +128,40 @@ void bli_cntl_free_w_thrinfo // Base case: simply return when asked to free NULL nodes. if ( cntl == NULL ) return; - cntl_t* cntl_sub_node = bli_cntl_sub_node( cntl ); - void* cntl_params = bli_cntl_params( cntl ); - mem_t* cntl_pack_mem = bli_cntl_pack_mem( cntl ); + cntl_t* cntl_sub_prenode = bli_cntl_sub_prenode( cntl ); + cntl_t* cntl_sub_node = bli_cntl_sub_node( cntl ); + void* cntl_params = bli_cntl_params( cntl ); + mem_t* cntl_pack_mem = bli_cntl_pack_mem( cntl ); - thrinfo_t* thread_sub_node = bli_thrinfo_sub_node( thread ); + // Don't immediately dereference the prenode and subnode of the thrinfo_t + // node. In some cases, the thrinfo_t tree is not built out all the way, + // perhaps because there are more ways of parallelization than micropanels + // of data in this dimension, or because the problem is small enough that + // there is no gemm subproblem in bli_trsm_blk_var1(). Thus, we start with + // NULL values for these variables and only dereference the fields of the + // thrinfo_t struct if the thrinfo_t exists (ie: is non-NULL). We will also + // have to check the thrinfo_t pointer for NULLness before using it below, + // when checking if we need to free the pack_mem field of the cntl_t node + // (see below). + thrinfo_t* thread_sub_prenode = NULL; + thrinfo_t* thread_sub_node = NULL; - // Only recurse if the current thrinfo_t node has a child. - if ( thread_sub_node != NULL ) + if ( thread != NULL ) + { + thread_sub_prenode = bli_thrinfo_sub_prenode( thread ); + thread_sub_node = bli_thrinfo_sub_node( thread ); + } + + // Only recurse into prenode branch if it exists. + if ( cntl_sub_prenode != NULL ) + { + // Recursively free all memory associated with the sub-prenode and its + // children. + bli_cntl_free_w_thrinfo( rntm, cntl_sub_prenode, thread_sub_prenode ); + } + + // Only recurse into the child node if it exists. + if ( cntl_sub_node != NULL ) { // Recursively free all memory associated with the sub-node and its // children. @@ -153,6 +181,10 @@ void bli_cntl_free_w_thrinfo // Release the current node's pack mem_t entry back to the memory // broker from which it originated, but only if the mem_t entry is // allocated, and only if the current thread is chief for its group. + // Also note that we don't proceed with either of the above tests if + // the thrinfo_t pointer is NULL. (See above for background on when + // this can happen.) + if ( thread != NULL ) if ( bli_thread_am_ochief( thread ) ) if ( bli_mem_is_alloc( cntl_pack_mem ) ) { @@ -176,9 +208,16 @@ void bli_cntl_free_wo_thrinfo // Base case: simply return when asked to free NULL nodes. if ( cntl == NULL ) return; - cntl_t* cntl_sub_node = bli_cntl_sub_node( cntl ); - void* cntl_params = bli_cntl_params( cntl ); - mem_t* cntl_pack_mem = bli_cntl_pack_mem( cntl ); + cntl_t* cntl_sub_prenode = bli_cntl_sub_prenode( cntl ); + cntl_t* cntl_sub_node = bli_cntl_sub_node( cntl ); + void* cntl_params = bli_cntl_params( cntl ); + mem_t* cntl_pack_mem = bli_cntl_pack_mem( cntl ); + + { + // Recursively free all memory associated with the sub-prenode and its + // children. + bli_cntl_free_wo_thrinfo( rntm, cntl_sub_prenode ); + } { // Recursively free all memory associated with the sub-node and its @@ -244,6 +283,20 @@ cntl_t* bli_cntl_copy bli_cntl_set_params( params_copy, cntl_copy ); } + // If the sub-prenode exists, copy it recursively. + if ( bli_cntl_sub_prenode( cntl ) != NULL ) + { + cntl_t* sub_prenode_copy = bli_cntl_copy + ( + rntm, + bli_cntl_sub_prenode( cntl ) + ); + + // Save the address of the new sub-node (sub-tree) to the existing + // node. + bli_cntl_set_sub_prenode( sub_prenode_copy, cntl_copy ); + } + // If the sub-node exists, copy it recursively. if ( bli_cntl_sub_node( cntl ) != NULL ) { @@ -277,14 +330,18 @@ void bli_cntl_mark_family // Set the family of the root node. bli_cntl_set_family( family, cntl ); - // Continue as long as the current node has a valid child. - while ( bli_cntl_sub_node( cntl ) != NULL ) + // Recursively set the family field of the sub-tree rooted at the sub-node, + // if it exists. + if ( bli_cntl_sub_prenode( cntl ) != NULL ) { - // Move down the tree to the child node. - cntl = bli_cntl_sub_node( cntl ); + bli_cntl_mark_family( family, bli_cntl_sub_prenode( cntl ) ); + } - // Set the family of the current node. - bli_cntl_set_family( family, cntl ); + // Recursively set the family field of the sub-tree rooted at the prenode, + // if it exists. + if ( bli_cntl_sub_node( cntl ) != NULL ) + { + bli_cntl_mark_family( family, bli_cntl_sub_node( cntl ) ); } } diff --git a/frame/base/bli_cntl.h b/frame/base/bli_cntl.h index 4e881ea1d..2e61bb114 100644 --- a/frame/base/bli_cntl.h +++ b/frame/base/bli_cntl.h @@ -43,6 +43,7 @@ struct cntl_s opid_t family; bszid_t bszid; void* var_func; + struct cntl_s* sub_prenode; struct cntl_s* sub_node; // Optional fields (needed only by some operations such as packm). @@ -141,6 +142,11 @@ static void* bli_cntl_var_func( cntl_t* cntl ) return cntl->var_func; } +static cntl_t* bli_cntl_sub_prenode( cntl_t* cntl ) +{ + return cntl->sub_prenode; +} + static cntl_t* bli_cntl_sub_node( cntl_t* cntl ) { return cntl->sub_node; @@ -164,6 +170,12 @@ static mem_t* bli_cntl_pack_mem( cntl_t* cntl ) // cntl_t query (complex) +static bool_t bli_cntl_is_null( cntl_t* cntl ) +{ + return ( bool_t ) + ( cntl == NULL ); +} + static bool_t bli_cntl_is_leaf( cntl_t* cntl ) { return ( bool_t ) @@ -193,6 +205,11 @@ static void bli_cntl_set_var_func( void* var_func, cntl_t* cntl ) cntl->var_func = var_func; } +static void bli_cntl_set_sub_prenode( cntl_t* sub_prenode, cntl_t* cntl ) +{ + cntl->sub_prenode = sub_prenode; +} + static void bli_cntl_set_sub_node( cntl_t* sub_node, cntl_t* cntl ) { cntl->sub_node = sub_node; diff --git a/frame/base/bli_part.c b/frame/base/bli_part.c index 74f0e38ac..ce6af5b6f 100644 --- a/frame/base/bli_part.c +++ b/frame/base/bli_part.c @@ -81,9 +81,8 @@ void bli_acquire_mpart } -void bli_acquire_mpart_mdim +void bli_acquire_mpart_t2b ( - dir_t direct, subpart_t req_part, dim_t i, dim_t b, @@ -91,14 +90,11 @@ void bli_acquire_mpart_mdim obj_t* sub_obj ) { - if ( direct == BLIS_FWD ) - bli_acquire_mpart_t2b( req_part, i, b, obj, sub_obj ); - else - bli_acquire_mpart_b2t( req_part, i, b, obj, sub_obj ); + bli_acquire_mpart_mdim( BLIS_FWD, req_part, i, b, obj, sub_obj ); } -void bli_acquire_mpart_t2b +void bli_acquire_mpart_b2t ( subpart_t req_part, dim_t i, @@ -106,6 +102,20 @@ void bli_acquire_mpart_t2b obj_t* obj, obj_t* sub_obj ) +{ + bli_acquire_mpart_mdim( BLIS_BWD, req_part, i, b, obj, sub_obj ); +} + + +void bli_acquire_mpart_mdim + ( + dir_t direct, + subpart_t req_part, + dim_t i, + dim_t b, + obj_t* obj, + obj_t* sub_obj + ) { dim_t m; dim_t n; @@ -116,6 +126,18 @@ void bli_acquire_mpart_t2b doff_t diag_off_inc; + // NOTE: Most of this function implicitly assumes moving forward. + // When moving backward, we have to relocate i. + if ( direct == BLIS_BWD ) + { + // Query the dimension in the partitioning direction. + dim_t m = bli_obj_length_after_trans( obj ); + + // Modify i to account for the fact that we are moving backwards. + i = m - i - b; + } + + // Call a special function for partitioning packed objects. (By only // catching those objects packed to panels, we omit cases where the // object is packed to row or column storage, as such objects can be @@ -151,9 +173,22 @@ void bli_acquire_mpart_t2b if ( b > m - i ) b = m - i; + // Support SUBPART1B (behind SUBPART1) and SUBPART1A (ahead of SUBPART1), + // to refer to subpartitions 0 and 2 when moving forward, and 2 and 0 when + // moving backward. + subpart_t subpart0_alias; + subpart_t subpart2_alias; + + if ( direct == BLIS_FWD ) { subpart0_alias = BLIS_SUBPART1B; + subpart2_alias = BLIS_SUBPART1A; } + else { subpart0_alias = BLIS_SUBPART1A; + subpart2_alias = BLIS_SUBPART1B; } + + // Compute offset increments and dimensions based on which // subpartition is being requested, assuming no transposition. - if ( req_part == BLIS_SUBPART0 ) + if ( req_part == BLIS_SUBPART0 || + req_part == subpart0_alias ) { // A0 (offm,offn) unchanged. // A0 is i x n. @@ -162,10 +197,10 @@ void bli_acquire_mpart_t2b m_part = i; n_part = n; } - else if ( req_part == BLIS_SUBPART1T ) + else if ( req_part == BLIS_SUBPART1AND0 ) { - // A1T (offm,offn) unchanged. - // A1T is (i+b) x n. + // A1+A0 (offm,offn) unchanged. + // A1+A0 is (i+b) x n. offm_inc = 0; offn_inc = 0; m_part = i + b; @@ -180,16 +215,17 @@ void bli_acquire_mpart_t2b m_part = b; n_part = n; } - else if ( req_part == BLIS_SUBPART1B ) + else if ( req_part == BLIS_SUBPART1AND2 ) { - // A1B (offm,offn) += (i,0). - // A1B is (m-i) x n. + // A1+A2 (offm,offn) += (i,0). + // A1+A2 is (m-i) x n. offm_inc = i; offn_inc = 0; m_part = m - i; n_part = n; } - else // if ( req_part == BLIS_SUBPART2 ) + else if ( req_part == BLIS_SUBPART2 || + req_part == subpart2_alias ) { // A2 (offm,offn) += (i+b,0). // A2 is (m-i-b) x n. @@ -271,7 +307,7 @@ void bli_acquire_mpart_t2b } -void bli_acquire_mpart_b2t +void bli_acquire_mpart_l2r ( subpart_t req_part, dim_t i, @@ -280,37 +316,26 @@ void bli_acquire_mpart_b2t obj_t* sub_obj ) { - dim_t m; + bli_acquire_mpart_ndim( BLIS_FWD, req_part, i, b, obj, sub_obj ); +} - // Query the dimension in the partitioning direction. - m = bli_obj_length_after_trans( obj ); - // Modify i to account for the fact that we are moving backwards. - i = m - i - b; - - bli_acquire_mpart_t2b( req_part, i, b, obj, sub_obj ); +void bli_acquire_mpart_r2l + ( + subpart_t req_part, + dim_t j, + dim_t b, + obj_t* obj, + obj_t* sub_obj + ) +{ + bli_acquire_mpart_ndim( BLIS_BWD, req_part, j, b, obj, sub_obj ); } void bli_acquire_mpart_ndim ( dir_t direct, - subpart_t req_part, - dim_t i, - dim_t b, - obj_t* obj, - obj_t* sub_obj - ) -{ - if ( direct == BLIS_FWD ) - bli_acquire_mpart_l2r( req_part, i, b, obj, sub_obj ); - else - bli_acquire_mpart_r2l( req_part, i, b, obj, sub_obj ); -} - - -void bli_acquire_mpart_l2r - ( subpart_t req_part, dim_t j, dim_t b, @@ -327,6 +352,18 @@ void bli_acquire_mpart_l2r doff_t diag_off_inc; + // NOTE: Most of this function implicitly assumes moving forward. + // When moving backward, we have to relocate j. + if ( direct == BLIS_BWD ) + { + // Query the dimension in the partitioning direction. + dim_t n = bli_obj_width_after_trans( obj ); + + // Modify i to account for the fact that we are moving backwards. + j = n - j - b; + } + + // Call a special function for partitioning packed objects. (By only // catching those objects packed to panels, we omit cases where the // object is packed to row or column storage, as such objects can be @@ -362,9 +399,22 @@ void bli_acquire_mpart_l2r if ( b > n - j ) b = n - j; + // Support SUBPART1B (behind SUBPART1) and SUBPART1A (ahead of SUBPART1), + // to refer to subpartitions 0 and 2 when moving forward, and 2 and 0 when + // moving backward. + subpart_t subpart0_alias; + subpart_t subpart2_alias; + + if ( direct == BLIS_FWD ) { subpart0_alias = BLIS_SUBPART1B; + subpart2_alias = BLIS_SUBPART1A; } + else { subpart0_alias = BLIS_SUBPART1A; + subpart2_alias = BLIS_SUBPART1B; } + + // Compute offset increments and dimensions based on which // subpartition is being requested, assuming no transposition. - if ( req_part == BLIS_SUBPART0 ) + if ( req_part == BLIS_SUBPART0 || + req_part == subpart0_alias ) { // A0 (offm,offn) unchanged. // A0 is m x j. @@ -373,10 +423,10 @@ void bli_acquire_mpart_l2r m_part = m; n_part = j; } - else if ( req_part == BLIS_SUBPART1L ) + else if ( req_part == BLIS_SUBPART1AND0 ) { - // A1L (offm,offn) unchanged. - // A1L is m x (j+b). + // A1+A0 (offm,offn) unchanged. + // A1+A0 is m x (j+b). offm_inc = 0; offn_inc = 0; m_part = m; @@ -391,16 +441,17 @@ void bli_acquire_mpart_l2r m_part = m; n_part = b; } - else if ( req_part == BLIS_SUBPART1R ) + else if ( req_part == BLIS_SUBPART1AND2 ) { - // A1R (offm,offn) += (0,j). - // A1R is m x (n-j). + // A1+A2 (offm,offn) += (0,j). + // A1+A2 is m x (n-j). offm_inc = 0; offn_inc = j; m_part = m; n_part = n - j; } - else // if ( req_part == BLIS_SUBPART2 ) + else if ( req_part == BLIS_SUBPART2 || + req_part == subpart2_alias ) { // A2 (offm,offn) += (0,j+b). // A2 is m x (n-j-b). @@ -481,7 +532,20 @@ void bli_acquire_mpart_l2r } -void bli_acquire_mpart_r2l +void bli_acquire_mpart_tl2br + ( + subpart_t req_part, + dim_t i, + dim_t b, + obj_t* obj, + obj_t* sub_obj + ) +{ + bli_acquire_mpart_mndim( BLIS_FWD, req_part, i, b, obj, sub_obj ); +} + + +void bli_acquire_mpart_br2tl ( subpart_t req_part, dim_t j, @@ -490,20 +554,13 @@ void bli_acquire_mpart_r2l obj_t* sub_obj ) { - dim_t n; - - // Query the dimension in the partitioning direction. - n = bli_obj_width_after_trans( obj ); - - // Modify i to account for the fact that we are moving backwards. - j = n - j - b; - - bli_acquire_mpart_l2r( req_part, j, b, obj, sub_obj ); + bli_acquire_mpart_mndim( BLIS_BWD, req_part, j, b, obj, sub_obj ); } -void bli_acquire_mpart_tl2br +void bli_acquire_mpart_mndim ( + dir_t direct, subpart_t req_part, dim_t ij, dim_t b, @@ -521,6 +578,18 @@ void bli_acquire_mpart_tl2br doff_t diag_off_inc; + // NOTE: Most of this function implicitly assumes moving forward. + // When moving backward, we have to relocate ij. + if ( direct == BLIS_BWD ) + { + // Query the dimension of the object. + dim_t mn = bli_obj_length( obj ); + + // Modify ij to account for the fact that we are moving backwards. + ij = mn - ij - b; + } + + // Call a special function for partitioning packed objects. (By only // catching those objects packed to panels, we omit cases where the // object is packed to row or column storage, as such objects can be @@ -730,25 +799,6 @@ void bli_acquire_mpart_tl2br } -void bli_acquire_mpart_br2tl - ( - subpart_t req_part, - dim_t ij, - dim_t b, - obj_t* obj, - obj_t* sub_obj - ) -{ - // Query the dimension of the object. - dim_t mn = bli_obj_length( obj ); - - // Modify ij to account for the fact that we are moving backwards. - ij = mn - ij - b; - - bli_acquire_mpart_tl2br( req_part, ij, b, obj, sub_obj ); -} - - // -- Vector partitioning ------------------------------------------------------ @@ -762,9 +812,9 @@ void bli_acquire_vpart_f2b ) { if ( bli_obj_is_col_vector( obj ) ) - bli_acquire_mpart_t2b( req_part, i, b, obj, sub_obj ); + bli_acquire_mpart_mdim( BLIS_FWD, req_part, i, b, obj, sub_obj ); else // if ( bli_obj_is_row_vector( obj ) ) - bli_acquire_mpart_l2r( req_part, i, b, obj, sub_obj ); + bli_acquire_mpart_ndim( BLIS_FWD, req_part, i, b, obj, sub_obj ); } @@ -778,9 +828,9 @@ void bli_acquire_vpart_b2f ) { if ( bli_obj_is_col_vector( obj ) ) - bli_acquire_mpart_b2t( req_part, i, b, obj, sub_obj ); + bli_acquire_mpart_mdim( BLIS_BWD, req_part, i, b, obj, sub_obj ); else // if ( bli_obj_is_row_vector( obj ) ) - bli_acquire_mpart_r2l( req_part, i, b, obj, sub_obj ); + bli_acquire_mpart_ndim( BLIS_BWD, req_part, i, b, obj, sub_obj ); } @@ -797,8 +847,8 @@ void bli_acquire_mij { obj_t tmp_obj; - bli_acquire_mpart_l2r( BLIS_SUBPART1, j, 1, obj, &tmp_obj ); - bli_acquire_mpart_t2b( BLIS_SUBPART1, i, 1, &tmp_obj, sub_obj ); + bli_acquire_mpart_ndim( BLIS_FWD, BLIS_SUBPART1, j, 1, obj, &tmp_obj ); + bli_acquire_mpart_mdim( BLIS_FWD, BLIS_SUBPART1, i, 1, &tmp_obj, sub_obj ); } @@ -810,8 +860,8 @@ void bli_acquire_vi ) { if ( bli_obj_is_col_vector( obj ) ) - bli_acquire_mpart_t2b( BLIS_SUBPART1, i, 1, obj, sub_obj ); + bli_acquire_mpart_mdim( BLIS_FWD, BLIS_SUBPART1, i, 1, obj, sub_obj ); else // if ( bli_obj_is_row_vector( obj ) ) - bli_acquire_mpart_l2r( BLIS_SUBPART1, i, 1, obj, sub_obj ); + bli_acquire_mpart_ndim( BLIS_FWD, BLIS_SUBPART1, i, 1, obj, sub_obj ); } diff --git a/frame/base/bli_part.h b/frame/base/bli_part.h index 4247f248b..81232bccd 100644 --- a/frame/base/bli_part.h +++ b/frame/base/bli_part.h @@ -46,22 +46,6 @@ void bli_acquire_mpart obj_t* sub_obj ); -#undef GENPROT -#define GENPROT( opname ) \ -\ -void PASTEMAC0( opname ) \ - ( \ - dir_t direct, \ - subpart_t req_part, \ - dim_t i, \ - dim_t b, \ - obj_t* obj, \ - obj_t* sub_obj \ - ); - -GENPROT( acquire_mpart_mdim ) -GENPROT( acquire_mpart_ndim ) - #undef GENPROT #define GENPROT( opname ) \ \ @@ -81,8 +65,39 @@ GENPROT( acquire_mpart_r2l ) GENPROT( acquire_mpart_tl2br ) GENPROT( acquire_mpart_br2tl ) + +#undef GENPROT +#define GENPROT( opname ) \ +\ +void PASTEMAC0( opname ) \ + ( \ + dir_t direct, \ + subpart_t req_part, \ + dim_t i, \ + dim_t b, \ + obj_t* obj, \ + obj_t* sub_obj \ + ); + +GENPROT( acquire_mpart_mdim ) +GENPROT( acquire_mpart_ndim ) +GENPROT( acquire_mpart_mndim ) + + // -- Vector partitioning ------------------------------------------------------ +#undef GENPROT +#define GENPROT( opname ) \ +\ +void PASTEMAC0( opname ) \ + ( \ + subpart_t req_part, \ + dim_t i, \ + dim_t b, \ + obj_t* obj, \ + obj_t* sub_obj \ + ); + GENPROT( acquire_vpart_f2b ) GENPROT( acquire_vpart_b2f ) diff --git a/frame/base/bli_pool.c b/frame/base/bli_pool.c index 276169bfe..1821e1326 100644 --- a/frame/base/bli_pool.c +++ b/frame/base/bli_pool.c @@ -123,7 +123,13 @@ void bli_pool_finalize const siz_t top_index = bli_pool_top_index( pool ); // Sanity check: The top_index should be zero. - if ( top_index != 0 ) bli_abort(); + if ( top_index != 0 ) + { + printf( "bli_pool_finalize(): final top_index == %d (expected 0); block_size: %d.\n", + ( int )top_index, ( int )bli_pool_block_size( pool ) ); + printf( "bli_pool_finalize(): Implication: not all blocks were checked back in!\n" ); + bli_abort(); + } // Query the free() function pointer for the pool. free_ft free_fp = bli_pool_free_fp( pool ); diff --git a/frame/base/bli_rntm.c b/frame/base/bli_rntm.c index 63bfe2e13..8b97bd4c2 100644 --- a/frame/base/bli_rntm.c +++ b/frame/base/bli_rntm.c @@ -101,16 +101,15 @@ bli_rntm_print( rntm ); } else if ( l3_op == BLIS_TRSM ) { - // For trsm_l, we extract all parallelism from the jc and jr loops. - // For trsm_r, we extract all parallelism from the ic loop. +//printf( "bli_rntm_set_ways_for_op(): jc%d ic%d jr%d\n", (int)jc, (int)ic, (int)jr ); if ( bli_is_left( side ) ) { bli_rntm_set_ways_only ( jc, 1, - 1, - ic * pc * jr * ir, + ic, + jr, 1, rntm ); diff --git a/frame/include/bli_type_defs.h b/frame/include/bli_type_defs.h index 9f8393320..d2c3cb189 100644 --- a/frame/include/bli_type_defs.h +++ b/frame/include/bli_type_defs.h @@ -594,10 +594,10 @@ typedef enum BLIS_SUBPART0, BLIS_SUBPART1, BLIS_SUBPART2, - BLIS_SUBPART1T, + BLIS_SUBPART1AND0, + BLIS_SUBPART1AND2, + BLIS_SUBPART1A, BLIS_SUBPART1B, - BLIS_SUBPART1L, - BLIS_SUBPART1R, BLIS_SUBPART00, BLIS_SUBPART10, BLIS_SUBPART20, @@ -1015,6 +1015,7 @@ struct cntl_s opid_t family; bszid_t bszid; void* var_func; + struct cntl_s* sub_prenode; struct cntl_s* sub_node; // Optional fields (needed only by some operations such as packm). diff --git a/frame/thread/bli_thrcomm_openmp.c b/frame/thread/bli_thrcomm_openmp.c index 4423f83ff..05cfa610a 100644 --- a/frame/thread/bli_thrcomm_openmp.c +++ b/frame/thread/bli_thrcomm_openmp.c @@ -317,6 +317,7 @@ void bli_l3_thread_decorator // Create the root node of the current thread's thrinfo_t structure. bli_l3_thrinfo_create_root( tid, gl_comm, rntm_p, cntl_use, &thread ); +#if 1 func ( alpha, @@ -329,6 +330,14 @@ void bli_l3_thread_decorator cntl_use, thread ); +#else + bli_thrinfo_grow_tree + ( + rntm_p, + cntl_use, + thread + ); +#endif // Free the thread's local control tree. bli_l3_cntl_free( rntm_p, cntl_use, thread ); @@ -346,9 +355,9 @@ void bli_l3_thread_decorator // (called above). #ifdef PRINT_THRINFO - bli_l3_thrinfo_print_paths( threads ); + if ( family != BLIS_TRSM ) bli_l3_thrinfo_print_gemm_paths( threads ); + else bli_l3_thrinfo_print_trsm_paths( threads ); exit(1); - //bli_l3_thrinfo_free_paths( rntm_p, threads ); #endif // Check the array_t back into the small block allocator. Similar to the @@ -414,4 +423,3 @@ void bli_l3_thread_decorator_thread_check } #endif - diff --git a/frame/thread/bli_thrinfo.c b/frame/thread/bli_thrinfo.c index 0dcaae2d8..fdcf31f1d 100644 --- a/frame/thread/bli_thrinfo.c +++ b/frame/thread/bli_thrinfo.c @@ -43,6 +43,7 @@ thrinfo_t* bli_thrinfo_create dim_t n_way, dim_t work_id, bool_t free_comm, + bszid_t bszid, thrinfo_t* sub_node ) { @@ -58,6 +59,7 @@ thrinfo_t* bli_thrinfo_create ocomm, ocomm_id, n_way, work_id, free_comm, + bszid, sub_node ); @@ -72,6 +74,7 @@ void bli_thrinfo_init dim_t n_way, dim_t work_id, bool_t free_comm, + bszid_t bszid, thrinfo_t* sub_node ) { @@ -80,8 +83,10 @@ void bli_thrinfo_init thread->n_way = n_way; thread->work_id = work_id; thread->free_comm = free_comm; + thread->bszid = bszid; - thread->sub_node = sub_node; + thread->sub_prenode = NULL; + thread->sub_node = sub_node; } void bli_thrinfo_init_single @@ -96,6 +101,7 @@ void bli_thrinfo_init_single 1, 0, FALSE, + BLIS_NO_PART, thread ); } @@ -111,7 +117,20 @@ void bli_thrinfo_free thread == &BLIS_GEMM_SINGLE_THREADED ) return; - thrinfo_t* thrinfo_sub_node = bli_thrinfo_sub_node( thread ); + thrinfo_t* thrinfo_sub_prenode = bli_thrinfo_sub_prenode( thread ); + thrinfo_t* thrinfo_sub_node = bli_thrinfo_sub_node( thread ); + + // Recursively free all children of the current thrinfo_t. + if ( thrinfo_sub_prenode != NULL ) + { + bli_thrinfo_free( rntm, thrinfo_sub_prenode ); + } + + // Recursively free all children of the current thrinfo_t. + if ( thrinfo_sub_node != NULL ) + { + bli_thrinfo_free( rntm, thrinfo_sub_node ); + } // Free the communicators, but only if the current thrinfo_t struct // is marked as needing them to be freed. The most common example of @@ -119,15 +138,11 @@ void bli_thrinfo_free // associated with packm thrinfo_t nodes. if ( bli_thrinfo_needs_free_comm( thread ) ) { - // The ochief always frees his communicator, and the ichief free its - // communicator if we are at the leaf node. + // The ochief always frees his communicator. if ( bli_thread_am_ochief( thread ) ) bli_thrcomm_free( rntm, bli_thrinfo_ocomm( thread ) ); } - // Recursively free all children of the current thrinfo_t. - bli_thrinfo_free( rntm, thrinfo_sub_node ); - #ifdef BLIS_ENABLE_MEM_TRACING printf( "bli_thrinfo_free(): " ); #endif @@ -138,97 +153,6 @@ void bli_thrinfo_free // ----------------------------------------------------------------------------- -#include "assert.h" - -#define BLIS_NUM_STATIC_COMMS 80 - -thrinfo_t* bli_thrinfo_create_for_cntl - ( - rntm_t* rntm, - cntl_t* cntl_par, - cntl_t* cntl_chl, - thrinfo_t* thread_par - ) -{ - thrcomm_t* static_comms[ BLIS_NUM_STATIC_COMMS ]; - thrcomm_t** new_comms = NULL; - - thrinfo_t* thread_chl; - - const bszid_t bszid_chl = bli_cntl_bszid( cntl_chl ); - - const dim_t parent_nt_in = bli_thread_num_threads( thread_par ); - const dim_t parent_n_way = bli_thread_n_way( thread_par ); - const dim_t parent_comm_id = bli_thread_ocomm_id( thread_par ); - const dim_t parent_work_id = bli_thread_work_id( thread_par ); - - dim_t child_nt_in; - dim_t child_comm_id; - dim_t child_n_way; - dim_t child_work_id; - - // Sanity check: make sure the number of threads in the parent's - // communicator is divisible by the number of new sub-groups. - assert( parent_nt_in % parent_n_way == 0 ); - - // Compute: - // - the number of threads inside the new child comm, - // - the current thread's id within the new communicator, - // - the current thread's work id, given the ways of parallelism - // to be obtained within the next loop. - child_nt_in = bli_cntl_calc_num_threads_in( rntm, cntl_chl ); - child_n_way = bli_rntm_ways_for( bszid_chl, rntm ); - child_comm_id = parent_comm_id % child_nt_in; - child_work_id = child_comm_id / ( child_nt_in / child_n_way ); - - // The parent's chief thread creates a temporary array of thrcomm_t - // pointers. - if ( bli_thread_am_ochief( thread_par ) ) - { - if ( parent_n_way > BLIS_NUM_STATIC_COMMS ) - new_comms = bli_malloc_intl( parent_n_way * sizeof( thrcomm_t* ) ); - else - new_comms = static_comms; - } - - // Broadcast the temporary array to all threads in the parent's - // communicator. - new_comms = bli_thread_obroadcast( thread_par, new_comms ); - - // Chiefs in the child communicator allocate the communicator - // object and store it in the array element corresponding to the - // parent's work id. - if ( child_comm_id == 0 ) - new_comms[ parent_work_id ] = bli_thrcomm_create( rntm, child_nt_in ); - - bli_thread_obarrier( thread_par ); - - // All threads create a new thrinfo_t node using the communicator - // that was created by their chief, as identified by parent_work_id. - thread_chl = bli_thrinfo_create - ( - rntm, - new_comms[ parent_work_id ], - child_comm_id, - child_n_way, - child_work_id, - TRUE, - NULL - ); - - bli_thread_obarrier( thread_par ); - - // The parent's chief thread frees the temporary array of thrcomm_t - // pointers. - if ( bli_thread_am_ochief( thread_par ) ) - { - if ( parent_n_way > BLIS_NUM_STATIC_COMMS ) - bli_free_intl( new_comms ); - } - - return thread_chl; -} - void bli_thrinfo_grow ( rntm_t* rntm, @@ -236,24 +160,72 @@ void bli_thrinfo_grow thrinfo_t* thread ) { - // If the sub-node of the thrinfo_t object is non-NULL, we don't - // need to create it, and will just use the existing sub-node as-is. - if ( bli_thrinfo_sub_node( thread ) != NULL ) return; + // First, consider the prenode branch of the thrinfo_t tree, which should be + // expanded only if there exists a prenode branch in the cntl_t tree. - // Create a new node (or, if needed, multiple nodes) and return the - // pointer to the (eldest) child. - thrinfo_t* thread_child = bli_thrinfo_rgrow - ( - rntm, - cntl, - bli_cntl_sub_node( cntl ), - thread - ); + if ( bli_cntl_sub_prenode( cntl ) != NULL ) + { + // We only need to take action if the thrinfo_t sub-node is NULL; if it + // is non-NULL, then it has already been created and we'll use it as-is. + if ( bli_thrinfo_sub_prenode( thread ) == NULL ) + { + // Assertion / sanity check. + if ( bli_cntl_bszid( cntl ) != BLIS_MC ) + { + printf( "Assertion failed: Expanding prenode for non-IC loop?\n" ); + bli_abort(); + } - // Attach the child thrinfo_t node to its parent structure. - bli_thrinfo_set_sub_node( thread_child, thread ); + // Now we must create the packa, jr, and ir nodes that make up + // the prenode branch of current cntl_t node. + + // Create a new node (or, if needed, multiple nodes) along the + // prenode branch of the tree and return the pointer to the + // (highest) child. + thrinfo_t* thread_prenode = bli_thrinfo_rgrow_prenode + ( + rntm, + cntl, + bli_cntl_sub_prenode( cntl ), + thread + ); + + // Attach the child thrinfo_t node for the secondary branch to its + // parent structure. + bli_thrinfo_set_sub_prenode( thread_prenode, thread ); + } + } + + // Now, grow the primary branch of the thrinfo_t tree. + + // NOTE: If bli_thrinfo_rgrow() is being called, the sub_node field will + // always be non-NULL, and so there's no need to check it. + //if ( bli_cntl_sub_node( cntl ) != NULL ) + { + // We only need to take action if the thrinfo_t sub-node is NULL; if it + // is non-NULL, then it has already been created and we'll use it as-is. + if ( bli_thrinfo_sub_node( thread ) == NULL ) + { + // Create a new node (or, if needed, multiple nodes) along the + // main sub-node branch of the tree and return the pointer to the + // (highest) child. + thrinfo_t* thread_child = bli_thrinfo_rgrow + ( + rntm, + cntl, + bli_cntl_sub_node( cntl ), + thread + ); + + // Attach the child thrinfo_t node for the primary branch to its + // parent structure. + bli_thrinfo_set_sub_node( thread_child, thread ); + } + } } +// ----------------------------------------------------------------------------- + thrinfo_t* bli_thrinfo_rgrow ( rntm_t* rntm, @@ -291,25 +263,368 @@ thrinfo_t* bli_thrinfo_rgrow thread_par ); - // Create a thrinfo_t node corresponding to cntl_cur. Notice that - // the free_comm field is set to FALSE, since cntl_cur is a - // non-partitioning node. The communicator used here will be - // freed when thread_seg, or one of its descendents, is freed. + // Create a thrinfo_t node corresponding to cntl_cur. Since the + // corresponding cntl node, cntl_cur, is a non-partitioning node + // (bszid = BLIS_NO_PART), this means it's a packing node. Packing + // thrinfo_t nodes are formed differently than those corresponding to + // partitioning nodes; specifically, their work_id's are set equal to + // the their comm_id's. Also, notice that the free_comm field is set + // to FALSE since cntl_cur is a non-partitioning node. The reason: + // the communicator used here will be freed when thread_seg, or one + // of its descendents, is freed. thread_cur = bli_thrinfo_create ( - rntm, - bli_thrinfo_ocomm( thread_seg ), - bli_thread_ocomm_id( thread_seg ), - bli_cntl_calc_num_threads_in( rntm, cntl_cur ), - bli_thread_ocomm_id( thread_seg ), - FALSE, - thread_seg + rntm, // rntm + bli_thrinfo_ocomm( thread_seg ), // ocomm + bli_thread_ocomm_id( thread_seg ), // ocomm_id + bli_cntl_calc_num_threads_in( rntm, cntl_cur ), // n_way + bli_thread_ocomm_id( thread_seg ), // work_id + FALSE, // free_comm + BLIS_NO_PART, // bszid + thread_seg // sub_node ); - - // Attach the child thrinfo_t node to its parent structure. - bli_thrinfo_set_sub_node( thread_cur, thread_par ); } return thread_cur; } +#define BLIS_NUM_STATIC_COMMS 80 + +thrinfo_t* bli_thrinfo_create_for_cntl + ( + rntm_t* rntm, + cntl_t* cntl_par, + cntl_t* cntl_chl, + thrinfo_t* thread_par + ) +{ + thrcomm_t* static_comms[ BLIS_NUM_STATIC_COMMS ]; + thrcomm_t** new_comms = NULL; + + const bszid_t bszid_chl = bli_cntl_bszid( cntl_chl ); + + const dim_t parent_nt_in = bli_thread_num_threads( thread_par ); + const dim_t parent_n_way = bli_thread_n_way( thread_par ); + const dim_t parent_comm_id = bli_thread_ocomm_id( thread_par ); + const dim_t parent_work_id = bli_thread_work_id( thread_par ); + + // Sanity check: make sure the number of threads in the parent's + // communicator is divisible by the number of new sub-groups. + if ( parent_nt_in % parent_n_way != 0 ) + { + printf( "Assertion failed: parent_nt_in parent_n_way != 0\n" ); + bli_abort(); + } + + // Compute: + // - the number of threads inside the new child comm, + // - the current thread's id within the new communicator, + // - the current thread's work id, given the ways of parallelism + // to be obtained within the next loop. + const dim_t child_nt_in = bli_cntl_calc_num_threads_in( rntm, cntl_chl ); + const dim_t child_n_way = bli_rntm_ways_for( bszid_chl, rntm ); + const dim_t child_comm_id = parent_comm_id % child_nt_in; + const dim_t child_work_id = child_comm_id / ( child_nt_in / child_n_way ); + +//printf( "thread %d: child_n_way = %d child_nt_in = %d parent_n_way = %d (bszid = %d->%d)\n", (int)child_comm_id, (int)child_nt_in, (int)child_n_way, (int)parent_n_way, (int)bli_cntl_bszid( cntl_par ), (int)bszid_chl ); + + // The parent's chief thread creates a temporary array of thrcomm_t + // pointers. + if ( bli_thread_am_ochief( thread_par ) ) + { + if ( parent_n_way > BLIS_NUM_STATIC_COMMS ) + new_comms = bli_malloc_intl( parent_n_way * sizeof( thrcomm_t* ) ); + else + new_comms = static_comms; + } + + // Broadcast the temporary array to all threads in the parent's + // communicator. + new_comms = bli_thread_obroadcast( thread_par, new_comms ); + + // Chiefs in the child communicator allocate the communicator + // object and store it in the array element corresponding to the + // parent's work id. + if ( child_comm_id == 0 ) + new_comms[ parent_work_id ] = bli_thrcomm_create( rntm, child_nt_in ); + + bli_thread_obarrier( thread_par ); + + // All threads create a new thrinfo_t node using the communicator + // that was created by their chief, as identified by parent_work_id. + thrinfo_t* thread_chl = bli_thrinfo_create + ( + rntm, // rntm + new_comms[ parent_work_id ], // ocomm + child_comm_id, // ocomm_id + child_n_way, // n_way + child_work_id, // work_id + TRUE, // free_comm + bszid_chl, // bszid + NULL // sub_node + ); + + bli_thread_obarrier( thread_par ); + + // The parent's chief thread frees the temporary array of thrcomm_t + // pointers. + if ( bli_thread_am_ochief( thread_par ) ) + { + if ( parent_n_way > BLIS_NUM_STATIC_COMMS ) + bli_free_intl( new_comms ); + } + + return thread_chl; +} + +// ----------------------------------------------------------------------------- + +thrinfo_t* bli_thrinfo_rgrow_prenode + ( + rntm_t* rntm, + cntl_t* cntl_par, + cntl_t* cntl_cur, + thrinfo_t* thread_par + ) +{ + thrinfo_t* thread_cur; + + // We must handle two cases: those where the next node in the + // control tree is a partitioning node, and those where it is + // a non-partitioning (ie: packing) node. + if ( bli_cntl_bszid( cntl_cur ) != BLIS_NO_PART ) + { + // Create the child thrinfo_t node corresponding to cntl_cur, + // with cntl_par being the parent. + thread_cur = bli_thrinfo_create_for_cntl_prenode + ( + rntm, + cntl_par, + cntl_cur, + thread_par + ); + } + else // if ( bli_cntl_bszid( cntl_cur ) == BLIS_NO_PART ) + { + // Recursively grow the thread structure and return the top-most + // thrinfo_t node of that segment. + thrinfo_t* thread_seg = bli_thrinfo_rgrow_prenode + ( + rntm, + cntl_par, + bli_cntl_sub_node( cntl_cur ), + thread_par + ); + + // Create a thrinfo_t node corresponding to cntl_cur. Since the + // corresponding cntl node, cntl_cur, is a non-partitioning node + // (bszid = BLIS_NO_PART), this means it's a packing node. Packing + // thrinfo_t nodes are formed differently than those corresponding to + // partitioning nodes; specifically, their work_id's are set equal to + // the their comm_id's. Also, notice that the free_comm field is set + // to FALSE since cntl_cur is a non-partitioning node. The reason: + // the communicator used here will be freed when thread_seg, or one + // of its descendents, is freed. + thread_cur = bli_thrinfo_create + ( + rntm, // rntm + bli_thrinfo_ocomm( thread_seg ), // ocomm + bli_thread_ocomm_id( thread_seg ), // ocomm_id + bli_cntl_calc_num_threads_in( rntm, cntl_par ), // n_way + bli_thread_ocomm_id( thread_seg ), // work_id + FALSE, // free_comm + BLIS_NO_PART, // bszid + thread_seg // sub_node + ); + } + + return thread_cur; +} + +thrinfo_t* bli_thrinfo_create_for_cntl_prenode + ( + rntm_t* rntm, + cntl_t* cntl_par, + cntl_t* cntl_chl, + thrinfo_t* thread_par + ) +{ + // NOTE: This function only has to work for the ic -> (pa -> jr) + // thrinfo_t tree branch extension. After that, the function + // bli_thrinfo_create_for_cntl() will be called for the last jr->ir + // branch extension. + + const bszid_t bszid_chl = bli_cntl_bszid( cntl_chl ); + + const dim_t parent_nt_in = bli_thread_num_threads( thread_par ); + const dim_t parent_n_way = bli_thread_n_way( thread_par ); + const dim_t parent_comm_id = bli_thread_ocomm_id( thread_par ); + //const dim_t parent_work_id = bli_thread_work_id( thread_par ); + + // Sanity check: make sure the number of threads in the parent's + // communicator is divisible by the number of new sub-groups. + if ( parent_nt_in % parent_n_way != 0 ) + { + printf( "Assertion failed: parent_nt_in (%d) parent_n_way (%d) != 0\n", + ( int )parent_nt_in, ( int )parent_n_way ); + bli_abort(); + } + + //dim_t child_nt_in = bli_cntl_calc_num_threads_in( rntm, cntl_chl ); + //dim_t child_n_way = bli_rntm_ways_for( bszid_chl, rntm ); + const dim_t child_nt_in = parent_nt_in; + const dim_t child_n_way = parent_nt_in; + const dim_t child_comm_id = parent_comm_id % child_nt_in; + const dim_t child_work_id = child_comm_id / ( child_nt_in / child_n_way ); + + bli_thread_obarrier( thread_par ); + + // NOTE: Recall that parent_comm_id == child_comm_id, so checking for the + // parent's chief-ness is equivalent to checking for chief-ness in the new + // about-to-be-created communicator group. + thrcomm_t* new_comm = NULL; + if ( bli_thread_am_ochief( thread_par ) ) + new_comm = bli_thrcomm_create( rntm, child_nt_in ); + + // Broadcast the new thrcomm_t address to the other threads in the + // parent's group. + new_comm = bli_thread_obroadcast( thread_par, new_comm ); + + // All threads create a new thrinfo_t node using the communicator + // that was created by their chief, as identified by parent_work_id. + thrinfo_t* thread_chl = bli_thrinfo_create + ( + rntm, // rntm + new_comm, // ocomm + child_comm_id, // ocomm_id + child_n_way, // n_way + child_work_id, // work_id + TRUE, // free_comm + bszid_chl, // bszid + NULL // sub_node + ); + + bli_thread_obarrier( thread_par ); + + return thread_chl; +} + +// ----------------------------------------------------------------------------- + +#if 0 +void bli_thrinfo_grow_tree + ( + rntm_t* rntm, + cntl_t* cntl, + thrinfo_t* thread + ) +{ + cntl_t* cntl_jc = cntl; + thrinfo_t* thrinfo_jc = thread; + + bli_thrinfo_grow( rntm, cntl_jc, thrinfo_jc ); + + // inside jc loop: + cntl_t* cntl_pc = bli_cntl_sub_node( cntl_jc ); + thrinfo_t* thrinfo_pc = bli_thrinfo_sub_node( thrinfo_jc ); + + bli_thrinfo_grow( rntm, cntl_pc, thrinfo_pc ); + + // inside pc loop: + cntl_t* cntl_pb = bli_cntl_sub_node( cntl_pc ); + thrinfo_t* thrinfo_pb = bli_thrinfo_sub_node( thrinfo_pc ); + + bli_thrinfo_grow( rntm, cntl_pb, thrinfo_pb ); + + // after pb packing: + cntl_t* cntl_ic = bli_cntl_sub_node( cntl_pb ); + thrinfo_t* thrinfo_ic = bli_thrinfo_sub_node( thrinfo_pb ); + + bli_thrinfo_grow( rntm, cntl_ic, thrinfo_ic ); + + // -- main branch -- + + // inside ic loop: + cntl_t* cntl_pa = bli_cntl_sub_node( cntl_ic ); + thrinfo_t* thrinfo_pa = bli_thrinfo_sub_node( thrinfo_ic ); + + bli_thrinfo_grow( rntm, cntl_pa, thrinfo_pa ); + + // after pa packing: + cntl_t* cntl_jr = bli_cntl_sub_node( cntl_pa ); + thrinfo_t* thrinfo_jr = bli_thrinfo_sub_node( thrinfo_pa ); + + bli_thrinfo_grow( rntm, cntl_jr, thrinfo_jr ); + + // inside jr loop: + //cntl_t* cntl_ir = bli_cntl_sub_node( cntl_jr ); + //thrinfo_t* thrinfo_ir = bli_thrinfo_sub_node( thrinfo_jr ); + + // -- trsm branch -- + + // inside ic loop: + cntl_t* cntl_pa0 = bli_cntl_sub_prenode( cntl_ic ); + thrinfo_t* thrinfo_pa0 = bli_thrinfo_sub_prenode( thrinfo_ic ); + + bli_thrinfo_grow( rntm, cntl_pa0, thrinfo_pa0 ); + + // after pa packing: + cntl_t* cntl_jr0 = bli_cntl_sub_node( cntl_pa0 ); + thrinfo_t* thrinfo_jr0 = bli_thrinfo_sub_node( thrinfo_pa0 ); + + bli_thrinfo_grow( rntm, cntl_jr0, thrinfo_jr0 ); + + // inside jr loop: + //cntl_t* cntl_ir0 = bli_cntl_sub_node( cntl_jr0 ); + //thrinfo_t* thrinfo_ir0= bli_thrinfo_sub_node( thrinfo_jr0 ); +} + +void bli_thrinfo_grow_tree_ic + ( + rntm_t* rntm, + cntl_t* cntl, + thrinfo_t* thread + ) +{ + cntl_t* cntl_ic = cntl; + thrinfo_t* thrinfo_ic = thread; + + bli_thrinfo_grow( rntm, cntl_ic, thrinfo_ic ); + + // -- main branch -- + + // inside ic loop: + cntl_t* cntl_pa = bli_cntl_sub_node( cntl_ic ); + thrinfo_t* thrinfo_pa = bli_thrinfo_sub_node( thrinfo_ic ); + + bli_thrinfo_grow( rntm, cntl_pa, thrinfo_pa ); + + // after pa packing: + cntl_t* cntl_jr = bli_cntl_sub_node( cntl_pa ); + thrinfo_t* thrinfo_jr = bli_thrinfo_sub_node( thrinfo_pa ); + + bli_thrinfo_grow( rntm, cntl_jr, thrinfo_jr ); + + // inside jr loop: + //cntl_t* cntl_ir = bli_cntl_sub_node( cntl_jr ); + //thrinfo_t* thrinfo_ir = bli_thrinfo_sub_node( thrinfo_jr ); + + // -- trsm branch -- + + // inside ic loop: + cntl_t* cntl_pa0 = bli_cntl_sub_prenode( cntl_ic ); + thrinfo_t* thrinfo_pa0 = bli_thrinfo_sub_prenode( thrinfo_ic ); + + bli_thrinfo_grow( rntm, cntl_pa0, thrinfo_pa0 ); + + // after pa packing: + cntl_t* cntl_jr0 = bli_cntl_sub_node( cntl_pa0 ); + thrinfo_t* thrinfo_jr0 = bli_thrinfo_sub_node( thrinfo_pa0 ); + + bli_thrinfo_grow( rntm, cntl_jr0, thrinfo_jr0 ); + + // inside jr loop: + //cntl_t* cntl_ir0 = bli_cntl_sub_node( cntl_jr0 ); + //thrinfo_t* thrinfo_ir0= bli_thrinfo_sub_node( thrinfo_jr0 ); +} +#endif diff --git a/frame/thread/bli_thrinfo.h b/frame/thread/bli_thrinfo.h index 5903cced0..2b3d2e809 100644 --- a/frame/thread/bli_thrinfo.h +++ b/frame/thread/bli_thrinfo.h @@ -58,6 +58,11 @@ struct thrinfo_s // to false. bool_t free_comm; + // The bszid_t to help identify the node. This is mostly only useful when + // debugging or tracing the allocation and release of thrinfo_t nodes. + bszid_t bszid; + + struct thrinfo_s* sub_prenode; struct thrinfo_s* sub_node; }; typedef struct thrinfo_s thrinfo_t; @@ -100,11 +105,21 @@ static bool_t bli_thrinfo_needs_free_comm( thrinfo_t* t ) return t->free_comm; } +static dim_t bli_thread_bszid( thrinfo_t* t ) +{ + return t->bszid; +} + static thrinfo_t* bli_thrinfo_sub_node( thrinfo_t* t ) { return t->sub_node; } +static thrinfo_t* bli_thrinfo_sub_prenode( thrinfo_t* t ) +{ + return t->sub_prenode; +} + // thrinfo_t query (complex) static bool_t bli_thread_am_ochief( thrinfo_t* t ) @@ -119,6 +134,11 @@ static void bli_thrinfo_set_sub_node( thrinfo_t* sub_node, thrinfo_t* t ) t->sub_node = sub_node; } +static void bli_thrinfo_set_sub_prenode( thrinfo_t* sub_prenode, thrinfo_t* t ) +{ + t->sub_prenode = sub_prenode; +} + // other thrinfo_t-related functions static void* bli_thread_obroadcast( thrinfo_t* t, void* p ) @@ -144,6 +164,7 @@ thrinfo_t* bli_thrinfo_create dim_t n_way, dim_t work_id, bool_t free_comm, + bszid_t bszid, thrinfo_t* sub_node ); @@ -155,6 +176,7 @@ void bli_thrinfo_init dim_t n_way, dim_t work_id, bool_t free_comm, + bszid_t bszid, thrinfo_t* sub_node ); @@ -171,14 +193,6 @@ void bli_thrinfo_free // ----------------------------------------------------------------------------- -thrinfo_t* bli_thrinfo_create_for_cntl - ( - rntm_t* rntm, - cntl_t* cntl_par, - cntl_t* cntl_chl, - thrinfo_t* thread_par - ); - void bli_thrinfo_grow ( rntm_t* rntm, @@ -194,4 +208,46 @@ thrinfo_t* bli_thrinfo_rgrow thrinfo_t* thread_par ); +thrinfo_t* bli_thrinfo_create_for_cntl + ( + rntm_t* rntm, + cntl_t* cntl_par, + cntl_t* cntl_chl, + thrinfo_t* thread_par + ); + +thrinfo_t* bli_thrinfo_rgrow_prenode + ( + rntm_t* rntm, + cntl_t* cntl_par, + cntl_t* cntl_cur, + thrinfo_t* thread_par + ); + +thrinfo_t* bli_thrinfo_create_for_cntl_prenode + ( + rntm_t* rntm, + cntl_t* cntl_par, + cntl_t* cntl_chl, + thrinfo_t* thread_par + ); + +// ----------------------------------------------------------------------------- + +#if 0 +void bli_thrinfo_grow_tree + ( + rntm_t* rntm, + cntl_t* cntl, + thrinfo_t* thread + ); + +void bli_thrinfo_grow_tree_ic + ( + rntm_t* rntm, + cntl_t* cntl, + thrinfo_t* thread + ); +#endif + #endif From a023c643f25222593f4c98c2166212561d030621 Mon Sep 17 00:00:00 2001 From: "Field G. Van Zee" Date: Thu, 14 Feb 2019 20:18:55 -0600 Subject: [PATCH 02/17] Regenerated symbols in build/libblis-symbols.def. Details: - Reran ./build/regen-symbols.sh after running 'configure --enable-cblas auto' --- build/libblis-symbols.def | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build/libblis-symbols.def b/build/libblis-symbols.def index 3ee6f6821..f4db5f98f 100644 --- a/build/libblis-symbols.def +++ b/build/libblis-symbols.def @@ -10,6 +10,7 @@ bli_acquire_mpart_br2tl bli_acquire_mpart_l2r bli_acquire_mpart_l2r_check bli_acquire_mpart_mdim +bli_acquire_mpart_mndim bli_acquire_mpart_ndim bli_acquire_mpart_r2l bli_acquire_mpart_t2b @@ -1306,9 +1307,9 @@ bli_l3_thread_entry bli_l3_thrinfo_create_root bli_l3_thrinfo_free bli_l3_thrinfo_free_paths -bli_l3_thrinfo_init bli_l3_thrinfo_init_single -bli_l3_thrinfo_print_paths +bli_l3_thrinfo_print_gemm_paths +bli_l3_thrinfo_print_trsm_paths bli_lcm bli_lsame bli_machval @@ -2032,11 +2033,13 @@ bli_thread_set_ways bli_thread_set_ways_ bli_thrinfo_create bli_thrinfo_create_for_cntl +bli_thrinfo_create_for_cntl_prenode bli_thrinfo_free bli_thrinfo_grow bli_thrinfo_init bli_thrinfo_init_single bli_thrinfo_rgrow +bli_thrinfo_rgrow_prenode bli_trmm bli_trmm1m bli_trmm3 From 565fa3853b381051ac92cff764625909d105644d Mon Sep 17 00:00:00 2001 From: "Field G. Van Zee" Date: Mon, 18 Feb 2019 11:43:58 -0600 Subject: [PATCH 03/17] Redirect trsm pc, ir parallelism to ic, jr loops. Details: - trsm parallelization was temporarily simplifed in 075143d to entirely ignore any parallelism specified via the pc or ir loops. Now, any parallelism specified to the pc loop will be redirected to the ic loop, and any parallelism specified to the ir loop will be redirected to the jr loop. (Note that because of inter-iteration dependencies, trsm cannot parallelize the ir loop. Parallelism via the pc loop is at least somewhat feasible in theory, but it would require tracking dependencies between blocks--something for which BLIS currently lacks the necessary supporting infrastructure.) --- frame/base/bli_rntm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frame/base/bli_rntm.c b/frame/base/bli_rntm.c index 8b97bd4c2..34d741324 100644 --- a/frame/base/bli_rntm.c +++ b/frame/base/bli_rntm.c @@ -108,8 +108,8 @@ bli_rntm_print( rntm ); ( jc, 1, - ic, - jr, + ic * pc, + jr * ir, 1, rntm ); From 6a014a3377a2e829dbc294b814ca257a2bfcb763 Mon Sep 17 00:00:00 2001 From: "Field G. Van Zee" Date: Mon, 18 Feb 2019 14:52:29 -0600 Subject: [PATCH 04/17] Standardized optimization flags in make_defs.mk. Details: - Per Dave Love's recommendation in issue #300, this commit defines COPTFLAGS := -03 and CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations in the make_defs.mk for all Intel- and AMD-based configurations. --- config/amd64/make_defs.mk | 6 +++++- config/bulldozer/make_defs.mk | 6 +++++- config/excavator/make_defs.mk | 6 +++++- config/generic/make_defs.mk | 4 ++++ config/haswell/make_defs.mk | 4 ++++ config/intel64/make_defs.mk | 4 ++++ config/knc/make_defs.mk | 4 ++++ config/knl/make_defs.mk | 2 +- config/penryn/make_defs.mk | 6 +++++- config/piledriver/make_defs.mk | 6 +++++- config/sandybridge/make_defs.mk | 4 ++++ config/skx/make_defs.mk | 2 +- config/steamroller/make_defs.mk | 6 +++++- config/template/make_defs.mk | 2 +- config/x86_64/make_defs.mk | 4 ++++ config/zen/make_defs.mk | 6 +++++- 16 files changed, 62 insertions(+), 10 deletions(-) diff --git a/config/amd64/make_defs.mk b/config/amd64/make_defs.mk index afea69558..668c7275e 100644 --- a/config/amd64/make_defs.mk +++ b/config/amd64/make_defs.mk @@ -57,7 +57,7 @@ endif ifeq ($(DEBUG_TYPE),noopt) COPTFLAGS := -O0 else -COPTFLAGS := -O2 -fomit-frame-pointer +COPTFLAGS := -O3 endif # Flags specific to optimized kernels. @@ -74,7 +74,11 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) +ifeq ($(CC_VENDOR),gcc) +CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +else CRVECFLAGS := $(CKVECFLAGS) +endif # Store all of the variables here to new variables containing the # configuration name. diff --git a/config/bulldozer/make_defs.mk b/config/bulldozer/make_defs.mk index 15870c4cb..28328e4b7 100644 --- a/config/bulldozer/make_defs.mk +++ b/config/bulldozer/make_defs.mk @@ -57,7 +57,7 @@ endif ifeq ($(DEBUG_TYPE),noopt) COPTFLAGS := -O0 else -COPTFLAGS := -O2 -funroll-all-loops +COPTFLAGS := -O3 endif # Flags specific to optimized kernels. @@ -74,7 +74,11 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) +ifeq ($(CC_VENDOR),gcc) +CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +else CRVECFLAGS := $(CKVECFLAGS) +endif # Store all of the variables here to new variables containing the # configuration name. diff --git a/config/excavator/make_defs.mk b/config/excavator/make_defs.mk index 45fff9690..82dcd8233 100644 --- a/config/excavator/make_defs.mk +++ b/config/excavator/make_defs.mk @@ -57,7 +57,7 @@ endif ifeq ($(DEBUG_TYPE),noopt) COPTFLAGS := -O0 else -COPTFLAGS := -O2 -fomit-frame-pointer +COPTFLAGS := -O3 endif # Flags specific to optimized kernels. @@ -74,7 +74,11 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) +ifeq ($(CC_VENDOR),gcc) +CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +else CRVECFLAGS := $(CKVECFLAGS) +endif # Store all of the variables here to new variables containing the # configuration name. diff --git a/config/generic/make_defs.mk b/config/generic/make_defs.mk index d491d072e..93e4d5212 100644 --- a/config/generic/make_defs.mk +++ b/config/generic/make_defs.mk @@ -78,7 +78,11 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) +ifeq ($(CC_VENDOR),gcc) +CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +else CRVECFLAGS := $(CKVECFLAGS) +endif # Store all of the variables here to new variables containing the # configuration name. diff --git a/config/haswell/make_defs.mk b/config/haswell/make_defs.mk index 5d2f0a73b..41b61540a 100644 --- a/config/haswell/make_defs.mk +++ b/config/haswell/make_defs.mk @@ -78,7 +78,11 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) +ifeq ($(CC_VENDOR),gcc) +CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +else CRVECFLAGS := $(CKVECFLAGS) +endif # Store all of the variables here to new variables containing the # configuration name. diff --git a/config/intel64/make_defs.mk b/config/intel64/make_defs.mk index 442b81e3a..3a9cb8895 100644 --- a/config/intel64/make_defs.mk +++ b/config/intel64/make_defs.mk @@ -78,7 +78,11 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) +ifeq ($(CC_VENDOR),gcc) +CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +else CRVECFLAGS := $(CKVECFLAGS) +endif # Store all of the variables here to new variables containing the # configuration name. diff --git a/config/knc/make_defs.mk b/config/knc/make_defs.mk index 367b64b27..48b89159f 100644 --- a/config/knc/make_defs.mk +++ b/config/knc/make_defs.mk @@ -70,7 +70,11 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) +ifeq ($(CC_VENDOR),gcc) +CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +else CRVECFLAGS := $(CKVECFLAGS) +endif # Override the default value for LDFLAGS. LDFLAGS := -mmic diff --git a/config/knl/make_defs.mk b/config/knl/make_defs.mk index f4165f788..e239a2fdf 100644 --- a/config/knl/make_defs.mk +++ b/config/knl/make_defs.mk @@ -99,7 +99,7 @@ endif # Note: We use AVX2 for reference kernels instead of AVX-512. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := -march=knl -mno-avx512f -mno-avx512pf -mno-avx512er -mno-avx512cd +CRVECFLAGS := -march=knl -mno-avx512f -mno-avx512pf -mno-avx512er -mno-avx512cd -funsafe-loop-optimizations else ifeq ($(CC_VENDOR),icc) CRVECFLAGS := -xMIC-AVX512 diff --git a/config/penryn/make_defs.mk b/config/penryn/make_defs.mk index 294dd616a..175c8d5bf 100644 --- a/config/penryn/make_defs.mk +++ b/config/penryn/make_defs.mk @@ -57,7 +57,7 @@ endif ifeq ($(DEBUG_TYPE),noopt) COPTFLAGS := -O0 else -COPTFLAGS := -O2 -fomit-frame-pointer +COPTFLAGS := -O3 endif # Flags specific to optimized kernels. @@ -78,7 +78,11 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) +ifeq ($(CC_VENDOR),gcc) +CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +else CRVECFLAGS := $(CKVECFLAGS) +endif # Store all of the variables here to new variables containing the # configuration name. diff --git a/config/piledriver/make_defs.mk b/config/piledriver/make_defs.mk index 155b0c002..d5ebc1f14 100644 --- a/config/piledriver/make_defs.mk +++ b/config/piledriver/make_defs.mk @@ -57,7 +57,7 @@ endif ifeq ($(DEBUG_TYPE),noopt) COPTFLAGS := -O0 else -COPTFLAGS := -O2 -fomit-frame-pointer +COPTFLAGS := -O3 endif # Flags specific to optimized kernels. @@ -74,7 +74,11 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) +ifeq ($(CC_VENDOR),gcc) +CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +else CRVECFLAGS := $(CKVECFLAGS) +endif # Store all of the variables here to new variables containing the # configuration name. diff --git a/config/sandybridge/make_defs.mk b/config/sandybridge/make_defs.mk index f0d694f8c..02fb4d641 100644 --- a/config/sandybridge/make_defs.mk +++ b/config/sandybridge/make_defs.mk @@ -78,7 +78,11 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) +ifeq ($(CC_VENDOR),gcc) +CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +else CRVECFLAGS := $(CKVECFLAGS) +endif # Store all of the variables here to new variables containing the # configuration name. diff --git a/config/skx/make_defs.mk b/config/skx/make_defs.mk index e9319e476..98c5ebd6f 100644 --- a/config/skx/make_defs.mk +++ b/config/skx/make_defs.mk @@ -89,7 +89,7 @@ endif # to overcome the AVX-512 frequency drop". (Issue #187) CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := -march=skylake-avx512 -mno-avx512f -mno-avx512vl -mno-avx512bw -mno-avx512dq -mno-avx512cd +CRVECFLAGS := -march=skylake-avx512 -mno-avx512f -mno-avx512vl -mno-avx512bw -mno-avx512dq -mno-avx512cd -funsafe-loop-optimizations else ifeq ($(CC_VENDOR),icc) CRVECFLAGS := -xCORE-AVX2 diff --git a/config/steamroller/make_defs.mk b/config/steamroller/make_defs.mk index 6c093d244..18c5c6461 100644 --- a/config/steamroller/make_defs.mk +++ b/config/steamroller/make_defs.mk @@ -57,7 +57,7 @@ endif ifeq ($(DEBUG_TYPE),noopt) COPTFLAGS := -O0 else -COPTFLAGS := -O2 -fomit-frame-pointer +COPTFLAGS := -O3 endif # Flags specific to optimized kernels. @@ -74,7 +74,11 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) +ifeq ($(CC_VENDOR),gcc) +CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +else CRVECFLAGS := $(CKVECFLAGS) +endif # Store all of the variables here to new variables containing the # configuration name. diff --git a/config/template/make_defs.mk b/config/template/make_defs.mk index ff89757c7..35edf71a1 100644 --- a/config/template/make_defs.mk +++ b/config/template/make_defs.mk @@ -57,7 +57,7 @@ endif ifeq ($(DEBUG_TYPE),noopt) COPTFLAGS := -O0 else -COPTFLAGS := -O2 +COPTFLAGS := -O3 endif # Flags specific to optimized kernels. diff --git a/config/x86_64/make_defs.mk b/config/x86_64/make_defs.mk index 375ea7dec..0c6c521bd 100644 --- a/config/x86_64/make_defs.mk +++ b/config/x86_64/make_defs.mk @@ -78,7 +78,11 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) +ifeq ($(CC_VENDOR),gcc) +CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +else CRVECFLAGS := $(CKVECFLAGS) +endif # Store all of the variables here to new variables containing the # configuration name. diff --git a/config/zen/make_defs.mk b/config/zen/make_defs.mk index 40b07661b..5fdb7539f 100644 --- a/config/zen/make_defs.mk +++ b/config/zen/make_defs.mk @@ -57,7 +57,7 @@ endif ifeq ($(DEBUG_TYPE),noopt) COPTFLAGS := -O0 else -COPTFLAGS := -O3 -fomit-frame-pointer +COPTFLAGS := -O3 endif # Flags specific to optimized kernels. @@ -78,7 +78,11 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) +ifeq ($(CC_VENDOR),gcc) +CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +else CRVECFLAGS := $(CKVECFLAGS) +endif # Store all of the variables here to new variables containing the # configuration name. From bf0fb78c5e575372060d22f5ceeb5b332e8978ec Mon Sep 17 00:00:00 2001 From: "Field G. Van Zee" Date: Mon, 18 Feb 2019 16:51:38 -0600 Subject: [PATCH 05/17] Removed -funsafe-loop-optimizations from families. Details: - Removed -funsafe-loop-optimizations from the configuration families affected by 6a014a3, specifically: intel64, amd64, and x86_64. This is part of an attempt to debug why the sde, as executed by Travis CI, is crashing via the following error: TID 0 SDE-ERROR: Executed instruction not valid for specified chip (ICELAKE): 0x9172a5: bextr_xop rax, rcx, 0x103 --- config/amd64/make_defs.mk | 2 +- config/intel64/make_defs.mk | 2 +- config/x86_64/make_defs.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/amd64/make_defs.mk b/config/amd64/make_defs.mk index 668c7275e..70c0b692b 100644 --- a/config/amd64/make_defs.mk +++ b/config/amd64/make_defs.mk @@ -75,7 +75,7 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +CRVECFLAGS := $(CKVECFLAGS) else CRVECFLAGS := $(CKVECFLAGS) endif diff --git a/config/intel64/make_defs.mk b/config/intel64/make_defs.mk index 3a9cb8895..af462fdc3 100644 --- a/config/intel64/make_defs.mk +++ b/config/intel64/make_defs.mk @@ -79,7 +79,7 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +CRVECFLAGS := $(CKVECFLAGS) else CRVECFLAGS := $(CKVECFLAGS) endif diff --git a/config/x86_64/make_defs.mk b/config/x86_64/make_defs.mk index 0c6c521bd..4d038ff04 100644 --- a/config/x86_64/make_defs.mk +++ b/config/x86_64/make_defs.mk @@ -79,7 +79,7 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +CRVECFLAGS := $(CKVECFLAGS) else CRVECFLAGS := $(CKVECFLAGS) endif From 5190d05a27c5fa4c7942e20094f76eb9a9785c3e Mon Sep 17 00:00:00 2001 From: "Field G. Van Zee" Date: Mon, 18 Feb 2019 17:07:35 -0600 Subject: [PATCH 06/17] Removed -funsafe-loop-optimizations from piledriver. Details: - Error persists; continuing debugging from bf0fb78c by removing -funsafe-loop-optimizations from piledriver configuration. --- config/piledriver/make_defs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/piledriver/make_defs.mk b/config/piledriver/make_defs.mk index d5ebc1f14..213f78056 100644 --- a/config/piledriver/make_defs.mk +++ b/config/piledriver/make_defs.mk @@ -75,7 +75,7 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +CRVECFLAGS := $(CKVECFLAGS) else CRVECFLAGS := $(CKVECFLAGS) endif From 6cf155049168652c512aefdd16d74e7ff39b98df Mon Sep 17 00:00:00 2001 From: "Field G. Van Zee" Date: Mon, 18 Feb 2019 17:29:51 -0600 Subject: [PATCH 07/17] Removed -funsafe-loop-optimizations from all configs. Details: - Error persists. Removed -funsafe-loop-optimizations from all remaining sub-configurations. --- config/bulldozer/make_defs.mk | 2 +- config/excavator/make_defs.mk | 2 +- config/generic/make_defs.mk | 2 +- config/haswell/make_defs.mk | 2 +- config/knc/make_defs.mk | 2 +- config/knl/make_defs.mk | 2 +- config/penryn/make_defs.mk | 2 +- config/sandybridge/make_defs.mk | 2 +- config/skx/make_defs.mk | 2 +- config/steamroller/make_defs.mk | 2 +- config/zen/make_defs.mk | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config/bulldozer/make_defs.mk b/config/bulldozer/make_defs.mk index 28328e4b7..6a75d199e 100644 --- a/config/bulldozer/make_defs.mk +++ b/config/bulldozer/make_defs.mk @@ -75,7 +75,7 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +CRVECFLAGS := $(CKVECFLAGS) else CRVECFLAGS := $(CKVECFLAGS) endif diff --git a/config/excavator/make_defs.mk b/config/excavator/make_defs.mk index 82dcd8233..40a552198 100644 --- a/config/excavator/make_defs.mk +++ b/config/excavator/make_defs.mk @@ -75,7 +75,7 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +CRVECFLAGS := $(CKVECFLAGS) else CRVECFLAGS := $(CKVECFLAGS) endif diff --git a/config/generic/make_defs.mk b/config/generic/make_defs.mk index 93e4d5212..3388291da 100644 --- a/config/generic/make_defs.mk +++ b/config/generic/make_defs.mk @@ -79,7 +79,7 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +CRVECFLAGS := $(CKVECFLAGS) else CRVECFLAGS := $(CKVECFLAGS) endif diff --git a/config/haswell/make_defs.mk b/config/haswell/make_defs.mk index 41b61540a..e33b2ad11 100644 --- a/config/haswell/make_defs.mk +++ b/config/haswell/make_defs.mk @@ -79,7 +79,7 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +CRVECFLAGS := $(CKVECFLAGS) else CRVECFLAGS := $(CKVECFLAGS) endif diff --git a/config/knc/make_defs.mk b/config/knc/make_defs.mk index 48b89159f..ba2209c16 100644 --- a/config/knc/make_defs.mk +++ b/config/knc/make_defs.mk @@ -71,7 +71,7 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +CRVECFLAGS := $(CKVECFLAGS) else CRVECFLAGS := $(CKVECFLAGS) endif diff --git a/config/knl/make_defs.mk b/config/knl/make_defs.mk index e239a2fdf..f4165f788 100644 --- a/config/knl/make_defs.mk +++ b/config/knl/make_defs.mk @@ -99,7 +99,7 @@ endif # Note: We use AVX2 for reference kernels instead of AVX-512. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := -march=knl -mno-avx512f -mno-avx512pf -mno-avx512er -mno-avx512cd -funsafe-loop-optimizations +CRVECFLAGS := -march=knl -mno-avx512f -mno-avx512pf -mno-avx512er -mno-avx512cd else ifeq ($(CC_VENDOR),icc) CRVECFLAGS := -xMIC-AVX512 diff --git a/config/penryn/make_defs.mk b/config/penryn/make_defs.mk index 175c8d5bf..060c06609 100644 --- a/config/penryn/make_defs.mk +++ b/config/penryn/make_defs.mk @@ -79,7 +79,7 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +CRVECFLAGS := $(CKVECFLAGS) else CRVECFLAGS := $(CKVECFLAGS) endif diff --git a/config/sandybridge/make_defs.mk b/config/sandybridge/make_defs.mk index 02fb4d641..e9e5f3be3 100644 --- a/config/sandybridge/make_defs.mk +++ b/config/sandybridge/make_defs.mk @@ -79,7 +79,7 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +CRVECFLAGS := $(CKVECFLAGS) else CRVECFLAGS := $(CKVECFLAGS) endif diff --git a/config/skx/make_defs.mk b/config/skx/make_defs.mk index 98c5ebd6f..e9319e476 100644 --- a/config/skx/make_defs.mk +++ b/config/skx/make_defs.mk @@ -89,7 +89,7 @@ endif # to overcome the AVX-512 frequency drop". (Issue #187) CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := -march=skylake-avx512 -mno-avx512f -mno-avx512vl -mno-avx512bw -mno-avx512dq -mno-avx512cd -funsafe-loop-optimizations +CRVECFLAGS := -march=skylake-avx512 -mno-avx512f -mno-avx512vl -mno-avx512bw -mno-avx512dq -mno-avx512cd else ifeq ($(CC_VENDOR),icc) CRVECFLAGS := -xCORE-AVX2 diff --git a/config/steamroller/make_defs.mk b/config/steamroller/make_defs.mk index 18c5c6461..656076fd9 100644 --- a/config/steamroller/make_defs.mk +++ b/config/steamroller/make_defs.mk @@ -75,7 +75,7 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +CRVECFLAGS := $(CKVECFLAGS) else CRVECFLAGS := $(CKVECFLAGS) endif diff --git a/config/zen/make_defs.mk b/config/zen/make_defs.mk index 5fdb7539f..dee06c8aa 100644 --- a/config/zen/make_defs.mk +++ b/config/zen/make_defs.mk @@ -79,7 +79,7 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +CRVECFLAGS := $(CKVECFLAGS) else CRVECFLAGS := $(CKVECFLAGS) endif From 1e5b530744c1906140d47f43c5cad235eaa619cf Mon Sep 17 00:00:00 2001 From: "Field G. Van Zee" Date: Mon, 18 Feb 2019 18:04:38 -0600 Subject: [PATCH 08/17] Reverted piledriver COPTFLAGS from -O3 to -O2. Details: - Debugging continues; changing COPTFLAGS for piledriver subconfig from -O3 to -O2, its original value prior to 6a014a3. --- config/piledriver/make_defs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/piledriver/make_defs.mk b/config/piledriver/make_defs.mk index 213f78056..87b1b8644 100644 --- a/config/piledriver/make_defs.mk +++ b/config/piledriver/make_defs.mk @@ -57,7 +57,7 @@ endif ifeq ($(DEBUG_TYPE),noopt) COPTFLAGS := -O0 else -COPTFLAGS := -O3 +COPTFLAGS := -O2 endif # Flags specific to optimized kernels. From 44994d1490897b08cde52a615a2e37ddae8b2061 Mon Sep 17 00:00:00 2001 From: "Field G. Van Zee" Date: Mon, 18 Feb 2019 18:35:30 -0600 Subject: [PATCH 09/17] Disable TBM, XOP, LWP instructions in AMD configs. Details: - Added -mno-tbm -mno-xop -mno-lwp to CKVECFLAGS in bulldozer, piledriver, steamroller, and excavator configurations to explicitly disable AMD's bulldozer-era TBM, XOP, and LWP instruction sets in an attempt to fix the invalid instruction error that has plagued Travis CI builds since 6a014a3. Thanks to Devin Matthews for pointing out that the offending instruction was part of TBM (issue #300). - Restored -O3 to piledriver configuration's COPTFLAGS. --- config/bulldozer/make_defs.mk | 4 ++-- config/excavator/make_defs.mk | 4 ++-- config/piledriver/make_defs.mk | 6 +++--- config/steamroller/make_defs.mk | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/bulldozer/make_defs.mk b/config/bulldozer/make_defs.mk index 6a75d199e..06f7d8251 100644 --- a/config/bulldozer/make_defs.mk +++ b/config/bulldozer/make_defs.mk @@ -63,10 +63,10 @@ endif # Flags specific to optimized kernels. CKOPTFLAGS := $(COPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CKVECFLAGS := -mfpmath=sse -mavx -mfma4 -march=bdver1 +CKVECFLAGS := -mfpmath=sse -mavx -mfma4 -march=bdver1 -mno-tbm -mno-xop -mno-lwp else ifeq ($(CC_VENDOR),clang) -CKVECFLAGS := -mfpmath=sse -mavx -mfma4 -march=bdver1 +CKVECFLAGS := -mfpmath=sse -mavx -mfma4 -march=bdver1 -mno-tbm -mno-xop -mno-lwp else $(error gcc or clang are required for this configuration.) endif diff --git a/config/excavator/make_defs.mk b/config/excavator/make_defs.mk index 40a552198..48de8ed50 100644 --- a/config/excavator/make_defs.mk +++ b/config/excavator/make_defs.mk @@ -63,10 +63,10 @@ endif # Flags specific to optimized kernels. CKOPTFLAGS := $(COPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CKVECFLAGS := -mfpmath=sse -mavx -mfma -mno-fma4 -march=bdver4 +CKVECFLAGS := -mfpmath=sse -mavx -mfma -march=bdver4 -mno-fma4 -mno-tbm -mno-xop -mno-lwp else ifeq ($(CC_VENDOR),clang) -CKVECFLAGS := -mfpmath=sse -mavx -mfma -mno-fma4 -march=bdver4 +CKVECFLAGS := -mfpmath=sse -mavx -mfma -march=bdver4 -mno-fma4 -mno-tbm -mno-xop -mno-lwp else $(error gcc or clang are required for this configuration.) endif diff --git a/config/piledriver/make_defs.mk b/config/piledriver/make_defs.mk index 87b1b8644..425040692 100644 --- a/config/piledriver/make_defs.mk +++ b/config/piledriver/make_defs.mk @@ -57,16 +57,16 @@ endif ifeq ($(DEBUG_TYPE),noopt) COPTFLAGS := -O0 else -COPTFLAGS := -O2 +COPTFLAGS := -O3 endif # Flags specific to optimized kernels. CKOPTFLAGS := $(COPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CKVECFLAGS := -mfpmath=sse -mavx -mfma -mno-fma4 -march=bdver2 +CKVECFLAGS := -mfpmath=sse -mavx -mfma -march=bdver2 -mno-fma4 -mno-tbm -mno-xop -mno-lwp else ifeq ($(CC_VENDOR),clang) -CKVECFLAGS := -mfpmath=sse -mavx -mfma -mno-fma4 -march=bdver2 +CKVECFLAGS := -mfpmath=sse -mavx -mfma -march=bdver2 -mno-fma4 -mno-tbm -mno-xop -mno-lwp else $(error gcc or clang are required for this configuration.) endif diff --git a/config/steamroller/make_defs.mk b/config/steamroller/make_defs.mk index 656076fd9..58315d7f5 100644 --- a/config/steamroller/make_defs.mk +++ b/config/steamroller/make_defs.mk @@ -63,10 +63,10 @@ endif # Flags specific to optimized kernels. CKOPTFLAGS := $(COPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CKVECFLAGS := -mfpmath=sse -mavx -mfma -mno-fma4 -march=bdver3 +CKVECFLAGS := -mfpmath=sse -mavx -mfma -march=bdver3 -mno-fma4 -mno-tbm -mno-xop -mno-lwp else ifeq ($(CC_VENDOR),clang) -CKVECFLAGS := -mfpmath=sse -mavx -mfma -mno-fma4 -march=bdver3 +CKVECFLAGS := -mfpmath=sse -mavx -mfma -march=bdver3 -mno-fma4 -mno-tbm -mno-xop -mno-lwp else $(error gcc or clang are required for this configuration.) endif From 7690855c5106a56e5b341a350f8db1c78caacd89 Mon Sep 17 00:00:00 2001 From: "Field G. Van Zee" Date: Mon, 18 Feb 2019 19:16:01 -0600 Subject: [PATCH 10/17] Restored -funsafe-loop-optimizations to subconfigs. Details: - Restored use of -funsafe-loop-optimizations in the definitions of CRVECFLAGS (when using gcc), but only for sub-configurations (and not configuration families such as amd64, intel64, and x86_64). This more or less reverts 5190d05 and 6cf1550. --- config/bulldozer/make_defs.mk | 2 +- config/excavator/make_defs.mk | 2 +- config/haswell/make_defs.mk | 2 +- config/knc/make_defs.mk | 2 +- config/knl/make_defs.mk | 2 +- config/penryn/make_defs.mk | 2 +- config/piledriver/make_defs.mk | 2 +- config/sandybridge/make_defs.mk | 2 +- config/skx/make_defs.mk | 2 +- config/steamroller/make_defs.mk | 2 +- config/zen/make_defs.mk | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config/bulldozer/make_defs.mk b/config/bulldozer/make_defs.mk index 06f7d8251..2e7c0db5a 100644 --- a/config/bulldozer/make_defs.mk +++ b/config/bulldozer/make_defs.mk @@ -75,7 +75,7 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := $(CKVECFLAGS) +CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations else CRVECFLAGS := $(CKVECFLAGS) endif diff --git a/config/excavator/make_defs.mk b/config/excavator/make_defs.mk index 48de8ed50..30c885601 100644 --- a/config/excavator/make_defs.mk +++ b/config/excavator/make_defs.mk @@ -75,7 +75,7 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := $(CKVECFLAGS) +CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations else CRVECFLAGS := $(CKVECFLAGS) endif diff --git a/config/haswell/make_defs.mk b/config/haswell/make_defs.mk index e33b2ad11..41b61540a 100644 --- a/config/haswell/make_defs.mk +++ b/config/haswell/make_defs.mk @@ -79,7 +79,7 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := $(CKVECFLAGS) +CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations else CRVECFLAGS := $(CKVECFLAGS) endif diff --git a/config/knc/make_defs.mk b/config/knc/make_defs.mk index ba2209c16..48b89159f 100644 --- a/config/knc/make_defs.mk +++ b/config/knc/make_defs.mk @@ -71,7 +71,7 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := $(CKVECFLAGS) +CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations else CRVECFLAGS := $(CKVECFLAGS) endif diff --git a/config/knl/make_defs.mk b/config/knl/make_defs.mk index f4165f788..e239a2fdf 100644 --- a/config/knl/make_defs.mk +++ b/config/knl/make_defs.mk @@ -99,7 +99,7 @@ endif # Note: We use AVX2 for reference kernels instead of AVX-512. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := -march=knl -mno-avx512f -mno-avx512pf -mno-avx512er -mno-avx512cd +CRVECFLAGS := -march=knl -mno-avx512f -mno-avx512pf -mno-avx512er -mno-avx512cd -funsafe-loop-optimizations else ifeq ($(CC_VENDOR),icc) CRVECFLAGS := -xMIC-AVX512 diff --git a/config/penryn/make_defs.mk b/config/penryn/make_defs.mk index 060c06609..175c8d5bf 100644 --- a/config/penryn/make_defs.mk +++ b/config/penryn/make_defs.mk @@ -79,7 +79,7 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := $(CKVECFLAGS) +CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations else CRVECFLAGS := $(CKVECFLAGS) endif diff --git a/config/piledriver/make_defs.mk b/config/piledriver/make_defs.mk index 425040692..c5313d76b 100644 --- a/config/piledriver/make_defs.mk +++ b/config/piledriver/make_defs.mk @@ -75,7 +75,7 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := $(CKVECFLAGS) +CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations else CRVECFLAGS := $(CKVECFLAGS) endif diff --git a/config/sandybridge/make_defs.mk b/config/sandybridge/make_defs.mk index e9e5f3be3..02fb4d641 100644 --- a/config/sandybridge/make_defs.mk +++ b/config/sandybridge/make_defs.mk @@ -79,7 +79,7 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := $(CKVECFLAGS) +CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations else CRVECFLAGS := $(CKVECFLAGS) endif diff --git a/config/skx/make_defs.mk b/config/skx/make_defs.mk index e9319e476..98c5ebd6f 100644 --- a/config/skx/make_defs.mk +++ b/config/skx/make_defs.mk @@ -89,7 +89,7 @@ endif # to overcome the AVX-512 frequency drop". (Issue #187) CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := -march=skylake-avx512 -mno-avx512f -mno-avx512vl -mno-avx512bw -mno-avx512dq -mno-avx512cd +CRVECFLAGS := -march=skylake-avx512 -mno-avx512f -mno-avx512vl -mno-avx512bw -mno-avx512dq -mno-avx512cd -funsafe-loop-optimizations else ifeq ($(CC_VENDOR),icc) CRVECFLAGS := -xCORE-AVX2 diff --git a/config/steamroller/make_defs.mk b/config/steamroller/make_defs.mk index 58315d7f5..351720296 100644 --- a/config/steamroller/make_defs.mk +++ b/config/steamroller/make_defs.mk @@ -75,7 +75,7 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := $(CKVECFLAGS) +CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations else CRVECFLAGS := $(CKVECFLAGS) endif diff --git a/config/zen/make_defs.mk b/config/zen/make_defs.mk index dee06c8aa..5fdb7539f 100644 --- a/config/zen/make_defs.mk +++ b/config/zen/make_defs.mk @@ -79,7 +79,7 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := $(CKVECFLAGS) +CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations else CRVECFLAGS := $(CKVECFLAGS) endif From 70f12f209bc1901b5205902503707134cf2991a0 Mon Sep 17 00:00:00 2001 From: "Field G. Van Zee" Date: Wed, 20 Feb 2019 16:10:10 -0600 Subject: [PATCH 11/17] Changed unsafe-loop to unsafe-math optimizations. Details: - Changed -funsafe-loop-optimizations (re-)introduced in 7690855 for make_defs.mk files' CRVECFLAGS to -funsafe-math-optimizations (to account for a miscommunication in issue #300). Thanks to Dave Love for this suggestion and Jeff Hammond for his feedback on the topic. --- config/bulldozer/make_defs.mk | 2 +- config/excavator/make_defs.mk | 2 +- config/haswell/make_defs.mk | 2 +- config/knc/make_defs.mk | 2 +- config/knl/make_defs.mk | 2 +- config/penryn/make_defs.mk | 2 +- config/piledriver/make_defs.mk | 2 +- config/sandybridge/make_defs.mk | 2 +- config/skx/make_defs.mk | 2 +- config/steamroller/make_defs.mk | 2 +- config/zen/make_defs.mk | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config/bulldozer/make_defs.mk b/config/bulldozer/make_defs.mk index 2e7c0db5a..dec89a4c3 100644 --- a/config/bulldozer/make_defs.mk +++ b/config/bulldozer/make_defs.mk @@ -75,7 +75,7 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +CRVECFLAGS := $(CKVECFLAGS) -funsafe-math-optimizations else CRVECFLAGS := $(CKVECFLAGS) endif diff --git a/config/excavator/make_defs.mk b/config/excavator/make_defs.mk index 30c885601..deb85c79b 100644 --- a/config/excavator/make_defs.mk +++ b/config/excavator/make_defs.mk @@ -75,7 +75,7 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +CRVECFLAGS := $(CKVECFLAGS) -funsafe-math-optimizations else CRVECFLAGS := $(CKVECFLAGS) endif diff --git a/config/haswell/make_defs.mk b/config/haswell/make_defs.mk index 41b61540a..f08d5a937 100644 --- a/config/haswell/make_defs.mk +++ b/config/haswell/make_defs.mk @@ -79,7 +79,7 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +CRVECFLAGS := $(CKVECFLAGS) #-funsafe-math-optimizations else CRVECFLAGS := $(CKVECFLAGS) endif diff --git a/config/knc/make_defs.mk b/config/knc/make_defs.mk index 48b89159f..be3c9019d 100644 --- a/config/knc/make_defs.mk +++ b/config/knc/make_defs.mk @@ -71,7 +71,7 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +CRVECFLAGS := $(CKVECFLAGS) -funsafe-math-optimizations else CRVECFLAGS := $(CKVECFLAGS) endif diff --git a/config/knl/make_defs.mk b/config/knl/make_defs.mk index e239a2fdf..b08cf1e4d 100644 --- a/config/knl/make_defs.mk +++ b/config/knl/make_defs.mk @@ -99,7 +99,7 @@ endif # Note: We use AVX2 for reference kernels instead of AVX-512. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := -march=knl -mno-avx512f -mno-avx512pf -mno-avx512er -mno-avx512cd -funsafe-loop-optimizations +CRVECFLAGS := -march=knl -mno-avx512f -mno-avx512pf -mno-avx512er -mno-avx512cd -funsafe-math-optimizations else ifeq ($(CC_VENDOR),icc) CRVECFLAGS := -xMIC-AVX512 diff --git a/config/penryn/make_defs.mk b/config/penryn/make_defs.mk index 175c8d5bf..41d2d939f 100644 --- a/config/penryn/make_defs.mk +++ b/config/penryn/make_defs.mk @@ -79,7 +79,7 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +CRVECFLAGS := $(CKVECFLAGS) -funsafe-math-optimizations else CRVECFLAGS := $(CKVECFLAGS) endif diff --git a/config/piledriver/make_defs.mk b/config/piledriver/make_defs.mk index c5313d76b..bb23fbece 100644 --- a/config/piledriver/make_defs.mk +++ b/config/piledriver/make_defs.mk @@ -75,7 +75,7 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +CRVECFLAGS := $(CKVECFLAGS) -funsafe-math-optimizations else CRVECFLAGS := $(CKVECFLAGS) endif diff --git a/config/sandybridge/make_defs.mk b/config/sandybridge/make_defs.mk index 02fb4d641..ba18e4f32 100644 --- a/config/sandybridge/make_defs.mk +++ b/config/sandybridge/make_defs.mk @@ -79,7 +79,7 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +CRVECFLAGS := $(CKVECFLAGS) -funsafe-math-optimizations else CRVECFLAGS := $(CKVECFLAGS) endif diff --git a/config/skx/make_defs.mk b/config/skx/make_defs.mk index 98c5ebd6f..27bea5ef5 100644 --- a/config/skx/make_defs.mk +++ b/config/skx/make_defs.mk @@ -89,7 +89,7 @@ endif # to overcome the AVX-512 frequency drop". (Issue #187) CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := -march=skylake-avx512 -mno-avx512f -mno-avx512vl -mno-avx512bw -mno-avx512dq -mno-avx512cd -funsafe-loop-optimizations +CRVECFLAGS := -march=skylake-avx512 -mno-avx512f -mno-avx512vl -mno-avx512bw -mno-avx512dq -mno-avx512cd -funsafe-math-optimizations else ifeq ($(CC_VENDOR),icc) CRVECFLAGS := -xCORE-AVX2 diff --git a/config/steamroller/make_defs.mk b/config/steamroller/make_defs.mk index 351720296..a5b670704 100644 --- a/config/steamroller/make_defs.mk +++ b/config/steamroller/make_defs.mk @@ -75,7 +75,7 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +CRVECFLAGS := $(CKVECFLAGS) -funsafe-math-optimizations else CRVECFLAGS := $(CKVECFLAGS) endif diff --git a/config/zen/make_defs.mk b/config/zen/make_defs.mk index 5fdb7539f..0397f60b7 100644 --- a/config/zen/make_defs.mk +++ b/config/zen/make_defs.mk @@ -79,7 +79,7 @@ endif # Flags specific to reference kernels. CROPTFLAGS := $(CKOPTFLAGS) ifeq ($(CC_VENDOR),gcc) -CRVECFLAGS := $(CKVECFLAGS) -funsafe-loop-optimizations +CRVECFLAGS := $(CKVECFLAGS) -funsafe-math-optimizations else CRVECFLAGS := $(CKVECFLAGS) endif From f0dcc8944fa379d53770f5cae5d670140918f00c Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 27 Feb 2019 17:27:23 -0600 Subject: [PATCH 12/17] Add symbol export macro for all functions (#302) * initial export of blis functions * Regenerate def file for master * restore bli_extern_defs exporting for now --- build/bli_config.h.in | 3 + build/detect/config/config_detect.c | 1 + build/libblis-symbols.def | 188 ++++++------ frame/0/bli_l0_check.c | 6 +- frame/0/bli_l0_check.h | 20 +- frame/0/bli_l0_fpa.h | 2 +- frame/0/bli_l0_oapi.c | 16 +- frame/0/bli_l0_oapi.h | 14 +- frame/0/bli_l0_tapi.c | 20 +- frame/0/bli_l0_tapi.h | 20 +- frame/0/copysc/bli_copysc.c | 4 +- frame/0/copysc/bli_copysc.h | 4 +- frame/1/bli_l1v_check.c | 18 +- frame/1/bli_l1v_check.h | 34 +-- frame/1/bli_l1v_fpa.h | 2 +- frame/1/bli_l1v_ker_prot.h | 28 +- frame/1/bli_l1v_oapi.c | 20 +- frame/1/bli_l1v_oapi.h | 20 +- frame/1/bli_l1v_tapi.c | 20 +- frame/1/bli_l1v_tapi.h | 20 +- frame/1/other/packv/bli_packv_check.h | 2 +- frame/1/other/packv/bli_packv_cntl.h | 2 +- frame/1/other/packv/bli_packv_init.h | 4 +- frame/1/other/packv/bli_packv_int.h | 2 +- frame/1/other/packv/bli_packv_unb_var1.c | 2 +- frame/1/other/packv/bli_packv_unb_var1.h | 4 +- frame/1/other/scalv/bli_scalv_cntl.h | 8 +- frame/1/other/scalv/bli_scalv_int.h | 2 +- frame/1/other/unpackv/bli_unpackv_check.h | 2 +- frame/1/other/unpackv/bli_unpackv_cntl.h | 8 +- frame/1/other/unpackv/bli_unpackv_int.h | 4 +- frame/1/other/unpackv/bli_unpackv_unb_var1.c | 2 +- frame/1/other/unpackv/bli_unpackv_unb_var1.h | 4 +- frame/1d/bli_l1d_check.c | 10 +- frame/1d/bli_l1d_check.h | 18 +- frame/1d/bli_l1d_fpa.h | 2 +- frame/1d/bli_l1d_oapi.c | 14 +- frame/1d/bli_l1d_oapi.h | 10 +- frame/1d/bli_l1d_tapi.c | 14 +- frame/1d/bli_l1d_tapi.h | 14 +- frame/1f/bli_l1f_check.h | 10 +- frame/1f/bli_l1f_fpa.h | 2 +- frame/1f/bli_l1f_ker_prot.h | 10 +- frame/1f/bli_l1f_oapi.c | 10 +- frame/1f/bli_l1f_oapi.h | 10 +- frame/1f/bli_l1f_tapi.c | 10 +- frame/1f/bli_l1f_tapi.h | 10 +- frame/1m/bli_l1m_check.c | 8 +- frame/1m/bli_l1m_check.h | 14 +- frame/1m/bli_l1m_fpa.h | 4 +- frame/1m/bli_l1m_ker_prot.h | 12 +- frame/1m/bli_l1m_oapi.c | 12 +- frame/1m/bli_l1m_oapi.h | 8 +- frame/1m/bli_l1m_tapi.c | 14 +- frame/1m/bli_l1m_tapi.h | 10 +- frame/1m/bli_l1m_unb_var1.c | 10 +- frame/1m/bli_l1m_unb_var1.h | 10 +- frame/1m/other/bli_scalm_cntl.h | 2 +- frame/1m/other/bli_scalm_int.h | 2 +- frame/1m/packm/bli_packm_blk_var1.c | 2 +- frame/1m/packm/bli_packm_blk_var1_md.c | 4 +- frame/1m/packm/bli_packm_blk_var1_md.h | 4 +- frame/1m/packm/bli_packm_check.c | 4 +- frame/1m/packm/bli_packm_check.h | 4 +- frame/1m/packm/bli_packm_cntl.h | 2 +- frame/1m/packm/bli_packm_cxk.c | 2 +- frame/1m/packm/bli_packm_cxk.h | 2 +- frame/1m/packm/bli_packm_cxk_1er.c | 2 +- frame/1m/packm/bli_packm_cxk_1er.h | 2 +- frame/1m/packm/bli_packm_cxk_3mis.c | 2 +- frame/1m/packm/bli_packm_cxk_3mis.h | 2 +- frame/1m/packm/bli_packm_cxk_4mi.c | 2 +- frame/1m/packm/bli_packm_cxk_4mi.h | 2 +- frame/1m/packm/bli_packm_cxk_rih.c | 2 +- frame/1m/packm/bli_packm_cxk_rih.h | 2 +- frame/1m/packm/bli_packm_init.h | 4 +- frame/1m/packm/bli_packm_int.c | 2 +- frame/1m/packm/bli_packm_int.h | 2 +- frame/1m/packm/bli_packm_part.c | 6 +- frame/1m/packm/bli_packm_part.h | 8 +- frame/1m/packm/bli_packm_struc_cxk.c | 6 +- frame/1m/packm/bli_packm_struc_cxk.h | 6 +- frame/1m/packm/bli_packm_struc_cxk_1er.c | 6 +- frame/1m/packm/bli_packm_struc_cxk_1er.h | 6 +- frame/1m/packm/bli_packm_struc_cxk_3mis.c | 6 +- frame/1m/packm/bli_packm_struc_cxk_3mis.h | 6 +- frame/1m/packm/bli_packm_struc_cxk_4mi.c | 6 +- frame/1m/packm/bli_packm_struc_cxk_4mi.h | 6 +- frame/1m/packm/bli_packm_struc_cxk_md.c | 6 +- frame/1m/packm/bli_packm_struc_cxk_md.h | 4 +- frame/1m/packm/bli_packm_struc_cxk_rih.c | 6 +- frame/1m/packm/bli_packm_struc_cxk_rih.h | 6 +- frame/1m/packm/bli_packm_thrinfo.c | 4 +- frame/1m/packm/bli_packm_thrinfo.h | 8 +- frame/1m/packm/bli_packm_unb_var1.c | 2 +- frame/1m/packm/bli_packm_unb_var1.h | 4 +- frame/1m/packm/bli_packm_var.h | 6 +- frame/1m/unpackm/bli_unpackm_blk_var1.c | 4 +- frame/1m/unpackm/bli_unpackm_blk_var1.h | 4 +- frame/1m/unpackm/bli_unpackm_check.c | 2 +- frame/1m/unpackm/bli_unpackm_check.h | 2 +- frame/1m/unpackm/bli_unpackm_cntl.h | 2 +- frame/1m/unpackm/bli_unpackm_cxk.c | 2 +- frame/1m/unpackm/bli_unpackm_cxk.h | 2 +- frame/1m/unpackm/bli_unpackm_int.c | 2 +- frame/1m/unpackm/bli_unpackm_int.h | 2 +- frame/1m/unpackm/bli_unpackm_unb_var1.c | 4 +- frame/1m/unpackm/bli_unpackm_unb_var1.h | 4 +- frame/2/bli_l2_check.h | 12 +- frame/2/bli_l2_fpa.h | 4 +- frame/2/bli_l2_oapi.c | 12 +- frame/2/bli_l2_oapi.h | 8 +- frame/2/bli_l2_tapi.c | 14 +- frame/2/bli_l2_tapi.h | 14 +- frame/2/gemv/bli_gemv_unb_var1.c | 2 +- frame/2/gemv/bli_gemv_unb_var2.c | 2 +- frame/2/gemv/bli_gemv_unf_var1.c | 2 +- frame/2/gemv/bli_gemv_unf_var2.c | 2 +- frame/2/gemv/bli_gemv_var.h | 4 +- frame/2/gemv/bli_gemv_var_oapi.c | 2 +- frame/2/gemv/bli_gemv_var_oapi.c.prev | 2 +- frame/2/gemv/other/bli_gemv_cntl.h | 8 +- frame/2/gemv/other/bli_gemv_front.c | 2 +- frame/2/gemv/other/bli_gemv_front.h | 4 +- frame/2/gemv/other/bli_gemv_int.h | 2 +- frame/2/ger/bli_ger_unb_var1.c | 2 +- frame/2/ger/bli_ger_unb_var2.c | 2 +- frame/2/ger/bli_ger_var.h | 4 +- frame/2/ger/bli_ger_var_oapi.c | 2 +- frame/2/ger/other/bli_ger_cntl.h | 8 +- frame/2/ger/other/bli_ger_front.c | 2 +- frame/2/ger/other/bli_ger_front.h | 4 +- frame/2/ger/other/bli_ger_int.h | 2 +- frame/2/hemv/bli_hemv_unb_var1.c | 2 +- frame/2/hemv/bli_hemv_unb_var2.c | 2 +- frame/2/hemv/bli_hemv_unb_var3.c | 2 +- frame/2/hemv/bli_hemv_unb_var4.c | 2 +- frame/2/hemv/bli_hemv_unf_var1.c | 2 +- frame/2/hemv/bli_hemv_unf_var1a.c | 2 +- frame/2/hemv/bli_hemv_unf_var3.c | 2 +- frame/2/hemv/bli_hemv_unf_var3a.c | 2 +- frame/2/hemv/bli_hemv_var.h | 4 +- frame/2/hemv/bli_hemv_var_oapi.c | 2 +- frame/2/hemv/other/bli_hemv_cntl.h | 8 +- frame/2/hemv/other/bli_hemv_front.c | 2 +- frame/2/hemv/other/bli_hemv_front.h | 4 +- frame/2/hemv/other/bli_hemv_int.h | 2 +- frame/2/her/bli_her_unb_var1.c | 2 +- frame/2/her/bli_her_unb_var2.c | 2 +- frame/2/her/bli_her_var.h | 4 +- frame/2/her/bli_her_var_oapi.c | 2 +- frame/2/her/other/bli_her_cntl.h | 8 +- frame/2/her/other/bli_her_front.c | 2 +- frame/2/her/other/bli_her_front.h | 4 +- frame/2/her/other/bli_her_int.h | 2 +- frame/2/her2/bli_her2_unb_var1.c | 2 +- frame/2/her2/bli_her2_unb_var2.c | 2 +- frame/2/her2/bli_her2_unb_var3.c | 2 +- frame/2/her2/bli_her2_unb_var4.c | 2 +- frame/2/her2/bli_her2_unf_var1.c | 2 +- frame/2/her2/bli_her2_unf_var4.c | 2 +- frame/2/her2/bli_her2_var.h | 4 +- frame/2/her2/bli_her2_var_oapi.c | 2 +- frame/2/her2/other/bli_her2_cntl.h | 6 +- frame/2/her2/other/bli_her2_front.c | 2 +- frame/2/her2/other/bli_her2_front.h | 4 +- frame/2/her2/other/bli_her2_int.h | 2 +- frame/2/symv/other/bli_symv_front.c | 2 +- frame/2/symv/other/bli_symv_front.h | 4 +- frame/2/syr/other/bli_syr_front.c | 2 +- frame/2/syr/other/bli_syr_front.h | 4 +- frame/2/syr2/other/bli_syr2_front.c | 2 +- frame/2/syr2/other/bli_syr2_front.h | 4 +- frame/2/trmv/bli_trmv_unb_var1.c | 2 +- frame/2/trmv/bli_trmv_unb_var2.c | 2 +- frame/2/trmv/bli_trmv_unf_var1.c | 2 +- frame/2/trmv/bli_trmv_unf_var2.c | 2 +- frame/2/trmv/bli_trmv_var.h | 4 +- frame/2/trmv/bli_trmv_var_oapi.c | 2 +- frame/2/trmv/other/bli_trmv_cntl.h | 8 +- frame/2/trmv/other/bli_trmv_front.c | 2 +- frame/2/trmv/other/bli_trmv_front.h | 4 +- frame/2/trmv/other/bli_trmv_int.h | 2 +- frame/2/trsv/bli_trsv_unb_var1.c | 2 +- frame/2/trsv/bli_trsv_unb_var2.c | 2 +- frame/2/trsv/bli_trsv_unf_var1.c | 2 +- frame/2/trsv/bli_trsv_unf_var2.c | 2 +- frame/2/trsv/bli_trsv_var.h | 4 +- frame/2/trsv/bli_trsv_var_oapi.c | 2 +- frame/2/trsv/other/bli_trsv_cntl.h | 8 +- frame/2/trsv/other/bli_trsv_front.c | 2 +- frame/2/trsv/other/bli_trsv_front.h | 4 +- frame/2/trsv/other/bli_trsv_int.h | 2 +- frame/3/bli_l3_blocksize.h | 6 +- frame/3/bli_l3_check.h | 16 +- frame/3/bli_l3_cntl.h | 4 +- frame/3/bli_l3_direct.h | 4 +- frame/3/bli_l3_oapi.c | 8 +- frame/3/bli_l3_oapi.h | 8 +- frame/3/bli_l3_packm.h | 2 +- frame/3/bli_l3_prune.c | 20 +- frame/3/bli_l3_prune.h | 4 +- frame/3/bli_l3_tapi.c | 16 +- frame/3/bli_l3_tapi.h | 16 +- frame/3/bli_l3_thrinfo.h | 12 +- frame/3/bli_l3_ukr_fpa.h | 2 +- frame/3/bli_l3_ukr_oapi.c | 6 +- frame/3/bli_l3_ukr_oapi.h | 6 +- frame/3/bli_l3_ukr_prot.h | 6 +- frame/3/bli_l3_ukr_tapi.c | 6 +- frame/3/gemm/bli_gemm_cntl.c | 2 +- frame/3/gemm/bli_gemm_cntl.h | 10 +- frame/3/gemm/bli_gemm_front.c | 2 +- frame/3/gemm/bli_gemm_front.h | 4 +- frame/3/gemm/bli_gemm_int.c | 2 +- frame/3/gemm/bli_gemm_int.h | 2 +- frame/3/gemm/bli_gemm_ker_var2.c | 2 +- frame/3/gemm/bli_gemm_ker_var2_md.c | 2 +- frame/3/gemm/bli_gemm_md.h | 26 +- frame/3/gemm/bli_gemm_md_c2r_ref.c | 2 +- frame/3/gemm/bli_gemm_var.h | 4 +- frame/3/gemm/ind/bli_gemm4mb_ker_var2.c | 2 +- frame/3/gemm/ind/old/bli_gemm3m2_ker_var2.c | 2 +- frame/3/gemm/other/bli_gemm_ker_var2.c | 2 +- frame/3/gemm/other/bli_gemm_ker_var2rr.c | 2 +- frame/3/gemm/other/bli_gemm_ker_var2sl.c | 2 +- frame/3/gemm/other/bli_gemm_ker_var5.c | 2 +- frame/3/gemm/other/bli_gemm_ker_var5.h | 4 +- frame/3/hemm/bli_hemm_front.c | 2 +- frame/3/hemm/bli_hemm_front.h | 2 +- frame/3/her2k/bli_her2k_front.c | 2 +- frame/3/her2k/bli_her2k_front.h | 2 +- frame/3/herk/bli_herk_front.c | 2 +- frame/3/herk/bli_herk_front.h | 2 +- frame/3/herk/bli_herk_l_ker_var2.c | 2 +- frame/3/herk/bli_herk_u_ker_var2.c | 2 +- frame/3/herk/bli_herk_var.h | 4 +- .../herk/other/bli_herk_l_ker_var2.1looprr.c | 2 +- frame/3/herk/other/bli_herk_l_ker_var2.c | 2 +- frame/3/herk/other/bli_herk_l_ker_var2rr.c | 2 +- frame/3/herk/other/bli_herk_l_ker_var2sl.c | 2 +- .../herk/other/bli_herk_u_ker_var2.1looprr.c | 2 +- frame/3/herk/other/bli_herk_u_ker_var2.c | 2 +- frame/3/herk/other/bli_herk_u_ker_var2rr.c | 2 +- frame/3/herk/other/bli_herk_u_ker_var2sl.c | 2 +- frame/3/symm/bli_symm_front.c | 2 +- frame/3/symm/bli_symm_front.h | 2 +- frame/3/syr2k/bli_syr2k_front.c | 2 +- frame/3/syr2k/bli_syr2k_front.h | 2 +- frame/3/syrk/bli_syrk_front.c | 2 +- frame/3/syrk/bli_syrk_front.h | 2 +- frame/3/trmm/bli_trmm_front.c | 2 +- frame/3/trmm/bli_trmm_front.h | 2 +- frame/3/trmm/bli_trmm_ll_ker_var2.c | 2 +- frame/3/trmm/bli_trmm_lu_ker_var2.c | 2 +- frame/3/trmm/bli_trmm_rl_ker_var2.c | 2 +- frame/3/trmm/bli_trmm_ru_ker_var2.c | 2 +- frame/3/trmm/bli_trmm_var.h | 4 +- frame/3/trmm/other/bli_trmm_ll_ker_var2.c | 2 +- frame/3/trmm/other/bli_trmm_ll_ker_var2rr.c | 2 +- frame/3/trmm/other/bli_trmm_ll_ker_var2sl.c | 2 +- frame/3/trmm/other/bli_trmm_lu_ker_var2.c | 2 +- frame/3/trmm/other/bli_trmm_lu_ker_var2rr.c | 2 +- frame/3/trmm/other/bli_trmm_lu_ker_var2sl.c | 2 +- frame/3/trmm/other/bli_trmm_rl_ker_var2.c | 2 +- frame/3/trmm/other/bli_trmm_rl_ker_var2rr.c | 2 +- frame/3/trmm/other/bli_trmm_rl_ker_var2sl.c | 2 +- frame/3/trmm/other/bli_trmm_ru_ker_var2.c | 2 +- frame/3/trmm/other/bli_trmm_ru_ker_var2rr.c | 2 +- frame/3/trmm/other/bli_trmm_ru_ker_var2sl.c | 2 +- frame/3/trmm3/bli_trmm3_front.c | 2 +- frame/3/trmm3/bli_trmm3_front.h | 2 +- frame/3/trsm/bli_trsm_cntl.c | 2 +- frame/3/trsm/bli_trsm_cntl.h | 10 +- frame/3/trsm/bli_trsm_front.c | 2 +- frame/3/trsm/bli_trsm_front.h | 2 +- frame/3/trsm/bli_trsm_int.c | 2 +- frame/3/trsm/bli_trsm_int.h | 2 +- frame/3/trsm/bli_trsm_ll_ker_var2.c | 2 +- frame/3/trsm/bli_trsm_lu_ker_var2.c | 2 +- frame/3/trsm/bli_trsm_rl_ker_var2.c | 2 +- frame/3/trsm/bli_trsm_ru_ker_var2.c | 2 +- frame/3/trsm/bli_trsm_var.h | 4 +- frame/3/trsm/other/bli_trsm_ll_ker_var2.c | 2 +- frame/3/trsm/other/bli_trsm_ll_ker_var2rr.c | 2 +- frame/3/trsm/other/bli_trsm_ll_ker_var2sl.c | 2 +- frame/3/trsm/other/bli_trsm_lu_ker_var2.c | 2 +- frame/3/trsm/other/bli_trsm_lu_ker_var2rr.c | 2 +- frame/3/trsm/other/bli_trsm_lu_ker_var2sl.c | 2 +- frame/3/trsm/other/bli_trsm_rl_ker_var2.c | 2 +- frame/3/trsm/other/bli_trsm_ru_ker_var2.c | 2 +- frame/base/bli_apool.h | 18 +- frame/base/bli_arch.c | 1 + frame/base/bli_arch.h | 8 +- frame/base/bli_array.h | 10 +- frame/base/bli_blksz.h | 28 +- frame/base/bli_check.h | 126 ++++---- frame/base/bli_clock.h | 6 +- frame/base/bli_cntl.h | 18 +- frame/base/bli_cntx.h | 16 +- frame/base/bli_const.h | 4 +- frame/base/bli_cpuid.c | 1 + frame/base/bli_cpuid.h | 34 +-- frame/base/bli_error.c | 2 +- frame/base/bli_error.h | 12 +- frame/base/bli_func.h | 12 +- frame/base/bli_getopt.c | 2 +- frame/base/bli_getopt.h | 4 +- frame/base/bli_gks.h | 30 +- frame/base/bli_info.h | 84 ++--- frame/base/bli_init.h | 16 +- frame/base/bli_machval.c | 2 +- frame/base/bli_machval.h | 4 +- frame/base/bli_malloc.c | 2 +- frame/base/bli_malloc.h | 26 +- frame/base/bli_mbool.h | 6 +- frame/base/bli_membrk.h | 22 +- frame/base/bli_memsys.h | 4 +- frame/base/bli_obj.h | 32 +- frame/base/bli_obj_scalar.h | 18 +- frame/base/bli_param_map.h | 42 +-- frame/base/bli_part.h | 10 +- frame/base/bli_pool.h | 22 +- frame/base/bli_prune.h | 2 +- frame/base/bli_query.h | 6 +- frame/base/bli_rntm.h | 6 +- frame/base/bli_sba.h | 16 +- frame/base/bli_setgetij.c | 4 +- frame/base/bli_setgetij.h | 8 +- frame/base/bli_setri.h | 8 +- frame/base/bli_string.h | 2 +- frame/base/bli_winsys.h | 2 +- frame/base/cast/bli_castm.c | 6 +- frame/base/cast/bli_castm.h | 6 +- frame/base/cast/bli_castnzm.c | 6 +- frame/base/cast/bli_castnzm.h | 6 +- frame/base/cast/bli_castv.c | 6 +- frame/base/cast/bli_castv.h | 6 +- frame/base/cast/old/bli_cast_check.c | 4 +- frame/base/cast/old/bli_cast_check.h | 4 +- frame/base/check/bli_obj_check.c | 22 +- frame/base/check/bli_obj_check.h | 24 +- frame/base/check/bli_part_check.c | 6 +- frame/base/check/bli_part_check.h | 6 +- frame/base/noopt/bli_dlamch.h | 2 +- frame/base/noopt/bli_lsame.h | 2 +- frame/base/noopt/bli_slamch.h | 2 +- frame/base/proj/bli_projm.c | 4 +- frame/base/proj/bli_projm.h | 4 +- frame/base/proj/bli_projv.c | 4 +- frame/base/proj/bli_projv.h | 4 +- frame/base/proj/old/bli_proj_check.c | 4 +- frame/base/proj/old/bli_proj_check.h | 4 +- frame/compat/attic/bla_gbmv.c | 2 +- frame/compat/attic/bla_gbmv.h | 2 +- frame/compat/attic/bla_hbmv.c | 2 +- frame/compat/attic/bla_hbmv.h | 2 +- frame/compat/attic/bla_hpmv.c | 2 +- frame/compat/attic/bla_hpmv.h | 2 +- frame/compat/attic/bla_hpr.c | 2 +- frame/compat/attic/bla_hpr.h | 2 +- frame/compat/attic/bla_hpr2.c | 2 +- frame/compat/attic/bla_hpr2.h | 2 +- frame/compat/attic/bla_rot.c | 2 +- frame/compat/attic/bla_rot.h | 2 +- frame/compat/attic/bla_rotg.c | 2 +- frame/compat/attic/bla_rotg.h | 2 +- frame/compat/attic/bla_rotm.c | 2 +- frame/compat/attic/bla_rotm.h | 2 +- frame/compat/attic/bla_rotmg.c | 2 +- frame/compat/attic/bla_rotmg.h | 2 +- frame/compat/attic/bla_sbmv.c | 2 +- frame/compat/attic/bla_sbmv.h | 2 +- frame/compat/attic/bla_spmv.c | 2 +- frame/compat/attic/bla_spmv.h | 2 +- frame/compat/attic/bla_spr.c | 2 +- frame/compat/attic/bla_spr.h | 2 +- frame/compat/attic/bla_spr2.c | 2 +- frame/compat/attic/bla_spr2.h | 2 +- frame/compat/attic/bla_tbmv.c | 2 +- frame/compat/attic/bla_tbmv.h | 2 +- frame/compat/attic/bla_tbsv.c | 2 +- frame/compat/attic/bla_tbsv.h | 2 +- frame/compat/attic/bla_tpmv.c | 2 +- frame/compat/attic/bla_tpmv.h | 2 +- frame/compat/attic/bla_tpsv.c | 2 +- frame/compat/attic/bla_tpsv.h | 2 +- frame/compat/bla_amax.c | 2 +- frame/compat/bla_amax.h | 2 +- frame/compat/bla_asum.c | 2 +- frame/compat/bla_asum.h | 2 +- frame/compat/bla_axpy.c | 2 +- frame/compat/bla_axpy.h | 2 +- frame/compat/bla_copy.c | 2 +- frame/compat/bla_copy.h | 2 +- frame/compat/bla_dot.c | 6 +- frame/compat/bla_dot.h | 6 +- frame/compat/bla_gemm.c | 2 +- frame/compat/bla_gemm.h | 2 +- frame/compat/bla_gemv.c | 2 +- frame/compat/bla_gemv.h | 2 +- frame/compat/bla_ger.c | 2 +- frame/compat/bla_ger.h | 2 +- frame/compat/bla_hemm.c | 2 +- frame/compat/bla_hemm.h | 2 +- frame/compat/bla_hemv.c | 2 +- frame/compat/bla_hemv.h | 2 +- frame/compat/bla_her.c | 2 +- frame/compat/bla_her.h | 2 +- frame/compat/bla_her2.c | 2 +- frame/compat/bla_her2.h | 2 +- frame/compat/bla_her2k.c | 2 +- frame/compat/bla_her2k.h | 2 +- frame/compat/bla_herk.c | 2 +- frame/compat/bla_herk.h | 2 +- frame/compat/bla_nrm2.c | 2 +- frame/compat/bla_nrm2.h | 2 +- frame/compat/bla_scal.c | 2 +- frame/compat/bla_scal.h | 2 +- frame/compat/bla_swap.c | 2 +- frame/compat/bla_swap.h | 2 +- frame/compat/bla_symm.c | 2 +- frame/compat/bla_symm.h | 2 +- frame/compat/bla_symv.c | 2 +- frame/compat/bla_symv.h | 2 +- frame/compat/bla_syr.c | 2 +- frame/compat/bla_syr.h | 2 +- frame/compat/bla_syr2.c | 2 +- frame/compat/bla_syr2.h | 2 +- frame/compat/bla_syr2k.c | 2 +- frame/compat/bla_syr2k.h | 2 +- frame/compat/bla_syrk.c | 2 +- frame/compat/bla_syrk.h | 2 +- frame/compat/bla_trmm.c | 2 +- frame/compat/bla_trmm.h | 2 +- frame/compat/bla_trmv.c | 2 +- frame/compat/bla_trmv.h | 2 +- frame/compat/bla_trsm.c | 2 +- frame/compat/bla_trsm.h | 2 +- frame/compat/bla_trsv.c | 2 +- frame/compat/bla_trsv.h | 2 +- frame/compat/blis/thread/b77_thread.c | 4 +- frame/compat/blis/thread/b77_thread.h | 4 +- frame/compat/cblas/f77_sub/f77_amax_sub.c | 2 +- frame/compat/cblas/f77_sub/f77_amax_sub.h | 2 +- frame/compat/cblas/f77_sub/f77_asum_sub.c | 2 +- frame/compat/cblas/f77_sub/f77_asum_sub.h | 2 +- frame/compat/cblas/f77_sub/f77_dot_sub.c | 6 +- frame/compat/cblas/f77_sub/f77_dot_sub.h | 6 +- frame/compat/cblas/f77_sub/f77_nrm2_sub.c | 2 +- frame/compat/cblas/f77_sub/f77_nrm2_sub.h | 2 +- frame/compat/cblas/src/cblas.h | 286 +++++++++--------- frame/compat/cblas/src/cblas_caxpy.c | 2 +- frame/compat/cblas/src/cblas_ccopy.c | 2 +- frame/compat/cblas/src/cblas_cdotc_sub.c | 2 +- frame/compat/cblas/src/cblas_cdotu_sub.c | 2 +- frame/compat/cblas/src/cblas_cgbmv.c | 2 +- frame/compat/cblas/src/cblas_cgemm.c | 2 +- frame/compat/cblas/src/cblas_cgemv.c | 2 +- frame/compat/cblas/src/cblas_cgerc.c | 2 +- frame/compat/cblas/src/cblas_cgeru.c | 2 +- frame/compat/cblas/src/cblas_chbmv.c | 2 +- frame/compat/cblas/src/cblas_chemm.c | 2 +- frame/compat/cblas/src/cblas_chemv.c | 2 +- frame/compat/cblas/src/cblas_cher.c | 2 +- frame/compat/cblas/src/cblas_cher2.c | 2 +- frame/compat/cblas/src/cblas_cher2k.c | 2 +- frame/compat/cblas/src/cblas_cherk.c | 2 +- frame/compat/cblas/src/cblas_chpmv.c | 2 +- frame/compat/cblas/src/cblas_chpr.c | 2 +- frame/compat/cblas/src/cblas_chpr2.c | 2 +- frame/compat/cblas/src/cblas_cscal.c | 2 +- frame/compat/cblas/src/cblas_csscal.c | 2 +- frame/compat/cblas/src/cblas_cswap.c | 2 +- frame/compat/cblas/src/cblas_csymm.c | 2 +- frame/compat/cblas/src/cblas_csyr2k.c | 2 +- frame/compat/cblas/src/cblas_csyrk.c | 2 +- frame/compat/cblas/src/cblas_ctbmv.c | 2 +- frame/compat/cblas/src/cblas_ctbsv.c | 2 +- frame/compat/cblas/src/cblas_ctpmv.c | 2 +- frame/compat/cblas/src/cblas_ctpsv.c | 2 +- frame/compat/cblas/src/cblas_ctrmm.c | 2 +- frame/compat/cblas/src/cblas_ctrmv.c | 2 +- frame/compat/cblas/src/cblas_ctrsm.c | 2 +- frame/compat/cblas/src/cblas_ctrsv.c | 2 +- frame/compat/cblas/src/cblas_daxpy.c | 2 +- frame/compat/cblas/src/cblas_dcopy.c | 2 +- frame/compat/cblas/src/cblas_dgbmv.c | 2 +- frame/compat/cblas/src/cblas_dgemm.c | 2 +- frame/compat/cblas/src/cblas_dgemv.c | 2 +- frame/compat/cblas/src/cblas_dger.c | 2 +- frame/compat/cblas/src/cblas_drot.c | 2 +- frame/compat/cblas/src/cblas_drotg.c | 2 +- frame/compat/cblas/src/cblas_drotm.c | 2 +- frame/compat/cblas/src/cblas_drotmg.c | 2 +- frame/compat/cblas/src/cblas_dsbmv.c | 2 +- frame/compat/cblas/src/cblas_dscal.c | 2 +- frame/compat/cblas/src/cblas_dspmv.c | 2 +- frame/compat/cblas/src/cblas_dspr.c | 2 +- frame/compat/cblas/src/cblas_dspr2.c | 2 +- frame/compat/cblas/src/cblas_dswap.c | 2 +- frame/compat/cblas/src/cblas_dsymm.c | 2 +- frame/compat/cblas/src/cblas_dsymv.c | 2 +- frame/compat/cblas/src/cblas_dsyr.c | 2 +- frame/compat/cblas/src/cblas_dsyr2.c | 2 +- frame/compat/cblas/src/cblas_dsyr2k.c | 2 +- frame/compat/cblas/src/cblas_dsyrk.c | 2 +- frame/compat/cblas/src/cblas_dtbmv.c | 2 +- frame/compat/cblas/src/cblas_dtbsv.c | 2 +- frame/compat/cblas/src/cblas_dtpmv.c | 2 +- frame/compat/cblas/src/cblas_dtpsv.c | 2 +- frame/compat/cblas/src/cblas_dtrmm.c | 2 +- frame/compat/cblas/src/cblas_dtrmv.c | 2 +- frame/compat/cblas/src/cblas_dtrsm.c | 2 +- frame/compat/cblas/src/cblas_dtrsv.c | 2 +- frame/compat/cblas/src/cblas_saxpy.c | 2 +- frame/compat/cblas/src/cblas_scopy.c | 2 +- frame/compat/cblas/src/cblas_sgbmv.c | 2 +- frame/compat/cblas/src/cblas_sgemm.c | 2 +- frame/compat/cblas/src/cblas_sgemv.c | 2 +- frame/compat/cblas/src/cblas_sger.c | 2 +- frame/compat/cblas/src/cblas_srot.c | 2 +- frame/compat/cblas/src/cblas_srotg.c | 2 +- frame/compat/cblas/src/cblas_srotm.c | 2 +- frame/compat/cblas/src/cblas_srotmg.c | 2 +- frame/compat/cblas/src/cblas_ssbmv.c | 2 +- frame/compat/cblas/src/cblas_sscal.c | 2 +- frame/compat/cblas/src/cblas_sspmv.c | 2 +- frame/compat/cblas/src/cblas_sspr.c | 2 +- frame/compat/cblas/src/cblas_sspr2.c | 2 +- frame/compat/cblas/src/cblas_sswap.c | 2 +- frame/compat/cblas/src/cblas_ssymm.c | 2 +- frame/compat/cblas/src/cblas_ssymv.c | 2 +- frame/compat/cblas/src/cblas_ssyr.c | 2 +- frame/compat/cblas/src/cblas_ssyr2.c | 2 +- frame/compat/cblas/src/cblas_ssyr2k.c | 2 +- frame/compat/cblas/src/cblas_ssyrk.c | 2 +- frame/compat/cblas/src/cblas_stbmv.c | 2 +- frame/compat/cblas/src/cblas_stbsv.c | 2 +- frame/compat/cblas/src/cblas_stpmv.c | 2 +- frame/compat/cblas/src/cblas_stpsv.c | 2 +- frame/compat/cblas/src/cblas_strmm.c | 2 +- frame/compat/cblas/src/cblas_strmv.c | 2 +- frame/compat/cblas/src/cblas_strsm.c | 2 +- frame/compat/cblas/src/cblas_strsv.c | 2 +- frame/compat/cblas/src/cblas_xerbla.c | 2 +- frame/compat/cblas/src/cblas_zaxpy.c | 2 +- frame/compat/cblas/src/cblas_zcopy.c | 2 +- frame/compat/cblas/src/cblas_zdotc_sub.c | 2 +- frame/compat/cblas/src/cblas_zdotu_sub.c | 2 +- frame/compat/cblas/src/cblas_zdscal.c | 2 +- frame/compat/cblas/src/cblas_zgbmv.c | 2 +- frame/compat/cblas/src/cblas_zgemm.c | 2 +- frame/compat/cblas/src/cblas_zgemv.c | 2 +- frame/compat/cblas/src/cblas_zgerc.c | 2 +- frame/compat/cblas/src/cblas_zgeru.c | 2 +- frame/compat/cblas/src/cblas_zhbmv.c | 2 +- frame/compat/cblas/src/cblas_zhemm.c | 2 +- frame/compat/cblas/src/cblas_zhemv.c | 2 +- frame/compat/cblas/src/cblas_zher.c | 2 +- frame/compat/cblas/src/cblas_zher2.c | 2 +- frame/compat/cblas/src/cblas_zher2k.c | 2 +- frame/compat/cblas/src/cblas_zherk.c | 2 +- frame/compat/cblas/src/cblas_zhpmv.c | 2 +- frame/compat/cblas/src/cblas_zhpr.c | 2 +- frame/compat/cblas/src/cblas_zhpr2.c | 2 +- frame/compat/cblas/src/cblas_zscal.c | 2 +- frame/compat/cblas/src/cblas_zswap.c | 2 +- frame/compat/cblas/src/cblas_zsymm.c | 2 +- frame/compat/cblas/src/cblas_zsyr2k.c | 2 +- frame/compat/cblas/src/cblas_zsyrk.c | 2 +- frame/compat/cblas/src/cblas_ztbmv.c | 2 +- frame/compat/cblas/src/cblas_ztbsv.c | 2 +- frame/compat/cblas/src/cblas_ztpmv.c | 2 +- frame/compat/cblas/src/cblas_ztpsv.c | 2 +- frame/compat/cblas/src/cblas_ztrmm.c | 2 +- frame/compat/cblas/src/cblas_ztrmv.c | 2 +- frame/compat/cblas/src/cblas_ztrsm.c | 2 +- frame/compat/cblas/src/cblas_ztrsv.c | 2 +- frame/compat/f2c/bla_cabs1.c | 4 +- frame/compat/f2c/bla_cabs1.h | 4 +- frame/compat/f2c/bla_gbmv.c | 24 +- frame/compat/f2c/bla_gbmv.h | 8 +- frame/compat/f2c/bla_hbmv.c | 12 +- frame/compat/f2c/bla_hbmv.h | 4 +- frame/compat/f2c/bla_hpmv.c | 12 +- frame/compat/f2c/bla_hpmv.h | 4 +- frame/compat/f2c/bla_hpr.c | 12 +- frame/compat/f2c/bla_hpr.h | 4 +- frame/compat/f2c/bla_hpr2.c | 12 +- frame/compat/f2c/bla_hpr2.h | 4 +- frame/compat/f2c/bla_lsame.c | 2 +- frame/compat/f2c/bla_lsame.h | 2 +- frame/compat/f2c/bla_rot.c | 8 +- frame/compat/f2c/bla_rot.h | 8 +- frame/compat/f2c/bla_rotg.c | 8 +- frame/compat/f2c/bla_rotg.h | 8 +- frame/compat/f2c/bla_rotm.c | 4 +- frame/compat/f2c/bla_rotm.h | 4 +- frame/compat/f2c/bla_rotmg.c | 4 +- frame/compat/f2c/bla_rotmg.h | 4 +- frame/compat/f2c/bla_sbmv.c | 12 +- frame/compat/f2c/bla_sbmv.h | 4 +- frame/compat/f2c/bla_spmv.c | 12 +- frame/compat/f2c/bla_spmv.h | 4 +- frame/compat/f2c/bla_spr.c | 12 +- frame/compat/f2c/bla_spr.h | 4 +- frame/compat/f2c/bla_spr2.c | 12 +- frame/compat/f2c/bla_spr2.h | 4 +- frame/compat/f2c/bla_tbmv.c | 24 +- frame/compat/f2c/bla_tbmv.h | 8 +- frame/compat/f2c/bla_tbsv.c | 24 +- frame/compat/f2c/bla_tbsv.h | 8 +- frame/compat/f2c/bla_tpmv.c | 24 +- frame/compat/f2c/bla_tpmv.h | 8 +- frame/compat/f2c/bla_tpsv.c | 24 +- frame/compat/f2c/bla_tpsv.h | 8 +- frame/compat/f2c/bla_xerbla.c | 2 +- frame/compat/f2c/bla_xerbla.h | 2 +- frame/include/bli_arch_config_pre.h | 6 +- frame/include/bli_macro_defs.h | 8 +- frame/include/bli_param_macro_defs.h | 12 +- frame/ind/bli_ind.h | 30 +- frame/ind/bli_l3_ind.h | 16 +- frame/ind/cntx/bli_cntx_ind_stage.c | 16 +- frame/ind/cntx/bli_cntx_ind_stage.h | 16 +- frame/ind/oapi/bli_l3_3m4m1m_oapi.c | 10 +- frame/ind/oapi/bli_l3_ind_oapi.c | 8 +- frame/ind/oapi/bli_l3_ind_oapi.h | 38 +-- frame/ind/oapi/bli_l3_nat_oapi.c | 10 +- frame/ind/tapi/bli_l3_ind_tapi.c | 20 +- frame/ind/tapi/bli_l3_ind_tapi.h | 20 +- frame/ind/ukernels/bli_l3_ind_ukr.h | 6 +- frame/thread/bli_pthread.h | 60 ++-- frame/thread/bli_thrcomm.h | 16 +- frame/thread/bli_thrcomm_openmp.h | 8 +- frame/thread/bli_thread.h | 52 ++-- frame/thread/bli_thrinfo.h | 14 +- frame/util/bli_util_check.c | 14 +- frame/util/bli_util_check.h | 30 +- frame/util/bli_util_fpa.h | 4 +- frame/util/bli_util_oapi.c | 20 +- frame/util/bli_util_oapi.h | 18 +- frame/util/bli_util_tapi.c | 18 +- frame/util/bli_util_tapi.h | 18 +- frame/util/bli_util_unb_var1.c | 34 +-- frame/util/bli_util_unb_var1.h | 18 +- 647 files changed, 2028 insertions(+), 2022 deletions(-) diff --git a/build/bli_config.h.in b/build/bli_config.h.in index e3a97ca79..1bd5e57f6 100644 --- a/build/bli_config.h.in +++ b/build/bli_config.h.in @@ -159,4 +159,7 @@ #define BLIS_DISABLE_SHARED #endif +#define BLIS_EXPORT_BLAS +#define BLIS_EXPORT_BLIS + #endif diff --git a/build/detect/config/config_detect.c b/build/detect/config/config_detect.c index 85b79e476..12b93162a 100644 --- a/build/detect/config/config_detect.c +++ b/build/detect/config/config_detect.c @@ -33,6 +33,7 @@ */ +#define BLIS_EXPORT_BLIS #include "bli_system.h" #include "bli_type_defs.h" #include "bli_arch.h" diff --git a/build/libblis-symbols.def b/build/libblis-symbols.def index 3ee6f6821..2979dac61 100644 --- a/build/libblis-symbols.def +++ b/build/libblis-symbols.def @@ -186,9 +186,9 @@ bli_cgemm_haswell_asm_3x8 bli_cgemm_haswell_asm_8x3 bli_cgemm_ker_var2 bli_cgemm_md_c2r_ref -bli_cgemm_ukernel bli_cgemmtrsm_l_ukernel bli_cgemmtrsm_u_ukernel +bli_cgemm_ukernel bli_cgemv bli_cgemv_ex bli_cgemv_unb_var1 @@ -284,12 +284,6 @@ bli_chemv_unf_var3a bli_cher bli_cher2 bli_cher2_ex -bli_cher2_unb_var1 -bli_cher2_unb_var2 -bli_cher2_unb_var3 -bli_cher2_unb_var4 -bli_cher2_unf_var1 -bli_cher2_unf_var4 bli_cher2k bli_cher2k1m bli_cher2k3m1 @@ -297,9 +291,13 @@ bli_cher2k3mh bli_cher2k4m1 bli_cher2k4mh bli_cher2k_ex +bli_cher2_unb_var1 +bli_cher2_unb_var2 +bli_cher2_unb_var3 +bli_cher2_unb_var4 +bli_cher2_unf_var1 +bli_cher2_unf_var4 bli_cher_ex -bli_cher_unb_var1 -bli_cher_unb_var2 bli_cherk bli_cherk1m bli_cherk3m1 @@ -309,6 +307,8 @@ bli_cherk4mh bli_cherk_ex bli_cherk_l_ker_var2 bli_cherk_u_ker_var2 +bli_cher_unb_var1 +bli_cher_unb_var2 bli_cinvertd bli_cinvertd_ex bli_cinvertsc @@ -353,8 +353,8 @@ bli_cntl_copy bli_cntl_create_node bli_cntl_free bli_cntl_free_node -bli_cntl_free_w_thrinfo bli_cntl_free_wo_thrinfo +bli_cntl_free_w_thrinfo bli_cntl_mark_family bli_cntx_1m_stage bli_cntx_3m1_stage @@ -543,8 +543,8 @@ bli_ctrsm1m bli_ctrsm3m1 bli_ctrsm4m1 bli_ctrsm_ex -bli_ctrsm_l_ukernel bli_ctrsm_ll_ker_var2 +bli_ctrsm_l_ukernel bli_ctrsm_lu_ker_var2 bli_ctrsm_rl_ker_var2 bli_ctrsm_ru_ker_var2 @@ -675,11 +675,11 @@ bli_dgemm_ex bli_dgemm_haswell_asm_6x8 bli_dgemm_haswell_asm_8x6 bli_dgemm_ker_var2 -bli_dgemm_ukernel bli_dgemmtrsm_l_haswell_asm_6x8 bli_dgemmtrsm_l_ukernel bli_dgemmtrsm_u_haswell_asm_6x8 bli_dgemmtrsm_u_ukernel +bli_dgemm_ukernel bli_dgemv bli_dgemv_ex bli_dgemv_unb_var1 @@ -712,12 +712,6 @@ bli_dhemv_unf_var3a bli_dher bli_dher2 bli_dher2_ex -bli_dher2_unb_var1 -bli_dher2_unb_var2 -bli_dher2_unb_var3 -bli_dher2_unb_var4 -bli_dher2_unf_var1 -bli_dher2_unf_var4 bli_dher2k bli_dher2k1m bli_dher2k3m1 @@ -725,9 +719,13 @@ bli_dher2k3mh bli_dher2k4m1 bli_dher2k4mh bli_dher2k_ex +bli_dher2_unb_var1 +bli_dher2_unb_var2 +bli_dher2_unb_var3 +bli_dher2_unb_var4 +bli_dher2_unf_var1 +bli_dher2_unf_var4 bli_dher_ex -bli_dher_unb_var1 -bli_dher_unb_var2 bli_dherk bli_dherk1m bli_dherk3m1 @@ -737,6 +735,8 @@ bli_dherk4mh bli_dherk_ex bli_dherk_l_ker_var2 bli_dherk_u_ker_var2 +bli_dher_unb_var1 +bli_dher_unb_var2 bli_dinvertd bli_dinvertd_ex bli_dinvertsc @@ -905,11 +905,6 @@ bli_dsyrk3mh bli_dsyrk4m1 bli_dsyrk4mh bli_dsyrk_ex -bli_dt_size -bli_dt_size_check -bli_dt_string -bli_dt_string_check -bli_dt_union_check bli_dtrmm bli_dtrmm1m bli_dtrmm3 @@ -937,8 +932,8 @@ bli_dtrsm1m bli_dtrsm3m1 bli_dtrsm4m1 bli_dtrsm_ex -bli_dtrsm_l_ukernel bli_dtrsm_ll_ker_var2 +bli_dtrsm_l_ukernel bli_dtrsm_lu_ker_var2 bli_dtrsm_rl_ker_var2 bli_dtrsm_ru_ker_var2 @@ -949,6 +944,11 @@ bli_dtrsv_unb_var1 bli_dtrsv_unb_var2 bli_dtrsv_unf_var1 bli_dtrsv_unf_var2 +bli_dt_size +bli_dt_size_check +bli_dt_string +bli_dt_string_check +bli_dt_union_check bli_dunpackm_blk_var1 bli_dunpackm_cxk bli_dunpackm_unb_var1 @@ -1017,6 +1017,7 @@ bli_gemm_basic_check bli_gemm_blk_var1 bli_gemm_blk_var2 bli_gemm_blk_var3 +bli_gemmbp_cntl_create bli_gemm_check bli_gemm_cntl_create bli_gemm_cntl_create_node @@ -1027,6 +1028,8 @@ bli_gemm_determine_kc_f bli_gemm_direct bli_gemm_ex bli_gemm_front +bli_gemmind +bli_gemmind_get_avail bli_gemm_int bli_gemm_ker_var2 bli_gemm_ker_var2_md @@ -1039,20 +1042,17 @@ bli_gemm_md_rcc bli_gemm_md_rcr bli_gemm_md_rrc bli_gemm_md_rrr +bli_gemmnat bli_gemm_packa bli_gemm_packb bli_gemm_prune_unref_mparts_k bli_gemm_prune_unref_mparts_m bli_gemm_prune_unref_mparts_n +bli_gemmtrsm_l_ukernel_qfp +bli_gemmtrsm_ukernel +bli_gemmtrsm_u_ukernel_qfp bli_gemm_ukernel bli_gemm_ukernel_qfp -bli_gemmbp_cntl_create -bli_gemmind -bli_gemmind_get_avail -bli_gemmnat -bli_gemmtrsm_l_ukernel_qfp -bli_gemmtrsm_u_ukernel_qfp -bli_gemmtrsm_ukernel bli_gemv bli_gemv_check bli_gemv_ex @@ -1119,30 +1119,18 @@ bli_hemv_unb_var3_qfp bli_hemv_unb_var4 bli_hemv_unb_var4_qfp bli_hemv_unf_var1 -bli_hemv_unf_var1_qfp bli_hemv_unf_var1a bli_hemv_unf_var1a_qfp +bli_hemv_unf_var1_qfp bli_hemv_unf_var3 -bli_hemv_unf_var3_qfp bli_hemv_unf_var3a bli_hemv_unf_var3a_qfp +bli_hemv_unf_var3_qfp bli_her bli_her2 bli_her2_check bli_her2_ex bli_her2_ex_qfp -bli_her2_unb_var1 -bli_her2_unb_var1_qfp -bli_her2_unb_var2 -bli_her2_unb_var2_qfp -bli_her2_unb_var3 -bli_her2_unb_var3_qfp -bli_her2_unb_var4 -bli_her2_unb_var4_qfp -bli_her2_unf_var1 -bli_her2_unf_var1_qfp -bli_her2_unf_var4 -bli_her2_unf_var4_qfp bli_her2k bli_her2k1m bli_her2k3m1 @@ -1156,13 +1144,21 @@ bli_her2k_front bli_her2kind bli_her2kind_get_avail bli_her2knat +bli_her2_unb_var1 +bli_her2_unb_var1_qfp +bli_her2_unb_var2 +bli_her2_unb_var2_qfp +bli_her2_unb_var3 +bli_her2_unb_var3_qfp +bli_her2_unb_var4 +bli_her2_unb_var4_qfp +bli_her2_unf_var1 +bli_her2_unf_var1_qfp +bli_her2_unf_var4 +bli_her2_unf_var4_qfp bli_her_check bli_her_ex bli_her_ex_qfp -bli_her_unb_var1 -bli_her_unb_var1_qfp -bli_her_unb_var2 -bli_her_unb_var2_qfp bli_herk bli_herk1m bli_herk3m1 @@ -1177,15 +1173,19 @@ bli_herk_determine_kc_f bli_herk_direct bli_herk_ex bli_herk_front +bli_herkind +bli_herkind_get_avail bli_herk_l_ker_var2 +bli_herknat bli_herk_prune_unref_mparts_k bli_herk_prune_unref_mparts_m bli_herk_prune_unref_mparts_n bli_herk_u_ker_var2 bli_herk_x_ker_var2 -bli_herkind -bli_herkind_get_avail -bli_herknat +bli_her_unb_var1 +bli_her_unb_var1_qfp +bli_her_unb_var2 +bli_her_unb_var2_qfp bli_ifprintm bli_ifprintv bli_igetsc @@ -1216,9 +1216,9 @@ bli_info_get_enable_sba_pools bli_info_get_enable_stay_auto_init bli_info_get_enable_threading bli_info_get_gemm_impl_string -bli_info_get_gemm_ukr_impl_string bli_info_get_gemmtrsm_l_ukr_impl_string bli_info_get_gemmtrsm_u_ukr_impl_string +bli_info_get_gemm_ukr_impl_string bli_info_get_heap_addr_align_size bli_info_get_heap_stride_align_size bli_info_get_hemm_impl_string @@ -1277,12 +1277,12 @@ bli_l1d_xy_check bli_l1m_ax_check bli_l1m_axy_check bli_l1m_xy_check -bli_l1v_ax_check bli_l1v_axby_check +bli_l1v_ax_check bli_l1v_axy_check bli_l1v_dot_check -bli_l1v_x_check bli_l1v_xby_check +bli_l1v_x_check bli_l1v_xi_check bli_l1v_xy_check bli_l3_basic_check @@ -1454,9 +1454,9 @@ bli_pool_shrink bli_pow_di bli_pow_ri bli_prime_factorization -bli_print_msg bli_printm bli_printm_ex +bli_print_msg bli_printv bli_printv_ex bli_projm @@ -1645,11 +1645,11 @@ bli_sgemm_ex bli_sgemm_haswell_asm_16x6 bli_sgemm_haswell_asm_6x16 bli_sgemm_ker_var2 -bli_sgemm_ukernel bli_sgemmtrsm_l_haswell_asm_6x16 bli_sgemmtrsm_l_ukernel bli_sgemmtrsm_u_haswell_asm_6x16 bli_sgemmtrsm_u_ukernel +bli_sgemm_ukernel bli_sgemv bli_sgemv_ex bli_sgemv_unb_var1 @@ -1682,12 +1682,6 @@ bli_shemv_unf_var3a bli_sher bli_sher2 bli_sher2_ex -bli_sher2_unb_var1 -bli_sher2_unb_var2 -bli_sher2_unb_var3 -bli_sher2_unb_var4 -bli_sher2_unf_var1 -bli_sher2_unf_var4 bli_sher2k bli_sher2k1m bli_sher2k3m1 @@ -1695,9 +1689,13 @@ bli_sher2k3mh bli_sher2k4m1 bli_sher2k4mh bli_sher2k_ex +bli_sher2_unb_var1 +bli_sher2_unb_var2 +bli_sher2_unb_var3 +bli_sher2_unb_var4 +bli_sher2_unf_var1 +bli_sher2_unf_var4 bli_sher_ex -bli_sher_unb_var1 -bli_sher_unb_var2 bli_sherk bli_sherk1m bli_sherk3m1 @@ -1707,6 +1705,8 @@ bli_sherk4mh bli_sherk_ex bli_sherk_l_ker_var2 bli_sherk_u_ker_var2 +bli_sher_unb_var1 +bli_sher_unb_var2 bli_shiftd bli_shiftd_check bli_shiftd_ex @@ -1888,8 +1888,8 @@ bli_strsm1m bli_strsm3m1 bli_strsm4m1 bli_strsm_ex -bli_strsm_l_ukernel bli_strsm_ll_ker_var2 +bli_strsm_l_ukernel bli_strsm_lu_ker_var2 bli_strsm_rl_ker_var2 bli_strsm_ru_ker_var2 @@ -2059,17 +2059,17 @@ bli_trmm_determine_kc_f bli_trmm_direct bli_trmm_ex bli_trmm_front +bli_trmmind +bli_trmmind_get_avail bli_trmm_ll_ker_var2 bli_trmm_lu_ker_var2 +bli_trmmnat bli_trmm_prune_unref_mparts_k bli_trmm_prune_unref_mparts_m bli_trmm_prune_unref_mparts_n bli_trmm_rl_ker_var2 bli_trmm_ru_ker_var2 bli_trmm_xx_ker_var2 -bli_trmmind -bli_trmmind_get_avail -bli_trmmnat bli_trmv bli_trmv_check bli_trmv_ex @@ -2099,11 +2099,14 @@ bli_trsm_determine_kc_f bli_trsm_direct bli_trsm_ex bli_trsm_front +bli_trsmind +bli_trsmind_get_avail bli_trsm_int bli_trsm_l_cntl_create -bli_trsm_l_ukernel_qfp bli_trsm_ll_ker_var2 +bli_trsm_l_ukernel_qfp bli_trsm_lu_ker_var2 +bli_trsmnat bli_trsm_packa bli_trsm_packb bli_trsm_prune_unref_mparts_k @@ -2112,12 +2115,9 @@ bli_trsm_prune_unref_mparts_n bli_trsm_r_cntl_create bli_trsm_rl_ker_var2 bli_trsm_ru_ker_var2 -bli_trsm_u_ukernel_qfp bli_trsm_ukernel +bli_trsm_u_ukernel_qfp bli_trsm_xx_ker_var2 -bli_trsmind -bli_trsmind_get_avail -bli_trsmnat bli_trsv bli_trsv_check bli_trsv_ex @@ -2246,9 +2246,9 @@ bli_zgemm_haswell_asm_3x4 bli_zgemm_haswell_asm_4x3 bli_zgemm_ker_var2 bli_zgemm_md_c2r_ref -bli_zgemm_ukernel bli_zgemmtrsm_l_ukernel bli_zgemmtrsm_u_ukernel +bli_zgemm_ukernel bli_zgemv bli_zgemv_ex bli_zgemv_unb_var1 @@ -2281,12 +2281,6 @@ bli_zhemv_unf_var3a bli_zher bli_zher2 bli_zher2_ex -bli_zher2_unb_var1 -bli_zher2_unb_var2 -bli_zher2_unb_var3 -bli_zher2_unb_var4 -bli_zher2_unf_var1 -bli_zher2_unf_var4 bli_zher2k bli_zher2k1m bli_zher2k3m1 @@ -2294,9 +2288,13 @@ bli_zher2k3mh bli_zher2k4m1 bli_zher2k4mh bli_zher2k_ex +bli_zher2_unb_var1 +bli_zher2_unb_var2 +bli_zher2_unb_var3 +bli_zher2_unb_var4 +bli_zher2_unf_var1 +bli_zher2_unf_var4 bli_zher_ex -bli_zher_unb_var1 -bli_zher_unb_var2 bli_zherk bli_zherk1m bli_zherk3m1 @@ -2306,6 +2304,8 @@ bli_zherk4mh bli_zherk_ex bli_zherk_l_ker_var2 bli_zherk_u_ker_var2 +bli_zher_unb_var1 +bli_zher_unb_var2 bli_zinvertd bli_zinvertd_ex bli_zinvertsc @@ -2489,8 +2489,8 @@ bli_ztrsm1m bli_ztrsm3m1 bli_ztrsm4m1 bli_ztrsm_ex -bli_ztrsm_l_ukernel bli_ztrsm_ll_ker_var2 +bli_ztrsm_l_ukernel bli_ztrsm_lu_ker_var2 bli_ztrsm_rl_ker_var2 bli_ztrsm_ru_ker_var2 @@ -2564,14 +2564,14 @@ srotmg_ ssbmv_ sscal_ sspmv_ -sspr2_ sspr_ +sspr2_ sswap_ ssymm_ ssymv_ +ssyr_ ssyr2_ ssyr2k_ -ssyr_ ssyrk_ stbmv_ stbsv_ @@ -2603,14 +2603,14 @@ dscal_ dsdot_ dsdotsub_ dspmv_ -dspr2_ dspr_ +dspr2_ dswap_ dsymm_ dsymv_ +dsyr_ dsyr2_ dsyr2k_ -dsyr_ dsyrk_ dtbmv_ dtbsv_ @@ -2638,13 +2638,13 @@ cgeru_ chbmv_ chemm_ chemv_ +cher_ cher2_ cher2k_ -cher_ cherk_ chpmv_ -chpr2_ chpr_ +chpr2_ crotg_ cscal_ csrot_ @@ -2677,13 +2677,13 @@ zgeru_ zhbmv_ zhemm_ zhemv_ +zher_ zher2_ zher2k_ -zher_ zherk_ zhpmv_ -zhpr2_ zhpr_ +zhpr2_ zrotg_ zscal_ zswap_ diff --git a/frame/0/bli_l0_check.c b/frame/0/bli_l0_check.c index 65eeda1b7..aa046285e 100644 --- a/frame/0/bli_l0_check.c +++ b/frame/0/bli_l0_check.c @@ -41,7 +41,7 @@ #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* chi, \ obj_t* psi \ @@ -61,7 +61,7 @@ GENFRONT( subsc ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* chi \ ) \ @@ -75,7 +75,7 @@ GENFRONT( invertsc ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* chi, \ obj_t* norm \ diff --git a/frame/0/bli_l0_check.h b/frame/0/bli_l0_check.h index 262679aeb..e1ae0951e 100644 --- a/frame/0/bli_l0_check.h +++ b/frame/0/bli_l0_check.h @@ -40,7 +40,7 @@ #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* chi, \ obj_t* psi \ @@ -57,7 +57,7 @@ GENTPROT( subsc ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* chi \ ); @@ -68,7 +68,7 @@ GENTPROT( invertsc ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* chi, \ obj_t* absq \ @@ -81,7 +81,7 @@ GENTPROT( normfsc ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* chi, \ double* zeta_r, \ @@ -94,7 +94,7 @@ GENTPROT( getsc ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ double zeta_r, \ double zeta_i, \ @@ -107,7 +107,7 @@ GENTPROT( setsc ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* chi, \ obj_t* zeta_r, \ @@ -120,7 +120,7 @@ GENTPROT( unzipsc ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* zeta_r, \ obj_t* zeta_i, \ @@ -132,18 +132,18 @@ GENTPROT( zipsc ) // ----------------------------------------------------------------------------- -void bli_l0_xsc_check +BLIS_EXPORT_BLIS void bli_l0_xsc_check ( obj_t* chi ); -void bli_l0_xxsc_check +BLIS_EXPORT_BLIS void bli_l0_xxsc_check ( obj_t* chi, obj_t* psi ); -void bli_l0_xx2sc_check +BLIS_EXPORT_BLIS void bli_l0_xx2sc_check ( obj_t* chi, obj_t* norm diff --git a/frame/0/bli_l0_fpa.h b/frame/0/bli_l0_fpa.h index 0d9b28361..1749c4af8 100644 --- a/frame/0/bli_l0_fpa.h +++ b/frame/0/bli_l0_fpa.h @@ -40,7 +40,7 @@ #define GENPROT( opname ) \ \ PASTECH(opname,_vft) \ -PASTEMAC(opname,_qfp)( num_t dt ); +BLIS_EXPORT_BLIS BLIS_EXPORT_BLIS PASTEMAC(opname,_qfp)( num_t dt ); GENPROT( absqsc ) GENPROT( normfsc ) diff --git a/frame/0/bli_l0_oapi.c b/frame/0/bli_l0_oapi.c index 9a5492971..c6e98f7b6 100644 --- a/frame/0/bli_l0_oapi.c +++ b/frame/0/bli_l0_oapi.c @@ -41,7 +41,7 @@ #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* chi, \ obj_t* absq \ @@ -81,7 +81,7 @@ GENFRONT( normfsc ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* chi, \ obj_t* psi \ @@ -120,7 +120,7 @@ GENFRONT( subsc ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* chi \ ) \ @@ -153,7 +153,7 @@ GENFRONT( invertsc ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* chi, \ obj_t* psi \ @@ -186,7 +186,7 @@ GENFRONT( sqrtsc ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* chi, \ double* zeta_r, \ @@ -230,7 +230,7 @@ GENFRONT( getsc ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ double zeta_r, \ double zeta_i, \ @@ -264,7 +264,7 @@ GENFRONT( setsc ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* chi, \ obj_t* zeta_r, \ @@ -307,7 +307,7 @@ GENFRONT( unzipsc ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* zeta_r, \ obj_t* zeta_i, \ diff --git a/frame/0/bli_l0_oapi.h b/frame/0/bli_l0_oapi.h index f73aa08d2..d0b05606f 100644 --- a/frame/0/bli_l0_oapi.h +++ b/frame/0/bli_l0_oapi.h @@ -40,7 +40,7 @@ #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* chi, \ obj_t* absq \ @@ -53,7 +53,7 @@ GENPROT( normfsc ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* chi, \ obj_t* psi \ @@ -69,7 +69,7 @@ GENPROT( subsc ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* chi \ ); @@ -80,7 +80,7 @@ GENPROT( invertsc ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* chi, \ double* zeta_r, \ @@ -93,7 +93,7 @@ GENPROT( getsc ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ double zeta_r, \ double zeta_i, \ @@ -106,7 +106,7 @@ GENPROT( setsc ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* chi, \ obj_t* zeta_r, \ @@ -119,7 +119,7 @@ GENPROT( unzipsc ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* zeta_r, \ obj_t* zeta_i, \ diff --git a/frame/0/bli_l0_tapi.c b/frame/0/bli_l0_tapi.c index 620cad299..1a86ebd0a 100644 --- a/frame/0/bli_l0_tapi.c +++ b/frame/0/bli_l0_tapi.c @@ -41,7 +41,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, kername ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ conj_t conjchi, \ ctype* chi, \ @@ -64,7 +64,7 @@ INSERT_GENTFUNC_BASIC( subsc, subs ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, kername ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ conj_t conjchi, \ ctype* chi \ @@ -85,7 +85,7 @@ INSERT_GENTFUNC_BASIC( invertsc, inverts ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, kername ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ conj_t conjchi, \ ctype* chi, \ @@ -114,7 +114,7 @@ INSERT_GENTFUNC_BASIC( mulsc, scals ) #undef GENTFUNCR #define GENTFUNCR( ctype, ctype_r, ch, chr, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ ctype* chi, \ ctype_r* absq \ @@ -143,7 +143,7 @@ INSERT_GENTFUNCR_BASIC0( absqsc ) #undef GENTFUNCR #define GENTFUNCR( ctype, ctype_r, ch, chr, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ ctype* chi, \ ctype_r* norm \ @@ -161,7 +161,7 @@ INSERT_GENTFUNCR_BASIC0( normfsc ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ ctype* chi, \ ctype* psi \ @@ -179,7 +179,7 @@ INSERT_GENTFUNC_BASIC0( sqrtsc ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ ctype* chi, \ double* zeta_r, \ @@ -197,7 +197,7 @@ INSERT_GENTFUNC_BASIC0( getsc ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ double zeta_r, \ double zeta_i, \ @@ -215,7 +215,7 @@ INSERT_GENTFUNC_BASIC0( setsc ) #undef GENTFUNCR #define GENTFUNCR( ctype, ctype_r, ch, chr, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ ctype* chi, \ ctype_r* zeta_r, \ @@ -233,7 +233,7 @@ INSERT_GENTFUNCR_BASIC0( unzipsc ) #undef GENTFUNCR #define GENTFUNCR( ctype, ctype_r, ch, chr, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ ctype_r* zeta_r, \ ctype_r* zeta_i, \ diff --git a/frame/0/bli_l0_tapi.h b/frame/0/bli_l0_tapi.h index 46c43d935..c2d600d66 100644 --- a/frame/0/bli_l0_tapi.h +++ b/frame/0/bli_l0_tapi.h @@ -40,7 +40,7 @@ #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ conj_t conjchi, \ ctype* chi, \ @@ -56,7 +56,7 @@ INSERT_GENTPROT_BASIC0( subsc ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ conj_t conjchi, \ ctype* chi \ @@ -68,7 +68,7 @@ INSERT_GENTPROT_BASIC0( invertsc ) #undef GENTPROTR #define GENTPROTR( ctype, ctype_r, ch, chr, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ ctype* chi, \ ctype_r* absq \ @@ -81,7 +81,7 @@ INSERT_GENTPROTR_BASIC0( normfsc ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ ctype* chi, \ ctype* psi \ @@ -93,7 +93,7 @@ INSERT_GENTPROT_BASIC0( sqrtsc ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ ctype* chi, \ double* zeta_r, \ @@ -106,7 +106,7 @@ INSERT_GENTPROT_BASIC0( getsc ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ double zeta_r, \ double zeta_i, \ @@ -119,7 +119,7 @@ INSERT_GENTPROT_BASIC0( setsc ) #undef GENTPROTR #define GENTPROTR( ctype, ctype_r, ch, chr, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ ctype* chi, \ ctype_r* zeta_r, \ @@ -132,7 +132,7 @@ INSERT_GENTPROTR_BASIC0( unzipsc ) #undef GENTPROTR #define GENTPROTR( ctype, ctype_r, ch, chr, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ ctype_r* zeta_r, \ ctype_r* zeta_i, \ @@ -143,14 +143,14 @@ INSERT_GENTPROTR_BASIC0( zipsc ) // ----------------------------------------------------------------------------- -void bli_igetsc +BLIS_EXPORT_BLIS void bli_igetsc ( dim_t* chi, double* zeta_r, double* zeta_i ); -void bli_isetsc +BLIS_EXPORT_BLIS void bli_isetsc ( double zeta_r, double zeta_i, diff --git a/frame/0/copysc/bli_copysc.c b/frame/0/copysc/bli_copysc.c index 3001aa6c7..b01678877 100644 --- a/frame/0/copysc/bli_copysc.c +++ b/frame/0/copysc/bli_copysc.c @@ -55,7 +55,7 @@ static FUNCPTR_T GENARRAY2_ALL(ftypes,copysc); #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* chi, \ obj_t* psi \ @@ -103,7 +103,7 @@ GENFRONT( copysc ) #undef GENTFUNC2 #define GENTFUNC2( ctype_x, ctype_y, chx, chy, varname ) \ \ -void PASTEMAC2(chx,chy,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC2(chx,chy,varname) \ ( \ conj_t conjchi, \ void* chi, \ diff --git a/frame/0/copysc/bli_copysc.h b/frame/0/copysc/bli_copysc.h index 1d43919ca..1dfd9d7bc 100644 --- a/frame/0/copysc/bli_copysc.h +++ b/frame/0/copysc/bli_copysc.h @@ -40,7 +40,7 @@ #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* chi, \ obj_t* psi \ @@ -55,7 +55,7 @@ GENFRONT( copysc ) #undef GENTPROT2 #define GENTPROT2( ctype_x, ctype_y, chx, chy, varname ) \ \ -void PASTEMAC2(chx,chy,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC2(chx,chy,varname) \ ( \ conj_t conjchi, \ void* chi, \ diff --git a/frame/1/bli_l1v_check.c b/frame/1/bli_l1v_check.c index 74b60febd..e795f7e00 100644 --- a/frame/1/bli_l1v_check.c +++ b/frame/1/bli_l1v_check.c @@ -41,7 +41,7 @@ #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x, \ obj_t* y \ @@ -59,7 +59,7 @@ GENFRONT( swapv ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x, \ obj_t* index \ @@ -74,7 +74,7 @@ GENFRONT( amaxv ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* alpha, \ obj_t* x, \ @@ -91,7 +91,7 @@ GENFRONT( axpbyv ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* alpha, \ obj_t* x, \ @@ -108,7 +108,7 @@ GENFRONT( scal2v ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x, \ obj_t* y, \ @@ -124,7 +124,7 @@ GENFRONT( dotv ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* alpha, \ obj_t* x, \ @@ -142,7 +142,7 @@ GENFRONT( dotxv ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x \ ) \ @@ -156,7 +156,7 @@ GENFRONT( invertv ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* alpha, \ obj_t* x \ @@ -172,7 +172,7 @@ GENFRONT( setv ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x, \ obj_t* beta, \ diff --git a/frame/1/bli_l1v_check.h b/frame/1/bli_l1v_check.h index 98051d0cd..9fc902c04 100644 --- a/frame/1/bli_l1v_check.h +++ b/frame/1/bli_l1v_check.h @@ -40,7 +40,7 @@ #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x, \ obj_t* y \ @@ -55,7 +55,7 @@ GENTPROT( swapv ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x, \ obj_t* index \ @@ -67,7 +67,7 @@ GENTPROT( amaxv ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* alpha, \ obj_t* x, \ @@ -81,7 +81,7 @@ GENTPROT( axpbyv ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* alpha, \ obj_t* x, \ @@ -95,7 +95,7 @@ GENTPROT( scal2v ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x, \ obj_t* y, \ @@ -108,7 +108,7 @@ GENTPROT( dotv ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* alpha, \ obj_t* x, \ @@ -123,7 +123,7 @@ GENTPROT( dotxv ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x \ ); @@ -134,7 +134,7 @@ GENTPROT( invertv ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* alpha, \ obj_t* x \ @@ -147,7 +147,7 @@ GENTPROT( setv ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x, \ obj_t* beta, \ @@ -160,27 +160,27 @@ GENTPROT( xpbyv ) // ----------------------------------------------------------------------------- -void bli_l1v_xy_check +BLIS_EXPORT_BLIS void bli_l1v_xy_check ( obj_t* x, obj_t* y ); -void bli_l1v_axy_check +BLIS_EXPORT_BLIS void bli_l1v_axy_check ( obj_t* alpha, obj_t* x, obj_t* y ); -void bli_l1v_xby_check +BLIS_EXPORT_BLIS void bli_l1v_xby_check ( obj_t* x, obj_t* beta, obj_t* y ); -void bli_l1v_axby_check +BLIS_EXPORT_BLIS void bli_l1v_axby_check ( obj_t* alpha, obj_t* x, @@ -188,7 +188,7 @@ void bli_l1v_axby_check obj_t* y ); -void bli_l1v_dot_check +BLIS_EXPORT_BLIS void bli_l1v_dot_check ( obj_t* alpha, obj_t* x, @@ -197,18 +197,18 @@ void bli_l1v_dot_check obj_t* rho ); -void bli_l1v_x_check +BLIS_EXPORT_BLIS void bli_l1v_x_check ( obj_t* x ); -void bli_l1v_ax_check +BLIS_EXPORT_BLIS void bli_l1v_ax_check ( obj_t* alpha, obj_t* x ); -void bli_l1v_xi_check +BLIS_EXPORT_BLIS void bli_l1v_xi_check ( obj_t* x, obj_t* index diff --git a/frame/1/bli_l1v_fpa.h b/frame/1/bli_l1v_fpa.h index c05a4ff7b..05361bdde 100644 --- a/frame/1/bli_l1v_fpa.h +++ b/frame/1/bli_l1v_fpa.h @@ -40,7 +40,7 @@ #define GENPROT( opname ) \ \ PASTECH2(opname,BLIS_TAPI_EX_SUF,_vft) \ -PASTEMAC2(opname,BLIS_TAPI_EX_SUF,_qfp)( num_t dt ); +BLIS_EXPORT_BLIS BLIS_EXPORT_BLIS PASTEMAC2(opname,BLIS_TAPI_EX_SUF,_qfp)( num_t dt ); GENPROT( addv ) GENPROT( copyv ) diff --git a/frame/1/bli_l1v_ker_prot.h b/frame/1/bli_l1v_ker_prot.h index 1a1eec3f3..a06c8539e 100644 --- a/frame/1/bli_l1v_ker_prot.h +++ b/frame/1/bli_l1v_ker_prot.h @@ -39,7 +39,7 @@ #define ADDV_KER_PROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ conj_t conjx, \ dim_t n, \ @@ -51,7 +51,7 @@ void PASTEMAC(ch,opname) \ #define AMAXV_KER_PROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ dim_t n, \ ctype* restrict x, inc_t incx, \ @@ -62,7 +62,7 @@ void PASTEMAC(ch,opname) \ #define AXPBYV_KER_PROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ conj_t conjx, \ dim_t n, \ @@ -76,7 +76,7 @@ void PASTEMAC(ch,opname) \ #define AXPYV_KER_PROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ conj_t conjx, \ dim_t n, \ @@ -89,7 +89,7 @@ void PASTEMAC(ch,opname) \ #define COPYV_KER_PROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ conj_t conjx, \ dim_t n, \ @@ -101,7 +101,7 @@ void PASTEMAC(ch,opname) \ #define DOTV_KER_PROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ conj_t conjx, \ conj_t conjy, \ @@ -115,7 +115,7 @@ void PASTEMAC(ch,opname) \ #define DOTXV_KER_PROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ conj_t conjx, \ conj_t conjy, \ @@ -131,7 +131,7 @@ void PASTEMAC(ch,opname) \ #define INVERTV_KER_PROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ dim_t n, \ ctype* restrict x, inc_t incx, \ @@ -141,7 +141,7 @@ void PASTEMAC(ch,opname) \ #define SCALV_KER_PROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ conj_t conjalpha, \ dim_t n, \ @@ -153,7 +153,7 @@ void PASTEMAC(ch,opname) \ #define SCAL2V_KER_PROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ conj_t conjx, \ dim_t n, \ @@ -166,7 +166,7 @@ void PASTEMAC(ch,opname) \ #define SETV_KER_PROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ conj_t conjalpha, \ dim_t n, \ @@ -178,7 +178,7 @@ void PASTEMAC(ch,opname) \ #define SUBV_KER_PROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ conj_t conjx, \ dim_t n, \ @@ -190,7 +190,7 @@ void PASTEMAC(ch,opname) \ #define SWAPV_KER_PROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ dim_t n, \ ctype* restrict x, inc_t incx, \ @@ -201,7 +201,7 @@ void PASTEMAC(ch,opname) \ #define XPBYV_KER_PROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ conj_t conjx, \ dim_t n, \ diff --git a/frame/1/bli_l1v_oapi.c b/frame/1/bli_l1v_oapi.c index 19e61bb7a..9c50d93ab 100644 --- a/frame/1/bli_l1v_oapi.c +++ b/frame/1/bli_l1v_oapi.c @@ -43,7 +43,7 @@ #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x, \ obj_t* y \ @@ -90,7 +90,7 @@ GENFRONT( subv ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x, \ obj_t* index \ @@ -133,7 +133,7 @@ GENFRONT( amaxv ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* x, \ @@ -197,7 +197,7 @@ GENFRONT( axpbyv ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* x, \ @@ -255,7 +255,7 @@ GENFRONT( scal2v ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x, \ obj_t* y, \ @@ -305,7 +305,7 @@ GENFRONT( dotv ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* x, \ @@ -374,7 +374,7 @@ GENFRONT( dotxv ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x \ BLIS_OAPI_EX_PARAMS \ @@ -413,7 +413,7 @@ GENFRONT( invertv ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* x \ @@ -467,7 +467,7 @@ GENFRONT( setv ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x, \ obj_t* y \ @@ -510,7 +510,7 @@ GENFRONT( swapv ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x, \ obj_t* beta, \ diff --git a/frame/1/bli_l1v_oapi.h b/frame/1/bli_l1v_oapi.h index 3124db9c3..41aecdc4d 100644 --- a/frame/1/bli_l1v_oapi.h +++ b/frame/1/bli_l1v_oapi.h @@ -40,7 +40,7 @@ #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x, \ obj_t* y \ @@ -55,7 +55,7 @@ GENTPROT( subv ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x, \ obj_t* index \ @@ -68,7 +68,7 @@ GENTPROT( amaxv ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* x, \ @@ -83,7 +83,7 @@ GENTPROT( axpbyv ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* x, \ @@ -98,7 +98,7 @@ GENTPROT( scal2v ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x, \ obj_t* y, \ @@ -112,7 +112,7 @@ GENTPROT( dotv ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* x, \ @@ -128,7 +128,7 @@ GENTPROT( dotxv ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x \ BLIS_OAPI_EX_PARAMS \ @@ -140,7 +140,7 @@ GENTPROT( invertv ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* x \ @@ -154,7 +154,7 @@ GENTPROT( setv ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x, \ obj_t* y \ @@ -167,7 +167,7 @@ GENTPROT( swapv ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x, \ obj_t* beta, \ diff --git a/frame/1/bli_l1v_tapi.c b/frame/1/bli_l1v_tapi.c index 5fdfdb91e..1127cefe4 100644 --- a/frame/1/bli_l1v_tapi.c +++ b/frame/1/bli_l1v_tapi.c @@ -43,7 +43,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, kerid ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ conj_t conjx, \ dim_t n, \ @@ -81,7 +81,7 @@ INSERT_GENTFUNC_BASIC( subv, BLIS_SUBV_KER ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, kerid ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ dim_t n, \ ctype* x, inc_t incx, \ @@ -115,7 +115,7 @@ INSERT_GENTFUNC_BASIC( amaxv, BLIS_AMAXV_KER ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, kerid ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ conj_t conjx, \ dim_t n, \ @@ -155,7 +155,7 @@ INSERT_GENTFUNC_BASIC( axpbyv, BLIS_AXPBYV_KER ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, kerid ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ conj_t conjx, \ dim_t n, \ @@ -195,7 +195,7 @@ INSERT_GENTFUNC_BASIC( scal2v, BLIS_SCAL2V_KER ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, kerid ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ conj_t conjx, \ conj_t conjy, \ @@ -235,7 +235,7 @@ INSERT_GENTFUNC_BASIC( dotv, BLIS_DOTV_KER ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, kerid ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ conj_t conjx, \ conj_t conjy, \ @@ -279,7 +279,7 @@ INSERT_GENTFUNC_BASIC( dotxv, BLIS_DOTXV_KER ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, kerid ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ dim_t n, \ ctype* x, inc_t incx \ @@ -311,7 +311,7 @@ INSERT_GENTFUNC_BASIC( invertv, BLIS_INVERTV_KER ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, kerid ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ conj_t conjalpha, \ dim_t n, \ @@ -348,7 +348,7 @@ INSERT_GENTFUNC_BASIC( setv, BLIS_SETV_KER ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, kerid ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ dim_t n, \ ctype* x, inc_t incx, \ @@ -381,7 +381,7 @@ INSERT_GENTFUNC_BASIC( swapv, BLIS_SWAPV_KER ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, kerid ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ conj_t conjx, \ dim_t n, \ diff --git a/frame/1/bli_l1v_tapi.h b/frame/1/bli_l1v_tapi.h index 6ddd0c1af..5cb3295ef 100644 --- a/frame/1/bli_l1v_tapi.h +++ b/frame/1/bli_l1v_tapi.h @@ -40,7 +40,7 @@ #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ conj_t conjx, \ dim_t n, \ @@ -57,7 +57,7 @@ INSERT_GENTPROT_BASIC0( subv ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ dim_t n, \ ctype* x, inc_t incx, \ @@ -71,7 +71,7 @@ INSERT_GENTPROT_BASIC0( amaxv ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ conj_t conjx, \ dim_t n, \ @@ -88,7 +88,7 @@ INSERT_GENTPROT_BASIC0( axpbyv ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ conj_t conjx, \ dim_t n, \ @@ -105,7 +105,7 @@ INSERT_GENTPROT_BASIC0( scal2v ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ conj_t conjx, \ conj_t conjy, \ @@ -122,7 +122,7 @@ INSERT_GENTPROT_BASIC0( dotv ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ conj_t conjx, \ conj_t conjy, \ @@ -141,7 +141,7 @@ INSERT_GENTPROT_BASIC0( dotxv ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ dim_t n, \ ctype* x, inc_t incx \ @@ -154,7 +154,7 @@ INSERT_GENTPROT_BASIC0( invertv ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ conj_t conjalpha, \ dim_t n, \ @@ -170,7 +170,7 @@ INSERT_GENTPROT_BASIC0( setv ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ dim_t n, \ ctype* x, inc_t incx, \ @@ -184,7 +184,7 @@ INSERT_GENTPROT_BASIC0( swapv ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ conj_t conjx, \ dim_t n, \ diff --git a/frame/1/other/packv/bli_packv_check.h b/frame/1/other/packv/bli_packv_check.h index 08dcd476f..7e4c62808 100644 --- a/frame/1/other/packv/bli_packv_check.h +++ b/frame/1/other/packv/bli_packv_check.h @@ -32,7 +32,7 @@ */ -void bli_packv_check +BLIS_EXPORT_BLIS void bli_packv_check ( obj_t* c, obj_t* p, diff --git a/frame/1/other/packv/bli_packv_cntl.h b/frame/1/other/packv/bli_packv_cntl.h index 87f33524b..6ddd1dcc1 100644 --- a/frame/1/other/packv/bli_packv_cntl.h +++ b/frame/1/other/packv/bli_packv_cntl.h @@ -56,7 +56,7 @@ typedef struct packv_params_s packv_params_t; // ----------------------------------------------------------------------------- -cntl_t* bli_packv_cntl_obj_create +BLIS_EXPORT_BLIS cntl_t* bli_packv_cntl_obj_create ( void* var_func, void* packv_var_func, diff --git a/frame/1/other/packv/bli_packv_init.h b/frame/1/other/packv/bli_packv_init.h index 8848b395f..38bbcd92b 100644 --- a/frame/1/other/packv/bli_packv_init.h +++ b/frame/1/other/packv/bli_packv_init.h @@ -32,7 +32,7 @@ */ -void bli_packv_init +BLIS_EXPORT_BLIS void bli_packv_init ( obj_t* a, obj_t* p, @@ -40,7 +40,7 @@ void bli_packv_init packv_t* cntl ); -siz_t bli_packv_init_pack +BLIS_EXPORT_BLIS siz_t bli_packv_init_pack ( pack_t pack_schema, bszid_t bmult_id, diff --git a/frame/1/other/packv/bli_packv_int.h b/frame/1/other/packv/bli_packv_int.h index b922c67a3..07fb60cf5 100644 --- a/frame/1/other/packv/bli_packv_int.h +++ b/frame/1/other/packv/bli_packv_int.h @@ -32,7 +32,7 @@ */ -void bli_packv_int +BLIS_EXPORT_BLIS void bli_packv_int ( obj_t* c, obj_t* p, diff --git a/frame/1/other/packv/bli_packv_unb_var1.c b/frame/1/other/packv/bli_packv_unb_var1.c index 23b370949..5da136ae4 100644 --- a/frame/1/other/packv/bli_packv_unb_var1.c +++ b/frame/1/other/packv/bli_packv_unb_var1.c @@ -81,7 +81,7 @@ void bli_packv_unb_var1( obj_t* c, #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ dim_t m, \ void* c, inc_t incc, \ diff --git a/frame/1/other/packv/bli_packv_unb_var1.h b/frame/1/other/packv/bli_packv_unb_var1.h index f33632015..0f8fbc804 100644 --- a/frame/1/other/packv/bli_packv_unb_var1.h +++ b/frame/1/other/packv/bli_packv_unb_var1.h @@ -32,7 +32,7 @@ */ -void bli_packv_unb_var1( obj_t* c, +BLIS_EXPORT_BLIS void bli_packv_unb_var1( obj_t* c, obj_t* p, cntx_t* cntx, packv_t* cntl ); @@ -40,7 +40,7 @@ void bli_packv_unb_var1( obj_t* c, #undef GENTPROT #define GENTPROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ dim_t m, \ void* c, inc_t incc, \ diff --git a/frame/1/other/scalv/bli_scalv_cntl.h b/frame/1/other/scalv/bli_scalv_cntl.h index c97536387..1c9a4dac0 100644 --- a/frame/1/other/scalv/bli_scalv_cntl.h +++ b/frame/1/other/scalv/bli_scalv_cntl.h @@ -41,11 +41,11 @@ typedef struct scalv_s scalv_t; #define bli_cntl_sub_scalv( cntl ) cntl->sub_scalv -void bli_scalv_cntl_init( void ); -void bli_scalv_cntl_finalize( void ); -scalv_t* bli_scalv_cntl_obj_create( impl_t impl_type, +BLIS_EXPORT_BLIS void bli_scalv_cntl_init( void ); +BLIS_EXPORT_BLIS void bli_scalv_cntl_finalize( void ); +BLIS_EXPORT_BLIS scalv_t* bli_scalv_cntl_obj_create( impl_t impl_type, varnum_t var_num ); -void bli_scalv_cntl_obj_init( scalv_t* cntl, +BLIS_EXPORT_BLIS void bli_scalv_cntl_obj_init( scalv_t* cntl, impl_t impl_type, varnum_t var_num ); diff --git a/frame/1/other/scalv/bli_scalv_int.h b/frame/1/other/scalv/bli_scalv_int.h index fd7cff116..7a2a1eec1 100644 --- a/frame/1/other/scalv/bli_scalv_int.h +++ b/frame/1/other/scalv/bli_scalv_int.h @@ -32,7 +32,7 @@ */ -void bli_scalv_int( obj_t* alpha, +BLIS_EXPORT_BLIS void bli_scalv_int( obj_t* alpha, obj_t* x, cntx_t* cntx, scalv_t* cntl ); diff --git a/frame/1/other/unpackv/bli_unpackv_check.h b/frame/1/other/unpackv/bli_unpackv_check.h index 38d79fb3b..b8f10aa3d 100644 --- a/frame/1/other/unpackv/bli_unpackv_check.h +++ b/frame/1/other/unpackv/bli_unpackv_check.h @@ -32,7 +32,7 @@ */ -void bli_unpackv_check +BLIS_EXPORT_BLIS void bli_unpackv_check ( obj_t* p, obj_t* a, diff --git a/frame/1/other/unpackv/bli_unpackv_cntl.h b/frame/1/other/unpackv/bli_unpackv_cntl.h index 0defc6803..6a8adec82 100644 --- a/frame/1/other/unpackv/bli_unpackv_cntl.h +++ b/frame/1/other/unpackv/bli_unpackv_cntl.h @@ -45,11 +45,11 @@ typedef struct unpackv_s unpackv_t; #define bli_cntl_sub_unpackv_y( cntl ) cntl->sub_unpackv_y #define bli_cntl_sub_unpackv_y1( cntl ) cntl->sub_unpackv_y1 -void bli_unpackv_cntl_init( void ); -void bli_unpackv_cntl_finalize( void ); -unpackv_t* bli_unpackv_cntl_obj_create( impl_t impl_type, +BLIS_EXPORT_BLIS void bli_unpackv_cntl_init( void ); +BLIS_EXPORT_BLIS void bli_unpackv_cntl_finalize( void ); +BLIS_EXPORT_BLIS unpackv_t* bli_unpackv_cntl_obj_create( impl_t impl_type, varnum_t var_num ); -void bli_unpackv_cntl_obj_init( unpackv_t* cntl, +BLIS_EXPORT_BLIS void bli_unpackv_cntl_obj_init( unpackv_t* cntl, impl_t impl_type, varnum_t var_num ); diff --git a/frame/1/other/unpackv/bli_unpackv_int.h b/frame/1/other/unpackv/bli_unpackv_int.h index 940b738eb..043c58924 100644 --- a/frame/1/other/unpackv/bli_unpackv_int.h +++ b/frame/1/other/unpackv/bli_unpackv_int.h @@ -32,13 +32,13 @@ */ -void bli_unpackv_int( obj_t* p, +BLIS_EXPORT_BLIS void bli_unpackv_int( obj_t* p, obj_t* a, cntx_t* cntx, unpackv_t* cntl ); /* -void bli_unpackv_init_cast( obj_t* p, +BLIS_EXPORT_BLIS void bli_unpackv_init_cast( obj_t* p, obj_t* a, obj_t* c ); */ diff --git a/frame/1/other/unpackv/bli_unpackv_unb_var1.c b/frame/1/other/unpackv/bli_unpackv_unb_var1.c index 5dc1101b6..c23f6dc79 100644 --- a/frame/1/other/unpackv/bli_unpackv_unb_var1.c +++ b/frame/1/other/unpackv/bli_unpackv_unb_var1.c @@ -81,7 +81,7 @@ void bli_unpackv_unb_var1( obj_t* p, #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ dim_t m, \ void* p, inc_t incp, \ diff --git a/frame/1/other/unpackv/bli_unpackv_unb_var1.h b/frame/1/other/unpackv/bli_unpackv_unb_var1.h index 4449175b9..f13fb8265 100644 --- a/frame/1/other/unpackv/bli_unpackv_unb_var1.h +++ b/frame/1/other/unpackv/bli_unpackv_unb_var1.h @@ -32,7 +32,7 @@ */ -void bli_unpackv_unb_var1( obj_t* p, +BLIS_EXPORT_BLIS void bli_unpackv_unb_var1( obj_t* p, obj_t* c, cntx_t* cntx, unpackv_t* cntl ); @@ -40,7 +40,7 @@ void bli_unpackv_unb_var1( obj_t* p, #undef GENTPROT #define GENTPROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ dim_t m, \ void* p, inc_t incp, \ diff --git a/frame/1d/bli_l1d_check.c b/frame/1d/bli_l1d_check.c index 908a410ad..4745c8d17 100644 --- a/frame/1d/bli_l1d_check.c +++ b/frame/1d/bli_l1d_check.c @@ -41,7 +41,7 @@ #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x, \ obj_t* y \ @@ -58,7 +58,7 @@ GENFRONT( subd ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* alpha, \ obj_t* x, \ @@ -75,7 +75,7 @@ GENFRONT( scal2d ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x \ ) \ @@ -89,7 +89,7 @@ GENFRONT( invertd ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* alpha, \ obj_t* x \ @@ -107,7 +107,7 @@ GENFRONT( shiftd ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x, \ obj_t* beta, \ diff --git a/frame/1d/bli_l1d_check.h b/frame/1d/bli_l1d_check.h index 6d000d314..efb6f7af5 100644 --- a/frame/1d/bli_l1d_check.h +++ b/frame/1d/bli_l1d_check.h @@ -40,7 +40,7 @@ #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x, \ obj_t* y \ @@ -54,7 +54,7 @@ GENTPROT( subd ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* alpha, \ obj_t* x, \ @@ -68,7 +68,7 @@ GENTPROT( scal2d ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x \ ); @@ -79,7 +79,7 @@ GENTPROT( invertd ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* alpha, \ obj_t* x \ @@ -94,7 +94,7 @@ GENTPROT( shiftd ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x, \ obj_t* beta, \ @@ -106,25 +106,25 @@ GENTPROT( xpbyd ) // ----------------------------------------------------------------------------- -void bli_l1d_xy_check +BLIS_EXPORT_BLIS void bli_l1d_xy_check ( obj_t* x, obj_t* y ); -void bli_l1d_axy_check +BLIS_EXPORT_BLIS void bli_l1d_axy_check ( obj_t* alpha, obj_t* x, obj_t* y ); -void bli_l1d_x_check +BLIS_EXPORT_BLIS void bli_l1d_x_check ( obj_t* x ); -void bli_l1d_ax_check +BLIS_EXPORT_BLIS void bli_l1d_ax_check ( obj_t* alpha, obj_t* x diff --git a/frame/1d/bli_l1d_fpa.h b/frame/1d/bli_l1d_fpa.h index 4516912de..743055636 100644 --- a/frame/1d/bli_l1d_fpa.h +++ b/frame/1d/bli_l1d_fpa.h @@ -40,7 +40,7 @@ #define GENPROT( opname ) \ \ PASTECH2(opname,BLIS_TAPI_EX_SUF,_vft) \ -PASTEMAC2(opname,BLIS_TAPI_EX_SUF,_qfp)( num_t dt ); +BLIS_EXPORT_BLIS BLIS_EXPORT_BLIS PASTEMAC2(opname,BLIS_TAPI_EX_SUF,_qfp)( num_t dt ); GENPROT( addd ) GENPROT( copyd ) diff --git a/frame/1d/bli_l1d_oapi.c b/frame/1d/bli_l1d_oapi.c index 1a8b8f124..f548410b6 100644 --- a/frame/1d/bli_l1d_oapi.c +++ b/frame/1d/bli_l1d_oapi.c @@ -43,7 +43,7 @@ #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x, \ obj_t* y \ @@ -98,7 +98,7 @@ GENFRONT( subd ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* x, \ @@ -164,7 +164,7 @@ GENFRONT( scal2d ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x \ BLIS_OAPI_EX_PARAMS \ @@ -208,7 +208,7 @@ GENFRONT( invertd ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* x \ @@ -267,7 +267,7 @@ GENFRONT( setd ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* x \ @@ -315,7 +315,7 @@ GENFRONT( setid ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* x \ @@ -371,7 +371,7 @@ GENFRONT( shiftd ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x, \ obj_t* beta, \ diff --git a/frame/1d/bli_l1d_oapi.h b/frame/1d/bli_l1d_oapi.h index d0e39b313..47129b771 100644 --- a/frame/1d/bli_l1d_oapi.h +++ b/frame/1d/bli_l1d_oapi.h @@ -40,7 +40,7 @@ #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x, \ obj_t* y \ @@ -55,7 +55,7 @@ GENTPROT( subd ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* x, \ @@ -70,7 +70,7 @@ GENTPROT( scal2d ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x \ BLIS_OAPI_EX_PARAMS \ @@ -82,7 +82,7 @@ GENTPROT( invertd ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* x \ @@ -98,7 +98,7 @@ GENTPROT( shiftd ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x, \ obj_t* beta, \ diff --git a/frame/1d/bli_l1d_tapi.c b/frame/1d/bli_l1d_tapi.c index a8f9e844a..65a24f4cc 100644 --- a/frame/1d/bli_l1d_tapi.c +++ b/frame/1d/bli_l1d_tapi.c @@ -43,7 +43,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, kername, kerid ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ doff_t diagoffx, \ diag_t diagx, \ @@ -121,7 +121,7 @@ INSERT_GENTFUNC_BASIC2( subd, subv, BLIS_SUBV_KER ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, kername, kerid ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ doff_t diagoffx, \ diag_t diagx, \ @@ -200,7 +200,7 @@ INSERT_GENTFUNC_BASIC2( scal2d, scal2v, BLIS_SCAL2V_KER ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, kername, kerid ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ doff_t diagoffx, \ dim_t m, \ @@ -255,7 +255,7 @@ INSERT_GENTFUNC_BASIC2( invertd, invertv, BLIS_INVERTV_KER ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, kername, kerid ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ conj_t conjalpha, \ doff_t diagoffx, \ @@ -315,7 +315,7 @@ INSERT_GENTFUNC_BASIC2( setd, setv, BLIS_SETV_KER ) #undef GENTFUNCR #define GENTFUNCR( ctype, ctype_r, ch, chr, opname, kername, kerid ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ doff_t diagoffx, \ dim_t m, \ @@ -390,7 +390,7 @@ INSERT_GENTFUNCR_BASIC2( setid, setv, BLIS_SETV_KER ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, kername, kerid ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ doff_t diagoffx, \ dim_t m, \ @@ -448,7 +448,7 @@ INSERT_GENTFUNC_BASIC2( shiftd, addv, BLIS_ADDV_KER ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, kername, kerid ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ doff_t diagoffx, \ diag_t diagx, \ diff --git a/frame/1d/bli_l1d_tapi.h b/frame/1d/bli_l1d_tapi.h index 823858578..35d093e86 100644 --- a/frame/1d/bli_l1d_tapi.h +++ b/frame/1d/bli_l1d_tapi.h @@ -40,7 +40,7 @@ #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ doff_t diagoffx, \ diag_t diagx, \ @@ -60,7 +60,7 @@ INSERT_GENTPROT_BASIC0( subd ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ doff_t diagoffx, \ diag_t diagx, \ @@ -80,7 +80,7 @@ INSERT_GENTPROT_BASIC0( scal2d ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ doff_t diagoffx, \ dim_t m, \ @@ -95,7 +95,7 @@ INSERT_GENTPROT_BASIC0( invertd ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ conj_t conjalpha, \ doff_t diagoffx, \ @@ -113,7 +113,7 @@ INSERT_GENTPROT_BASIC0( setd ) #undef GENTPROTR #define GENTPROTR( ctype, ctype_r, ch, chr, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ doff_t diagoffx, \ dim_t m, \ @@ -129,7 +129,7 @@ INSERT_GENTPROTR_BASIC0( setid ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ doff_t diagoffx, \ dim_t m, \ @@ -145,7 +145,7 @@ INSERT_GENTPROT_BASIC0( shiftd ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ doff_t diagoffx, \ diag_t diagx, \ diff --git a/frame/1f/bli_l1f_check.h b/frame/1f/bli_l1f_check.h index d630f3205..66ef9ad8c 100644 --- a/frame/1f/bli_l1f_check.h +++ b/frame/1f/bli_l1f_check.h @@ -40,7 +40,7 @@ #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* alphax, \ obj_t* alphay, \ @@ -55,7 +55,7 @@ GENTPROT( axpy2v ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* alpha, \ obj_t* a, \ @@ -69,7 +69,7 @@ GENTPROT( axpyf ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* alpha, \ obj_t* xt, \ @@ -85,7 +85,7 @@ GENTPROT( dotaxpyv ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* alpha, \ obj_t* at, \ @@ -103,7 +103,7 @@ GENTPROT( dotxaxpyf ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* alpha, \ obj_t* a, \ diff --git a/frame/1f/bli_l1f_fpa.h b/frame/1f/bli_l1f_fpa.h index df11439a4..e7059bf0d 100644 --- a/frame/1f/bli_l1f_fpa.h +++ b/frame/1f/bli_l1f_fpa.h @@ -40,7 +40,7 @@ #define GENPROT( opname ) \ \ PASTECH2(opname,BLIS_TAPI_EX_SUF,_vft) \ -PASTEMAC2(opname,BLIS_TAPI_EX_SUF,_qfp)( num_t dt ); +BLIS_EXPORT_BLIS PASTEMAC2(opname,BLIS_TAPI_EX_SUF,_qfp)( num_t dt ); GENPROT( axpy2v ) GENPROT( axpyf ) diff --git a/frame/1f/bli_l1f_ker_prot.h b/frame/1f/bli_l1f_ker_prot.h index 18eea4568..824470663 100644 --- a/frame/1f/bli_l1f_ker_prot.h +++ b/frame/1f/bli_l1f_ker_prot.h @@ -39,7 +39,7 @@ #define AXPY2V_KER_PROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ conj_t conjx, \ conj_t conjy, \ @@ -55,7 +55,7 @@ void PASTEMAC(ch,opname) \ #define AXPYF_KER_PROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ conj_t conja, \ conj_t conjx, \ @@ -71,7 +71,7 @@ void PASTEMAC(ch,opname) \ #define DOTAXPYV_KER_PROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ conj_t conjxt, \ conj_t conjx, \ @@ -88,7 +88,7 @@ void PASTEMAC(ch,opname) \ #define DOTXAXPYF_KER_PROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ conj_t conjat, \ conj_t conja, \ @@ -109,7 +109,7 @@ void PASTEMAC(ch,opname) \ #define DOTXF_KER_PROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ conj_t conjat, \ conj_t conjx, \ diff --git a/frame/1f/bli_l1f_oapi.c b/frame/1f/bli_l1f_oapi.c index d1e7f0dbe..285be9370 100644 --- a/frame/1f/bli_l1f_oapi.c +++ b/frame/1f/bli_l1f_oapi.c @@ -43,7 +43,7 @@ #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alphax, \ obj_t* alphay, \ @@ -113,7 +113,7 @@ GENFRONT( axpy2v ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* a, \ @@ -182,7 +182,7 @@ GENFRONT( axpyf ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* xt, \ @@ -251,7 +251,7 @@ GENFRONT( dotaxpyv ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* at, \ @@ -340,7 +340,7 @@ GENFRONT( dotxaxpyf ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* a, \ diff --git a/frame/1f/bli_l1f_oapi.h b/frame/1f/bli_l1f_oapi.h index 47fdf381a..0348c4871 100644 --- a/frame/1f/bli_l1f_oapi.h +++ b/frame/1f/bli_l1f_oapi.h @@ -40,7 +40,7 @@ #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alphax, \ obj_t* alphay, \ @@ -56,7 +56,7 @@ GENTPROT( axpy2v ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* a, \ @@ -71,7 +71,7 @@ GENTPROT( axpyf ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* xt, \ @@ -88,7 +88,7 @@ GENTPROT( dotaxpyv ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* at, \ @@ -107,7 +107,7 @@ GENTPROT( dotxaxpyf ) #undef GENTPROT #define GENTPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* a, \ diff --git a/frame/1f/bli_l1f_tapi.c b/frame/1f/bli_l1f_tapi.c index 332ff5af2..787273982 100644 --- a/frame/1f/bli_l1f_tapi.c +++ b/frame/1f/bli_l1f_tapi.c @@ -43,7 +43,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, kerid ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ conj_t conjx, \ conj_t conjy, \ @@ -87,7 +87,7 @@ INSERT_GENTFUNC_BASIC( axpy2v, BLIS_AXPY2V_KER ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, kerid ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ conj_t conja, \ conj_t conjx, \ @@ -131,7 +131,7 @@ INSERT_GENTFUNC_BASIC( axpyf, BLIS_AXPYF_KER ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, kerid ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ conj_t conjxt, \ conj_t conjx, \ @@ -177,7 +177,7 @@ INSERT_GENTFUNC_BASIC( dotaxpyv, BLIS_DOTAXPYV_KER ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, kerid ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ conj_t conjat, \ conj_t conja, \ @@ -231,7 +231,7 @@ INSERT_GENTFUNC_BASIC( dotxaxpyf, BLIS_DOTXAXPYF_KER ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, kerid ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ conj_t conjat, \ conj_t conjx, \ diff --git a/frame/1f/bli_l1f_tapi.h b/frame/1f/bli_l1f_tapi.h index 54361e8e6..2138b989d 100644 --- a/frame/1f/bli_l1f_tapi.h +++ b/frame/1f/bli_l1f_tapi.h @@ -40,7 +40,7 @@ #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ conj_t conjx, \ conj_t conjy, \ @@ -59,7 +59,7 @@ INSERT_GENTPROT_BASIC0( axpy2v ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ conj_t conja, \ conj_t conjx, \ @@ -78,7 +78,7 @@ INSERT_GENTPROT_BASIC0( axpyf ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ conj_t conjxt, \ conj_t conjx, \ @@ -98,7 +98,7 @@ INSERT_GENTPROT_BASIC0( dotaxpyv ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ conj_t conjat, \ conj_t conja, \ @@ -122,7 +122,7 @@ INSERT_GENTPROT_BASIC0( dotxaxpyf ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ conj_t conjat, \ conj_t conjx, \ diff --git a/frame/1m/bli_l1m_check.c b/frame/1m/bli_l1m_check.c index 8914e43b1..e65ac1bbe 100644 --- a/frame/1m/bli_l1m_check.c +++ b/frame/1m/bli_l1m_check.c @@ -41,7 +41,7 @@ #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x, \ obj_t* y \ @@ -58,7 +58,7 @@ GENFRONT( subm ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* alpha, \ obj_t* x, \ @@ -75,7 +75,7 @@ GENFRONT( scal2m ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* alpha, \ obj_t* x \ @@ -91,7 +91,7 @@ GENFRONT( setm ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x, \ obj_t* beta, \ diff --git a/frame/1m/bli_l1m_check.h b/frame/1m/bli_l1m_check.h index 030c0e219..a01a7bdd7 100644 --- a/frame/1m/bli_l1m_check.h +++ b/frame/1m/bli_l1m_check.h @@ -40,7 +40,7 @@ #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x, \ obj_t* y \ @@ -54,7 +54,7 @@ GENPROT( subm ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* alpha, \ obj_t* x, \ @@ -68,7 +68,7 @@ GENPROT( scal2m ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* alpha, \ obj_t* x \ @@ -81,7 +81,7 @@ GENPROT( setm ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x, \ obj_t* beta, \ @@ -93,20 +93,20 @@ GENPROT( xpbym ) // ----------------------------------------------------------------------------- -void bli_l1m_xy_check +BLIS_EXPORT_BLIS void bli_l1m_xy_check ( obj_t* x, obj_t* y ); -void bli_l1m_axy_check +BLIS_EXPORT_BLIS void bli_l1m_axy_check ( obj_t* alpha, obj_t* x, obj_t* y ); -void bli_l1m_ax_check +BLIS_EXPORT_BLIS void bli_l1m_ax_check ( obj_t* alpha, obj_t* x diff --git a/frame/1m/bli_l1m_fpa.h b/frame/1m/bli_l1m_fpa.h index 84ef8b77f..2f4bb6468 100644 --- a/frame/1m/bli_l1m_fpa.h +++ b/frame/1m/bli_l1m_fpa.h @@ -40,7 +40,7 @@ #define GENPROT( opname ) \ \ PASTECH2(opname,BLIS_TAPI_EX_SUF,_vft) \ -PASTEMAC2(opname,BLIS_TAPI_EX_SUF,_qfp)( num_t dt ); +BLIS_EXPORT_BLIS PASTEMAC2(opname,BLIS_TAPI_EX_SUF,_qfp)( num_t dt ); GENPROT( addm ) GENPROT( copym ) @@ -55,7 +55,7 @@ GENPROT( xpbym ) #define GENPROT( opname ) \ \ PASTECH2(opname,BLIS_TAPI_EX_SUF,_vft) \ -PASTEMAC2(opname,BLIS_TAPI_EX_SUF,_qfp2)( num_t dtx, num_t dty ); +BLIS_EXPORT_BLIS PASTEMAC2(opname,BLIS_TAPI_EX_SUF,_qfp2)( num_t dtx, num_t dty ); GENPROT( xpbym_md ) diff --git a/frame/1m/bli_l1m_ker_prot.h b/frame/1m/bli_l1m_ker_prot.h index ada520b56..725eb750b 100644 --- a/frame/1m/bli_l1m_ker_prot.h +++ b/frame/1m/bli_l1m_ker_prot.h @@ -41,7 +41,7 @@ #define PACKM_KER_PROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ conj_t conja, \ dim_t cdim, \ @@ -58,7 +58,7 @@ void PASTEMAC(ch,varname) \ #define UNPACKM_KER_PROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ conj_t conja, \ dim_t n, \ @@ -73,7 +73,7 @@ void PASTEMAC(ch,varname) \ #define PACKM_3MIS_KER_PROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ conj_t conja, \ dim_t cdim, \ @@ -90,7 +90,7 @@ void PASTEMAC(ch,varname) \ #define PACKM_4MI_KER_PROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ conj_t conja, \ dim_t cdim, \ @@ -107,7 +107,7 @@ void PASTEMAC(ch,varname) \ #define PACKM_RIH_KER_PROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ conj_t conja, \ pack_t schema, \ @@ -125,7 +125,7 @@ void PASTEMAC(ch,varname) \ #define PACKM_1ER_KER_PROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ conj_t conja, \ pack_t schema, \ diff --git a/frame/1m/bli_l1m_oapi.c b/frame/1m/bli_l1m_oapi.c index 4bb0de784..eb94e5aea 100644 --- a/frame/1m/bli_l1m_oapi.c +++ b/frame/1m/bli_l1m_oapi.c @@ -43,7 +43,7 @@ #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x, \ obj_t* y \ @@ -100,7 +100,7 @@ GENFRONT( subm ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* x, \ @@ -168,7 +168,7 @@ GENFRONT( scal2m ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* x \ @@ -243,7 +243,7 @@ GENFRONT( scalm ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* x \ @@ -305,7 +305,7 @@ GENFRONT( setm ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x, \ obj_t* beta, \ @@ -375,7 +375,7 @@ GENFRONT( xpbym ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x, \ obj_t* beta, \ diff --git a/frame/1m/bli_l1m_oapi.h b/frame/1m/bli_l1m_oapi.h index 3ca023deb..a6a94cf9f 100644 --- a/frame/1m/bli_l1m_oapi.h +++ b/frame/1m/bli_l1m_oapi.h @@ -40,7 +40,7 @@ #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x, \ obj_t* y \ @@ -55,7 +55,7 @@ GENPROT( subm ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* x, \ @@ -70,7 +70,7 @@ GENPROT( scal2m ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* x \ @@ -84,7 +84,7 @@ GENPROT( setm ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x, \ obj_t* beta, \ diff --git a/frame/1m/bli_l1m_tapi.c b/frame/1m/bli_l1m_tapi.c index 2b3c4bb4a..45a17182f 100644 --- a/frame/1m/bli_l1m_tapi.c +++ b/frame/1m/bli_l1m_tapi.c @@ -43,7 +43,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, auxker ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ doff_t diagoffx, \ diag_t diagx, \ @@ -108,7 +108,7 @@ INSERT_GENTFUNC_BASIC( subm, subd ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ doff_t diagoffx, \ diag_t diagx, \ @@ -177,7 +177,7 @@ INSERT_GENTFUNC_BASIC0( copym ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ doff_t diagoffx, \ diag_t diagx, \ @@ -247,7 +247,7 @@ INSERT_GENTFUNC_BASIC0( axpym ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ doff_t diagoffx, \ diag_t diagx, \ @@ -339,7 +339,7 @@ INSERT_GENTFUNC_BASIC0( scal2m ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ conj_t conjalpha, \ doff_t diagoffx, \ @@ -385,7 +385,7 @@ INSERT_GENTFUNC_BASIC0( setm ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ doff_t diagoffx, \ diag_t diagx, \ @@ -472,7 +472,7 @@ INSERT_GENTFUNC_BASIC0( xpbym ) #undef GENTFUNC2 #define GENTFUNC2( ctype_x, ctype_y, chx, chy, opname ) \ \ -void PASTEMAC3(chx,chy,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC3(chx,chy,opname,EX_SUF) \ ( \ doff_t diagoffx, \ diag_t diagx, \ diff --git a/frame/1m/bli_l1m_tapi.h b/frame/1m/bli_l1m_tapi.h index a2592f8ba..03a1196ed 100644 --- a/frame/1m/bli_l1m_tapi.h +++ b/frame/1m/bli_l1m_tapi.h @@ -40,7 +40,7 @@ #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ doff_t diagoffx, \ diag_t diagx, \ @@ -61,7 +61,7 @@ INSERT_GENTPROT_BASIC0( subm ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ doff_t diagoffx, \ diag_t diagx, \ @@ -82,7 +82,7 @@ INSERT_GENTPROT_BASIC0( scal2m ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ conj_t conjalpha, \ doff_t diagoffx, \ @@ -102,7 +102,7 @@ INSERT_GENTPROT_BASIC0( setm ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ doff_t diagoffx, \ diag_t diagx, \ @@ -122,7 +122,7 @@ INSERT_GENTPROT_BASIC0( xpbym ) #undef GENTPROT2 #define GENTPROT2( ctype_x, ctype_y, chx, chy, opname ) \ \ -void PASTEMAC3(chx,chy,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC3(chx,chy,opname,EX_SUF) \ ( \ doff_t diagoffx, \ diag_t diagx, \ diff --git a/frame/1m/bli_l1m_unb_var1.c b/frame/1m/bli_l1m_unb_var1.c index cb6098e3f..c9104c8d8 100644 --- a/frame/1m/bli_l1m_unb_var1.c +++ b/frame/1m/bli_l1m_unb_var1.c @@ -41,7 +41,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, kername, kerid ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ doff_t diagoffx, \ diag_t diagx, \ @@ -157,7 +157,7 @@ INSERT_GENTFUNC_BASIC2( subm_unb_var1, subv, BLIS_SUBV_KER ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, kername, kerid ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ doff_t diagoffx, \ diag_t diagx, \ @@ -276,7 +276,7 @@ INSERT_GENTFUNC_BASIC2( scal2m_unb_var1, scal2v, BLIS_SCAL2V_KER ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, kername, kerid ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ conj_t conjalpha, \ doff_t diagoffx, \ @@ -382,7 +382,7 @@ INSERT_GENTFUNC_BASIC2( setm_unb_var1, setv, BLIS_SETV_KER ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, kername, kerid ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ doff_t diagoffx, \ diag_t diagx, \ @@ -500,7 +500,7 @@ INSERT_GENTFUNC_BASIC2( xpbym_unb_var1, xpbyv, BLIS_XPBYV_KER ) #undef GENTFUNC2 #define GENTFUNC2( ctype_x, ctype_y, chx, chy, opname ) \ \ -void PASTEMAC2(chx,chy,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC2(chx,chy,opname) \ ( \ doff_t diagoffx, \ diag_t diagx, \ diff --git a/frame/1m/bli_l1m_unb_var1.h b/frame/1m/bli_l1m_unb_var1.h index 0364d4b7c..81be9fe80 100644 --- a/frame/1m/bli_l1m_unb_var1.h +++ b/frame/1m/bli_l1m_unb_var1.h @@ -40,7 +40,7 @@ #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,_unb_var1) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,_unb_var1) \ ( \ doff_t diagoffx, \ diag_t diagx, \ @@ -62,7 +62,7 @@ INSERT_GENTPROT_BASIC0( subm ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,_unb_var1) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,_unb_var1) \ ( \ doff_t diagoffx, \ diag_t diagx, \ @@ -84,7 +84,7 @@ INSERT_GENTPROT_BASIC0( scal2m ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,_unb_var1) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,_unb_var1) \ ( \ conj_t conjalpha, \ doff_t diagoffx, \ @@ -105,7 +105,7 @@ INSERT_GENTPROT_BASIC0( setm ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,_unb_var1) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,_unb_var1) \ ( \ doff_t diagoffx, \ diag_t diagx, \ @@ -126,7 +126,7 @@ INSERT_GENTPROT_BASIC0( xpbym ) #undef GENTPROT2 #define GENTPROT2( ctype_x, ctype_y, chx, chy, opname ) \ \ -void PASTEMAC3(chx,chy,opname,_unb_var1) \ +BLIS_EXPORT_BLIS void PASTEMAC3(chx,chy,opname,_unb_var1) \ ( \ doff_t diagoffx, \ diag_t diagx, \ diff --git a/frame/1m/other/bli_scalm_cntl.h b/frame/1m/other/bli_scalm_cntl.h index 0d589f207..f87fe110b 100644 --- a/frame/1m/other/bli_scalm_cntl.h +++ b/frame/1m/other/bli_scalm_cntl.h @@ -33,7 +33,7 @@ */ -cntl_t* bli_scalm_cntl_create_node +BLIS_EXPORT_BLIS cntl_t* bli_scalm_cntl_create_node ( void* var_func, cntl_t* sub_node diff --git a/frame/1m/other/bli_scalm_int.h b/frame/1m/other/bli_scalm_int.h index fb043e45f..5b7f054b0 100644 --- a/frame/1m/other/bli_scalm_int.h +++ b/frame/1m/other/bli_scalm_int.h @@ -32,7 +32,7 @@ */ -void bli_scalm_int( obj_t* alpha, +BLIS_EXPORT_BLIS void bli_scalm_int( obj_t* alpha, obj_t* x, cntx_t* cntx, scalm_t* cntl ); diff --git a/frame/1m/packm/bli_packm_blk_var1.c b/frame/1m/packm/bli_packm_blk_var1.c index 3f753a914..54baec41f 100644 --- a/frame/1m/packm/bli_packm_blk_var1.c +++ b/frame/1m/packm/bli_packm_blk_var1.c @@ -276,7 +276,7 @@ void bli_packm_blk_var1 #undef GENTFUNCR #define GENTFUNCR( ctype, ctype_r, ch, chr, opname, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffc, \ diff --git a/frame/1m/packm/bli_packm_blk_var1_md.c b/frame/1m/packm/bli_packm_blk_var1_md.c index 8d4906c50..c0b5b4709 100644 --- a/frame/1m/packm/bli_packm_blk_var1_md.c +++ b/frame/1m/packm/bli_packm_blk_var1_md.c @@ -57,7 +57,7 @@ typedef void (*FUNCPTR_T)( static FUNCPTR_T GENARRAY2_ALL(ftypes,packm_blk_var1_md); -void bli_packm_blk_var1_md +BLIS_EXPORT_BLIS void bli_packm_blk_var1_md ( obj_t* c, obj_t* p, @@ -164,7 +164,7 @@ void bli_packm_blk_var1_md #undef GENTFUNC2 #define GENTFUNC2( ctype_c, ctype_p, chc, chp, varname ) \ \ -void PASTEMAC2(chc,chp,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC2(chc,chp,varname) \ ( \ trans_t transc, \ pack_t schema, \ diff --git a/frame/1m/packm/bli_packm_blk_var1_md.h b/frame/1m/packm/bli_packm_blk_var1_md.h index e6bf151d0..99c697da6 100644 --- a/frame/1m/packm/bli_packm_blk_var1_md.h +++ b/frame/1m/packm/bli_packm_blk_var1_md.h @@ -32,7 +32,7 @@ */ -void bli_packm_blk_var1_md +BLIS_EXPORT_BLIS void bli_packm_blk_var1_md ( obj_t* c, obj_t* p, @@ -45,7 +45,7 @@ void bli_packm_blk_var1_md #undef GENTPROT2 #define GENTPROT2( ctype_c, ctype_p, chc, chp, varname ) \ \ -void PASTEMAC2(chc,chp,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC2(chc,chp,varname) \ ( \ trans_t transc, \ pack_t schema, \ diff --git a/frame/1m/packm/bli_packm_check.c b/frame/1m/packm/bli_packm_check.c index e662a85df..2e0c059c7 100644 --- a/frame/1m/packm/bli_packm_check.c +++ b/frame/1m/packm/bli_packm_check.c @@ -35,7 +35,7 @@ #include "blis.h" -void bli_packm_init_check +BLIS_EXPORT_BLIS void bli_packm_init_check ( obj_t* a, obj_t* p, @@ -57,7 +57,7 @@ void bli_packm_init_check //bli_check_error_code( e_val ); } -void bli_packm_int_check +BLIS_EXPORT_BLIS void bli_packm_int_check ( obj_t* a, obj_t* p, diff --git a/frame/1m/packm/bli_packm_check.h b/frame/1m/packm/bli_packm_check.h index be375fcf7..8b78feb99 100644 --- a/frame/1m/packm/bli_packm_check.h +++ b/frame/1m/packm/bli_packm_check.h @@ -32,14 +32,14 @@ */ -void bli_packm_init_check +BLIS_EXPORT_BLIS void bli_packm_init_check ( obj_t* a, obj_t* p, cntx_t* cntx ); -void bli_packm_int_check +BLIS_EXPORT_BLIS void bli_packm_int_check ( obj_t* a, obj_t* p, diff --git a/frame/1m/packm/bli_packm_cntl.h b/frame/1m/packm/bli_packm_cntl.h index fef603ab0..b366a4188 100644 --- a/frame/1m/packm/bli_packm_cntl.h +++ b/frame/1m/packm/bli_packm_cntl.h @@ -89,7 +89,7 @@ static packbuf_t bli_cntl_packm_params_pack_buf_type( cntl_t* cntl ) // ----------------------------------------------------------------------------- -cntl_t* bli_packm_cntl_create_node +BLIS_EXPORT_BLIS cntl_t* bli_packm_cntl_create_node ( rntm_t* rntm, void* var_func, diff --git a/frame/1m/packm/bli_packm_cxk.c b/frame/1m/packm/bli_packm_cxk.c index 59f99dd18..9e82bfc8d 100644 --- a/frame/1m/packm/bli_packm_cxk.c +++ b/frame/1m/packm/bli_packm_cxk.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ conj_t conja, \ dim_t panel_dim, \ diff --git a/frame/1m/packm/bli_packm_cxk.h b/frame/1m/packm/bli_packm_cxk.h index be089f05c..26071af4d 100644 --- a/frame/1m/packm/bli_packm_cxk.h +++ b/frame/1m/packm/bli_packm_cxk.h @@ -36,7 +36,7 @@ #undef GENTPROT #define GENTPROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ conj_t conja, \ dim_t panel_dim, \ diff --git a/frame/1m/packm/bli_packm_cxk_1er.c b/frame/1m/packm/bli_packm_cxk_1er.c index e583c8a82..8331acf1c 100644 --- a/frame/1m/packm/bli_packm_cxk_1er.c +++ b/frame/1m/packm/bli_packm_cxk_1er.c @@ -37,7 +37,7 @@ #undef GENTFUNCCO #define GENTFUNCCO( ctype, ctype_r, ch, chr, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ conj_t conja, \ pack_t schema, \ diff --git a/frame/1m/packm/bli_packm_cxk_1er.h b/frame/1m/packm/bli_packm_cxk_1er.h index 2b0c977b9..77151a2e5 100644 --- a/frame/1m/packm/bli_packm_cxk_1er.h +++ b/frame/1m/packm/bli_packm_cxk_1er.h @@ -36,7 +36,7 @@ #undef GENTPROTCO #define GENTPROTCO( ctype, ctype_r, ch, chr, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ conj_t conja, \ pack_t schema, \ diff --git a/frame/1m/packm/bli_packm_cxk_3mis.c b/frame/1m/packm/bli_packm_cxk_3mis.c index 9435f6a73..900eefb50 100644 --- a/frame/1m/packm/bli_packm_cxk_3mis.c +++ b/frame/1m/packm/bli_packm_cxk_3mis.c @@ -37,7 +37,7 @@ #undef GENTFUNCCO #define GENTFUNCCO( ctype, ctype_r, ch, chr, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ conj_t conja, \ dim_t panel_dim, \ diff --git a/frame/1m/packm/bli_packm_cxk_3mis.h b/frame/1m/packm/bli_packm_cxk_3mis.h index 358cdcee4..472723986 100644 --- a/frame/1m/packm/bli_packm_cxk_3mis.h +++ b/frame/1m/packm/bli_packm_cxk_3mis.h @@ -36,7 +36,7 @@ #undef GENTPROTCO #define GENTPROTCO( ctype, ctype_r, ch, chr, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ conj_t conja, \ dim_t panel_dim, \ diff --git a/frame/1m/packm/bli_packm_cxk_4mi.c b/frame/1m/packm/bli_packm_cxk_4mi.c index c22f551cc..03f151681 100644 --- a/frame/1m/packm/bli_packm_cxk_4mi.c +++ b/frame/1m/packm/bli_packm_cxk_4mi.c @@ -37,7 +37,7 @@ #undef GENTFUNCCO #define GENTFUNCCO( ctype, ctype_r, ch, chr, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ conj_t conja, \ dim_t panel_dim, \ diff --git a/frame/1m/packm/bli_packm_cxk_4mi.h b/frame/1m/packm/bli_packm_cxk_4mi.h index 244f2d045..1ad57079c 100644 --- a/frame/1m/packm/bli_packm_cxk_4mi.h +++ b/frame/1m/packm/bli_packm_cxk_4mi.h @@ -36,7 +36,7 @@ #undef GENTPROTCO #define GENTPROTCO( ctype, ctype_r, ch, chr, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ conj_t conja, \ dim_t panel_dim, \ diff --git a/frame/1m/packm/bli_packm_cxk_rih.c b/frame/1m/packm/bli_packm_cxk_rih.c index 1f2c9f240..62e4b5246 100644 --- a/frame/1m/packm/bli_packm_cxk_rih.c +++ b/frame/1m/packm/bli_packm_cxk_rih.c @@ -37,7 +37,7 @@ #undef GENTFUNCCO #define GENTFUNCCO( ctype, ctype_r, ch, chr, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ conj_t conja, \ pack_t schema, \ diff --git a/frame/1m/packm/bli_packm_cxk_rih.h b/frame/1m/packm/bli_packm_cxk_rih.h index c1d2ba9fe..7bf49aca7 100644 --- a/frame/1m/packm/bli_packm_cxk_rih.h +++ b/frame/1m/packm/bli_packm_cxk_rih.h @@ -36,7 +36,7 @@ #undef GENTPROTCO #define GENTPROTCO( ctype, ctype_r, ch, chr, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ conj_t conja, \ pack_t schema, \ diff --git a/frame/1m/packm/bli_packm_init.h b/frame/1m/packm/bli_packm_init.h index 6896ab913..c1b1a8f62 100644 --- a/frame/1m/packm/bli_packm_init.h +++ b/frame/1m/packm/bli_packm_init.h @@ -32,7 +32,7 @@ */ -siz_t bli_packm_init +BLIS_EXPORT_BLIS siz_t bli_packm_init ( obj_t* a, obj_t* p, @@ -40,7 +40,7 @@ siz_t bli_packm_init cntl_t* cntl ); -siz_t bli_packm_init_pack +BLIS_EXPORT_BLIS siz_t bli_packm_init_pack ( invdiag_t invert_diag, pack_t schema, diff --git a/frame/1m/packm/bli_packm_int.c b/frame/1m/packm/bli_packm_int.c index 6dc9ec85a..c59781532 100644 --- a/frame/1m/packm/bli_packm_int.c +++ b/frame/1m/packm/bli_packm_int.c @@ -34,7 +34,7 @@ #include "blis.h" -void bli_packm_int +BLIS_EXPORT_BLIS void bli_packm_int ( obj_t* a, obj_t* p, diff --git a/frame/1m/packm/bli_packm_int.h b/frame/1m/packm/bli_packm_int.h index 573a299d6..883c72ae9 100644 --- a/frame/1m/packm/bli_packm_int.h +++ b/frame/1m/packm/bli_packm_int.h @@ -32,7 +32,7 @@ */ -void bli_packm_int +BLIS_EXPORT_BLIS void bli_packm_int ( obj_t* a, obj_t* p, diff --git a/frame/1m/packm/bli_packm_part.c b/frame/1m/packm/bli_packm_part.c index 2fff4b7c8..09cedbed1 100644 --- a/frame/1m/packm/bli_packm_part.c +++ b/frame/1m/packm/bli_packm_part.c @@ -38,7 +38,7 @@ // -- Matrix partitioning ------------------------------------------------------ -void bli_packm_acquire_mpart_t2b( subpart_t requested_part, +BLIS_EXPORT_BLIS void bli_packm_acquire_mpart_t2b( subpart_t requested_part, dim_t i, dim_t b, obj_t* obj, @@ -110,7 +110,7 @@ void bli_packm_acquire_mpart_t2b( subpart_t requested_part, -void bli_packm_acquire_mpart_l2r( subpart_t requested_part, +BLIS_EXPORT_BLIS void bli_packm_acquire_mpart_l2r( subpart_t requested_part, dim_t j, dim_t b, obj_t* obj, @@ -186,7 +186,7 @@ void bli_packm_acquire_mpart_l2r( subpart_t requested_part, -void bli_packm_acquire_mpart_tl2br( subpart_t requested_part, +BLIS_EXPORT_BLIS void bli_packm_acquire_mpart_tl2br( subpart_t requested_part, dim_t ij, dim_t b, obj_t* obj, diff --git a/frame/1m/packm/bli_packm_part.h b/frame/1m/packm/bli_packm_part.h index 5930d312e..e2ccbf18e 100644 --- a/frame/1m/packm/bli_packm_part.h +++ b/frame/1m/packm/bli_packm_part.h @@ -34,23 +34,23 @@ // -- Matrix partitioning ------------------------------------------------------ -void bli_packm_acquire_mpart_t2b( subpart_t requested_part, +BLIS_EXPORT_BLIS void bli_packm_acquire_mpart_t2b( subpart_t requested_part, dim_t i, dim_t b, obj_t* obj, obj_t* sub_obj ); -void bli_packm_acquire_mpart_l2r( subpart_t requested_part, +BLIS_EXPORT_BLIS void bli_packm_acquire_mpart_l2r( subpart_t requested_part, dim_t j, dim_t b, obj_t* obj, obj_t* sub_obj ); -void bli_packm_acquire_mpart_tl2br( subpart_t requested_part, +BLIS_EXPORT_BLIS void bli_packm_acquire_mpart_tl2br( subpart_t requested_part, dim_t ij, dim_t b, obj_t* obj, obj_t* sub_obj ); -dim_t bli_packm_offset_to_panel_for( dim_t offmn, obj_t* p ); +BLIS_EXPORT_BLIS dim_t bli_packm_offset_to_panel_for( dim_t offmn, obj_t* p ); diff --git a/frame/1m/packm/bli_packm_struc_cxk.c b/frame/1m/packm/bli_packm_struc_cxk.c index b86a9ebbd..5e7decea6 100644 --- a/frame/1m/packm/bli_packm_struc_cxk.c +++ b/frame/1m/packm/bli_packm_struc_cxk.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, varname, kername ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffc, \ @@ -278,7 +278,7 @@ INSERT_GENTFUNC_BASIC( packm_struc_cxk, packm_cxk ) #undef GENTFUNC #define GENTFUNC( ctype, ch, varname, kername ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffc, \ @@ -532,7 +532,7 @@ INSERT_GENTFUNC_BASIC( packm_herm_cxk, packm_cxk ) #undef GENTFUNC #define GENTFUNC( ctype, ch, varname, kername ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffp, \ diff --git a/frame/1m/packm/bli_packm_struc_cxk.h b/frame/1m/packm/bli_packm_struc_cxk.h index 5b486d776..f192bd3cd 100644 --- a/frame/1m/packm/bli_packm_struc_cxk.h +++ b/frame/1m/packm/bli_packm_struc_cxk.h @@ -35,7 +35,7 @@ #undef GENTPROT #define GENTPROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffp, \ @@ -62,7 +62,7 @@ INSERT_GENTPROT_BASIC0( packm_struc_cxk ) #undef GENTPROT #define GENTPROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffc, \ @@ -92,7 +92,7 @@ INSERT_GENTPROT_BASIC0( packm_herm_cxk ) #undef GENTPROT #define GENTPROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffc, \ diff --git a/frame/1m/packm/bli_packm_struc_cxk_1er.c b/frame/1m/packm/bli_packm_struc_cxk_1er.c index 038ee1b8f..9a2c079c3 100644 --- a/frame/1m/packm/bli_packm_struc_cxk_1er.c +++ b/frame/1m/packm/bli_packm_struc_cxk_1er.c @@ -37,7 +37,7 @@ #undef GENTFUNCCO #define GENTFUNCCO( ctype, ctype_r, ch, chr, varname, kername ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffc, \ @@ -274,7 +274,7 @@ INSERT_GENTFUNCCO_BASIC( packm_struc_cxk_1er, packm_cxk_1er ) #undef GENTFUNCCO #define GENTFUNCCO( ctype, ctype_r, ch, chr, varname, kername ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffc, \ @@ -520,7 +520,7 @@ INSERT_GENTFUNCCO_BASIC( packm_herm_cxk_1er, packm_cxk_1er ) #undef GENTFUNCCO #define GENTFUNCCO( ctype, ctype_r, ch, chr, varname, kername ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffp, \ diff --git a/frame/1m/packm/bli_packm_struc_cxk_1er.h b/frame/1m/packm/bli_packm_struc_cxk_1er.h index e63edf8f2..348f5bd30 100644 --- a/frame/1m/packm/bli_packm_struc_cxk_1er.h +++ b/frame/1m/packm/bli_packm_struc_cxk_1er.h @@ -35,7 +35,7 @@ #undef GENTPROTCO #define GENTPROTCO( ctype, ctype_r, ch, chr, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffp, \ @@ -62,7 +62,7 @@ INSERT_GENTPROTCO_BASIC0( packm_struc_cxk_1er ) #undef GENTPROTCO #define GENTPROTCO( ctype, ctype_r, ch, chr, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffc, \ @@ -92,7 +92,7 @@ INSERT_GENTPROTCO_BASIC0( packm_herm_cxk_1er ) #undef GENTPROTCO #define GENTPROTCO( ctype, ctype_r, ch, chr, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffc, \ diff --git a/frame/1m/packm/bli_packm_struc_cxk_3mis.c b/frame/1m/packm/bli_packm_struc_cxk_3mis.c index 9d01b3b40..7530ad42b 100644 --- a/frame/1m/packm/bli_packm_struc_cxk_3mis.c +++ b/frame/1m/packm/bli_packm_struc_cxk_3mis.c @@ -37,7 +37,7 @@ #undef GENTFUNCCO #define GENTFUNCCO( ctype, ctype_r, ch, chr, varname, kername ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffc, \ @@ -338,7 +338,7 @@ INSERT_GENTFUNCCO_BASIC( packm_struc_cxk_3mis, packm_cxk_3mis ) #undef GENTFUNCCO #define GENTFUNCCO( ctype, ctype_r, ch, chr, varname, kername ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffc, \ @@ -657,7 +657,7 @@ INSERT_GENTFUNCCO_BASIC( packm_herm_cxk_3mis, packm_cxk_3mis ) #undef GENTFUNCCO #define GENTFUNCCO( ctype, ctype_r, ch, chr, varname, kername ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffp, \ diff --git a/frame/1m/packm/bli_packm_struc_cxk_3mis.h b/frame/1m/packm/bli_packm_struc_cxk_3mis.h index 24f2c0fcb..f4568f722 100644 --- a/frame/1m/packm/bli_packm_struc_cxk_3mis.h +++ b/frame/1m/packm/bli_packm_struc_cxk_3mis.h @@ -35,7 +35,7 @@ #undef GENTPROTCO #define GENTPROTCO( ctype, ctype_r, ch, chr, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffp, \ @@ -62,7 +62,7 @@ INSERT_GENTPROTCO_BASIC0( packm_struc_cxk_3mis ) #undef GENTPROTCO #define GENTPROTCO( ctype, ctype_r, ch, chr, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffc, \ @@ -92,7 +92,7 @@ INSERT_GENTPROTCO_BASIC0( packm_herm_cxk_3mis ) #undef GENTPROTCO #define GENTPROTCO( ctype, ctype_r, ch, chr, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffc, \ diff --git a/frame/1m/packm/bli_packm_struc_cxk_4mi.c b/frame/1m/packm/bli_packm_struc_cxk_4mi.c index 3df849921..80ce1ffb8 100644 --- a/frame/1m/packm/bli_packm_struc_cxk_4mi.c +++ b/frame/1m/packm/bli_packm_struc_cxk_4mi.c @@ -37,7 +37,7 @@ #undef GENTFUNCCO #define GENTFUNCCO( ctype, ctype_r, ch, chr, varname, kername ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffc, \ @@ -308,7 +308,7 @@ INSERT_GENTFUNCCO_BASIC( packm_struc_cxk_4mi, packm_cxk_4mi ) #undef GENTFUNCCO #define GENTFUNCCO( ctype, ctype_r, ch, chr, varname, kername ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffc, \ @@ -612,7 +612,7 @@ INSERT_GENTFUNCCO_BASIC( packm_herm_cxk_4mi, packm_cxk_4mi ) #undef GENTFUNCCO #define GENTFUNCCO( ctype, ctype_r, ch, chr, varname, kername ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffp, \ diff --git a/frame/1m/packm/bli_packm_struc_cxk_4mi.h b/frame/1m/packm/bli_packm_struc_cxk_4mi.h index f2e6636bf..65cee615b 100644 --- a/frame/1m/packm/bli_packm_struc_cxk_4mi.h +++ b/frame/1m/packm/bli_packm_struc_cxk_4mi.h @@ -35,7 +35,7 @@ #undef GENTPROTCO #define GENTPROTCO( ctype, ctype_r, ch, chr, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffp, \ @@ -62,7 +62,7 @@ INSERT_GENTPROTCO_BASIC0( packm_struc_cxk_4mi ) #undef GENTPROTCO #define GENTPROTCO( ctype, ctype_r, ch, chr, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffc, \ @@ -92,7 +92,7 @@ INSERT_GENTPROTCO_BASIC0( packm_herm_cxk_4mi ) #undef GENTPROTCO #define GENTPROTCO( ctype, ctype_r, ch, chr, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffc, \ diff --git a/frame/1m/packm/bli_packm_struc_cxk_md.c b/frame/1m/packm/bli_packm_struc_cxk_md.c index 52a1f9817..8bae422a6 100644 --- a/frame/1m/packm/bli_packm_struc_cxk_md.c +++ b/frame/1m/packm/bli_packm_struc_cxk_md.c @@ -39,7 +39,7 @@ #undef GENTFUNC2 #define GENTFUNC2( ctype_c, ctype_p, chc, chp, varname ) \ \ -void PASTEMAC2(chc,chp,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC2(chc,chp,varname) \ ( \ conj_t conjc, \ pack_t schema, \ @@ -313,7 +313,7 @@ INSERT_GENTFUNC2_MIXDP0( packm_struc_cxk_md ) #undef GENTFUNC2 #define GENTFUNC2( ctype_a, ctype_p, cha, chp, opname ) \ \ -void PASTEMAC2(cha,chp,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC2(cha,chp,opname) \ ( \ conj_t conja, \ dim_t m, \ @@ -440,7 +440,7 @@ INSERT_GENTFUNC2_MIXDP0( packm_cxk_1r_md ) #undef GENTFUNC2 #define GENTFUNC2( ctype_a, ctype_p, cha, chp, opname ) \ \ -void PASTEMAC2(cha,chp,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC2(cha,chp,opname) \ ( \ conj_t conja, \ dim_t m, \ diff --git a/frame/1m/packm/bli_packm_struc_cxk_md.h b/frame/1m/packm/bli_packm_struc_cxk_md.h index 72ca67937..f6b62160c 100644 --- a/frame/1m/packm/bli_packm_struc_cxk_md.h +++ b/frame/1m/packm/bli_packm_struc_cxk_md.h @@ -35,7 +35,7 @@ #undef GENTPROT2 #define GENTPROT2( ctype_c, ctype_p, chc, chp, varname ) \ \ -void PASTEMAC2(chc,chp,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC2(chc,chp,varname) \ ( \ conj_t conjc, \ pack_t schema, \ @@ -57,7 +57,7 @@ INSERT_GENTPROT2_MIXDP0( packm_struc_cxk_md ) #undef GENTPROT2 #define GENTPROT2( ctype_a, ctype_p, cha, chp, opname ) \ \ -void PASTEMAC2(cha,chp,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC2(cha,chp,opname) \ ( \ conj_t conja, \ dim_t m, \ diff --git a/frame/1m/packm/bli_packm_struc_cxk_rih.c b/frame/1m/packm/bli_packm_struc_cxk_rih.c index 32a7ec1a7..e73970ab5 100644 --- a/frame/1m/packm/bli_packm_struc_cxk_rih.c +++ b/frame/1m/packm/bli_packm_struc_cxk_rih.c @@ -37,7 +37,7 @@ #undef GENTFUNCCO #define GENTFUNCCO( ctype, ctype_r, ch, chr, varname, kername ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffc, \ @@ -269,7 +269,7 @@ INSERT_GENTFUNCCO_BASIC( packm_struc_cxk_rih, packm_cxk_rih ) #undef GENTFUNCCO #define GENTFUNCCO( ctype, ctype_r, ch, chr, varname, kername ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffc, \ @@ -522,7 +522,7 @@ INSERT_GENTFUNCCO_BASIC( packm_herm_cxk_rih, packm_cxk_rih ) #undef GENTFUNCCO #define GENTFUNCCO( ctype, ctype_r, ch, chr, varname, kername ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffp, \ diff --git a/frame/1m/packm/bli_packm_struc_cxk_rih.h b/frame/1m/packm/bli_packm_struc_cxk_rih.h index e87767e26..392124021 100644 --- a/frame/1m/packm/bli_packm_struc_cxk_rih.h +++ b/frame/1m/packm/bli_packm_struc_cxk_rih.h @@ -35,7 +35,7 @@ #undef GENTPROTCO #define GENTPROTCO( ctype, ctype_r, ch, chr, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffp, \ @@ -62,7 +62,7 @@ INSERT_GENTPROTCO_BASIC0( packm_struc_cxk_rih ) #undef GENTPROTCO #define GENTPROTCO( ctype, ctype_r, ch, chr, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffc, \ @@ -92,7 +92,7 @@ INSERT_GENTPROTCO_BASIC0( packm_herm_cxk_rih ) #undef GENTPROTCO #define GENTPROTCO( ctype, ctype_r, ch, chr, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffc, \ diff --git a/frame/1m/packm/bli_packm_thrinfo.c b/frame/1m/packm/bli_packm_thrinfo.c index 800fa3c7f..896cb0f5b 100644 --- a/frame/1m/packm/bli_packm_thrinfo.c +++ b/frame/1m/packm/bli_packm_thrinfo.c @@ -35,7 +35,7 @@ #include "blis.h" -void bli_packm_thrinfo_init +BLIS_EXPORT_BLIS void bli_packm_thrinfo_init ( thrinfo_t* thread, thrcomm_t* ocomm, @@ -55,7 +55,7 @@ void bli_packm_thrinfo_init ); } -void bli_packm_thrinfo_init_single +BLIS_EXPORT_BLIS void bli_packm_thrinfo_init_single ( thrinfo_t* thread ) diff --git a/frame/1m/packm/bli_packm_thrinfo.h b/frame/1m/packm/bli_packm_thrinfo.h index 190d3f2d3..5b1e653fe 100644 --- a/frame/1m/packm/bli_packm_thrinfo.h +++ b/frame/1m/packm/bli_packm_thrinfo.h @@ -70,7 +70,7 @@ // #if 0 -thrinfo_t* bli_packm_thrinfo_create +BLIS_EXPORT_BLIS thrinfo_t* bli_packm_thrinfo_create ( thrcomm_t* ocomm, dim_t ocomm_id, @@ -80,7 +80,7 @@ thrinfo_t* bli_packm_thrinfo_create ); #endif -void bli_packm_thrinfo_init +BLIS_EXPORT_BLIS void bli_packm_thrinfo_init ( thrinfo_t* thread, thrcomm_t* ocomm, @@ -90,13 +90,13 @@ void bli_packm_thrinfo_init thrinfo_t* sub_node ); -void bli_packm_thrinfo_init_single +BLIS_EXPORT_BLIS void bli_packm_thrinfo_init_single ( thrinfo_t* thread ); #if 0 -void bli_packm_thrinfo_free +BLIS_EXPORT_BLIS void bli_packm_thrinfo_free ( thrinfo_t* thread ); diff --git a/frame/1m/packm/bli_packm_unb_var1.c b/frame/1m/packm/bli_packm_unb_var1.c index 6e72b3e9d..c6705b956 100644 --- a/frame/1m/packm/bli_packm_unb_var1.c +++ b/frame/1m/packm/bli_packm_unb_var1.c @@ -125,7 +125,7 @@ void bli_packm_unb_var1 #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffc, \ diff --git a/frame/1m/packm/bli_packm_unb_var1.h b/frame/1m/packm/bli_packm_unb_var1.h index 8960c8661..9d7b20c52 100644 --- a/frame/1m/packm/bli_packm_unb_var1.h +++ b/frame/1m/packm/bli_packm_unb_var1.h @@ -32,7 +32,7 @@ */ -void bli_packm_unb_var1 +BLIS_EXPORT_BLIS void bli_packm_unb_var1 ( obj_t* c, obj_t* p, @@ -45,7 +45,7 @@ void bli_packm_unb_var1 #undef GENTPROT #define GENTPROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffc, \ diff --git a/frame/1m/packm/bli_packm_var.h b/frame/1m/packm/bli_packm_var.h index 6c11b19ab..3e1e2dd32 100644 --- a/frame/1m/packm/bli_packm_var.h +++ b/frame/1m/packm/bli_packm_var.h @@ -40,7 +40,7 @@ #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* c, \ obj_t* p, \ @@ -59,7 +59,7 @@ GENPROT( packm_blk_var1 ) #undef GENTPROT #define GENTPROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffc, \ @@ -81,7 +81,7 @@ INSERT_GENTPROT_BASIC0( packm_unb_var1 ) #undef GENTPROT #define GENTPROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffc, \ diff --git a/frame/1m/unpackm/bli_unpackm_blk_var1.c b/frame/1m/unpackm/bli_unpackm_blk_var1.c index b2c862045..430efd45b 100644 --- a/frame/1m/unpackm/bli_unpackm_blk_var1.c +++ b/frame/1m/unpackm/bli_unpackm_blk_var1.c @@ -55,7 +55,7 @@ typedef void (*FUNCPTR_T)( static FUNCPTR_T GENARRAY(ftypes,unpackm_blk_var1); -void bli_unpackm_blk_var1 +BLIS_EXPORT_BLIS void bli_unpackm_blk_var1 ( obj_t* p, obj_t* c, @@ -126,7 +126,7 @@ void bli_unpackm_blk_var1 #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffc, \ diff --git a/frame/1m/unpackm/bli_unpackm_blk_var1.h b/frame/1m/unpackm/bli_unpackm_blk_var1.h index abd044549..160cef90f 100644 --- a/frame/1m/unpackm/bli_unpackm_blk_var1.h +++ b/frame/1m/unpackm/bli_unpackm_blk_var1.h @@ -32,7 +32,7 @@ */ -void bli_unpackm_blk_var1 +BLIS_EXPORT_BLIS void bli_unpackm_blk_var1 ( obj_t* p, obj_t* c, @@ -45,7 +45,7 @@ void bli_unpackm_blk_var1 #undef GENTPROT #define GENTPROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ struc_t strucc, \ doff_t diagoffc, \ diff --git a/frame/1m/unpackm/bli_unpackm_check.c b/frame/1m/unpackm/bli_unpackm_check.c index 5bce60ed3..19189bdbf 100644 --- a/frame/1m/unpackm/bli_unpackm_check.c +++ b/frame/1m/unpackm/bli_unpackm_check.c @@ -34,7 +34,7 @@ #include "blis.h" -void bli_unpackm_int_check +BLIS_EXPORT_BLIS void bli_unpackm_int_check ( obj_t* p, obj_t* a, diff --git a/frame/1m/unpackm/bli_unpackm_check.h b/frame/1m/unpackm/bli_unpackm_check.h index d2a976dd8..0edb6bc57 100644 --- a/frame/1m/unpackm/bli_unpackm_check.h +++ b/frame/1m/unpackm/bli_unpackm_check.h @@ -32,7 +32,7 @@ */ -void bli_unpackm_int_check +BLIS_EXPORT_BLIS void bli_unpackm_int_check ( obj_t* p, obj_t* a, diff --git a/frame/1m/unpackm/bli_unpackm_cntl.h b/frame/1m/unpackm/bli_unpackm_cntl.h index b282c3561..1d7ba609c 100644 --- a/frame/1m/unpackm/bli_unpackm_cntl.h +++ b/frame/1m/unpackm/bli_unpackm_cntl.h @@ -46,7 +46,7 @@ typedef struct unpackm_params_s unpackm_params_t; // ----------------------------------------------------------------------------- -cntl_t* bli_unpackm_cntl_create_node +BLIS_EXPORT_BLIS cntl_t* bli_unpackm_cntl_create_node ( rntm_t* rntm, void* var_func, diff --git a/frame/1m/unpackm/bli_unpackm_cxk.c b/frame/1m/unpackm/bli_unpackm_cxk.c index 4423c41a2..88dffd692 100644 --- a/frame/1m/unpackm/bli_unpackm_cxk.c +++ b/frame/1m/unpackm/bli_unpackm_cxk.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ conj_t conjp, \ dim_t panel_dim, \ diff --git a/frame/1m/unpackm/bli_unpackm_cxk.h b/frame/1m/unpackm/bli_unpackm_cxk.h index 53c3c0c44..730f15fa9 100644 --- a/frame/1m/unpackm/bli_unpackm_cxk.h +++ b/frame/1m/unpackm/bli_unpackm_cxk.h @@ -36,7 +36,7 @@ #undef GENTPROT #define GENTPROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ conj_t conjp, \ dim_t panel_dim, \ diff --git a/frame/1m/unpackm/bli_unpackm_int.c b/frame/1m/unpackm/bli_unpackm_int.c index f4c8ab82d..83b0acfbe 100644 --- a/frame/1m/unpackm/bli_unpackm_int.c +++ b/frame/1m/unpackm/bli_unpackm_int.c @@ -34,7 +34,7 @@ #include "blis.h" -void bli_unpackm_int +BLIS_EXPORT_BLIS void bli_unpackm_int ( obj_t* p, obj_t* a, diff --git a/frame/1m/unpackm/bli_unpackm_int.h b/frame/1m/unpackm/bli_unpackm_int.h index cb66d0975..690a5479c 100644 --- a/frame/1m/unpackm/bli_unpackm_int.h +++ b/frame/1m/unpackm/bli_unpackm_int.h @@ -32,7 +32,7 @@ */ -void bli_unpackm_int +BLIS_EXPORT_BLIS void bli_unpackm_int ( obj_t* p, obj_t* a, diff --git a/frame/1m/unpackm/bli_unpackm_unb_var1.c b/frame/1m/unpackm/bli_unpackm_unb_var1.c index c1033c2cb..d7bb57e60 100644 --- a/frame/1m/unpackm/bli_unpackm_unb_var1.c +++ b/frame/1m/unpackm/bli_unpackm_unb_var1.c @@ -50,7 +50,7 @@ typedef void (*FUNCPTR_T)( static FUNCPTR_T GENARRAY(ftypes,unpackm_unb_var1); -void bli_unpackm_unb_var1 +BLIS_EXPORT_BLIS void bli_unpackm_unb_var1 ( obj_t* p, obj_t* c, @@ -98,7 +98,7 @@ void bli_unpackm_unb_var1 #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, varname ) \ \ -void PASTEMAC(ch,varname)( \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname)( \ doff_t diagoffp, \ uplo_t uplop, \ trans_t transp, \ diff --git a/frame/1m/unpackm/bli_unpackm_unb_var1.h b/frame/1m/unpackm/bli_unpackm_unb_var1.h index 5119aaa7f..290b1a927 100644 --- a/frame/1m/unpackm/bli_unpackm_unb_var1.h +++ b/frame/1m/unpackm/bli_unpackm_unb_var1.h @@ -32,7 +32,7 @@ */ -void bli_unpackm_unb_var1 +BLIS_EXPORT_BLIS void bli_unpackm_unb_var1 ( obj_t* p, obj_t* c, @@ -44,7 +44,7 @@ void bli_unpackm_unb_var1 #undef GENTPROT #define GENTPROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffp, \ uplo_t uplop, \ diff --git a/frame/2/bli_l2_check.h b/frame/2/bli_l2_check.h index af9388753..6d1e2b2da 100644 --- a/frame/2/bli_l2_check.h +++ b/frame/2/bli_l2_check.h @@ -40,7 +40,7 @@ #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* alpha, \ obj_t* a, \ @@ -57,7 +57,7 @@ GENPROT( symv ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* alpha, \ obj_t* x, \ @@ -73,7 +73,7 @@ GENPROT( syr2 ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* alpha, \ obj_t* x, \ @@ -87,7 +87,7 @@ GENPROT( syr ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* alpha, \ obj_t* a, \ @@ -100,7 +100,7 @@ GENPROT( trsv ) // ----------------------------------------------------------------------------- -void bli_xxmv_check +BLIS_EXPORT_BLIS void bli_xxmv_check ( obj_t* alpha, obj_t* a, @@ -109,7 +109,7 @@ void bli_xxmv_check obj_t* y ); -void bli_xxr_check +BLIS_EXPORT_BLIS void bli_xxr_check ( obj_t* alpha, obj_t* x, diff --git a/frame/2/bli_l2_fpa.h b/frame/2/bli_l2_fpa.h index 414bd82c2..c22e040e9 100644 --- a/frame/2/bli_l2_fpa.h +++ b/frame/2/bli_l2_fpa.h @@ -40,7 +40,7 @@ #define GENPROT( opname ) \ \ PASTECH2(opname,BLIS_TAPI_EX_SUF,_vft) \ -PASTEMAC2(opname,BLIS_TAPI_EX_SUF,_qfp)( num_t dt ); +BLIS_EXPORT_BLIS PASTEMAC2(opname,BLIS_TAPI_EX_SUF,_qfp)( num_t dt ); GENPROT( gemv ) GENPROT( ger ) @@ -61,7 +61,7 @@ GENPROT( trsv ) #define GENPROT( opname, varname ) \ \ PASTECH2(opname,_unb,_vft) \ -PASTEMAC(varname,_qfp)( num_t dt ); +BLIS_EXPORT_BLIS PASTEMAC(varname,_qfp)( num_t dt ); GENPROT( gemv, gemv_unb_var1 ) GENPROT( gemv, gemv_unb_var2 ) diff --git a/frame/2/bli_l2_oapi.c b/frame/2/bli_l2_oapi.c index 25acb4207..6d4d14170 100644 --- a/frame/2/bli_l2_oapi.c +++ b/frame/2/bli_l2_oapi.c @@ -43,7 +43,7 @@ #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* a, \ @@ -116,7 +116,7 @@ GENFRONT( gemv ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* x, \ @@ -182,7 +182,7 @@ GENFRONT( ger ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* a, \ @@ -256,7 +256,7 @@ GENFRONT( symv ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* x, \ @@ -317,7 +317,7 @@ GENFRONT( syr ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* x, \ @@ -384,7 +384,7 @@ GENFRONT( syr2 ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* a, \ diff --git a/frame/2/bli_l2_oapi.h b/frame/2/bli_l2_oapi.h index eb0f47249..6b6a1d77e 100644 --- a/frame/2/bli_l2_oapi.h +++ b/frame/2/bli_l2_oapi.h @@ -40,7 +40,7 @@ #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* a, \ @@ -58,7 +58,7 @@ GENPROT( symv ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* x, \ @@ -75,7 +75,7 @@ GENPROT( syr2 ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* x, \ @@ -90,7 +90,7 @@ GENPROT( syr ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* a, \ diff --git a/frame/2/bli_l2_tapi.c b/frame/2/bli_l2_tapi.c index f6eb6c7d9..6b7f5cd12 100644 --- a/frame/2/bli_l2_tapi.c +++ b/frame/2/bli_l2_tapi.c @@ -43,7 +43,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, ftname, rvarname, cvarname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ trans_t transa, \ conj_t conjx, \ @@ -126,7 +126,7 @@ INSERT_GENTFUNC_BASIC3( gemv, gemv, gemv_unf_var1, gemv_unf_var2 ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, ftname, rvarname, cvarname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ conj_t conjx, \ conj_t conjy, \ @@ -178,7 +178,7 @@ INSERT_GENTFUNC_BASIC3( ger, ger, ger_unb_var1, ger_unb_var2 ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, ftname, conjh, rvarname, cvarname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ uplo_t uploa, \ conj_t conja, \ @@ -255,7 +255,7 @@ INSERT_GENTFUNC_BASIC4( symv, hemv, BLIS_NO_CONJUGATE, hemv_unf_var1, hemv_unf_v #undef GENTFUNCR #define GENTFUNCR( ctype, ctype_r, ch, chr, opname, ftname, conjh, rvarname, cvarname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ uplo_t uploa, \ conj_t conjx, \ @@ -319,7 +319,7 @@ INSERT_GENTFUNCR_BASIC4( her, her, BLIS_CONJUGATE, her_unb_var1, her_unb_var2 ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, ftname, conjh, rvarname, cvarname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ uplo_t uploa, \ conj_t conjx, \ @@ -376,7 +376,7 @@ INSERT_GENTFUNC_BASIC4( syr, her, BLIS_NO_CONJUGATE, her_unb_var1, her_unb_var2 #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, ftname, conjh, rvarname, cvarname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ uplo_t uploa, \ conj_t conjx, \ @@ -438,7 +438,7 @@ INSERT_GENTFUNC_BASIC4( syr2, her2, BLIS_NO_CONJUGATE, her2_unf_var1, her2_unf_v #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, ftname, rvarname, cvarname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ uplo_t uploa, \ trans_t transa, \ diff --git a/frame/2/bli_l2_tapi.h b/frame/2/bli_l2_tapi.h index b66ccfb7a..4b45236e2 100644 --- a/frame/2/bli_l2_tapi.h +++ b/frame/2/bli_l2_tapi.h @@ -40,7 +40,7 @@ #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ trans_t transa, \ conj_t conjx, \ @@ -60,7 +60,7 @@ INSERT_GENTPROT_BASIC0( gemv ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ conj_t conjx, \ conj_t conjy, \ @@ -79,7 +79,7 @@ INSERT_GENTPROT_BASIC0( ger ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ uplo_t uploa, \ conj_t conja, \ @@ -100,7 +100,7 @@ INSERT_GENTPROT_BASIC0( symv ) #undef GENTPROTR #define GENTPROTR( ctype, ctype_r, ch, chr, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ uplo_t uploa, \ conj_t conjx, \ @@ -117,7 +117,7 @@ INSERT_GENTPROTR_BASIC0( her ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ uplo_t uploa, \ conj_t conjx, \ @@ -134,7 +134,7 @@ INSERT_GENTPROT_BASIC0( syr ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ uplo_t uploa, \ conj_t conjx, \ @@ -154,7 +154,7 @@ INSERT_GENTPROT_BASIC0( syr2 ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ uplo_t uploa, \ trans_t transa, \ diff --git a/frame/2/gemv/bli_gemv_unb_var1.c b/frame/2/gemv/bli_gemv_unb_var1.c index 3f5681d2b..e3d5de14c 100644 --- a/frame/2/gemv/bli_gemv_unb_var1.c +++ b/frame/2/gemv/bli_gemv_unb_var1.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ trans_t transa, \ conj_t conjx, \ diff --git a/frame/2/gemv/bli_gemv_unb_var2.c b/frame/2/gemv/bli_gemv_unb_var2.c index 8166aa417..4bdad7ab2 100644 --- a/frame/2/gemv/bli_gemv_unb_var2.c +++ b/frame/2/gemv/bli_gemv_unb_var2.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ trans_t transa, \ conj_t conjx, \ diff --git a/frame/2/gemv/bli_gemv_unf_var1.c b/frame/2/gemv/bli_gemv_unf_var1.c index e392e830e..65e00f32f 100644 --- a/frame/2/gemv/bli_gemv_unf_var1.c +++ b/frame/2/gemv/bli_gemv_unf_var1.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ trans_t transa, \ conj_t conjx, \ diff --git a/frame/2/gemv/bli_gemv_unf_var2.c b/frame/2/gemv/bli_gemv_unf_var2.c index fe7702e4c..729826220 100644 --- a/frame/2/gemv/bli_gemv_unf_var2.c +++ b/frame/2/gemv/bli_gemv_unf_var2.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ trans_t transa, \ conj_t conjx, \ diff --git a/frame/2/gemv/bli_gemv_var.h b/frame/2/gemv/bli_gemv_var.h index 2102c1d0b..b19e3ddf2 100644 --- a/frame/2/gemv/bli_gemv_var.h +++ b/frame/2/gemv/bli_gemv_var.h @@ -40,7 +40,7 @@ #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* alpha, \ obj_t* a, \ @@ -68,7 +68,7 @@ GENPROT( gemv_unf_var2 ) #undef GENTPROT #define GENTPROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ trans_t transa, \ conj_t conjx, \ diff --git a/frame/2/gemv/bli_gemv_var_oapi.c b/frame/2/gemv/bli_gemv_var_oapi.c index 2e746b417..d137d21b0 100644 --- a/frame/2/gemv/bli_gemv_var_oapi.c +++ b/frame/2/gemv/bli_gemv_var_oapi.c @@ -37,7 +37,7 @@ #undef GENFRONT #define GENFRONT( opname, varname ) \ \ -void PASTEMAC0(varname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(varname) \ ( \ obj_t* alpha, \ obj_t* a, \ diff --git a/frame/2/gemv/bli_gemv_var_oapi.c.prev b/frame/2/gemv/bli_gemv_var_oapi.c.prev index 595508d0f..c62979732 100644 --- a/frame/2/gemv/bli_gemv_var_oapi.c.prev +++ b/frame/2/gemv/bli_gemv_var_oapi.c.prev @@ -40,7 +40,7 @@ /*static gemv_vft GENARRAY(ftypes,gemv_unb_var1);*/ \ static GENARRAY_VFP(ftname,opname); \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* alpha, \ obj_t* a, \ diff --git a/frame/2/gemv/other/bli_gemv_cntl.h b/frame/2/gemv/other/bli_gemv_cntl.h index f505e8997..848c99442 100644 --- a/frame/2/gemv/other/bli_gemv_cntl.h +++ b/frame/2/gemv/other/bli_gemv_cntl.h @@ -54,9 +54,9 @@ typedef struct gemv_s gemv_t; #define bli_cntl_sub_gemv_t_rp( cntl ) cntl->sub_gemv_t_rp #define bli_cntl_sub_gemv_t_cp( cntl ) cntl->sub_gemv_t_cp -void bli_gemv_cntl_init( void ); -void bli_gemv_cntl_finalize( void ); -gemv_t* bli_gemv_cntl_obj_create( impl_t impl_type, +BLIS_EXPORT_BLIS void bli_gemv_cntl_init( void ); +BLIS_EXPORT_BLIS void bli_gemv_cntl_finalize( void ); +BLIS_EXPORT_BLIS gemv_t* bli_gemv_cntl_obj_create( impl_t impl_type, varnum_t var_num, bszid_t bszid, scalv_t* sub_scalv, @@ -65,7 +65,7 @@ gemv_t* bli_gemv_cntl_obj_create( impl_t impl_type, packv_t* sub_packv_y, gemv_t* sub_gemv, unpackv_t* sub_unpackv_y ); -void bli_gemv_cntl_obj_init( gemv_t* cntl, +BLIS_EXPORT_BLIS void bli_gemv_cntl_obj_init( gemv_t* cntl, impl_t impl_type, varnum_t var_num, bszid_t bszid, diff --git a/frame/2/gemv/other/bli_gemv_front.c b/frame/2/gemv/other/bli_gemv_front.c index 3fd1c8cf7..a7f24610c 100644 --- a/frame/2/gemv/other/bli_gemv_front.c +++ b/frame/2/gemv/other/bli_gemv_front.c @@ -165,7 +165,7 @@ void bli_gemv_front #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ trans_t transa, \ conj_t conjx, \ diff --git a/frame/2/gemv/other/bli_gemv_front.h b/frame/2/gemv/other/bli_gemv_front.h index 5ffb1aedf..4c8677bdc 100644 --- a/frame/2/gemv/other/bli_gemv_front.h +++ b/frame/2/gemv/other/bli_gemv_front.h @@ -32,7 +32,7 @@ */ -void bli_gemv_front +BLIS_EXPORT_BLIS void bli_gemv_front ( obj_t* alpha, obj_t* a, @@ -45,7 +45,7 @@ void bli_gemv_front #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ trans_t transa, \ conj_t conjx, \ diff --git a/frame/2/gemv/other/bli_gemv_int.h b/frame/2/gemv/other/bli_gemv_int.h index 478fe5fb7..33ab520a7 100644 --- a/frame/2/gemv/other/bli_gemv_int.h +++ b/frame/2/gemv/other/bli_gemv_int.h @@ -32,7 +32,7 @@ */ -void bli_gemv_int +BLIS_EXPORT_BLIS void bli_gemv_int ( trans_t transa, conj_t conjx, diff --git a/frame/2/ger/bli_ger_unb_var1.c b/frame/2/ger/bli_ger_unb_var1.c index d6cda277e..d2af2a1b9 100644 --- a/frame/2/ger/bli_ger_unb_var1.c +++ b/frame/2/ger/bli_ger_unb_var1.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ conj_t conjx, \ conj_t conjy, \ diff --git a/frame/2/ger/bli_ger_unb_var2.c b/frame/2/ger/bli_ger_unb_var2.c index 1590bfe5e..ed0ab0305 100644 --- a/frame/2/ger/bli_ger_unb_var2.c +++ b/frame/2/ger/bli_ger_unb_var2.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ conj_t conjx, \ conj_t conjy, \ diff --git a/frame/2/ger/bli_ger_var.h b/frame/2/ger/bli_ger_var.h index a19bac08c..0e0abff94 100644 --- a/frame/2/ger/bli_ger_var.h +++ b/frame/2/ger/bli_ger_var.h @@ -40,7 +40,7 @@ #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* alpha, \ obj_t* x, \ @@ -64,7 +64,7 @@ GENPROT( ger_unb_var2 ) #undef GENTPROT #define GENTPROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ conj_t conjx, \ conj_t conjy, \ diff --git a/frame/2/ger/bli_ger_var_oapi.c b/frame/2/ger/bli_ger_var_oapi.c index 3fd95e89f..41e83fdaf 100644 --- a/frame/2/ger/bli_ger_var_oapi.c +++ b/frame/2/ger/bli_ger_var_oapi.c @@ -37,7 +37,7 @@ #undef GENFRONT #define GENFRONT( opname, varname ) \ \ -void PASTEMAC0(varname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(varname) \ ( \ obj_t* alpha, \ obj_t* x, \ diff --git a/frame/2/ger/other/bli_ger_cntl.h b/frame/2/ger/other/bli_ger_cntl.h index b7b460177..f1425c680 100644 --- a/frame/2/ger/other/bli_ger_cntl.h +++ b/frame/2/ger/other/bli_ger_cntl.h @@ -49,9 +49,9 @@ typedef struct ger_s ger_t; #define bli_cntl_sub_ger_rp( cntl ) cntl->sub_ger_rp #define bli_cntl_sub_ger_cp( cntl ) cntl->sub_ger_cp -void bli_ger_cntl_init( void ); -void bli_ger_cntl_finalize( void ); -ger_t* bli_ger_cntl_obj_create( impl_t impl_type, +BLIS_EXPORT_BLIS void bli_ger_cntl_init( void ); +BLIS_EXPORT_BLIS void bli_ger_cntl_finalize( void ); +BLIS_EXPORT_BLIS ger_t* bli_ger_cntl_obj_create( impl_t impl_type, varnum_t var_num, bszid_t bszid, packv_t* sub_packv_x, @@ -59,7 +59,7 @@ ger_t* bli_ger_cntl_obj_create( impl_t impl_type, packm_t* sub_packm_a, ger_t* sub_ger, unpackm_t* sub_unpackm_a ); -void bli_ger_cntl_obj_init( ger_t* cntl, +BLIS_EXPORT_BLIS void bli_ger_cntl_obj_init( ger_t* cntl, impl_t impl_type, varnum_t var_num, bszid_t bszid, diff --git a/frame/2/ger/other/bli_ger_front.c b/frame/2/ger/other/bli_ger_front.c index 8f641fe2e..8ec5549b8 100644 --- a/frame/2/ger/other/bli_ger_front.c +++ b/frame/2/ger/other/bli_ger_front.c @@ -129,7 +129,7 @@ void bli_ger_front #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ conj_t conjx, \ conj_t conjy, \ diff --git a/frame/2/ger/other/bli_ger_front.h b/frame/2/ger/other/bli_ger_front.h index 5547b13d1..0f45417c2 100644 --- a/frame/2/ger/other/bli_ger_front.h +++ b/frame/2/ger/other/bli_ger_front.h @@ -32,7 +32,7 @@ */ -void bli_ger_front +BLIS_EXPORT_BLIS void bli_ger_front ( obj_t* alpha, obj_t* x, @@ -44,7 +44,7 @@ void bli_ger_front #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ conj_t conjx, \ conj_t conjy, \ diff --git a/frame/2/ger/other/bli_ger_int.h b/frame/2/ger/other/bli_ger_int.h index 7cec64b6d..42cd91f96 100644 --- a/frame/2/ger/other/bli_ger_int.h +++ b/frame/2/ger/other/bli_ger_int.h @@ -32,7 +32,7 @@ */ -void bli_ger_int( conj_t conjx, +BLIS_EXPORT_BLIS void bli_ger_int( conj_t conjx, conj_t conjy, obj_t* alpha, obj_t* x, diff --git a/frame/2/hemv/bli_hemv_unb_var1.c b/frame/2/hemv/bli_hemv_unb_var1.c index ea5d478be..dd6eebb76 100644 --- a/frame/2/hemv/bli_hemv_unb_var1.c +++ b/frame/2/hemv/bli_hemv_unb_var1.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uplo, \ conj_t conja, \ diff --git a/frame/2/hemv/bli_hemv_unb_var2.c b/frame/2/hemv/bli_hemv_unb_var2.c index 1f7346517..d75b05394 100644 --- a/frame/2/hemv/bli_hemv_unb_var2.c +++ b/frame/2/hemv/bli_hemv_unb_var2.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uplo, \ conj_t conja, \ diff --git a/frame/2/hemv/bli_hemv_unb_var3.c b/frame/2/hemv/bli_hemv_unb_var3.c index 6573e59fc..c2797faf4 100644 --- a/frame/2/hemv/bli_hemv_unb_var3.c +++ b/frame/2/hemv/bli_hemv_unb_var3.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uplo, \ conj_t conja, \ diff --git a/frame/2/hemv/bli_hemv_unb_var4.c b/frame/2/hemv/bli_hemv_unb_var4.c index deabc3ab4..2b46b83e0 100644 --- a/frame/2/hemv/bli_hemv_unb_var4.c +++ b/frame/2/hemv/bli_hemv_unb_var4.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uplo, \ conj_t conja, \ diff --git a/frame/2/hemv/bli_hemv_unf_var1.c b/frame/2/hemv/bli_hemv_unf_var1.c index d36dc0098..f95699068 100644 --- a/frame/2/hemv/bli_hemv_unf_var1.c +++ b/frame/2/hemv/bli_hemv_unf_var1.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uplo, \ conj_t conja, \ diff --git a/frame/2/hemv/bli_hemv_unf_var1a.c b/frame/2/hemv/bli_hemv_unf_var1a.c index 31ab1515f..b99f17bd1 100644 --- a/frame/2/hemv/bli_hemv_unf_var1a.c +++ b/frame/2/hemv/bli_hemv_unf_var1a.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uplo, \ conj_t conja, \ diff --git a/frame/2/hemv/bli_hemv_unf_var3.c b/frame/2/hemv/bli_hemv_unf_var3.c index d8db9bc78..a1b2e984b 100644 --- a/frame/2/hemv/bli_hemv_unf_var3.c +++ b/frame/2/hemv/bli_hemv_unf_var3.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uplo, \ conj_t conja, \ diff --git a/frame/2/hemv/bli_hemv_unf_var3a.c b/frame/2/hemv/bli_hemv_unf_var3a.c index 54ab0f6ce..b2bd018d5 100644 --- a/frame/2/hemv/bli_hemv_unf_var3a.c +++ b/frame/2/hemv/bli_hemv_unf_var3a.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uplo, \ conj_t conja, \ diff --git a/frame/2/hemv/bli_hemv_var.h b/frame/2/hemv/bli_hemv_var.h index a591f1afe..629af9620 100644 --- a/frame/2/hemv/bli_hemv_var.h +++ b/frame/2/hemv/bli_hemv_var.h @@ -40,7 +40,7 @@ #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ conj_t conjh, \ obj_t* alpha, \ @@ -75,7 +75,7 @@ GENPROT( hemv_unf_var3a ) #undef GENTPROT #define GENTPROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uplo, \ conj_t conja, \ diff --git a/frame/2/hemv/bli_hemv_var_oapi.c b/frame/2/hemv/bli_hemv_var_oapi.c index 845f288c3..8d70f8ab1 100644 --- a/frame/2/hemv/bli_hemv_var_oapi.c +++ b/frame/2/hemv/bli_hemv_var_oapi.c @@ -37,7 +37,7 @@ #undef GENFRONT #define GENFRONT( opname, varname ) \ \ -void PASTEMAC0(varname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(varname) \ ( \ conj_t conjh, \ obj_t* alpha, \ diff --git a/frame/2/hemv/other/bli_hemv_cntl.h b/frame/2/hemv/other/bli_hemv_cntl.h index fba7b19b4..3a8d17d26 100644 --- a/frame/2/hemv/other/bli_hemv_cntl.h +++ b/frame/2/hemv/other/bli_hemv_cntl.h @@ -52,9 +52,9 @@ typedef struct hemv_s hemv_t; #define bli_cntl_sub_hemv( cntl ) cntl->sub_hemv -void bli_hemv_cntl_init( void ); -void bli_hemv_cntl_finalize( void ); -hemv_t* bli_hemv_cntl_obj_create( impl_t impl_type, +BLIS_EXPORT_BLIS void bli_hemv_cntl_init( void ); +BLIS_EXPORT_BLIS void bli_hemv_cntl_finalize( void ); +BLIS_EXPORT_BLIS hemv_t* bli_hemv_cntl_obj_create( impl_t impl_type, varnum_t var_num, bszid_t bszid, scalv_t* sub_scalv, @@ -67,7 +67,7 @@ hemv_t* bli_hemv_cntl_obj_create( impl_t impl_type, gemv_t* sub_gemv_t_cp, hemv_t* sub_hemv, unpackv_t* sub_unpackv_y1 ); -void bli_hemv_cntl_obj_init( hemv_t* cntl, +BLIS_EXPORT_BLIS void bli_hemv_cntl_obj_init( hemv_t* cntl, impl_t impl_type, varnum_t var_num, bszid_t bszid, diff --git a/frame/2/hemv/other/bli_hemv_front.c b/frame/2/hemv/other/bli_hemv_front.c index 1293f6b8e..149d8d6db 100644 --- a/frame/2/hemv/other/bli_hemv_front.c +++ b/frame/2/hemv/other/bli_hemv_front.c @@ -162,7 +162,7 @@ void bli_hemv_front #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ uplo_t uploa, \ conj_t conja, \ diff --git a/frame/2/hemv/other/bli_hemv_front.h b/frame/2/hemv/other/bli_hemv_front.h index 5e467be2e..1f111e06e 100644 --- a/frame/2/hemv/other/bli_hemv_front.h +++ b/frame/2/hemv/other/bli_hemv_front.h @@ -33,7 +33,7 @@ */ -void bli_hemv_front +BLIS_EXPORT_BLIS void bli_hemv_front ( obj_t* alpha, obj_t* a, @@ -50,7 +50,7 @@ void bli_hemv_front #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ uplo_t uploa, \ conj_t conja, \ diff --git a/frame/2/hemv/other/bli_hemv_int.h b/frame/2/hemv/other/bli_hemv_int.h index 33c1c2a3f..8576fa406 100644 --- a/frame/2/hemv/other/bli_hemv_int.h +++ b/frame/2/hemv/other/bli_hemv_int.h @@ -32,7 +32,7 @@ */ -void bli_hemv_int( conj_t conjh, +BLIS_EXPORT_BLIS void bli_hemv_int( conj_t conjh, obj_t* alpha, obj_t* a, obj_t* x, diff --git a/frame/2/her/bli_her_unb_var1.c b/frame/2/her/bli_her_unb_var1.c index e7f718680..cdfd116ac 100644 --- a/frame/2/her/bli_her_unb_var1.c +++ b/frame/2/her/bli_her_unb_var1.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uplo, \ conj_t conjx, \ diff --git a/frame/2/her/bli_her_unb_var2.c b/frame/2/her/bli_her_unb_var2.c index 4b39e1df0..90d6051dd 100644 --- a/frame/2/her/bli_her_unb_var2.c +++ b/frame/2/her/bli_her_unb_var2.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uplo, \ conj_t conjx, \ diff --git a/frame/2/her/bli_her_var.h b/frame/2/her/bli_her_var.h index f7f02baac..b6634578f 100644 --- a/frame/2/her/bli_her_var.h +++ b/frame/2/her/bli_her_var.h @@ -40,7 +40,7 @@ #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ conj_t conjh, \ obj_t* alpha, \ @@ -64,7 +64,7 @@ GENPROT( her_unb_var2 ) #undef GENTPROTR #define GENTPROTR( ctype, ctype_r, ch, chr, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uplo, \ conj_t conjx, \ diff --git a/frame/2/her/bli_her_var_oapi.c b/frame/2/her/bli_her_var_oapi.c index ffca2e71e..d063f368b 100644 --- a/frame/2/her/bli_her_var_oapi.c +++ b/frame/2/her/bli_her_var_oapi.c @@ -37,7 +37,7 @@ #undef GENFRONT #define GENFRONT( opname, varname ) \ \ -void PASTEMAC0(varname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(varname) \ ( \ conj_t conjh, \ obj_t* alpha, \ diff --git a/frame/2/her/other/bli_her_cntl.h b/frame/2/her/other/bli_her_cntl.h index 280492b29..311f2fa49 100644 --- a/frame/2/her/other/bli_her_cntl.h +++ b/frame/2/her/other/bli_her_cntl.h @@ -47,9 +47,9 @@ typedef struct her_s her_t; #define bli_cntl_sub_her( cntl ) cntl->sub_her -void bli_her_cntl_init( void ); -void bli_her_cntl_finalize( void ); -her_t* bli_her_cntl_obj_create( impl_t impl_type, +BLIS_EXPORT_BLIS void bli_her_cntl_init( void ); +BLIS_EXPORT_BLIS void bli_her_cntl_finalize( void ); +BLIS_EXPORT_BLIS her_t* bli_her_cntl_obj_create( impl_t impl_type, varnum_t var_num, bszid_t bszid, packv_t* sub_packv_x1, @@ -57,7 +57,7 @@ her_t* bli_her_cntl_obj_create( impl_t impl_type, ger_t* sub_ger, her_t* sub_her, unpackm_t* sub_unpackm_c11 ); -void bli_her_cntl_obj_init( her_t* cntl, +BLIS_EXPORT_BLIS void bli_her_cntl_obj_init( her_t* cntl, impl_t impl_type, varnum_t var_num, bszid_t bszid, diff --git a/frame/2/her/other/bli_her_front.c b/frame/2/her/other/bli_her_front.c index 7753b28cf..7f1a5dce6 100644 --- a/frame/2/her/other/bli_her_front.c +++ b/frame/2/her/other/bli_her_front.c @@ -137,7 +137,7 @@ void bli_her_front #undef GENTFUNCR #define GENTFUNCR( ctype, ctype_r, ch, chr, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ uplo_t uploc, \ conj_t conjx, \ diff --git a/frame/2/her/other/bli_her_front.h b/frame/2/her/other/bli_her_front.h index 99a0b43b8..3ae9a9d50 100644 --- a/frame/2/her/other/bli_her_front.h +++ b/frame/2/her/other/bli_her_front.h @@ -32,7 +32,7 @@ */ -void bli_her_front +BLIS_EXPORT_BLIS void bli_her_front ( obj_t* alpha, obj_t* x, @@ -43,7 +43,7 @@ void bli_her_front #undef GENTPROTR #define GENTPROTR( ctype, ctype_r, ch, chr, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ uplo_t uploc, \ conj_t conjx, \ diff --git a/frame/2/her/other/bli_her_int.h b/frame/2/her/other/bli_her_int.h index fc1b2c677..bd2d6bd78 100644 --- a/frame/2/her/other/bli_her_int.h +++ b/frame/2/her/other/bli_her_int.h @@ -32,7 +32,7 @@ */ -void bli_her_int( conj_t conjh, +BLIS_EXPORT_BLIS void bli_her_int( conj_t conjh, obj_t* alpha, obj_t* x, obj_t* c, diff --git a/frame/2/her2/bli_her2_unb_var1.c b/frame/2/her2/bli_her2_unb_var1.c index 37423bfcb..fdd06f26d 100644 --- a/frame/2/her2/bli_her2_unb_var1.c +++ b/frame/2/her2/bli_her2_unb_var1.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uplo, \ conj_t conjx, \ diff --git a/frame/2/her2/bli_her2_unb_var2.c b/frame/2/her2/bli_her2_unb_var2.c index 22d6de07a..fa274f1ca 100644 --- a/frame/2/her2/bli_her2_unb_var2.c +++ b/frame/2/her2/bli_her2_unb_var2.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uplo, \ conj_t conjx, \ diff --git a/frame/2/her2/bli_her2_unb_var3.c b/frame/2/her2/bli_her2_unb_var3.c index 297b9b702..d176fb2af 100644 --- a/frame/2/her2/bli_her2_unb_var3.c +++ b/frame/2/her2/bli_her2_unb_var3.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uplo, \ conj_t conjx, \ diff --git a/frame/2/her2/bli_her2_unb_var4.c b/frame/2/her2/bli_her2_unb_var4.c index 58adb0e70..0ebeef77c 100644 --- a/frame/2/her2/bli_her2_unb_var4.c +++ b/frame/2/her2/bli_her2_unb_var4.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uplo, \ conj_t conjx, \ diff --git a/frame/2/her2/bli_her2_unf_var1.c b/frame/2/her2/bli_her2_unf_var1.c index a0aec48f7..3abc1b316 100644 --- a/frame/2/her2/bli_her2_unf_var1.c +++ b/frame/2/her2/bli_her2_unf_var1.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uplo, \ conj_t conjx, \ diff --git a/frame/2/her2/bli_her2_unf_var4.c b/frame/2/her2/bli_her2_unf_var4.c index 3dea31d53..799f3485f 100644 --- a/frame/2/her2/bli_her2_unf_var4.c +++ b/frame/2/her2/bli_her2_unf_var4.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uplo, \ conj_t conjx, \ diff --git a/frame/2/her2/bli_her2_var.h b/frame/2/her2/bli_her2_var.h index 99672f68c..3055a23c8 100644 --- a/frame/2/her2/bli_her2_var.h +++ b/frame/2/her2/bli_her2_var.h @@ -40,7 +40,7 @@ #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ conj_t conjh, \ obj_t* alpha, \ @@ -73,7 +73,7 @@ GENPROT( her2_unf_var4 ) #undef GENTPROT #define GENTPROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uplo, \ conj_t conjx, \ diff --git a/frame/2/her2/bli_her2_var_oapi.c b/frame/2/her2/bli_her2_var_oapi.c index 2b26e5476..22e05744e 100644 --- a/frame/2/her2/bli_her2_var_oapi.c +++ b/frame/2/her2/bli_her2_var_oapi.c @@ -37,7 +37,7 @@ #undef GENFRONT #define GENFRONT( opname, varname ) \ \ -void PASTEMAC0(varname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(varname) \ ( \ conj_t conjh, \ obj_t* alpha, \ diff --git a/frame/2/her2/other/bli_her2_cntl.h b/frame/2/her2/other/bli_her2_cntl.h index 4eca63af0..ab8cfc8de 100644 --- a/frame/2/her2/other/bli_her2_cntl.h +++ b/frame/2/her2/other/bli_her2_cntl.h @@ -49,8 +49,8 @@ typedef struct her2_s her2_t; #define bli_cntl_sub_her2( cntl ) cntl->sub_her2 -void bli_her2_cntl_init( void ); -void bli_her2_cntl_finalize( void ); +BLIS_EXPORT_BLIS void bli_her2_cntl_init( void ); +BLIS_EXPORT_BLIS void bli_her2_cntl_finalize( void ); her2_t* bli_her2_cntl_obj_create( impl_t impl_type, varnum_t var_num, bszid_t bszid, @@ -61,7 +61,7 @@ her2_t* bli_her2_cntl_obj_create( impl_t impl_type, ger_t* sub_ger_cp, her2_t* sub_her2, unpackm_t* sub_unpackm_c11 ); -void bli_her2_cntl_obj_init( her2_t* cntl, +BLIS_EXPORT_BLIS void bli_her2_cntl_obj_init( her2_t* cntl, impl_t impl_type, varnum_t var_num, bszid_t bszid, diff --git a/frame/2/her2/other/bli_her2_front.c b/frame/2/her2/other/bli_her2_front.c index 21c9027b5..65bb2ab55 100644 --- a/frame/2/her2/other/bli_her2_front.c +++ b/frame/2/her2/other/bli_her2_front.c @@ -154,7 +154,7 @@ void bli_her2_front #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ uplo_t uploc, \ conj_t conjx, \ diff --git a/frame/2/her2/other/bli_her2_front.h b/frame/2/her2/other/bli_her2_front.h index d5a0e3950..15df4151d 100644 --- a/frame/2/her2/other/bli_her2_front.h +++ b/frame/2/her2/other/bli_her2_front.h @@ -32,7 +32,7 @@ */ -void bli_her2_front +BLIS_EXPORT_BLIS void bli_her2_front ( obj_t* alpha, obj_t* x, @@ -44,7 +44,7 @@ void bli_her2_front #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ uplo_t uploc, \ conj_t conjx, \ diff --git a/frame/2/her2/other/bli_her2_int.h b/frame/2/her2/other/bli_her2_int.h index d15c6221c..b3eb1566d 100644 --- a/frame/2/her2/other/bli_her2_int.h +++ b/frame/2/her2/other/bli_her2_int.h @@ -32,7 +32,7 @@ */ -void bli_her2_int( conj_t conjh, +BLIS_EXPORT_BLIS void bli_her2_int( conj_t conjh, obj_t* alpha, obj_t* alpha_conj, obj_t* x, diff --git a/frame/2/symv/other/bli_symv_front.c b/frame/2/symv/other/bli_symv_front.c index bac3f2243..ffce1bac5 100644 --- a/frame/2/symv/other/bli_symv_front.c +++ b/frame/2/symv/other/bli_symv_front.c @@ -163,7 +163,7 @@ void bli_symv_front #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ uplo_t uploa, \ conj_t conja, \ diff --git a/frame/2/symv/other/bli_symv_front.h b/frame/2/symv/other/bli_symv_front.h index 40b5c0b2a..d8c5ff4be 100644 --- a/frame/2/symv/other/bli_symv_front.h +++ b/frame/2/symv/other/bli_symv_front.h @@ -33,7 +33,7 @@ */ -void bli_symv_front +BLIS_EXPORT_BLIS void bli_symv_front ( obj_t* alpha, obj_t* a, @@ -46,7 +46,7 @@ void bli_symv_front #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ uplo_t uploa, \ conj_t conja, \ diff --git a/frame/2/syr/other/bli_syr_front.c b/frame/2/syr/other/bli_syr_front.c index efbd24cf8..93ac6e6e9 100644 --- a/frame/2/syr/other/bli_syr_front.c +++ b/frame/2/syr/other/bli_syr_front.c @@ -139,7 +139,7 @@ void bli_syr_front #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ uplo_t uploc, \ conj_t conjx, \ diff --git a/frame/2/syr/other/bli_syr_front.h b/frame/2/syr/other/bli_syr_front.h index a0ac22415..344e39181 100644 --- a/frame/2/syr/other/bli_syr_front.h +++ b/frame/2/syr/other/bli_syr_front.h @@ -32,7 +32,7 @@ */ -void bli_syr_front +BLIS_EXPORT_BLIS void bli_syr_front ( obj_t* alpha, obj_t* x, @@ -43,7 +43,7 @@ void bli_syr_front #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ uplo_t uploc, \ conj_t conjx, \ diff --git a/frame/2/syr2/other/bli_syr2_front.c b/frame/2/syr2/other/bli_syr2_front.c index 59a36f478..547ff3f06 100644 --- a/frame/2/syr2/other/bli_syr2_front.c +++ b/frame/2/syr2/other/bli_syr2_front.c @@ -147,7 +147,7 @@ void bli_syr2_front #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ uplo_t uploc, \ conj_t conjx, \ diff --git a/frame/2/syr2/other/bli_syr2_front.h b/frame/2/syr2/other/bli_syr2_front.h index bb164731e..44846643f 100644 --- a/frame/2/syr2/other/bli_syr2_front.h +++ b/frame/2/syr2/other/bli_syr2_front.h @@ -32,7 +32,7 @@ */ -void bli_syr2_front +BLIS_EXPORT_BLIS void bli_syr2_front ( obj_t* alpha, obj_t* x, @@ -44,7 +44,7 @@ void bli_syr2_front #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ uplo_t uploc, \ conj_t conjx, \ diff --git a/frame/2/trmv/bli_trmv_unb_var1.c b/frame/2/trmv/bli_trmv_unb_var1.c index 31bfa6a83..e1b8711b5 100644 --- a/frame/2/trmv/bli_trmv_unb_var1.c +++ b/frame/2/trmv/bli_trmv_unb_var1.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uploa, \ trans_t transa, \ diff --git a/frame/2/trmv/bli_trmv_unb_var2.c b/frame/2/trmv/bli_trmv_unb_var2.c index 00d4d95f3..f6ab264a0 100644 --- a/frame/2/trmv/bli_trmv_unb_var2.c +++ b/frame/2/trmv/bli_trmv_unb_var2.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uploa, \ trans_t transa, \ diff --git a/frame/2/trmv/bli_trmv_unf_var1.c b/frame/2/trmv/bli_trmv_unf_var1.c index 6dc3cea36..032856dfe 100644 --- a/frame/2/trmv/bli_trmv_unf_var1.c +++ b/frame/2/trmv/bli_trmv_unf_var1.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uploa, \ trans_t transa, \ diff --git a/frame/2/trmv/bli_trmv_unf_var2.c b/frame/2/trmv/bli_trmv_unf_var2.c index 8bbd51820..81ad30769 100644 --- a/frame/2/trmv/bli_trmv_unf_var2.c +++ b/frame/2/trmv/bli_trmv_unf_var2.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uploa, \ trans_t transa, \ diff --git a/frame/2/trmv/bli_trmv_var.h b/frame/2/trmv/bli_trmv_var.h index 5a36a656d..fbe51af0b 100644 --- a/frame/2/trmv/bli_trmv_var.h +++ b/frame/2/trmv/bli_trmv_var.h @@ -40,7 +40,7 @@ #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* alpha, \ obj_t* a, \ @@ -68,7 +68,7 @@ GENPROT( trmv_unf_var2 ) #undef GENTPROT #define GENTPROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uploa, \ trans_t transa, \ diff --git a/frame/2/trmv/bli_trmv_var_oapi.c b/frame/2/trmv/bli_trmv_var_oapi.c index 931eb2abb..38c5becb1 100644 --- a/frame/2/trmv/bli_trmv_var_oapi.c +++ b/frame/2/trmv/bli_trmv_var_oapi.c @@ -37,7 +37,7 @@ #undef GENFRONT #define GENFRONT( opname, varname ) \ \ -void PASTEMAC0(varname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(varname) \ ( \ obj_t* alpha, \ obj_t* a, \ diff --git a/frame/2/trmv/other/bli_trmv_cntl.h b/frame/2/trmv/other/bli_trmv_cntl.h index 2474f5f6d..e268523b7 100644 --- a/frame/2/trmv/other/bli_trmv_cntl.h +++ b/frame/2/trmv/other/bli_trmv_cntl.h @@ -48,9 +48,9 @@ typedef struct trmv_s trmv_t; #define bli_cntl_sub_trmv( cntl ) cntl->sub_trmv -void bli_trmv_cntl_init( void ); -void bli_trmv_cntl_finalize( void ); -trmv_t* bli_trmv_cntl_obj_create( impl_t impl_type, +BLIS_EXPORT_BLIS void bli_trmv_cntl_init( void ); +BLIS_EXPORT_BLIS void bli_trmv_cntl_finalize( void ); +BLIS_EXPORT_BLIS trmv_t* bli_trmv_cntl_obj_create( impl_t impl_type, varnum_t var_num, bszid_t bszid, packm_t* sub_packm_a11, @@ -59,7 +59,7 @@ trmv_t* bli_trmv_cntl_obj_create( impl_t impl_type, gemv_t* sub_gemv_cp, trmv_t* sub_trmv, unpackv_t* sub_unpackv_x1 ); -void bli_trmv_cntl_obj_init( trmv_t* cntl, +BLIS_EXPORT_BLIS void bli_trmv_cntl_obj_init( trmv_t* cntl, impl_t impl_type, varnum_t var_num, bszid_t bszid, diff --git a/frame/2/trmv/other/bli_trmv_front.c b/frame/2/trmv/other/bli_trmv_front.c index 698f48710..0b361b8a2 100644 --- a/frame/2/trmv/other/bli_trmv_front.c +++ b/frame/2/trmv/other/bli_trmv_front.c @@ -137,7 +137,7 @@ void bli_trmv_front #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ uplo_t uploa, \ trans_t transa, \ diff --git a/frame/2/trmv/other/bli_trmv_front.h b/frame/2/trmv/other/bli_trmv_front.h index daf54ca9b..170c6a2d9 100644 --- a/frame/2/trmv/other/bli_trmv_front.h +++ b/frame/2/trmv/other/bli_trmv_front.h @@ -32,7 +32,7 @@ */ -void bli_trmv_front +BLIS_EXPORT_BLIS void bli_trmv_front ( obj_t* alpha, obj_t* a, @@ -43,7 +43,7 @@ void bli_trmv_front #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ uplo_t uploa, \ trans_t transa, \ diff --git a/frame/2/trmv/other/bli_trmv_int.h b/frame/2/trmv/other/bli_trmv_int.h index c956c72d1..a04310ed1 100644 --- a/frame/2/trmv/other/bli_trmv_int.h +++ b/frame/2/trmv/other/bli_trmv_int.h @@ -32,7 +32,7 @@ */ -void bli_trmv_int( obj_t* alpha, +BLIS_EXPORT_BLIS void bli_trmv_int( obj_t* alpha, obj_t* a, obj_t* x, cntx_t* cntx, diff --git a/frame/2/trsv/bli_trsv_unb_var1.c b/frame/2/trsv/bli_trsv_unb_var1.c index c7493e33d..9b24333d3 100644 --- a/frame/2/trsv/bli_trsv_unb_var1.c +++ b/frame/2/trsv/bli_trsv_unb_var1.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uploa, \ trans_t transa, \ diff --git a/frame/2/trsv/bli_trsv_unb_var2.c b/frame/2/trsv/bli_trsv_unb_var2.c index a78e7eef0..def6d92e0 100644 --- a/frame/2/trsv/bli_trsv_unb_var2.c +++ b/frame/2/trsv/bli_trsv_unb_var2.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uploa, \ trans_t transa, \ diff --git a/frame/2/trsv/bli_trsv_unf_var1.c b/frame/2/trsv/bli_trsv_unf_var1.c index 3b03b43e5..df6913bbc 100644 --- a/frame/2/trsv/bli_trsv_unf_var1.c +++ b/frame/2/trsv/bli_trsv_unf_var1.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uploa, \ trans_t transa, \ diff --git a/frame/2/trsv/bli_trsv_unf_var2.c b/frame/2/trsv/bli_trsv_unf_var2.c index 10741d291..2e9deea47 100644 --- a/frame/2/trsv/bli_trsv_unf_var2.c +++ b/frame/2/trsv/bli_trsv_unf_var2.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uploa, \ trans_t transa, \ diff --git a/frame/2/trsv/bli_trsv_var.h b/frame/2/trsv/bli_trsv_var.h index 064394355..cc292b724 100644 --- a/frame/2/trsv/bli_trsv_var.h +++ b/frame/2/trsv/bli_trsv_var.h @@ -40,7 +40,7 @@ #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* alpha, \ obj_t* a, \ @@ -68,7 +68,7 @@ GENPROT( trsv_unf_var2 ) #undef GENTPROT #define GENTPROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uploa, \ trans_t transa, \ diff --git a/frame/2/trsv/bli_trsv_var_oapi.c b/frame/2/trsv/bli_trsv_var_oapi.c index 4cf346acf..3d1670335 100644 --- a/frame/2/trsv/bli_trsv_var_oapi.c +++ b/frame/2/trsv/bli_trsv_var_oapi.c @@ -37,7 +37,7 @@ #undef GENFRONT #define GENFRONT( opname, varname ) \ \ -void PASTEMAC0(varname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(varname) \ ( \ obj_t* alpha, \ obj_t* a, \ diff --git a/frame/2/trsv/other/bli_trsv_cntl.h b/frame/2/trsv/other/bli_trsv_cntl.h index cb53c0fe9..8224cabcd 100644 --- a/frame/2/trsv/other/bli_trsv_cntl.h +++ b/frame/2/trsv/other/bli_trsv_cntl.h @@ -49,9 +49,9 @@ typedef struct trsv_s trsv_t; #define bli_cntl_sub_trsv( cntl ) cntl->sub_trsv -void bli_trsv_cntl_init( void ); -void bli_trsv_cntl_finalize( void ); -trsv_t* bli_trsv_cntl_obj_create( impl_t impl_type, +BLIS_EXPORT_BLIS void bli_trsv_cntl_init( void ); +BLIS_EXPORT_BLIS void bli_trsv_cntl_finalize( void ); +BLIS_EXPORT_BLIS trsv_t* bli_trsv_cntl_obj_create( impl_t impl_type, varnum_t var_num, bszid_t bszid, scalv_t* sub_scalv, @@ -61,7 +61,7 @@ trsv_t* bli_trsv_cntl_obj_create( impl_t impl_type, gemv_t* sub_gemv_cp, trsv_t* sub_trsv, unpackv_t* sub_unpackv_x1 ); -void bli_trsv_cntl_obj_init( trsv_t* cntl, +BLIS_EXPORT_BLIS void bli_trsv_cntl_obj_init( trsv_t* cntl, impl_t impl_type, varnum_t var_num, bszid_t bszid, diff --git a/frame/2/trsv/other/bli_trsv_front.c b/frame/2/trsv/other/bli_trsv_front.c index 90a152e89..478dc94db 100644 --- a/frame/2/trsv/other/bli_trsv_front.c +++ b/frame/2/trsv/other/bli_trsv_front.c @@ -133,7 +133,7 @@ void bli_trsv_front #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ uplo_t uploa, \ trans_t transa, \ diff --git a/frame/2/trsv/other/bli_trsv_front.h b/frame/2/trsv/other/bli_trsv_front.h index 21d2f6e3c..0506a60f7 100644 --- a/frame/2/trsv/other/bli_trsv_front.h +++ b/frame/2/trsv/other/bli_trsv_front.h @@ -32,7 +32,7 @@ */ -void bli_trsv_front +BLIS_EXPORT_BLIS void bli_trsv_front ( obj_t* alpha, obj_t* a, @@ -43,7 +43,7 @@ void bli_trsv_front #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ uplo_t uploa, \ trans_t transa, \ diff --git a/frame/2/trsv/other/bli_trsv_int.h b/frame/2/trsv/other/bli_trsv_int.h index a7e6003e3..b4fc83583 100644 --- a/frame/2/trsv/other/bli_trsv_int.h +++ b/frame/2/trsv/other/bli_trsv_int.h @@ -32,7 +32,7 @@ */ -void bli_trsv_int( obj_t* alpha, +BLIS_EXPORT_BLIS void bli_trsv_int( obj_t* alpha, obj_t* a, obj_t* x, cntx_t* cntx, diff --git a/frame/3/bli_l3_blocksize.h b/frame/3/bli_l3_blocksize.h index c3301ee13..47a0e5891 100644 --- a/frame/3/bli_l3_blocksize.h +++ b/frame/3/bli_l3_blocksize.h @@ -32,7 +32,7 @@ */ -dim_t bli_l3_determine_kc +BLIS_EXPORT_BLIS dim_t bli_l3_determine_kc ( dir_t direct, dim_t i, @@ -48,7 +48,7 @@ dim_t bli_l3_determine_kc #undef GENPROT #define GENPROT( opname ) \ \ -dim_t PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS dim_t PASTEMAC0(opname) \ ( \ dir_t direct, \ dim_t i, \ @@ -68,7 +68,7 @@ GENPROT( trsm_determine_kc ) #undef GENPROT #define GENPROT( opname ) \ \ -dim_t PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS dim_t PASTEMAC0(opname) \ ( \ dim_t i, \ dim_t dim, \ diff --git a/frame/3/bli_l3_check.h b/frame/3/bli_l3_check.h index 7d30bb184..c572d14a3 100644 --- a/frame/3/bli_l3_check.h +++ b/frame/3/bli_l3_check.h @@ -40,7 +40,7 @@ #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* alpha, \ obj_t* a, \ @@ -58,7 +58,7 @@ GENPROT( syr2k ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ side_t side, \ obj_t* alpha, \ @@ -78,7 +78,7 @@ GENPROT( trsm ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* alpha, \ obj_t* a, \ @@ -93,7 +93,7 @@ GENPROT( syrk ) // ----------------------------------------------------------------------------- -void bli_gemm_basic_check +BLIS_EXPORT_BLIS void bli_gemm_basic_check ( obj_t* alpha, obj_t* a, @@ -103,7 +103,7 @@ void bli_gemm_basic_check cntx_t* cntx ); -void bli_hemm_basic_check +BLIS_EXPORT_BLIS void bli_hemm_basic_check ( side_t side, obj_t* alpha, @@ -114,7 +114,7 @@ void bli_hemm_basic_check cntx_t* cntx ); -void bli_herk_basic_check +BLIS_EXPORT_BLIS void bli_herk_basic_check ( obj_t* alpha, obj_t* a, @@ -124,7 +124,7 @@ void bli_herk_basic_check cntx_t* cntx ); -void bli_her2k_basic_check +BLIS_EXPORT_BLIS void bli_her2k_basic_check ( obj_t* alpha, obj_t* a, @@ -136,7 +136,7 @@ void bli_her2k_basic_check cntx_t* cntx ); -void bli_l3_basic_check +BLIS_EXPORT_BLIS void bli_l3_basic_check ( obj_t* alpha, obj_t* a, diff --git a/frame/3/bli_l3_cntl.h b/frame/3/bli_l3_cntl.h index 0c04f348c..3984763be 100644 --- a/frame/3/bli_l3_cntl.h +++ b/frame/3/bli_l3_cntl.h @@ -38,7 +38,7 @@ // Prototype conditional control tree creation functions. // -void bli_l3_cntl_create_if +BLIS_EXPORT_BLIS void bli_l3_cntl_create_if ( opid_t family, pack_t schema_a, @@ -51,7 +51,7 @@ void bli_l3_cntl_create_if cntl_t** cntl_use ); -void bli_l3_cntl_free +BLIS_EXPORT_BLIS void bli_l3_cntl_free ( rntm_t* rntm, cntl_t* cntl_use, diff --git a/frame/3/bli_l3_direct.h b/frame/3/bli_l3_direct.h index 7383c4a9f..5da1fe1b5 100644 --- a/frame/3/bli_l3_direct.h +++ b/frame/3/bli_l3_direct.h @@ -32,7 +32,7 @@ */ -dir_t bli_l3_direct +BLIS_EXPORT_BLIS dir_t bli_l3_direct ( obj_t* a, obj_t* b, @@ -45,7 +45,7 @@ dir_t bli_l3_direct #undef GENPROT #define GENPROT( opname ) \ \ -dir_t PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS dir_t PASTEMAC0(opname) \ ( \ obj_t* a, \ obj_t* b, \ diff --git a/frame/3/bli_l3_oapi.c b/frame/3/bli_l3_oapi.c index d9ba27369..5792638ef 100644 --- a/frame/3/bli_l3_oapi.c +++ b/frame/3/bli_l3_oapi.c @@ -43,7 +43,7 @@ #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* a, \ @@ -88,7 +88,7 @@ GENFRONT( syr2k ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ side_t side, \ obj_t* alpha, \ @@ -132,7 +132,7 @@ GENFRONT( trmm3 ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* a, \ @@ -172,7 +172,7 @@ GENFRONT( syrk ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ side_t side, \ obj_t* alpha, \ diff --git a/frame/3/bli_l3_oapi.h b/frame/3/bli_l3_oapi.h index 2f0af81b2..4f9f20608 100644 --- a/frame/3/bli_l3_oapi.h +++ b/frame/3/bli_l3_oapi.h @@ -40,7 +40,7 @@ #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* a, \ @@ -58,7 +58,7 @@ GENPROT( syr2k ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ side_t side, \ obj_t* alpha, \ @@ -77,7 +77,7 @@ GENPROT( trmm3 ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* alpha, \ obj_t* a, \ @@ -93,7 +93,7 @@ GENPROT( syrk ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ side_t side, \ obj_t* alpha, \ diff --git a/frame/3/bli_l3_packm.h b/frame/3/bli_l3_packm.h index 37b1db105..ab8a9b341 100644 --- a/frame/3/bli_l3_packm.h +++ b/frame/3/bli_l3_packm.h @@ -33,7 +33,7 @@ */ -void bli_l3_packm +BLIS_EXPORT_BLIS void bli_l3_packm ( obj_t* x, obj_t* x_pack, diff --git a/frame/3/bli_l3_prune.c b/frame/3/bli_l3_prune.c index fa008fd15..02f6d4f55 100644 --- a/frame/3/bli_l3_prune.c +++ b/frame/3/bli_l3_prune.c @@ -56,7 +56,7 @@ void bli_l3_prune_unref_mparts_m #undef GENFRONT #define GENFRONT( dim ) \ \ -void PASTEMAC(l3_prune_unref_mparts_,dim) \ +BLIS_EXPORT_BLIS void PASTEMAC(l3_prune_unref_mparts_,dim) \ ( \ obj_t* a, \ obj_t* b, \ @@ -82,7 +82,7 @@ GENFRONT( k ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,_prune_unref_mparts_m) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_prune_unref_mparts_m) \ ( \ obj_t* a, \ obj_t* b, \ @@ -91,7 +91,7 @@ void PASTEMAC(opname,_prune_unref_mparts_m) \ { \ /* No pruning is necessary for gemm. */ \ } \ -void PASTEMAC(opname,_prune_unref_mparts_n) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_prune_unref_mparts_n) \ ( \ obj_t* a, \ obj_t* b, \ @@ -100,7 +100,7 @@ void PASTEMAC(opname,_prune_unref_mparts_n) \ { \ /* No pruning is necessary for gemm. */ \ } \ -void PASTEMAC(opname,_prune_unref_mparts_k) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_prune_unref_mparts_k) \ ( \ obj_t* a, \ obj_t* b, \ @@ -117,7 +117,7 @@ GENFRONT( gemm ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,_prune_unref_mparts_m) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_prune_unref_mparts_m) \ ( \ obj_t* a, \ obj_t* ah, \ @@ -129,7 +129,7 @@ void PASTEMAC(opname,_prune_unref_mparts_m) \ subpartition of A accordingly. */ \ bli_prune_unref_mparts( c, BLIS_M, a, BLIS_M ); \ } \ -void PASTEMAC(opname,_prune_unref_mparts_n) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_prune_unref_mparts_n) \ ( \ obj_t* a, \ obj_t* ah, \ @@ -141,7 +141,7 @@ void PASTEMAC(opname,_prune_unref_mparts_n) \ subpartition of Ah accordingly. */ \ bli_prune_unref_mparts( c, BLIS_N, ah, BLIS_N ); \ } \ -void PASTEMAC(opname,_prune_unref_mparts_k) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_prune_unref_mparts_k) \ ( \ obj_t* a, \ obj_t* ah, \ @@ -159,7 +159,7 @@ GENFRONT( herk ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,_prune_unref_mparts_m) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_prune_unref_mparts_m) \ ( \ obj_t* a, \ obj_t* b, \ @@ -171,7 +171,7 @@ void PASTEMAC(opname,_prune_unref_mparts_m) \ subpartition of C accordingly. */ \ bli_prune_unref_mparts( a, BLIS_M, c, BLIS_M ); \ } \ -void PASTEMAC(opname,_prune_unref_mparts_n) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_prune_unref_mparts_n) \ ( \ obj_t* a, \ obj_t* b, \ @@ -183,7 +183,7 @@ void PASTEMAC(opname,_prune_unref_mparts_n) \ subpartition of C accordingly. */ \ bli_prune_unref_mparts( b, BLIS_N, c, BLIS_N ); \ } \ -void PASTEMAC(opname,_prune_unref_mparts_k) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_prune_unref_mparts_k) \ ( \ obj_t* a, \ obj_t* b, \ diff --git a/frame/3/bli_l3_prune.h b/frame/3/bli_l3_prune.h index 340ecd4db..dbdc6ee72 100644 --- a/frame/3/bli_l3_prune.h +++ b/frame/3/bli_l3_prune.h @@ -36,7 +36,7 @@ #undef GENPROT #define GENPROT( dim ) \ \ -void PASTEMAC(l3_prune_unref_mparts_,dim) \ +BLIS_EXPORT_BLIS void PASTEMAC(l3_prune_unref_mparts_,dim) \ ( \ obj_t* a, \ obj_t* b, \ @@ -53,7 +53,7 @@ GENPROT( k ) #undef GENPROT #define GENPROT( opname, dim ) \ \ -void PASTEMAC2(opname,_prune_unref_mparts_,dim) \ +BLIS_EXPORT_BLIS void PASTEMAC2(opname,_prune_unref_mparts_,dim) \ ( \ obj_t* a, \ obj_t* b, \ diff --git a/frame/3/bli_l3_tapi.c b/frame/3/bli_l3_tapi.c index 4eeba1971..e977a9d06 100644 --- a/frame/3/bli_l3_tapi.c +++ b/frame/3/bli_l3_tapi.c @@ -43,7 +43,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ trans_t transa, \ trans_t transb, \ @@ -100,7 +100,7 @@ INSERT_GENTFUNC_BASIC0( gemm ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, struca ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ side_t side, \ uplo_t uploa, \ @@ -163,7 +163,7 @@ INSERT_GENTFUNC_BASIC( symm, BLIS_SYMMETRIC ) #undef GENTFUNCR #define GENTFUNCR( ctype, ctype_r, ch, chr, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ uplo_t uploc, \ trans_t transa, \ @@ -217,7 +217,7 @@ INSERT_GENTFUNCR_BASIC0( herk ) #undef GENTFUNCR #define GENTFUNCR( ctype, ctype_r, ch, chr, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ uplo_t uploc, \ trans_t transa, \ @@ -278,7 +278,7 @@ INSERT_GENTFUNCR_BASIC0( her2k ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ uplo_t uploc, \ trans_t transa, \ @@ -331,7 +331,7 @@ INSERT_GENTFUNC_BASIC0( syrk ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ uplo_t uploc, \ trans_t transa, \ @@ -391,7 +391,7 @@ INSERT_GENTFUNC_BASIC0( syr2k ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ side_t side, \ uplo_t uploa, \ @@ -455,7 +455,7 @@ INSERT_GENTFUNC_BASIC0( trmm3 ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ side_t side, \ uplo_t uploa, \ diff --git a/frame/3/bli_l3_tapi.h b/frame/3/bli_l3_tapi.h index 4ae9d6921..a809c2a68 100644 --- a/frame/3/bli_l3_tapi.h +++ b/frame/3/bli_l3_tapi.h @@ -40,7 +40,7 @@ #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ trans_t transa, \ trans_t transb, \ @@ -61,7 +61,7 @@ INSERT_GENTPROT_BASIC0( gemm ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ side_t side, \ uplo_t uploa, \ @@ -84,7 +84,7 @@ INSERT_GENTPROT_BASIC0( symm ) #undef GENTPROTR #define GENTPROTR( ctype, ctype_r, ch, chr, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ uplo_t uploc, \ trans_t transa, \ @@ -103,7 +103,7 @@ INSERT_GENTPROTR_BASIC0( herk ) #undef GENTPROTR #define GENTPROTR( ctype, ctype_r, ch, chr, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ uplo_t uploc, \ trans_t transa, \ @@ -124,7 +124,7 @@ INSERT_GENTPROTR_BASIC0( her2k ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ uplo_t uploc, \ trans_t transa, \ @@ -143,7 +143,7 @@ INSERT_GENTPROT_BASIC0( syrk ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ uplo_t uploc, \ trans_t transa, \ @@ -164,7 +164,7 @@ INSERT_GENTPROT_BASIC0( syr2k ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ side_t side, \ uplo_t uploa, \ @@ -187,7 +187,7 @@ INSERT_GENTPROT_BASIC0( trmm3 ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ side_t side, \ uplo_t uploa, \ diff --git a/frame/3/bli_l3_thrinfo.h b/frame/3/bli_l3_thrinfo.h index 72a4f77e2..80110bfb3 100644 --- a/frame/3/bli_l3_thrinfo.h +++ b/frame/3/bli_l3_thrinfo.h @@ -72,7 +72,7 @@ // thrinfo_t APIs specific to level-3 operations. // -void bli_l3_thrinfo_init +BLIS_EXPORT_BLIS void bli_l3_thrinfo_init ( thrinfo_t* thread, thrcomm_t* ocomm, @@ -82,12 +82,12 @@ void bli_l3_thrinfo_init thrinfo_t* sub_node ); -void bli_l3_thrinfo_init_single +BLIS_EXPORT_BLIS void bli_l3_thrinfo_init_single ( thrinfo_t* thread ); -void bli_l3_thrinfo_free +BLIS_EXPORT_BLIS void bli_l3_thrinfo_free ( rntm_t* rntm, thrinfo_t* thread @@ -95,7 +95,7 @@ void bli_l3_thrinfo_free // ----------------------------------------------------------------------------- -void bli_l3_thrinfo_create_root +BLIS_EXPORT_BLIS void bli_l3_thrinfo_create_root ( dim_t id, thrcomm_t* gl_comm, @@ -104,14 +104,14 @@ void bli_l3_thrinfo_create_root thrinfo_t** thread ); -void bli_l3_thrinfo_print_paths +BLIS_EXPORT_BLIS void bli_l3_thrinfo_print_paths ( thrinfo_t** threads ); // ----------------------------------------------------------------------------- -void bli_l3_thrinfo_free_paths +BLIS_EXPORT_BLIS void bli_l3_thrinfo_free_paths ( rntm_t* rntm, thrinfo_t** threads diff --git a/frame/3/bli_l3_ukr_fpa.h b/frame/3/bli_l3_ukr_fpa.h index 65bdc6964..24947c6ff 100644 --- a/frame/3/bli_l3_ukr_fpa.h +++ b/frame/3/bli_l3_ukr_fpa.h @@ -40,7 +40,7 @@ #define GENPROT( tname, opname ) \ \ PASTECH2(tname,_ukr,_vft) \ -PASTEMAC(opname,_qfp)( num_t dt ); +BLIS_EXPORT_BLIS PASTEMAC(opname,_qfp)( num_t dt ); GENPROT( gemm, gemm_ukernel ) GENPROT( gemmtrsm, gemmtrsm_l_ukernel ) diff --git a/frame/3/bli_l3_ukr_oapi.c b/frame/3/bli_l3_ukr_oapi.c index a8191b1aa..5b10cf6ab 100644 --- a/frame/3/bli_l3_ukr_oapi.c +++ b/frame/3/bli_l3_ukr_oapi.c @@ -37,7 +37,7 @@ #undef GENFRONT #define GENFRONT( tname, opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* alpha, \ obj_t* a, \ @@ -92,7 +92,7 @@ GENFRONT( gemm, gemm_ukernel ) #undef GENFRONT #define GENFRONT( tname, opname, opnamel, opnameu ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* alpha, \ obj_t* a1x, \ @@ -175,7 +175,7 @@ GENFRONT( gemmtrsm, gemmtrsm_ukernel, gemmtrsm_l_ukernel, gemmtrsm_u_ukernel ) #undef GENFRONT #define GENFRONT( tname, opname, opnamel, opnameu ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* a, \ obj_t* b, \ diff --git a/frame/3/bli_l3_ukr_oapi.h b/frame/3/bli_l3_ukr_oapi.h index 512df492b..5fed11ede 100644 --- a/frame/3/bli_l3_ukr_oapi.h +++ b/frame/3/bli_l3_ukr_oapi.h @@ -40,7 +40,7 @@ #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* alpha, \ obj_t* a, \ @@ -56,7 +56,7 @@ GENPROT( gemm_ukernel ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* alpha, \ obj_t* a1x, \ @@ -73,7 +73,7 @@ GENPROT( gemmtrsm_ukernel ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* a, \ obj_t* b, \ diff --git a/frame/3/bli_l3_ukr_prot.h b/frame/3/bli_l3_ukr_prot.h index 80733897b..bc9aa3e40 100644 --- a/frame/3/bli_l3_ukr_prot.h +++ b/frame/3/bli_l3_ukr_prot.h @@ -38,7 +38,7 @@ #define GEMM_UKR_PROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ dim_t k, \ ctype* restrict alpha, \ @@ -53,7 +53,7 @@ void PASTEMAC(ch,opname) \ #define GEMMTRSM_UKR_PROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ dim_t k, \ ctype* restrict alpha, \ @@ -69,7 +69,7 @@ void PASTEMAC(ch,opname) \ #define TRSM_UKR_PROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ ctype* restrict a, \ ctype* restrict b, \ diff --git a/frame/3/bli_l3_ukr_tapi.c b/frame/3/bli_l3_ukr_tapi.c index 67e33175b..3f17ff6a7 100644 --- a/frame/3/bli_l3_ukr_tapi.c +++ b/frame/3/bli_l3_ukr_tapi.c @@ -37,7 +37,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, tname, kerid ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ dim_t k, \ ctype* restrict alpha, \ @@ -76,7 +76,7 @@ INSERT_GENTFUNC_BASIC2( gemm_ukernel, gemm, BLIS_GEMM_UKR ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, tname, kerid ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ dim_t k, \ ctype* restrict alpha, \ @@ -118,7 +118,7 @@ INSERT_GENTFUNC_BASIC2( gemmtrsm_u_ukernel, gemmtrsm, BLIS_GEMMTRSM_U_UKR ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, tname, kerid ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ ctype* restrict a, \ ctype* restrict b, \ diff --git a/frame/3/gemm/bli_gemm_cntl.c b/frame/3/gemm/bli_gemm_cntl.c index 67c71e798..8e327f002 100644 --- a/frame/3/gemm/bli_gemm_cntl.c +++ b/frame/3/gemm/bli_gemm_cntl.c @@ -253,7 +253,7 @@ cntl_t* bli_gemmpb_cntl_create // ----------------------------------------------------------------------------- -void bli_gemm_cntl_free +BLIS_EXPORT_BLIS void bli_gemm_cntl_free ( rntm_t* rntm, cntl_t* cntl, diff --git a/frame/3/gemm/bli_gemm_cntl.h b/frame/3/gemm/bli_gemm_cntl.h index e19384a51..adb759667 100644 --- a/frame/3/gemm/bli_gemm_cntl.h +++ b/frame/3/gemm/bli_gemm_cntl.h @@ -33,7 +33,7 @@ */ -cntl_t* bli_gemm_cntl_create +BLIS_EXPORT_BLIS cntl_t* bli_gemm_cntl_create ( rntm_t* rntm, opid_t family, @@ -43,7 +43,7 @@ cntl_t* bli_gemm_cntl_create // ----------------------------------------------------------------------------- -cntl_t* bli_gemmbp_cntl_create +BLIS_EXPORT_BLIS cntl_t* bli_gemmbp_cntl_create ( rntm_t* rntm, opid_t family, @@ -52,7 +52,7 @@ cntl_t* bli_gemmbp_cntl_create ); #if 0 -cntl_t* bli_gemmpb_cntl_create +BLIS_EXPORT_BLIS cntl_t* bli_gemmpb_cntl_create ( opid_t family, ); @@ -60,7 +60,7 @@ cntl_t* bli_gemmpb_cntl_create // ----------------------------------------------------------------------------- -void bli_gemm_cntl_free +BLIS_EXPORT_BLIS void bli_gemm_cntl_free ( rntm_t* rntm, cntl_t* cntl, @@ -69,7 +69,7 @@ void bli_gemm_cntl_free // ----------------------------------------------------------------------------- -cntl_t* bli_gemm_cntl_create_node +BLIS_EXPORT_BLIS cntl_t* bli_gemm_cntl_create_node ( rntm_t* rntm, opid_t family, diff --git a/frame/3/gemm/bli_gemm_front.c b/frame/3/gemm/bli_gemm_front.c index 97bc5c5d0..491cfba8a 100644 --- a/frame/3/gemm/bli_gemm_front.c +++ b/frame/3/gemm/bli_gemm_front.c @@ -35,7 +35,7 @@ #include "blis.h" -void bli_gemm_front +BLIS_EXPORT_BLIS void bli_gemm_front ( obj_t* alpha, obj_t* a, diff --git a/frame/3/gemm/bli_gemm_front.h b/frame/3/gemm/bli_gemm_front.h index ba65bab8d..0da4e0b9e 100644 --- a/frame/3/gemm/bli_gemm_front.h +++ b/frame/3/gemm/bli_gemm_front.h @@ -32,7 +32,7 @@ */ -void bli_gemm_front +BLIS_EXPORT_BLIS void bli_gemm_front ( obj_t* alpha, obj_t* a, @@ -44,7 +44,7 @@ void bli_gemm_front cntl_t* cntl ); -err_t bli_gemm_small +BLIS_EXPORT_BLIS err_t bli_gemm_small ( obj_t* alpha, obj_t* a, diff --git a/frame/3/gemm/bli_gemm_int.c b/frame/3/gemm/bli_gemm_int.c index 25a6215df..4f35de640 100644 --- a/frame/3/gemm/bli_gemm_int.c +++ b/frame/3/gemm/bli_gemm_int.c @@ -35,7 +35,7 @@ #include "blis.h" -void bli_gemm_int +BLIS_EXPORT_BLIS void bli_gemm_int ( obj_t* alpha, obj_t* a, diff --git a/frame/3/gemm/bli_gemm_int.h b/frame/3/gemm/bli_gemm_int.h index 2bbe5480a..725cc64ba 100644 --- a/frame/3/gemm/bli_gemm_int.h +++ b/frame/3/gemm/bli_gemm_int.h @@ -32,7 +32,7 @@ */ -void bli_gemm_int +BLIS_EXPORT_BLIS void bli_gemm_int ( obj_t* alpha, obj_t* a, diff --git a/frame/3/gemm/bli_gemm_ker_var2.c b/frame/3/gemm/bli_gemm_ker_var2.c index 41bb3f455..5b1dd30b6 100644 --- a/frame/3/gemm/bli_gemm_ker_var2.c +++ b/frame/3/gemm/bli_gemm_ker_var2.c @@ -191,7 +191,7 @@ void bli_gemm_ker_var2 #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ pack_t schema_a, \ pack_t schema_b, \ diff --git a/frame/3/gemm/bli_gemm_ker_var2_md.c b/frame/3/gemm/bli_gemm_ker_var2_md.c index 3428be9b4..6badf4a08 100644 --- a/frame/3/gemm/bli_gemm_ker_var2_md.c +++ b/frame/3/gemm/bli_gemm_ker_var2_md.c @@ -192,7 +192,7 @@ void bli_gemm_ker_var2_md #undef GENTFUNC2 #define GENTFUNC2( ctype_c, ctype_e, chc, che, varname ) \ \ -void PASTEMAC2(chc,che,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC2(chc,che,varname) \ ( \ pack_t schema_a, \ pack_t schema_b, \ diff --git a/frame/3/gemm/bli_gemm_md.h b/frame/3/gemm/bli_gemm_md.h index 057eb0a1d..4d8825f58 100644 --- a/frame/3/gemm/bli_gemm_md.h +++ b/frame/3/gemm/bli_gemm_md.h @@ -41,7 +41,7 @@ typedef struct mddm_s dom_t exec; } mddm_t; -void bli_gemm_md +BLIS_EXPORT_BLIS void bli_gemm_md ( obj_t* a, obj_t* b, @@ -50,18 +50,18 @@ void bli_gemm_md cntx_t* cntx_local, cntx_t** cntx ); -mddm_t bli_gemm_md_ccc( obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx_l, cntx_t** cntx ); -mddm_t bli_gemm_md_ccr( obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx_l, cntx_t** cntx ); -mddm_t bli_gemm_md_crc( obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx_l, cntx_t** cntx ); -mddm_t bli_gemm_md_rcc( obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx_l, cntx_t** cntx ); -mddm_t bli_gemm_md_rrc( obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx_l, cntx_t** cntx ); -mddm_t bli_gemm_md_rcr( obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx_l, cntx_t** cntx ); -mddm_t bli_gemm_md_crr( obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx_l, cntx_t** cntx ); -mddm_t bli_gemm_md_rrr( obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx_l, cntx_t** cntx ); +BLIS_EXPORT_BLIS mddm_t bli_gemm_md_ccc( obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx_l, cntx_t** cntx ); +BLIS_EXPORT_BLIS mddm_t bli_gemm_md_ccr( obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx_l, cntx_t** cntx ); +BLIS_EXPORT_BLIS mddm_t bli_gemm_md_crc( obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx_l, cntx_t** cntx ); +BLIS_EXPORT_BLIS mddm_t bli_gemm_md_rcc( obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx_l, cntx_t** cntx ); +BLIS_EXPORT_BLIS mddm_t bli_gemm_md_rrc( obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx_l, cntx_t** cntx ); +BLIS_EXPORT_BLIS mddm_t bli_gemm_md_rcr( obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx_l, cntx_t** cntx ); +BLIS_EXPORT_BLIS mddm_t bli_gemm_md_crr( obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx_l, cntx_t** cntx ); +BLIS_EXPORT_BLIS mddm_t bli_gemm_md_rrr( obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx_l, cntx_t** cntx ); // ----------------------------------------------------------------------------- -void bli_gemm_md_front +BLIS_EXPORT_BLIS void bli_gemm_md_front ( obj_t* alpha, obj_t* a, @@ -73,7 +73,7 @@ void bli_gemm_md_front cntl_t* cntl ); -void bli_gemm_md_zgemm +BLIS_EXPORT_BLIS void bli_gemm_md_zgemm ( obj_t* alpha, obj_t* a, @@ -283,7 +283,7 @@ static void bli_gemm_md_ker_var2_recast #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* a, \ obj_t* b, \ @@ -303,7 +303,7 @@ GENPROT( gemm_ker_var2_md ) #undef GENTPROT2 #define GENTPROT2( ctype_c, ctype_e, chc, che, varname ) \ \ -void PASTEMAC2(chc,che,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC2(chc,che,varname) \ ( \ pack_t schema_a, \ pack_t schema_b, \ diff --git a/frame/3/gemm/bli_gemm_md_c2r_ref.c b/frame/3/gemm/bli_gemm_md_c2r_ref.c index 6198d85b2..ff4d0dee7 100644 --- a/frame/3/gemm/bli_gemm_md_c2r_ref.c +++ b/frame/3/gemm/bli_gemm_md_c2r_ref.c @@ -39,7 +39,7 @@ #undef GENTFUNCCO #define GENTFUNCCO( ctype, ctype_r, ch, chr, opname, suf ) \ \ -void PASTEMAC2(ch,opname,suf) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,suf) \ ( \ dim_t k, \ ctype* restrict alpha, \ diff --git a/frame/3/gemm/bli_gemm_var.h b/frame/3/gemm/bli_gemm_var.h index 34cf95ae6..09b648c2e 100644 --- a/frame/3/gemm/bli_gemm_var.h +++ b/frame/3/gemm/bli_gemm_var.h @@ -41,7 +41,7 @@ #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* a, \ obj_t* b, \ @@ -73,7 +73,7 @@ GENPROT( gemm4mb_ker_var2 ) // 4m1b #undef GENTPROT #define GENTPROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ pack_t schema_a, \ pack_t schema_b, \ diff --git a/frame/3/gemm/ind/bli_gemm4mb_ker_var2.c b/frame/3/gemm/ind/bli_gemm4mb_ker_var2.c index e4b377b37..619457752 100644 --- a/frame/3/gemm/ind/bli_gemm4mb_ker_var2.c +++ b/frame/3/gemm/ind/bli_gemm4mb_ker_var2.c @@ -138,7 +138,7 @@ void bli_gemm4mb_ker_var2 #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ pack_t schema_a, \ pack_t schema_b, \ diff --git a/frame/3/gemm/ind/old/bli_gemm3m2_ker_var2.c b/frame/3/gemm/ind/old/bli_gemm3m2_ker_var2.c index 09830753e..34bf0c656 100644 --- a/frame/3/gemm/ind/old/bli_gemm3m2_ker_var2.c +++ b/frame/3/gemm/ind/old/bli_gemm3m2_ker_var2.c @@ -134,7 +134,7 @@ void bli_gemm3m2_ker_var2 #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ pack_t schema_a, \ pack_t schema_b, \ diff --git a/frame/3/gemm/other/bli_gemm_ker_var2.c b/frame/3/gemm/other/bli_gemm_ker_var2.c index 6ae8df0c1..9de95a83b 100644 --- a/frame/3/gemm/other/bli_gemm_ker_var2.c +++ b/frame/3/gemm/other/bli_gemm_ker_var2.c @@ -159,7 +159,7 @@ void bli_gemm_ker_var2 #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ pack_t schema_a, \ pack_t schema_b, \ diff --git a/frame/3/gemm/other/bli_gemm_ker_var2rr.c b/frame/3/gemm/other/bli_gemm_ker_var2rr.c index a213e50fc..111b3a9c1 100644 --- a/frame/3/gemm/other/bli_gemm_ker_var2rr.c +++ b/frame/3/gemm/other/bli_gemm_ker_var2rr.c @@ -160,7 +160,7 @@ void bli_gemm_ker_var2rr #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ pack_t schema_a, \ pack_t schema_b, \ diff --git a/frame/3/gemm/other/bli_gemm_ker_var2sl.c b/frame/3/gemm/other/bli_gemm_ker_var2sl.c index 0d710bd73..68c53b22c 100644 --- a/frame/3/gemm/other/bli_gemm_ker_var2sl.c +++ b/frame/3/gemm/other/bli_gemm_ker_var2sl.c @@ -160,7 +160,7 @@ void bli_gemm_ker_var2sl #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ pack_t schema_a, \ pack_t schema_b, \ diff --git a/frame/3/gemm/other/bli_gemm_ker_var5.c b/frame/3/gemm/other/bli_gemm_ker_var5.c index 0d0c914d8..2298e631c 100644 --- a/frame/3/gemm/other/bli_gemm_ker_var5.c +++ b/frame/3/gemm/other/bli_gemm_ker_var5.c @@ -126,7 +126,7 @@ void bli_gemm_ker_var5( obj_t* a, #undef GENTFUNC #define GENTFUNC( ctype, ch, varname, ukrtype ) \ \ -void PASTEMAC(ch,varname)( \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname)( \ dim_t m, \ dim_t n, \ dim_t k, \ diff --git a/frame/3/gemm/other/bli_gemm_ker_var5.h b/frame/3/gemm/other/bli_gemm_ker_var5.h index 7e24bb5f9..ab39b6109 100644 --- a/frame/3/gemm/other/bli_gemm_ker_var5.h +++ b/frame/3/gemm/other/bli_gemm_ker_var5.h @@ -36,7 +36,7 @@ // // Prototype object-based interface. // -void bli_gemm_ker_var5( obj_t* a, +BLIS_EXPORT_BLIS void bli_gemm_ker_var5( obj_t* a, obj_t* b, obj_t* c, cntx_t* cntx, @@ -50,7 +50,7 @@ void bli_gemm_ker_var5( obj_t* a, #undef GENTPROT #define GENTPROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname)( \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname)( \ dim_t m, \ dim_t n, \ dim_t k, \ diff --git a/frame/3/hemm/bli_hemm_front.c b/frame/3/hemm/bli_hemm_front.c index 5949a2e6c..8202d5cf0 100644 --- a/frame/3/hemm/bli_hemm_front.c +++ b/frame/3/hemm/bli_hemm_front.c @@ -34,7 +34,7 @@ #include "blis.h" -void bli_hemm_front +BLIS_EXPORT_BLIS void bli_hemm_front ( side_t side, obj_t* alpha, diff --git a/frame/3/hemm/bli_hemm_front.h b/frame/3/hemm/bli_hemm_front.h index 308b6378b..01affcaa9 100644 --- a/frame/3/hemm/bli_hemm_front.h +++ b/frame/3/hemm/bli_hemm_front.h @@ -32,7 +32,7 @@ */ -void bli_hemm_front +BLIS_EXPORT_BLIS void bli_hemm_front ( side_t side, obj_t* alpha, diff --git a/frame/3/her2k/bli_her2k_front.c b/frame/3/her2k/bli_her2k_front.c index a99aa05c8..234b04e16 100644 --- a/frame/3/her2k/bli_her2k_front.c +++ b/frame/3/her2k/bli_her2k_front.c @@ -34,7 +34,7 @@ #include "blis.h" -void bli_her2k_front +BLIS_EXPORT_BLIS void bli_her2k_front ( obj_t* alpha, obj_t* a, diff --git a/frame/3/her2k/bli_her2k_front.h b/frame/3/her2k/bli_her2k_front.h index 0efdb86c2..736d6beff 100644 --- a/frame/3/her2k/bli_her2k_front.h +++ b/frame/3/her2k/bli_her2k_front.h @@ -32,7 +32,7 @@ */ -void bli_her2k_front +BLIS_EXPORT_BLIS void bli_her2k_front ( obj_t* alpha, obj_t* a, diff --git a/frame/3/herk/bli_herk_front.c b/frame/3/herk/bli_herk_front.c index be0118f18..40020afb9 100644 --- a/frame/3/herk/bli_herk_front.c +++ b/frame/3/herk/bli_herk_front.c @@ -34,7 +34,7 @@ #include "blis.h" -void bli_herk_front +BLIS_EXPORT_BLIS void bli_herk_front ( obj_t* alpha, obj_t* a, diff --git a/frame/3/herk/bli_herk_front.h b/frame/3/herk/bli_herk_front.h index 44778a450..ec05a2249 100644 --- a/frame/3/herk/bli_herk_front.h +++ b/frame/3/herk/bli_herk_front.h @@ -32,7 +32,7 @@ */ -void bli_herk_front +BLIS_EXPORT_BLIS void bli_herk_front ( obj_t* alpha, obj_t* a, diff --git a/frame/3/herk/bli_herk_l_ker_var2.c b/frame/3/herk/bli_herk_l_ker_var2.c index d077b8f89..480595931 100644 --- a/frame/3/herk/bli_herk_l_ker_var2.c +++ b/frame/3/herk/bli_herk_l_ker_var2.c @@ -143,7 +143,7 @@ void bli_herk_l_ker_var2 #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffc, \ pack_t schema_a, \ diff --git a/frame/3/herk/bli_herk_u_ker_var2.c b/frame/3/herk/bli_herk_u_ker_var2.c index b20a96df7..4cdca5cc0 100644 --- a/frame/3/herk/bli_herk_u_ker_var2.c +++ b/frame/3/herk/bli_herk_u_ker_var2.c @@ -143,7 +143,7 @@ void bli_herk_u_ker_var2 #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffc, \ pack_t schema_a, \ diff --git a/frame/3/herk/bli_herk_var.h b/frame/3/herk/bli_herk_var.h index 3c565e1b0..f4f1c8421 100644 --- a/frame/3/herk/bli_herk_var.h +++ b/frame/3/herk/bli_herk_var.h @@ -41,7 +41,7 @@ #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* a, \ obj_t* ah, \ @@ -71,7 +71,7 @@ GENPROT( herk_u_ker_var2 ) #undef GENTPROT #define GENTPROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffc, \ pack_t schema_a, \ diff --git a/frame/3/herk/other/bli_herk_l_ker_var2.1looprr.c b/frame/3/herk/other/bli_herk_l_ker_var2.1looprr.c index 38675b11b..e6a59e248 100644 --- a/frame/3/herk/other/bli_herk_l_ker_var2.1looprr.c +++ b/frame/3/herk/other/bli_herk_l_ker_var2.1looprr.c @@ -143,7 +143,7 @@ void bli_herk_l_ker_var2 #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffc, \ pack_t schema_a, \ diff --git a/frame/3/herk/other/bli_herk_l_ker_var2.c b/frame/3/herk/other/bli_herk_l_ker_var2.c index 904da9f5e..86df7455b 100644 --- a/frame/3/herk/other/bli_herk_l_ker_var2.c +++ b/frame/3/herk/other/bli_herk_l_ker_var2.c @@ -143,7 +143,7 @@ void bli_herk_l_ker_var2 #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffc, \ pack_t schema_a, \ diff --git a/frame/3/herk/other/bli_herk_l_ker_var2rr.c b/frame/3/herk/other/bli_herk_l_ker_var2rr.c index a313f04b2..43772a3a5 100644 --- a/frame/3/herk/other/bli_herk_l_ker_var2rr.c +++ b/frame/3/herk/other/bli_herk_l_ker_var2rr.c @@ -146,7 +146,7 @@ void bli_herk_l_ker_var2rr #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffc, \ pack_t schema_a, \ diff --git a/frame/3/herk/other/bli_herk_l_ker_var2sl.c b/frame/3/herk/other/bli_herk_l_ker_var2sl.c index f913cced2..c0dd268d8 100644 --- a/frame/3/herk/other/bli_herk_l_ker_var2sl.c +++ b/frame/3/herk/other/bli_herk_l_ker_var2sl.c @@ -146,7 +146,7 @@ void bli_herk_l_ker_var2sl #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffc, \ pack_t schema_a, \ diff --git a/frame/3/herk/other/bli_herk_u_ker_var2.1looprr.c b/frame/3/herk/other/bli_herk_u_ker_var2.1looprr.c index cd4a4e7ad..15be08932 100644 --- a/frame/3/herk/other/bli_herk_u_ker_var2.1looprr.c +++ b/frame/3/herk/other/bli_herk_u_ker_var2.1looprr.c @@ -143,7 +143,7 @@ void bli_herk_u_ker_var2 #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffc, \ pack_t schema_a, \ diff --git a/frame/3/herk/other/bli_herk_u_ker_var2.c b/frame/3/herk/other/bli_herk_u_ker_var2.c index 0bdc0b0a4..13fb5eb6e 100644 --- a/frame/3/herk/other/bli_herk_u_ker_var2.c +++ b/frame/3/herk/other/bli_herk_u_ker_var2.c @@ -143,7 +143,7 @@ void bli_herk_u_ker_var2 #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffc, \ pack_t schema_a, \ diff --git a/frame/3/herk/other/bli_herk_u_ker_var2rr.c b/frame/3/herk/other/bli_herk_u_ker_var2rr.c index 4ffa8085c..1ac932763 100644 --- a/frame/3/herk/other/bli_herk_u_ker_var2rr.c +++ b/frame/3/herk/other/bli_herk_u_ker_var2rr.c @@ -146,7 +146,7 @@ void bli_herk_u_ker_var2rr #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffc, \ pack_t schema_a, \ diff --git a/frame/3/herk/other/bli_herk_u_ker_var2sl.c b/frame/3/herk/other/bli_herk_u_ker_var2sl.c index 7af7ee56d..9ad7b8621 100644 --- a/frame/3/herk/other/bli_herk_u_ker_var2sl.c +++ b/frame/3/herk/other/bli_herk_u_ker_var2sl.c @@ -146,7 +146,7 @@ void bli_herk_u_ker_var2sl #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffc, \ pack_t schema_a, \ diff --git a/frame/3/symm/bli_symm_front.c b/frame/3/symm/bli_symm_front.c index 820c26fd1..cb59e1657 100644 --- a/frame/3/symm/bli_symm_front.c +++ b/frame/3/symm/bli_symm_front.c @@ -34,7 +34,7 @@ #include "blis.h" -void bli_symm_front +BLIS_EXPORT_BLIS void bli_symm_front ( side_t side, obj_t* alpha, diff --git a/frame/3/symm/bli_symm_front.h b/frame/3/symm/bli_symm_front.h index 909997f6c..be1e1b060 100644 --- a/frame/3/symm/bli_symm_front.h +++ b/frame/3/symm/bli_symm_front.h @@ -32,7 +32,7 @@ */ -void bli_symm_front +BLIS_EXPORT_BLIS void bli_symm_front ( side_t side, obj_t* alpha, diff --git a/frame/3/syr2k/bli_syr2k_front.c b/frame/3/syr2k/bli_syr2k_front.c index 3ccd28c5c..77300ba3d 100644 --- a/frame/3/syr2k/bli_syr2k_front.c +++ b/frame/3/syr2k/bli_syr2k_front.c @@ -34,7 +34,7 @@ #include "blis.h" -void bli_syr2k_front +BLIS_EXPORT_BLIS void bli_syr2k_front ( obj_t* alpha, obj_t* a, diff --git a/frame/3/syr2k/bli_syr2k_front.h b/frame/3/syr2k/bli_syr2k_front.h index 767bb6ee1..5251fee38 100644 --- a/frame/3/syr2k/bli_syr2k_front.h +++ b/frame/3/syr2k/bli_syr2k_front.h @@ -32,7 +32,7 @@ */ -void bli_syr2k_front +BLIS_EXPORT_BLIS void bli_syr2k_front ( obj_t* alpha, obj_t* a, diff --git a/frame/3/syrk/bli_syrk_front.c b/frame/3/syrk/bli_syrk_front.c index 534848e33..f6388e523 100644 --- a/frame/3/syrk/bli_syrk_front.c +++ b/frame/3/syrk/bli_syrk_front.c @@ -34,7 +34,7 @@ #include "blis.h" -void bli_syrk_front +BLIS_EXPORT_BLIS void bli_syrk_front ( obj_t* alpha, obj_t* a, diff --git a/frame/3/syrk/bli_syrk_front.h b/frame/3/syrk/bli_syrk_front.h index 28d1e13f6..8eb204eda 100644 --- a/frame/3/syrk/bli_syrk_front.h +++ b/frame/3/syrk/bli_syrk_front.h @@ -32,7 +32,7 @@ */ -void bli_syrk_front +BLIS_EXPORT_BLIS void bli_syrk_front ( obj_t* alpha, obj_t* a, diff --git a/frame/3/trmm/bli_trmm_front.c b/frame/3/trmm/bli_trmm_front.c index aee9d1d6f..773f9639d 100644 --- a/frame/3/trmm/bli_trmm_front.c +++ b/frame/3/trmm/bli_trmm_front.c @@ -35,7 +35,7 @@ #include "blis.h" -void bli_trmm_front +BLIS_EXPORT_BLIS void bli_trmm_front ( side_t side, obj_t* alpha, diff --git a/frame/3/trmm/bli_trmm_front.h b/frame/3/trmm/bli_trmm_front.h index 3e136f9dc..f53dd8133 100644 --- a/frame/3/trmm/bli_trmm_front.h +++ b/frame/3/trmm/bli_trmm_front.h @@ -32,7 +32,7 @@ */ -void bli_trmm_front +BLIS_EXPORT_BLIS void bli_trmm_front ( side_t side, obj_t* alpha, diff --git a/frame/3/trmm/bli_trmm_ll_ker_var2.c b/frame/3/trmm/bli_trmm_ll_ker_var2.c index 98e62926c..c9162c349 100644 --- a/frame/3/trmm/bli_trmm_ll_ker_var2.c +++ b/frame/3/trmm/bli_trmm_ll_ker_var2.c @@ -137,7 +137,7 @@ void bli_trmm_ll_ker_var2 #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffa, \ pack_t schema_a, \ diff --git a/frame/3/trmm/bli_trmm_lu_ker_var2.c b/frame/3/trmm/bli_trmm_lu_ker_var2.c index 624604141..ca9c02e72 100644 --- a/frame/3/trmm/bli_trmm_lu_ker_var2.c +++ b/frame/3/trmm/bli_trmm_lu_ker_var2.c @@ -137,7 +137,7 @@ void bli_trmm_lu_ker_var2 #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffa, \ pack_t schema_a, \ diff --git a/frame/3/trmm/bli_trmm_rl_ker_var2.c b/frame/3/trmm/bli_trmm_rl_ker_var2.c index 117cf63c5..c8985c135 100644 --- a/frame/3/trmm/bli_trmm_rl_ker_var2.c +++ b/frame/3/trmm/bli_trmm_rl_ker_var2.c @@ -137,7 +137,7 @@ void bli_trmm_rl_ker_var2 #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffb, \ pack_t schema_a, \ diff --git a/frame/3/trmm/bli_trmm_ru_ker_var2.c b/frame/3/trmm/bli_trmm_ru_ker_var2.c index ea59959c7..a252fda5d 100644 --- a/frame/3/trmm/bli_trmm_ru_ker_var2.c +++ b/frame/3/trmm/bli_trmm_ru_ker_var2.c @@ -137,7 +137,7 @@ void bli_trmm_ru_ker_var2 #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffb, \ pack_t schema_a, \ diff --git a/frame/3/trmm/bli_trmm_var.h b/frame/3/trmm/bli_trmm_var.h index 09694ca5c..07ab53514 100644 --- a/frame/3/trmm/bli_trmm_var.h +++ b/frame/3/trmm/bli_trmm_var.h @@ -41,7 +41,7 @@ #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* a, \ obj_t* b, \ @@ -71,7 +71,7 @@ GENPROT( trmm_ru_ker_var2 ) #undef GENTPROT #define GENTPROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoff, \ pack_t schema_a, \ diff --git a/frame/3/trmm/other/bli_trmm_ll_ker_var2.c b/frame/3/trmm/other/bli_trmm_ll_ker_var2.c index 3747a0dcf..74492ae00 100644 --- a/frame/3/trmm/other/bli_trmm_ll_ker_var2.c +++ b/frame/3/trmm/other/bli_trmm_ll_ker_var2.c @@ -137,7 +137,7 @@ void bli_trmm_ll_ker_var2 #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffa, \ pack_t schema_a, \ diff --git a/frame/3/trmm/other/bli_trmm_ll_ker_var2rr.c b/frame/3/trmm/other/bli_trmm_ll_ker_var2rr.c index ea979d7c3..58a53e93a 100644 --- a/frame/3/trmm/other/bli_trmm_ll_ker_var2rr.c +++ b/frame/3/trmm/other/bli_trmm_ll_ker_var2rr.c @@ -140,7 +140,7 @@ void bli_trmm_ll_ker_var2rr #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffa, \ pack_t schema_a, \ diff --git a/frame/3/trmm/other/bli_trmm_ll_ker_var2sl.c b/frame/3/trmm/other/bli_trmm_ll_ker_var2sl.c index e612b340c..209d231b2 100644 --- a/frame/3/trmm/other/bli_trmm_ll_ker_var2sl.c +++ b/frame/3/trmm/other/bli_trmm_ll_ker_var2sl.c @@ -140,7 +140,7 @@ void bli_trmm_ll_ker_var2sl #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffa, \ pack_t schema_a, \ diff --git a/frame/3/trmm/other/bli_trmm_lu_ker_var2.c b/frame/3/trmm/other/bli_trmm_lu_ker_var2.c index 9a4e36b65..496d7c3db 100644 --- a/frame/3/trmm/other/bli_trmm_lu_ker_var2.c +++ b/frame/3/trmm/other/bli_trmm_lu_ker_var2.c @@ -137,7 +137,7 @@ void bli_trmm_lu_ker_var2 #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffa, \ pack_t schema_a, \ diff --git a/frame/3/trmm/other/bli_trmm_lu_ker_var2rr.c b/frame/3/trmm/other/bli_trmm_lu_ker_var2rr.c index 551bc097d..c4e019c8f 100644 --- a/frame/3/trmm/other/bli_trmm_lu_ker_var2rr.c +++ b/frame/3/trmm/other/bli_trmm_lu_ker_var2rr.c @@ -140,7 +140,7 @@ void bli_trmm_lu_ker_var2rr #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffa, \ pack_t schema_a, \ diff --git a/frame/3/trmm/other/bli_trmm_lu_ker_var2sl.c b/frame/3/trmm/other/bli_trmm_lu_ker_var2sl.c index 132c732d6..4bc995fcf 100644 --- a/frame/3/trmm/other/bli_trmm_lu_ker_var2sl.c +++ b/frame/3/trmm/other/bli_trmm_lu_ker_var2sl.c @@ -140,7 +140,7 @@ void bli_trmm_lu_ker_var2sl #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffa, \ pack_t schema_a, \ diff --git a/frame/3/trmm/other/bli_trmm_rl_ker_var2.c b/frame/3/trmm/other/bli_trmm_rl_ker_var2.c index b29df0850..6482bcbab 100644 --- a/frame/3/trmm/other/bli_trmm_rl_ker_var2.c +++ b/frame/3/trmm/other/bli_trmm_rl_ker_var2.c @@ -137,7 +137,7 @@ void bli_trmm_rl_ker_var2 #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffb, \ pack_t schema_a, \ diff --git a/frame/3/trmm/other/bli_trmm_rl_ker_var2rr.c b/frame/3/trmm/other/bli_trmm_rl_ker_var2rr.c index 14b235918..23162fa6c 100644 --- a/frame/3/trmm/other/bli_trmm_rl_ker_var2rr.c +++ b/frame/3/trmm/other/bli_trmm_rl_ker_var2rr.c @@ -140,7 +140,7 @@ void bli_trmm_rl_ker_var2rr #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffb, \ pack_t schema_a, \ diff --git a/frame/3/trmm/other/bli_trmm_rl_ker_var2sl.c b/frame/3/trmm/other/bli_trmm_rl_ker_var2sl.c index cf4a6e086..7952cb8c4 100644 --- a/frame/3/trmm/other/bli_trmm_rl_ker_var2sl.c +++ b/frame/3/trmm/other/bli_trmm_rl_ker_var2sl.c @@ -140,7 +140,7 @@ void bli_trmm_rl_ker_var2sl #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffb, \ pack_t schema_a, \ diff --git a/frame/3/trmm/other/bli_trmm_ru_ker_var2.c b/frame/3/trmm/other/bli_trmm_ru_ker_var2.c index 602f4cc3b..9a39776d4 100644 --- a/frame/3/trmm/other/bli_trmm_ru_ker_var2.c +++ b/frame/3/trmm/other/bli_trmm_ru_ker_var2.c @@ -137,7 +137,7 @@ void bli_trmm_ru_ker_var2 #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffb, \ pack_t schema_a, \ diff --git a/frame/3/trmm/other/bli_trmm_ru_ker_var2rr.c b/frame/3/trmm/other/bli_trmm_ru_ker_var2rr.c index 03eaa6ea6..3723dde6d 100644 --- a/frame/3/trmm/other/bli_trmm_ru_ker_var2rr.c +++ b/frame/3/trmm/other/bli_trmm_ru_ker_var2rr.c @@ -140,7 +140,7 @@ void bli_trmm_ru_ker_var2rr #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffb, \ pack_t schema_a, \ diff --git a/frame/3/trmm/other/bli_trmm_ru_ker_var2sl.c b/frame/3/trmm/other/bli_trmm_ru_ker_var2sl.c index 2411a24a4..50b9050cd 100644 --- a/frame/3/trmm/other/bli_trmm_ru_ker_var2sl.c +++ b/frame/3/trmm/other/bli_trmm_ru_ker_var2sl.c @@ -140,7 +140,7 @@ void bli_trmm_ru_ker_var2sl #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffb, \ pack_t schema_a, \ diff --git a/frame/3/trmm3/bli_trmm3_front.c b/frame/3/trmm3/bli_trmm3_front.c index 39067ac0b..ff508d0b5 100644 --- a/frame/3/trmm3/bli_trmm3_front.c +++ b/frame/3/trmm3/bli_trmm3_front.c @@ -34,7 +34,7 @@ #include "blis.h" -void bli_trmm3_front +BLIS_EXPORT_BLIS void bli_trmm3_front ( side_t side, obj_t* alpha, diff --git a/frame/3/trmm3/bli_trmm3_front.h b/frame/3/trmm3/bli_trmm3_front.h index 296b9354b..22c0ff509 100644 --- a/frame/3/trmm3/bli_trmm3_front.h +++ b/frame/3/trmm3/bli_trmm3_front.h @@ -32,7 +32,7 @@ */ -void bli_trmm3_front +BLIS_EXPORT_BLIS void bli_trmm3_front ( side_t side, obj_t* alpha, diff --git a/frame/3/trsm/bli_trsm_cntl.c b/frame/3/trsm/bli_trsm_cntl.c index 8ae6f6da2..bde2942c8 100644 --- a/frame/3/trsm/bli_trsm_cntl.c +++ b/frame/3/trsm/bli_trsm_cntl.c @@ -252,7 +252,7 @@ cntl_t* bli_trsm_r_cntl_create return trsm_cntl_vl_mm; } -void bli_trsm_cntl_free +BLIS_EXPORT_BLIS void bli_trsm_cntl_free ( rntm_t* rntm, cntl_t* cntl, diff --git a/frame/3/trsm/bli_trsm_cntl.h b/frame/3/trsm/bli_trsm_cntl.h index 17b8d3c18..65bd2884f 100644 --- a/frame/3/trsm/bli_trsm_cntl.h +++ b/frame/3/trsm/bli_trsm_cntl.h @@ -33,7 +33,7 @@ */ -cntl_t* bli_trsm_cntl_create +BLIS_EXPORT_BLIS cntl_t* bli_trsm_cntl_create ( rntm_t* rntm, side_t side, @@ -41,21 +41,21 @@ cntl_t* bli_trsm_cntl_create pack_t schema_b ); -cntl_t* bli_trsm_l_cntl_create +BLIS_EXPORT_BLIS cntl_t* bli_trsm_l_cntl_create ( rntm_t* rntm, pack_t schema_a, pack_t schema_b ); -cntl_t* bli_trsm_r_cntl_create +BLIS_EXPORT_BLIS cntl_t* bli_trsm_r_cntl_create ( rntm_t* rntm, pack_t schema_a, pack_t schema_b ); -void bli_trsm_cntl_free +BLIS_EXPORT_BLIS void bli_trsm_cntl_free ( rntm_t* rntm, cntl_t* cntl, @@ -64,7 +64,7 @@ void bli_trsm_cntl_free // ----------------------------------------------------------------------------- -cntl_t* bli_trsm_cntl_create_node +BLIS_EXPORT_BLIS cntl_t* bli_trsm_cntl_create_node ( rntm_t* rntm, opid_t family, diff --git a/frame/3/trsm/bli_trsm_front.c b/frame/3/trsm/bli_trsm_front.c index 5093d1a4a..932a44d24 100644 --- a/frame/3/trsm/bli_trsm_front.c +++ b/frame/3/trsm/bli_trsm_front.c @@ -34,7 +34,7 @@ #include "blis.h" -void bli_trsm_front +BLIS_EXPORT_BLIS void bli_trsm_front ( side_t side, obj_t* alpha, diff --git a/frame/3/trsm/bli_trsm_front.h b/frame/3/trsm/bli_trsm_front.h index 1a08b7c75..c7b8567c9 100644 --- a/frame/3/trsm/bli_trsm_front.h +++ b/frame/3/trsm/bli_trsm_front.h @@ -32,7 +32,7 @@ */ -void bli_trsm_front +BLIS_EXPORT_BLIS void bli_trsm_front ( side_t side, obj_t* alpha, diff --git a/frame/3/trsm/bli_trsm_int.c b/frame/3/trsm/bli_trsm_int.c index b397a52dd..9a4358f47 100644 --- a/frame/3/trsm/bli_trsm_int.c +++ b/frame/3/trsm/bli_trsm_int.c @@ -34,7 +34,7 @@ #include "blis.h" -void bli_trsm_int +BLIS_EXPORT_BLIS void bli_trsm_int ( obj_t* alpha, obj_t* a, diff --git a/frame/3/trsm/bli_trsm_int.h b/frame/3/trsm/bli_trsm_int.h index aabb2a8aa..ce205765c 100644 --- a/frame/3/trsm/bli_trsm_int.h +++ b/frame/3/trsm/bli_trsm_int.h @@ -32,7 +32,7 @@ */ -void bli_trsm_int +BLIS_EXPORT_BLIS void bli_trsm_int ( obj_t* alpha, obj_t* a, diff --git a/frame/3/trsm/bli_trsm_ll_ker_var2.c b/frame/3/trsm/bli_trsm_ll_ker_var2.c index 37823d7bf..19292a2f3 100644 --- a/frame/3/trsm/bli_trsm_ll_ker_var2.c +++ b/frame/3/trsm/bli_trsm_ll_ker_var2.c @@ -140,7 +140,7 @@ void bli_trsm_ll_ker_var2 #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffa, \ pack_t schema_a, \ diff --git a/frame/3/trsm/bli_trsm_lu_ker_var2.c b/frame/3/trsm/bli_trsm_lu_ker_var2.c index 853bccf91..94f3180ae 100644 --- a/frame/3/trsm/bli_trsm_lu_ker_var2.c +++ b/frame/3/trsm/bli_trsm_lu_ker_var2.c @@ -140,7 +140,7 @@ void bli_trsm_lu_ker_var2 #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffa, \ pack_t schema_a, \ diff --git a/frame/3/trsm/bli_trsm_rl_ker_var2.c b/frame/3/trsm/bli_trsm_rl_ker_var2.c index 87e1a0b28..14fa2a30a 100644 --- a/frame/3/trsm/bli_trsm_rl_ker_var2.c +++ b/frame/3/trsm/bli_trsm_rl_ker_var2.c @@ -140,7 +140,7 @@ void bli_trsm_rl_ker_var2 #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffb, \ pack_t schema_a, \ diff --git a/frame/3/trsm/bli_trsm_ru_ker_var2.c b/frame/3/trsm/bli_trsm_ru_ker_var2.c index 71a72ea24..a7a65264a 100644 --- a/frame/3/trsm/bli_trsm_ru_ker_var2.c +++ b/frame/3/trsm/bli_trsm_ru_ker_var2.c @@ -140,7 +140,7 @@ void bli_trsm_ru_ker_var2 #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffb, \ pack_t schema_a, \ diff --git a/frame/3/trsm/bli_trsm_var.h b/frame/3/trsm/bli_trsm_var.h index 0f5f42de8..0ee1c0fc6 100644 --- a/frame/3/trsm/bli_trsm_var.h +++ b/frame/3/trsm/bli_trsm_var.h @@ -41,7 +41,7 @@ #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC0(opname) \ +BLIS_EXPORT_BLIS void PASTEMAC0(opname) \ ( \ obj_t* a, \ obj_t* b, \ @@ -73,7 +73,7 @@ GENPROT( trsm_ru_ker_var2 ) #undef GENTPROT #define GENTPROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoff, \ pack_t schema_a, \ diff --git a/frame/3/trsm/other/bli_trsm_ll_ker_var2.c b/frame/3/trsm/other/bli_trsm_ll_ker_var2.c index 1c4b0b5c7..f58602903 100644 --- a/frame/3/trsm/other/bli_trsm_ll_ker_var2.c +++ b/frame/3/trsm/other/bli_trsm_ll_ker_var2.c @@ -140,7 +140,7 @@ void bli_trsm_ll_ker_var2 #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffa, \ pack_t schema_a, \ diff --git a/frame/3/trsm/other/bli_trsm_ll_ker_var2rr.c b/frame/3/trsm/other/bli_trsm_ll_ker_var2rr.c index 3891bffc0..ffb4102fd 100644 --- a/frame/3/trsm/other/bli_trsm_ll_ker_var2rr.c +++ b/frame/3/trsm/other/bli_trsm_ll_ker_var2rr.c @@ -143,7 +143,7 @@ void bli_trsm_ll_ker_var2rr #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffa, \ pack_t schema_a, \ diff --git a/frame/3/trsm/other/bli_trsm_ll_ker_var2sl.c b/frame/3/trsm/other/bli_trsm_ll_ker_var2sl.c index 1bc2f6e42..9065c1d10 100644 --- a/frame/3/trsm/other/bli_trsm_ll_ker_var2sl.c +++ b/frame/3/trsm/other/bli_trsm_ll_ker_var2sl.c @@ -143,7 +143,7 @@ void bli_trsm_ll_ker_var2sl #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffa, \ pack_t schema_a, \ diff --git a/frame/3/trsm/other/bli_trsm_lu_ker_var2.c b/frame/3/trsm/other/bli_trsm_lu_ker_var2.c index 673e1eaa3..e7a0c956c 100644 --- a/frame/3/trsm/other/bli_trsm_lu_ker_var2.c +++ b/frame/3/trsm/other/bli_trsm_lu_ker_var2.c @@ -140,7 +140,7 @@ void bli_trsm_lu_ker_var2 #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffa, \ pack_t schema_a, \ diff --git a/frame/3/trsm/other/bli_trsm_lu_ker_var2rr.c b/frame/3/trsm/other/bli_trsm_lu_ker_var2rr.c index 72761ee54..675a2ab19 100644 --- a/frame/3/trsm/other/bli_trsm_lu_ker_var2rr.c +++ b/frame/3/trsm/other/bli_trsm_lu_ker_var2rr.c @@ -143,7 +143,7 @@ void bli_trsm_lu_ker_var2rr #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffa, \ pack_t schema_a, \ diff --git a/frame/3/trsm/other/bli_trsm_lu_ker_var2sl.c b/frame/3/trsm/other/bli_trsm_lu_ker_var2sl.c index 491ae8198..386c87b37 100644 --- a/frame/3/trsm/other/bli_trsm_lu_ker_var2sl.c +++ b/frame/3/trsm/other/bli_trsm_lu_ker_var2sl.c @@ -143,7 +143,7 @@ void bli_trsm_lu_ker_var2sl #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffa, \ pack_t schema_a, \ diff --git a/frame/3/trsm/other/bli_trsm_rl_ker_var2.c b/frame/3/trsm/other/bli_trsm_rl_ker_var2.c index 3293289a1..97509d01b 100644 --- a/frame/3/trsm/other/bli_trsm_rl_ker_var2.c +++ b/frame/3/trsm/other/bli_trsm_rl_ker_var2.c @@ -140,7 +140,7 @@ void bli_trsm_rl_ker_var2 #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffb, \ pack_t schema_a, \ diff --git a/frame/3/trsm/other/bli_trsm_ru_ker_var2.c b/frame/3/trsm/other/bli_trsm_ru_ker_var2.c index 9726fd467..8fa33210c 100644 --- a/frame/3/trsm/other/bli_trsm_ru_ker_var2.c +++ b/frame/3/trsm/other/bli_trsm_ru_ker_var2.c @@ -140,7 +140,7 @@ void bli_trsm_ru_ker_var2 #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffb, \ pack_t schema_a, \ diff --git a/frame/base/bli_apool.h b/frame/base/bli_apool.h index bc6adf757..3e514b4e0 100644 --- a/frame/base/bli_apool.h +++ b/frame/base/bli_apool.h @@ -56,7 +56,7 @@ static pool_t* bli_apool_pool( apool_t* apool ) return &(apool->pool); } -static bli_pthread_mutex_t* bli_apool_mutex( apool_t* apool ) +static bli_pthread_mutex_t* bli_apool_mutex( apool_t* apool ) { return &(apool->mutex); } @@ -94,44 +94,44 @@ static void bli_apool_set_def_array_len( siz_t def_array_len, apool_t* pool ) \ // ----------------------------------------------------------------------------- -void bli_apool_init +BLIS_EXPORT_BLIS void bli_apool_init ( apool_t* restrict apool ); -void bli_apool_finalize +BLIS_EXPORT_BLIS void bli_apool_finalize ( apool_t* restrict apool ); -array_t* bli_apool_checkout_array +BLIS_EXPORT_BLIS array_t* bli_apool_checkout_array ( siz_t n_threads, apool_t* restrict apool ); -void bli_apool_checkin_array +BLIS_EXPORT_BLIS void bli_apool_checkin_array ( array_t* restrict array, apool_t* restrict apool ); -pool_t* bli_apool_array_elem +BLIS_EXPORT_BLIS pool_t* bli_apool_array_elem ( siz_t index, array_t* restrict array ); -void bli_apool_grow +BLIS_EXPORT_BLIS void bli_apool_grow ( siz_t num_blocks_add, apool_t* restrict apool ); -void bli_apool_alloc_block +BLIS_EXPORT_BLIS void bli_apool_alloc_block ( siz_t num_elem, array_t** restrict array_p ); -void bli_apool_free_block +BLIS_EXPORT_BLIS void bli_apool_free_block ( array_t* restrict array ); diff --git a/frame/base/bli_arch.c b/frame/base/bli_arch.c index b0ee7412b..524340c5f 100644 --- a/frame/base/bli_arch.c +++ b/frame/base/bli_arch.c @@ -36,6 +36,7 @@ #ifndef BLIS_CONFIGURETIME_CPUID #include "blis.h" #else + #define BLIS_EXPORT_BLIS #include "bli_system.h" #include "bli_type_defs.h" #include "bli_arch.h" diff --git a/frame/base/bli_arch.h b/frame/base/bli_arch.h index 4299a12a0..42a021806 100644 --- a/frame/base/bli_arch.h +++ b/frame/base/bli_arch.h @@ -35,12 +35,12 @@ #ifndef BLIS_ARCH_H #define BLIS_ARCH_H -arch_t bli_arch_query_id( void ); +BLIS_EXPORT_BLIS arch_t bli_arch_query_id( void ); -void bli_arch_set_id_once( void ); -void bli_arch_set_id( void ); +BLIS_EXPORT_BLIS void bli_arch_set_id_once( void ); +BLIS_EXPORT_BLIS void bli_arch_set_id( void ); -char* bli_arch_string( arch_t id ); +BLIS_EXPORT_BLIS char* bli_arch_string( arch_t id ); #endif diff --git a/frame/base/bli_array.h b/frame/base/bli_array.h index e3070ae67..5676a7a22 100644 --- a/frame/base/bli_array.h +++ b/frame/base/bli_array.h @@ -85,28 +85,28 @@ static void bli_array_set_elem_size( siz_t elem_size, array_t* array ) \ // ----------------------------------------------------------------------------- -void bli_array_init +BLIS_EXPORT_BLIS void bli_array_init ( const siz_t num_elem, const siz_t elem_size, array_t* restrict array ); -void bli_array_resize +BLIS_EXPORT_BLIS void bli_array_resize ( const siz_t num_elem_new, array_t* restrict array ); -void bli_array_finalize +BLIS_EXPORT_BLIS void bli_array_finalize ( array_t* restrict array ); -void* bli_array_elem +BLIS_EXPORT_BLIS void* bli_array_elem ( const siz_t index, array_t* restrict array ); -void bli_array_set_elem +BLIS_EXPORT_BLIS void bli_array_set_elem ( void* restrict elem, const siz_t index, diff --git a/frame/base/bli_blksz.h b/frame/base/bli_blksz.h index 15280ca18..5ca441a29 100644 --- a/frame/base/bli_blksz.h +++ b/frame/base/bli_blksz.h @@ -186,7 +186,7 @@ static void bli_blksz_scale_def_max // ----------------------------------------------------------------------------- -blksz_t* bli_blksz_create_ed +BLIS_EXPORT_BLIS blksz_t* bli_blksz_create_ed ( dim_t b_s, dim_t be_s, dim_t b_d, dim_t be_d, @@ -194,13 +194,13 @@ blksz_t* bli_blksz_create_ed dim_t b_z, dim_t be_z ); -blksz_t* bli_blksz_create +BLIS_EXPORT_BLIS blksz_t* bli_blksz_create ( dim_t b_s, dim_t b_d, dim_t b_c, dim_t b_z, dim_t be_s, dim_t be_d, dim_t be_c, dim_t be_z ); -void bli_blksz_init_ed +BLIS_EXPORT_BLIS void bli_blksz_init_ed ( blksz_t* b, dim_t b_s, dim_t be_s, @@ -209,20 +209,20 @@ void bli_blksz_init_ed dim_t b_z, dim_t be_z ); -void bli_blksz_init +BLIS_EXPORT_BLIS void bli_blksz_init ( blksz_t* b, dim_t b_s, dim_t b_d, dim_t b_c, dim_t b_z, dim_t be_s, dim_t be_d, dim_t be_c, dim_t be_z ); -void bli_blksz_init_easy +BLIS_EXPORT_BLIS void bli_blksz_init_easy ( blksz_t* b, dim_t b_s, dim_t b_d, dim_t b_c, dim_t b_z ); -void bli_blksz_free +BLIS_EXPORT_BLIS void bli_blksz_free ( blksz_t* b ); @@ -230,27 +230,27 @@ void bli_blksz_free // ----------------------------------------------------------------------------- #if 0 -void bli_blksz_reduce_dt_to +BLIS_EXPORT_BLIS void bli_blksz_reduce_dt_to ( num_t dt_bm, blksz_t* bmult, num_t dt_bs, blksz_t* blksz ); #endif -void bli_blksz_reduce_def_to +BLIS_EXPORT_BLIS void bli_blksz_reduce_def_to ( num_t dt_bm, blksz_t* bmult, num_t dt_bs, blksz_t* blksz ); -void bli_blksz_reduce_max_to +BLIS_EXPORT_BLIS void bli_blksz_reduce_max_to ( num_t dt_bm, blksz_t* bmult, num_t dt_bs, blksz_t* blksz ); // ----------------------------------------------------------------------------- -dim_t bli_determine_blocksize +BLIS_EXPORT_BLIS dim_t bli_determine_blocksize ( dir_t direct, dim_t i, @@ -260,7 +260,7 @@ dim_t bli_determine_blocksize cntx_t* cntx ); -dim_t bli_determine_blocksize_f +BLIS_EXPORT_BLIS dim_t bli_determine_blocksize_f ( dim_t i, dim_t dim, @@ -269,7 +269,7 @@ dim_t bli_determine_blocksize_f cntx_t* cntx ); -dim_t bli_determine_blocksize_b +BLIS_EXPORT_BLIS dim_t bli_determine_blocksize_b ( dim_t i, dim_t dim, @@ -278,7 +278,7 @@ dim_t bli_determine_blocksize_b cntx_t* cntx ); -dim_t bli_determine_blocksize_f_sub +BLIS_EXPORT_BLIS dim_t bli_determine_blocksize_f_sub ( dim_t i, dim_t dim, @@ -286,7 +286,7 @@ dim_t bli_determine_blocksize_f_sub dim_t b_max ); -dim_t bli_determine_blocksize_b_sub +BLIS_EXPORT_BLIS dim_t bli_determine_blocksize_b_sub ( dim_t i, dim_t dim, diff --git a/frame/base/bli_check.h b/frame/base/bli_check.h index 242dc9487..b96f4f1ff 100644 --- a/frame/base/bli_check.h +++ b/frame/base/bli_check.h @@ -34,84 +34,84 @@ */ -err_t bli_check_error_code_helper( gint_t code, char* file, guint_t line ); +BLIS_EXPORT_BLIS err_t bli_check_error_code_helper( gint_t code, char* file, guint_t line ); -err_t bli_check_valid_error_level( errlev_t level ); +BLIS_EXPORT_BLIS err_t bli_check_valid_error_level( errlev_t level ); -err_t bli_check_null_pointer( void* ptr ); +BLIS_EXPORT_BLIS err_t bli_check_null_pointer( void* ptr ); -err_t bli_check_valid_side( side_t side ); -err_t bli_check_valid_uplo( uplo_t uplo ); -err_t bli_check_valid_trans( trans_t trans ); -err_t bli_check_valid_diag( diag_t diag ); -err_t bli_check_nonunit_diag( obj_t* a ); +BLIS_EXPORT_BLIS err_t bli_check_valid_side( side_t side ); +BLIS_EXPORT_BLIS err_t bli_check_valid_uplo( uplo_t uplo ); +BLIS_EXPORT_BLIS err_t bli_check_valid_trans( trans_t trans ); +BLIS_EXPORT_BLIS err_t bli_check_valid_diag( diag_t diag ); +BLIS_EXPORT_BLIS err_t bli_check_nonunit_diag( obj_t* a ); -err_t bli_check_valid_datatype( num_t dt ); -err_t bli_check_object_valid_datatype( obj_t* a ); -err_t bli_check_noninteger_datatype( num_t dt ); -err_t bli_check_noninteger_object( obj_t* a ); -err_t bli_check_nonconstant_datatype( num_t dt ); -err_t bli_check_nonconstant_object( obj_t* a ); -err_t bli_check_floating_datatype( num_t dt ); -err_t bli_check_floating_object( obj_t* a ); -err_t bli_check_real_datatype( num_t dt ); -err_t bli_check_real_object( obj_t* a ); -err_t bli_check_integer_datatype( num_t dt ); -err_t bli_check_integer_object( obj_t* a ); -err_t bli_check_consistent_datatypes( num_t dt_a, num_t dt_b ); -err_t bli_check_consistent_object_datatypes( obj_t* a, obj_t* b ); -err_t bli_check_datatype_real_proj_of( num_t dt_c, num_t dt_r ); -err_t bli_check_object_real_proj_of( obj_t* c, obj_t* r ); -err_t bli_check_real_valued_object( obj_t* a ); -err_t bli_check_consistent_precisions( num_t dt_a, num_t dt_b ); -err_t bli_check_consistent_object_precisions( obj_t* a, obj_t* b ); +BLIS_EXPORT_BLIS err_t bli_check_valid_datatype( num_t dt ); +BLIS_EXPORT_BLIS err_t bli_check_object_valid_datatype( obj_t* a ); +BLIS_EXPORT_BLIS err_t bli_check_noninteger_datatype( num_t dt ); +BLIS_EXPORT_BLIS err_t bli_check_noninteger_object( obj_t* a ); +BLIS_EXPORT_BLIS err_t bli_check_nonconstant_datatype( num_t dt ); +BLIS_EXPORT_BLIS err_t bli_check_nonconstant_object( obj_t* a ); +BLIS_EXPORT_BLIS err_t bli_check_floating_datatype( num_t dt ); +BLIS_EXPORT_BLIS err_t bli_check_floating_object( obj_t* a ); +BLIS_EXPORT_BLIS err_t bli_check_real_datatype( num_t dt ); +BLIS_EXPORT_BLIS err_t bli_check_real_object( obj_t* a ); +BLIS_EXPORT_BLIS err_t bli_check_integer_datatype( num_t dt ); +BLIS_EXPORT_BLIS err_t bli_check_integer_object( obj_t* a ); +BLIS_EXPORT_BLIS err_t bli_check_consistent_datatypes( num_t dt_a, num_t dt_b ); +BLIS_EXPORT_BLIS err_t bli_check_consistent_object_datatypes( obj_t* a, obj_t* b ); +BLIS_EXPORT_BLIS err_t bli_check_datatype_real_proj_of( num_t dt_c, num_t dt_r ); +BLIS_EXPORT_BLIS err_t bli_check_object_real_proj_of( obj_t* c, obj_t* r ); +BLIS_EXPORT_BLIS err_t bli_check_real_valued_object( obj_t* a ); +BLIS_EXPORT_BLIS err_t bli_check_consistent_precisions( num_t dt_a, num_t dt_b ); +BLIS_EXPORT_BLIS err_t bli_check_consistent_object_precisions( obj_t* a, obj_t* b ); -err_t bli_check_conformal_dims( obj_t* a, obj_t* b ); -err_t bli_check_level3_dims( obj_t* a, obj_t* b, obj_t* c ); -err_t bli_check_scalar_object( obj_t* a ); -err_t bli_check_vector_object( obj_t* a ); -err_t bli_check_matrix_object( obj_t* a ); -err_t bli_check_equal_vector_lengths( obj_t* x, obj_t* y ); -err_t bli_check_square_object( obj_t* a ); -err_t bli_check_object_length_equals( obj_t* a, dim_t m ); -err_t bli_check_object_width_equals( obj_t* a, dim_t n ); -err_t bli_check_vector_dim_equals( obj_t* a, dim_t n ); -err_t bli_check_object_diag_offset_equals( obj_t* a, doff_t offset ); +BLIS_EXPORT_BLIS err_t bli_check_conformal_dims( obj_t* a, obj_t* b ); +BLIS_EXPORT_BLIS err_t bli_check_level3_dims( obj_t* a, obj_t* b, obj_t* c ); +BLIS_EXPORT_BLIS err_t bli_check_scalar_object( obj_t* a ); +BLIS_EXPORT_BLIS err_t bli_check_vector_object( obj_t* a ); +BLIS_EXPORT_BLIS err_t bli_check_matrix_object( obj_t* a ); +BLIS_EXPORT_BLIS err_t bli_check_equal_vector_lengths( obj_t* x, obj_t* y ); +BLIS_EXPORT_BLIS err_t bli_check_square_object( obj_t* a ); +BLIS_EXPORT_BLIS err_t bli_check_object_length_equals( obj_t* a, dim_t m ); +BLIS_EXPORT_BLIS err_t bli_check_object_width_equals( obj_t* a, dim_t n ); +BLIS_EXPORT_BLIS err_t bli_check_vector_dim_equals( obj_t* a, dim_t n ); +BLIS_EXPORT_BLIS err_t bli_check_object_diag_offset_equals( obj_t* a, doff_t offset ); -err_t bli_check_matrix_strides( dim_t m, dim_t n, inc_t rs, inc_t cs, inc_t is ); +BLIS_EXPORT_BLIS err_t bli_check_matrix_strides( dim_t m, dim_t n, inc_t rs, inc_t cs, inc_t is ); -err_t bli_check_general_object( obj_t* a ); -err_t bli_check_hermitian_object( obj_t* a ); -err_t bli_check_symmetric_object( obj_t* a ); -err_t bli_check_triangular_object( obj_t* a ); -err_t bli_check_object_struc( obj_t* a, struc_t struc ); +BLIS_EXPORT_BLIS err_t bli_check_general_object( obj_t* a ); +BLIS_EXPORT_BLIS err_t bli_check_hermitian_object( obj_t* a ); +BLIS_EXPORT_BLIS err_t bli_check_symmetric_object( obj_t* a ); +BLIS_EXPORT_BLIS err_t bli_check_triangular_object( obj_t* a ); +BLIS_EXPORT_BLIS err_t bli_check_object_struc( obj_t* a, struc_t struc ); -err_t bli_check_upper_or_lower_object( obj_t* a ); +BLIS_EXPORT_BLIS err_t bli_check_upper_or_lower_object( obj_t* a ); -err_t bli_check_valid_3x1_subpart( subpart_t part ); -err_t bli_check_valid_1x3_subpart( subpart_t part ); -err_t bli_check_valid_3x3_subpart( subpart_t part ); +BLIS_EXPORT_BLIS err_t bli_check_valid_3x1_subpart( subpart_t part ); +BLIS_EXPORT_BLIS err_t bli_check_valid_1x3_subpart( subpart_t part ); +BLIS_EXPORT_BLIS err_t bli_check_valid_3x3_subpart( subpart_t part ); -err_t bli_check_valid_cntl( void* cntl ); +BLIS_EXPORT_BLIS err_t bli_check_valid_cntl( void* cntl ); -err_t bli_check_packm_schema_on_unpack( obj_t* a ); -err_t bli_check_packv_schema_on_unpack( obj_t* a ); +BLIS_EXPORT_BLIS err_t bli_check_packm_schema_on_unpack( obj_t* a ); +BLIS_EXPORT_BLIS err_t bli_check_packv_schema_on_unpack( obj_t* a ); -err_t bli_check_object_buffer( obj_t* a ); +BLIS_EXPORT_BLIS err_t bli_check_object_buffer( obj_t* a ); -err_t bli_check_valid_malloc_buf( void* ptr ); +BLIS_EXPORT_BLIS err_t bli_check_valid_malloc_buf( void* ptr ); -err_t bli_check_valid_packbuf( packbuf_t buf_type ); -err_t bli_check_if_exhausted_pool( pool_t* pool ); -err_t bli_check_sufficient_stack_buf_size( num_t dt, cntx_t* cntx ); -err_t bli_check_alignment_is_power_of_two( size_t align_size ); -err_t bli_check_alignment_is_mult_of_ptr_size( size_t align_size ); +BLIS_EXPORT_BLIS err_t bli_check_valid_packbuf( packbuf_t buf_type ); +BLIS_EXPORT_BLIS err_t bli_check_if_exhausted_pool( pool_t* pool ); +BLIS_EXPORT_BLIS err_t bli_check_sufficient_stack_buf_size( num_t dt, cntx_t* cntx ); +BLIS_EXPORT_BLIS err_t bli_check_alignment_is_power_of_two( size_t align_size ); +BLIS_EXPORT_BLIS err_t bli_check_alignment_is_mult_of_ptr_size( size_t align_size ); -err_t bli_check_object_alias_of( obj_t* a, obj_t* b ); +BLIS_EXPORT_BLIS err_t bli_check_object_alias_of( obj_t* a, obj_t* b ); -err_t bli_check_valid_arch_id( arch_t id ); +BLIS_EXPORT_BLIS err_t bli_check_valid_arch_id( arch_t id ); -err_t bli_check_valid_mc_mod_mult( blksz_t* mc, blksz_t* mr ); -err_t bli_check_valid_nc_mod_mult( blksz_t* nc, blksz_t* nr ); -err_t bli_check_valid_kc_mod_mult( blksz_t* kc, blksz_t* kr ); +BLIS_EXPORT_BLIS err_t bli_check_valid_mc_mod_mult( blksz_t* mc, blksz_t* mr ); +BLIS_EXPORT_BLIS err_t bli_check_valid_nc_mod_mult( blksz_t* nc, blksz_t* nr ); +BLIS_EXPORT_BLIS err_t bli_check_valid_kc_mod_mult( blksz_t* kc, blksz_t* kr ); diff --git a/frame/base/bli_clock.h b/frame/base/bli_clock.h index c17eafdd1..f4d952a08 100644 --- a/frame/base/bli_clock.h +++ b/frame/base/bli_clock.h @@ -32,7 +32,7 @@ */ -double bli_clock( void ); -double bli_clock_min_diff( double time_min, double time_start ); -double bli_clock_helper( void ); +BLIS_EXPORT_BLIS double bli_clock( void ); +BLIS_EXPORT_BLIS double bli_clock_min_diff( double time_min, double time_start ); +BLIS_EXPORT_BLIS double bli_clock_helper( void ); diff --git a/frame/base/bli_cntl.h b/frame/base/bli_cntl.h index 4e881ea1d..f317b3357 100644 --- a/frame/base/bli_cntl.h +++ b/frame/base/bli_cntl.h @@ -59,7 +59,7 @@ typedef struct cntl_s cntl_t; // -- Control tree prototypes -- -cntl_t* bli_cntl_create_node +BLIS_EXPORT_BLIS cntl_t* bli_cntl_create_node ( rntm_t* rntm, opid_t family, @@ -69,46 +69,46 @@ cntl_t* bli_cntl_create_node cntl_t* sub_node ); -void bli_cntl_free_node +BLIS_EXPORT_BLIS void bli_cntl_free_node ( rntm_t* rntm, cntl_t* cntl ); -void bli_cntl_clear_node +BLIS_EXPORT_BLIS void bli_cntl_clear_node ( cntl_t* cntl ); // ----------------------------------------------------------------------------- -void bli_cntl_free +BLIS_EXPORT_BLIS void bli_cntl_free ( rntm_t* rntm, cntl_t* cntl, thrinfo_t* thread ); -void bli_cntl_free_w_thrinfo +BLIS_EXPORT_BLIS void bli_cntl_free_w_thrinfo ( rntm_t* rntm, cntl_t* cntl, thrinfo_t* thread ); -void bli_cntl_free_wo_thrinfo +BLIS_EXPORT_BLIS void bli_cntl_free_wo_thrinfo ( rntm_t* rntm, cntl_t* cntl ); -cntl_t* bli_cntl_copy +BLIS_EXPORT_BLIS cntl_t* bli_cntl_copy ( rntm_t* rntm, cntl_t* cntl ); -void bli_cntl_mark_family +BLIS_EXPORT_BLIS void bli_cntl_mark_family ( opid_t family, cntl_t* cntl @@ -116,7 +116,7 @@ void bli_cntl_mark_family // ----------------------------------------------------------------------------- -dim_t bli_cntl_calc_num_threads_in +BLIS_EXPORT_BLIS dim_t bli_cntl_calc_num_threads_in ( rntm_t* rntm, cntl_t* cntl diff --git a/frame/base/bli_cntx.h b/frame/base/bli_cntx.h index 450c753b6..e87794e90 100644 --- a/frame/base/bli_cntx.h +++ b/frame/base/bli_cntx.h @@ -538,18 +538,18 @@ static void bli_cntx_set_unpackm_ker_dt( void* fp, num_t dt, l1mkr_t ker_id, cnt // Function prototypes -void bli_cntx_clear( cntx_t* cntx ); +BLIS_EXPORT_BLIS void bli_cntx_clear( cntx_t* cntx ); -void bli_cntx_set_blkszs( ind_t method, dim_t n_bs, ... ); +BLIS_EXPORT_BLIS void bli_cntx_set_blkszs( ind_t method, dim_t n_bs, ... ); -void bli_cntx_set_ind_blkszs( ind_t method, dim_t n_bs, ... ); +BLIS_EXPORT_BLIS void bli_cntx_set_ind_blkszs( ind_t method, dim_t n_bs, ... ); -void bli_cntx_set_l3_nat_ukrs( dim_t n_ukrs, ... ); -void bli_cntx_set_l1f_kers( dim_t n_kers, ... ); -void bli_cntx_set_l1v_kers( dim_t n_kers, ... ); -void bli_cntx_set_packm_kers( dim_t n_kers, ... ); +BLIS_EXPORT_BLIS void bli_cntx_set_l3_nat_ukrs( dim_t n_ukrs, ... ); +BLIS_EXPORT_BLIS void bli_cntx_set_l1f_kers( dim_t n_kers, ... ); +BLIS_EXPORT_BLIS void bli_cntx_set_l1v_kers( dim_t n_kers, ... ); +BLIS_EXPORT_BLIS void bli_cntx_set_packm_kers( dim_t n_kers, ... ); -void bli_cntx_print( cntx_t* cntx ); +BLIS_EXPORT_BLIS void bli_cntx_print( cntx_t* cntx ); #endif diff --git a/frame/base/bli_const.h b/frame/base/bli_const.h index 1b9799482..ad088addb 100644 --- a/frame/base/bli_const.h +++ b/frame/base/bli_const.h @@ -32,6 +32,6 @@ */ -void bli_const_init( void ); -void bli_const_finalize( void ); +BLIS_EXPORT_BLIS void bli_const_init( void ); +BLIS_EXPORT_BLIS void bli_const_finalize( void ); diff --git a/frame/base/bli_cpuid.c b/frame/base/bli_cpuid.c index 6b17a1dac..f5c53fc29 100644 --- a/frame/base/bli_cpuid.c +++ b/frame/base/bli_cpuid.c @@ -48,6 +48,7 @@ #ifndef BLIS_CONFIGURETIME_CPUID #include "blis.h" #else + #define BLIS_EXPORT_BLIS #include "bli_system.h" #include "bli_type_defs.h" #include "bli_cpuid.h" diff --git a/frame/base/bli_cpuid.h b/frame/base/bli_cpuid.h index f2e4d334b..d624b5f1c 100644 --- a/frame/base/bli_cpuid.h +++ b/frame/base/bli_cpuid.h @@ -50,30 +50,30 @@ #ifndef BLIS_CPUID_H #define BLIS_CPUID_H -arch_t bli_cpuid_query_id( void ); +BLIS_EXPORT_BLIS arch_t bli_cpuid_query_id( void ); // Intel -bool_t bli_cpuid_is_skx( uint32_t family, uint32_t model, uint32_t features ); -bool_t bli_cpuid_is_knl( uint32_t family, uint32_t model, uint32_t features ); -bool_t bli_cpuid_is_haswell( uint32_t family, uint32_t model, uint32_t features ); -bool_t bli_cpuid_is_sandybridge( uint32_t family, uint32_t model, uint32_t features ); -bool_t bli_cpuid_is_penryn( uint32_t family, uint32_t model, uint32_t features ); +BLIS_EXPORT_BLIS bool_t bli_cpuid_is_skx( uint32_t family, uint32_t model, uint32_t features ); +BLIS_EXPORT_BLIS bool_t bli_cpuid_is_knl( uint32_t family, uint32_t model, uint32_t features ); +BLIS_EXPORT_BLIS bool_t bli_cpuid_is_haswell( uint32_t family, uint32_t model, uint32_t features ); +BLIS_EXPORT_BLIS bool_t bli_cpuid_is_sandybridge( uint32_t family, uint32_t model, uint32_t features ); +BLIS_EXPORT_BLIS bool_t bli_cpuid_is_penryn( uint32_t family, uint32_t model, uint32_t features ); // AMD -bool_t bli_cpuid_is_zen( uint32_t family, uint32_t model, uint32_t features ); -bool_t bli_cpuid_is_excavator( uint32_t family, uint32_t model, uint32_t features ); -bool_t bli_cpuid_is_steamroller( uint32_t family, uint32_t model, uint32_t features ); -bool_t bli_cpuid_is_piledriver( uint32_t family, uint32_t model, uint32_t features ); -bool_t bli_cpuid_is_bulldozer( uint32_t family, uint32_t model, uint32_t features ); +BLIS_EXPORT_BLIS bool_t bli_cpuid_is_zen( uint32_t family, uint32_t model, uint32_t features ); +BLIS_EXPORT_BLIS bool_t bli_cpuid_is_excavator( uint32_t family, uint32_t model, uint32_t features ); +BLIS_EXPORT_BLIS bool_t bli_cpuid_is_steamroller( uint32_t family, uint32_t model, uint32_t features ); +BLIS_EXPORT_BLIS bool_t bli_cpuid_is_piledriver( uint32_t family, uint32_t model, uint32_t features ); +BLIS_EXPORT_BLIS bool_t bli_cpuid_is_bulldozer( uint32_t family, uint32_t model, uint32_t features ); // ARM -bool_t bli_cpuid_is_thunderx2( uint32_t model, uint32_t part, uint32_t features ); -bool_t bli_cpuid_is_cortexa57( uint32_t model, uint32_t part, uint32_t features ); -bool_t bli_cpuid_is_cortexa53( uint32_t model, uint32_t part, uint32_t features ); -bool_t bli_cpuid_is_cortexa15( uint32_t model, uint32_t part, uint32_t features ); -bool_t bli_cpuid_is_cortexa9( uint32_t model, uint32_t part, uint32_t features ); +BLIS_EXPORT_BLIS bool_t bli_cpuid_is_thunderx2( uint32_t model, uint32_t part, uint32_t features ); +BLIS_EXPORT_BLIS bool_t bli_cpuid_is_cortexa57( uint32_t model, uint32_t part, uint32_t features ); +BLIS_EXPORT_BLIS bool_t bli_cpuid_is_cortexa53( uint32_t model, uint32_t part, uint32_t features ); +BLIS_EXPORT_BLIS bool_t bli_cpuid_is_cortexa15( uint32_t model, uint32_t part, uint32_t features ); +BLIS_EXPORT_BLIS bool_t bli_cpuid_is_cortexa9( uint32_t model, uint32_t part, uint32_t features ); -uint32_t bli_cpuid_query( uint32_t* family, uint32_t* model, uint32_t* features ); +BLIS_EXPORT_BLIS uint32_t bli_cpuid_query( uint32_t* family, uint32_t* model, uint32_t* features ); // ----------------------------------------------------------------------------- diff --git a/frame/base/bli_error.c b/frame/base/bli_error.c index 8ed386af5..0a10ba2cf 100644 --- a/frame/base/bli_error.c +++ b/frame/base/bli_error.c @@ -143,7 +143,7 @@ errlev_t bli_error_checking_level( void ) return bli_err_chk_level; } -void bli_error_checking_level_set( errlev_t new_level ) +BLIS_EXPORT_BLIS void bli_error_checking_level_set( errlev_t new_level ) { err_t e_val; diff --git a/frame/base/bli_error.h b/frame/base/bli_error.h index bb624a5dc..d0b8101a6 100644 --- a/frame/base/bli_error.h +++ b/frame/base/bli_error.h @@ -33,13 +33,13 @@ */ -void bli_print_msg( char* str, char* file, guint_t line ); -void bli_abort( void ); +BLIS_EXPORT_BLIS void bli_print_msg( char* str, char* file, guint_t line ); +BLIS_EXPORT_BLIS void bli_abort( void ); -errlev_t bli_error_checking_level( void ); -void bli_error_checking_level_set( errlev_t new_level ); +BLIS_EXPORT_BLIS errlev_t bli_error_checking_level( void ); +BLIS_EXPORT_BLIS void bli_error_checking_level_set( errlev_t new_level ); -bool_t bli_error_checking_is_enabled( void ); +BLIS_EXPORT_BLIS bool_t bli_error_checking_is_enabled( void ); -char* bli_error_string_for_code( gint_t code ); +BLIS_EXPORT_BLIS char* bli_error_string_for_code( gint_t code ); diff --git a/frame/base/bli_func.h b/frame/base/bli_func.h index 0f927ad81..aa9186279 100644 --- a/frame/base/bli_func.h +++ b/frame/base/bli_func.h @@ -70,7 +70,7 @@ static void bli_func_copy_dt // ----------------------------------------------------------------------------- -func_t* bli_func_create +BLIS_EXPORT_BLIS func_t* bli_func_create ( void* ptr_s, void* ptr_d, @@ -78,7 +78,7 @@ func_t* bli_func_create void* ptr_z ); -void bli_func_init +BLIS_EXPORT_BLIS void bli_func_init ( func_t* f, void* ptr_s, @@ -87,16 +87,16 @@ void bli_func_init void* ptr_z ); -void bli_func_init_null +BLIS_EXPORT_BLIS void bli_func_init_null ( func_t* f ); -void bli_func_free( func_t* f ); +BLIS_EXPORT_BLIS void bli_func_free( func_t* f ); // ----------------------------------------------------------------------------- -bool_t bli_func_is_null_dt( num_t dt, +BLIS_EXPORT_BLIS bool_t bli_func_is_null_dt( num_t dt, func_t* f ); -bool_t bli_func_is_null( func_t* f ); +BLIS_EXPORT_BLIS bool_t bli_func_is_null( func_t* f ); diff --git a/frame/base/bli_getopt.c b/frame/base/bli_getopt.c index 222223484..3ce8ea81c 100644 --- a/frame/base/bli_getopt.c +++ b/frame/base/bli_getopt.c @@ -37,7 +37,7 @@ static const char OPT_MARKER = '-'; -void bli_getopt_init_state( int opterr, getopt_t* state ) +BLIS_EXPORT_BLIS void bli_getopt_init_state( int opterr, getopt_t* state ) { state->optarg = NULL; state->optind = 1; diff --git a/frame/base/bli_getopt.h b/frame/base/bli_getopt.h index 215df82f7..1b5a7a002 100644 --- a/frame/base/bli_getopt.h +++ b/frame/base/bli_getopt.h @@ -40,7 +40,7 @@ typedef struct getopt_s int optopt; } getopt_t; -void bli_getopt_init_state( int opterr, getopt_t* state ); +BLIS_EXPORT_BLIS void bli_getopt_init_state( int opterr, getopt_t* state ); -int bli_getopt( int argc, char** const argv, const char* optstring, getopt_t* state ); +BLIS_EXPORT_BLIS int bli_getopt( int argc, char** const argv, const char* optstring, getopt_t* state ); diff --git a/frame/base/bli_gks.h b/frame/base/bli_gks.h index a87a07136..350619f31 100644 --- a/frame/base/bli_gks.h +++ b/frame/base/bli_gks.h @@ -35,30 +35,30 @@ #ifndef BLIS_GKS_H #define BLIS_GKS_H -arch_t bli_arch_query_id( void ); +BLIS_EXPORT_BLIS arch_t bli_arch_query_id( void ); // ----------------------------------------------------------------------------- -void bli_gks_init( void ); -void bli_gks_finalize( void ); +BLIS_EXPORT_BLIS void bli_gks_init( void ); +BLIS_EXPORT_BLIS void bli_gks_finalize( void ); -void bli_gks_init_index( void ); +BLIS_EXPORT_BLIS void bli_gks_init_index( void ); -cntx_t* bli_gks_lookup_nat_cntx( arch_t id ); -cntx_t* bli_gks_lookup_ind_cntx( arch_t id, ind_t ind ); -void bli_gks_register_cntx( arch_t id, void* nat_fp, void* ref_fp, void* ind_fp ); +BLIS_EXPORT_BLIS cntx_t* bli_gks_lookup_nat_cntx( arch_t id ); +BLIS_EXPORT_BLIS cntx_t* bli_gks_lookup_ind_cntx( arch_t id, ind_t ind ); +BLIS_EXPORT_BLIS void bli_gks_register_cntx( arch_t id, void* nat_fp, void* ref_fp, void* ind_fp ); -cntx_t* bli_gks_query_cntx( void ); -cntx_t* bli_gks_query_nat_cntx( void ); -cntx_t* bli_gks_query_cntx_noinit( void ); -cntx_t* bli_gks_query_ind_cntx( ind_t ind, num_t dt ); +BLIS_EXPORT_BLIS cntx_t* bli_gks_query_cntx( void ); +BLIS_EXPORT_BLIS cntx_t* bli_gks_query_nat_cntx( void ); +BLIS_EXPORT_BLIS cntx_t* bli_gks_query_cntx_noinit( void ); +BLIS_EXPORT_BLIS cntx_t* bli_gks_query_ind_cntx( ind_t ind, num_t dt ); -void bli_gks_init_ref_cntx( cntx_t* cntx ); +BLIS_EXPORT_BLIS void bli_gks_init_ref_cntx( cntx_t* cntx ); -bool_t bli_gks_cntx_l3_nat_ukr_is_ref( num_t dt, l3ukr_t ukr_id, cntx_t* cntx ); +BLIS_EXPORT_BLIS bool_t bli_gks_cntx_l3_nat_ukr_is_ref( num_t dt, l3ukr_t ukr_id, cntx_t* cntx ); -char* bli_gks_l3_ukr_impl_string( l3ukr_t ukr, ind_t method, num_t dt ); -kimpl_t bli_gks_l3_ukr_impl_type( l3ukr_t ukr, ind_t method, num_t dt ); +BLIS_EXPORT_BLIS char* bli_gks_l3_ukr_impl_string( l3ukr_t ukr, ind_t method, num_t dt ); +BLIS_EXPORT_BLIS kimpl_t bli_gks_l3_ukr_impl_type( l3ukr_t ukr, ind_t method, num_t dt ); //char* bli_gks_l3_ukr_avail_impl_string( l3ukr_t ukr, num_t dt ); diff --git a/frame/base/bli_info.h b/frame/base/bli_info.h index 51b589aa5..be078fd7b 100644 --- a/frame/base/bli_info.h +++ b/frame/base/bli_info.h @@ -36,37 +36,37 @@ // -- General library information ---------------------------------------------- -char* bli_info_get_version_str( void ); -char* bli_info_get_int_type_size_str( void ); +BLIS_EXPORT_BLIS char* bli_info_get_version_str( void ); +BLIS_EXPORT_BLIS char* bli_info_get_int_type_size_str( void ); // -- General configuration-related -------------------------------------------- -gint_t bli_info_get_int_type_size( void ); -gint_t bli_info_get_num_fp_types( void ); -gint_t bli_info_get_max_type_size( void ); -gint_t bli_info_get_page_size( void ); -gint_t bli_info_get_simd_num_registers( void ); -gint_t bli_info_get_simd_size( void ); -gint_t bli_info_get_simd_align_size( void ); -gint_t bli_info_get_stack_buf_max_size( void ); -gint_t bli_info_get_stack_buf_align_size( void ); -gint_t bli_info_get_heap_addr_align_size( void ); -gint_t bli_info_get_heap_stride_align_size( void ); -gint_t bli_info_get_pool_addr_align_size( void ); -gint_t bli_info_get_enable_stay_auto_init( void ); -gint_t bli_info_get_enable_blas( void ); -gint_t bli_info_get_enable_cblas( void ); -gint_t bli_info_get_blas_int_type_size( void ); -gint_t bli_info_get_enable_pba_pools( void ); -gint_t bli_info_get_enable_sba_pools( void ); -gint_t bli_info_get_enable_threading( void ); -gint_t bli_info_get_enable_openmp( void ); -gint_t bli_info_get_enable_pthreads( void ); -gint_t bli_info_get_thread_part_jrir_slab( void ); -gint_t bli_info_get_thread_part_jrir_rr( void ); -gint_t bli_info_get_enable_memkind( void ); -gint_t bli_info_get_enable_sandbox( void ); +BLIS_EXPORT_BLIS gint_t bli_info_get_int_type_size( void ); +BLIS_EXPORT_BLIS gint_t bli_info_get_num_fp_types( void ); +BLIS_EXPORT_BLIS gint_t bli_info_get_max_type_size( void ); +BLIS_EXPORT_BLIS gint_t bli_info_get_page_size( void ); +BLIS_EXPORT_BLIS gint_t bli_info_get_simd_num_registers( void ); +BLIS_EXPORT_BLIS gint_t bli_info_get_simd_size( void ); +BLIS_EXPORT_BLIS gint_t bli_info_get_simd_align_size( void ); +BLIS_EXPORT_BLIS gint_t bli_info_get_stack_buf_max_size( void ); +BLIS_EXPORT_BLIS gint_t bli_info_get_stack_buf_align_size( void ); +BLIS_EXPORT_BLIS gint_t bli_info_get_heap_addr_align_size( void ); +BLIS_EXPORT_BLIS gint_t bli_info_get_heap_stride_align_size( void ); +BLIS_EXPORT_BLIS gint_t bli_info_get_pool_addr_align_size( void ); +BLIS_EXPORT_BLIS gint_t bli_info_get_enable_stay_auto_init( void ); +BLIS_EXPORT_BLIS gint_t bli_info_get_enable_blas( void ); +BLIS_EXPORT_BLIS gint_t bli_info_get_enable_cblas( void ); +BLIS_EXPORT_BLIS gint_t bli_info_get_blas_int_type_size( void ); +BLIS_EXPORT_BLIS gint_t bli_info_get_enable_pba_pools( void ); +BLIS_EXPORT_BLIS gint_t bli_info_get_enable_sba_pools( void ); +BLIS_EXPORT_BLIS gint_t bli_info_get_enable_threading( void ); +BLIS_EXPORT_BLIS gint_t bli_info_get_enable_openmp( void ); +BLIS_EXPORT_BLIS gint_t bli_info_get_enable_pthreads( void ); +BLIS_EXPORT_BLIS gint_t bli_info_get_thread_part_jrir_slab( void ); +BLIS_EXPORT_BLIS gint_t bli_info_get_thread_part_jrir_rr( void ); +BLIS_EXPORT_BLIS gint_t bli_info_get_enable_memkind( void ); +BLIS_EXPORT_BLIS gint_t bli_info_get_enable_sandbox( void ); // -- Kernel implementation-related -------------------------------------------- @@ -74,23 +74,23 @@ gint_t bli_info_get_enable_sandbox( void ); // -- Level-3 kernel definitions -- -char* bli_info_get_gemm_ukr_impl_string( ind_t method, num_t dt ); -char* bli_info_get_gemmtrsm_l_ukr_impl_string( ind_t method, num_t dt ); -char* bli_info_get_gemmtrsm_u_ukr_impl_string( ind_t method, num_t dt ); -char* bli_info_get_trsm_l_ukr_impl_string( ind_t method, num_t dt ); -char* bli_info_get_trsm_u_ukr_impl_string( ind_t method, num_t dt ); +BLIS_EXPORT_BLIS char* bli_info_get_gemm_ukr_impl_string( ind_t method, num_t dt ); +BLIS_EXPORT_BLIS char* bli_info_get_gemmtrsm_l_ukr_impl_string( ind_t method, num_t dt ); +BLIS_EXPORT_BLIS char* bli_info_get_gemmtrsm_u_ukr_impl_string( ind_t method, num_t dt ); +BLIS_EXPORT_BLIS char* bli_info_get_trsm_l_ukr_impl_string( ind_t method, num_t dt ); +BLIS_EXPORT_BLIS char* bli_info_get_trsm_u_ukr_impl_string( ind_t method, num_t dt ); // -- BLIS implementation query (level-3) -------------------------------------- -char* bli_info_get_gemm_impl_string( num_t dt ); -char* bli_info_get_hemm_impl_string( num_t dt ); -char* bli_info_get_herk_impl_string( num_t dt ); -char* bli_info_get_her2k_impl_string( num_t dt ); -char* bli_info_get_symm_impl_string( num_t dt ); -char* bli_info_get_syrk_impl_string( num_t dt ); -char* bli_info_get_syr2k_impl_string( num_t dt ); -char* bli_info_get_trmm_impl_string( num_t dt ); -char* bli_info_get_trmm3_impl_string( num_t dt ); -char* bli_info_get_trsm_impl_string( num_t dt ); +BLIS_EXPORT_BLIS char* bli_info_get_gemm_impl_string( num_t dt ); +BLIS_EXPORT_BLIS char* bli_info_get_hemm_impl_string( num_t dt ); +BLIS_EXPORT_BLIS char* bli_info_get_herk_impl_string( num_t dt ); +BLIS_EXPORT_BLIS char* bli_info_get_her2k_impl_string( num_t dt ); +BLIS_EXPORT_BLIS char* bli_info_get_symm_impl_string( num_t dt ); +BLIS_EXPORT_BLIS char* bli_info_get_syrk_impl_string( num_t dt ); +BLIS_EXPORT_BLIS char* bli_info_get_syr2k_impl_string( num_t dt ); +BLIS_EXPORT_BLIS char* bli_info_get_trmm_impl_string( num_t dt ); +BLIS_EXPORT_BLIS char* bli_info_get_trmm3_impl_string( num_t dt ); +BLIS_EXPORT_BLIS char* bli_info_get_trsm_impl_string( num_t dt ); diff --git a/frame/base/bli_init.h b/frame/base/bli_init.h index b37a8e342..9f45e2b03 100644 --- a/frame/base/bli_init.h +++ b/frame/base/bli_init.h @@ -32,15 +32,15 @@ */ -void bli_init( void ); -void bli_finalize( void ); +BLIS_EXPORT_BLIS void bli_init( void ); +BLIS_EXPORT_BLIS void bli_finalize( void ); -void bli_init_auto( void ); -void bli_finalize_auto( void ); +BLIS_EXPORT_BLIS void bli_init_auto( void ); +BLIS_EXPORT_BLIS void bli_finalize_auto( void ); -void bli_init_apis( void ); -void bli_finalize_apis( void ); +BLIS_EXPORT_BLIS void bli_init_apis( void ); +BLIS_EXPORT_BLIS void bli_finalize_apis( void ); -void bli_init_once( void ); -void bli_finalize_once( void ); +BLIS_EXPORT_BLIS void bli_init_once( void ); +BLIS_EXPORT_BLIS void bli_finalize_once( void ); diff --git a/frame/base/bli_machval.c b/frame/base/bli_machval.c index e26c5a4d8..495d20b01 100644 --- a/frame/base/bli_machval.c +++ b/frame/base/bli_machval.c @@ -72,7 +72,7 @@ void bli_machval( machval_t mval, #undef GENTFUNCR #define GENTFUNCR( ctype_v, ctype_vr, chv, chvr, opname, varname ) \ \ -void PASTEMAC(chv,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(chv,opname) \ ( \ machval_t mval, \ void* v \ diff --git a/frame/base/bli_machval.h b/frame/base/bli_machval.h index 07606da3f..034af7505 100644 --- a/frame/base/bli_machval.h +++ b/frame/base/bli_machval.h @@ -39,7 +39,7 @@ // // Prototype object-based interface. // -void bli_machval( machval_t mval, +BLIS_EXPORT_BLIS void bli_machval( machval_t mval, obj_t* v ); @@ -49,7 +49,7 @@ void bli_machval( machval_t mval, #undef GENTPROTR #define GENTPROTR( ctype_v, ctype_vr, chv, chvr, opname ) \ \ -void PASTEMAC(chv,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(chv,opname) \ ( \ machval_t mval, \ void* v \ diff --git a/frame/base/bli_malloc.c b/frame/base/bli_malloc.c index 25ebeb1e0..f586e26f7 100644 --- a/frame/base/bli_malloc.c +++ b/frame/base/bli_malloc.c @@ -249,7 +249,7 @@ void bli_ffree_noalign // ----------------------------------------------------------------------------- -void bli_fmalloc_align_check +BLIS_EXPORT_BLIS void bli_fmalloc_align_check ( malloc_ft f, size_t size, diff --git a/frame/base/bli_malloc.h b/frame/base/bli_malloc.h index 4e4113bd9..6b57f2522 100644 --- a/frame/base/bli_malloc.h +++ b/frame/base/bli_malloc.h @@ -40,25 +40,25 @@ typedef void (*free_ft) ( void* p ); // ----------------------------------------------------------------------------- #if 0 -void* bli_malloc_pool( size_t size ); -void bli_free_pool( void* p ); +BLIS_EXPORT_BLIS void* bli_malloc_pool( size_t size ); +BLIS_EXPORT_BLIS void bli_free_pool( void* p ); #endif -void* bli_malloc_intl( size_t size ); -void* bli_calloc_intl( size_t size ); -void bli_free_intl( void* p ); +BLIS_EXPORT_BLIS void* bli_malloc_intl( size_t size ); +BLIS_EXPORT_BLIS void* bli_calloc_intl( size_t size ); +BLIS_EXPORT_BLIS void bli_free_intl( void* p ); -void* bli_malloc_user( size_t size ); -void bli_free_user( void* p ); +BLIS_EXPORT_BLIS void* bli_malloc_user( size_t size ); +BLIS_EXPORT_BLIS void bli_free_user( void* p ); // ----------------------------------------------------------------------------- -void* bli_fmalloc_align( malloc_ft f, size_t size, size_t align_size ); -void bli_ffree_align( free_ft f, void* p ); +BLIS_EXPORT_BLIS void* bli_fmalloc_align( malloc_ft f, size_t size, size_t align_size ); +BLIS_EXPORT_BLIS void bli_ffree_align( free_ft f, void* p ); -void* bli_fmalloc_noalign( malloc_ft f, size_t size ); -void bli_ffree_noalign( free_ft f, void* p ); +BLIS_EXPORT_BLIS void* bli_fmalloc_noalign( malloc_ft f, size_t size ); +BLIS_EXPORT_BLIS void bli_ffree_noalign( free_ft f, void* p ); -void bli_fmalloc_align_check( malloc_ft f, size_t size, size_t align_size ); -void bli_fmalloc_post_check( void* p ); +BLIS_EXPORT_BLIS void bli_fmalloc_align_check( malloc_ft f, size_t size, size_t align_size ); +BLIS_EXPORT_BLIS void bli_fmalloc_post_check( void* p ); diff --git a/frame/base/bli_mbool.h b/frame/base/bli_mbool.h index 4cd4a78fb..01d782549 100644 --- a/frame/base/bli_mbool.h +++ b/frame/base/bli_mbool.h @@ -50,7 +50,7 @@ static void bli_mbool_set_dt( bool_t val, num_t dt, mbool_t* mb ) // ----------------------------------------------------------------------------- -mbool_t* bli_mbool_create +BLIS_EXPORT_BLIS mbool_t* bli_mbool_create ( bool_t b_s, bool_t b_d, @@ -58,7 +58,7 @@ mbool_t* bli_mbool_create bool_t b_z ); -void bli_mbool_init +BLIS_EXPORT_BLIS void bli_mbool_init ( mbool_t* b, bool_t b_s, @@ -67,5 +67,5 @@ void bli_mbool_init bool_t b_z ); -void bli_mbool_free( mbool_t* b ); +BLIS_EXPORT_BLIS void bli_mbool_free( mbool_t* b ); diff --git a/frame/base/bli_membrk.h b/frame/base/bli_membrk.h index 4d00eae63..32bbbf0c4 100644 --- a/frame/base/bli_membrk.h +++ b/frame/base/bli_membrk.h @@ -102,18 +102,18 @@ static void bli_membrk_unlock( membrk_t* membrk ) // ----------------------------------------------------------------------------- -membrk_t* bli_membrk_query( void ); +BLIS_EXPORT_BLIS membrk_t* bli_membrk_query( void ); -void bli_membrk_init +BLIS_EXPORT_BLIS void bli_membrk_init ( cntx_t* cntx ); -void bli_membrk_finalize +BLIS_EXPORT_BLIS void bli_membrk_finalize ( void ); -void bli_membrk_acquire_m +BLIS_EXPORT_BLIS void bli_membrk_acquire_m ( rntm_t* rntm, siz_t req_size, @@ -121,18 +121,18 @@ void bli_membrk_acquire_m mem_t* mem ); -void bli_membrk_release +BLIS_EXPORT_BLIS void bli_membrk_release ( rntm_t* rntm, mem_t* mem ); -void bli_membrk_rntm_set_membrk +BLIS_EXPORT_BLIS void bli_membrk_rntm_set_membrk ( rntm_t* rntm ); -siz_t bli_membrk_pool_size +BLIS_EXPORT_BLIS siz_t bli_membrk_pool_size ( membrk_t* membrk, packbuf_t buf_type @@ -140,24 +140,24 @@ siz_t bli_membrk_pool_size // ---------------------------------------------------------------------------- -void bli_membrk_init_pools +BLIS_EXPORT_BLIS void bli_membrk_init_pools ( cntx_t* cntx, membrk_t* membrk ); -void bli_membrk_finalize_pools +BLIS_EXPORT_BLIS void bli_membrk_finalize_pools ( membrk_t* membrk ); -void bli_membrk_compute_pool_block_sizes +BLIS_EXPORT_BLIS void bli_membrk_compute_pool_block_sizes ( siz_t* bs_a, siz_t* bs_b, siz_t* bs_c, cntx_t* cntx ); -void bli_membrk_compute_pool_block_sizes_dt +BLIS_EXPORT_BLIS void bli_membrk_compute_pool_block_sizes_dt ( num_t dt, siz_t* bs_a, diff --git a/frame/base/bli_memsys.h b/frame/base/bli_memsys.h index 306819c03..e522355fe 100644 --- a/frame/base/bli_memsys.h +++ b/frame/base/bli_memsys.h @@ -39,8 +39,8 @@ // ----------------------------------------------------------------------------- -void bli_memsys_init( void ); -void bli_memsys_finalize( void ); +BLIS_EXPORT_BLIS void bli_memsys_init( void ); +BLIS_EXPORT_BLIS void bli_memsys_finalize( void ); #endif diff --git a/frame/base/bli_obj.h b/frame/base/bli_obj.h index 69f1aaa80..965f33f1a 100644 --- a/frame/base/bli_obj.h +++ b/frame/base/bli_obj.h @@ -34,7 +34,7 @@ #include "bli_obj_check.h" -void bli_obj_create +BLIS_EXPORT_BLIS void bli_obj_create ( num_t dt, dim_t m, @@ -44,7 +44,7 @@ void bli_obj_create obj_t* obj ); -void bli_obj_create_with_attached_buffer +BLIS_EXPORT_BLIS void bli_obj_create_with_attached_buffer ( num_t dt, dim_t m, @@ -55,7 +55,7 @@ void bli_obj_create_with_attached_buffer obj_t* obj ); -void bli_obj_create_without_buffer +BLIS_EXPORT_BLIS void bli_obj_create_without_buffer ( num_t dt, dim_t m, @@ -63,7 +63,7 @@ void bli_obj_create_without_buffer obj_t* obj ); -void bli_obj_alloc_buffer +BLIS_EXPORT_BLIS void bli_obj_alloc_buffer ( inc_t rs, inc_t cs, @@ -71,7 +71,7 @@ void bli_obj_alloc_buffer obj_t* obj ); -void bli_obj_attach_buffer +BLIS_EXPORT_BLIS void bli_obj_attach_buffer ( void* p, inc_t rs, @@ -80,31 +80,31 @@ void bli_obj_attach_buffer obj_t* obj ); -void bli_obj_create_1x1 +BLIS_EXPORT_BLIS void bli_obj_create_1x1 ( num_t dt, obj_t* obj ); -void bli_obj_create_1x1_with_attached_buffer +BLIS_EXPORT_BLIS void bli_obj_create_1x1_with_attached_buffer ( num_t dt, void* p, obj_t* obj ); -void bli_obj_create_conf_to +BLIS_EXPORT_BLIS void bli_obj_create_conf_to ( obj_t* s, obj_t* d ); -void bli_obj_free +BLIS_EXPORT_BLIS void bli_obj_free ( obj_t* obj ); -void bli_adjust_strides +BLIS_EXPORT_BLIS void bli_adjust_strides ( dim_t m, dim_t n, @@ -114,36 +114,36 @@ void bli_adjust_strides inc_t* is ); -siz_t bli_dt_size +BLIS_EXPORT_BLIS siz_t bli_dt_size ( num_t dt ); -char* bli_dt_string +BLIS_EXPORT_BLIS char* bli_dt_string ( num_t dt ); -dim_t bli_align_dim_to_mult +BLIS_EXPORT_BLIS dim_t bli_align_dim_to_mult ( dim_t dim, dim_t dim_mult ); -dim_t bli_align_dim_to_size +BLIS_EXPORT_BLIS dim_t bli_align_dim_to_size ( dim_t dim, siz_t elem_size, siz_t align_size ); -dim_t bli_align_ptr_to_size +BLIS_EXPORT_BLIS dim_t bli_align_ptr_to_size ( void* p, size_t align_size ); -void bli_obj_print +BLIS_EXPORT_BLIS void bli_obj_print ( char* label, obj_t* obj diff --git a/frame/base/bli_obj_scalar.h b/frame/base/bli_obj_scalar.h index ba890d5b7..f655ff46e 100644 --- a/frame/base/bli_obj_scalar.h +++ b/frame/base/bli_obj_scalar.h @@ -32,13 +32,13 @@ */ -void bli_obj_scalar_init_detached +BLIS_EXPORT_BLIS void bli_obj_scalar_init_detached ( num_t dt, obj_t* beta ); -void bli_obj_scalar_init_detached_copy_of +BLIS_EXPORT_BLIS void bli_obj_scalar_init_detached_copy_of ( num_t dt, conj_t conj, @@ -46,42 +46,42 @@ void bli_obj_scalar_init_detached_copy_of obj_t* beta ); -void bli_obj_scalar_detach +BLIS_EXPORT_BLIS void bli_obj_scalar_detach ( obj_t* a, obj_t* alpha ); -void bli_obj_scalar_attach +BLIS_EXPORT_BLIS void bli_obj_scalar_attach ( conj_t conj, obj_t* alpha, obj_t* a ); -void bli_obj_scalar_cast_to +BLIS_EXPORT_BLIS void bli_obj_scalar_cast_to ( num_t dt, obj_t* a ); -void bli_obj_scalar_apply_scalar +BLIS_EXPORT_BLIS void bli_obj_scalar_apply_scalar ( obj_t* alpha, obj_t* a ); -void bli_obj_scalar_reset +BLIS_EXPORT_BLIS void bli_obj_scalar_reset ( obj_t* a ); -bool_t bli_obj_scalar_has_nonzero_imag +BLIS_EXPORT_BLIS bool_t bli_obj_scalar_has_nonzero_imag ( obj_t* a ); -bool_t bli_obj_scalar_equals +BLIS_EXPORT_BLIS bool_t bli_obj_scalar_equals ( obj_t* a, obj_t* beta diff --git a/frame/base/bli_param_map.h b/frame/base/bli_param_map.h index 829fe808c..9a9601f91 100644 --- a/frame/base/bli_param_map.h +++ b/frame/base/bli_param_map.h @@ -35,37 +35,37 @@ // --- BLIS to BLAS/LAPACK mappings -------------------------------------------- -void bli_param_map_blis_to_netlib_side( side_t side, char* blas_side ); -void bli_param_map_blis_to_netlib_uplo( uplo_t uplo, char* blas_uplo ); -void bli_param_map_blis_to_netlib_trans( trans_t trans, char* blas_trans ); -void bli_param_map_blis_to_netlib_diag( diag_t diag, char* blas_diag ); -void bli_param_map_blis_to_netlib_machval( machval_t machval, char* blas_machval ); +BLIS_EXPORT_BLIS void bli_param_map_blis_to_netlib_side( side_t side, char* blas_side ); +BLIS_EXPORT_BLIS void bli_param_map_blis_to_netlib_uplo( uplo_t uplo, char* blas_uplo ); +BLIS_EXPORT_BLIS void bli_param_map_blis_to_netlib_trans( trans_t trans, char* blas_trans ); +BLIS_EXPORT_BLIS void bli_param_map_blis_to_netlib_diag( diag_t diag, char* blas_diag ); +BLIS_EXPORT_BLIS void bli_param_map_blis_to_netlib_machval( machval_t machval, char* blas_machval ); // --- BLAS/LAPACK to BLIS mappings -------------------------------------------- -void bli_param_map_netlib_to_blis_side( char side, side_t* blis_side ); -void bli_param_map_netlib_to_blis_uplo( char uplo, uplo_t* blis_uplo ); -void bli_param_map_netlib_to_blis_trans( char trans, trans_t* blis_trans ); -void bli_param_map_netlib_to_blis_diag( char diag, diag_t* blis_diag ); +BLIS_EXPORT_BLIS void bli_param_map_netlib_to_blis_side( char side, side_t* blis_side ); +BLIS_EXPORT_BLIS void bli_param_map_netlib_to_blis_uplo( char uplo, uplo_t* blis_uplo ); +BLIS_EXPORT_BLIS void bli_param_map_netlib_to_blis_trans( char trans, trans_t* blis_trans ); +BLIS_EXPORT_BLIS void bli_param_map_netlib_to_blis_diag( char diag, diag_t* blis_diag ); // --- BLIS char to BLIS mappings ---------------------------------------------- -void bli_param_map_char_to_blis_side( char side, side_t* blis_side ); -void bli_param_map_char_to_blis_uplo( char uplo, uplo_t* blis_uplo ); -void bli_param_map_char_to_blis_trans( char trans, trans_t* blis_trans ); -void bli_param_map_char_to_blis_conj( char conj, conj_t* blis_conj ); -void bli_param_map_char_to_blis_diag( char diag, diag_t* blis_diag ); -void bli_param_map_char_to_blis_dt( char dt, num_t* blis_dt ); +BLIS_EXPORT_BLIS void bli_param_map_char_to_blis_side( char side, side_t* blis_side ); +BLIS_EXPORT_BLIS void bli_param_map_char_to_blis_uplo( char uplo, uplo_t* blis_uplo ); +BLIS_EXPORT_BLIS void bli_param_map_char_to_blis_trans( char trans, trans_t* blis_trans ); +BLIS_EXPORT_BLIS void bli_param_map_char_to_blis_conj( char conj, conj_t* blis_conj ); +BLIS_EXPORT_BLIS void bli_param_map_char_to_blis_diag( char diag, diag_t* blis_diag ); +BLIS_EXPORT_BLIS void bli_param_map_char_to_blis_dt( char dt, num_t* blis_dt ); // --- BLIS to BLIS char mappings ---------------------------------------------- -void bli_param_map_blis_to_char_side( side_t blis_side, char* side ); -void bli_param_map_blis_to_char_uplo( uplo_t blis_uplo, char* uplo ); -void bli_param_map_blis_to_char_trans( trans_t blis_trans, char* trans ); -void bli_param_map_blis_to_char_conj( conj_t blis_conj, char* conj ); -void bli_param_map_blis_to_char_diag( diag_t blis_diag, char* diag ); -void bli_param_map_blis_to_char_dt( num_t blis_dt, char* dt ); +BLIS_EXPORT_BLIS void bli_param_map_blis_to_char_side( side_t blis_side, char* side ); +BLIS_EXPORT_BLIS void bli_param_map_blis_to_char_uplo( uplo_t blis_uplo, char* uplo ); +BLIS_EXPORT_BLIS void bli_param_map_blis_to_char_trans( trans_t blis_trans, char* trans ); +BLIS_EXPORT_BLIS void bli_param_map_blis_to_char_conj( conj_t blis_conj, char* conj ); +BLIS_EXPORT_BLIS void bli_param_map_blis_to_char_diag( diag_t blis_diag, char* diag ); +BLIS_EXPORT_BLIS void bli_param_map_blis_to_char_dt( num_t blis_dt, char* dt ); diff --git a/frame/base/bli_part.h b/frame/base/bli_part.h index 4247f248b..2d0dfb3d5 100644 --- a/frame/base/bli_part.h +++ b/frame/base/bli_part.h @@ -36,7 +36,7 @@ // -- Matrix partitioning ------------------------------------------------------ -void bli_acquire_mpart +BLIS_EXPORT_BLIS void bli_acquire_mpart ( dim_t i, dim_t j, @@ -49,7 +49,7 @@ void bli_acquire_mpart #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC0( opname ) \ +BLIS_EXPORT_BLIS void PASTEMAC0( opname ) \ ( \ dir_t direct, \ subpart_t req_part, \ @@ -65,7 +65,7 @@ GENPROT( acquire_mpart_ndim ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC0( opname ) \ +BLIS_EXPORT_BLIS void PASTEMAC0( opname ) \ ( \ subpart_t req_part, \ dim_t i, \ @@ -88,7 +88,7 @@ GENPROT( acquire_vpart_b2f ) // -- Scalar acquisition ------------------------------------------------------- -void bli_acquire_mij +BLIS_EXPORT_BLIS void bli_acquire_mij ( dim_t i, dim_t j, @@ -96,7 +96,7 @@ void bli_acquire_mij obj_t* sub_obj ); -void bli_acquire_vi +BLIS_EXPORT_BLIS void bli_acquire_vi ( dim_t i, obj_t* obj, diff --git a/frame/base/bli_pool.h b/frame/base/bli_pool.h index 0d39fd7d3..7f460df25 100644 --- a/frame/base/bli_pool.h +++ b/frame/base/bli_pool.h @@ -191,7 +191,7 @@ static void bli_pool_set_top_index( siz_t top_index, pool_t* pool ) \ // ----------------------------------------------------------------------------- -void bli_pool_init +BLIS_EXPORT_BLIS void bli_pool_init ( siz_t num_blocks, siz_t block_ptrs_len, @@ -201,11 +201,11 @@ void bli_pool_init free_ft free_fp, pool_t* restrict pool ); -void bli_pool_finalize +BLIS_EXPORT_BLIS void bli_pool_finalize ( pool_t* restrict pool ); -void bli_pool_reinit +BLIS_EXPORT_BLIS void bli_pool_reinit ( siz_t num_blocks_new, siz_t block_ptrs_len_new, @@ -214,47 +214,47 @@ void bli_pool_reinit pool_t* restrict pool ); -void bli_pool_checkout_block +BLIS_EXPORT_BLIS void bli_pool_checkout_block ( siz_t req_size, pblk_t* restrict block, pool_t* restrict pool ); -void bli_pool_checkin_block +BLIS_EXPORT_BLIS void bli_pool_checkin_block ( pblk_t* restrict block, pool_t* restrict pool ); -void bli_pool_grow +BLIS_EXPORT_BLIS void bli_pool_grow ( siz_t num_blocks_add, pool_t* restrict pool ); -void bli_pool_shrink +BLIS_EXPORT_BLIS void bli_pool_shrink ( siz_t num_blocks_sub, pool_t* restrict pool ); -void bli_pool_alloc_block +BLIS_EXPORT_BLIS void bli_pool_alloc_block ( siz_t block_size, siz_t align_size, malloc_ft malloc_fp, pblk_t* restrict block ); -void bli_pool_free_block +BLIS_EXPORT_BLIS void bli_pool_free_block ( free_ft free_fp, pblk_t* restrict block ); -void bli_pool_print +BLIS_EXPORT_BLIS void bli_pool_print ( pool_t* restrict pool ); -void bli_pblk_print +BLIS_EXPORT_BLIS void bli_pblk_print ( pblk_t* restrict pblk ); diff --git a/frame/base/bli_prune.h b/frame/base/bli_prune.h index 318096707..1fdb6b5ae 100644 --- a/frame/base/bli_prune.h +++ b/frame/base/bli_prune.h @@ -32,5 +32,5 @@ */ -void bli_prune_unref_mparts( obj_t* p, mdim_t mdim_p, +BLIS_EXPORT_BLIS void bli_prune_unref_mparts( obj_t* p, mdim_t mdim_p, obj_t* s, mdim_t mdim_s ); diff --git a/frame/base/bli_query.h b/frame/base/bli_query.h index 94274f1cd..fa4045b50 100644 --- a/frame/base/bli_query.h +++ b/frame/base/bli_query.h @@ -32,10 +32,10 @@ */ -bool_t bli_obj_equals( obj_t* a, +BLIS_EXPORT_BLIS bool_t bli_obj_equals( obj_t* a, obj_t* b ); -bool_t bli_obj_imag_equals( obj_t* a, +BLIS_EXPORT_BLIS bool_t bli_obj_imag_equals( obj_t* a, obj_t* b ); -bool_t bli_obj_imag_is_zero( obj_t* a ); +BLIS_EXPORT_BLIS bool_t bli_obj_imag_is_zero( obj_t* a ); diff --git a/frame/base/bli_rntm.h b/frame/base/bli_rntm.h index f33c25e36..18aae5572 100644 --- a/frame/base/bli_rntm.h +++ b/frame/base/bli_rntm.h @@ -239,7 +239,7 @@ static void bli_rntm_init( rntm_t* rntm ) // Function prototypes -void bli_rntm_set_ways_for_op +BLIS_EXPORT_BLIS void bli_rntm_set_ways_for_op ( opid_t l3_op, side_t side, @@ -249,7 +249,7 @@ void bli_rntm_set_ways_for_op rntm_t* rntm ); -void bli_rntm_set_ways_from_rntm +BLIS_EXPORT_BLIS void bli_rntm_set_ways_from_rntm ( dim_t m, dim_t n, @@ -257,7 +257,7 @@ void bli_rntm_set_ways_from_rntm rntm_t* rntm ); -void bli_rntm_print +BLIS_EXPORT_BLIS void bli_rntm_print ( rntm_t* rntm ); diff --git a/frame/base/bli_sba.h b/frame/base/bli_sba.h index cf10834e3..76e2e7f8d 100644 --- a/frame/base/bli_sba.h +++ b/frame/base/bli_sba.h @@ -35,36 +35,36 @@ #ifndef BLIS_SBA_H #define BLIS_SBA_H -apool_t* bli_sba_query( void ); +BLIS_EXPORT_BLIS apool_t* bli_sba_query( void ); // ----------------------------------------------------------------------------- -void bli_sba_init( void ); -void bli_sba_finalize( void ); +BLIS_EXPORT_BLIS void bli_sba_init( void ); +BLIS_EXPORT_BLIS void bli_sba_finalize( void ); -array_t* bli_sba_checkout_array +BLIS_EXPORT_BLIS array_t* bli_sba_checkout_array ( const siz_t n_threads ); -void bli_sba_checkin_array +BLIS_EXPORT_BLIS void bli_sba_checkin_array ( array_t* restrict array ); -void bli_sba_rntm_set_pool +BLIS_EXPORT_BLIS void bli_sba_rntm_set_pool ( siz_t index, array_t* restrict array, rntm_t* restrict rntm ); -void* bli_sba_acquire +BLIS_EXPORT_BLIS void* bli_sba_acquire ( rntm_t* restrict rntm, siz_t req_size ); -void bli_sba_release +BLIS_EXPORT_BLIS void bli_sba_release ( rntm_t* restrict rntm, void* restrict block diff --git a/frame/base/bli_setgetij.c b/frame/base/bli_setgetij.c index 744e24c27..0830b8ae8 100644 --- a/frame/base/bli_setgetij.c +++ b/frame/base/bli_setgetij.c @@ -88,7 +88,7 @@ err_t bli_setijm #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ double ar, \ double ai, \ @@ -182,7 +182,7 @@ err_t bli_getijm #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ dim_t i, \ dim_t j, \ diff --git a/frame/base/bli_setgetij.h b/frame/base/bli_setgetij.h index 9478bd76d..55ce0ee11 100644 --- a/frame/base/bli_setgetij.h +++ b/frame/base/bli_setgetij.h @@ -32,7 +32,7 @@ */ -err_t bli_setijm +BLIS_EXPORT_BLIS err_t bli_setijm ( double ar, double ai, @@ -44,7 +44,7 @@ err_t bli_setijm #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ double ar, \ double ai, \ @@ -57,7 +57,7 @@ INSERT_GENTPROT_BASIC0( setijm ) // ----------------------------------------------------------------------------- -err_t bli_getijm +BLIS_EXPORT_BLIS err_t bli_getijm ( dim_t i, dim_t j, @@ -69,7 +69,7 @@ err_t bli_getijm #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ dim_t i, \ dim_t j, \ diff --git a/frame/base/bli_setri.h b/frame/base/bli_setri.h index 1e124f419..dd6ce9f3f 100644 --- a/frame/base/bli_setri.h +++ b/frame/base/bli_setri.h @@ -34,13 +34,13 @@ // -- setr --------------------------------------------------------------------- -void bli_setrm +BLIS_EXPORT_BLIS void bli_setrm ( obj_t* alpha, obj_t* b ); -void bli_setrv +BLIS_EXPORT_BLIS void bli_setrv ( obj_t* alpha, obj_t* x @@ -48,13 +48,13 @@ void bli_setrv // -- seti --------------------------------------------------------------------- -void bli_setim +BLIS_EXPORT_BLIS void bli_setim ( obj_t* alpha, obj_t* b ); -void bli_setiv +BLIS_EXPORT_BLIS void bli_setiv ( obj_t* alpha, obj_t* x diff --git a/frame/base/bli_string.h b/frame/base/bli_string.h index 426038051..54cf3c7f6 100644 --- a/frame/base/bli_string.h +++ b/frame/base/bli_string.h @@ -32,4 +32,4 @@ */ -void bli_string_mkupper( char* s ); +BLIS_EXPORT_BLIS void bli_string_mkupper( char* s ); diff --git a/frame/base/bli_winsys.h b/frame/base/bli_winsys.h index 0ad7c408c..0c71114ad 100644 --- a/frame/base/bli_winsys.h +++ b/frame/base/bli_winsys.h @@ -33,5 +33,5 @@ */ //int bli_setenv( const char *name, const char *value, int overwrite ); -void bli_sleep( unsigned int secs ); +BLIS_EXPORT_BLIS void bli_sleep( unsigned int secs ); diff --git a/frame/base/cast/bli_castm.c b/frame/base/cast/bli_castm.c index 64db75d24..0e04dc175 100644 --- a/frame/base/cast/bli_castm.c +++ b/frame/base/cast/bli_castm.c @@ -54,7 +54,7 @@ static FUNCPTR_T GENARRAY2_ALL(ftypes,castm); // Define object-based interface. // -void bli_castm +BLIS_EXPORT_BLIS void bli_castm ( obj_t* a, obj_t* b @@ -115,7 +115,7 @@ void bli_castm #undef GENTFUNC2 #define GENTFUNC2( ctype_a, ctype_b, cha, chb, opname ) \ \ -void PASTEMAC2(cha,chb,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC2(cha,chb,opname) \ ( \ trans_t transa, \ dim_t m, \ @@ -219,7 +219,7 @@ INSERT_GENTFUNC2_MIXDP0( castm ) // Define object-based _check() function. // -void bli_castm_check +BLIS_EXPORT_BLIS void bli_castm_check ( obj_t* a, obj_t* b diff --git a/frame/base/cast/bli_castm.h b/frame/base/cast/bli_castm.h index 5ab13544b..ecc5d4655 100644 --- a/frame/base/cast/bli_castm.h +++ b/frame/base/cast/bli_castm.h @@ -36,7 +36,7 @@ // Prototype object-based interface. // -void bli_castm +BLIS_EXPORT_BLIS void bli_castm ( obj_t* a, obj_t* b @@ -49,7 +49,7 @@ void bli_castm #undef GENTPROT2 #define GENTPROT2( ctype_a, ctype_b, cha, chb, opname ) \ \ -void PASTEMAC2(cha,chb,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC2(cha,chb,opname) \ ( \ trans_t transa, \ dim_t m, \ @@ -65,7 +65,7 @@ INSERT_GENTPROT2_MIXDP0( castm ) // Prototype object-based _check() function. // -void bli_castm_check +BLIS_EXPORT_BLIS void bli_castm_check ( obj_t* a, obj_t* b diff --git a/frame/base/cast/bli_castnzm.c b/frame/base/cast/bli_castnzm.c index a50bdfc15..04b04e147 100644 --- a/frame/base/cast/bli_castnzm.c +++ b/frame/base/cast/bli_castnzm.c @@ -54,7 +54,7 @@ static FUNCPTR_T GENARRAY2_ALL(ftypes,castnzm); // Define object-based interface. // -void bli_castnzm +BLIS_EXPORT_BLIS void bli_castnzm ( obj_t* a, obj_t* b @@ -115,7 +115,7 @@ void bli_castnzm #undef GENTFUNC2 #define GENTFUNC2( ctype_a, ctype_b, cha, chb, opname ) \ \ -void PASTEMAC2(cha,chb,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC2(cha,chb,opname) \ ( \ trans_t transa, \ dim_t m, \ @@ -219,7 +219,7 @@ INSERT_GENTFUNC2_MIXDP0( castnzm ) // Define object-based _check() function. // -void bli_castnzm_check +BLIS_EXPORT_BLIS void bli_castnzm_check ( obj_t* a, obj_t* b diff --git a/frame/base/cast/bli_castnzm.h b/frame/base/cast/bli_castnzm.h index e4e1b1cad..bfc062485 100644 --- a/frame/base/cast/bli_castnzm.h +++ b/frame/base/cast/bli_castnzm.h @@ -36,7 +36,7 @@ // Prototype object-based interface. // -void bli_castnzm +BLIS_EXPORT_BLIS void bli_castnzm ( obj_t* a, obj_t* b @@ -49,7 +49,7 @@ void bli_castnzm #undef GENTPROT2 #define GENTPROT2( ctype_a, ctype_b, cha, chb, opname ) \ \ -void PASTEMAC2(cha,chb,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC2(cha,chb,opname) \ ( \ trans_t transa, \ dim_t m, \ @@ -65,7 +65,7 @@ INSERT_GENTPROT2_MIXDP0( castnzm ) // Prototype object-based _check() function. // -void bli_castnzm_check +BLIS_EXPORT_BLIS void bli_castnzm_check ( obj_t* a, obj_t* b diff --git a/frame/base/cast/bli_castv.c b/frame/base/cast/bli_castv.c index 213c960d8..f07617ac8 100644 --- a/frame/base/cast/bli_castv.c +++ b/frame/base/cast/bli_castv.c @@ -53,7 +53,7 @@ static FUNCPTR_T GENARRAY2_ALL(ftypes,castv); // Define object-based interface. // -void bli_castv +BLIS_EXPORT_BLIS void bli_castv ( obj_t* x, obj_t* y @@ -110,7 +110,7 @@ void bli_castv #undef GENTFUNC2 #define GENTFUNC2( ctype_x, ctype_y, chx, chy, opname ) \ \ -void PASTEMAC2(chx,chy,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC2(chx,chy,opname) \ ( \ conj_t conjx, \ dim_t n, \ @@ -173,7 +173,7 @@ INSERT_GENTFUNC2_MIXDP0( castv ) // Define object-based _check() function. // -void bli_castv_check +BLIS_EXPORT_BLIS void bli_castv_check ( obj_t* x, obj_t* y diff --git a/frame/base/cast/bli_castv.h b/frame/base/cast/bli_castv.h index eeb376a89..712b83ee9 100644 --- a/frame/base/cast/bli_castv.h +++ b/frame/base/cast/bli_castv.h @@ -36,7 +36,7 @@ // Prototype object-based interface. // -void bli_castv +BLIS_EXPORT_BLIS void bli_castv ( obj_t* x, obj_t* y @@ -49,7 +49,7 @@ void bli_castv #undef GENTPROT2 #define GENTPROT2( ctype_x, ctype_y, chx, chy, opname ) \ \ -void PASTEMAC2(chx,chy,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC2(chx,chy,opname) \ ( \ conj_t conjx, \ dim_t n, \ @@ -64,7 +64,7 @@ INSERT_GENTPROT2_MIXDP0( castv ) // Prototype object-based _check() function. // -void bli_castv_check +BLIS_EXPORT_BLIS void bli_castv_check ( obj_t* x, obj_t* y diff --git a/frame/base/cast/old/bli_cast_check.c b/frame/base/cast/old/bli_cast_check.c index b1184c8e4..7b2610a92 100644 --- a/frame/base/cast/old/bli_cast_check.c +++ b/frame/base/cast/old/bli_cast_check.c @@ -34,7 +34,7 @@ #include "blis.h" -void bli_castm_check +BLIS_EXPORT_BLIS void bli_castm_check ( obj_t* a, obj_t* b @@ -80,7 +80,7 @@ void bli_castm_check bli_check_error_code( e_val ); } -void bli_castv_check +BLIS_EXPORT_BLIS void bli_castv_check ( obj_t* x, obj_t* y diff --git a/frame/base/cast/old/bli_cast_check.h b/frame/base/cast/old/bli_cast_check.h index e963c4cfc..7b805cfce 100644 --- a/frame/base/cast/old/bli_cast_check.h +++ b/frame/base/cast/old/bli_cast_check.h @@ -32,13 +32,13 @@ */ -void bli_castm_check +BLIS_EXPORT_BLIS void bli_castm_check ( obj_t* a, obj_t* b ); -void bli_castv_check +BLIS_EXPORT_BLIS void bli_castv_check ( obj_t* x, obj_t* y diff --git a/frame/base/check/bli_obj_check.c b/frame/base/check/bli_obj_check.c index a971fa19a..0f1e86f40 100644 --- a/frame/base/check/bli_obj_check.c +++ b/frame/base/check/bli_obj_check.c @@ -34,7 +34,7 @@ #include "blis.h" -void bli_obj_create_check( num_t dt, +BLIS_EXPORT_BLIS void bli_obj_create_check( num_t dt, dim_t m, dim_t n, inc_t rs, @@ -53,7 +53,7 @@ void bli_obj_create_check( num_t dt, bli_check_error_code( e_val ); } -void bli_obj_create_without_buffer_check( num_t dt, +BLIS_EXPORT_BLIS void bli_obj_create_without_buffer_check( num_t dt, dim_t m, dim_t n, obj_t* obj ) @@ -67,7 +67,7 @@ void bli_obj_create_without_buffer_check( num_t dt, bli_check_error_code( e_val ); } -void bli_obj_alloc_buffer_check( inc_t rs, +BLIS_EXPORT_BLIS void bli_obj_alloc_buffer_check( inc_t rs, inc_t cs, inc_t is, obj_t* obj ) @@ -83,7 +83,7 @@ void bli_obj_alloc_buffer_check( inc_t rs, bli_check_error_code( e_val ); } -void bli_obj_attach_buffer_check( void* p, +BLIS_EXPORT_BLIS void bli_obj_attach_buffer_check( void* p, inc_t rs, inc_t cs, inc_t is, @@ -109,7 +109,7 @@ void bli_obj_attach_buffer_check( void* p, bli_check_error_code( e_val ); } -void bli_obj_create_scalar_check( num_t dt, +BLIS_EXPORT_BLIS void bli_obj_create_scalar_check( num_t dt, obj_t* obj ) { err_t e_val; @@ -121,7 +121,7 @@ void bli_obj_create_scalar_check( num_t dt, bli_check_error_code( e_val ); } -void bli_obj_free_check( obj_t* obj ) +BLIS_EXPORT_BLIS void bli_obj_free_check( obj_t* obj ) { //err_t e_val; @@ -131,7 +131,7 @@ void bli_obj_free_check( obj_t* obj ) //bli_check_error_code( e_val ); } -void bli_obj_create_const_check( double value, obj_t* obj ) +BLIS_EXPORT_BLIS void bli_obj_create_const_check( double value, obj_t* obj ) { err_t e_val; @@ -158,7 +158,7 @@ void bli_obj_create_const_copy_of_check( obj_t* a, obj_t* b ) } #endif -void bli_dt_size_check( num_t dt ) +BLIS_EXPORT_BLIS void bli_dt_size_check( num_t dt ) { err_t e_val; @@ -166,7 +166,7 @@ void bli_dt_size_check( num_t dt ) bli_check_error_code( e_val ); } -void bli_dt_string_check( num_t dt ) +BLIS_EXPORT_BLIS void bli_dt_string_check( num_t dt ) { err_t e_val; @@ -174,7 +174,7 @@ void bli_dt_string_check( num_t dt ) bli_check_error_code( e_val ); } -void bli_dt_union_check( num_t dt1, num_t dt2 ) +BLIS_EXPORT_BLIS void bli_dt_union_check( num_t dt1, num_t dt2 ) { err_t e_val; @@ -185,7 +185,7 @@ void bli_dt_union_check( num_t dt1, num_t dt2 ) bli_check_error_code( e_val ); } -void bli_obj_print_check( char* label, obj_t* obj ) +BLIS_EXPORT_BLIS void bli_obj_print_check( char* label, obj_t* obj ) { err_t e_val; diff --git a/frame/base/check/bli_obj_check.h b/frame/base/check/bli_obj_check.h index 201842844..48baa4a0e 100644 --- a/frame/base/check/bli_obj_check.h +++ b/frame/base/check/bli_obj_check.h @@ -32,43 +32,43 @@ */ -void bli_obj_create_check( num_t dt, +BLIS_EXPORT_BLIS void bli_obj_create_check( num_t dt, dim_t m, dim_t n, inc_t rs, inc_t cs, obj_t* obj ); -void bli_obj_create_without_buffer_check( num_t dt, +BLIS_EXPORT_BLIS void bli_obj_create_without_buffer_check( num_t dt, dim_t m, dim_t n, obj_t* obj ); -void bli_obj_alloc_buffer_check( inc_t rs, +BLIS_EXPORT_BLIS void bli_obj_alloc_buffer_check( inc_t rs, inc_t cs, inc_t is, obj_t* obj ); -void bli_obj_attach_buffer_check( void* p, +BLIS_EXPORT_BLIS void bli_obj_attach_buffer_check( void* p, inc_t rs, inc_t cs, inc_t is, obj_t* obj ); -void bli_obj_create_scalar_check( num_t dt, +BLIS_EXPORT_BLIS void bli_obj_create_scalar_check( num_t dt, obj_t* obj ); -void bli_obj_free_check( obj_t* obj ); +BLIS_EXPORT_BLIS void bli_obj_free_check( obj_t* obj ); -void bli_obj_create_const_check( double value, obj_t* obj ); +BLIS_EXPORT_BLIS void bli_obj_create_const_check( double value, obj_t* obj ); -void bli_obj_create_const_copy_of_check( obj_t* a, obj_t* b ); +BLIS_EXPORT_BLIS void bli_obj_create_const_copy_of_check( obj_t* a, obj_t* b ); -void bli_dt_size_check( num_t dt ); +BLIS_EXPORT_BLIS void bli_dt_size_check( num_t dt ); -void bli_dt_string_check( num_t dt ); +BLIS_EXPORT_BLIS void bli_dt_string_check( num_t dt ); -void bli_dt_union_check( num_t dt1, num_t dt2 ); +BLIS_EXPORT_BLIS void bli_dt_union_check( num_t dt1, num_t dt2 ); -void bli_obj_print_check( char* label, obj_t* obj ); +BLIS_EXPORT_BLIS void bli_obj_print_check( char* label, obj_t* obj ); diff --git a/frame/base/check/bli_part_check.c b/frame/base/check/bli_part_check.c index 6d9aa37b9..a50a1705d 100644 --- a/frame/base/check/bli_part_check.c +++ b/frame/base/check/bli_part_check.c @@ -34,7 +34,7 @@ #include "blis.h" -void bli_acquire_mpart_t2b_check( subpart_t requested_part, +BLIS_EXPORT_BLIS void bli_acquire_mpart_t2b_check( subpart_t requested_part, dim_t i, dim_t b, obj_t* obj, @@ -52,7 +52,7 @@ void bli_acquire_mpart_t2b_check( subpart_t requested_part, bli_check_error_code( e_val ); } -void bli_acquire_mpart_l2r_check( subpart_t requested_part, +BLIS_EXPORT_BLIS void bli_acquire_mpart_l2r_check( subpart_t requested_part, dim_t j, dim_t b, obj_t* obj, @@ -70,7 +70,7 @@ void bli_acquire_mpart_l2r_check( subpart_t requested_part, bli_check_error_code( e_val ); } -void bli_acquire_mpart_tl2br_check( subpart_t requested_part, +BLIS_EXPORT_BLIS void bli_acquire_mpart_tl2br_check( subpart_t requested_part, dim_t ij, dim_t b, obj_t* obj, diff --git a/frame/base/check/bli_part_check.h b/frame/base/check/bli_part_check.h index 2905af0e4..b0e724db1 100644 --- a/frame/base/check/bli_part_check.h +++ b/frame/base/check/bli_part_check.h @@ -32,19 +32,19 @@ */ -void bli_acquire_mpart_t2b_check( subpart_t requested_part, +BLIS_EXPORT_BLIS void bli_acquire_mpart_t2b_check( subpart_t requested_part, dim_t i, dim_t b, obj_t* obj, obj_t* sub_obj ); -void bli_acquire_mpart_l2r_check( subpart_t requested_part, +BLIS_EXPORT_BLIS void bli_acquire_mpart_l2r_check( subpart_t requested_part, dim_t j, dim_t b, obj_t* obj, obj_t* sub_obj ); -void bli_acquire_mpart_tl2br_check( subpart_t requested_part, +BLIS_EXPORT_BLIS void bli_acquire_mpart_tl2br_check( subpart_t requested_part, dim_t ij, dim_t b, obj_t* obj, diff --git a/frame/base/noopt/bli_dlamch.h b/frame/base/noopt/bli_dlamch.h index a3fcdb1b3..e23883c7e 100644 --- a/frame/base/noopt/bli_dlamch.h +++ b/frame/base/noopt/bli_dlamch.h @@ -32,4 +32,4 @@ */ -bla_double bli_dlamch( bla_character* cmach, ftnlen cmach_len ); +BLIS_EXPORT_BLIS bla_double bli_dlamch( bla_character* cmach, ftnlen cmach_len ); diff --git a/frame/base/noopt/bli_lsame.h b/frame/base/noopt/bli_lsame.h index 8968ab8b0..9f85f3c51 100644 --- a/frame/base/noopt/bli_lsame.h +++ b/frame/base/noopt/bli_lsame.h @@ -32,4 +32,4 @@ */ -bla_logical bli_lsame( bla_character* ca, bla_character* cb, ftnlen ca_len, ftnlen cb_len ); +BLIS_EXPORT_BLIS bla_logical bli_lsame( bla_character* ca, bla_character* cb, ftnlen ca_len, ftnlen cb_len ); diff --git a/frame/base/noopt/bli_slamch.h b/frame/base/noopt/bli_slamch.h index 0e041c8d8..eee97d453 100644 --- a/frame/base/noopt/bli_slamch.h +++ b/frame/base/noopt/bli_slamch.h @@ -32,4 +32,4 @@ */ -bla_real bli_slamch( bla_character* cmach, ftnlen cmach_len ); +BLIS_EXPORT_BLIS bla_real bli_slamch( bla_character* cmach, ftnlen cmach_len ); diff --git a/frame/base/proj/bli_projm.c b/frame/base/proj/bli_projm.c index 949bc2cc9..2e458cbcd 100644 --- a/frame/base/proj/bli_projm.c +++ b/frame/base/proj/bli_projm.c @@ -34,7 +34,7 @@ #include "blis.h" -void bli_projm +BLIS_EXPORT_BLIS void bli_projm ( obj_t* a, obj_t* b @@ -86,7 +86,7 @@ void bli_projm // ----------------------------------------------------------------------------- -void bli_projm_check +BLIS_EXPORT_BLIS void bli_projm_check ( obj_t* a, obj_t* b diff --git a/frame/base/proj/bli_projm.h b/frame/base/proj/bli_projm.h index b34e63dac..e93f0cab8 100644 --- a/frame/base/proj/bli_projm.h +++ b/frame/base/proj/bli_projm.h @@ -32,13 +32,13 @@ */ -void bli_projm +BLIS_EXPORT_BLIS void bli_projm ( obj_t* a, obj_t* b ); -void bli_projm_check +BLIS_EXPORT_BLIS void bli_projm_check ( obj_t* a, obj_t* b diff --git a/frame/base/proj/bli_projv.c b/frame/base/proj/bli_projv.c index 9a6587e5b..d27746f79 100644 --- a/frame/base/proj/bli_projv.c +++ b/frame/base/proj/bli_projv.c @@ -34,7 +34,7 @@ #include "blis.h" -void bli_projv +BLIS_EXPORT_BLIS void bli_projv ( obj_t* x, obj_t* y @@ -86,7 +86,7 @@ void bli_projv // ----------------------------------------------------------------------------- -void bli_projv_check +BLIS_EXPORT_BLIS void bli_projv_check ( obj_t* x, obj_t* y diff --git a/frame/base/proj/bli_projv.h b/frame/base/proj/bli_projv.h index 7c33d834f..2c53076a5 100644 --- a/frame/base/proj/bli_projv.h +++ b/frame/base/proj/bli_projv.h @@ -32,13 +32,13 @@ */ -void bli_projv +BLIS_EXPORT_BLIS void bli_projv ( obj_t* x, obj_t* y ); -void bli_projv_check +BLIS_EXPORT_BLIS void bli_projv_check ( obj_t* x, obj_t* y diff --git a/frame/base/proj/old/bli_proj_check.c b/frame/base/proj/old/bli_proj_check.c index 9ffeef653..9eb3dd4c7 100644 --- a/frame/base/proj/old/bli_proj_check.c +++ b/frame/base/proj/old/bli_proj_check.c @@ -34,7 +34,7 @@ #include "blis.h" -void bli_projm_check +BLIS_EXPORT_BLIS void bli_projm_check ( obj_t* a, obj_t* b @@ -73,7 +73,7 @@ void bli_projm_check bli_check_error_code( e_val ); } -void bli_projv_check +BLIS_EXPORT_BLIS void bli_projv_check ( obj_t* x, obj_t* y diff --git a/frame/base/proj/old/bli_proj_check.h b/frame/base/proj/old/bli_proj_check.h index b32fb6d62..6d6823bd0 100644 --- a/frame/base/proj/old/bli_proj_check.h +++ b/frame/base/proj/old/bli_proj_check.h @@ -32,13 +32,13 @@ */ -void bli_projm_check +BLIS_EXPORT_BLIS void bli_projm_check ( obj_t* a, obj_t* b ); -void bli_projv_check +BLIS_EXPORT_BLIS void bli_projv_check ( obj_t* x, obj_t* y diff --git a/frame/compat/attic/bla_gbmv.c b/frame/compat/attic/bla_gbmv.c index 0d903fa43..09f01d16f 100644 --- a/frame/compat/attic/bla_gbmv.c +++ b/frame/compat/attic/bla_gbmv.c @@ -41,7 +41,7 @@ #undef GENTFUNC #define GENTFUNC( ftype, ch, blasname, blisname ) \ \ -void PASTEF77(ch,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname)( \ f77_char* transa, \ f77_int* m, \ f77_int* n, \ diff --git a/frame/compat/attic/bla_gbmv.h b/frame/compat/attic/bla_gbmv.h index 69b8ea9c5..2e60bbc7c 100644 --- a/frame/compat/attic/bla_gbmv.h +++ b/frame/compat/attic/bla_gbmv.h @@ -39,7 +39,7 @@ #undef GENTPROT #define GENTPROT( ftype, ch, blasname ) \ \ -void PASTEF77(ch,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname)( \ f77_char* transa, \ f77_int* m, \ f77_int* n, \ diff --git a/frame/compat/attic/bla_hbmv.c b/frame/compat/attic/bla_hbmv.c index e34313394..1bc0482c2 100644 --- a/frame/compat/attic/bla_hbmv.c +++ b/frame/compat/attic/bla_hbmv.c @@ -41,7 +41,7 @@ #undef GENTFUNCCO #define GENTFUNCCO( ftype, ftype_r, ch, chr, blasname, blisname ) \ \ -void PASTEF77(ch,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname)( \ f77_char* uploa, \ f77_int* m, \ f77_int* k, \ diff --git a/frame/compat/attic/bla_hbmv.h b/frame/compat/attic/bla_hbmv.h index a6362a4ba..89054809e 100644 --- a/frame/compat/attic/bla_hbmv.h +++ b/frame/compat/attic/bla_hbmv.h @@ -39,7 +39,7 @@ #undef GENTPROTCO #define GENTPROTCO( ftype, ftype_r, ch, chr, blasname ) \ \ -void PASTEF77(ch,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname)( \ f77_char* uploa, \ f77_int* m, \ f77_int* k, \ diff --git a/frame/compat/attic/bla_hpmv.c b/frame/compat/attic/bla_hpmv.c index d53da2e4e..27fee32e2 100644 --- a/frame/compat/attic/bla_hpmv.c +++ b/frame/compat/attic/bla_hpmv.c @@ -41,7 +41,7 @@ #undef GENTFUNCCO #define GENTFUNCCO( ftype, ftype_r, ch, chr, blasname, blisname ) \ \ -void PASTEF77(ch,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname)( \ f77_char* uploa, \ f77_int* m, \ ftype* alpha, \ diff --git a/frame/compat/attic/bla_hpmv.h b/frame/compat/attic/bla_hpmv.h index fe5b2238a..c58a5ebbf 100644 --- a/frame/compat/attic/bla_hpmv.h +++ b/frame/compat/attic/bla_hpmv.h @@ -39,7 +39,7 @@ #undef GENTPROTCO #define GENTPROTCO( ftype, ftype_r, ch, chr, blasname ) \ \ -void PASTEF77(ch,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname)( \ f77_char* uploa, \ f77_int* m, \ ftype* alpha, \ diff --git a/frame/compat/attic/bla_hpr.c b/frame/compat/attic/bla_hpr.c index c0205f41b..21ec33e63 100644 --- a/frame/compat/attic/bla_hpr.c +++ b/frame/compat/attic/bla_hpr.c @@ -41,7 +41,7 @@ #undef GENTFUNCCO #define GENTFUNCCO( ftype, ftype_r, ch, chr, blasname, blisname ) \ \ -void PASTEF77(ch,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname)( \ f77_char* uploa, \ f77_int* m, \ ftype_r* alpha, \ diff --git a/frame/compat/attic/bla_hpr.h b/frame/compat/attic/bla_hpr.h index 264cf60fe..b32c939a7 100644 --- a/frame/compat/attic/bla_hpr.h +++ b/frame/compat/attic/bla_hpr.h @@ -39,7 +39,7 @@ #undef GENTPROTCO #define GENTPROTCO( ftype, ftype_r, ch, chr, blasname ) \ \ -void PASTEF77(ch,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname)( \ f77_char* uploa, \ f77_int* m, \ ftype_r* alpha, \ diff --git a/frame/compat/attic/bla_hpr2.c b/frame/compat/attic/bla_hpr2.c index 2153857d1..882db3b28 100644 --- a/frame/compat/attic/bla_hpr2.c +++ b/frame/compat/attic/bla_hpr2.c @@ -41,7 +41,7 @@ #undef GENTFUNCCO #define GENTFUNCCO( ftype, ftype_r, ch, chr, blasname, blisname ) \ \ -void PASTEF77(ch,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname)( \ f77_char* uploa, \ f77_int* m, \ ftype* alpha, \ diff --git a/frame/compat/attic/bla_hpr2.h b/frame/compat/attic/bla_hpr2.h index c288656e0..e62179a5a 100644 --- a/frame/compat/attic/bla_hpr2.h +++ b/frame/compat/attic/bla_hpr2.h @@ -39,7 +39,7 @@ #undef GENTPROTCO #define GENTPROTCO( ftype, ftype_r, ch, chr, blasname ) \ \ -void PASTEF77(ch,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname)( \ f77_char* uploa, \ f77_int* m, \ ftype* alpha, \ diff --git a/frame/compat/attic/bla_rot.c b/frame/compat/attic/bla_rot.c index 5c97d3961..0fdb9fa4b 100644 --- a/frame/compat/attic/bla_rot.c +++ b/frame/compat/attic/bla_rot.c @@ -41,7 +41,7 @@ #undef GENTFUNCR2 #define GENTFUNCR2( ftype_xy, ftype_r, chxy, chr, blasname, blisname ) \ \ -void PASTEF772(chxy,chr,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF772(chxy,chr,blasname)( \ f77_int* n, \ ftype_xy* x, f77_int* incx, \ ftype_xy* y, f77_int* incy, \ diff --git a/frame/compat/attic/bla_rot.h b/frame/compat/attic/bla_rot.h index 964d7001e..1713ccae2 100644 --- a/frame/compat/attic/bla_rot.h +++ b/frame/compat/attic/bla_rot.h @@ -39,7 +39,7 @@ #undef GENTPROTR2 #define GENTPROTR2( ftype_xy, ftype_r, chxy, chr, blasname ) \ \ -void PASTEF772(chxy,chr,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF772(chxy,chr,blasname)( \ f77_int* n, \ ftype_xy* x, f77_int* incx, \ ftype_xy* y, f77_int* incy, \ diff --git a/frame/compat/attic/bla_rotg.c b/frame/compat/attic/bla_rotg.c index f45ef9810..317987f8e 100644 --- a/frame/compat/attic/bla_rotg.c +++ b/frame/compat/attic/bla_rotg.c @@ -41,7 +41,7 @@ #undef GENTFUNCR #define GENTFUNCR( ftype_xy, ftype_r, chxy, chr, blasname, blisname ) \ \ -void PASTEF77(chxy,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(chxy,blasname)( \ ftype_xy* x, \ ftype_xy* y, \ ftype_r* c, \ diff --git a/frame/compat/attic/bla_rotg.h b/frame/compat/attic/bla_rotg.h index 3104aa5dc..9da266113 100644 --- a/frame/compat/attic/bla_rotg.h +++ b/frame/compat/attic/bla_rotg.h @@ -39,7 +39,7 @@ #undef GENTPROTR #define GENTPROTR( ftype_xy, ftype_r, chxy, chr, blasname ) \ \ -void PASTEF77(chxy,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(chxy,blasname)( \ ftype_xy* x, \ ftype_xy* y, \ ftype_r* c, \ diff --git a/frame/compat/attic/bla_rotm.c b/frame/compat/attic/bla_rotm.c index 5660f7238..3626e2897 100644 --- a/frame/compat/attic/bla_rotm.c +++ b/frame/compat/attic/bla_rotm.c @@ -41,7 +41,7 @@ #undef GENTFUNCRO #define GENTFUNCRO( ftype, ch, blasname, blisname ) \ \ -void PASTEF77(ch,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname)( \ f77_int* n, \ ftype* x, f77_int* incx, \ ftype* y, f77_int* incy, \ diff --git a/frame/compat/attic/bla_rotm.h b/frame/compat/attic/bla_rotm.h index 77ef4a040..73dc6bec9 100644 --- a/frame/compat/attic/bla_rotm.h +++ b/frame/compat/attic/bla_rotm.h @@ -39,7 +39,7 @@ #undef GENTPROTRO #define GENTPROTRO( ftype, ch, blasname ) \ \ -void PASTEF77(ch,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname)( \ f77_int* n, \ ftype* x, f77_int* incx, \ ftype* y, f77_int* incy, \ diff --git a/frame/compat/attic/bla_rotmg.c b/frame/compat/attic/bla_rotmg.c index 5130cb6e5..5a662283b 100644 --- a/frame/compat/attic/bla_rotmg.c +++ b/frame/compat/attic/bla_rotmg.c @@ -41,7 +41,7 @@ #undef GENTFUNCRO #define GENTFUNCRO( ftype, ch, blasname, blisname ) \ \ -void PASTEF77(ch,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname)( \ ftype* d1, \ ftype* d2, \ ftype* x, \ diff --git a/frame/compat/attic/bla_rotmg.h b/frame/compat/attic/bla_rotmg.h index b18c867d7..dba9f6f08 100644 --- a/frame/compat/attic/bla_rotmg.h +++ b/frame/compat/attic/bla_rotmg.h @@ -39,7 +39,7 @@ #undef GENTPROTRO #define GENTPROTRO( ftype, ch, blasname ) \ \ -void PASTEF77(ch,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname)( \ ftype* d1, \ ftype* d2, \ ftype* x, \ diff --git a/frame/compat/attic/bla_sbmv.c b/frame/compat/attic/bla_sbmv.c index 8aa1e63a4..8aca3c8e4 100644 --- a/frame/compat/attic/bla_sbmv.c +++ b/frame/compat/attic/bla_sbmv.c @@ -41,7 +41,7 @@ #undef GENTFUNCRO #define GENTFUNCRO( ftype, ch, blasname, blisname ) \ \ -void PASTEF77(ch,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname)( \ f77_char* uploa, \ f77_int* m, \ f77_int* k, \ diff --git a/frame/compat/attic/bla_sbmv.h b/frame/compat/attic/bla_sbmv.h index 8e68d701e..e96e88975 100644 --- a/frame/compat/attic/bla_sbmv.h +++ b/frame/compat/attic/bla_sbmv.h @@ -39,7 +39,7 @@ #undef GENTPROTRO #define GENTPROTRO( ftype, ch, blasname ) \ \ -void PASTEF77(ch,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname)( \ f77_char* uploa, \ f77_int* m, \ f77_int* k, \ diff --git a/frame/compat/attic/bla_spmv.c b/frame/compat/attic/bla_spmv.c index 2e562da97..12896d2d0 100644 --- a/frame/compat/attic/bla_spmv.c +++ b/frame/compat/attic/bla_spmv.c @@ -41,7 +41,7 @@ #undef GENTFUNCRO #define GENTFUNCRO( ftype, ch, blasname, blisname ) \ \ -void PASTEF77(ch,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname)( \ f77_char* uploa, \ f77_int* m, \ ftype* alpha, \ diff --git a/frame/compat/attic/bla_spmv.h b/frame/compat/attic/bla_spmv.h index fb3ce55cf..60c787eb9 100644 --- a/frame/compat/attic/bla_spmv.h +++ b/frame/compat/attic/bla_spmv.h @@ -39,7 +39,7 @@ #undef GENTPROTRO #define GENTPROTRO( ftype, ch, blasname ) \ \ -void PASTEF77(ch,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname)( \ f77_char* uploa, \ f77_int* m, \ ftype* alpha, \ diff --git a/frame/compat/attic/bla_spr.c b/frame/compat/attic/bla_spr.c index 7c2a9e93c..2b4431395 100644 --- a/frame/compat/attic/bla_spr.c +++ b/frame/compat/attic/bla_spr.c @@ -41,7 +41,7 @@ #undef GENTFUNCRO #define GENTFUNCRO( ftype, ch, blasname, blisname ) \ \ -void PASTEF77(ch,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname)( \ f77_char* uploa, \ f77_int* m, \ ftype* alpha, \ diff --git a/frame/compat/attic/bla_spr.h b/frame/compat/attic/bla_spr.h index 097931e82..59407b229 100644 --- a/frame/compat/attic/bla_spr.h +++ b/frame/compat/attic/bla_spr.h @@ -39,7 +39,7 @@ #undef GENTPROTRO #define GENTPROTRO( ftype, ch, blasname ) \ \ -void PASTEF77(ch,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname)( \ f77_char* uploa, \ f77_int* m, \ ftype* alpha, \ diff --git a/frame/compat/attic/bla_spr2.c b/frame/compat/attic/bla_spr2.c index 08770c4f7..729742c0b 100644 --- a/frame/compat/attic/bla_spr2.c +++ b/frame/compat/attic/bla_spr2.c @@ -41,7 +41,7 @@ #undef GENTFUNCRO #define GENTFUNCRO( ftype, ch, blasname, blisname ) \ \ -void PASTEF77(ch,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname)( \ f77_char* uploa, \ f77_int* m, \ ftype* alpha, \ diff --git a/frame/compat/attic/bla_spr2.h b/frame/compat/attic/bla_spr2.h index 8864523ac..911b4301c 100644 --- a/frame/compat/attic/bla_spr2.h +++ b/frame/compat/attic/bla_spr2.h @@ -39,7 +39,7 @@ #undef GENTPROTRO #define GENTPROTRO( ftype, ch, blasname ) \ \ -void PASTEF77(ch,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname)( \ f77_char* uploa, \ f77_int* m, \ ftype* alpha, \ diff --git a/frame/compat/attic/bla_tbmv.c b/frame/compat/attic/bla_tbmv.c index 95765d59b..159f907fa 100644 --- a/frame/compat/attic/bla_tbmv.c +++ b/frame/compat/attic/bla_tbmv.c @@ -41,7 +41,7 @@ #undef GENTFUNC #define GENTFUNC( ftype, ch, blasname, blisname ) \ \ -void PASTEF77(ch,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname)( \ f77_char* uploa, \ f77_char* transa, \ f77_char* diaga, \ diff --git a/frame/compat/attic/bla_tbmv.h b/frame/compat/attic/bla_tbmv.h index d28b58d12..7a343c362 100644 --- a/frame/compat/attic/bla_tbmv.h +++ b/frame/compat/attic/bla_tbmv.h @@ -39,7 +39,7 @@ #undef GENTPROT #define GENTPROT( ftype, ch, blasname ) \ \ -void PASTEF77(ch,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname)( \ f77_char* uploa, \ f77_char* transa, \ f77_char* diaga, \ diff --git a/frame/compat/attic/bla_tbsv.c b/frame/compat/attic/bla_tbsv.c index eb4be901f..dffe53375 100644 --- a/frame/compat/attic/bla_tbsv.c +++ b/frame/compat/attic/bla_tbsv.c @@ -41,7 +41,7 @@ #undef GENTFUNC #define GENTFUNC( ftype, ch, blasname, blisname ) \ \ -void PASTEF77(ch,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname)( \ f77_char* uploa, \ f77_char* transa, \ f77_char* diaga, \ diff --git a/frame/compat/attic/bla_tbsv.h b/frame/compat/attic/bla_tbsv.h index a41a15bf1..0837352ae 100644 --- a/frame/compat/attic/bla_tbsv.h +++ b/frame/compat/attic/bla_tbsv.h @@ -39,7 +39,7 @@ #undef GENTPROT #define GENTPROT( ftype, ch, blasname ) \ \ -void PASTEF77(ch,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname)( \ f77_char* uploa, \ f77_char* transa, \ f77_char* diaga, \ diff --git a/frame/compat/attic/bla_tpmv.c b/frame/compat/attic/bla_tpmv.c index 4abe6ba46..a913875ba 100644 --- a/frame/compat/attic/bla_tpmv.c +++ b/frame/compat/attic/bla_tpmv.c @@ -41,7 +41,7 @@ #undef GENTFUNC #define GENTFUNC( ftype, ch, blasname, blisname ) \ \ -void PASTEF77(ch,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname)( \ f77_char* uploa, \ f77_char* transa, \ f77_char* diaga, \ diff --git a/frame/compat/attic/bla_tpmv.h b/frame/compat/attic/bla_tpmv.h index 7689befdc..37cd494a5 100644 --- a/frame/compat/attic/bla_tpmv.h +++ b/frame/compat/attic/bla_tpmv.h @@ -39,7 +39,7 @@ #undef GENTPROT #define GENTPROT( ftype, ch, blasname ) \ \ -void PASTEF77(ch,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname)( \ f77_char* uploa, \ f77_char* transa, \ f77_char* diaga, \ diff --git a/frame/compat/attic/bla_tpsv.c b/frame/compat/attic/bla_tpsv.c index f1a039c66..63900b3ab 100644 --- a/frame/compat/attic/bla_tpsv.c +++ b/frame/compat/attic/bla_tpsv.c @@ -41,7 +41,7 @@ #undef GENTFUNC #define GENTFUNC( ftype, ch, blasname, blisname ) \ \ -void PASTEF77(ch,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname)( \ f77_char* uploa, \ f77_char* transa, \ f77_char* diaga, \ diff --git a/frame/compat/attic/bla_tpsv.h b/frame/compat/attic/bla_tpsv.h index 526769062..179fd607d 100644 --- a/frame/compat/attic/bla_tpsv.h +++ b/frame/compat/attic/bla_tpsv.h @@ -39,7 +39,7 @@ #undef GENTPROT #define GENTPROT( ftype, ch, blasname ) \ \ -void PASTEF77(ch,blasname)( \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname)( \ f77_char* uploa, \ f77_char* transa, \ f77_char* diaga, \ diff --git a/frame/compat/bla_amax.c b/frame/compat/bla_amax.c index 9fcce920b..ef2ac46d0 100644 --- a/frame/compat/bla_amax.c +++ b/frame/compat/bla_amax.c @@ -41,7 +41,7 @@ #undef GENTFUNC #define GENTFUNC( ftype_x, chx, blasname, blisname ) \ \ -f77_int PASTEF772(i,chx,blasname) \ +BLIS_EXPORT_BLAS f77_int PASTEF772(i,chx,blasname) \ ( \ const f77_int* n, \ const ftype_x* x, const f77_int* incx \ diff --git a/frame/compat/bla_amax.h b/frame/compat/bla_amax.h index f6e3dd0f6..1f13715dc 100644 --- a/frame/compat/bla_amax.h +++ b/frame/compat/bla_amax.h @@ -39,7 +39,7 @@ #undef GENTPROT #define GENTPROT( ftype_x, chx, blasname ) \ \ -f77_int PASTEF772(i,chx,blasname) \ +BLIS_EXPORT_BLAS f77_int PASTEF772(i,chx,blasname) \ ( \ const f77_int* n, \ const ftype_x* x, const f77_int* incx \ diff --git a/frame/compat/bla_asum.c b/frame/compat/bla_asum.c index 8e71bfa8c..920dd823d 100644 --- a/frame/compat/bla_asum.c +++ b/frame/compat/bla_asum.c @@ -41,7 +41,7 @@ #undef GENTFUNCR2 #define GENTFUNCR2( ftype_x, ftype_r, chx, chr, blasname, blisname ) \ \ -ftype_r PASTEF772(chr,chx,blasname) \ +BLIS_EXPORT_BLAS ftype_r PASTEF772(chr,chx,blasname) \ ( \ const f77_int* n, \ const ftype_x* x, const f77_int* incx \ diff --git a/frame/compat/bla_asum.h b/frame/compat/bla_asum.h index 036cd1529..a9ef27a03 100644 --- a/frame/compat/bla_asum.h +++ b/frame/compat/bla_asum.h @@ -39,7 +39,7 @@ #undef GENTPROTR2 #define GENTPROTR2( ftype_x, ftype_r, chx, chr, blasname ) \ \ -ftype_r PASTEF772(chr,chx,blasname) \ +BLIS_EXPORT_BLAS ftype_r PASTEF772(chr,chx,blasname) \ ( \ const f77_int* n, \ const ftype_x* x, const f77_int* incx \ diff --git a/frame/compat/bla_axpy.c b/frame/compat/bla_axpy.c index e3c67fd55..abe4c0da7 100644 --- a/frame/compat/bla_axpy.c +++ b/frame/compat/bla_axpy.c @@ -41,7 +41,7 @@ #undef GENTFUNC #define GENTFUNC( ftype, ch, blasname, blisname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_int* n, \ const ftype* alpha, \ diff --git a/frame/compat/bla_axpy.h b/frame/compat/bla_axpy.h index 3c014f36f..294a385c7 100644 --- a/frame/compat/bla_axpy.h +++ b/frame/compat/bla_axpy.h @@ -39,7 +39,7 @@ #undef GENTPROT #define GENTPROT( ftype, ch, blasname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_int* n, \ const ftype* alpha, \ diff --git a/frame/compat/bla_copy.c b/frame/compat/bla_copy.c index d9d3b7cce..2d0f50ca3 100644 --- a/frame/compat/bla_copy.c +++ b/frame/compat/bla_copy.c @@ -41,7 +41,7 @@ #undef GENTFUNC #define GENTFUNC( ftype, ch, blasname, blisname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_int* n, \ const ftype* x, const f77_int* incx, \ diff --git a/frame/compat/bla_copy.h b/frame/compat/bla_copy.h index 5f95afff2..679017b19 100644 --- a/frame/compat/bla_copy.h +++ b/frame/compat/bla_copy.h @@ -39,7 +39,7 @@ #undef GENTPROT #define GENTPROT( ftype, ch, blasname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_int* n, \ const ftype* x, const f77_int* incx, \ diff --git a/frame/compat/bla_dot.c b/frame/compat/bla_dot.c index dbab039d1..453c7aec8 100644 --- a/frame/compat/bla_dot.c +++ b/frame/compat/bla_dot.c @@ -41,7 +41,7 @@ #undef GENTFUNCDOT #define GENTFUNCDOT( ftype, ch, chc, blis_conjx, blasname, blisname ) \ \ -ftype PASTEF772(ch,blasname,chc) \ +BLIS_EXPORT_BLAS ftype PASTEF772(ch,blasname,chc) \ ( \ const f77_int* n, \ const ftype* x, const f77_int* incx, \ @@ -93,7 +93,7 @@ INSERT_GENTFUNCDOT_BLAS( dot, dotv ) // Input vectors stored in single precision, computed in double precision, // with result returned in single precision. -float PASTEF77(sd,sdot) +BLIS_EXPORT_BLAS float PASTEF77(sd,sdot) ( const f77_int* n, const float* sb, @@ -109,7 +109,7 @@ float PASTEF77(sd,sdot) // Input vectors stored in single precision, computed in double precision, // with result returned in double precision. -double PASTEF77(d,sdot) +BLIS_EXPORT_BLAS double PASTEF77(d,sdot) ( const f77_int* n, const float* x, const f77_int* incx, diff --git a/frame/compat/bla_dot.h b/frame/compat/bla_dot.h index 01eb532e6..373e1a7b7 100644 --- a/frame/compat/bla_dot.h +++ b/frame/compat/bla_dot.h @@ -39,7 +39,7 @@ #undef GENTPROTDOT #define GENTPROTDOT( ftype, ch, chc, blasname ) \ \ -ftype PASTEF772(ch,blasname,chc) \ +BLIS_EXPORT_BLAS ftype PASTEF772(ch,blasname,chc) \ ( \ const f77_int* n, \ const ftype* x, const f77_int* incx, \ @@ -52,7 +52,7 @@ INSERT_GENTPROTDOT_BLAS( dot ) // -- "Black sheep" dot product function prototypes -- -float PASTEF77(sd,sdot) +BLIS_EXPORT_BLAS float PASTEF77(sd,sdot) ( const f77_int* n, const float* sb, @@ -60,7 +60,7 @@ float PASTEF77(sd,sdot) const float* y, const f77_int* incy ); -double PASTEF77(d,sdot) +BLIS_EXPORT_BLAS double PASTEF77(d,sdot) ( const f77_int* n, const float* x, const f77_int* incx, diff --git a/frame/compat/bla_gemm.c b/frame/compat/bla_gemm.c index 1effececa..dc2d2a74d 100644 --- a/frame/compat/bla_gemm.c +++ b/frame/compat/bla_gemm.c @@ -41,7 +41,7 @@ #undef GENTFUNC #define GENTFUNC( ftype, ch, blasname, blisname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* transa, \ const f77_char* transb, \ diff --git a/frame/compat/bla_gemm.h b/frame/compat/bla_gemm.h index 18a101da1..77111dbd8 100644 --- a/frame/compat/bla_gemm.h +++ b/frame/compat/bla_gemm.h @@ -39,7 +39,7 @@ #undef GENTPROT #define GENTPROT( ftype, ch, blasname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* transa, \ const f77_char* transb, \ diff --git a/frame/compat/bla_gemv.c b/frame/compat/bla_gemv.c index 85c65dde4..b4f27177d 100644 --- a/frame/compat/bla_gemv.c +++ b/frame/compat/bla_gemv.c @@ -41,7 +41,7 @@ #undef GENTFUNC #define GENTFUNC( ftype, ch, blasname, blisname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* transa, \ const f77_int* m, \ diff --git a/frame/compat/bla_gemv.h b/frame/compat/bla_gemv.h index da4561606..22c8bf1c0 100644 --- a/frame/compat/bla_gemv.h +++ b/frame/compat/bla_gemv.h @@ -39,7 +39,7 @@ #undef GENTPROT #define GENTPROT( ftype, ch, blasname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* transa, \ const f77_int* m, \ diff --git a/frame/compat/bla_ger.c b/frame/compat/bla_ger.c index db4f76f18..7113b73bd 100644 --- a/frame/compat/bla_ger.c +++ b/frame/compat/bla_ger.c @@ -41,7 +41,7 @@ #undef GENTFUNCDOT #define GENTFUNCDOT( ftype, ch, chc, blis_conjy, blasname, blisname ) \ \ -void PASTEF772(ch,blasname,chc) \ +BLIS_EXPORT_BLAS void PASTEF772(ch,blasname,chc) \ ( \ const f77_int* m, \ const f77_int* n, \ diff --git a/frame/compat/bla_ger.h b/frame/compat/bla_ger.h index d37511c0a..a31548f61 100644 --- a/frame/compat/bla_ger.h +++ b/frame/compat/bla_ger.h @@ -39,7 +39,7 @@ #undef GENTPROTDOT #define GENTPROTDOT( ftype, chxy, chc, blasname ) \ \ -void PASTEF772(chxy,blasname,chc) \ +BLIS_EXPORT_BLAS void PASTEF772(chxy,blasname,chc) \ ( \ const f77_int* m, \ const f77_int* n, \ diff --git a/frame/compat/bla_hemm.c b/frame/compat/bla_hemm.c index 88e9c8b55..33c9e1f75 100644 --- a/frame/compat/bla_hemm.c +++ b/frame/compat/bla_hemm.c @@ -41,7 +41,7 @@ #undef GENTFUNCCO #define GENTFUNCCO( ftype, ftype_r, ch, chr, blasname, blisname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* side, \ const f77_char* uploa, \ diff --git a/frame/compat/bla_hemm.h b/frame/compat/bla_hemm.h index 712fc611a..711877ede 100644 --- a/frame/compat/bla_hemm.h +++ b/frame/compat/bla_hemm.h @@ -39,7 +39,7 @@ #undef GENTPROTCO #define GENTPROTCO( ftype, ftype_r, ch, chr, blasname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* side, \ const f77_char* uploa, \ diff --git a/frame/compat/bla_hemv.c b/frame/compat/bla_hemv.c index 944468278..fa488b052 100644 --- a/frame/compat/bla_hemv.c +++ b/frame/compat/bla_hemv.c @@ -41,7 +41,7 @@ #undef GENTFUNCCO #define GENTFUNCCO( ftype, ftype_r, ch, chr, blasname, blisname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* uploa, \ const f77_int* m, \ diff --git a/frame/compat/bla_hemv.h b/frame/compat/bla_hemv.h index 01c25e324..4e8230114 100644 --- a/frame/compat/bla_hemv.h +++ b/frame/compat/bla_hemv.h @@ -39,7 +39,7 @@ #undef GENTPROTCO #define GENTPROTCO( ftype, ftype_r, ch, chr, blasname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* uploa, \ const f77_int* m, \ diff --git a/frame/compat/bla_her.c b/frame/compat/bla_her.c index ade3cbdda..a80d1b364 100644 --- a/frame/compat/bla_her.c +++ b/frame/compat/bla_her.c @@ -41,7 +41,7 @@ #undef GENTFUNCCO #define GENTFUNCCO( ftype, ftype_r, ch, chr, blasname, blisname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* uploa, \ const f77_int* m, \ diff --git a/frame/compat/bla_her.h b/frame/compat/bla_her.h index f93f49ac0..b9ae30d90 100644 --- a/frame/compat/bla_her.h +++ b/frame/compat/bla_her.h @@ -39,7 +39,7 @@ #undef GENTPROTCO #define GENTPROTCO( ftype, ftype_r, ch, chr, blasname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* uploa, \ const f77_int* m, \ diff --git a/frame/compat/bla_her2.c b/frame/compat/bla_her2.c index e3ed4ce31..1286e21bc 100644 --- a/frame/compat/bla_her2.c +++ b/frame/compat/bla_her2.c @@ -41,7 +41,7 @@ #undef GENTFUNCCO #define GENTFUNCCO( ftype, ftype_r, ch, chr, blasname, blisname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* uploa, \ const f77_int* m, \ diff --git a/frame/compat/bla_her2.h b/frame/compat/bla_her2.h index c96374130..7cf0bb867 100644 --- a/frame/compat/bla_her2.h +++ b/frame/compat/bla_her2.h @@ -39,7 +39,7 @@ #undef GENTPROTCO #define GENTPROTCO( ftype, ftype_r, ch, chr, blasname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* uploa, \ const f77_int* m, \ diff --git a/frame/compat/bla_her2k.c b/frame/compat/bla_her2k.c index 0bbe98e1c..d15e73b4f 100644 --- a/frame/compat/bla_her2k.c +++ b/frame/compat/bla_her2k.c @@ -41,7 +41,7 @@ #undef GENTFUNCCO #define GENTFUNCCO( ftype, ftype_r, ch, chr, blasname, blisname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* uploc, \ const f77_char* transa, \ diff --git a/frame/compat/bla_her2k.h b/frame/compat/bla_her2k.h index e04b11755..c771f78d4 100644 --- a/frame/compat/bla_her2k.h +++ b/frame/compat/bla_her2k.h @@ -39,7 +39,7 @@ #undef GENTPROTCO #define GENTPROTCO( ftype, ftype_r, ch, chr, blasname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* uploc, \ const f77_char* transa, \ diff --git a/frame/compat/bla_herk.c b/frame/compat/bla_herk.c index 88185de0b..27446fc2f 100644 --- a/frame/compat/bla_herk.c +++ b/frame/compat/bla_herk.c @@ -41,7 +41,7 @@ #undef GENTFUNCCO #define GENTFUNCCO( ftype, ftype_r, ch, chr, blasname, blisname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* uploc, \ const f77_char* transa, \ diff --git a/frame/compat/bla_herk.h b/frame/compat/bla_herk.h index 6b3ebd38c..e649a74ab 100644 --- a/frame/compat/bla_herk.h +++ b/frame/compat/bla_herk.h @@ -39,7 +39,7 @@ #undef GENTPROTCO #define GENTPROTCO( ftype, ftype_r, ch, chr, blasname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* uploc, \ const f77_char* transa, \ diff --git a/frame/compat/bla_nrm2.c b/frame/compat/bla_nrm2.c index 0b41a0673..79fa9116e 100644 --- a/frame/compat/bla_nrm2.c +++ b/frame/compat/bla_nrm2.c @@ -41,7 +41,7 @@ #undef GENTFUNCR2 #define GENTFUNCR2( ftype_x, ftype_r, chx, chr, blasname, blisname ) \ \ -ftype_r PASTEF772(chr,chx,blasname) \ +BLIS_EXPORT_BLAS ftype_r PASTEF772(chr,chx,blasname) \ ( \ const f77_int* n, \ const ftype_x* x, const f77_int* incx \ diff --git a/frame/compat/bla_nrm2.h b/frame/compat/bla_nrm2.h index af18d6ec3..a8bc25ef4 100644 --- a/frame/compat/bla_nrm2.h +++ b/frame/compat/bla_nrm2.h @@ -39,7 +39,7 @@ #undef GENTPROTR2 #define GENTPROTR2( ftype_x, ftype_r, chx, chr, blasname ) \ \ -ftype_r PASTEF772(chr,chx,blasname) \ +BLIS_EXPORT_BLAS ftype_r PASTEF772(chr,chx,blasname) \ ( \ const f77_int* n, \ const ftype_x* x, const f77_int* incx \ diff --git a/frame/compat/bla_scal.c b/frame/compat/bla_scal.c index 6c2a3c3db..9dc3a89c6 100644 --- a/frame/compat/bla_scal.c +++ b/frame/compat/bla_scal.c @@ -41,7 +41,7 @@ #undef GENTFUNCSCAL #define GENTFUNCSCAL( ftype_x, ftype_a, chx, cha, blasname, blisname ) \ \ -void PASTEF772(chx,cha,blasname) \ +BLIS_EXPORT_BLAS void PASTEF772(chx,cha,blasname) \ ( \ const f77_int* n, \ const ftype_a* alpha, \ diff --git a/frame/compat/bla_scal.h b/frame/compat/bla_scal.h index a615ea13f..c8e898b6b 100644 --- a/frame/compat/bla_scal.h +++ b/frame/compat/bla_scal.h @@ -39,7 +39,7 @@ #undef GENTPROTSCAL #define GENTPROTSCAL( ftype_a, ftype_x, cha, chx, blasname ) \ \ -void PASTEF772(chx,cha,blasname) \ +BLIS_EXPORT_BLAS void PASTEF772(chx,cha,blasname) \ ( \ const f77_int* n, \ const ftype_a* alpha, \ diff --git a/frame/compat/bla_swap.c b/frame/compat/bla_swap.c index 72bc9d6d5..b2619510e 100644 --- a/frame/compat/bla_swap.c +++ b/frame/compat/bla_swap.c @@ -41,7 +41,7 @@ #undef GENTFUNC #define GENTFUNC( ftype, ch, blasname, blisname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_int* n, \ ftype* x, const f77_int* incx, \ diff --git a/frame/compat/bla_swap.h b/frame/compat/bla_swap.h index 4943a6504..54c0613a9 100644 --- a/frame/compat/bla_swap.h +++ b/frame/compat/bla_swap.h @@ -39,7 +39,7 @@ #undef GENTPROT #define GENTPROT( ftype, ch, blasname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_int* n, \ ftype* x, const f77_int* incx, \ diff --git a/frame/compat/bla_symm.c b/frame/compat/bla_symm.c index 02d3a3b27..2dab8e52b 100644 --- a/frame/compat/bla_symm.c +++ b/frame/compat/bla_symm.c @@ -41,7 +41,7 @@ #undef GENTFUNC #define GENTFUNC( ftype, ch, blasname, blisname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* side, \ const f77_char* uploa, \ diff --git a/frame/compat/bla_symm.h b/frame/compat/bla_symm.h index 6bfdec35e..b186e4b43 100644 --- a/frame/compat/bla_symm.h +++ b/frame/compat/bla_symm.h @@ -39,7 +39,7 @@ #undef GENTPROT #define GENTPROT( ftype, ch, blasname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* side, \ const f77_char* uploa, \ diff --git a/frame/compat/bla_symv.c b/frame/compat/bla_symv.c index 79076194c..76ebd07e5 100644 --- a/frame/compat/bla_symv.c +++ b/frame/compat/bla_symv.c @@ -41,7 +41,7 @@ #undef GENTFUNCRO #define GENTFUNCRO( ftype, ch, blasname, blisname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* uploa, \ const f77_int* m, \ diff --git a/frame/compat/bla_symv.h b/frame/compat/bla_symv.h index d003f1124..9d1662fad 100644 --- a/frame/compat/bla_symv.h +++ b/frame/compat/bla_symv.h @@ -39,7 +39,7 @@ #undef GENTPROTRO #define GENTPROTRO( ftype, ch, blasname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* uploa, \ const f77_int* m, \ diff --git a/frame/compat/bla_syr.c b/frame/compat/bla_syr.c index 0ed4aebb1..3abcca28a 100644 --- a/frame/compat/bla_syr.c +++ b/frame/compat/bla_syr.c @@ -41,7 +41,7 @@ #undef GENTFUNCRO #define GENTFUNCRO( ftype, ch, blasname, blisname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* uploa, \ const f77_int* m, \ diff --git a/frame/compat/bla_syr.h b/frame/compat/bla_syr.h index 4a1d79d3e..0d2a1e031 100644 --- a/frame/compat/bla_syr.h +++ b/frame/compat/bla_syr.h @@ -39,7 +39,7 @@ #undef GENTPROTRO #define GENTPROTRO( ftype, ch, blasname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* uploa, \ const f77_int* m, \ diff --git a/frame/compat/bla_syr2.c b/frame/compat/bla_syr2.c index dbae67027..302864b8f 100644 --- a/frame/compat/bla_syr2.c +++ b/frame/compat/bla_syr2.c @@ -41,7 +41,7 @@ #undef GENTFUNCRO #define GENTFUNCRO( ftype, ch, blasname, blisname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* uploa, \ const f77_int* m, \ diff --git a/frame/compat/bla_syr2.h b/frame/compat/bla_syr2.h index 06e4c2d91..b45876794 100644 --- a/frame/compat/bla_syr2.h +++ b/frame/compat/bla_syr2.h @@ -39,7 +39,7 @@ #undef GENTPROTRO #define GENTPROTRO( ftype, ch, blasname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* uploa, \ const f77_int* m, \ diff --git a/frame/compat/bla_syr2k.c b/frame/compat/bla_syr2k.c index 7e611b1d6..2f5b65df6 100644 --- a/frame/compat/bla_syr2k.c +++ b/frame/compat/bla_syr2k.c @@ -41,7 +41,7 @@ #undef GENTFUNC #define GENTFUNC( ftype, ch, blasname, blisname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* uploc, \ const f77_char* transa, \ diff --git a/frame/compat/bla_syr2k.h b/frame/compat/bla_syr2k.h index f1eb8e127..91d9a3acf 100644 --- a/frame/compat/bla_syr2k.h +++ b/frame/compat/bla_syr2k.h @@ -39,7 +39,7 @@ #undef GENTPROT #define GENTPROT( ftype, ch, blasname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* uploc, \ const f77_char* transa, \ diff --git a/frame/compat/bla_syrk.c b/frame/compat/bla_syrk.c index 9c08dd06b..0e8fb791a 100644 --- a/frame/compat/bla_syrk.c +++ b/frame/compat/bla_syrk.c @@ -41,7 +41,7 @@ #undef GENTFUNC #define GENTFUNC( ftype, ch, blasname, blisname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* uploc, \ const f77_char* transa, \ diff --git a/frame/compat/bla_syrk.h b/frame/compat/bla_syrk.h index 9b2e49c5a..b6ca938a6 100644 --- a/frame/compat/bla_syrk.h +++ b/frame/compat/bla_syrk.h @@ -39,7 +39,7 @@ #undef GENTPROT #define GENTPROT( ftype, ch, blasname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* uploc, \ const f77_char* transa, \ diff --git a/frame/compat/bla_trmm.c b/frame/compat/bla_trmm.c index 116d2b8c4..78b73d004 100644 --- a/frame/compat/bla_trmm.c +++ b/frame/compat/bla_trmm.c @@ -41,7 +41,7 @@ #undef GENTFUNC #define GENTFUNC( ftype, ch, blasname, blisname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* side, \ const f77_char* uploa, \ diff --git a/frame/compat/bla_trmm.h b/frame/compat/bla_trmm.h index 7c800f9eb..4f0c20b1b 100644 --- a/frame/compat/bla_trmm.h +++ b/frame/compat/bla_trmm.h @@ -39,7 +39,7 @@ #undef GENTPROT #define GENTPROT( ftype, ch, blasname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* side, \ const f77_char* uploa, \ diff --git a/frame/compat/bla_trmv.c b/frame/compat/bla_trmv.c index ffb31b12f..783d975e7 100644 --- a/frame/compat/bla_trmv.c +++ b/frame/compat/bla_trmv.c @@ -41,7 +41,7 @@ #undef GENTFUNC #define GENTFUNC( ftype, ch, blasname, blisname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* uploa, \ const f77_char* transa, \ diff --git a/frame/compat/bla_trmv.h b/frame/compat/bla_trmv.h index 4faec098b..4096ffe79 100644 --- a/frame/compat/bla_trmv.h +++ b/frame/compat/bla_trmv.h @@ -39,7 +39,7 @@ #undef GENTPROT #define GENTPROT( ftype, ch, blasname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* uploa, \ const f77_char* transa, \ diff --git a/frame/compat/bla_trsm.c b/frame/compat/bla_trsm.c index 70597cc93..efc9aed71 100644 --- a/frame/compat/bla_trsm.c +++ b/frame/compat/bla_trsm.c @@ -41,7 +41,7 @@ #undef GENTFUNC #define GENTFUNC( ftype, ch, blasname, blisname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* side, \ const f77_char* uploa, \ diff --git a/frame/compat/bla_trsm.h b/frame/compat/bla_trsm.h index a2c2222b0..5694db52a 100644 --- a/frame/compat/bla_trsm.h +++ b/frame/compat/bla_trsm.h @@ -39,7 +39,7 @@ #undef GENTPROT #define GENTPROT( ftype, ch, blasname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* side, \ const f77_char* uploa, \ diff --git a/frame/compat/bla_trsv.c b/frame/compat/bla_trsv.c index 445059720..2717b1940 100644 --- a/frame/compat/bla_trsv.c +++ b/frame/compat/bla_trsv.c @@ -41,7 +41,7 @@ #undef GENTFUNC #define GENTFUNC( ftype, ch, blasname, blisname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* uploa, \ const f77_char* transa, \ diff --git a/frame/compat/bla_trsv.h b/frame/compat/bla_trsv.h index cec3976be..6edb435f1 100644 --- a/frame/compat/bla_trsv.h +++ b/frame/compat/bla_trsv.h @@ -39,7 +39,7 @@ #undef GENTPROT #define GENTPROT( ftype, ch, blasname ) \ \ -void PASTEF77(ch,blasname) \ +BLIS_EXPORT_BLAS void PASTEF77(ch,blasname) \ ( \ const f77_char* uploa, \ const f77_char* transa, \ diff --git a/frame/compat/blis/thread/b77_thread.c b/frame/compat/blis/thread/b77_thread.c index c864339a3..28ba737aa 100644 --- a/frame/compat/blis/thread/b77_thread.c +++ b/frame/compat/blis/thread/b77_thread.c @@ -39,7 +39,7 @@ // Define Fortran-compatible BLIS interfaces. // -void PASTEF770(bli_thread_set_ways) +BLIS_EXPORT_BLAS void PASTEF770(bli_thread_set_ways) ( const f77_int* jc, const f77_int* pc, @@ -71,7 +71,7 @@ void PASTEF770(bli_thread_set_ways) bli_finalize_auto(); } -void PASTEF770(bli_thread_set_num_threads) +BLIS_EXPORT_BLAS void PASTEF770(bli_thread_set_num_threads) ( const f77_int* nt ) diff --git a/frame/compat/blis/thread/b77_thread.h b/frame/compat/blis/thread/b77_thread.h index 0e87f6bb0..922ed6e13 100644 --- a/frame/compat/blis/thread/b77_thread.h +++ b/frame/compat/blis/thread/b77_thread.h @@ -37,7 +37,7 @@ // Prototype Fortran-compatible BLIS interfaces. // -void PASTEF770(bli_thread_set_ways) +BLIS_EXPORT_BLAS void PASTEF770(bli_thread_set_ways) ( const f77_int* jc, const f77_int* pc, @@ -46,7 +46,7 @@ void PASTEF770(bli_thread_set_ways) const f77_int* ir ); -void PASTEF770(bli_thread_set_num_threads) +BLIS_EXPORT_BLAS void PASTEF770(bli_thread_set_num_threads) ( const f77_int* nt ); diff --git a/frame/compat/cblas/f77_sub/f77_amax_sub.c b/frame/compat/cblas/f77_sub/f77_amax_sub.c index cc26196d7..3fa18894c 100644 --- a/frame/compat/cblas/f77_sub/f77_amax_sub.c +++ b/frame/compat/cblas/f77_sub/f77_amax_sub.c @@ -42,7 +42,7 @@ #undef GENTFUNC #define GENTFUNC( ftype_x, chx, blasname, blisname ) \ \ -void PASTEF773(i,chx,blasname,sub) \ +BLIS_EXPORT_BLAS void PASTEF773(i,chx,blasname,sub) \ ( \ const f77_int* n, \ const ftype_x* x, const f77_int* incx, \ diff --git a/frame/compat/cblas/f77_sub/f77_amax_sub.h b/frame/compat/cblas/f77_sub/f77_amax_sub.h index 9a4ebb0af..9cd1202d2 100644 --- a/frame/compat/cblas/f77_sub/f77_amax_sub.h +++ b/frame/compat/cblas/f77_sub/f77_amax_sub.h @@ -39,7 +39,7 @@ #undef GENTPROT #define GENTPROT( ftype_x, chx, blasname ) \ \ -void PASTEF773(i,chx,blasname,sub) \ +BLIS_EXPORT_BLAS void PASTEF773(i,chx,blasname,sub) \ ( \ const f77_int* n, \ const ftype_x* x, const f77_int* incx, \ diff --git a/frame/compat/cblas/f77_sub/f77_asum_sub.c b/frame/compat/cblas/f77_sub/f77_asum_sub.c index f1cb35b0c..f0d4abe43 100644 --- a/frame/compat/cblas/f77_sub/f77_asum_sub.c +++ b/frame/compat/cblas/f77_sub/f77_asum_sub.c @@ -42,7 +42,7 @@ #undef GENTFUNCR2 #define GENTFUNCR2( ftype_x, ftype_r, chx, chr, blasname, blisname ) \ \ -void PASTEF773(chr,chx,blasname,sub) \ +BLIS_EXPORT_BLAS void PASTEF773(chr,chx,blasname,sub) \ ( \ const f77_int* n, \ const ftype_x* x, const f77_int* incx, \ diff --git a/frame/compat/cblas/f77_sub/f77_asum_sub.h b/frame/compat/cblas/f77_sub/f77_asum_sub.h index 2c61e14d0..4b8634c16 100644 --- a/frame/compat/cblas/f77_sub/f77_asum_sub.h +++ b/frame/compat/cblas/f77_sub/f77_asum_sub.h @@ -39,7 +39,7 @@ #undef GENTPROTR2 #define GENTPROTR2( ftype_x, ftype_r, chx, chr, blasname ) \ \ -void PASTEF773(chr,chx,blasname,sub) \ +BLIS_EXPORT_BLAS void PASTEF773(chr,chx,blasname,sub) \ ( \ const f77_int* n, \ const ftype_x* x, const f77_int* incx, \ diff --git a/frame/compat/cblas/f77_sub/f77_dot_sub.c b/frame/compat/cblas/f77_sub/f77_dot_sub.c index 6c06133f1..0dbd5a7e4 100644 --- a/frame/compat/cblas/f77_sub/f77_dot_sub.c +++ b/frame/compat/cblas/f77_sub/f77_dot_sub.c @@ -42,7 +42,7 @@ #undef GENTFUNCDOT #define GENTFUNCDOT( ftype, ch, chc, blis_conjx, blasname, blisname ) \ \ -void PASTEF773(ch,blasname,chc,sub) \ +BLIS_EXPORT_BLAS void PASTEF773(ch,blasname,chc,sub) \ ( \ const f77_int* n, \ const ftype* x, const f77_int* incx, \ @@ -66,7 +66,7 @@ INSERT_GENTFUNCDOT_BLAS( dot, NULL ) // Input vectors stored in single precision, computed in double precision, // with result returned in single precision. -void PASTEF772(sds,dot,sub) +BLIS_EXPORT_BLAS void PASTEF772(sds,dot,sub) ( const f77_int* n, const float* sb, @@ -86,7 +86,7 @@ void PASTEF772(sds,dot,sub) // Input vectors stored in single precision, computed in double precision, // with result returned in double precision. -void PASTEF772(ds,dot,sub) +BLIS_EXPORT_BLAS void PASTEF772(ds,dot,sub) ( const f77_int* n, const float* x, const f77_int* incx, diff --git a/frame/compat/cblas/f77_sub/f77_dot_sub.h b/frame/compat/cblas/f77_sub/f77_dot_sub.h index 2ee169591..8aab2728b 100644 --- a/frame/compat/cblas/f77_sub/f77_dot_sub.h +++ b/frame/compat/cblas/f77_sub/f77_dot_sub.h @@ -39,7 +39,7 @@ #undef GENTPROTDOT #define GENTPROTDOT( ftype, ch, chc, blasname ) \ \ -void PASTEF773(ch,blasname,chc,sub) \ +BLIS_EXPORT_BLAS void PASTEF773(ch,blasname,chc,sub) \ ( \ const f77_int* n, \ const ftype* x, const f77_int* incx, \ @@ -53,7 +53,7 @@ INSERT_GENTPROTDOT_BLAS( dot ) // -- "Black sheep" dot product function prototypes -- -void PASTEF772(sds,dot,sub) +BLIS_EXPORT_BLAS void PASTEF772(sds,dot,sub) ( const f77_int* n, const float* sb, @@ -62,7 +62,7 @@ void PASTEF772(sds,dot,sub) float* rval ); -void PASTEF772(ds,dot,sub) +BLIS_EXPORT_BLAS void PASTEF772(ds,dot,sub) ( const f77_int* n, const float* x, const f77_int* incx, diff --git a/frame/compat/cblas/f77_sub/f77_nrm2_sub.c b/frame/compat/cblas/f77_sub/f77_nrm2_sub.c index 54ce1a5b4..d3b75a5fe 100644 --- a/frame/compat/cblas/f77_sub/f77_nrm2_sub.c +++ b/frame/compat/cblas/f77_sub/f77_nrm2_sub.c @@ -42,7 +42,7 @@ #undef GENTFUNCR2 #define GENTFUNCR2( ftype_x, ftype_r, chx, chr, blasname, blisname ) \ \ -void PASTEF773(chr,chx,blasname,sub) \ +BLIS_EXPORT_BLAS void PASTEF773(chr,chx,blasname,sub) \ ( \ const f77_int* n, \ const ftype_x* x, const f77_int* incx, \ diff --git a/frame/compat/cblas/f77_sub/f77_nrm2_sub.h b/frame/compat/cblas/f77_sub/f77_nrm2_sub.h index df2dd2357..c51a94292 100644 --- a/frame/compat/cblas/f77_sub/f77_nrm2_sub.h +++ b/frame/compat/cblas/f77_sub/f77_nrm2_sub.h @@ -39,7 +39,7 @@ #undef GENTPROTR2 #define GENTPROTR2( ftype_x, ftype_r, chx, chr, blasname ) \ \ -void PASTEF773(chr,chx,blasname,sub) \ +BLIS_EXPORT_BLAS void PASTEF773(chr,chx,blasname,sub) \ ( \ const f77_int* n, \ const ftype_x* x, const f77_int* incx, \ diff --git a/frame/compat/cblas/src/cblas.h b/frame/compat/cblas/src/cblas.h index 1ee6209c9..85778c8a4 100644 --- a/frame/compat/cblas/src/cblas.h +++ b/frame/compat/cblas/src/cblas.h @@ -28,52 +28,52 @@ extern "C" { * Prototypes for level 1 BLAS functions (complex are recast as routines) * =========================================================================== */ -float cblas_sdsdot(f77_int N, float alpha, const float *X, +BLIS_EXPORT_BLAS float cblas_sdsdot(f77_int N, float alpha, const float *X, f77_int incX, const float *Y, f77_int incY); -double cblas_dsdot(f77_int N, const float *X, f77_int incX, const float *Y, +BLIS_EXPORT_BLAS double cblas_dsdot(f77_int N, const float *X, f77_int incX, const float *Y, f77_int incY); -float cblas_sdot(f77_int N, const float *X, f77_int incX, +BLIS_EXPORT_BLAS float cblas_sdot(f77_int N, const float *X, f77_int incX, const float *Y, f77_int incY); -double cblas_ddot(f77_int N, const double *X, f77_int incX, +BLIS_EXPORT_BLAS double cblas_ddot(f77_int N, const double *X, f77_int incX, const double *Y, f77_int incY); /* * Functions having prefixes Z and C only */ -void cblas_cdotu_sub(f77_int N, const void *X, f77_int incX, +BLIS_EXPORT_BLAS void cblas_cdotu_sub(f77_int N, const void *X, f77_int incX, const void *Y, f77_int incY, void *dotu); -void cblas_cdotc_sub(f77_int N, const void *X, f77_int incX, +BLIS_EXPORT_BLAS void cblas_cdotc_sub(f77_int N, const void *X, f77_int incX, const void *Y, f77_int incY, void *dotc); -void cblas_zdotu_sub(f77_int N, const void *X, f77_int incX, +BLIS_EXPORT_BLAS void cblas_zdotu_sub(f77_int N, const void *X, f77_int incX, const void *Y, f77_int incY, void *dotu); -void cblas_zdotc_sub(f77_int N, const void *X, f77_int incX, +BLIS_EXPORT_BLAS void cblas_zdotc_sub(f77_int N, const void *X, f77_int incX, const void *Y, f77_int incY, void *dotc); /* * Functions having prefixes S D SC DZ */ -float cblas_snrm2(f77_int N, const float *X, f77_int incX); -float cblas_sasum(f77_int N, const float *X, f77_int incX); +BLIS_EXPORT_BLAS float cblas_snrm2(f77_int N, const float *X, f77_int incX); +BLIS_EXPORT_BLAS float cblas_sasum(f77_int N, const float *X, f77_int incX); -double cblas_dnrm2(f77_int N, const double *X, f77_int incX); -double cblas_dasum(f77_int N, const double *X, f77_int incX); +BLIS_EXPORT_BLAS double cblas_dnrm2(f77_int N, const double *X, f77_int incX); +BLIS_EXPORT_BLAS double cblas_dasum(f77_int N, const double *X, f77_int incX); -float cblas_scnrm2(f77_int N, const void *X, f77_int incX); -float cblas_scasum(f77_int N, const void *X, f77_int incX); +BLIS_EXPORT_BLAS float cblas_scnrm2(f77_int N, const void *X, f77_int incX); +BLIS_EXPORT_BLAS float cblas_scasum(f77_int N, const void *X, f77_int incX); -double cblas_dznrm2(f77_int N, const void *X, f77_int incX); -double cblas_dzasum(f77_int N, const void *X, f77_int incX); +BLIS_EXPORT_BLAS double cblas_dznrm2(f77_int N, const void *X, f77_int incX); +BLIS_EXPORT_BLAS double cblas_dzasum(f77_int N, const void *X, f77_int incX); /* * Functions having standard 4 prefixes (S D C Z) */ -f77_int cblas_isamax(f77_int N, const float *X, f77_int incX); -f77_int cblas_idamax(f77_int N, const double *X, f77_int incX); -f77_int cblas_icamax(f77_int N, const void *X, f77_int incX); -f77_int cblas_izamax(f77_int N, const void *X, f77_int incX); +BLIS_EXPORT_BLAS f77_int cblas_isamax(f77_int N, const float *X, f77_int incX); +BLIS_EXPORT_BLAS f77_int cblas_idamax(f77_int N, const double *X, f77_int incX); +BLIS_EXPORT_BLAS f77_int cblas_icamax(f77_int N, const void *X, f77_int incX); +BLIS_EXPORT_BLAS f77_int cblas_izamax(f77_int N, const void *X, f77_int incX); /* * =========================================================================== @@ -84,62 +84,62 @@ f77_int cblas_izamax(f77_int N, const void *X, f77_int incX); /* * Routines with standard 4 prefixes (s, d, c, z) */ -void cblas_sswap(f77_int N, float *X, f77_int incX, +void BLIS_EXPORT_BLAS cblas_sswap(f77_int N, float *X, f77_int incX, float *Y, f77_int incY); -void cblas_scopy(f77_int N, const float *X, f77_int incX, +void BLIS_EXPORT_BLAS cblas_scopy(f77_int N, const float *X, f77_int incX, float *Y, f77_int incY); -void cblas_saxpy(f77_int N, float alpha, const float *X, +void BLIS_EXPORT_BLAS cblas_saxpy(f77_int N, float alpha, const float *X, f77_int incX, float *Y, f77_int incY); -void cblas_dswap(f77_int N, double *X, f77_int incX, +void BLIS_EXPORT_BLAS cblas_dswap(f77_int N, double *X, f77_int incX, double *Y, f77_int incY); -void cblas_dcopy(f77_int N, const double *X, f77_int incX, +void BLIS_EXPORT_BLAS cblas_dcopy(f77_int N, const double *X, f77_int incX, double *Y, f77_int incY); -void cblas_daxpy(f77_int N, double alpha, const double *X, +void BLIS_EXPORT_BLAS cblas_daxpy(f77_int N, double alpha, const double *X, f77_int incX, double *Y, f77_int incY); -void cblas_cswap(f77_int N, void *X, f77_int incX, +void BLIS_EXPORT_BLAS cblas_cswap(f77_int N, void *X, f77_int incX, void *Y, f77_int incY); -void cblas_ccopy(f77_int N, const void *X, f77_int incX, +void BLIS_EXPORT_BLAS cblas_ccopy(f77_int N, const void *X, f77_int incX, void *Y, f77_int incY); -void cblas_caxpy(f77_int N, const void *alpha, const void *X, +void BLIS_EXPORT_BLAS cblas_caxpy(f77_int N, const void *alpha, const void *X, f77_int incX, void *Y, f77_int incY); -void cblas_zswap(f77_int N, void *X, f77_int incX, +void BLIS_EXPORT_BLAS cblas_zswap(f77_int N, void *X, f77_int incX, void *Y, f77_int incY); -void cblas_zcopy(f77_int N, const void *X, f77_int incX, +void BLIS_EXPORT_BLAS cblas_zcopy(f77_int N, const void *X, f77_int incX, void *Y, f77_int incY); -void cblas_zaxpy(f77_int N, const void *alpha, const void *X, +void BLIS_EXPORT_BLAS cblas_zaxpy(f77_int N, const void *alpha, const void *X, f77_int incX, void *Y, f77_int incY); /* * Routines with S and D prefix only */ -void cblas_srotg(float *a, float *b, float *c, float *s); -void cblas_srotmg(float *d1, float *d2, float *b1, const float b2, float *P); -void cblas_srot(f77_int N, float *X, f77_int incX, +void BLIS_EXPORT_BLAS cblas_srotg(float *a, float *b, float *c, float *s); +void BLIS_EXPORT_BLAS cblas_srotmg(float *d1, float *d2, float *b1, const float b2, float *P); +void BLIS_EXPORT_BLAS cblas_srot(f77_int N, float *X, f77_int incX, float *Y, f77_int incY, const float c, const float s); -void cblas_srotm(f77_int N, float *X, f77_int incX, +void BLIS_EXPORT_BLAS cblas_srotm(f77_int N, float *X, f77_int incX, float *Y, f77_int incY, const float *P); -void cblas_drotg(double *a, double *b, double *c, double *s); -void cblas_drotmg(double *d1, double *d2, double *b1, const double b2, double *P); -void cblas_drot(f77_int N, double *X, f77_int incX, +void BLIS_EXPORT_BLAS cblas_drotg(double *a, double *b, double *c, double *s); +void BLIS_EXPORT_BLAS cblas_drotmg(double *d1, double *d2, double *b1, const double b2, double *P); +void BLIS_EXPORT_BLAS cblas_drot(f77_int N, double *X, f77_int incX, double *Y, f77_int incY, const double c, const double s); -void cblas_drotm(f77_int N, double *X, f77_int incX, +void BLIS_EXPORT_BLAS cblas_drotm(f77_int N, double *X, f77_int incX, double *Y, f77_int incY, const double *P); /* * Routines with S D C Z CS and ZD prefixes */ -void cblas_sscal(f77_int N, float alpha, float *X, f77_int incX); -void cblas_dscal(f77_int N, double alpha, double *X, f77_int incX); -void cblas_cscal(f77_int N, const void *alpha, void *X, f77_int incX); -void cblas_zscal(f77_int N, const void *alpha, void *X, f77_int incX); -void cblas_csscal(f77_int N, float alpha, void *X, f77_int incX); -void cblas_zdscal(f77_int N, double alpha, void *X, f77_int incX); +void BLIS_EXPORT_BLAS cblas_sscal(f77_int N, float alpha, float *X, f77_int incX); +void BLIS_EXPORT_BLAS cblas_dscal(f77_int N, double alpha, double *X, f77_int incX); +void BLIS_EXPORT_BLAS cblas_cscal(f77_int N, const void *alpha, void *X, f77_int incX); +void BLIS_EXPORT_BLAS cblas_zscal(f77_int N, const void *alpha, void *X, f77_int incX); +void BLIS_EXPORT_BLAS cblas_csscal(f77_int N, float alpha, void *X, f77_int incX); +void BLIS_EXPORT_BLAS cblas_zdscal(f77_int N, double alpha, void *X, f77_int incX); /* * =========================================================================== @@ -150,135 +150,135 @@ void cblas_zdscal(f77_int N, double alpha, void *X, f77_int incX); /* * Routines with standard 4 prefixes (S, D, C, Z) */ -void cblas_sgemv(enum CBLAS_ORDER order, +void BLIS_EXPORT_BLAS cblas_sgemv(enum CBLAS_ORDER order, enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, float alpha, const float *A, f77_int lda, const float *X, f77_int incX, float beta, float *Y, f77_int incY); -void cblas_sgbmv(enum CBLAS_ORDER order, +void BLIS_EXPORT_BLAS cblas_sgbmv(enum CBLAS_ORDER order, enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, f77_int KL, f77_int KU, float alpha, const float *A, f77_int lda, const float *X, f77_int incX, float beta, float *Y, f77_int incY); -void cblas_strmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_strmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const float *A, f77_int lda, float *X, f77_int incX); -void cblas_stbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_stbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, f77_int K, const float *A, f77_int lda, float *X, f77_int incX); -void cblas_stpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_stpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const float *Ap, float *X, f77_int incX); -void cblas_strsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_strsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const float *A, f77_int lda, float *X, f77_int incX); -void cblas_stbsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_stbsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, f77_int K, const float *A, f77_int lda, float *X, f77_int incX); -void cblas_stpsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_stpsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const float *Ap, float *X, f77_int incX); -void cblas_dgemv(enum CBLAS_ORDER order, +void BLIS_EXPORT_BLAS cblas_dgemv(enum CBLAS_ORDER order, enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, double alpha, const double *A, f77_int lda, const double *X, f77_int incX, double beta, double *Y, f77_int incY); -void cblas_dgbmv(enum CBLAS_ORDER order, +void BLIS_EXPORT_BLAS cblas_dgbmv(enum CBLAS_ORDER order, enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, f77_int KL, f77_int KU, double alpha, const double *A, f77_int lda, const double *X, f77_int incX, double beta, double *Y, f77_int incY); -void cblas_dtrmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_dtrmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const double *A, f77_int lda, double *X, f77_int incX); -void cblas_dtbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_dtbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, f77_int K, const double *A, f77_int lda, double *X, f77_int incX); -void cblas_dtpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_dtpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const double *Ap, double *X, f77_int incX); -void cblas_dtrsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_dtrsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const double *A, f77_int lda, double *X, f77_int incX); -void cblas_dtbsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_dtbsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, f77_int K, const double *A, f77_int lda, double *X, f77_int incX); -void cblas_dtpsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_dtpsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const double *Ap, double *X, f77_int incX); -void cblas_cgemv(enum CBLAS_ORDER order, +void BLIS_EXPORT_BLAS cblas_cgemv(enum CBLAS_ORDER order, enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, const void *alpha, const void *A, f77_int lda, const void *X, f77_int incX, const void *beta, void *Y, f77_int incY); -void cblas_cgbmv(enum CBLAS_ORDER order, +void BLIS_EXPORT_BLAS cblas_cgbmv(enum CBLAS_ORDER order, enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, f77_int KL, f77_int KU, const void *alpha, const void *A, f77_int lda, const void *X, f77_int incX, const void *beta, void *Y, f77_int incY); -void cblas_ctrmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ctrmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const void *A, f77_int lda, void *X, f77_int incX); -void cblas_ctbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ctbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, f77_int K, const void *A, f77_int lda, void *X, f77_int incX); -void cblas_ctpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ctpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const void *Ap, void *X, f77_int incX); -void cblas_ctrsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ctrsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const void *A, f77_int lda, void *X, f77_int incX); -void cblas_ctbsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ctbsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, f77_int K, const void *A, f77_int lda, void *X, f77_int incX); -void cblas_ctpsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ctpsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const void *Ap, void *X, f77_int incX); -void cblas_zgemv(enum CBLAS_ORDER order, +void BLIS_EXPORT_BLAS cblas_zgemv(enum CBLAS_ORDER order, enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, const void *alpha, const void *A, f77_int lda, const void *X, f77_int incX, const void *beta, void *Y, f77_int incY); -void cblas_zgbmv(enum CBLAS_ORDER order, +void BLIS_EXPORT_BLAS cblas_zgbmv(enum CBLAS_ORDER order, enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, f77_int KL, f77_int KU, const void *alpha, const void *A, f77_int lda, const void *X, f77_int incX, const void *beta, void *Y, f77_int incY); -void cblas_ztrmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ztrmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const void *A, f77_int lda, void *X, f77_int incX); -void cblas_ztbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ztbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, f77_int K, const void *A, f77_int lda, void *X, f77_int incX); -void cblas_ztpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ztpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const void *Ap, void *X, f77_int incX); -void cblas_ztrsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ztrsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const void *A, f77_int lda, void *X, f77_int incX); -void cblas_ztbsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ztbsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, f77_int K, const void *A, f77_int lda, void *X, f77_int incX); -void cblas_ztpsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ztpsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const void *Ap, void *X, f77_int incX); @@ -286,61 +286,61 @@ void cblas_ztpsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, /* * Routines with S and D prefixes only */ -void cblas_ssymv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ssymv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, float alpha, const float *A, f77_int lda, const float *X, f77_int incX, float beta, float *Y, f77_int incY); -void cblas_ssbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ssbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, f77_int K, float alpha, const float *A, f77_int lda, const float *X, f77_int incX, float beta, float *Y, f77_int incY); -void cblas_sspmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_sspmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, float alpha, const float *Ap, const float *X, f77_int incX, float beta, float *Y, f77_int incY); -void cblas_sger(enum CBLAS_ORDER order, f77_int M, f77_int N, +void BLIS_EXPORT_BLAS cblas_sger(enum CBLAS_ORDER order, f77_int M, f77_int N, float alpha, const float *X, f77_int incX, const float *Y, f77_int incY, float *A, f77_int lda); -void cblas_ssyr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ssyr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, float alpha, const float *X, f77_int incX, float *A, f77_int lda); -void cblas_sspr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_sspr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, float alpha, const float *X, f77_int incX, float *Ap); -void cblas_ssyr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ssyr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, float alpha, const float *X, f77_int incX, const float *Y, f77_int incY, float *A, f77_int lda); -void cblas_sspr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_sspr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, float alpha, const float *X, f77_int incX, const float *Y, f77_int incY, float *A); -void cblas_dsymv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_dsymv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, double alpha, const double *A, f77_int lda, const double *X, f77_int incX, double beta, double *Y, f77_int incY); -void cblas_dsbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_dsbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, f77_int K, double alpha, const double *A, f77_int lda, const double *X, f77_int incX, double beta, double *Y, f77_int incY); -void cblas_dspmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_dspmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, double alpha, const double *Ap, const double *X, f77_int incX, double beta, double *Y, f77_int incY); -void cblas_dger(enum CBLAS_ORDER order, f77_int M, f77_int N, +void BLIS_EXPORT_BLAS cblas_dger(enum CBLAS_ORDER order, f77_int M, f77_int N, double alpha, const double *X, f77_int incX, const double *Y, f77_int incY, double *A, f77_int lda); -void cblas_dsyr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_dsyr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, double alpha, const double *X, f77_int incX, double *A, f77_int lda); -void cblas_dspr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_dspr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, double alpha, const double *X, f77_int incX, double *Ap); -void cblas_dsyr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_dsyr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, double alpha, const double *X, f77_int incX, const double *Y, f77_int incY, double *A, f77_int lda); -void cblas_dspr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_dspr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, double alpha, const double *X, f77_int incX, const double *Y, f77_int incY, double *A); @@ -348,65 +348,65 @@ void cblas_dspr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, /* * Routines with C and Z prefixes only */ -void cblas_chemv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_chemv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, const void *alpha, const void *A, f77_int lda, const void *X, f77_int incX, const void *beta, void *Y, f77_int incY); -void cblas_chbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_chbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, f77_int K, const void *alpha, const void *A, f77_int lda, const void *X, f77_int incX, const void *beta, void *Y, f77_int incY); -void cblas_chpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_chpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, const void *alpha, const void *Ap, const void *X, f77_int incX, const void *beta, void *Y, f77_int incY); -void cblas_cgeru(enum CBLAS_ORDER order, f77_int M, f77_int N, +void BLIS_EXPORT_BLAS cblas_cgeru(enum CBLAS_ORDER order, f77_int M, f77_int N, const void *alpha, const void *X, f77_int incX, const void *Y, f77_int incY, void *A, f77_int lda); -void cblas_cgerc(enum CBLAS_ORDER order, f77_int M, f77_int N, +void BLIS_EXPORT_BLAS cblas_cgerc(enum CBLAS_ORDER order, f77_int M, f77_int N, const void *alpha, const void *X, f77_int incX, const void *Y, f77_int incY, void *A, f77_int lda); -void cblas_cher(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_cher(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, float alpha, const void *X, f77_int incX, void *A, f77_int lda); -void cblas_chpr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_chpr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, float alpha, const void *X, f77_int incX, void *A); -void cblas_cher2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, +void BLIS_EXPORT_BLAS cblas_cher2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, const void *alpha, const void *X, f77_int incX, const void *Y, f77_int incY, void *A, f77_int lda); -void cblas_chpr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, +void BLIS_EXPORT_BLAS cblas_chpr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, const void *alpha, const void *X, f77_int incX, const void *Y, f77_int incY, void *Ap); -void cblas_zhemv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_zhemv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, const void *alpha, const void *A, f77_int lda, const void *X, f77_int incX, const void *beta, void *Y, f77_int incY); -void cblas_zhbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_zhbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, f77_int K, const void *alpha, const void *A, f77_int lda, const void *X, f77_int incX, const void *beta, void *Y, f77_int incY); -void cblas_zhpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_zhpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, const void *alpha, const void *Ap, const void *X, f77_int incX, const void *beta, void *Y, f77_int incY); -void cblas_zgeru(enum CBLAS_ORDER order, f77_int M, f77_int N, +void BLIS_EXPORT_BLAS cblas_zgeru(enum CBLAS_ORDER order, f77_int M, f77_int N, const void *alpha, const void *X, f77_int incX, const void *Y, f77_int incY, void *A, f77_int lda); -void cblas_zgerc(enum CBLAS_ORDER order, f77_int M, f77_int N, +void BLIS_EXPORT_BLAS cblas_zgerc(enum CBLAS_ORDER order, f77_int M, f77_int N, const void *alpha, const void *X, f77_int incX, const void *Y, f77_int incY, void *A, f77_int lda); -void cblas_zher(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_zher(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, double alpha, const void *X, f77_int incX, void *A, f77_int lda); -void cblas_zhpr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_zhpr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, double alpha, const void *X, f77_int incX, void *A); -void cblas_zher2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, +void BLIS_EXPORT_BLAS cblas_zher2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, const void *alpha, const void *X, f77_int incX, const void *Y, f77_int incY, void *A, f77_int lda); -void cblas_zhpr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, +void BLIS_EXPORT_BLAS cblas_zhpr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, const void *alpha, const void *X, f77_int incX, const void *Y, f77_int incY, void *Ap); @@ -419,121 +419,121 @@ void cblas_zhpr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, /* * Routines with standard 4 prefixes (S, D, C, Z) */ -void cblas_sgemm(enum CBLAS_ORDER Order, enum CBLAS_TRANSPOSE TransA, +void BLIS_EXPORT_BLAS cblas_sgemm(enum CBLAS_ORDER Order, enum CBLAS_TRANSPOSE TransA, enum CBLAS_TRANSPOSE TransB, f77_int M, f77_int N, f77_int K, float alpha, const float *A, f77_int lda, const float *B, f77_int ldb, float beta, float *C, f77_int ldc); -void cblas_ssymm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, +void BLIS_EXPORT_BLAS cblas_ssymm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo, f77_int M, f77_int N, float alpha, const float *A, f77_int lda, const float *B, f77_int ldb, float beta, float *C, f77_int ldc); -void cblas_ssyrk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ssyrk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, float alpha, const float *A, f77_int lda, float beta, float *C, f77_int ldc); -void cblas_ssyr2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ssyr2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, float alpha, const float *A, f77_int lda, const float *B, f77_int ldb, float beta, float *C, f77_int ldc); -void cblas_strmm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, +void BLIS_EXPORT_BLAS cblas_strmm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int M, f77_int N, float alpha, const float *A, f77_int lda, float *B, f77_int ldb); -void cblas_strsm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, +void BLIS_EXPORT_BLAS cblas_strsm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int M, f77_int N, float alpha, const float *A, f77_int lda, float *B, f77_int ldb); -void cblas_dgemm(enum CBLAS_ORDER Order, enum CBLAS_TRANSPOSE TransA, +void BLIS_EXPORT_BLAS cblas_dgemm(enum CBLAS_ORDER Order, enum CBLAS_TRANSPOSE TransA, enum CBLAS_TRANSPOSE TransB, f77_int M, f77_int N, f77_int K, double alpha, const double *A, f77_int lda, const double *B, f77_int ldb, double beta, double *C, f77_int ldc); -void cblas_dsymm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, +void BLIS_EXPORT_BLAS cblas_dsymm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo, f77_int M, f77_int N, double alpha, const double *A, f77_int lda, const double *B, f77_int ldb, double beta, double *C, f77_int ldc); -void cblas_dsyrk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_dsyrk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, double alpha, const double *A, f77_int lda, double beta, double *C, f77_int ldc); -void cblas_dsyr2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_dsyr2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, double alpha, const double *A, f77_int lda, const double *B, f77_int ldb, double beta, double *C, f77_int ldc); -void cblas_dtrmm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, +void BLIS_EXPORT_BLAS cblas_dtrmm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int M, f77_int N, double alpha, const double *A, f77_int lda, double *B, f77_int ldb); -void cblas_dtrsm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, +void BLIS_EXPORT_BLAS cblas_dtrsm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int M, f77_int N, double alpha, const double *A, f77_int lda, double *B, f77_int ldb); -void cblas_cgemm(enum CBLAS_ORDER Order, enum CBLAS_TRANSPOSE TransA, +void BLIS_EXPORT_BLAS cblas_cgemm(enum CBLAS_ORDER Order, enum CBLAS_TRANSPOSE TransA, enum CBLAS_TRANSPOSE TransB, f77_int M, f77_int N, f77_int K, const void *alpha, const void *A, f77_int lda, const void *B, f77_int ldb, const void *beta, void *C, f77_int ldc); -void cblas_csymm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, +void BLIS_EXPORT_BLAS cblas_csymm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo, f77_int M, f77_int N, const void *alpha, const void *A, f77_int lda, const void *B, f77_int ldb, const void *beta, void *C, f77_int ldc); -void cblas_csyrk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_csyrk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, const void *alpha, const void *A, f77_int lda, const void *beta, void *C, f77_int ldc); -void cblas_csyr2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_csyr2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, const void *alpha, const void *A, f77_int lda, const void *B, f77_int ldb, const void *beta, void *C, f77_int ldc); -void cblas_ctrmm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, +void BLIS_EXPORT_BLAS cblas_ctrmm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int M, f77_int N, const void *alpha, const void *A, f77_int lda, void *B, f77_int ldb); -void cblas_ctrsm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, +void BLIS_EXPORT_BLAS cblas_ctrsm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int M, f77_int N, const void *alpha, const void *A, f77_int lda, void *B, f77_int ldb); -void cblas_zgemm(enum CBLAS_ORDER Order, enum CBLAS_TRANSPOSE TransA, +void BLIS_EXPORT_BLAS cblas_zgemm(enum CBLAS_ORDER Order, enum CBLAS_TRANSPOSE TransA, enum CBLAS_TRANSPOSE TransB, f77_int M, f77_int N, f77_int K, const void *alpha, const void *A, f77_int lda, const void *B, f77_int ldb, const void *beta, void *C, f77_int ldc); -void cblas_zsymm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, +void BLIS_EXPORT_BLAS cblas_zsymm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo, f77_int M, f77_int N, const void *alpha, const void *A, f77_int lda, const void *B, f77_int ldb, const void *beta, void *C, f77_int ldc); -void cblas_zsyrk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_zsyrk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, const void *alpha, const void *A, f77_int lda, const void *beta, void *C, f77_int ldc); -void cblas_zsyr2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_zsyr2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, const void *alpha, const void *A, f77_int lda, const void *B, f77_int ldb, const void *beta, void *C, f77_int ldc); -void cblas_ztrmm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, +void BLIS_EXPORT_BLAS cblas_ztrmm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int M, f77_int N, const void *alpha, const void *A, f77_int lda, void *B, f77_int ldb); -void cblas_ztrsm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, +void BLIS_EXPORT_BLAS cblas_ztrsm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int M, f77_int N, const void *alpha, const void *A, f77_int lda, @@ -543,37 +543,37 @@ void cblas_ztrsm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, /* * Routines with prefixes C and Z only */ -void cblas_chemm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, +void BLIS_EXPORT_BLAS cblas_chemm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo, f77_int M, f77_int N, const void *alpha, const void *A, f77_int lda, const void *B, f77_int ldb, const void *beta, void *C, f77_int ldc); -void cblas_cherk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_cherk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, float alpha, const void *A, f77_int lda, float beta, void *C, f77_int ldc); -void cblas_cher2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_cher2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, const void *alpha, const void *A, f77_int lda, const void *B, f77_int ldb, float beta, void *C, f77_int ldc); -void cblas_zhemm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, +void BLIS_EXPORT_BLAS cblas_zhemm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo, f77_int M, f77_int N, const void *alpha, const void *A, f77_int lda, const void *B, f77_int ldb, const void *beta, void *C, f77_int ldc); -void cblas_zherk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_zherk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, double alpha, const void *A, f77_int lda, double beta, void *C, f77_int ldc); -void cblas_zher2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_zher2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, const void *alpha, const void *A, f77_int lda, const void *B, f77_int ldb, double beta, void *C, f77_int ldc); -void cblas_xerbla(f77_int p, const char *rout, const char *form, ...); +void BLIS_EXPORT_BLAS cblas_xerbla(f77_int p, const char *rout, const char *form, ...); #ifdef __cplusplus } diff --git a/frame/compat/cblas/src/cblas_caxpy.c b/frame/compat/cblas/src/cblas_caxpy.c index 748d146c6..fe63ecc5f 100644 --- a/frame/compat/cblas/src/cblas_caxpy.c +++ b/frame/compat/cblas/src/cblas_caxpy.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_caxpy( f77_int N, const void *alpha, const void *X, +void BLIS_EXPORT_BLAS cblas_caxpy( f77_int N, const void *alpha, const void *X, f77_int incX, void *Y, f77_int incY) { #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_ccopy.c b/frame/compat/cblas/src/cblas_ccopy.c index 8871680b1..3334a0c6b 100644 --- a/frame/compat/cblas/src/cblas_ccopy.c +++ b/frame/compat/cblas/src/cblas_ccopy.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_ccopy( f77_int N, const void *X, +void BLIS_EXPORT_BLAS cblas_ccopy( f77_int N, const void *X, f77_int incX, void *Y, f77_int incY) { #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_cdotc_sub.c b/frame/compat/cblas/src/cblas_cdotc_sub.c index d0800ca4f..8ba14bf96 100644 --- a/frame/compat/cblas/src/cblas_cdotc_sub.c +++ b/frame/compat/cblas/src/cblas_cdotc_sub.c @@ -11,7 +11,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_cdotc_sub( f77_int N, const void *X, f77_int incX, +void BLIS_EXPORT_BLAS cblas_cdotc_sub( f77_int N, const void *X, f77_int incX, const void *Y, f77_int incY,void *dotc) { #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_cdotu_sub.c b/frame/compat/cblas/src/cblas_cdotu_sub.c index fd14f5bb4..af5d14a55 100644 --- a/frame/compat/cblas/src/cblas_cdotu_sub.c +++ b/frame/compat/cblas/src/cblas_cdotu_sub.c @@ -11,7 +11,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_cdotu_sub( f77_int N, const void *X, +void BLIS_EXPORT_BLAS cblas_cdotu_sub( f77_int N, const void *X, f77_int incX, const void *Y, f77_int incY,void *dotu) { #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_cgbmv.c b/frame/compat/cblas/src/cblas_cgbmv.c index 74872186e..1be1c3838 100644 --- a/frame/compat/cblas/src/cblas_cgbmv.c +++ b/frame/compat/cblas/src/cblas_cgbmv.c @@ -11,7 +11,7 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_cgbmv(enum CBLAS_ORDER order, +void BLIS_EXPORT_BLAS cblas_cgbmv(enum CBLAS_ORDER order, enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, f77_int KL, f77_int KU, const void *alpha, const void *A, f77_int lda, diff --git a/frame/compat/cblas/src/cblas_cgemm.c b/frame/compat/cblas/src/cblas_cgemm.c index 5680a19f6..343140922 100644 --- a/frame/compat/cblas/src/cblas_cgemm.c +++ b/frame/compat/cblas/src/cblas_cgemm.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_cgemm(enum CBLAS_ORDER Order, enum CBLAS_TRANSPOSE TransA, +void BLIS_EXPORT_BLAS cblas_cgemm(enum CBLAS_ORDER Order, enum CBLAS_TRANSPOSE TransA, enum CBLAS_TRANSPOSE TransB, f77_int M, f77_int N, f77_int K, const void *alpha, const void *A, f77_int lda, const void *B, f77_int ldb, diff --git a/frame/compat/cblas/src/cblas_cgemv.c b/frame/compat/cblas/src/cblas_cgemv.c index e5d226262..3203b4d6e 100644 --- a/frame/compat/cblas/src/cblas_cgemv.c +++ b/frame/compat/cblas/src/cblas_cgemv.c @@ -11,7 +11,7 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_cgemv(enum CBLAS_ORDER order, +void BLIS_EXPORT_BLAS cblas_cgemv(enum CBLAS_ORDER order, enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, const void *alpha, const void *A, f77_int lda, const void *X, f77_int incX, const void *beta, diff --git a/frame/compat/cblas/src/cblas_cgerc.c b/frame/compat/cblas/src/cblas_cgerc.c index dc582dd04..4f84d1c24 100644 --- a/frame/compat/cblas/src/cblas_cgerc.c +++ b/frame/compat/cblas/src/cblas_cgerc.c @@ -11,7 +11,7 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_cgerc(enum CBLAS_ORDER order, f77_int M, f77_int N, +void BLIS_EXPORT_BLAS cblas_cgerc(enum CBLAS_ORDER order, f77_int M, f77_int N, const void *alpha, const void *X, f77_int incX, const void *Y, f77_int incY, void *A, f77_int lda) { diff --git a/frame/compat/cblas/src/cblas_cgeru.c b/frame/compat/cblas/src/cblas_cgeru.c index 6339ef08a..c494d24d7 100644 --- a/frame/compat/cblas/src/cblas_cgeru.c +++ b/frame/compat/cblas/src/cblas_cgeru.c @@ -9,7 +9,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_cgeru(enum CBLAS_ORDER order, f77_int M, f77_int N, +void BLIS_EXPORT_BLAS cblas_cgeru(enum CBLAS_ORDER order, f77_int M, f77_int N, const void *alpha, const void *X, f77_int incX, const void *Y, f77_int incY, void *A, f77_int lda) { diff --git a/frame/compat/cblas/src/cblas_chbmv.c b/frame/compat/cblas/src/cblas_chbmv.c index 463f8ef25..d2f128dcd 100644 --- a/frame/compat/cblas/src/cblas_chbmv.c +++ b/frame/compat/cblas/src/cblas_chbmv.c @@ -11,7 +11,7 @@ #include "cblas_f77.h" #include #include -void cblas_chbmv(enum CBLAS_ORDER order, +void BLIS_EXPORT_BLAS cblas_chbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo,f77_int N,f77_int K, const void *alpha, const void *A, f77_int lda, const void *X, f77_int incX, const void *beta, diff --git a/frame/compat/cblas/src/cblas_chemm.c b/frame/compat/cblas/src/cblas_chemm.c index e8e1e374d..f2e772edb 100644 --- a/frame/compat/cblas/src/cblas_chemm.c +++ b/frame/compat/cblas/src/cblas_chemm.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_chemm(enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, +void BLIS_EXPORT_BLAS cblas_chemm(enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo, f77_int M, f77_int N, const void *alpha, const void *A, f77_int lda, const void *B, f77_int ldb, const void *beta, diff --git a/frame/compat/cblas/src/cblas_chemv.c b/frame/compat/cblas/src/cblas_chemv.c index b1df3ef12..949ece77c 100644 --- a/frame/compat/cblas/src/cblas_chemv.c +++ b/frame/compat/cblas/src/cblas_chemv.c @@ -11,7 +11,7 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_chemv(enum CBLAS_ORDER order, +void BLIS_EXPORT_BLAS cblas_chemv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, const void *alpha, const void *A, f77_int lda, const void *X, f77_int incX, const void *beta, diff --git a/frame/compat/cblas/src/cblas_cher.c b/frame/compat/cblas/src/cblas_cher.c index 05e1c684a..01f7ccc69 100644 --- a/frame/compat/cblas/src/cblas_cher.c +++ b/frame/compat/cblas/src/cblas_cher.c @@ -11,7 +11,7 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_cher(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_cher(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, float alpha, const void *X, f77_int incX ,void *A, f77_int lda) { diff --git a/frame/compat/cblas/src/cblas_cher2.c b/frame/compat/cblas/src/cblas_cher2.c index 9b82423d6..1eb711f33 100644 --- a/frame/compat/cblas/src/cblas_cher2.c +++ b/frame/compat/cblas/src/cblas_cher2.c @@ -11,7 +11,7 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_cher2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_cher2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, const void *alpha, const void *X, f77_int incX, const void *Y, f77_int incY, void *A, f77_int lda) { diff --git a/frame/compat/cblas/src/cblas_cher2k.c b/frame/compat/cblas/src/cblas_cher2k.c index fcd1c4b01..6e3e3b01d 100644 --- a/frame/compat/cblas/src/cblas_cher2k.c +++ b/frame/compat/cblas/src/cblas_cher2k.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_cher2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_cher2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, const void *alpha, const void *A, f77_int lda, const void *B, f77_int ldb, float beta, diff --git a/frame/compat/cblas/src/cblas_cherk.c b/frame/compat/cblas/src/cblas_cherk.c index 80bc4a7a8..8adf3c2b9 100644 --- a/frame/compat/cblas/src/cblas_cherk.c +++ b/frame/compat/cblas/src/cblas_cherk.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_cherk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_cherk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, float alpha, const void *A, f77_int lda, float beta, void *C, f77_int ldc) diff --git a/frame/compat/cblas/src/cblas_chpmv.c b/frame/compat/cblas/src/cblas_chpmv.c index 5857070a0..79c72b090 100644 --- a/frame/compat/cblas/src/cblas_chpmv.c +++ b/frame/compat/cblas/src/cblas_chpmv.c @@ -11,7 +11,7 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_chpmv(enum CBLAS_ORDER order, +void BLIS_EXPORT_BLAS cblas_chpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo,f77_int N, const void *alpha, const void *AP, const void *X, f77_int incX, const void *beta, diff --git a/frame/compat/cblas/src/cblas_chpr.c b/frame/compat/cblas/src/cblas_chpr.c index cd2f5baa3..031b275a2 100644 --- a/frame/compat/cblas/src/cblas_chpr.c +++ b/frame/compat/cblas/src/cblas_chpr.c @@ -11,7 +11,7 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_chpr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_chpr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, float alpha, const void *X, f77_int incX, void *A) { diff --git a/frame/compat/cblas/src/cblas_chpr2.c b/frame/compat/cblas/src/cblas_chpr2.c index f696083ab..67e1a6aaa 100644 --- a/frame/compat/cblas/src/cblas_chpr2.c +++ b/frame/compat/cblas/src/cblas_chpr2.c @@ -11,7 +11,7 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_chpr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_chpr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N,const void *alpha, const void *X, f77_int incX,const void *Y, f77_int incY, void *Ap) diff --git a/frame/compat/cblas/src/cblas_cscal.c b/frame/compat/cblas/src/cblas_cscal.c index 966b93ae9..5e3aaff2b 100644 --- a/frame/compat/cblas/src/cblas_cscal.c +++ b/frame/compat/cblas/src/cblas_cscal.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_cscal( f77_int N, const void *alpha, void *X, +void BLIS_EXPORT_BLAS cblas_cscal( f77_int N, const void *alpha, void *X, f77_int incX) { #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_csscal.c b/frame/compat/cblas/src/cblas_csscal.c index b2940d7d4..f40e88976 100644 --- a/frame/compat/cblas/src/cblas_csscal.c +++ b/frame/compat/cblas/src/cblas_csscal.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_csscal( f77_int N, float alpha, void *X, +void BLIS_EXPORT_BLAS cblas_csscal( f77_int N, float alpha, void *X, f77_int incX) { #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_cswap.c b/frame/compat/cblas/src/cblas_cswap.c index a5713a24c..d5b166e5e 100644 --- a/frame/compat/cblas/src/cblas_cswap.c +++ b/frame/compat/cblas/src/cblas_cswap.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_cswap( f77_int N, void *X, f77_int incX, void *Y, +void BLIS_EXPORT_BLAS cblas_cswap( f77_int N, void *X, f77_int incX, void *Y, f77_int incY) { #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_csymm.c b/frame/compat/cblas/src/cblas_csymm.c index 22cb266e4..9d2d34a3f 100644 --- a/frame/compat/cblas/src/cblas_csymm.c +++ b/frame/compat/cblas/src/cblas_csymm.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_csymm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, +void BLIS_EXPORT_BLAS cblas_csymm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo, f77_int M, f77_int N, const void *alpha, const void *A, f77_int lda, const void *B, f77_int ldb, const void *beta, diff --git a/frame/compat/cblas/src/cblas_csyr2k.c b/frame/compat/cblas/src/cblas_csyr2k.c index c47072d74..a6f32622e 100644 --- a/frame/compat/cblas/src/cblas_csyr2k.c +++ b/frame/compat/cblas/src/cblas_csyr2k.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_csyr2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_csyr2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, const void *alpha, const void *A, f77_int lda, const void *B, f77_int ldb, const void *beta, diff --git a/frame/compat/cblas/src/cblas_csyrk.c b/frame/compat/cblas/src/cblas_csyrk.c index 94d9e2a8f..7a085e45c 100644 --- a/frame/compat/cblas/src/cblas_csyrk.c +++ b/frame/compat/cblas/src/cblas_csyrk.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_csyrk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_csyrk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, const void *alpha, const void *A, f77_int lda, const void *beta, void *C, f77_int ldc) diff --git a/frame/compat/cblas/src/cblas_ctbmv.c b/frame/compat/cblas/src/cblas_ctbmv.c index 8dd2499c7..3689facfb 100644 --- a/frame/compat/cblas/src/cblas_ctbmv.c +++ b/frame/compat/cblas/src/cblas_ctbmv.c @@ -9,7 +9,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_ctbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ctbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, f77_int K, const void *A, f77_int lda, void *X, f77_int incX) diff --git a/frame/compat/cblas/src/cblas_ctbsv.c b/frame/compat/cblas/src/cblas_ctbsv.c index d9dfdcd22..2f4832922 100644 --- a/frame/compat/cblas/src/cblas_ctbsv.c +++ b/frame/compat/cblas/src/cblas_ctbsv.c @@ -9,7 +9,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_ctbsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ctbsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, f77_int K, const void *A, f77_int lda, void *X, f77_int incX) diff --git a/frame/compat/cblas/src/cblas_ctpmv.c b/frame/compat/cblas/src/cblas_ctpmv.c index 8f9cb33a4..6a384baa1 100644 --- a/frame/compat/cblas/src/cblas_ctpmv.c +++ b/frame/compat/cblas/src/cblas_ctpmv.c @@ -9,7 +9,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_ctpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ctpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const void *Ap, void *X, f77_int incX) { diff --git a/frame/compat/cblas/src/cblas_ctpsv.c b/frame/compat/cblas/src/cblas_ctpsv.c index 77d5821e3..e76a1ba4d 100644 --- a/frame/compat/cblas/src/cblas_ctpsv.c +++ b/frame/compat/cblas/src/cblas_ctpsv.c @@ -9,7 +9,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_ctpsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ctpsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const void *Ap, void *X, f77_int incX) { diff --git a/frame/compat/cblas/src/cblas_ctrmm.c b/frame/compat/cblas/src/cblas_ctrmm.c index 7eb621f3b..5335bf893 100644 --- a/frame/compat/cblas/src/cblas_ctrmm.c +++ b/frame/compat/cblas/src/cblas_ctrmm.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_ctrmm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, +void BLIS_EXPORT_BLAS cblas_ctrmm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int M, f77_int N, const void *alpha, const void *A, f77_int lda, diff --git a/frame/compat/cblas/src/cblas_ctrmv.c b/frame/compat/cblas/src/cblas_ctrmv.c index 756720207..f546a6a6f 100644 --- a/frame/compat/cblas/src/cblas_ctrmv.c +++ b/frame/compat/cblas/src/cblas_ctrmv.c @@ -9,7 +9,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_ctrmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ctrmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const void *A, f77_int lda, void *X, f77_int incX) diff --git a/frame/compat/cblas/src/cblas_ctrsm.c b/frame/compat/cblas/src/cblas_ctrsm.c index f6e016a21..04b1f0f71 100644 --- a/frame/compat/cblas/src/cblas_ctrsm.c +++ b/frame/compat/cblas/src/cblas_ctrsm.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_ctrsm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, +void BLIS_EXPORT_BLAS cblas_ctrsm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int M, f77_int N, const void *alpha, const void *A, f77_int lda, diff --git a/frame/compat/cblas/src/cblas_ctrsv.c b/frame/compat/cblas/src/cblas_ctrsv.c index 539d97e55..e0824dd98 100644 --- a/frame/compat/cblas/src/cblas_ctrsv.c +++ b/frame/compat/cblas/src/cblas_ctrsv.c @@ -9,7 +9,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_ctrsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ctrsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const void *A, f77_int lda, void *X, f77_int incX) diff --git a/frame/compat/cblas/src/cblas_daxpy.c b/frame/compat/cblas/src/cblas_daxpy.c index 5a3d08d6a..16032c5f6 100644 --- a/frame/compat/cblas/src/cblas_daxpy.c +++ b/frame/compat/cblas/src/cblas_daxpy.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_daxpy( f77_int N, double alpha, const double *X, +void BLIS_EXPORT_BLAS cblas_daxpy( f77_int N, double alpha, const double *X, f77_int incX, double *Y, f77_int incY) { #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_dcopy.c b/frame/compat/cblas/src/cblas_dcopy.c index 186c3d1d6..27bf873c0 100644 --- a/frame/compat/cblas/src/cblas_dcopy.c +++ b/frame/compat/cblas/src/cblas_dcopy.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_dcopy( f77_int N, const double *X, +void BLIS_EXPORT_BLAS cblas_dcopy( f77_int N, const double *X, f77_int incX, double *Y, f77_int incY) { #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_dgbmv.c b/frame/compat/cblas/src/cblas_dgbmv.c index f0a19d5e8..610eaf7d5 100644 --- a/frame/compat/cblas/src/cblas_dgbmv.c +++ b/frame/compat/cblas/src/cblas_dgbmv.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_dgbmv(enum CBLAS_ORDER order, +void BLIS_EXPORT_BLAS cblas_dgbmv(enum CBLAS_ORDER order, enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, f77_int KL, f77_int KU, double alpha, const double *A, f77_int lda, diff --git a/frame/compat/cblas/src/cblas_dgemm.c b/frame/compat/cblas/src/cblas_dgemm.c index 479a15abd..f27d4a835 100644 --- a/frame/compat/cblas/src/cblas_dgemm.c +++ b/frame/compat/cblas/src/cblas_dgemm.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_dgemm(enum CBLAS_ORDER Order, enum CBLAS_TRANSPOSE TransA, +void BLIS_EXPORT_BLAS cblas_dgemm(enum CBLAS_ORDER Order, enum CBLAS_TRANSPOSE TransA, enum CBLAS_TRANSPOSE TransB, f77_int M, f77_int N, f77_int K, double alpha, const double *A, f77_int lda, const double *B, f77_int ldb, diff --git a/frame/compat/cblas/src/cblas_dgemv.c b/frame/compat/cblas/src/cblas_dgemv.c index 025523b2c..f781e66a2 100644 --- a/frame/compat/cblas/src/cblas_dgemv.c +++ b/frame/compat/cblas/src/cblas_dgemv.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_dgemv(enum CBLAS_ORDER order, +void BLIS_EXPORT_BLAS cblas_dgemv(enum CBLAS_ORDER order, enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, double alpha, const double *A, f77_int lda, const double *X, f77_int incX, double beta, diff --git a/frame/compat/cblas/src/cblas_dger.c b/frame/compat/cblas/src/cblas_dger.c index 366d393b6..b178f0ceb 100644 --- a/frame/compat/cblas/src/cblas_dger.c +++ b/frame/compat/cblas/src/cblas_dger.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_dger(enum CBLAS_ORDER order, f77_int M, f77_int N, +void BLIS_EXPORT_BLAS cblas_dger(enum CBLAS_ORDER order, f77_int M, f77_int N, double alpha, const double *X, f77_int incX, const double *Y, f77_int incY, double *A, f77_int lda) { diff --git a/frame/compat/cblas/src/cblas_drot.c b/frame/compat/cblas/src/cblas_drot.c index b5dac7cad..314e4972e 100644 --- a/frame/compat/cblas/src/cblas_drot.c +++ b/frame/compat/cblas/src/cblas_drot.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_drot(f77_int N, double *X, f77_int incX, +void BLIS_EXPORT_BLAS cblas_drot(f77_int N, double *X, f77_int incX, double *Y, f77_int incY, const double c, const double s) { #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_drotg.c b/frame/compat/cblas/src/cblas_drotg.c index c509bafc7..fc174084c 100644 --- a/frame/compat/cblas/src/cblas_drotg.c +++ b/frame/compat/cblas/src/cblas_drotg.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_drotg( double *a, double *b, double *c, double *s) +void BLIS_EXPORT_BLAS cblas_drotg( double *a, double *b, double *c, double *s) { F77_drotg(a,b,c,s); } diff --git a/frame/compat/cblas/src/cblas_drotm.c b/frame/compat/cblas/src/cblas_drotm.c index f0ae348dd..1b05592df 100644 --- a/frame/compat/cblas/src/cblas_drotm.c +++ b/frame/compat/cblas/src/cblas_drotm.c @@ -2,7 +2,7 @@ #ifdef BLIS_ENABLE_CBLAS #include "cblas.h" #include "cblas_f77.h" -void cblas_drotm( f77_int N, double *X, f77_int incX, double *Y, +void BLIS_EXPORT_BLAS cblas_drotm( f77_int N, double *X, f77_int incX, double *Y, f77_int incY, const double *P) { #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_drotmg.c b/frame/compat/cblas/src/cblas_drotmg.c index 6b969bf87..ebbea6573 100644 --- a/frame/compat/cblas/src/cblas_drotmg.c +++ b/frame/compat/cblas/src/cblas_drotmg.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_drotmg( double *d1, double *d2, double *b1, +void BLIS_EXPORT_BLAS cblas_drotmg( double *d1, double *d2, double *b1, const double b2, double *p) { F77_drotmg(d1,d2,b1,&b2,p); diff --git a/frame/compat/cblas/src/cblas_dsbmv.c b/frame/compat/cblas/src/cblas_dsbmv.c index 8398dd6ce..af04d90a0 100644 --- a/frame/compat/cblas/src/cblas_dsbmv.c +++ b/frame/compat/cblas/src/cblas_dsbmv.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_dsbmv(enum CBLAS_ORDER order, +void BLIS_EXPORT_BLAS cblas_dsbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, f77_int K, double alpha, const double *A, f77_int lda, const double *X, f77_int incX, double beta, diff --git a/frame/compat/cblas/src/cblas_dscal.c b/frame/compat/cblas/src/cblas_dscal.c index bb6da3f67..6c5bda1b9 100644 --- a/frame/compat/cblas/src/cblas_dscal.c +++ b/frame/compat/cblas/src/cblas_dscal.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_dscal( f77_int N, double alpha, double *X, +void BLIS_EXPORT_BLAS cblas_dscal( f77_int N, double alpha, double *X, f77_int incX) { #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_dspmv.c b/frame/compat/cblas/src/cblas_dspmv.c index b8e95cfa8..c56c4125d 100644 --- a/frame/compat/cblas/src/cblas_dspmv.c +++ b/frame/compat/cblas/src/cblas_dspmv.c @@ -12,7 +12,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_dspmv(enum CBLAS_ORDER order, +void BLIS_EXPORT_BLAS cblas_dspmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, double alpha, const double *AP, const double *X, f77_int incX, double beta, diff --git a/frame/compat/cblas/src/cblas_dspr.c b/frame/compat/cblas/src/cblas_dspr.c index 9156f7a83..21a2da21c 100644 --- a/frame/compat/cblas/src/cblas_dspr.c +++ b/frame/compat/cblas/src/cblas_dspr.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_dspr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_dspr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, double alpha, const double *X, f77_int incX, double *Ap) { diff --git a/frame/compat/cblas/src/cblas_dspr2.c b/frame/compat/cblas/src/cblas_dspr2.c index 8fade8319..0fd33c080 100644 --- a/frame/compat/cblas/src/cblas_dspr2.c +++ b/frame/compat/cblas/src/cblas_dspr2.c @@ -9,7 +9,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_dspr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_dspr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, const double alpha, const double *X, f77_int incX, const double *Y, f77_int incY, double *A) { diff --git a/frame/compat/cblas/src/cblas_dswap.c b/frame/compat/cblas/src/cblas_dswap.c index e204baea0..ec676d9ca 100644 --- a/frame/compat/cblas/src/cblas_dswap.c +++ b/frame/compat/cblas/src/cblas_dswap.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_dswap( f77_int N, double *X, f77_int incX, double *Y, +void BLIS_EXPORT_BLAS cblas_dswap( f77_int N, double *X, f77_int incX, double *Y, f77_int incY) { #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_dsymm.c b/frame/compat/cblas/src/cblas_dsymm.c index 81bc52268..119f7a419 100644 --- a/frame/compat/cblas/src/cblas_dsymm.c +++ b/frame/compat/cblas/src/cblas_dsymm.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_dsymm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, +void BLIS_EXPORT_BLAS cblas_dsymm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo, f77_int M, f77_int N, double alpha, const double *A, f77_int lda, const double *B, f77_int ldb, double beta, diff --git a/frame/compat/cblas/src/cblas_dsymv.c b/frame/compat/cblas/src/cblas_dsymv.c index d0c2aa642..6e3ddc1f4 100644 --- a/frame/compat/cblas/src/cblas_dsymv.c +++ b/frame/compat/cblas/src/cblas_dsymv.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_dsymv(enum CBLAS_ORDER order, +void BLIS_EXPORT_BLAS cblas_dsymv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, double alpha, const double *A, f77_int lda, const double *X, f77_int incX, double beta, diff --git a/frame/compat/cblas/src/cblas_dsyr.c b/frame/compat/cblas/src/cblas_dsyr.c index f6dd66c75..69eec6ff4 100644 --- a/frame/compat/cblas/src/cblas_dsyr.c +++ b/frame/compat/cblas/src/cblas_dsyr.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_dsyr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_dsyr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, const double alpha, const double *X, f77_int incX, double *A, f77_int lda) { diff --git a/frame/compat/cblas/src/cblas_dsyr2.c b/frame/compat/cblas/src/cblas_dsyr2.c index c0d773939..b43ce4c6a 100644 --- a/frame/compat/cblas/src/cblas_dsyr2.c +++ b/frame/compat/cblas/src/cblas_dsyr2.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_dsyr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_dsyr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, const double alpha, const double *X, f77_int incX, const double *Y, f77_int incY, double *A, f77_int lda) diff --git a/frame/compat/cblas/src/cblas_dsyr2k.c b/frame/compat/cblas/src/cblas_dsyr2k.c index 2c35b9929..45b12a12c 100644 --- a/frame/compat/cblas/src/cblas_dsyr2k.c +++ b/frame/compat/cblas/src/cblas_dsyr2k.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_dsyr2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_dsyr2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, double alpha, const double *A, f77_int lda, const double *B, f77_int ldb, double beta, diff --git a/frame/compat/cblas/src/cblas_dsyrk.c b/frame/compat/cblas/src/cblas_dsyrk.c index 8a7ca1651..4a71e3b40 100644 --- a/frame/compat/cblas/src/cblas_dsyrk.c +++ b/frame/compat/cblas/src/cblas_dsyrk.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_dsyrk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_dsyrk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, double alpha, const double *A, f77_int lda, double beta, double *C, f77_int ldc) diff --git a/frame/compat/cblas/src/cblas_dtbmv.c b/frame/compat/cblas/src/cblas_dtbmv.c index 6502c1c22..702bfca63 100644 --- a/frame/compat/cblas/src/cblas_dtbmv.c +++ b/frame/compat/cblas/src/cblas_dtbmv.c @@ -9,7 +9,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_dtbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_dtbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, f77_int K, const double *A, f77_int lda, double *X, f77_int incX) diff --git a/frame/compat/cblas/src/cblas_dtbsv.c b/frame/compat/cblas/src/cblas_dtbsv.c index aae08e956..2817ff3d2 100644 --- a/frame/compat/cblas/src/cblas_dtbsv.c +++ b/frame/compat/cblas/src/cblas_dtbsv.c @@ -9,7 +9,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_dtbsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_dtbsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, f77_int K, const double *A, f77_int lda, double *X, f77_int incX) diff --git a/frame/compat/cblas/src/cblas_dtpmv.c b/frame/compat/cblas/src/cblas_dtpmv.c index b72b4ed7e..4e74b95f6 100644 --- a/frame/compat/cblas/src/cblas_dtpmv.c +++ b/frame/compat/cblas/src/cblas_dtpmv.c @@ -9,7 +9,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_dtpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_dtpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const double *Ap, double *X, f77_int incX) { diff --git a/frame/compat/cblas/src/cblas_dtpsv.c b/frame/compat/cblas/src/cblas_dtpsv.c index 501e4a256..484358acf 100644 --- a/frame/compat/cblas/src/cblas_dtpsv.c +++ b/frame/compat/cblas/src/cblas_dtpsv.c @@ -9,7 +9,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_dtpsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_dtpsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const double *Ap, double *X, f77_int incX) { diff --git a/frame/compat/cblas/src/cblas_dtrmm.c b/frame/compat/cblas/src/cblas_dtrmm.c index c93c4862a..4cd180261 100644 --- a/frame/compat/cblas/src/cblas_dtrmm.c +++ b/frame/compat/cblas/src/cblas_dtrmm.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_dtrmm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, +void BLIS_EXPORT_BLAS cblas_dtrmm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int M, f77_int N, double alpha, const double *A, f77_int lda, diff --git a/frame/compat/cblas/src/cblas_dtrmv.c b/frame/compat/cblas/src/cblas_dtrmv.c index 904d4b75b..404110b91 100644 --- a/frame/compat/cblas/src/cblas_dtrmv.c +++ b/frame/compat/cblas/src/cblas_dtrmv.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_dtrmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_dtrmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const double *A, f77_int lda, double *X, f77_int incX) diff --git a/frame/compat/cblas/src/cblas_dtrsm.c b/frame/compat/cblas/src/cblas_dtrsm.c index 552620495..1480ff2c5 100644 --- a/frame/compat/cblas/src/cblas_dtrsm.c +++ b/frame/compat/cblas/src/cblas_dtrsm.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_dtrsm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, +void BLIS_EXPORT_BLAS cblas_dtrsm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int M, f77_int N, double alpha, const double *A, f77_int lda, diff --git a/frame/compat/cblas/src/cblas_dtrsv.c b/frame/compat/cblas/src/cblas_dtrsv.c index 4d257f7ea..428b36781 100644 --- a/frame/compat/cblas/src/cblas_dtrsv.c +++ b/frame/compat/cblas/src/cblas_dtrsv.c @@ -9,7 +9,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_dtrsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_dtrsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const double *A, f77_int lda, double *X, f77_int incX) diff --git a/frame/compat/cblas/src/cblas_saxpy.c b/frame/compat/cblas/src/cblas_saxpy.c index b7f2b2d4e..c3846e9e4 100644 --- a/frame/compat/cblas/src/cblas_saxpy.c +++ b/frame/compat/cblas/src/cblas_saxpy.c @@ -11,7 +11,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_saxpy( f77_int N, float alpha, const float *X, +void BLIS_EXPORT_BLAS cblas_saxpy( f77_int N, float alpha, const float *X, f77_int incX, float *Y, f77_int incY) { #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_scopy.c b/frame/compat/cblas/src/cblas_scopy.c index f54343ff1..5f254eb52 100644 --- a/frame/compat/cblas/src/cblas_scopy.c +++ b/frame/compat/cblas/src/cblas_scopy.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_scopy( f77_int N, const float *X, +void BLIS_EXPORT_BLAS cblas_scopy( f77_int N, const float *X, f77_int incX, float *Y, f77_int incY) { #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_sgbmv.c b/frame/compat/cblas/src/cblas_sgbmv.c index 8bf944f9d..bf6b02ad9 100644 --- a/frame/compat/cblas/src/cblas_sgbmv.c +++ b/frame/compat/cblas/src/cblas_sgbmv.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_sgbmv(enum CBLAS_ORDER order, +void BLIS_EXPORT_BLAS cblas_sgbmv(enum CBLAS_ORDER order, enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, f77_int KL, f77_int KU, float alpha, const float *A, f77_int lda, diff --git a/frame/compat/cblas/src/cblas_sgemm.c b/frame/compat/cblas/src/cblas_sgemm.c index 89d0f07a8..09ed071ff 100644 --- a/frame/compat/cblas/src/cblas_sgemm.c +++ b/frame/compat/cblas/src/cblas_sgemm.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_sgemm(enum CBLAS_ORDER Order, enum CBLAS_TRANSPOSE TransA, +void BLIS_EXPORT_BLAS cblas_sgemm(enum CBLAS_ORDER Order, enum CBLAS_TRANSPOSE TransA, enum CBLAS_TRANSPOSE TransB, f77_int M, f77_int N, f77_int K, float alpha, const float *A, f77_int lda, const float *B, f77_int ldb, diff --git a/frame/compat/cblas/src/cblas_sgemv.c b/frame/compat/cblas/src/cblas_sgemv.c index 552140fec..79d536f6b 100644 --- a/frame/compat/cblas/src/cblas_sgemv.c +++ b/frame/compat/cblas/src/cblas_sgemv.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_sgemv(enum CBLAS_ORDER order, +void BLIS_EXPORT_BLAS cblas_sgemv(enum CBLAS_ORDER order, enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, float alpha, const float *A, f77_int lda, const float *X, f77_int incX, float beta, diff --git a/frame/compat/cblas/src/cblas_sger.c b/frame/compat/cblas/src/cblas_sger.c index 0617bad1e..64fb8bf8d 100644 --- a/frame/compat/cblas/src/cblas_sger.c +++ b/frame/compat/cblas/src/cblas_sger.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_sger(enum CBLAS_ORDER order, f77_int M, f77_int N, +void BLIS_EXPORT_BLAS cblas_sger(enum CBLAS_ORDER order, f77_int M, f77_int N, const float alpha, const float *X, f77_int incX, const float *Y, f77_int incY, float *A, f77_int lda) { diff --git a/frame/compat/cblas/src/cblas_srot.c b/frame/compat/cblas/src/cblas_srot.c index b9e7ede46..3279a5b99 100644 --- a/frame/compat/cblas/src/cblas_srot.c +++ b/frame/compat/cblas/src/cblas_srot.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_srot( f77_int N, float *X, f77_int incX, float *Y, +void BLIS_EXPORT_BLAS cblas_srot( f77_int N, float *X, f77_int incX, float *Y, f77_int incY, const float c, const float s) { #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_srotg.c b/frame/compat/cblas/src/cblas_srotg.c index 165497f7e..761dc34e3 100644 --- a/frame/compat/cblas/src/cblas_srotg.c +++ b/frame/compat/cblas/src/cblas_srotg.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_srotg( float *a, float *b, float *c, float *s) +void BLIS_EXPORT_BLAS cblas_srotg( float *a, float *b, float *c, float *s) { F77_srotg(a,b,c,s); } diff --git a/frame/compat/cblas/src/cblas_srotm.c b/frame/compat/cblas/src/cblas_srotm.c index ce417d769..335f76733 100644 --- a/frame/compat/cblas/src/cblas_srotm.c +++ b/frame/compat/cblas/src/cblas_srotm.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_srotm( f77_int N, float *X, f77_int incX, float *Y, +void BLIS_EXPORT_BLAS cblas_srotm( f77_int N, float *X, f77_int incX, float *Y, f77_int incY, const float *P) { #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_srotmg.c b/frame/compat/cblas/src/cblas_srotmg.c index 7f26ac659..c5c845aa7 100644 --- a/frame/compat/cblas/src/cblas_srotmg.c +++ b/frame/compat/cblas/src/cblas_srotmg.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_srotmg( float *d1, float *d2, float *b1, +void BLIS_EXPORT_BLAS cblas_srotmg( float *d1, float *d2, float *b1, const float b2, float *p) { F77_srotmg(d1,d2,b1,&b2,p); diff --git a/frame/compat/cblas/src/cblas_ssbmv.c b/frame/compat/cblas/src/cblas_ssbmv.c index ef8a96cfb..4935323b0 100644 --- a/frame/compat/cblas/src/cblas_ssbmv.c +++ b/frame/compat/cblas/src/cblas_ssbmv.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_ssbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ssbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, f77_int K, float alpha, const float *A, f77_int lda, const float *X, f77_int incX, float beta, float *Y, f77_int incY) diff --git a/frame/compat/cblas/src/cblas_sscal.c b/frame/compat/cblas/src/cblas_sscal.c index 55547ae64..fda92231c 100644 --- a/frame/compat/cblas/src/cblas_sscal.c +++ b/frame/compat/cblas/src/cblas_sscal.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_sscal( f77_int N, float alpha, float *X, +void BLIS_EXPORT_BLAS cblas_sscal( f77_int N, float alpha, float *X, f77_int incX) { #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_sspmv.c b/frame/compat/cblas/src/cblas_sspmv.c index a54f64214..28dc0b36c 100644 --- a/frame/compat/cblas/src/cblas_sspmv.c +++ b/frame/compat/cblas/src/cblas_sspmv.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_sspmv(enum CBLAS_ORDER order, +void BLIS_EXPORT_BLAS cblas_sspmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, float alpha, const float *AP, const float *X, f77_int incX, float beta, diff --git a/frame/compat/cblas/src/cblas_sspr.c b/frame/compat/cblas/src/cblas_sspr.c index 693dbba8c..a2b60e96d 100644 --- a/frame/compat/cblas/src/cblas_sspr.c +++ b/frame/compat/cblas/src/cblas_sspr.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_sspr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_sspr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, const float alpha, const float *X, f77_int incX, float *Ap) { diff --git a/frame/compat/cblas/src/cblas_sspr2.c b/frame/compat/cblas/src/cblas_sspr2.c index a4b612897..e38e6749f 100644 --- a/frame/compat/cblas/src/cblas_sspr2.c +++ b/frame/compat/cblas/src/cblas_sspr2.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_sspr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_sspr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, const float alpha, const float *X, f77_int incX, const float *Y, f77_int incY, float *A) { diff --git a/frame/compat/cblas/src/cblas_sswap.c b/frame/compat/cblas/src/cblas_sswap.c index 2c24ad0fa..e97aa27ef 100644 --- a/frame/compat/cblas/src/cblas_sswap.c +++ b/frame/compat/cblas/src/cblas_sswap.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_sswap( f77_int N, float *X, f77_int incX, float *Y, +void BLIS_EXPORT_BLAS cblas_sswap( f77_int N, float *X, f77_int incX, float *Y, f77_int incY) { #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_ssymm.c b/frame/compat/cblas/src/cblas_ssymm.c index 218ddba6a..138c3b47d 100644 --- a/frame/compat/cblas/src/cblas_ssymm.c +++ b/frame/compat/cblas/src/cblas_ssymm.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_ssymm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, +void BLIS_EXPORT_BLAS cblas_ssymm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo, f77_int M, f77_int N, float alpha, const float *A, f77_int lda, const float *B, f77_int ldb, float beta, diff --git a/frame/compat/cblas/src/cblas_ssymv.c b/frame/compat/cblas/src/cblas_ssymv.c index 6027aaddf..43a835cdd 100644 --- a/frame/compat/cblas/src/cblas_ssymv.c +++ b/frame/compat/cblas/src/cblas_ssymv.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_ssymv(enum CBLAS_ORDER order, +void BLIS_EXPORT_BLAS cblas_ssymv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, float alpha, const float *A, f77_int lda, const float *X, f77_int incX, float beta, diff --git a/frame/compat/cblas/src/cblas_ssyr.c b/frame/compat/cblas/src/cblas_ssyr.c index 14ed8fe54..90d4a748f 100644 --- a/frame/compat/cblas/src/cblas_ssyr.c +++ b/frame/compat/cblas/src/cblas_ssyr.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_ssyr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ssyr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, const float alpha, const float *X, f77_int incX, float *A, f77_int lda) { diff --git a/frame/compat/cblas/src/cblas_ssyr2.c b/frame/compat/cblas/src/cblas_ssyr2.c index 48263f2ae..287eacdd6 100644 --- a/frame/compat/cblas/src/cblas_ssyr2.c +++ b/frame/compat/cblas/src/cblas_ssyr2.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_ssyr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ssyr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, const float alpha, const float *X, f77_int incX, const float *Y, f77_int incY, float *A, f77_int lda) diff --git a/frame/compat/cblas/src/cblas_ssyr2k.c b/frame/compat/cblas/src/cblas_ssyr2k.c index 50cf8bf1d..9687f2dd9 100644 --- a/frame/compat/cblas/src/cblas_ssyr2k.c +++ b/frame/compat/cblas/src/cblas_ssyr2k.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_ssyr2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ssyr2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, float alpha, const float *A, f77_int lda, const float *B, f77_int ldb, float beta, diff --git a/frame/compat/cblas/src/cblas_ssyrk.c b/frame/compat/cblas/src/cblas_ssyrk.c index 6f486870f..63364bb91 100644 --- a/frame/compat/cblas/src/cblas_ssyrk.c +++ b/frame/compat/cblas/src/cblas_ssyrk.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_ssyrk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ssyrk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, float alpha, const float *A, f77_int lda, float beta, float *C, f77_int ldc) diff --git a/frame/compat/cblas/src/cblas_stbmv.c b/frame/compat/cblas/src/cblas_stbmv.c index 15daa49da..7f67b0d64 100644 --- a/frame/compat/cblas/src/cblas_stbmv.c +++ b/frame/compat/cblas/src/cblas_stbmv.c @@ -9,7 +9,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_stbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_stbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, f77_int K, const float *A, f77_int lda, float *X, f77_int incX) diff --git a/frame/compat/cblas/src/cblas_stbsv.c b/frame/compat/cblas/src/cblas_stbsv.c index ec9d9c844..d2137984b 100644 --- a/frame/compat/cblas/src/cblas_stbsv.c +++ b/frame/compat/cblas/src/cblas_stbsv.c @@ -9,7 +9,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_stbsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_stbsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, f77_int K, const float *A, f77_int lda, float *X, f77_int incX) diff --git a/frame/compat/cblas/src/cblas_stpmv.c b/frame/compat/cblas/src/cblas_stpmv.c index 91b308176..f8b9dc979 100644 --- a/frame/compat/cblas/src/cblas_stpmv.c +++ b/frame/compat/cblas/src/cblas_stpmv.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_stpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_stpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const float *Ap, float *X, f77_int incX) { diff --git a/frame/compat/cblas/src/cblas_stpsv.c b/frame/compat/cblas/src/cblas_stpsv.c index 548eaec79..d0bbc7661 100644 --- a/frame/compat/cblas/src/cblas_stpsv.c +++ b/frame/compat/cblas/src/cblas_stpsv.c @@ -9,7 +9,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_stpsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_stpsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const float *Ap, float *X, f77_int incX) { diff --git a/frame/compat/cblas/src/cblas_strmm.c b/frame/compat/cblas/src/cblas_strmm.c index a7737109b..93f2406c5 100644 --- a/frame/compat/cblas/src/cblas_strmm.c +++ b/frame/compat/cblas/src/cblas_strmm.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_strmm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, +void BLIS_EXPORT_BLAS cblas_strmm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int M, f77_int N, float alpha, const float *A, f77_int lda, diff --git a/frame/compat/cblas/src/cblas_strmv.c b/frame/compat/cblas/src/cblas_strmv.c index 987589eb7..4d0e7ebc7 100644 --- a/frame/compat/cblas/src/cblas_strmv.c +++ b/frame/compat/cblas/src/cblas_strmv.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_strmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_strmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const float *A, f77_int lda, float *X, f77_int incX) diff --git a/frame/compat/cblas/src/cblas_strsm.c b/frame/compat/cblas/src/cblas_strsm.c index ef78969f0..64cea9327 100644 --- a/frame/compat/cblas/src/cblas_strsm.c +++ b/frame/compat/cblas/src/cblas_strsm.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_strsm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, +void BLIS_EXPORT_BLAS cblas_strsm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int M, f77_int N, float alpha, const float *A, f77_int lda, diff --git a/frame/compat/cblas/src/cblas_strsv.c b/frame/compat/cblas/src/cblas_strsv.c index a37c797b8..d3c2cb063 100644 --- a/frame/compat/cblas/src/cblas_strsv.c +++ b/frame/compat/cblas/src/cblas_strsv.c @@ -9,7 +9,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_strsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_strsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const float *A, f77_int lda, float *X, f77_int incX) diff --git a/frame/compat/cblas/src/cblas_xerbla.c b/frame/compat/cblas/src/cblas_xerbla.c index ebe6bd800..8577f5fb2 100644 --- a/frame/compat/cblas/src/cblas_xerbla.c +++ b/frame/compat/cblas/src/cblas_xerbla.c @@ -7,7 +7,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_xerbla(f77_int info, const char *rout, const char *form, ...) +void BLIS_EXPORT_BLAS cblas_xerbla(f77_int info, const char *rout, const char *form, ...) { extern int RowMajorStrg; char empty[1] = ""; diff --git a/frame/compat/cblas/src/cblas_zaxpy.c b/frame/compat/cblas/src/cblas_zaxpy.c index dcf2f5c78..60998af86 100644 --- a/frame/compat/cblas/src/cblas_zaxpy.c +++ b/frame/compat/cblas/src/cblas_zaxpy.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_zaxpy( f77_int N, const void *alpha, const void *X, +void BLIS_EXPORT_BLAS cblas_zaxpy( f77_int N, const void *alpha, const void *X, f77_int incX, void *Y, f77_int incY) { #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_zcopy.c b/frame/compat/cblas/src/cblas_zcopy.c index 5b0a7dd5d..81bac5ae9 100644 --- a/frame/compat/cblas/src/cblas_zcopy.c +++ b/frame/compat/cblas/src/cblas_zcopy.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_zcopy( f77_int N, const void *X, +void BLIS_EXPORT_BLAS cblas_zcopy( f77_int N, const void *X, f77_int incX, void *Y, f77_int incY) { #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_zdotc_sub.c b/frame/compat/cblas/src/cblas_zdotc_sub.c index 2e0808c88..d9603a849 100644 --- a/frame/compat/cblas/src/cblas_zdotc_sub.c +++ b/frame/compat/cblas/src/cblas_zdotc_sub.c @@ -11,7 +11,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_zdotc_sub( f77_int N, const void *X, f77_int incX, +void BLIS_EXPORT_BLAS cblas_zdotc_sub( f77_int N, const void *X, f77_int incX, const void *Y, f77_int incY, void *dotc) { #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_zdotu_sub.c b/frame/compat/cblas/src/cblas_zdotu_sub.c index 255ad833f..2561df276 100644 --- a/frame/compat/cblas/src/cblas_zdotu_sub.c +++ b/frame/compat/cblas/src/cblas_zdotu_sub.c @@ -11,7 +11,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_zdotu_sub( f77_int N, const void *X, f77_int incX, +void BLIS_EXPORT_BLAS cblas_zdotu_sub( f77_int N, const void *X, f77_int incX, const void *Y, f77_int incY, void *dotu) { #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_zdscal.c b/frame/compat/cblas/src/cblas_zdscal.c index 9666e4509..062609b08 100644 --- a/frame/compat/cblas/src/cblas_zdscal.c +++ b/frame/compat/cblas/src/cblas_zdscal.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_zdscal( f77_int N, double alpha, void *X, +void BLIS_EXPORT_BLAS cblas_zdscal( f77_int N, double alpha, void *X, f77_int incX) { #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_zgbmv.c b/frame/compat/cblas/src/cblas_zgbmv.c index f6efa4e7b..967b14981 100644 --- a/frame/compat/cblas/src/cblas_zgbmv.c +++ b/frame/compat/cblas/src/cblas_zgbmv.c @@ -11,7 +11,7 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_zgbmv(enum CBLAS_ORDER order, +void BLIS_EXPORT_BLAS cblas_zgbmv(enum CBLAS_ORDER order, enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, f77_int KL, f77_int KU, const void *alpha, const void *A, f77_int lda, diff --git a/frame/compat/cblas/src/cblas_zgemm.c b/frame/compat/cblas/src/cblas_zgemm.c index e50de2205..a3ccc9a07 100644 --- a/frame/compat/cblas/src/cblas_zgemm.c +++ b/frame/compat/cblas/src/cblas_zgemm.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_zgemm(enum CBLAS_ORDER Order, enum CBLAS_TRANSPOSE TransA, +void BLIS_EXPORT_BLAS cblas_zgemm(enum CBLAS_ORDER Order, enum CBLAS_TRANSPOSE TransA, enum CBLAS_TRANSPOSE TransB, f77_int M, f77_int N, f77_int K, const void *alpha, const void *A, f77_int lda, const void *B, f77_int ldb, diff --git a/frame/compat/cblas/src/cblas_zgemv.c b/frame/compat/cblas/src/cblas_zgemv.c index 05b0bfe84..689702d6f 100644 --- a/frame/compat/cblas/src/cblas_zgemv.c +++ b/frame/compat/cblas/src/cblas_zgemv.c @@ -11,7 +11,7 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_zgemv(enum CBLAS_ORDER order, +void BLIS_EXPORT_BLAS cblas_zgemv(enum CBLAS_ORDER order, enum CBLAS_TRANSPOSE TransA, f77_int M, f77_int N, const void *alpha, const void *A, f77_int lda, const void *X, f77_int incX, const void *beta, diff --git a/frame/compat/cblas/src/cblas_zgerc.c b/frame/compat/cblas/src/cblas_zgerc.c index 9667958c5..e93fa21b8 100644 --- a/frame/compat/cblas/src/cblas_zgerc.c +++ b/frame/compat/cblas/src/cblas_zgerc.c @@ -11,7 +11,7 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_zgerc(enum CBLAS_ORDER order, f77_int M, f77_int N, +void BLIS_EXPORT_BLAS cblas_zgerc(enum CBLAS_ORDER order, f77_int M, f77_int N, const void *alpha, const void *X, f77_int incX, const void *Y, f77_int incY, void *A, f77_int lda) { diff --git a/frame/compat/cblas/src/cblas_zgeru.c b/frame/compat/cblas/src/cblas_zgeru.c index 3538ed044..9471781f7 100644 --- a/frame/compat/cblas/src/cblas_zgeru.c +++ b/frame/compat/cblas/src/cblas_zgeru.c @@ -9,7 +9,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_zgeru(enum CBLAS_ORDER order, f77_int M, f77_int N, +void BLIS_EXPORT_BLAS cblas_zgeru(enum CBLAS_ORDER order, f77_int M, f77_int N, const void *alpha, const void *X, f77_int incX, const void *Y, f77_int incY, void *A, f77_int lda) { diff --git a/frame/compat/cblas/src/cblas_zhbmv.c b/frame/compat/cblas/src/cblas_zhbmv.c index 8bfd139e9..dc544841a 100644 --- a/frame/compat/cblas/src/cblas_zhbmv.c +++ b/frame/compat/cblas/src/cblas_zhbmv.c @@ -11,7 +11,7 @@ #include "cblas_f77.h" #include #include -void cblas_zhbmv(enum CBLAS_ORDER order, +void BLIS_EXPORT_BLAS cblas_zhbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo,f77_int N,f77_int K, const void *alpha, const void *A, f77_int lda, const void *X, f77_int incX, const void *beta, diff --git a/frame/compat/cblas/src/cblas_zhemm.c b/frame/compat/cblas/src/cblas_zhemm.c index 7da2a41e6..bc19ae828 100644 --- a/frame/compat/cblas/src/cblas_zhemm.c +++ b/frame/compat/cblas/src/cblas_zhemm.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_zhemm(enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, +void BLIS_EXPORT_BLAS cblas_zhemm(enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo, f77_int M, f77_int N, const void *alpha, const void *A, f77_int lda, const void *B, f77_int ldb, const void *beta, diff --git a/frame/compat/cblas/src/cblas_zhemv.c b/frame/compat/cblas/src/cblas_zhemv.c index a0b6082ce..62d44b3e6 100644 --- a/frame/compat/cblas/src/cblas_zhemv.c +++ b/frame/compat/cblas/src/cblas_zhemv.c @@ -11,7 +11,7 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_zhemv(enum CBLAS_ORDER order, +void BLIS_EXPORT_BLAS cblas_zhemv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, const void *alpha, const void *A, f77_int lda, const void *X, f77_int incX, const void *beta, diff --git a/frame/compat/cblas/src/cblas_zher.c b/frame/compat/cblas/src/cblas_zher.c index 9e513d43b..ecbd36418 100644 --- a/frame/compat/cblas/src/cblas_zher.c +++ b/frame/compat/cblas/src/cblas_zher.c @@ -11,7 +11,7 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_zher(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_zher(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, double alpha, const void *X, f77_int incX ,void *A, f77_int lda) { diff --git a/frame/compat/cblas/src/cblas_zher2.c b/frame/compat/cblas/src/cblas_zher2.c index 5d49302f9..9c523d952 100644 --- a/frame/compat/cblas/src/cblas_zher2.c +++ b/frame/compat/cblas/src/cblas_zher2.c @@ -11,7 +11,7 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_zher2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_zher2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, const void *alpha, const void *X, f77_int incX, const void *Y, f77_int incY, void *A, f77_int lda) { diff --git a/frame/compat/cblas/src/cblas_zher2k.c b/frame/compat/cblas/src/cblas_zher2k.c index 424f650d0..d03ec1370 100644 --- a/frame/compat/cblas/src/cblas_zher2k.c +++ b/frame/compat/cblas/src/cblas_zher2k.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_zher2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_zher2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, const void *alpha, const void *A, f77_int lda, const void *B, f77_int ldb, double beta, diff --git a/frame/compat/cblas/src/cblas_zherk.c b/frame/compat/cblas/src/cblas_zherk.c index 5ddb45184..3167dc0fa 100644 --- a/frame/compat/cblas/src/cblas_zherk.c +++ b/frame/compat/cblas/src/cblas_zherk.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_zherk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_zherk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, double alpha, const void *A, f77_int lda, double beta, void *C, f77_int ldc) diff --git a/frame/compat/cblas/src/cblas_zhpmv.c b/frame/compat/cblas/src/cblas_zhpmv.c index 912300d44..602007023 100644 --- a/frame/compat/cblas/src/cblas_zhpmv.c +++ b/frame/compat/cblas/src/cblas_zhpmv.c @@ -11,7 +11,7 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_zhpmv(enum CBLAS_ORDER order, +void BLIS_EXPORT_BLAS cblas_zhpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo,f77_int N, const void *alpha, const void *AP, const void *X, f77_int incX, const void *beta, diff --git a/frame/compat/cblas/src/cblas_zhpr.c b/frame/compat/cblas/src/cblas_zhpr.c index 80d238170..0f45fd261 100644 --- a/frame/compat/cblas/src/cblas_zhpr.c +++ b/frame/compat/cblas/src/cblas_zhpr.c @@ -11,7 +11,7 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_zhpr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_zhpr(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N, double alpha, const void *X, f77_int incX, void *A) { diff --git a/frame/compat/cblas/src/cblas_zhpr2.c b/frame/compat/cblas/src/cblas_zhpr2.c index 2aa46062a..6358efc1a 100644 --- a/frame/compat/cblas/src/cblas_zhpr2.c +++ b/frame/compat/cblas/src/cblas_zhpr2.c @@ -11,7 +11,7 @@ #include #include "cblas.h" #include "cblas_f77.h" -void cblas_zhpr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_zhpr2(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, f77_int N,const void *alpha, const void *X, f77_int incX,const void *Y, f77_int incY, void *Ap) diff --git a/frame/compat/cblas/src/cblas_zscal.c b/frame/compat/cblas/src/cblas_zscal.c index a66ea6f9d..c58ddf84b 100644 --- a/frame/compat/cblas/src/cblas_zscal.c +++ b/frame/compat/cblas/src/cblas_zscal.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_zscal( f77_int N, const void *alpha, void *X, +void BLIS_EXPORT_BLAS cblas_zscal( f77_int N, const void *alpha, void *X, f77_int incX) { #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_zswap.c b/frame/compat/cblas/src/cblas_zswap.c index 6b2eb1a20..662933988 100644 --- a/frame/compat/cblas/src/cblas_zswap.c +++ b/frame/compat/cblas/src/cblas_zswap.c @@ -10,7 +10,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_zswap( f77_int N, void *X, f77_int incX, void *Y, +void BLIS_EXPORT_BLAS cblas_zswap( f77_int N, void *X, f77_int incX, void *Y, f77_int incY) { #ifdef F77_INT diff --git a/frame/compat/cblas/src/cblas_zsymm.c b/frame/compat/cblas/src/cblas_zsymm.c index 9303c5921..4292d6709 100644 --- a/frame/compat/cblas/src/cblas_zsymm.c +++ b/frame/compat/cblas/src/cblas_zsymm.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_zsymm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, +void BLIS_EXPORT_BLAS cblas_zsymm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo, f77_int M, f77_int N, const void *alpha, const void *A, f77_int lda, const void *B, f77_int ldb, const void *beta, diff --git a/frame/compat/cblas/src/cblas_zsyr2k.c b/frame/compat/cblas/src/cblas_zsyr2k.c index c275cc693..f4a4f0e12 100644 --- a/frame/compat/cblas/src/cblas_zsyr2k.c +++ b/frame/compat/cblas/src/cblas_zsyr2k.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_zsyr2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_zsyr2k(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, const void *alpha, const void *A, f77_int lda, const void *B, f77_int ldb, const void *beta, diff --git a/frame/compat/cblas/src/cblas_zsyrk.c b/frame/compat/cblas/src/cblas_zsyrk.c index ce2c0e1c8..641a975e6 100644 --- a/frame/compat/cblas/src/cblas_zsyrk.c +++ b/frame/compat/cblas/src/cblas_zsyrk.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_zsyrk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_zsyrk(enum CBLAS_ORDER Order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Trans, f77_int N, f77_int K, const void *alpha, const void *A, f77_int lda, const void *beta, void *C, f77_int ldc) diff --git a/frame/compat/cblas/src/cblas_ztbmv.c b/frame/compat/cblas/src/cblas_ztbmv.c index 3c7f58b96..e07fb42d2 100644 --- a/frame/compat/cblas/src/cblas_ztbmv.c +++ b/frame/compat/cblas/src/cblas_ztbmv.c @@ -9,7 +9,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_ztbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ztbmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, f77_int K, const void *A, f77_int lda, void *X, f77_int incX) diff --git a/frame/compat/cblas/src/cblas_ztbsv.c b/frame/compat/cblas/src/cblas_ztbsv.c index 56d936e1b..e2126e49c 100644 --- a/frame/compat/cblas/src/cblas_ztbsv.c +++ b/frame/compat/cblas/src/cblas_ztbsv.c @@ -9,7 +9,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_ztbsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ztbsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, f77_int K, const void *A, f77_int lda, void *X, f77_int incX) diff --git a/frame/compat/cblas/src/cblas_ztpmv.c b/frame/compat/cblas/src/cblas_ztpmv.c index a8717ccc5..a89a3fdc7 100644 --- a/frame/compat/cblas/src/cblas_ztpmv.c +++ b/frame/compat/cblas/src/cblas_ztpmv.c @@ -9,7 +9,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_ztpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ztpmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const void *Ap, void *X, f77_int incX) { diff --git a/frame/compat/cblas/src/cblas_ztpsv.c b/frame/compat/cblas/src/cblas_ztpsv.c index 4aa3706cc..1f51f5d9f 100644 --- a/frame/compat/cblas/src/cblas_ztpsv.c +++ b/frame/compat/cblas/src/cblas_ztpsv.c @@ -9,7 +9,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_ztpsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ztpsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const void *Ap, void *X, f77_int incX) { diff --git a/frame/compat/cblas/src/cblas_ztrmm.c b/frame/compat/cblas/src/cblas_ztrmm.c index 6fa8a2ca9..958a232b3 100644 --- a/frame/compat/cblas/src/cblas_ztrmm.c +++ b/frame/compat/cblas/src/cblas_ztrmm.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_ztrmm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, +void BLIS_EXPORT_BLAS cblas_ztrmm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int M, f77_int N, const void *alpha, const void *A, f77_int lda, diff --git a/frame/compat/cblas/src/cblas_ztrmv.c b/frame/compat/cblas/src/cblas_ztrmv.c index 590105d62..bb3bf4516 100644 --- a/frame/compat/cblas/src/cblas_ztrmv.c +++ b/frame/compat/cblas/src/cblas_ztrmv.c @@ -9,7 +9,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_ztrmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ztrmv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const void *A, f77_int lda, void *X, f77_int incX) diff --git a/frame/compat/cblas/src/cblas_ztrsm.c b/frame/compat/cblas/src/cblas_ztrsm.c index a68c70e1c..fda012933 100644 --- a/frame/compat/cblas/src/cblas_ztrsm.c +++ b/frame/compat/cblas/src/cblas_ztrsm.c @@ -11,7 +11,7 @@ #include "cblas.h" #include "cblas_f77.h" -void cblas_ztrsm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, +void BLIS_EXPORT_BLAS cblas_ztrsm(enum CBLAS_ORDER Order, enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int M, f77_int N, const void *alpha, const void *A, f77_int lda, diff --git a/frame/compat/cblas/src/cblas_ztrsv.c b/frame/compat/cblas/src/cblas_ztrsv.c index 1a541f7b1..e68d9ebe8 100644 --- a/frame/compat/cblas/src/cblas_ztrsv.c +++ b/frame/compat/cblas/src/cblas_ztrsv.c @@ -9,7 +9,7 @@ */ #include "cblas.h" #include "cblas_f77.h" -void cblas_ztrsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, +void BLIS_EXPORT_BLAS cblas_ztrsv(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE TransA, enum CBLAS_DIAG Diag, f77_int N, const void *A, f77_int lda, void *X, f77_int incX) diff --git a/frame/compat/f2c/bla_cabs1.c b/frame/compat/f2c/bla_cabs1.c index 59459f2fe..c62cb233a 100644 --- a/frame/compat/f2c/bla_cabs1.c +++ b/frame/compat/f2c/bla_cabs1.c @@ -41,7 +41,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ bla_real PASTEF77(s,cabs1)(bla_scomplex *z) +/* Subroutine */ bla_real BLIS_EXPORT_BLAS PASTEF77(s,cabs1)(bla_scomplex *z) { return bli_fabs( bli_creal( *z ) ) + bli_fabs( bli_cimag( *z ) ); @@ -52,7 +52,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ bla_double PASTEF77(d,cabs1)(bla_dcomplex *z) +/* Subroutine */ bla_double BLIS_EXPORT_BLAS PASTEF77(d,cabs1)(bla_dcomplex *z) { return bli_fabs( bli_zreal( *z ) ) + bli_fabs( bli_zimag( *z ) ); diff --git a/frame/compat/f2c/bla_cabs1.h b/frame/compat/f2c/bla_cabs1.h index edec8c86e..753765a1d 100644 --- a/frame/compat/f2c/bla_cabs1.h +++ b/frame/compat/f2c/bla_cabs1.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS -bla_real PASTEF77(s,cabs1)(bla_scomplex *z); -bla_double PASTEF77(d,cabs1)(bla_dcomplex *z); +BLIS_EXPORT_BLAS bla_real PASTEF77(s,cabs1)(bla_scomplex *z); +BLIS_EXPORT_BLAS bla_double PASTEF77(d,cabs1)(bla_dcomplex *z); #endif diff --git a/frame/compat/f2c/bla_gbmv.c b/frame/compat/f2c/bla_gbmv.c index d53dd322a..5f68b5beb 100644 --- a/frame/compat/f2c/bla_gbmv.c +++ b/frame/compat/f2c/bla_gbmv.c @@ -41,7 +41,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(c,gbmv)(const bla_character *trans, const bla_integer *m, const bla_integer *n, const bla_integer *kl, const bla_integer *ku, const bla_scomplex *alpha, const bla_scomplex *a, const bla_integer *lda, const bla_scomplex *x, const bla_integer *incx, const bla_scomplex *beta, bla_scomplex *y, const bla_integer *incy) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(c,gbmv)(const bla_character *trans, const bla_integer *m, const bla_integer *n, const bla_integer *kl, const bla_integer *ku, const bla_scomplex *alpha, const bla_scomplex *a, const bla_integer *lda, const bla_scomplex *x, const bla_integer *incx, const bla_scomplex *beta, bla_scomplex *y, const bla_integer *incy) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5, i__6; @@ -54,9 +54,9 @@ bla_integer info; bla_scomplex temp; bla_integer lenx, leny, i__, j, k; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer ix, iy, jx, jy, kx, ky; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical noconj; bla_integer kup1; @@ -482,7 +482,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(d,gbmv)(const bla_character *trans, const bla_integer *m, const bla_integer *n, const bla_integer *kl, const bla_integer *ku, const bla_double *alpha, const bla_double *a, const bla_integer *lda, const bla_double *x, const bla_integer *incx, const bla_double *beta, bla_double *y, const bla_integer *incy) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(d,gbmv)(const bla_character *trans, const bla_integer *m, const bla_integer *n, const bla_integer *kl, const bla_integer *ku, const bla_double *alpha, const bla_double *a, const bla_integer *lda, const bla_double *x, const bla_integer *incx, const bla_double *beta, bla_double *y, const bla_integer *incy) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5, i__6; @@ -491,9 +491,9 @@ bla_integer info; bla_double temp; bla_integer lenx, leny, i__, j, k; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer ix, iy, jx, jy, kx, ky; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_integer kup1; /* .. Scalar Arguments .. */ @@ -838,7 +838,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(s,gbmv)(const bla_character *trans, const bla_integer *m, const bla_integer *n, const bla_integer *kl, const bla_integer *ku, const bla_real *alpha, const bla_real *a, const bla_integer *lda, const bla_real *x, const bla_integer * incx, const bla_real *beta, bla_real *y, const bla_integer *incy) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(s,gbmv)(const bla_character *trans, const bla_integer *m, const bla_integer *n, const bla_integer *kl, const bla_integer *ku, const bla_real *alpha, const bla_real *a, const bla_integer *lda, const bla_real *x, const bla_integer * incx, const bla_real *beta, bla_real *y, const bla_integer *incy) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5, i__6; @@ -847,9 +847,9 @@ bla_integer info; bla_real temp; bla_integer lenx, leny, i__, j, k; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer ix, iy, jx, jy, kx, ky; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_integer kup1; /* .. Scalar Arguments .. */ @@ -1194,7 +1194,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(z,gbmv)(const bla_character *trans, const bla_integer *m, const bla_integer *n, const bla_integer *kl, const bla_integer *ku, const bla_dcomplex *alpha, const bla_dcomplex *a, const bla_integer *lda, const bla_dcomplex *x, const bla_integer *incx, const bla_dcomplex *beta, bla_dcomplex * y, const bla_integer *incy) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(z,gbmv)(const bla_character *trans, const bla_integer *m, const bla_integer *n, const bla_integer *kl, const bla_integer *ku, const bla_dcomplex *alpha, const bla_dcomplex *a, const bla_integer *lda, const bla_dcomplex *x, const bla_integer *incx, const bla_dcomplex *beta, bla_dcomplex * y, const bla_integer *incy) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5, i__6; @@ -1207,9 +1207,9 @@ bla_integer info; bla_dcomplex temp; bla_integer lenx, leny, i__, j, k; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer ix, iy, jx, jy, kx, ky; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical noconj; bla_integer kup1; diff --git a/frame/compat/f2c/bla_gbmv.h b/frame/compat/f2c/bla_gbmv.h index b0fd7f30b..eb8ce2534 100644 --- a/frame/compat/f2c/bla_gbmv.h +++ b/frame/compat/f2c/bla_gbmv.h @@ -34,9 +34,9 @@ #ifdef BLIS_ENABLE_BLAS -int PASTEF77(c,gbmv)(const bla_character *trans, const bla_integer *m, const bla_integer *n, const bla_integer *kl, const bla_integer *ku, const bla_scomplex *alpha, const bla_scomplex *a, const bla_integer *lda, const bla_scomplex *x, const bla_integer *incx, const bla_scomplex *beta, bla_scomplex *y, const bla_integer *incy); -int PASTEF77(d,gbmv)(const bla_character *trans, const bla_integer *m, const bla_integer *n, const bla_integer *kl, const bla_integer *ku, const bla_double *alpha, const bla_double *a, const bla_integer *lda, const bla_double *x, const bla_integer *incx, const bla_double *beta, bla_double *y, const bla_integer *incy); -int PASTEF77(s,gbmv)(const bla_character *trans, const bla_integer *m, const bla_integer *n, const bla_integer *kl, const bla_integer *ku, const bla_real *alpha, const bla_real *a, const bla_integer *lda, const bla_real *x, const bla_integer * incx, const bla_real *beta, bla_real *y, const bla_integer *incy); -int PASTEF77(z,gbmv)(const bla_character *trans, const bla_integer *m, const bla_integer *n, const bla_integer *kl, const bla_integer *ku, const bla_dcomplex *alpha, const bla_dcomplex *a, const bla_integer *lda, const bla_dcomplex *x, const bla_integer *incx, const bla_dcomplex *beta, bla_dcomplex * y, const bla_integer *incy); +BLIS_EXPORT_BLAS int PASTEF77(c,gbmv)(const bla_character *trans, const bla_integer *m, const bla_integer *n, const bla_integer *kl, const bla_integer *ku, const bla_scomplex *alpha, const bla_scomplex *a, const bla_integer *lda, const bla_scomplex *x, const bla_integer *incx, const bla_scomplex *beta, bla_scomplex *y, const bla_integer *incy); +BLIS_EXPORT_BLAS int PASTEF77(d,gbmv)(const bla_character *trans, const bla_integer *m, const bla_integer *n, const bla_integer *kl, const bla_integer *ku, const bla_double *alpha, const bla_double *a, const bla_integer *lda, const bla_double *x, const bla_integer *incx, const bla_double *beta, bla_double *y, const bla_integer *incy); +BLIS_EXPORT_BLAS int PASTEF77(s,gbmv)(const bla_character *trans, const bla_integer *m, const bla_integer *n, const bla_integer *kl, const bla_integer *ku, const bla_real *alpha, const bla_real *a, const bla_integer *lda, const bla_real *x, const bla_integer * incx, const bla_real *beta, bla_real *y, const bla_integer *incy); +BLIS_EXPORT_BLAS int PASTEF77(z,gbmv)(const bla_character *trans, const bla_integer *m, const bla_integer *n, const bla_integer *kl, const bla_integer *ku, const bla_dcomplex *alpha, const bla_dcomplex *a, const bla_integer *lda, const bla_dcomplex *x, const bla_integer *incx, const bla_dcomplex *beta, bla_dcomplex * y, const bla_integer *incy); #endif diff --git a/frame/compat/f2c/bla_hbmv.c b/frame/compat/f2c/bla_hbmv.c index 198336d04..f548331f6 100644 --- a/frame/compat/f2c/bla_hbmv.c +++ b/frame/compat/f2c/bla_hbmv.c @@ -41,7 +41,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(c,hbmv)(const bla_character *uplo, const bla_integer *n, const bla_integer *k, const bla_scomplex * alpha, const bla_scomplex *a, const bla_integer *lda, const bla_scomplex *x, const bla_integer *incx, const bla_scomplex *beta, bla_scomplex *y, const bla_integer *incy) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(c,hbmv)(const bla_character *uplo, const bla_integer *n, const bla_integer *k, const bla_scomplex * alpha, const bla_scomplex *a, const bla_integer *lda, const bla_scomplex *x, const bla_integer *incx, const bla_scomplex *beta, bla_scomplex *y, const bla_integer *incy) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5; @@ -55,9 +55,9 @@ bla_integer info; bla_scomplex temp1, temp2; bla_integer i__, j, l; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kplus1, ix, iy, jx, jy, kx, ky; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ @@ -487,7 +487,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(z,hbmv)(const bla_character *uplo, const bla_integer *n, const bla_integer *k, const bla_dcomplex *alpha, const bla_dcomplex *a, const bla_integer *lda, const bla_dcomplex *x, const bla_integer * incx, const bla_dcomplex *beta, bla_dcomplex *y, const bla_integer *incy) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(z,hbmv)(const bla_character *uplo, const bla_integer *n, const bla_integer *k, const bla_dcomplex *alpha, const bla_dcomplex *a, const bla_integer *lda, const bla_dcomplex *x, const bla_integer * incx, const bla_dcomplex *beta, bla_dcomplex *y, const bla_integer *incy) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5; @@ -501,9 +501,9 @@ bla_integer info; bla_dcomplex temp1, temp2; bla_integer i__, j, l; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kplus1, ix, iy, jx, jy, kx, ky; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ diff --git a/frame/compat/f2c/bla_hbmv.h b/frame/compat/f2c/bla_hbmv.h index 8a10c75da..1ddb83807 100644 --- a/frame/compat/f2c/bla_hbmv.h +++ b/frame/compat/f2c/bla_hbmv.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS -int PASTEF77(c,hbmv)(const bla_character *uplo, const bla_integer *n, const bla_integer *k, const bla_scomplex *alpha, const bla_scomplex *a, const bla_integer *lda, const bla_scomplex *x, const bla_integer *incx, const bla_scomplex *beta, bla_scomplex *y, const bla_integer *incy); -int PASTEF77(z,hbmv)(const bla_character *uplo, const bla_integer *n, const bla_integer *k, const bla_dcomplex *alpha, const bla_dcomplex *a, const bla_integer *lda, const bla_dcomplex *x, const bla_integer *incx, const bla_dcomplex *beta, bla_dcomplex *y, const bla_integer *incy); +BLIS_EXPORT_BLAS int PASTEF77(c,hbmv)(const bla_character *uplo, const bla_integer *n, const bla_integer *k, const bla_scomplex *alpha, const bla_scomplex *a, const bla_integer *lda, const bla_scomplex *x, const bla_integer *incx, const bla_scomplex *beta, bla_scomplex *y, const bla_integer *incy); +BLIS_EXPORT_BLAS int PASTEF77(z,hbmv)(const bla_character *uplo, const bla_integer *n, const bla_integer *k, const bla_dcomplex *alpha, const bla_dcomplex *a, const bla_integer *lda, const bla_dcomplex *x, const bla_integer *incx, const bla_dcomplex *beta, bla_dcomplex *y, const bla_integer *incy); #endif diff --git a/frame/compat/f2c/bla_hpmv.c b/frame/compat/f2c/bla_hpmv.c index 0d7ebce9d..2daa47bf5 100644 --- a/frame/compat/f2c/bla_hpmv.c +++ b/frame/compat/f2c/bla_hpmv.c @@ -41,7 +41,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(c,hpmv)(const bla_character *uplo, const bla_integer *n, const bla_scomplex *alpha, const bla_scomplex * ap, const bla_scomplex *x, const bla_integer *incx, const bla_scomplex *beta, bla_scomplex *y, const bla_integer *incy) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(c,hpmv)(const bla_character *uplo, const bla_integer *n, const bla_scomplex *alpha, const bla_scomplex * ap, const bla_scomplex *x, const bla_integer *incx, const bla_scomplex *beta, bla_scomplex *y, const bla_integer *incy) { /* System generated locals */ bla_integer i__1, i__2, i__3, i__4, i__5; @@ -55,9 +55,9 @@ bla_integer info; bla_scomplex temp1, temp2; bla_integer i__, j, k; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, iy, jx, jy, kx, ky; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ @@ -439,7 +439,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(z,hpmv)(const bla_character *uplo, const bla_integer *n, const bla_dcomplex *alpha, const bla_dcomplex *ap, const bla_dcomplex *x, const bla_integer *incx, const bla_dcomplex *beta, bla_dcomplex *y, const bla_integer *incy) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(z,hpmv)(const bla_character *uplo, const bla_integer *n, const bla_dcomplex *alpha, const bla_dcomplex *ap, const bla_dcomplex *x, const bla_integer *incx, const bla_dcomplex *beta, bla_dcomplex *y, const bla_integer *incy) { /* System generated locals */ bla_integer i__1, i__2, i__3, i__4, i__5; @@ -453,9 +453,9 @@ bla_integer info; bla_dcomplex temp1, temp2; bla_integer i__, j, k; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, iy, jx, jy, kx, ky; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ diff --git a/frame/compat/f2c/bla_hpmv.h b/frame/compat/f2c/bla_hpmv.h index fc744f985..26d055eff 100644 --- a/frame/compat/f2c/bla_hpmv.h +++ b/frame/compat/f2c/bla_hpmv.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS -int PASTEF77(c,hpmv)(const bla_character *uplo, const bla_integer *n, const bla_scomplex *alpha, const bla_scomplex *ap, const bla_scomplex *x, const bla_integer *incx, const bla_scomplex *beta, bla_scomplex *y, const bla_integer *incy); -int PASTEF77(z,hpmv)(const bla_character *uplo, const bla_integer *n, const bla_dcomplex *alpha, const bla_dcomplex *ap, const bla_dcomplex *x, const bla_integer *incx, const bla_dcomplex *beta, bla_dcomplex *y, const bla_integer *incy); +BLIS_EXPORT_BLAS int PASTEF77(c,hpmv)(const bla_character *uplo, const bla_integer *n, const bla_scomplex *alpha, const bla_scomplex *ap, const bla_scomplex *x, const bla_integer *incx, const bla_scomplex *beta, bla_scomplex *y, const bla_integer *incy); +BLIS_EXPORT_BLAS int PASTEF77(z,hpmv)(const bla_character *uplo, const bla_integer *n, const bla_dcomplex *alpha, const bla_dcomplex *ap, const bla_dcomplex *x, const bla_integer *incx, const bla_dcomplex *beta, bla_dcomplex *y, const bla_integer *incy); #endif diff --git a/frame/compat/f2c/bla_hpr.c b/frame/compat/f2c/bla_hpr.c index da1f0a0f3..be0f796c6 100644 --- a/frame/compat/f2c/bla_hpr.c +++ b/frame/compat/f2c/bla_hpr.c @@ -41,7 +41,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(c,hpr)(const bla_character *uplo, const bla_integer *n, const bla_real *alpha, const bla_scomplex *x, const bla_integer *incx, bla_scomplex *ap) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(c,hpr)(const bla_character *uplo, const bla_integer *n, const bla_real *alpha, const bla_scomplex *x, const bla_integer *incx, bla_scomplex *ap) { /* System generated locals */ bla_integer i__1, i__2, i__3, i__4, i__5; @@ -55,9 +55,9 @@ bla_integer info; bla_scomplex temp; bla_integer i__, j, k; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, jx, kx = 0; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ @@ -353,7 +353,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(z,hpr)(const bla_character *uplo, const bla_integer *n, const bla_double *alpha, const bla_dcomplex *x, const bla_integer *incx, bla_dcomplex *ap) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(z,hpr)(const bla_character *uplo, const bla_integer *n, const bla_double *alpha, const bla_dcomplex *x, const bla_integer *incx, bla_dcomplex *ap) { /* System generated locals */ bla_integer i__1, i__2, i__3, i__4, i__5; @@ -367,9 +367,9 @@ bla_integer info; bla_dcomplex temp; bla_integer i__, j, k; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, jx, kx = 0; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ diff --git a/frame/compat/f2c/bla_hpr.h b/frame/compat/f2c/bla_hpr.h index 1c1a96fc8..cfce9e177 100644 --- a/frame/compat/f2c/bla_hpr.h +++ b/frame/compat/f2c/bla_hpr.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS -int PASTEF77(c,hpr)(const bla_character *uplo, const bla_integer *n, const bla_real *alpha, const bla_scomplex *x, const bla_integer *incx, bla_scomplex *ap); -int PASTEF77(z,hpr)(const bla_character *uplo, const bla_integer *n, const bla_double *alpha, const bla_dcomplex *x, const bla_integer *incx, bla_dcomplex *ap); +BLIS_EXPORT_BLAS int PASTEF77(c,hpr)(const bla_character *uplo, const bla_integer *n, const bla_real *alpha, const bla_scomplex *x, const bla_integer *incx, bla_scomplex *ap); +BLIS_EXPORT_BLAS int PASTEF77(z,hpr)(const bla_character *uplo, const bla_integer *n, const bla_double *alpha, const bla_dcomplex *x, const bla_integer *incx, bla_dcomplex *ap); #endif diff --git a/frame/compat/f2c/bla_hpr2.c b/frame/compat/f2c/bla_hpr2.c index c78c1eec0..597ab7439 100644 --- a/frame/compat/f2c/bla_hpr2.c +++ b/frame/compat/f2c/bla_hpr2.c @@ -41,7 +41,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(c,hpr2)(const bla_character *uplo, const bla_integer *n, const bla_scomplex *alpha, const bla_scomplex *x, const bla_integer *incx, const bla_scomplex *y, const bla_integer *incy, bla_scomplex *ap) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(c,hpr2)(const bla_character *uplo, const bla_integer *n, const bla_scomplex *alpha, const bla_scomplex *x, const bla_integer *incx, const bla_scomplex *y, const bla_integer *incy, bla_scomplex *ap) { /* System generated locals */ bla_integer i__1, i__2, i__3, i__4, i__5, i__6; @@ -55,9 +55,9 @@ bla_integer info; bla_scomplex temp1, temp2; bla_integer i__, j, k; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, iy, jx = 0, jy = 0, kx = 0, ky = 0; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ @@ -429,7 +429,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(z,hpr2)(const bla_character *uplo, const bla_integer *n, const bla_dcomplex *alpha, const bla_dcomplex *x, const bla_integer *incx, const bla_dcomplex *y, const bla_integer *incy, bla_dcomplex *ap) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(z,hpr2)(const bla_character *uplo, const bla_integer *n, const bla_dcomplex *alpha, const bla_dcomplex *x, const bla_integer *incx, const bla_dcomplex *y, const bla_integer *incy, bla_dcomplex *ap) { /* System generated locals */ bla_integer i__1, i__2, i__3, i__4, i__5, i__6; @@ -443,9 +443,9 @@ bla_integer info; bla_dcomplex temp1, temp2; bla_integer i__, j, k; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, iy, jx = 0, jy = 0, kx = 0, ky = 0; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ diff --git a/frame/compat/f2c/bla_hpr2.h b/frame/compat/f2c/bla_hpr2.h index 766974eaf..16f929d61 100644 --- a/frame/compat/f2c/bla_hpr2.h +++ b/frame/compat/f2c/bla_hpr2.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS -int PASTEF77(c,hpr2)(const bla_character *uplo, const bla_integer *n, const bla_scomplex *alpha, const bla_scomplex *x, const bla_integer *incx, const bla_scomplex *y, const bla_integer *incy, bla_scomplex *ap); -int PASTEF77(z,hpr2)(const bla_character *uplo, const bla_integer *n, const bla_dcomplex *alpha, const bla_dcomplex *x, const bla_integer *incx, const bla_dcomplex *y, const bla_integer *incy, bla_dcomplex *ap); +BLIS_EXPORT_BLAS int PASTEF77(c,hpr2)(const bla_character *uplo, const bla_integer *n, const bla_scomplex *alpha, const bla_scomplex *x, const bla_integer *incx, const bla_scomplex *y, const bla_integer *incy, bla_scomplex *ap); +BLIS_EXPORT_BLAS int PASTEF77(z,hpr2)(const bla_character *uplo, const bla_integer *n, const bla_dcomplex *alpha, const bla_dcomplex *x, const bla_integer *incx, const bla_dcomplex *y, const bla_integer *incy, bla_dcomplex *ap); #endif diff --git a/frame/compat/f2c/bla_lsame.c b/frame/compat/f2c/bla_lsame.c index edee918d1..c5a7d2558 100644 --- a/frame/compat/f2c/bla_lsame.c +++ b/frame/compat/f2c/bla_lsame.c @@ -45,7 +45,7 @@ #ifdef LAPACK_ILP64 long PASTEF770(lsame)(const char *ca, const char *cb, long ca_len, long cb_len) #else -int PASTEF770(lsame)(const char *ca, const char *cb, int ca_len, int cb_len) +BLIS_EXPORT_BLAS int PASTEF770(lsame)(const char *ca, const char *cb, int ca_len, int cb_len) #endif { /* System generated locals */ diff --git a/frame/compat/f2c/bla_lsame.h b/frame/compat/f2c/bla_lsame.h index 738ce08b8..656032688 100644 --- a/frame/compat/f2c/bla_lsame.h +++ b/frame/compat/f2c/bla_lsame.h @@ -37,7 +37,7 @@ #ifdef LAPACK_ILP64 long PASTEF770(lsame)(const char *ca, const char *cb, long ca_len, long cb_len); #else -int PASTEF770(lsame)(const char *ca, const char *cb, int ca_len, int cb_len); +BLIS_EXPORT_BLAS int PASTEF770(lsame)(const char *ca, const char *cb, int ca_len, int cb_len); #endif #endif diff --git a/frame/compat/f2c/bla_rot.c b/frame/compat/f2c/bla_rot.c index c79769bc0..4c66e4aa8 100644 --- a/frame/compat/f2c/bla_rot.c +++ b/frame/compat/f2c/bla_rot.c @@ -41,7 +41,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(s,rot)(const bla_integer *n, bla_real *sx, const bla_integer *incx, bla_real *sy, const bla_integer *incy, const bla_real *c__, const bla_real *s) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(s,rot)(const bla_integer *n, bla_real *sx, const bla_integer *incx, bla_real *sy, const bla_integer *incy, const bla_real *c__, const bla_real *s) { /* System generated locals */ bla_integer i__1; @@ -109,7 +109,7 @@ L20: -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(d,rot)(const bla_integer *n, bla_double *dx, const bla_integer *incx, bla_double *dy, const bla_integer *incy, const bla_double *c__, const bla_double *s) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(d,rot)(const bla_integer *n, bla_double *dx, const bla_integer *incx, bla_double *dy, const bla_integer *incy, const bla_double *c__, const bla_double *s) { /* System generated locals */ bla_integer i__1; @@ -177,7 +177,7 @@ L20: -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(cs,rot)(const bla_integer *n, bla_scomplex *cx, const bla_integer *incx, bla_scomplex *cy, const bla_integer *incy, const bla_real *c__, const bla_real *s) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(cs,rot)(const bla_integer *n, bla_scomplex *cx, const bla_integer *incx, bla_scomplex *cy, const bla_integer *incy, const bla_real *c__, const bla_real *s) { /* System generated locals */ bla_integer i__1, i__2, i__3, i__4; @@ -270,7 +270,7 @@ L20: -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(zd,rot)(const bla_integer *n, bla_dcomplex *zx, const bla_integer *incx, bla_dcomplex *zy, const bla_integer *incy, const bla_double *c__, const bla_double *s) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(zd,rot)(const bla_integer *n, bla_dcomplex *zx, const bla_integer *incx, bla_dcomplex *zy, const bla_integer *incy, const bla_double *c__, const bla_double *s) { /* System generated locals */ bla_integer i__1, i__2, i__3, i__4; diff --git a/frame/compat/f2c/bla_rot.h b/frame/compat/f2c/bla_rot.h index 1532a7cfc..609355560 100644 --- a/frame/compat/f2c/bla_rot.h +++ b/frame/compat/f2c/bla_rot.h @@ -34,9 +34,9 @@ #ifdef BLIS_ENABLE_BLAS -int PASTEF77(s,rot)(const bla_integer *n, bla_real *sx, const bla_integer *incx, bla_real *sy, const bla_integer *incy, const bla_real *c__, const bla_real *s); -int PASTEF77(d,rot)(const bla_integer *n, bla_double *dx, const bla_integer *incx, bla_double *dy, const bla_integer *incy, const bla_double *c__, const bla_double *s); -int PASTEF77(cs,rot)(const bla_integer *n, bla_scomplex *cx, const bla_integer *incx, bla_scomplex *cy, const bla_integer *incy, const bla_real *c__, const bla_real *s); -int PASTEF77(zd,rot)(const bla_integer *n, bla_dcomplex *zx, const bla_integer *incx, bla_dcomplex *zy, const bla_integer *incy, const bla_double *c__, const bla_double *s); +BLIS_EXPORT_BLAS int PASTEF77(s,rot)(const bla_integer *n, bla_real *sx, const bla_integer *incx, bla_real *sy, const bla_integer *incy, const bla_real *c__, const bla_real *s); +BLIS_EXPORT_BLAS int PASTEF77(d,rot)(const bla_integer *n, bla_double *dx, const bla_integer *incx, bla_double *dy, const bla_integer *incy, const bla_double *c__, const bla_double *s); +BLIS_EXPORT_BLAS int PASTEF77(cs,rot)(const bla_integer *n, bla_scomplex *cx, const bla_integer *incx, bla_scomplex *cy, const bla_integer *incy, const bla_real *c__, const bla_real *s); +BLIS_EXPORT_BLAS int PASTEF77(zd,rot)(const bla_integer *n, bla_dcomplex *zx, const bla_integer *incx, bla_dcomplex *zy, const bla_integer *incy, const bla_double *c__, const bla_double *s); #endif diff --git a/frame/compat/f2c/bla_rotg.c b/frame/compat/f2c/bla_rotg.c index 1572689f5..1315bd6aa 100644 --- a/frame/compat/f2c/bla_rotg.c +++ b/frame/compat/f2c/bla_rotg.c @@ -45,7 +45,7 @@ static bla_real sc_b4 = 1.f; -/* Subroutine */ int PASTEF77(s,rotg)(bla_real *sa, bla_real *sb, bla_real *c__, bla_real *s) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(s,rotg)(bla_real *sa, bla_real *sb, bla_real *c__, bla_real *s) { /* System generated locals */ bla_real r__1, r__2; @@ -105,7 +105,7 @@ L20: static bla_double dc_b4 = 1.; -/* Subroutine */ int PASTEF77(d,rotg)(bla_double *da, bla_double *db, bla_double *c__, bla_double *s) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(d,rotg)(bla_double *da, bla_double *db, bla_double *c__, bla_double *s) { /* System generated locals */ bla_double d__1, d__2; @@ -161,7 +161,7 @@ L20: -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(c,rotg)(bla_scomplex *ca, bla_scomplex *cb, bla_real *c__, bla_scomplex *s) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(c,rotg)(bla_scomplex *ca, bla_scomplex *cb, bla_real *c__, bla_scomplex *s) { /* System generated locals */ bla_real r__1, r__2; @@ -211,7 +211,7 @@ L20: -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(z,rotg)(bla_dcomplex *ca, bla_dcomplex *cb, bla_double *c__, bla_dcomplex *s) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(z,rotg)(bla_dcomplex *ca, bla_dcomplex *cb, bla_double *c__, bla_dcomplex *s) { /* System generated locals */ bla_double d__1, d__2; diff --git a/frame/compat/f2c/bla_rotg.h b/frame/compat/f2c/bla_rotg.h index c89f0279b..b968ebbea 100644 --- a/frame/compat/f2c/bla_rotg.h +++ b/frame/compat/f2c/bla_rotg.h @@ -34,9 +34,9 @@ #ifdef BLIS_ENABLE_BLAS -int PASTEF77(s,rotg)(bla_real *sa, bla_real *sb, bla_real *c__, bla_real *s); -int PASTEF77(d,rotg)(bla_double *da, bla_double *db, bla_double *c__, bla_double *s); -int PASTEF77(c,rotg)(bla_scomplex *ca, bla_scomplex *cb, bla_real *c__, bla_scomplex *s); -int PASTEF77(z,rotg)(bla_dcomplex *ca, bla_dcomplex *cb, bla_double *c__, bla_dcomplex *s); +BLIS_EXPORT_BLAS int PASTEF77(s,rotg)(bla_real *sa, bla_real *sb, bla_real *c__, bla_real *s); +BLIS_EXPORT_BLAS int PASTEF77(d,rotg)(bla_double *da, bla_double *db, bla_double *c__, bla_double *s); +BLIS_EXPORT_BLAS int PASTEF77(c,rotg)(bla_scomplex *ca, bla_scomplex *cb, bla_real *c__, bla_scomplex *s); +BLIS_EXPORT_BLAS int PASTEF77(z,rotg)(bla_dcomplex *ca, bla_dcomplex *cb, bla_double *c__, bla_dcomplex *s); #endif diff --git a/frame/compat/f2c/bla_rotm.c b/frame/compat/f2c/bla_rotm.c index 003dea715..b39d33115 100644 --- a/frame/compat/f2c/bla_rotm.c +++ b/frame/compat/f2c/bla_rotm.c @@ -41,7 +41,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(s,rotm)(const bla_integer *n, bla_real *sx, const bla_integer *incx, bla_real *sy, const bla_integer *incy, const bla_real *sparam) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(s,rotm)(const bla_integer *n, bla_real *sx, const bla_integer *incx, bla_real *sy, const bla_integer *incy, const bla_real *sparam) { /* Initialized data */ @@ -207,7 +207,7 @@ L140: -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(d,rotm)(const bla_integer *n, bla_double *dx, const bla_integer *incx, bla_double *dy, const bla_integer *incy, const bla_double *dparam) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(d,rotm)(const bla_integer *n, bla_double *dx, const bla_integer *incx, bla_double *dy, const bla_integer *incy, const bla_double *dparam) { /* Initialized data */ diff --git a/frame/compat/f2c/bla_rotm.h b/frame/compat/f2c/bla_rotm.h index d28f0919b..21906358b 100644 --- a/frame/compat/f2c/bla_rotm.h +++ b/frame/compat/f2c/bla_rotm.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS -int PASTEF77(s,rotm)(const bla_integer *n, bla_real *sx, const bla_integer *incx, bla_real *sy, const bla_integer *incy, const bla_real *sparam); -int PASTEF77(d,rotm)(const bla_integer *n, bla_double *dx, const bla_integer *incx, bla_double *dy, const bla_integer *incy, const bla_double *dparam); +BLIS_EXPORT_BLAS int PASTEF77(s,rotm)(const bla_integer *n, bla_real *sx, const bla_integer *incx, bla_real *sy, const bla_integer *incy, const bla_real *sparam); +BLIS_EXPORT_BLAS int PASTEF77(d,rotm)(const bla_integer *n, bla_double *dx, const bla_integer *incx, bla_double *dy, const bla_integer *incy, const bla_double *dparam); #endif diff --git a/frame/compat/f2c/bla_rotmg.c b/frame/compat/f2c/bla_rotmg.c index 11ccc6f33..2803417fe 100644 --- a/frame/compat/f2c/bla_rotmg.c +++ b/frame/compat/f2c/bla_rotmg.c @@ -41,7 +41,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(s,rotmg)(bla_real *sd1, bla_real *sd2, bla_real *sx1, const bla_real *sy1, bla_real *sparam) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(s,rotmg)(bla_real *sd1, bla_real *sd2, bla_real *sx1, const bla_real *sy1, bla_real *sparam) { /* Initialized data */ @@ -281,7 +281,7 @@ L260: -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(d,rotmg)(bla_double *dd1, bla_double *dd2, bla_double *dx1, const bla_double *dy1, bla_double *dparam) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(d,rotmg)(bla_double *dd1, bla_double *dd2, bla_double *dx1, const bla_double *dy1, bla_double *dparam) { /* Initialized data */ diff --git a/frame/compat/f2c/bla_rotmg.h b/frame/compat/f2c/bla_rotmg.h index 29d42a90f..63e9710da 100644 --- a/frame/compat/f2c/bla_rotmg.h +++ b/frame/compat/f2c/bla_rotmg.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS -int PASTEF77(s,rotmg)(bla_real *sd1, bla_real *sd2, bla_real *sx1, const bla_real *sy1, bla_real *sparam); -int PASTEF77(d,rotmg)(bla_double *dd1, bla_double *dd2, bla_double *dx1, const bla_double *dy1, bla_double *dparam); +BLIS_EXPORT_BLAS int PASTEF77(s,rotmg)(bla_real *sd1, bla_real *sd2, bla_real *sx1, const bla_real *sy1, bla_real *sparam); +BLIS_EXPORT_BLAS int PASTEF77(d,rotmg)(bla_double *dd1, bla_double *dd2, bla_double *dx1, const bla_double *dy1, bla_double *dparam); #endif diff --git a/frame/compat/f2c/bla_sbmv.c b/frame/compat/f2c/bla_sbmv.c index 566fabd81..ddedc9ea7 100644 --- a/frame/compat/f2c/bla_sbmv.c +++ b/frame/compat/f2c/bla_sbmv.c @@ -41,7 +41,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(d,sbmv)(const bla_character *uplo, const bla_integer *n, const bla_integer *k, const bla_double *alpha, const bla_double *a, const bla_integer *lda, const bla_double *x, const bla_integer *incx, const bla_double *beta, bla_double *y, const bla_integer *incy) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(d,sbmv)(const bla_character *uplo, const bla_integer *n, const bla_integer *k, const bla_double *alpha, const bla_double *a, const bla_integer *lda, const bla_double *x, const bla_integer *incx, const bla_double *beta, bla_double *y, const bla_integer *incy) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4; @@ -50,9 +50,9 @@ bla_integer info; bla_double temp1, temp2; bla_integer i__, j, l; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kplus1, ix, iy, jx, jy, kx, ky; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ @@ -392,7 +392,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(s,sbmv)(const bla_character *uplo, const bla_integer *n, const bla_integer *k, const bla_real *alpha, const bla_real *a, const bla_integer *lda, const bla_real *x, const bla_integer *incx, const bla_real *beta, bla_real *y, const bla_integer *incy) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(s,sbmv)(const bla_character *uplo, const bla_integer *n, const bla_integer *k, const bla_real *alpha, const bla_real *a, const bla_integer *lda, const bla_real *x, const bla_integer *incx, const bla_real *beta, bla_real *y, const bla_integer *incy) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4; @@ -401,9 +401,9 @@ bla_integer info; bla_real temp1, temp2; bla_integer i__, j, l; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kplus1, ix, iy, jx, jy, kx, ky; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ diff --git a/frame/compat/f2c/bla_sbmv.h b/frame/compat/f2c/bla_sbmv.h index 75442fc7c..c3f3fc24f 100644 --- a/frame/compat/f2c/bla_sbmv.h +++ b/frame/compat/f2c/bla_sbmv.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS -int PASTEF77(d,sbmv)(const bla_character *uplo, const bla_integer *n, const bla_integer *k, const bla_double *alpha, const bla_double *a, const bla_integer *lda, const bla_double *x, const bla_integer *incx, const bla_double *beta, bla_double *y, const bla_integer *incy); -int PASTEF77(s,sbmv)(const bla_character *uplo, const bla_integer *n, const bla_integer *k, const bla_real *alpha, const bla_real *a, const bla_integer *lda, const bla_real *x, const bla_integer *incx, const bla_real *beta, bla_real *y, const bla_integer *incy); +BLIS_EXPORT_BLAS int PASTEF77(d,sbmv)(const bla_character *uplo, const bla_integer *n, const bla_integer *k, const bla_double *alpha, const bla_double *a, const bla_integer *lda, const bla_double *x, const bla_integer *incx, const bla_double *beta, bla_double *y, const bla_integer *incy); +BLIS_EXPORT_BLAS int PASTEF77(s,sbmv)(const bla_character *uplo, const bla_integer *n, const bla_integer *k, const bla_real *alpha, const bla_real *a, const bla_integer *lda, const bla_real *x, const bla_integer *incx, const bla_real *beta, bla_real *y, const bla_integer *incy); #endif diff --git a/frame/compat/f2c/bla_spmv.c b/frame/compat/f2c/bla_spmv.c index 0485e1dc3..909085f38 100644 --- a/frame/compat/f2c/bla_spmv.c +++ b/frame/compat/f2c/bla_spmv.c @@ -41,7 +41,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(d,spmv)(const bla_character *uplo, const bla_integer *n, const bla_double *alpha, const bla_double *ap, const bla_double *x, const bla_integer *incx, const bla_double *beta, bla_double *y, const bla_integer *incy) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(d,spmv)(const bla_character *uplo, const bla_integer *n, const bla_double *alpha, const bla_double *ap, const bla_double *x, const bla_integer *incx, const bla_double *beta, bla_double *y, const bla_integer *incy) { /* System generated locals */ bla_integer i__1, i__2; @@ -50,9 +50,9 @@ bla_integer info; bla_double temp1, temp2; bla_integer i__, j, k; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, iy, jx, jy, kx, ky; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ @@ -342,7 +342,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(s,spmv)(const bla_character *uplo, const bla_integer *n, const bla_real *alpha, const bla_real *ap, const bla_real *x, const bla_integer *incx, const bla_real *beta, bla_real *y, const bla_integer *incy) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(s,spmv)(const bla_character *uplo, const bla_integer *n, const bla_real *alpha, const bla_real *ap, const bla_real *x, const bla_integer *incx, const bla_real *beta, bla_real *y, const bla_integer *incy) { /* System generated locals */ bla_integer i__1, i__2; @@ -351,9 +351,9 @@ bla_integer info; bla_real temp1, temp2; bla_integer i__, j, k; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, iy, jx, jy, kx, ky; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ diff --git a/frame/compat/f2c/bla_spmv.h b/frame/compat/f2c/bla_spmv.h index 8e0d0c1ff..7db7d4a8b 100644 --- a/frame/compat/f2c/bla_spmv.h +++ b/frame/compat/f2c/bla_spmv.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS -int PASTEF77(d,spmv)(const bla_character *uplo, const bla_integer *n, const bla_double *alpha, const bla_double *ap, const bla_double *x, const bla_integer *incx, const bla_double *beta, bla_double *y, const bla_integer *incy); -int PASTEF77(s,spmv)(const bla_character *uplo, const bla_integer *n, const bla_real *alpha, const bla_real *ap, const bla_real *x, const bla_integer *incx, const bla_real *beta, bla_real *y, const bla_integer *incy); +BLIS_EXPORT_BLAS int PASTEF77(d,spmv)(const bla_character *uplo, const bla_integer *n, const bla_double *alpha, const bla_double *ap, const bla_double *x, const bla_integer *incx, const bla_double *beta, bla_double *y, const bla_integer *incy); +BLIS_EXPORT_BLAS int PASTEF77(s,spmv)(const bla_character *uplo, const bla_integer *n, const bla_real *alpha, const bla_real *ap, const bla_real *x, const bla_integer *incx, const bla_real *beta, bla_real *y, const bla_integer *incy); #endif diff --git a/frame/compat/f2c/bla_spr.c b/frame/compat/f2c/bla_spr.c index d276458b4..84f33b569 100644 --- a/frame/compat/f2c/bla_spr.c +++ b/frame/compat/f2c/bla_spr.c @@ -41,7 +41,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(d,spr)(const bla_character *uplo, const bla_integer *n, const bla_double *alpha, const bla_double *x, const bla_integer *incx, bla_double *ap) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(d,spr)(const bla_character *uplo, const bla_integer *n, const bla_double *alpha, const bla_double *x, const bla_integer *incx, bla_double *ap) { /* System generated locals */ bla_integer i__1, i__2; @@ -50,9 +50,9 @@ bla_integer info; bla_double temp; bla_integer i__, j, k; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, jx, kx = 0; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ @@ -268,7 +268,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(s,spr)(const bla_character *uplo, const bla_integer *n, const bla_real *alpha, const bla_real *x, const bla_integer *incx, bla_real *ap) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(s,spr)(const bla_character *uplo, const bla_integer *n, const bla_real *alpha, const bla_real *x, const bla_integer *incx, bla_real *ap) { /* System generated locals */ bla_integer i__1, i__2; @@ -277,9 +277,9 @@ bla_integer info; bla_real temp; bla_integer i__, j, k; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, jx, kx = 0; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ diff --git a/frame/compat/f2c/bla_spr.h b/frame/compat/f2c/bla_spr.h index af63cea52..6712d7c16 100644 --- a/frame/compat/f2c/bla_spr.h +++ b/frame/compat/f2c/bla_spr.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS -int PASTEF77(d,spr)(const bla_character *uplo, const bla_integer *n, const bla_double *alpha, const bla_double *x, const bla_integer *incx, bla_double *ap); -int PASTEF77(s,spr)(const bla_character *uplo, const bla_integer *n, const bla_real *alpha, const bla_real *x, const bla_integer *incx, bla_real *ap); +BLIS_EXPORT_BLAS int PASTEF77(d,spr)(const bla_character *uplo, const bla_integer *n, const bla_double *alpha, const bla_double *x, const bla_integer *incx, bla_double *ap); +BLIS_EXPORT_BLAS int PASTEF77(s,spr)(const bla_character *uplo, const bla_integer *n, const bla_real *alpha, const bla_real *x, const bla_integer *incx, bla_real *ap); #endif diff --git a/frame/compat/f2c/bla_spr2.c b/frame/compat/f2c/bla_spr2.c index 7c7538212..e2df99299 100644 --- a/frame/compat/f2c/bla_spr2.c +++ b/frame/compat/f2c/bla_spr2.c @@ -41,7 +41,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(d,spr2)(const bla_character *uplo, const bla_integer *n, const bla_double *alpha, const bla_double *x, const bla_integer *incx, const bla_double *y, const bla_integer *incy, bla_double *ap) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(d,spr2)(const bla_character *uplo, const bla_integer *n, const bla_double *alpha, const bla_double *x, const bla_integer *incx, const bla_double *y, const bla_integer *incy, bla_double *ap) { /* System generated locals */ bla_integer i__1, i__2; @@ -50,9 +50,9 @@ bla_integer info; bla_double temp1, temp2; bla_integer i__, j, k; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, iy, jx = 0, jy = 0, kx = 0, ky = 0; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ @@ -300,7 +300,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(s,spr2)(const bla_character *uplo, const bla_integer *n, const bla_real *alpha, const bla_real *x, const bla_integer *incx, const bla_real *y, const bla_integer *incy, bla_real *ap) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(s,spr2)(const bla_character *uplo, const bla_integer *n, const bla_real *alpha, const bla_real *x, const bla_integer *incx, const bla_real *y, const bla_integer *incy, bla_real *ap) { /* System generated locals */ bla_integer i__1, i__2; @@ -309,9 +309,9 @@ bla_integer info; bla_real temp1, temp2; bla_integer i__, j, k; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, iy, jx = 0, jy = 0, kx = 0, ky = 0; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); /* .. Scalar Arguments .. */ /* .. Array Arguments .. */ diff --git a/frame/compat/f2c/bla_spr2.h b/frame/compat/f2c/bla_spr2.h index b6322cc37..5a1d60747 100644 --- a/frame/compat/f2c/bla_spr2.h +++ b/frame/compat/f2c/bla_spr2.h @@ -34,7 +34,7 @@ #ifdef BLIS_ENABLE_BLAS -int PASTEF77(d,spr2)(const bla_character *uplo, const bla_integer *n, const bla_double *alpha, const bla_double *x, const bla_integer *incx, const bla_double *y, const bla_integer *incy, bla_double *ap); -int PASTEF77(s,spr2)(const bla_character *uplo, const bla_integer *n, const bla_real *alpha, const bla_real *x, const bla_integer *incx, const bla_real *y, const bla_integer *incy, bla_real *ap); +BLIS_EXPORT_BLAS int PASTEF77(d,spr2)(const bla_character *uplo, const bla_integer *n, const bla_double *alpha, const bla_double *x, const bla_integer *incx, const bla_double *y, const bla_integer *incy, bla_double *ap); +BLIS_EXPORT_BLAS int PASTEF77(s,spr2)(const bla_character *uplo, const bla_integer *n, const bla_real *alpha, const bla_real *x, const bla_integer *incx, const bla_real *y, const bla_integer *incy, bla_real *ap); #endif diff --git a/frame/compat/f2c/bla_tbmv.c b/frame/compat/f2c/bla_tbmv.c index 78feb7056..2d25bde6c 100644 --- a/frame/compat/f2c/bla_tbmv.c +++ b/frame/compat/f2c/bla_tbmv.c @@ -41,7 +41,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(c,tbmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_scomplex *a, const bla_integer *lda, bla_scomplex *x, const bla_integer *incx) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(c,tbmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_scomplex *a, const bla_integer *lda, bla_scomplex *x, const bla_integer *incx) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5; @@ -54,9 +54,9 @@ bla_integer info; bla_scomplex temp; bla_integer i__, j, l; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kplus1, ix, jx, kx = 0; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical noconj, nounit; /* .. Scalar Arguments .. */ @@ -611,7 +611,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(d,tbmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_double *a, const bla_integer *lda, bla_double *x, const bla_integer *incx) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(d,tbmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_double *a, const bla_integer *lda, bla_double *x, const bla_integer *incx) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4; @@ -620,9 +620,9 @@ bla_integer info; bla_double temp; bla_integer i__, j, l; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kplus1, ix, jx, kx = 0; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical nounit; /* .. Scalar Arguments .. */ @@ -1022,7 +1022,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(s,tbmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_real *a, const bla_integer *lda, bla_real *x, const bla_integer *incx) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(s,tbmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_real *a, const bla_integer *lda, bla_real *x, const bla_integer *incx) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4; @@ -1031,9 +1031,9 @@ bla_integer info; bla_real temp; bla_integer i__, j, l; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kplus1, ix, jx, kx = 0; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical nounit; /* .. Scalar Arguments .. */ @@ -1433,7 +1433,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(z,tbmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_dcomplex *a, const bla_integer *lda, bla_dcomplex *x, const bla_integer *incx) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(z,tbmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_dcomplex *a, const bla_integer *lda, bla_dcomplex *x, const bla_integer *incx) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5; @@ -1446,9 +1446,9 @@ bla_integer info; bla_dcomplex temp; bla_integer i__, j, l; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kplus1, ix, jx, kx = 0; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical noconj, nounit; /* .. Scalar Arguments .. */ diff --git a/frame/compat/f2c/bla_tbmv.h b/frame/compat/f2c/bla_tbmv.h index c524f0ee2..f34654762 100644 --- a/frame/compat/f2c/bla_tbmv.h +++ b/frame/compat/f2c/bla_tbmv.h @@ -34,9 +34,9 @@ #ifdef BLIS_ENABLE_BLAS -int PASTEF77(c,tbmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_scomplex *a, const bla_integer *lda, bla_scomplex *x, const bla_integer *incx); -int PASTEF77(d,tbmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_double *a, const bla_integer *lda, bla_double *x, const bla_integer *incx); -int PASTEF77(s,tbmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_real *a, const bla_integer *lda, bla_real *x, const bla_integer *incx); -int PASTEF77(z,tbmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_dcomplex *a, const bla_integer *lda, bla_dcomplex *x, const bla_integer *incx); +BLIS_EXPORT_BLAS int PASTEF77(c,tbmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_scomplex *a, const bla_integer *lda, bla_scomplex *x, const bla_integer *incx); +BLIS_EXPORT_BLAS int PASTEF77(d,tbmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_double *a, const bla_integer *lda, bla_double *x, const bla_integer *incx); +BLIS_EXPORT_BLAS int PASTEF77(s,tbmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_real *a, const bla_integer *lda, bla_real *x, const bla_integer *incx); +BLIS_EXPORT_BLAS int PASTEF77(z,tbmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_dcomplex *a, const bla_integer *lda, bla_dcomplex *x, const bla_integer *incx); #endif diff --git a/frame/compat/f2c/bla_tbsv.c b/frame/compat/f2c/bla_tbsv.c index 6914882d2..733e90a2d 100644 --- a/frame/compat/f2c/bla_tbsv.c +++ b/frame/compat/f2c/bla_tbsv.c @@ -41,7 +41,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(c,tbsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_scomplex *a, const bla_integer *lda, bla_scomplex *x, const bla_integer *incx) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(c,tbsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_scomplex *a, const bla_integer *lda, bla_scomplex *x, const bla_integer *incx) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5; @@ -54,9 +54,9 @@ bla_integer info; bla_scomplex temp; bla_integer i__, j, l; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kplus1, ix, jx, kx = 0; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical noconj, nounit; /* .. Scalar Arguments .. */ @@ -603,7 +603,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(d,tbsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_double *a, const bla_integer *lda, bla_double *x, const bla_integer *incx) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(d,tbsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_double *a, const bla_integer *lda, bla_double *x, const bla_integer *incx) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4; @@ -612,9 +612,9 @@ bla_integer info; bla_double temp; bla_integer i__, j, l; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kplus1, ix, jx, kx = 0; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical nounit; /* .. Scalar Arguments .. */ @@ -1018,7 +1018,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(s,tbsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_real *a, const bla_integer *lda, bla_real *x, const bla_integer *incx) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(s,tbsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_real *a, const bla_integer *lda, bla_real *x, const bla_integer *incx) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4; @@ -1027,9 +1027,9 @@ bla_integer info; bla_real temp; bla_integer i__, j, l; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kplus1, ix, jx, kx = 0; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical nounit; /* .. Scalar Arguments .. */ @@ -1433,7 +1433,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(z,tbsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_dcomplex *a, const bla_integer *lda, bla_dcomplex *x, const bla_integer *incx) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(z,tbsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_dcomplex *a, const bla_integer *lda, bla_dcomplex *x, const bla_integer *incx) { /* System generated locals */ bla_integer a_dim1, a_offset, i__1, i__2, i__3, i__4, i__5; @@ -1447,9 +1447,9 @@ bla_integer info; bla_dcomplex temp; bla_integer i__, j, l; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kplus1, ix, jx, kx = 0; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical noconj, nounit; /* .. Scalar Arguments .. */ diff --git a/frame/compat/f2c/bla_tbsv.h b/frame/compat/f2c/bla_tbsv.h index e48de07e1..5e84f5c36 100644 --- a/frame/compat/f2c/bla_tbsv.h +++ b/frame/compat/f2c/bla_tbsv.h @@ -34,9 +34,9 @@ #ifdef BLIS_ENABLE_BLAS -int PASTEF77(c,tbsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_scomplex *a, const bla_integer *lda, bla_scomplex *x, const bla_integer *incx); -int PASTEF77(d,tbsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_double *a, const bla_integer *lda, bla_double *x, const bla_integer *incx); -int PASTEF77(s,tbsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_real *a, const bla_integer *lda, bla_real *x, const bla_integer *incx); -int PASTEF77(z,tbsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_dcomplex *a, const bla_integer *lda, bla_dcomplex *x, const bla_integer *incx); +BLIS_EXPORT_BLAS int PASTEF77(c,tbsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_scomplex *a, const bla_integer *lda, bla_scomplex *x, const bla_integer *incx); +BLIS_EXPORT_BLAS int PASTEF77(d,tbsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_double *a, const bla_integer *lda, bla_double *x, const bla_integer *incx); +BLIS_EXPORT_BLAS int PASTEF77(s,tbsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_real *a, const bla_integer *lda, bla_real *x, const bla_integer *incx); +BLIS_EXPORT_BLAS int PASTEF77(z,tbsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_integer *k, const bla_dcomplex *a, const bla_integer *lda, bla_dcomplex *x, const bla_integer *incx); #endif diff --git a/frame/compat/f2c/bla_tpmv.c b/frame/compat/f2c/bla_tpmv.c index 8fa46f4c4..eddd776d6 100644 --- a/frame/compat/f2c/bla_tpmv.c +++ b/frame/compat/f2c/bla_tpmv.c @@ -41,7 +41,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(c,tpmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_scomplex *ap, bla_scomplex *x, const bla_integer *incx) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(c,tpmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_scomplex *ap, bla_scomplex *x, const bla_integer *incx) { /* System generated locals */ bla_integer i__1, i__2, i__3, i__4, i__5; @@ -54,9 +54,9 @@ bla_integer info; bla_scomplex temp; bla_integer i__, j, k; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, jx, kx = 0; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical noconj, nounit; /* .. Scalar Arguments .. */ @@ -542,7 +542,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(d,tpmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_double *ap, bla_double *x, const bla_integer *incx) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(d,tpmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_double *ap, bla_double *x, const bla_integer *incx) { /* System generated locals */ bla_integer i__1, i__2; @@ -551,9 +551,9 @@ bla_integer info; bla_double temp; bla_integer i__, j, k; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, jx, kx = 0; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical nounit; /* .. Scalar Arguments .. */ @@ -890,7 +890,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(s,tpmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_real *ap, bla_real *x, const bla_integer *incx) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(s,tpmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_real *ap, bla_real *x, const bla_integer *incx) { /* System generated locals */ bla_integer i__1, i__2; @@ -899,9 +899,9 @@ bla_integer info; bla_real temp; bla_integer i__, j, k; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, jx, kx = 0; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical nounit; /* .. Scalar Arguments .. */ @@ -1238,7 +1238,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(z,tpmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_dcomplex *ap, bla_dcomplex *x, const bla_integer *incx) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(z,tpmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_dcomplex *ap, bla_dcomplex *x, const bla_integer *incx) { /* System generated locals */ bla_integer i__1, i__2, i__3, i__4, i__5; @@ -1251,9 +1251,9 @@ bla_integer info; bla_dcomplex temp; bla_integer i__, j, k; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, jx, kx = 0; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical noconj, nounit; /* .. Scalar Arguments .. */ diff --git a/frame/compat/f2c/bla_tpmv.h b/frame/compat/f2c/bla_tpmv.h index 095d7d414..2376ecfe3 100644 --- a/frame/compat/f2c/bla_tpmv.h +++ b/frame/compat/f2c/bla_tpmv.h @@ -34,9 +34,9 @@ #ifdef BLIS_ENABLE_BLAS -int PASTEF77(c,tpmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_scomplex *ap, bla_scomplex *x, const bla_integer *incx); -int PASTEF77(d,tpmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_double *ap, bla_double *x, const bla_integer *incx); -int PASTEF77(s,tpmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_real *ap, bla_real *x, const bla_integer *incx); -int PASTEF77(z,tpmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_dcomplex *ap, bla_dcomplex *x, const bla_integer *incx); +BLIS_EXPORT_BLAS int PASTEF77(c,tpmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_scomplex *ap, bla_scomplex *x, const bla_integer *incx); +BLIS_EXPORT_BLAS int PASTEF77(d,tpmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_double *ap, bla_double *x, const bla_integer *incx); +BLIS_EXPORT_BLAS int PASTEF77(s,tpmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_real *ap, bla_real *x, const bla_integer *incx); +BLIS_EXPORT_BLAS int PASTEF77(z,tpmv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_dcomplex *ap, bla_dcomplex *x, const bla_integer *incx); #endif diff --git a/frame/compat/f2c/bla_tpsv.c b/frame/compat/f2c/bla_tpsv.c index 076494097..8cb43f007 100644 --- a/frame/compat/f2c/bla_tpsv.c +++ b/frame/compat/f2c/bla_tpsv.c @@ -41,7 +41,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(c,tpsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_scomplex *ap, bla_scomplex *x, const bla_integer *incx) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(c,tpsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_scomplex *ap, bla_scomplex *x, const bla_integer *incx) { /* System generated locals */ bla_integer i__1, i__2, i__3, i__4, i__5; @@ -54,9 +54,9 @@ bla_integer info; bla_scomplex temp; bla_integer i__, j, k; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, jx, kx = 0; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical noconj, nounit; /* .. Scalar Arguments .. */ @@ -534,7 +534,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(d,tpsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_double *ap, bla_double *x, const bla_integer *incx) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(d,tpsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_double *ap, bla_double *x, const bla_integer *incx) { /* System generated locals */ bla_integer i__1, i__2; @@ -543,9 +543,9 @@ bla_integer info; bla_double temp; bla_integer i__, j, k; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, jx, kx = 0; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical nounit; /* .. Scalar Arguments .. */ @@ -885,7 +885,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(s,tpsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_real *ap, bla_real *x, const bla_integer *incx) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(s,tpsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_real *ap, bla_real *x, const bla_integer *incx) { /* System generated locals */ bla_integer i__1, i__2; @@ -894,9 +894,9 @@ bla_integer info; bla_real temp; bla_integer i__, j, k; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, jx, kx = 0; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical nounit; /* .. Scalar Arguments .. */ @@ -1236,7 +1236,7 @@ -lf2c -lm (in that order) */ -/* Subroutine */ int PASTEF77(z,tpsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_dcomplex *ap, bla_dcomplex *x, const bla_integer *incx) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF77(z,tpsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_dcomplex *ap, bla_dcomplex *x, const bla_integer *incx) { /* System generated locals */ bla_integer i__1, i__2, i__3, i__4, i__5; @@ -1250,9 +1250,9 @@ bla_integer info; bla_dcomplex temp; bla_integer i__, j, k; - //extern bla_logical PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); + //extern bla_logical BLIS_EXPORT_BLAS PASTEF770(lsame)(bla_character *, bla_character *, ftnlen, ftnlen); bla_integer kk, ix, jx, kx = 0; - //extern /* Subroutine */ int PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); + //extern /* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(bla_character *, bla_integer *, ftnlen); bla_logical noconj, nounit; /* .. Scalar Arguments .. */ diff --git a/frame/compat/f2c/bla_tpsv.h b/frame/compat/f2c/bla_tpsv.h index 9c3de2ea0..77bd55979 100644 --- a/frame/compat/f2c/bla_tpsv.h +++ b/frame/compat/f2c/bla_tpsv.h @@ -34,9 +34,9 @@ #ifdef BLIS_ENABLE_BLAS -int PASTEF77(c,tpsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_scomplex *ap, bla_scomplex *x, const bla_integer *incx); -int PASTEF77(d,tpsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_double *ap, bla_double *x, const bla_integer *incx); -int PASTEF77(s,tpsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_real *ap, bla_real *x, const bla_integer *incx); -int PASTEF77(z,tpsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_dcomplex *ap, bla_dcomplex *x, const bla_integer *incx); +BLIS_EXPORT_BLAS int PASTEF77(c,tpsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_scomplex *ap, bla_scomplex *x, const bla_integer *incx); +BLIS_EXPORT_BLAS int PASTEF77(d,tpsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_double *ap, bla_double *x, const bla_integer *incx); +BLIS_EXPORT_BLAS int PASTEF77(s,tpsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_real *ap, bla_real *x, const bla_integer *incx); +BLIS_EXPORT_BLAS int PASTEF77(z,tpsv)(const bla_character *uplo, const bla_character *trans, const bla_character *diag, const bla_integer *n, const bla_dcomplex *ap, bla_dcomplex *x, const bla_integer *incx); #endif diff --git a/frame/compat/f2c/bla_xerbla.c b/frame/compat/f2c/bla_xerbla.c index a6500c443..543e06fdb 100644 --- a/frame/compat/f2c/bla_xerbla.c +++ b/frame/compat/f2c/bla_xerbla.c @@ -43,7 +43,7 @@ /* Table of constant values */ -/* Subroutine */ int PASTEF770(xerbla)(const bla_character *srname, const bla_integer *info, ftnlen srname_len) +/* Subroutine */ int BLIS_EXPORT_BLAS PASTEF770(xerbla)(const bla_character *srname, const bla_integer *info, ftnlen srname_len) { /* -- LAPACK auxiliary routine (preliminary version) -- */ /* Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd., */ diff --git a/frame/compat/f2c/bla_xerbla.h b/frame/compat/f2c/bla_xerbla.h index 4110cf281..44c168e58 100644 --- a/frame/compat/f2c/bla_xerbla.h +++ b/frame/compat/f2c/bla_xerbla.h @@ -34,6 +34,6 @@ #ifdef BLIS_ENABLE_BLAS -int PASTEF770(xerbla)(const bla_character *srname, const bla_integer *info, ftnlen srname_len); +BLIS_EXPORT_BLAS int PASTEF770(xerbla)(const bla_character *srname, const bla_integer *info, ftnlen srname_len); #endif diff --git a/frame/include/bli_arch_config_pre.h b/frame/include/bli_arch_config_pre.h index 1ab0561d8..2fa61b0d0 100644 --- a/frame/include/bli_arch_config_pre.h +++ b/frame/include/bli_arch_config_pre.h @@ -58,15 +58,15 @@ // Prototype-generating macro for bli_cntx_init_*() functions. #define CNTX_INIT_PROTS( archname ) \ \ -void PASTEMAC(cntx_init_,archname) \ +BLIS_EXPORT_BLIS void PASTEMAC(cntx_init_,archname) \ ( \ cntx_t* cntx \ ); \ -void PASTEMAC2(cntx_init_,archname,BLIS_REF_SUFFIX) \ +BLIS_EXPORT_BLIS void PASTEMAC2(cntx_init_,archname,BLIS_REF_SUFFIX) \ ( \ cntx_t* cntx \ ); \ -void PASTEMAC2(cntx_init_,archname,BLIS_IND_SUFFIX) \ +BLIS_EXPORT_BLIS void PASTEMAC2(cntx_init_,archname,BLIS_IND_SUFFIX) \ ( \ ind_t method, \ num_t dt, \ diff --git a/frame/include/bli_macro_defs.h b/frame/include/bli_macro_defs.h index 400ae2e9c..c25d84c99 100644 --- a/frame/include/bli_macro_defs.h +++ b/frame/include/bli_macro_defs.h @@ -153,10 +153,10 @@ #define STRINGIFY_INT( s ) MKSTR( s ) // Fortran-77 name-mangling macros. -#define PASTEF770(name) name ## _ -#define PASTEF77(ch1,name) ch1 ## name ## _ -#define PASTEF772(ch1,ch2,name) ch1 ## ch2 ## name ## _ -#define PASTEF773(ch1,ch2,ch3,name) ch1 ## ch2 ## ch3 ## name ## _ +#define PASTEF770(name) name ## _ +#define PASTEF77(ch1,name) ch1 ## name ## _ +#define PASTEF772(ch1,ch2,name) ch1 ## ch2 ## name ## _ +#define PASTEF773(ch1,ch2,ch3,name) ch1 ## ch2 ## ch3 ## name ## _ // -- Include other groups of macros diff --git a/frame/include/bli_param_macro_defs.h b/frame/include/bli_param_macro_defs.h index 3c1f74abf..f4e7e775f 100644 --- a/frame/include/bli_param_macro_defs.h +++ b/frame/include/bli_param_macro_defs.h @@ -961,7 +961,7 @@ static bool_t bli_is_nonnull( void* p ) // argument. static -void bli_set_dims_incs_uplo_1m +void bli_set_dims_incs_uplo_1m ( doff_t diagoffa, diag_t diaga, uplo_t uploa, dim_t m, dim_t n, inc_t rs_a, inc_t cs_a, @@ -1056,7 +1056,7 @@ void bli_set_dims_incs_uplo_1m // argument (without column-wise stride optimization). static -void bli_set_dims_incs_uplo_1m_noswap +void bli_set_dims_incs_uplo_1m_noswap ( doff_t diagoffa, diag_t diaga, uplo_t uploa, dim_t m, dim_t n, inc_t rs_a, inc_t cs_a, @@ -1142,7 +1142,7 @@ void bli_set_dims_incs_uplo_1m_noswap // Set dimensions and increments for TWO matrix arguments. static -void bli_set_dims_incs_2m +void bli_set_dims_incs_2m ( trans_t transa, dim_t m, dim_t n, inc_t rs_a, inc_t cs_a, @@ -1178,7 +1178,7 @@ void bli_set_dims_incs_2m // arguments. static -void bli_set_dims_incs_uplo_2m +void bli_set_dims_incs_uplo_2m ( doff_t diagoffa, diag_t diaga, trans_t transa, uplo_t uploa, dim_t m, dim_t n, inc_t rs_a, inc_t cs_a, @@ -1286,7 +1286,7 @@ void bli_set_dims_incs_uplo_2m // on the diagonal. static -void bli_set_dims_incs_1d +void bli_set_dims_incs_1d ( doff_t diagoffx, dim_t m, dim_t n, inc_t rs_x, inc_t cs_x, @@ -1310,7 +1310,7 @@ void bli_set_dims_incs_1d // Set dimensions, increments, etc for TWO matrix arguments when operating // on diagonals. static -void bli_set_dims_incs_2d +void bli_set_dims_incs_2d ( doff_t diagoffx, trans_t transx, dim_t m, dim_t n, inc_t rs_x, inc_t cs_x, diff --git a/frame/ind/bli_ind.h b/frame/ind/bli_ind.h index 9618acd8e..f3a8ea690 100644 --- a/frame/ind/bli_ind.h +++ b/frame/ind/bli_ind.h @@ -48,27 +48,27 @@ #include "bli_cntx_ind_stage.h" -void bli_ind_init( void ); -void bli_ind_finalize( void ); +BLIS_EXPORT_BLIS void bli_ind_init( void ); +BLIS_EXPORT_BLIS void bli_ind_finalize( void ); -void bli_ind_enable( ind_t method ); -void bli_ind_disable( ind_t method ); -void bli_ind_disable_all( void ); +BLIS_EXPORT_BLIS void bli_ind_enable( ind_t method ); +BLIS_EXPORT_BLIS void bli_ind_disable( ind_t method ); +BLIS_EXPORT_BLIS void bli_ind_disable_all( void ); -void bli_ind_enable_dt( ind_t method, num_t dt ); -void bli_ind_disable_dt( ind_t method, num_t dt ); -void bli_ind_disable_all_dt( num_t dt ); +BLIS_EXPORT_BLIS void bli_ind_enable_dt( ind_t method, num_t dt ); +BLIS_EXPORT_BLIS void bli_ind_disable_dt( ind_t method, num_t dt ); +BLIS_EXPORT_BLIS void bli_ind_disable_all_dt( num_t dt ); -void bli_ind_oper_enable_only( opid_t oper, ind_t method, num_t dt ); +BLIS_EXPORT_BLIS void bli_ind_oper_enable_only( opid_t oper, ind_t method, num_t dt ); -bool_t bli_ind_oper_is_impl( opid_t oper, ind_t method ); +BLIS_EXPORT_BLIS bool_t bli_ind_oper_is_impl( opid_t oper, ind_t method ); //bool_t bli_ind_oper_has_avail( opid_t oper, num_t dt ); -void* bli_ind_oper_get_avail( opid_t oper, num_t dt ); -ind_t bli_ind_oper_find_avail( opid_t oper, num_t dt ); -char* bli_ind_oper_get_avail_impl_string( opid_t oper, num_t dt ); +BLIS_EXPORT_BLIS void* bli_ind_oper_get_avail( opid_t oper, num_t dt ); +BLIS_EXPORT_BLIS ind_t bli_ind_oper_find_avail( opid_t oper, num_t dt ); +BLIS_EXPORT_BLIS char* bli_ind_oper_get_avail_impl_string( opid_t oper, num_t dt ); -char* bli_ind_get_impl_string( ind_t method ); -num_t bli_ind_map_cdt_to_index( num_t dt ); +BLIS_EXPORT_BLIS char* bli_ind_get_impl_string( ind_t method ); +BLIS_EXPORT_BLIS num_t bli_ind_map_cdt_to_index( num_t dt ); #endif diff --git a/frame/ind/bli_l3_ind.h b/frame/ind/bli_l3_ind.h index 0b9f49ec3..454eb6240 100644 --- a/frame/ind/bli_l3_ind.h +++ b/frame/ind/bli_l3_ind.h @@ -40,7 +40,7 @@ #undef GENPROT #define GENPROT( opname ) \ \ -void* PASTEMAC(opname,ind_get_avail)( num_t dt ); +BLIS_EXPORT_BLIS void* PASTEMAC(opname,ind_get_avail)( num_t dt ); /*bool_t PASTEMAC(opname,ind_has_avail)( num_t dt ); */ GENPROT( gemm ) @@ -58,17 +58,17 @@ GENPROT( trsm ) //bool_t bli_l3_ind_oper_is_avail( opid_t oper, ind_t method, num_t dt ); -ind_t bli_l3_ind_oper_find_avail( opid_t oper, num_t dt ); +BLIS_EXPORT_BLIS ind_t bli_l3_ind_oper_find_avail( opid_t oper, num_t dt ); -void bli_l3_ind_set_enable_dt( ind_t method, num_t dt, bool_t status ); +BLIS_EXPORT_BLIS void bli_l3_ind_set_enable_dt( ind_t method, num_t dt, bool_t status ); -void bli_l3_ind_oper_enable_only( opid_t oper, ind_t method, num_t dt ); -void bli_l3_ind_oper_set_enable_all( opid_t oper, num_t dt, bool_t status ); +BLIS_EXPORT_BLIS void bli_l3_ind_oper_enable_only( opid_t oper, ind_t method, num_t dt ); +BLIS_EXPORT_BLIS void bli_l3_ind_oper_set_enable_all( opid_t oper, num_t dt, bool_t status ); -void bli_l3_ind_oper_set_enable( opid_t oper, ind_t method, num_t dt, bool_t status ); -bool_t bli_l3_ind_oper_get_enable( opid_t oper, ind_t method, num_t dt ); +BLIS_EXPORT_BLIS void bli_l3_ind_oper_set_enable( opid_t oper, ind_t method, num_t dt, bool_t status ); +BLIS_EXPORT_BLIS bool_t bli_l3_ind_oper_get_enable( opid_t oper, ind_t method, num_t dt ); -void* bli_l3_ind_oper_get_func( opid_t oper, ind_t method ); +BLIS_EXPORT_BLIS void* bli_l3_ind_oper_get_func( opid_t oper, ind_t method ); #endif diff --git a/frame/ind/cntx/bli_cntx_ind_stage.c b/frame/ind/cntx/bli_cntx_ind_stage.c index 671be681d..c48dbe234 100644 --- a/frame/ind/cntx/bli_cntx_ind_stage.c +++ b/frame/ind/cntx/bli_cntx_ind_stage.c @@ -53,7 +53,7 @@ static void* bli_cntx_ind_stage_fp[BLIS_NUM_IND_METHODS] = // Execute the context initialization/finalization function associated // with a given induced method. -void bli_cntx_ind_stage( ind_t method, dim_t stage, cntx_t* cntx ) +BLIS_EXPORT_BLIS void bli_cntx_ind_stage( ind_t method, dim_t stage, cntx_t* cntx ) { cntx_stage_ft func = bli_cntx_ind_stage_fp[ method ]; @@ -69,7 +69,7 @@ void bli_cntx_ind_stage( ind_t method, dim_t stage, cntx_t* cntx ) // ----------------------------------------------------------------------------- -void bli_cntx_3mh_stage( dim_t stage, cntx_t* cntx ) +BLIS_EXPORT_BLIS void bli_cntx_3mh_stage( dim_t stage, cntx_t* cntx ) { // Set the pack_t schemas as a function of the stage of execution. if ( stage == 0 ) @@ -91,13 +91,13 @@ void bli_cntx_3mh_stage( dim_t stage, cntx_t* cntx ) // ----------------------------------------------------------------------------- -void bli_cntx_3m1_stage( dim_t stage, cntx_t* cntx ) +BLIS_EXPORT_BLIS void bli_cntx_3m1_stage( dim_t stage, cntx_t* cntx ) { } // ----------------------------------------------------------------------------- -void bli_cntx_4mh_stage( dim_t stage, cntx_t* cntx ) +BLIS_EXPORT_BLIS void bli_cntx_4mh_stage( dim_t stage, cntx_t* cntx ) { // Set the pack_t schemas as a function of the stage of execution. if ( stage == 0 ) @@ -124,25 +124,25 @@ void bli_cntx_4mh_stage( dim_t stage, cntx_t* cntx ) // ----------------------------------------------------------------------------- -void bli_cntx_4mb_stage( dim_t stage, cntx_t* cntx ) +BLIS_EXPORT_BLIS void bli_cntx_4mb_stage( dim_t stage, cntx_t* cntx ) { } // ----------------------------------------------------------------------------- -void bli_cntx_4m1_stage( dim_t stage, cntx_t* cntx ) +BLIS_EXPORT_BLIS void bli_cntx_4m1_stage( dim_t stage, cntx_t* cntx ) { } // ----------------------------------------------------------------------------- -void bli_cntx_1m_stage( dim_t stage, cntx_t* cntx ) +BLIS_EXPORT_BLIS void bli_cntx_1m_stage( dim_t stage, cntx_t* cntx ) { } // ----------------------------------------------------------------------------- -void bli_cntx_nat_stage( dim_t stage, cntx_t* cntx ) +BLIS_EXPORT_BLIS void bli_cntx_nat_stage( dim_t stage, cntx_t* cntx ) { } diff --git a/frame/ind/cntx/bli_cntx_ind_stage.h b/frame/ind/cntx/bli_cntx_ind_stage.h index affaa84f4..d469319c3 100644 --- a/frame/ind/cntx/bli_cntx_ind_stage.h +++ b/frame/ind/cntx/bli_cntx_ind_stage.h @@ -32,13 +32,13 @@ */ -void bli_cntx_ind_stage( ind_t method, dim_t stage, cntx_t* cntx ); +BLIS_EXPORT_BLIS void bli_cntx_ind_stage( ind_t method, dim_t stage, cntx_t* cntx ); -void bli_cntx_3mh_stage( dim_t stage, cntx_t* cntx ); -void bli_cntx_3m1_stage( dim_t stage, cntx_t* cntx ); -void bli_cntx_4mh_stage( dim_t stage, cntx_t* cntx ); -void bli_cntx_4mb_stage( dim_t stage, cntx_t* cntx ); -void bli_cntx_4m1_stage( dim_t stage, cntx_t* cntx ); -void bli_cntx_1m_stage( dim_t stage, cntx_t* cntx ); -void bli_cntx_nat_stage( dim_t stage, cntx_t* cntx ); +BLIS_EXPORT_BLIS void bli_cntx_3mh_stage( dim_t stage, cntx_t* cntx ); +BLIS_EXPORT_BLIS void bli_cntx_3m1_stage( dim_t stage, cntx_t* cntx ); +BLIS_EXPORT_BLIS void bli_cntx_4mh_stage( dim_t stage, cntx_t* cntx ); +BLIS_EXPORT_BLIS void bli_cntx_4mb_stage( dim_t stage, cntx_t* cntx ); +BLIS_EXPORT_BLIS void bli_cntx_4m1_stage( dim_t stage, cntx_t* cntx ); +BLIS_EXPORT_BLIS void bli_cntx_1m_stage( dim_t stage, cntx_t* cntx ); +BLIS_EXPORT_BLIS void bli_cntx_nat_stage( dim_t stage, cntx_t* cntx ); diff --git a/frame/ind/oapi/bli_l3_3m4m1m_oapi.c b/frame/ind/oapi/bli_l3_3m4m1m_oapi.c index 087e1beef..9386a2738 100644 --- a/frame/ind/oapi/bli_l3_3m4m1m_oapi.c +++ b/frame/ind/oapi/bli_l3_3m4m1m_oapi.c @@ -40,7 +40,7 @@ #undef GENFRONT #define GENFRONT( opname, cname, imeth, nstage ) \ \ -void PASTEMAC(opname,imeth) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,imeth) \ ( \ obj_t* alpha, \ obj_t* a, \ @@ -147,7 +147,7 @@ GENFRONT( syr2k, gemm, 1m, 1 ) #undef GENFRONT #define GENFRONT( opname, cname, imeth, nstage ) \ \ -void PASTEMAC(opname,imeth) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,imeth) \ ( \ side_t side, \ obj_t* alpha, \ @@ -240,7 +240,7 @@ GENFRONT( trmm3, gemm, 1m, 1 ) #undef GENFRONT #define GENFRONT( opname, cname, imeth, nstage ) \ \ -void PASTEMAC(opname,imeth) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,imeth) \ ( \ obj_t* alpha, \ obj_t* a, \ @@ -323,7 +323,7 @@ GENFRONT( syrk, gemm, 1m, 1 ) #undef GENFRONT #define GENFRONT( opname, cname, imeth, nstage ) \ \ -void PASTEMAC(opname,imeth) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,imeth) \ ( \ side_t side, \ obj_t* alpha, \ @@ -387,7 +387,7 @@ GENFRONT( trmm, gemm, 1m, 1 ) #undef GENFRONT #define GENFRONT( opname, cname, imeth, nstage ) \ \ -void PASTEMAC(opname,imeth) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,imeth) \ ( \ side_t side, \ obj_t* alpha, \ diff --git a/frame/ind/oapi/bli_l3_ind_oapi.c b/frame/ind/oapi/bli_l3_ind_oapi.c index 213753019..87755e277 100644 --- a/frame/ind/oapi/bli_l3_ind_oapi.c +++ b/frame/ind/oapi/bli_l3_ind_oapi.c @@ -41,7 +41,7 @@ #undef GENFRONT #define GENFRONT( opname, imeth ) \ \ -void PASTEMAC(opname,imeth) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,imeth) \ ( \ obj_t* alpha, \ obj_t* a, \ @@ -76,7 +76,7 @@ GENFRONT( syr2k, ind ) #undef GENFRONT #define GENFRONT( opname, imeth ) \ \ -void PASTEMAC(opname,imeth) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,imeth) \ ( \ side_t side, \ obj_t* alpha, \ @@ -112,7 +112,7 @@ GENFRONT( trmm3, ind ) #undef GENFRONT #define GENFRONT( opname, imeth ) \ \ -void PASTEMAC(opname,imeth) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,imeth) \ ( \ obj_t* alpha, \ obj_t* a, \ @@ -145,7 +145,7 @@ GENFRONT( syrk, ind ) #undef GENFRONT #define GENFRONT( opname, imeth ) \ \ -void PASTEMAC(opname,imeth) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,imeth) \ ( \ side_t side, \ obj_t* alpha, \ diff --git a/frame/ind/oapi/bli_l3_ind_oapi.h b/frame/ind/oapi/bli_l3_ind_oapi.h index c8370a2a5..d4767925d 100644 --- a/frame/ind/oapi/bli_l3_ind_oapi.h +++ b/frame/ind/oapi/bli_l3_ind_oapi.h @@ -40,16 +40,16 @@ #undef GENPROT #define GENPROT( imeth ) \ \ -void PASTEMAC(gemm,imeth) ( obj_t* alpha, obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); \ -void PASTEMAC(hemm,imeth) ( side_t side, obj_t* alpha, obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); \ -void PASTEMAC(herk,imeth) ( obj_t* alpha, obj_t* a, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); \ -void PASTEMAC(her2k,imeth)( obj_t* alpha, obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); \ -void PASTEMAC(symm,imeth) ( side_t side, obj_t* alpha, obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); \ -void PASTEMAC(syrk,imeth) ( obj_t* alpha, obj_t* a, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); \ -void PASTEMAC(syr2k,imeth)( obj_t* alpha, obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); \ -void PASTEMAC(trmm3,imeth)( side_t side, obj_t* alpha, obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); \ -void PASTEMAC(trmm,imeth) ( side_t side, obj_t* alpha, obj_t* a, obj_t* b, cntx_t* cntx, rntm_t* rntm ); \ -void PASTEMAC(trsm,imeth) ( side_t side, obj_t* alpha, obj_t* a, obj_t* b, cntx_t* cntx, rntm_t* rntm ); +BLIS_EXPORT_BLIS void PASTEMAC(gemm,imeth) ( obj_t* alpha, obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); \ +BLIS_EXPORT_BLIS void PASTEMAC(hemm,imeth) ( side_t side, obj_t* alpha, obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); \ +BLIS_EXPORT_BLIS void PASTEMAC(herk,imeth) ( obj_t* alpha, obj_t* a, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); \ +BLIS_EXPORT_BLIS void PASTEMAC(her2k,imeth)( obj_t* alpha, obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); \ +BLIS_EXPORT_BLIS void PASTEMAC(symm,imeth) ( side_t side, obj_t* alpha, obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); \ +BLIS_EXPORT_BLIS void PASTEMAC(syrk,imeth) ( obj_t* alpha, obj_t* a, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); \ +BLIS_EXPORT_BLIS void PASTEMAC(syr2k,imeth)( obj_t* alpha, obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); \ +BLIS_EXPORT_BLIS void PASTEMAC(trmm3,imeth)( side_t side, obj_t* alpha, obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); \ +BLIS_EXPORT_BLIS void PASTEMAC(trmm,imeth) ( side_t side, obj_t* alpha, obj_t* a, obj_t* b, cntx_t* cntx, rntm_t* rntm ); \ +BLIS_EXPORT_BLIS void PASTEMAC(trsm,imeth) ( side_t side, obj_t* alpha, obj_t* a, obj_t* b, cntx_t* cntx, rntm_t* rntm ); GENPROT( nat ) GENPROT( ind ) @@ -65,14 +65,14 @@ GENPROT( 1m ) #undef GENPROT_NO2OP #define GENPROT_NO2OP( imeth ) \ \ -void PASTEMAC(gemm,imeth) ( obj_t* alpha, obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); \ -void PASTEMAC(hemm,imeth) ( side_t side, obj_t* alpha, obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); \ -void PASTEMAC(herk,imeth) ( obj_t* alpha, obj_t* a, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); \ -void PASTEMAC(her2k,imeth)( obj_t* alpha, obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); \ -void PASTEMAC(symm,imeth) ( side_t side, obj_t* alpha, obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); \ -void PASTEMAC(syrk,imeth) ( obj_t* alpha, obj_t* a, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); \ -void PASTEMAC(syr2k,imeth)( obj_t* alpha, obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); \ -void PASTEMAC(trmm3,imeth)( side_t side, obj_t* alpha, obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); +BLIS_EXPORT_BLIS void PASTEMAC(gemm,imeth) ( obj_t* alpha, obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); \ +BLIS_EXPORT_BLIS void PASTEMAC(hemm,imeth) ( side_t side, obj_t* alpha, obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); \ +BLIS_EXPORT_BLIS void PASTEMAC(herk,imeth) ( obj_t* alpha, obj_t* a, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); \ +BLIS_EXPORT_BLIS void PASTEMAC(her2k,imeth)( obj_t* alpha, obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); \ +BLIS_EXPORT_BLIS void PASTEMAC(symm,imeth) ( side_t side, obj_t* alpha, obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); \ +BLIS_EXPORT_BLIS void PASTEMAC(syrk,imeth) ( obj_t* alpha, obj_t* a, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); \ +BLIS_EXPORT_BLIS void PASTEMAC(syr2k,imeth)( obj_t* alpha, obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); \ +BLIS_EXPORT_BLIS void PASTEMAC(trmm3,imeth)( side_t side, obj_t* alpha, obj_t* a, obj_t* b, obj_t* beta, obj_t* c, cntx_t* cntx, rntm_t* rntm ); GENPROT_NO2OP( 3mh ) GENPROT_NO2OP( 4mh ) @@ -88,7 +88,7 @@ GENPROT_NO2OP( 4mb ) #undef GENPROT #define GENPROT( imeth, alg ) \ \ -void PASTEMAC2(gemm,imeth,alg) ( obj_t* alpha, obj_t* a, obj_t* b, obj_t* beta, obj_t* c ); \ +BLIS_EXPORT_BLIS void PASTEMAC2(gemm,imeth,alg) ( obj_t* alpha, obj_t* a, obj_t* b, obj_t* beta, obj_t* c ); \ */ //GENPROT( 1m, bp ) diff --git a/frame/ind/oapi/bli_l3_nat_oapi.c b/frame/ind/oapi/bli_l3_nat_oapi.c index 52b7e98ad..c45e74f12 100644 --- a/frame/ind/oapi/bli_l3_nat_oapi.c +++ b/frame/ind/oapi/bli_l3_nat_oapi.c @@ -46,7 +46,7 @@ #undef GENFRONT #define GENFRONT( opname, cname, imeth ) \ \ -void PASTEMAC(opname,imeth) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,imeth) \ ( \ obj_t* alpha, \ obj_t* a, \ @@ -89,7 +89,7 @@ GENFRONT( syr2k, gemm, nat ) #undef GENFRONT #define GENFRONT( opname, cname, imeth ) \ \ -void PASTEMAC(opname,imeth) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,imeth) \ ( \ side_t side, \ obj_t* alpha, \ @@ -129,7 +129,7 @@ GENFRONT( trmm3, gemm, nat ) #undef GENFRONT #define GENFRONT( opname, cname, imeth ) \ \ -void PASTEMAC(opname,imeth) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,imeth) \ ( \ obj_t* alpha, \ obj_t* a, \ @@ -166,7 +166,7 @@ GENFRONT( syrk, gemm, nat ) #undef GENFRONT #define GENFRONT( opname, cname, imeth ) \ \ -void PASTEMAC(opname,imeth) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,imeth) \ ( \ side_t side, \ obj_t* alpha, \ @@ -202,7 +202,7 @@ GENFRONT( trmm, gemm, nat ) #undef GENFRONT #define GENFRONT( opname, cname, imeth ) \ \ -void PASTEMAC(opname,imeth) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,imeth) \ ( \ side_t side, \ obj_t* alpha, \ diff --git a/frame/ind/tapi/bli_l3_ind_tapi.c b/frame/ind/tapi/bli_l3_ind_tapi.c index 9ca7746bc..35060a572 100644 --- a/frame/ind/tapi/bli_l3_ind_tapi.c +++ b/frame/ind/tapi/bli_l3_ind_tapi.c @@ -40,7 +40,7 @@ #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ trans_t transa, \ trans_t transb, \ @@ -103,7 +103,7 @@ INSERT_GENTFUNC_BASIC0( gemm1m ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ side_t side, \ uplo_t uploa, \ @@ -170,7 +170,7 @@ INSERT_GENTFUNC_BASIC0( hemm1m ) #undef GENTFUNCR #define GENTFUNCR( ctype, ctype_r, ch, chr, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ uplo_t uploc, \ trans_t transa, \ @@ -229,7 +229,7 @@ INSERT_GENTFUNCR_BASIC0( herk1m ) #undef GENTFUNCR #define GENTFUNCR( ctype, ctype_r, ch, chr, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ uplo_t uploc, \ trans_t transa, \ @@ -295,7 +295,7 @@ INSERT_GENTFUNCR_BASIC0( her2k1m ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ side_t side, \ uplo_t uploa, \ @@ -362,7 +362,7 @@ INSERT_GENTFUNC_BASIC0( symm1m ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ uplo_t uploc, \ trans_t transa, \ @@ -420,7 +420,7 @@ INSERT_GENTFUNC_BASIC0( syrk1m ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ uplo_t uploc, \ trans_t transa, \ @@ -485,7 +485,7 @@ INSERT_GENTFUNC_BASIC0( syr2k1m ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ side_t side, \ uplo_t uploa, \ @@ -554,7 +554,7 @@ INSERT_GENTFUNC_BASIC0( trmm31m ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ side_t side, \ uplo_t uploa, \ @@ -611,7 +611,7 @@ INSERT_GENTFUNC_BASIC0( trmm1m ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ side_t side, \ uplo_t uploa, \ diff --git a/frame/ind/tapi/bli_l3_ind_tapi.h b/frame/ind/tapi/bli_l3_ind_tapi.h index 49ff6a873..7c693cea0 100644 --- a/frame/ind/tapi/bli_l3_ind_tapi.h +++ b/frame/ind/tapi/bli_l3_ind_tapi.h @@ -36,7 +36,7 @@ #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ trans_t transa, \ trans_t transb, \ @@ -63,7 +63,7 @@ INSERT_GENTPROT_BASIC0( gemm1m ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ side_t side, \ uplo_t uploa, \ @@ -90,7 +90,7 @@ INSERT_GENTPROT_BASIC0( hemm1m ) #undef GENTPROTR #define GENTPROTR( ctype, ctype_r, ch, chr, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ uplo_t uploc, \ trans_t transa, \ @@ -116,7 +116,7 @@ INSERT_GENTPROTR_BASIC0( her2k1m ) #undef GENTPROTR #define GENTPROTR( ctype, ctype_r, ch, chr, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ uplo_t uploc, \ trans_t transa, \ @@ -140,7 +140,7 @@ INSERT_GENTPROTR_BASIC0( herk1m ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ side_t side, \ uplo_t uploa, \ @@ -167,7 +167,7 @@ INSERT_GENTPROT_BASIC0( symm1m ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ uplo_t uploc, \ trans_t transa, \ @@ -193,7 +193,7 @@ INSERT_GENTPROT_BASIC0( syr2k1m ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ uplo_t uploc, \ trans_t transa, \ @@ -217,7 +217,7 @@ INSERT_GENTPROT_BASIC0( syrk1m ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ side_t side, \ uplo_t uploa, \ @@ -245,7 +245,7 @@ INSERT_GENTPROT_BASIC0( trmm31m ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ side_t side, \ uplo_t uploa, \ @@ -268,7 +268,7 @@ INSERT_GENTPROT_BASIC0( trmm1m ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ side_t side, \ uplo_t uploa, \ diff --git a/frame/ind/ukernels/bli_l3_ind_ukr.h b/frame/ind/ukernels/bli_l3_ind_ukr.h index 53cb0b6f8..1b9e7bebc 100644 --- a/frame/ind/ukernels/bli_l3_ind_ukr.h +++ b/frame/ind/ukernels/bli_l3_ind_ukr.h @@ -41,7 +41,7 @@ #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ dim_t k, \ ctype* restrict alpha, \ @@ -64,7 +64,7 @@ INSERT_GENTPROT_BASIC0( gemm1m_ukr_name ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ dim_t k, \ ctype* restrict alpha, \ @@ -88,7 +88,7 @@ INSERT_GENTPROT_BASIC0( gemmtrsm1m_u_ukr_name ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ ctype* restrict a, \ ctype* restrict b, \ diff --git a/frame/thread/bli_pthread.h b/frame/thread/bli_pthread.h index 337eadc33..7fb47ff8c 100644 --- a/frame/thread/bli_pthread.h +++ b/frame/thread/bli_pthread.h @@ -46,34 +46,34 @@ typedef void bli_pthread_mutexattr_t; #define BLIS_PTHREAD_MUTEX_INITIALIZER SRWLOCK_INIT -int bli_pthread_mutex_init( bli_pthread_mutex_t* mutex, const bli_pthread_mutexattr_t *attr ); +BLIS_EXPORT_BLIS int bli_pthread_mutex_init( bli_pthread_mutex_t* mutex, const bli_pthread_mutexattr_t *attr ); -int bli_pthread_mutex_destroy( bli_pthread_mutex_t* mutex ); +BLIS_EXPORT_BLIS int bli_pthread_mutex_destroy( bli_pthread_mutex_t* mutex ); -int bli_pthread_mutex_lock( bli_pthread_mutex_t* mutex ); +BLIS_EXPORT_BLIS int bli_pthread_mutex_lock( bli_pthread_mutex_t* mutex ); -int bli_pthread_mutex_trylock( bli_pthread_mutex_t* mutex ); +BLIS_EXPORT_BLIS int bli_pthread_mutex_trylock( bli_pthread_mutex_t* mutex ); -int bli_pthread_mutex_unlock( bli_pthread_mutex_t* mutex ); +BLIS_EXPORT_BLIS int bli_pthread_mutex_unlock( bli_pthread_mutex_t* mutex ); typedef INIT_ONCE bli_pthread_once_t; #define BLIS_PTHREAD_ONCE_INIT INIT_ONCE_STATIC_INIT -void bli_pthread_once( bli_pthread_once_t* once, void (*init)( void ) ); +BLIS_EXPORT_BLIS void bli_pthread_once( bli_pthread_once_t* once, void (*init)( void ) ); typedef CONDITION_VARIABLE bli_pthread_cond_t; typedef void bli_pthread_condattr_t; #define BLIS_PTHREAD_COND_INITIALIZER CONDITION_VARIABLE_INIT -int bli_pthread_cond_init( bli_pthread_cond_t* cond, const bli_pthread_condattr_t* attr ); +BLIS_EXPORT_BLIS int bli_pthread_cond_init( bli_pthread_cond_t* cond, const bli_pthread_condattr_t* attr ); -int bli_pthread_cond_destroy( bli_pthread_cond_t* cond ); +BLIS_EXPORT_BLIS int bli_pthread_cond_destroy( bli_pthread_cond_t* cond ); -int bli_pthread_cond_wait( bli_pthread_cond_t* cond, bli_pthread_mutex_t* mutex ); +BLIS_EXPORT_BLIS int bli_pthread_cond_wait( bli_pthread_cond_t* cond, bli_pthread_mutex_t* mutex ); -int bli_pthread_cond_broadcast( bli_pthread_cond_t* cond ); +BLIS_EXPORT_BLIS int bli_pthread_cond_broadcast( bli_pthread_cond_t* cond ); typedef struct { HANDLE handle; @@ -82,9 +82,9 @@ typedef struct typedef void bli_pthread_attr_t; -int bli_pthread_create( bli_pthread_t *thread, const bli_pthread_attr_t *attr, void* (*start_routine)( void* ), void *arg ); +BLIS_EXPORT_BLIS int bli_pthread_create( bli_pthread_t *thread, const bli_pthread_attr_t *attr, void* (*start_routine)( void* ), void *arg ); -int bli_pthread_join( bli_pthread_t thread, void **retval ); +BLIS_EXPORT_BLIS int bli_pthread_join( bli_pthread_t thread, void **retval ); // barrier-related definitions @@ -98,11 +98,11 @@ typedef struct int tripCount; } bli_pthread_barrier_t; -int bli_pthread_barrier_init( bli_pthread_barrier_t *barrier, const bli_pthread_barrierattr_t *attr, unsigned int count ); +BLIS_EXPORT_BLIS int bli_pthread_barrier_init( bli_pthread_barrier_t *barrier, const bli_pthread_barrierattr_t *attr, unsigned int count ); -int bli_pthread_barrier_destroy( bli_pthread_barrier_t *barrier ); +BLIS_EXPORT_BLIS int bli_pthread_barrier_destroy( bli_pthread_barrier_t *barrier ); -int bli_pthread_barrier_wait( bli_pthread_barrier_t *barrier ); +BLIS_EXPORT_BLIS int bli_pthread_barrier_wait( bli_pthread_barrier_t *barrier ); #else // !defined(_MSC_VER) @@ -155,7 +155,7 @@ typedef pthread_barrierattr_t bli_pthread_barrierattr_t; // -- pthread_create(), pthread_join() -- -int bli_pthread_create +BLIS_EXPORT_BLIS int bli_pthread_create ( bli_pthread_t* thread, const bli_pthread_attr_t* attr, @@ -163,7 +163,7 @@ int bli_pthread_create void* arg ); -int bli_pthread_join +BLIS_EXPORT_BLIS int bli_pthread_join ( bli_pthread_t thread, void** retval @@ -171,59 +171,59 @@ int bli_pthread_join // -- pthread_mutex_*() -- -int bli_pthread_mutex_init +BLIS_EXPORT_BLIS int bli_pthread_mutex_init ( bli_pthread_mutex_t* mutex, const bli_pthread_mutexattr_t* attr ); -int bli_pthread_mutex_destroy +BLIS_EXPORT_BLIS int bli_pthread_mutex_destroy ( bli_pthread_mutex_t* mutex ); -int bli_pthread_mutex_lock +BLIS_EXPORT_BLIS int bli_pthread_mutex_lock ( bli_pthread_mutex_t* mutex ); -int bli_pthread_mutex_trylock +BLIS_EXPORT_BLIS int bli_pthread_mutex_trylock ( bli_pthread_mutex_t* mutex ); -int bli_pthread_mutex_unlock +BLIS_EXPORT_BLIS int bli_pthread_mutex_unlock ( bli_pthread_mutex_t* mutex ); // -- pthread_cond_*() -- -int bli_pthread_cond_init +BLIS_EXPORT_BLIS int bli_pthread_cond_init ( bli_pthread_cond_t* cond, const bli_pthread_condattr_t* attr ); -int bli_pthread_cond_destroy +BLIS_EXPORT_BLIS int bli_pthread_cond_destroy ( bli_pthread_cond_t* cond ); -int bli_pthread_cond_wait +BLIS_EXPORT_BLIS int bli_pthread_cond_wait ( bli_pthread_cond_t* cond, bli_pthread_mutex_t* mutex ); -int bli_pthread_cond_broadcast +BLIS_EXPORT_BLIS int bli_pthread_cond_broadcast ( bli_pthread_cond_t* cond ); // -- pthread_once_*() -- -void bli_pthread_once +BLIS_EXPORT_BLIS void bli_pthread_once ( bli_pthread_once_t* once, void (*init)(void) @@ -231,19 +231,19 @@ void bli_pthread_once // -- pthread_barrier_*() -- -int bli_pthread_barrier_init +BLIS_EXPORT_BLIS int bli_pthread_barrier_init ( bli_pthread_barrier_t* barrier, const bli_pthread_barrierattr_t* attr, unsigned int count ); -int bli_pthread_barrier_destroy +BLIS_EXPORT_BLIS int bli_pthread_barrier_destroy ( bli_pthread_barrier_t* barrier ); -int bli_pthread_barrier_wait +BLIS_EXPORT_BLIS int bli_pthread_barrier_wait ( bli_pthread_barrier_t* barrier ); diff --git a/frame/thread/bli_thrcomm.h b/frame/thread/bli_thrcomm.h index 04bceae2a..ab5ebaabd 100644 --- a/frame/thread/bli_thrcomm.h +++ b/frame/thread/bli_thrcomm.h @@ -44,7 +44,7 @@ // thread entry point prototype. -void* bli_l3_thread_entry( void* data_void ); +BLIS_EXPORT_BLIS void* bli_l3_thread_entry( void* data_void ); // thrcomm_t query (field only) @@ -56,14 +56,14 @@ static dim_t bli_thrcomm_num_threads( thrcomm_t* comm ) // Thread communicator prototypes. -thrcomm_t* bli_thrcomm_create( rntm_t* rntm, dim_t n_threads ); -void bli_thrcomm_free( rntm_t* rntm, thrcomm_t* comm ); -void bli_thrcomm_init( dim_t n_threads, thrcomm_t* comm ); -void bli_thrcomm_cleanup( thrcomm_t* comm ); -void bli_thrcomm_barrier( dim_t thread_id, thrcomm_t* comm ); -void* bli_thrcomm_bcast( dim_t inside_id, void* to_send, thrcomm_t* comm ); +BLIS_EXPORT_BLIS thrcomm_t* bli_thrcomm_create( rntm_t* rntm, dim_t n_threads ); +BLIS_EXPORT_BLIS void bli_thrcomm_free( rntm_t* rntm, thrcomm_t* comm ); +BLIS_EXPORT_BLIS void bli_thrcomm_init( dim_t n_threads, thrcomm_t* comm ); +BLIS_EXPORT_BLIS void bli_thrcomm_cleanup( thrcomm_t* comm ); +BLIS_EXPORT_BLIS void bli_thrcomm_barrier( dim_t thread_id, thrcomm_t* comm ); +BLIS_EXPORT_BLIS void* bli_thrcomm_bcast( dim_t inside_id, void* to_send, thrcomm_t* comm ); -void bli_thrcomm_barrier_atomic( dim_t thread_id, thrcomm_t* comm ); +BLIS_EXPORT_BLIS void bli_thrcomm_barrier_atomic( dim_t thread_id, thrcomm_t* comm ); #endif diff --git a/frame/thread/bli_thrcomm_openmp.h b/frame/thread/bli_thrcomm_openmp.h index c7b3b0694..da7921a01 100644 --- a/frame/thread/bli_thrcomm_openmp.h +++ b/frame/thread/bli_thrcomm_openmp.h @@ -74,12 +74,12 @@ typedef struct thrcomm_s thrcomm_t; // Prototypes specific to tree barriers. #ifdef BLIS_TREE_BARRIER -barrier_t* bli_thrcomm_tree_barrier_create( int num_threads, int arity, barrier_t** leaves, int leaf_index ); -void bli_thrcomm_tree_barrier_free( barrier_t* barrier ); -void bli_thrcomm_tree_barrier( barrier_t* barack ); +BLIS_EXPORT_BLIS barrier_t* bli_thrcomm_tree_barrier_create( int num_threads, int arity, barrier_t** leaves, int leaf_index ); +BLIS_EXPORT_BLIS void bli_thrcomm_tree_barrier_free( barrier_t* barrier ); +BLIS_EXPORT_BLIS void bli_thrcomm_tree_barrier( barrier_t* barack ); #endif -void bli_l3_thread_decorator_thread_check +BLIS_EXPORT_BLIS void bli_l3_thread_decorator_thread_check ( dim_t n_threads, dim_t tid, diff --git a/frame/thread/bli_thread.h b/frame/thread/bli_thread.h index f186c0f3b..0a5696cf6 100644 --- a/frame/thread/bli_thread.h +++ b/frame/thread/bli_thread.h @@ -49,8 +49,8 @@ #include "bli_l3_thrinfo.h" // Initialization-related prototypes. -void bli_thread_init( void ); -void bli_thread_finalize( void ); +BLIS_EXPORT_BLIS void bli_thread_init( void ); +BLIS_EXPORT_BLIS void bli_thread_finalize( void ); #ifdef _MSC_VER #define strerror_r(errno,buf,len) strerror_s(buf,len,errno) @@ -58,7 +58,7 @@ void bli_thread_finalize( void ); // Thread range-related prototypes. -void bli_thread_range_sub +BLIS_EXPORT_BLIS void bli_thread_range_sub ( thrinfo_t* thread, dim_t n, @@ -71,7 +71,7 @@ void bli_thread_range_sub #undef GENPROT #define GENPROT( opname ) \ \ -siz_t PASTEMAC0( opname ) \ +BLIS_EXPORT_BLIS siz_t PASTEMAC0( opname ) \ ( \ dir_t direct, \ thrinfo_t* thr, \ @@ -90,7 +90,7 @@ GENPROT( thread_range_ndim ) #undef GENPROT #define GENPROT( opname ) \ \ -siz_t PASTEMAC0( opname ) \ +BLIS_EXPORT_BLIS siz_t PASTEMAC0( opname ) \ ( \ thrinfo_t* thr, \ obj_t* a, \ @@ -110,7 +110,7 @@ GENPROT( thread_range_weighted_t2b ) GENPROT( thread_range_weighted_b2t ) -dim_t bli_thread_range_width_l +BLIS_EXPORT_BLIS dim_t bli_thread_range_width_l ( doff_t diagoff_j, dim_t m, @@ -122,13 +122,13 @@ dim_t bli_thread_range_width_l double area_per_thr, bool_t handle_edge_low ); -siz_t bli_find_area_trap_l +BLIS_EXPORT_BLIS siz_t bli_find_area_trap_l ( dim_t m, dim_t n, doff_t diagoff ); -siz_t bli_thread_range_weighted_sub +BLIS_EXPORT_BLIS siz_t bli_thread_range_weighted_sub ( thrinfo_t* restrict thread, doff_t diagoff, @@ -158,7 +158,7 @@ typedef void (*l3int_t) ); // Level-3 thread decorator prototype -void bli_l3_thread_decorator +BLIS_EXPORT_BLIS void bli_l3_thread_decorator ( l3int_t func, opid_t family, @@ -182,36 +182,36 @@ typedef struct dim_t f; } bli_prime_factors_t; -void bli_prime_factorization(dim_t n, bli_prime_factors_t* factors); +BLIS_EXPORT_BLIS void bli_prime_factorization(dim_t n, bli_prime_factors_t* factors); -dim_t bli_next_prime_factor(bli_prime_factors_t* factors); +BLIS_EXPORT_BLIS dim_t bli_next_prime_factor(bli_prime_factors_t* factors); -void bli_partition_2x2(dim_t nthread, dim_t work1, dim_t work2, dim_t* nt1, dim_t* nt2); +BLIS_EXPORT_BLIS void bli_partition_2x2(dim_t nthread, dim_t work1, dim_t work2, dim_t* nt1, dim_t* nt2); // ----------------------------------------------------------------------------- -dim_t bli_gcd( dim_t x, dim_t y ); -dim_t bli_lcm( dim_t x, dim_t y ); -dim_t bli_ipow( dim_t base, dim_t power ); +BLIS_EXPORT_BLIS dim_t bli_gcd( dim_t x, dim_t y ); +BLIS_EXPORT_BLIS dim_t bli_lcm( dim_t x, dim_t y ); +BLIS_EXPORT_BLIS dim_t bli_ipow( dim_t base, dim_t power ); // ----------------------------------------------------------------------------- -dim_t bli_thread_get_env( const char* env, dim_t fallback ); +BLIS_EXPORT_BLIS dim_t bli_thread_get_env( const char* env, dim_t fallback ); //void bli_thread_set_env( const char* env, dim_t value ); -dim_t bli_thread_get_jc_nt( void ); -dim_t bli_thread_get_pc_nt( void ); -dim_t bli_thread_get_ic_nt( void ); -dim_t bli_thread_get_jr_nt( void ); -dim_t bli_thread_get_ir_nt( void ); -dim_t bli_thread_get_num_threads( void ); +BLIS_EXPORT_BLIS dim_t bli_thread_get_jc_nt( void ); +BLIS_EXPORT_BLIS dim_t bli_thread_get_pc_nt( void ); +BLIS_EXPORT_BLIS dim_t bli_thread_get_ic_nt( void ); +BLIS_EXPORT_BLIS dim_t bli_thread_get_jr_nt( void ); +BLIS_EXPORT_BLIS dim_t bli_thread_get_ir_nt( void ); +BLIS_EXPORT_BLIS dim_t bli_thread_get_num_threads( void ); -void bli_thread_set_ways( dim_t jc, dim_t pc, dim_t ic, dim_t jr, dim_t ir ); -void bli_thread_set_num_threads( dim_t value ); +BLIS_EXPORT_BLIS void bli_thread_set_ways( dim_t jc, dim_t pc, dim_t ic, dim_t jr, dim_t ir ); +BLIS_EXPORT_BLIS void bli_thread_set_num_threads( dim_t value ); -void bli_thread_init_rntm( rntm_t* rntm ); +BLIS_EXPORT_BLIS void bli_thread_init_rntm( rntm_t* rntm ); -void bli_thread_init_rntm_from_env( rntm_t* rntm ); +BLIS_EXPORT_BLIS void bli_thread_init_rntm_from_env( rntm_t* rntm ); // ----------------------------------------------------------------------------- diff --git a/frame/thread/bli_thrinfo.h b/frame/thread/bli_thrinfo.h index 5903cced0..492925d67 100644 --- a/frame/thread/bli_thrinfo.h +++ b/frame/thread/bli_thrinfo.h @@ -136,7 +136,7 @@ static void bli_thread_obarrier( thrinfo_t* t ) // Prototypes for level-3 thrinfo functions not specific to any operation. // -thrinfo_t* bli_thrinfo_create +BLIS_EXPORT_BLIS thrinfo_t* bli_thrinfo_create ( rntm_t* rntm, thrcomm_t* ocomm, @@ -147,7 +147,7 @@ thrinfo_t* bli_thrinfo_create thrinfo_t* sub_node ); -void bli_thrinfo_init +BLIS_EXPORT_BLIS void bli_thrinfo_init ( thrinfo_t* thread, thrcomm_t* ocomm, @@ -158,12 +158,12 @@ void bli_thrinfo_init thrinfo_t* sub_node ); -void bli_thrinfo_init_single +BLIS_EXPORT_BLIS void bli_thrinfo_init_single ( thrinfo_t* thread ); -void bli_thrinfo_free +BLIS_EXPORT_BLIS void bli_thrinfo_free ( rntm_t* rntm, thrinfo_t* thread @@ -171,7 +171,7 @@ void bli_thrinfo_free // ----------------------------------------------------------------------------- -thrinfo_t* bli_thrinfo_create_for_cntl +BLIS_EXPORT_BLIS thrinfo_t* bli_thrinfo_create_for_cntl ( rntm_t* rntm, cntl_t* cntl_par, @@ -179,14 +179,14 @@ thrinfo_t* bli_thrinfo_create_for_cntl thrinfo_t* thread_par ); -void bli_thrinfo_grow +BLIS_EXPORT_BLIS void bli_thrinfo_grow ( rntm_t* rntm, cntl_t* cntl, thrinfo_t* thread ); -thrinfo_t* bli_thrinfo_rgrow +BLIS_EXPORT_BLIS thrinfo_t* bli_thrinfo_rgrow ( rntm_t* rntm, cntl_t* cntl_par, diff --git a/frame/util/bli_util_check.c b/frame/util/bli_util_check.c index ae4ebb461..27a21279e 100644 --- a/frame/util/bli_util_check.c +++ b/frame/util/bli_util_check.c @@ -41,7 +41,7 @@ #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x, \ obj_t* asum \ @@ -56,7 +56,7 @@ GENFRONT( asumv ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x \ ) \ @@ -72,7 +72,7 @@ GENFRONT( mktrim ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x, \ obj_t* norm \ @@ -89,7 +89,7 @@ GENFRONT( normiv ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x, \ obj_t* norm \ @@ -106,7 +106,7 @@ GENFRONT( normim ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ FILE* file, \ char* s1, \ @@ -125,7 +125,7 @@ GENFRONT( fprintm ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x \ ) \ @@ -142,7 +142,7 @@ GENFRONT( randnm ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x, \ obj_t* scale, \ diff --git a/frame/util/bli_util_check.h b/frame/util/bli_util_check.h index a789211c9..fa5d230a1 100644 --- a/frame/util/bli_util_check.h +++ b/frame/util/bli_util_check.h @@ -40,7 +40,7 @@ #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x, \ obj_t* asum \ @@ -52,7 +52,7 @@ GENPROT( asumv ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x \ ); @@ -65,7 +65,7 @@ GENPROT( mktrim ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x, \ obj_t* norm \ @@ -79,7 +79,7 @@ GENPROT( normiv ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x, \ obj_t* norm \ @@ -93,7 +93,7 @@ GENPROT( normim ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ FILE* file, \ char* s1, \ @@ -109,7 +109,7 @@ GENPROT( fprintm ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x \ ); @@ -123,7 +123,7 @@ GENPROT( randnm ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,_check) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,_check) \ ( \ obj_t* x, \ obj_t* scale, \ @@ -135,36 +135,36 @@ GENPROT( sumsqv ) // ----------------------------------------------------------------------------- -void bli_utilv_xi_check +BLIS_EXPORT_BLIS void bli_utilv_xi_check ( obj_t* x, obj_t* index ); -void bli_utilv_xa_check +BLIS_EXPORT_BLIS void bli_utilv_xa_check ( obj_t* x, obj_t* asum ); -void bli_utilm_mkhst_check +BLIS_EXPORT_BLIS void bli_utilm_mkhst_check ( obj_t* a ); -void bli_utilv_norm_check +BLIS_EXPORT_BLIS void bli_utilv_norm_check ( obj_t* x, obj_t* norm ); -void bli_utilm_norm_check +BLIS_EXPORT_BLIS void bli_utilm_norm_check ( obj_t* x, obj_t* norm ); -void bli_utilm_fprint_check +BLIS_EXPORT_BLIS void bli_utilm_fprint_check ( FILE* file, char* s1, @@ -173,12 +173,12 @@ void bli_utilm_fprint_check char* s2 ); -void bli_utilm_rand_check +BLIS_EXPORT_BLIS void bli_utilm_rand_check ( obj_t* x ); -void bli_utilv_sumsqv_check +BLIS_EXPORT_BLIS void bli_utilv_sumsqv_check ( obj_t* x, obj_t* scale, diff --git a/frame/util/bli_util_fpa.h b/frame/util/bli_util_fpa.h index 3eb2c4868..cdff4b07f 100644 --- a/frame/util/bli_util_fpa.h +++ b/frame/util/bli_util_fpa.h @@ -40,7 +40,7 @@ #define GENPROT( opname ) \ \ PASTECH2(opname,BLIS_TAPI_EX_SUF,_vft) \ -PASTEMAC2(opname,BLIS_TAPI_EX_SUF,_qfp)( num_t dt ); +BLIS_EXPORT_BLIS PASTEMAC2(opname,BLIS_TAPI_EX_SUF,_qfp)( num_t dt ); GENPROT( asumv ) GENPROT( mkherm ) @@ -67,7 +67,7 @@ GENPROT( sumsqv ) #define GENPROT( opname ) \ \ PASTECH(opname,_vft) \ -PASTEMAC(opname,_qfp)( num_t dt ); +BLIS_EXPORT_BLIS PASTEMAC(opname,_qfp)( num_t dt ); GENPROT( fprintv ) GENPROT( fprintm ) diff --git a/frame/util/bli_util_oapi.c b/frame/util/bli_util_oapi.c index f9f9b4c93..b786a56dd 100644 --- a/frame/util/bli_util_oapi.c +++ b/frame/util/bli_util_oapi.c @@ -43,7 +43,7 @@ #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x, \ obj_t* asum \ @@ -86,7 +86,7 @@ GENFRONT( asumv ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* a \ BLIS_OAPI_EX_PARAMS \ @@ -130,7 +130,7 @@ GENFRONT( mktrim ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x, \ obj_t* norm \ @@ -174,7 +174,7 @@ GENFRONT( normiv ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x, \ obj_t* norm \ @@ -227,7 +227,7 @@ GENFRONT( normim ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ FILE* file, \ char* s1, \ @@ -278,7 +278,7 @@ GENFRONT( fprintv ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ FILE* file, \ char* s1, \ @@ -347,7 +347,7 @@ GENFRONT( fprintm ) #undef GENFRONT #define GENFRONT( opname, varname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ char* s1, \ obj_t* x, \ @@ -381,7 +381,7 @@ GENFRONT( printm, fprintm ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x \ BLIS_OAPI_EX_PARAMS \ @@ -421,7 +421,7 @@ GENFRONT( randnv ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x \ BLIS_OAPI_EX_PARAMS \ @@ -468,7 +468,7 @@ GENFRONT( randnm ) #undef GENFRONT #define GENFRONT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x, \ obj_t* scale, \ diff --git a/frame/util/bli_util_oapi.h b/frame/util/bli_util_oapi.h index b7952c822..1acce1606 100644 --- a/frame/util/bli_util_oapi.h +++ b/frame/util/bli_util_oapi.h @@ -40,7 +40,7 @@ #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x, \ obj_t* asum \ @@ -53,7 +53,7 @@ GENPROT( asumv ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* a \ BLIS_OAPI_EX_PARAMS \ @@ -67,7 +67,7 @@ GENPROT( mktrim ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x, \ obj_t* norm \ @@ -82,7 +82,7 @@ GENPROT( normiv ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x, \ obj_t* norm \ @@ -97,7 +97,7 @@ GENPROT( normim ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ FILE* file, \ char* s1, \ @@ -114,7 +114,7 @@ GENPROT( fprintm ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ char* s1, \ obj_t* x, \ @@ -130,7 +130,7 @@ GENPROT( printm ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x \ BLIS_OAPI_EX_PARAMS \ @@ -143,7 +143,7 @@ GENPROT( randnv ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x \ BLIS_OAPI_EX_PARAMS \ @@ -156,7 +156,7 @@ GENPROT( randnm ) #undef GENPROT #define GENPROT( opname ) \ \ -void PASTEMAC(opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC(opname,EX_SUF) \ ( \ obj_t* x, \ obj_t* scale, \ diff --git a/frame/util/bli_util_tapi.c b/frame/util/bli_util_tapi.c index 6bef27d43..b069b3b27 100644 --- a/frame/util/bli_util_tapi.c +++ b/frame/util/bli_util_tapi.c @@ -43,7 +43,7 @@ #undef GENTFUNCR #define GENTFUNCR( ctype, ctype_r, ch, chr, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ dim_t n, \ ctype* x, inc_t incx, \ @@ -84,7 +84,7 @@ INSERT_GENTFUNCR_BASIC0( asumv ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ uplo_t uploa, \ dim_t m, \ @@ -122,7 +122,7 @@ INSERT_GENTFUNC_BASIC0( mktrim ) #undef GENTFUNCR #define GENTFUNCR( ctype, ctype_r, ch, chr, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ dim_t n, \ ctype* x, inc_t incx, \ @@ -165,7 +165,7 @@ INSERT_GENTFUNCR_BASIC0( normiv ) #undef GENTFUNCR #define GENTFUNCR( ctype, ctype_r, ch, chr, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ doff_t diagoffx, \ diag_t diagx, \ @@ -216,7 +216,7 @@ INSERT_GENTFUNCR_BASIC0( normim ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, varname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ char* s1, \ dim_t n, \ @@ -244,7 +244,7 @@ INSERT_GENTFUNC_BASIC_I( printv, fprintv ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname, varname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ char* s1, \ dim_t m, \ @@ -274,7 +274,7 @@ INSERT_GENTFUNC_BASIC_I( printm, fprintm ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ dim_t n, \ ctype* x, inc_t incx \ @@ -309,7 +309,7 @@ INSERT_GENTFUNC_BASIC0( randnv ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ doff_t diagoffx, \ uplo_t uplox, \ @@ -350,7 +350,7 @@ INSERT_GENTFUNC_BASIC0( randnm ) #undef GENTFUNCR #define GENTFUNCR( ctype, ctype_r, ch, chr, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ dim_t n, \ ctype* x, inc_t incx, \ diff --git a/frame/util/bli_util_tapi.h b/frame/util/bli_util_tapi.h index f48acbd11..c35702cbc 100644 --- a/frame/util/bli_util_tapi.h +++ b/frame/util/bli_util_tapi.h @@ -40,7 +40,7 @@ #undef GENTPROTR #define GENTPROTR( ctype, ctype_r, ch, chr, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ dim_t n, \ ctype* x, inc_t incx, \ @@ -54,7 +54,7 @@ INSERT_GENTPROTR_BASIC0( asumv ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ uplo_t uploa, \ dim_t m, \ @@ -70,7 +70,7 @@ INSERT_GENTPROT_BASIC0( mktrim ) #undef GENTPROTR #define GENTPROTR( ctype, ctype_r, ch, chr, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ dim_t n, \ ctype* x, inc_t incx, \ @@ -86,7 +86,7 @@ INSERT_GENTPROTR_BASIC0( normiv ) #undef GENTPROTR #define GENTPROTR( ctype, ctype_r, ch, chr, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ doff_t diagoffx, \ diag_t diagx, \ @@ -106,7 +106,7 @@ INSERT_GENTPROTR_BASIC0( normim ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ char* s1, \ dim_t n, \ @@ -121,7 +121,7 @@ INSERT_GENTPROT_BASIC0_I( printv ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ char* s1, \ dim_t m, \ @@ -137,7 +137,7 @@ INSERT_GENTPROT_BASIC0_I( printm ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ dim_t n, \ ctype* x, inc_t incx \ @@ -151,7 +151,7 @@ INSERT_GENTPROT_BASIC0( randnv ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ doff_t diagoffx, \ uplo_t uplox, \ @@ -168,7 +168,7 @@ INSERT_GENTPROT_BASIC0( randnm ) #undef GENTPROTR #define GENTPROTR( ctype, ctype_r, ch, chr, opname ) \ \ -void PASTEMAC2(ch,opname,EX_SUF) \ +BLIS_EXPORT_BLIS void PASTEMAC2(ch,opname,EX_SUF) \ ( \ dim_t n, \ ctype* x, inc_t incx, \ diff --git a/frame/util/bli_util_unb_var1.c b/frame/util/bli_util_unb_var1.c index 203a63a1d..b688fbae5 100644 --- a/frame/util/bli_util_unb_var1.c +++ b/frame/util/bli_util_unb_var1.c @@ -43,7 +43,7 @@ #undef GENTFUNCR #define GENTFUNCR( ctype, ctype_r, ch, chr, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ dim_t n, \ ctype* x, inc_t incx, \ @@ -87,7 +87,7 @@ INSERT_GENTFUNCR_BASIC0( asumv_unb_var1 ) #undef GENTFUNCR #define GENTFUNCR( ctype, ctype_r, ch, chr, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uploa, \ dim_t m, \ @@ -143,7 +143,7 @@ INSERT_GENTFUNCR_BASIC0( mkherm_unb_var1 ) #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uploa, \ dim_t m, \ @@ -185,7 +185,7 @@ INSERT_GENTFUNC_BASIC0( mksymm_unb_var1 ) #undef GENTFUNC #define GENTFUNC( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uploa, \ dim_t m, \ @@ -230,7 +230,7 @@ INSERT_GENTFUNC_BASIC0( mktrim_unb_var1 ) #undef GENTFUNCR #define GENTFUNCR( ctype, ctype_r, ch, chr, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ dim_t n, \ ctype* x, inc_t incx, \ @@ -268,7 +268,7 @@ INSERT_GENTFUNCR_BASIC0( norm1v_unb_var1 ) #undef GENTFUNCR #define GENTFUNCR( ctype, ctype_r, ch, chr, varname, kername ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ dim_t n, \ ctype* x, inc_t incx, \ @@ -314,7 +314,7 @@ GENTFUNCR( dcomplex, double, z, d, normfv_unb_var1, sumsqv_unb_var1 ) #ifdef FE_OVERFLOW #define GENTFUNCR( ctype, ctype_r, ch, chr, varname, kername ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ dim_t n, \ ctype* x, inc_t incx, \ @@ -393,7 +393,7 @@ void PASTEMAC(ch,varname) \ #else #define GENTFUNCR( ctype, ctype_r, ch, chr, varname, kername ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ dim_t n, \ ctype* x, inc_t incx, \ @@ -439,7 +439,7 @@ GENTFUNCR( double, double, d, d, normfv_unb_var1, sumsqv_unb_var1 ) #undef GENTFUNCR #define GENTFUNCR( ctype, ctype_r, ch, chr, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ dim_t n, \ ctype* x, inc_t incx, \ @@ -485,7 +485,7 @@ INSERT_GENTFUNCR_BASIC0( normiv_unb_var1 ) #undef GENTFUNCR #define GENTFUNCR( ctype, ctype_r, ch, chr, varname, kername ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffx, \ diag_t diagx, \ @@ -649,7 +649,7 @@ INSERT_GENTFUNCR_BASIC( norm1m_unb_var1, norm1v_unb_var1 ) #undef GENTFUNCR #define GENTFUNCR( ctype, ctype_r, ch, chr, varname, kername ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffx, \ diag_t diagx, \ @@ -816,7 +816,7 @@ INSERT_GENTFUNCR_BASIC( normfm_unb_var1, sumsqv_unb_var1 ) #undef GENTFUNCR #define GENTFUNCR( ctype, ctype_r, ch, chr, varname, kername ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffx, \ diag_t diagx, \ @@ -858,7 +858,7 @@ INSERT_GENTFUNCR_BASIC( normim_unb_var1, norm1m_unb_var1 ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ FILE* file, \ char* s1, \ @@ -895,7 +895,7 @@ INSERT_GENTFUNC_BASIC0_I( fprintv ) #undef GENTFUNC #define GENTFUNC( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ FILE* file, \ char* s1, \ @@ -937,7 +937,7 @@ INSERT_GENTFUNC_BASIC0_I( fprintm ) #undef GENTFUNC #define GENTFUNC( ctype, ch, varname, randmac ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ dim_t n, \ ctype* x, inc_t incx, \ @@ -965,7 +965,7 @@ INSERT_GENTFUNC_BASIC( randnv_unb_var1, randnp2s ) #undef GENTFUNC #define GENTFUNC( ctype, ch, varname, kername ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffx, \ uplo_t uplox, \ @@ -1118,7 +1118,7 @@ INSERT_GENTFUNC_BASIC( randnm_unb_var1, randnv ) #undef GENTFUNCR #define GENTFUNCR( ctype, ctype_r, ch, chr, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ dim_t n, \ ctype* x, inc_t incx, \ diff --git a/frame/util/bli_util_unb_var1.h b/frame/util/bli_util_unb_var1.h index 6f2a3fc85..9f5838161 100644 --- a/frame/util/bli_util_unb_var1.h +++ b/frame/util/bli_util_unb_var1.h @@ -40,7 +40,7 @@ #undef GENTPROTR #define GENTPROTR( ctype, ctype_r, ch, chr, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ dim_t n, \ ctype* x, inc_t incx, \ @@ -55,7 +55,7 @@ INSERT_GENTPROTR_BASIC0( asumv_unb_var1 ) #undef GENTPROT #define GENTPROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ uplo_t uploa, \ dim_t m, \ @@ -72,7 +72,7 @@ INSERT_GENTPROT_BASIC0( mktrim_unb_var1 ) #undef GENTPROTR #define GENTPROTR( ctype, ctype_r, ch, chr, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ dim_t n, \ ctype* x, inc_t incx, \ @@ -89,7 +89,7 @@ INSERT_GENTPROTR_BASIC0( normiv_unb_var1 ) #undef GENTPROTR #define GENTPROTR( ctype, ctype_r, ch, chr, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffx, \ diag_t diagx, \ @@ -110,7 +110,7 @@ INSERT_GENTPROTR_BASIC0( normim_unb_var1 ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ FILE* file, \ char* s1, \ @@ -126,7 +126,7 @@ INSERT_GENTPROT_BASIC0_I( fprintv ) #undef GENTPROT #define GENTPROT( ctype, ch, opname ) \ \ -void PASTEMAC(ch,opname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,opname) \ ( \ FILE* file, \ char* s1, \ @@ -143,7 +143,7 @@ INSERT_GENTPROT_BASIC0_I( fprintm ) #undef GENTPROT #define GENTPROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ dim_t n, \ ctype* x, inc_t incx, \ @@ -158,7 +158,7 @@ INSERT_GENTPROT_BASIC0( randnv_unb_var1 ) #undef GENTPROT #define GENTPROT( ctype, ch, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ doff_t diagoffx, \ uplo_t uplox, \ @@ -176,7 +176,7 @@ INSERT_GENTPROT_BASIC0( randnm_unb_var1 ) #undef GENTPROTR #define GENTPROTR( ctype, ctype_r, ch, chr, varname ) \ \ -void PASTEMAC(ch,varname) \ +BLIS_EXPORT_BLIS void PASTEMAC(ch,varname) \ ( \ dim_t n, \ ctype* x, inc_t incx, \ From e2a02ebd005503c63138d48a2b7d18978ee29205 Mon Sep 17 00:00:00 2001 From: "Field G. Van Zee" Date: Thu, 28 Feb 2019 13:58:59 -0600 Subject: [PATCH 13/17] Updates (from ls5) to test/3m4m/runme.sh. Details: - Lonestar5-specific updates to runme.sh. --- test/3m4m/runme.sh | 83 ++++++++++++++++++++++++++++------------------ 1 file changed, 51 insertions(+), 32 deletions(-) diff --git a/test/3m4m/runme.sh b/test/3m4m/runme.sh index a48cca989..50fd61ae8 100755 --- a/test/3m4m/runme.sh +++ b/test/3m4m/runme.sh @@ -5,19 +5,12 @@ exec_root="test" out_root="output" #sys="blis" -#sys="stampede" #sys="stampede2" -#sys="lonestar5" -sys="ul252" +sys="lonestar5" +#sys="ul252" # Bind threads to processors. #export OMP_PROC_BIND=true -#export GOMP_CPU_AFFINITY="0 2 4 6 8 10 12 14 1 3 5 7 9 11 13 15" -#export GOMP_CPU_AFFINITY="0 1 2 3 4 5 6 7" -#export GOMP_CPU_AFFINITY="0 1 2 3 4 5 6 7" -#export GOMP_CPU_AFFINITY="0 2 4 6 1 3 5 7" -#export GOMP_CPU_AFFINITY="0 4 1 5 2 6 3 7" -#export GOMP_CPU_AFFINITY="0 1 4 5 8 9 12 13 16 17 20 21 24 25 28 29 32 33 36 37 40 41 44 45" #export GOMP_CPU_AFFINITY="0 2 4 6 8 10 12 14 16 18 20 22 1 3 5 7 9 11 13 15 17 19 21 23" # Modify LD_LIBRARY_PATH. @@ -36,25 +29,30 @@ elif [ ${sys} = "stampede2" ]; then echo "Need to set GOMP_CPU_AFFINITY." exit 1 - jc_nt=4 # 5th loop + jc_nt=4 # 5th loop ic_nt=12 # 3rd loop - jr_nt=1 # 2nd loop - ir_nt=1 # 1st loop + jr_nt=1 # 2nd loop + ir_nt=1 # 1st loop nt=48 elif [ ${sys} = "lonestar5" ]; then - echo "Need to set GOMP_CPU_AFFINITY." - exit 1 + export GOMP_CPU_AFFINITY="0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23" # A hack to use libiomp5 with gcc. - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/apps/intel/16.0.1.150/compilers_and_libraries_2016.1.150/linux/compiler/lib/intel64" + #export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/apps/intel/16.0.1.150/compilers_and_libraries_2016.1.150/linux/compiler/lib/intel64" - jc_nt=2 # 5th loop - ic_nt=12 # 3rd loop - jr_nt=1 # 2nd loop - ir_nt=1 # 1st loop - nt=24 + # runner-up: + #jc_nt=6 # 5th loop + #ic_nt=4 # 3rd loop + #jr_nt=1 # 2nd loop + + jc_nt=2 # 5th loop + ic_nt=3 # 3rd loop + jr_nt=2 # 2nd loop + + ir_nt=1 # 1st loop + nt=12 elif [ ${sys} = "ul252" ]; then @@ -62,15 +60,17 @@ elif [ ${sys} = "ul252" ]; then #export GOMP_CPU_AFFINITY="0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103" export GOMP_CPU_AFFINITY="0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51" - #jc_nt=4 # 5th loop - jc_nt=2 # 5th loop + #jc_nt=4 # 5th loop + jc_nt=2 # 5th loop ic_nt=13 # 3rd loop - jr_nt=1 # 2nd loop - ir_nt=1 # 1st loop + jr_nt=1 # 2nd loop + ir_nt=1 # 1st loop #nt=52 nt=26 fi +echo "Setting BLIS threading params for ${sys}: jc${jc_nt}ic${ic_nt}jr${jr_nt}." + # Save a copy of GOMP_CPU_AFFINITY so that if we have to unset it, we can # restore the value. GOMP_CPU_AFFINITYsave=${GOMP_CPU_AFFINITY} @@ -82,6 +82,8 @@ threads_r="mt" #threads_r="st" # Datatypes to test. +dts="" +dts_r="" dts="z c" dts_r="d s" @@ -94,11 +96,24 @@ test_ops_r="${l3_ops}" #test_impls="3mhw_blis 3m1_blis 4mhw_blis 4m1b_blis 4m1a_blis 1m_blis" #test_impls="openblas mkl asm_blis" +# Implementations to test. +impls="allasm" -# Real domain implementations to test. -test_impls_r="openblas asm_blis mkl" -test_impls="openblas asm_blis mkl" -#test_impls_r="asm_blis openblas" +if [ ${impls} = "allasm" ]; then + + test_impls_r="openblas asm_blis mkl" + test_impls="openblas asm_blis mkl" + +elif [ ${impls} = "comp" ]; then + + test_impls_r="openblas mkl" + test_impls="openblas mkl" + +elif [ ${impls} = "blis" ]; then + + test_impls_r="asm_blis" + test_impls="asm_blis" +fi # First perform real test cases. for th in ${threads_r}; do @@ -118,13 +133,14 @@ for th in ${threads_r}; do export BLIS_IR_NT=${ir_nt} export OPENBLAS_NUM_THREADS=${nt} export MKL_NUM_THREADS=${nt} + export nt_use=${nt} # Unset GOMP_CPU_AFFINITY for OpenBLAS. if [ ${im} = "openblas" ]; then unset GOMP_CPU_AFFINITY else - export GOMP_CPU_AFFINITY=${GOMP_CPU_AFFINITYsave} + export GOMP_CPU_AFFINITY="${GOMP_CPU_AFFINITYsave}" fi else @@ -134,6 +150,7 @@ for th in ${threads_r}; do export BLIS_IR_NT=1 export OPENBLAS_NUM_THREADS=1 export MKL_NUM_THREADS=1 + export nt_use=1 fi # Construct the name of the test executable. @@ -142,7 +159,7 @@ for th in ${threads_r}; do # Construct the name of the output file. out_file="${out_root}_${th}_${dt}${op}_${im}.m" - echo "Running (nt = ${nt}) ./${exec_name} > ${out_file}" + echo "Running (nt = ${nt_use}) ./${exec_name} > ${out_file}" # Run executable. ./${exec_name} > ${out_file} @@ -172,13 +189,14 @@ for th in ${threads}; do export BLIS_IR_NT=${ir_nt} export OPENBLAS_NUM_THREADS=${nt} export MKL_NUM_THREADS=${nt} + export nt_use=${nt} # Unset GOMP_CPU_AFFINITY for OpenBLAS. if [ ${im} = "openblas" ]; then unset GOMP_CPU_AFFINITY else - export GOMP_CPU_AFFINITY=${GOMP_CPU_AFFINITYsave} + export GOMP_CPU_AFFINITY="${GOMP_CPU_AFFINITYsave}" fi else @@ -188,6 +206,7 @@ for th in ${threads}; do export BLIS_IR_NT=1 export OPENBLAS_NUM_THREADS=1 export MKL_NUM_THREADS=1 + export nt_use=1 fi # Construct the name of the test executable. @@ -196,7 +215,7 @@ for th in ${threads}; do # Construct the name of the output file. out_file="${out_root}_${th}_${dt}${op}_${im}.m" - echo "Running (nt = ${nt}) ./${exec_name} > ${out_file}" + echo "Running (nt = ${nt_use}) ./${exec_name} > ${out_file}" # Run executable. ./${exec_name} > ${out_file} From 9f1dbe572b1fd5e7dd30d5649bdf59259ad770d5 Mon Sep 17 00:00:00 2001 From: "Field G. Van Zee" Date: Tue, 5 Mar 2019 17:47:55 -0600 Subject: [PATCH 14/17] Overhauled test/3m4m Makefile and scripts. Details: - Rewrote much of Makefile to generate executables for single- and dual- socket multithreading as well as single-threaded. Each of the three can also use a different problem size range/increment, as is often appropriate when doubling/halving the number of threads. - Rewrote runme.sh script to flexibly execute as many threading parameter scenarios as is given in the input parameter string (currently set within the script itself). The string also encodes the maximum problem size for each threading scenario, which is used to identify the executable to run. Also improved the "progress" output of the script to reduce redundant info and improve readability in terminals that are not especially wide. - Minor updates to test_*.c source files. - Updated matlab scripts according to changes made to the Makefile, test drivers, and runme.sh script, and renamed 'plot_all.m' to 'runme.m'. --- test/3m4m/Makefile | 516 +++++++++--------------------- test/3m4m/matlab/plot_all.m | 9 - test/3m4m/matlab/plot_l3_perf.m | 2 +- test/3m4m/matlab/plot_panel_4x5.m | 19 +- test/3m4m/matlab/runme.m | 9 + test/3m4m/runme.sh | 240 ++++++-------- test/3m4m/test_gemm.c | 217 ++++++------- test/3m4m/test_hemm.c | 200 ++++++------ test/3m4m/test_herk.c | 177 +++++----- test/3m4m/test_trmm.c | 176 +++++----- test/3m4m/test_trsm.c | 176 +++++----- 11 files changed, 727 insertions(+), 1014 deletions(-) delete mode 100644 test/3m4m/matlab/plot_all.m create mode 100644 test/3m4m/matlab/runme.m diff --git a/test/3m4m/Makefile b/test/3m4m/Makefile index f41df2f38..89dddad73 100644 --- a/test/3m4m/Makefile +++ b/test/3m4m/Makefile @@ -46,8 +46,6 @@ # .PHONY: all \ - blis-gemm-st openblas-gemm-st mkl-gemm-st acml-gemm-st \ - blis-gemm-mt openblas-gemm-mt mkl-gemm-mt acml-gemm-mt \ clean cleanx @@ -94,21 +92,19 @@ endif #BLIS_LIB := $(BLIS_LIB_PATH)/libblis.a # BLAS library path(s). This is where the BLAS libraries reside. -HOME_LIB_PATH := $(HOME)/flame/lib -#MKL_LIB_PATH := /opt/apps/intel/13/composer_xe_2013.2.146/mkl/lib/intel64 -MKL_LIB_PATH := $(HOME)/intel/mkl/lib/intel64 -#MKL_LIB_PATH := ${MKLROOT}/lib/intel64 +HOME_LIB_PATH := $(HOME)/flame/lib +#VENDOR_LIB_PATH := /opt/apps/intel/13/composer_xe_2013.2.146/mkl/lib/intel64 +MKL_LIB_PATH := $(HOME)/intel/mkl/lib/intel64 +#VENDOR_LIB_PATH := ${MKLROOT}/lib/intel64 #ICC_LIB_PATH := /opt/apps/intel/13/composer_xe_2013.2.146/compiler/lib/intel64 -ACML_LIB_PATH := $(HOME_LIB_PATH)/acml/5.3.1/gfortran64_fma4_int64/lib -ACMLP_LIB_PATH := $(HOME_LIB_PATH)/acml/5.3.1/gfortran64_fma4_mp_int64/lib # OpenBLAS OPENBLAS_LIB := $(HOME_LIB_PATH)/libopenblas.a OPENBLASP_LIB := $(HOME_LIB_PATH)/libopenblasp.a # ATLAS -ATLAS_LIB := $(HOME_LIB_PATH)/libf77blas.a \ - $(HOME_LIB_PATH)/libatlas.a +#ATLAS_LIB := $(HOME_LIB_PATH)/libf77blas.a \ +# $(HOME_LIB_PATH)/libatlas.a # MKL MKL_LIB := -L$(MKL_LIB_PATH) \ @@ -130,13 +126,29 @@ MKLP_LIB := -L$(MKL_LIB_PATH) \ #-L$(ICC_LIB_PATH) \ #-lgomp -# ACML -ACML_LIB := -L$(ACML_LIB_PATH) \ - -lgfortran -lm -lrt -ldl -lacml -ACMLP_LIB := -L$(ACMLP_LIB_PATH) \ - -lgfortran -lm -lrt -ldl -lacml_mp +VENDOR_LIB := $(MKL_LIB) +VENDORP_LIB := $(MKLP_LIB) +# +# --- Problem size definitions ------------------------------------------------- +# + +# Single core (single-threaded) +PS_BEGIN := 40 +PS_MAX := 2000 +PS_INC := 40 + +# Single-socket (multithreaded) +P1_BEGIN := 120 +P1_MAX := 6000 +P1_INC := 120 + +# Dual-socket (multithreaded) +P2_BEGIN := 160 +P2_MAX := 8000 +P2_INC := 160 + # # --- General build definitions ------------------------------------------------ @@ -165,12 +177,6 @@ CFLAGS += -I$(TEST_SRC_PATH) LIBBLIS_LINK := $(LIB_PATH)/$(LIBBLIS_L) -# Datatype -DT_S := -DDT=BLIS_FLOAT -DT_D := -DDT=BLIS_DOUBLE -DT_C := -DDT=BLIS_SCOMPLEX -DT_Z := -DDT=BLIS_DCOMPLEX - # Which library? BLI_DEF := -DBLIS BLA_DEF := -DBLAS @@ -185,29 +191,25 @@ D1M := -DIND=BLIS_1M DNAT := -DIND=BLIS_NAT # Implementation string -STR_3MHW := -DSTR=\"3mhw\" -STR_3M1 := -DSTR=\"3m1\" -STR_4MHW := -DSTR=\"4mhw\" -STR_4M1B := -DSTR=\"4m1b\" -STR_4M1A := -DSTR=\"4m1a\" -STR_1M := -DSTR=\"1m\" -STR_NAT := -DSTR=\"asm\" +#STR_3MHW := -DSTR=\"3mhw\" +#STR_3M1 := -DSTR=\"3m1\" +#STR_4MHW := -DSTR=\"4mhw\" +#STR_4M1B := -DSTR=\"4m1b\" +#STR_4M1A := -DSTR=\"4m1a\" +#STR_1M := -DSTR=\"1m\" +STR_NAT := -DSTR=\"asm_blis\" STR_OBL := -DSTR=\"openblas\" -STR_MKL := -DSTR=\"mkl\" -STR_ACML := -DSTR=\"acml\" +STR_VEN := -DSTR=\"vendor\" # Single or multithreaded string STR_ST := -DTHR_STR=\"st\" -STR_MT := -DTHR_STR=\"mt\" +STR_1S := -DTHR_STR=\"1s\" +STR_2S := -DTHR_STR=\"2s\" # Problem size specification -PDEF_ST := -DP_BEGIN=56 \ - -DP_END=2800 \ - -DP_INC=56 - -PDEF_MT := -DP_BEGIN=160 \ - -DP_END=8000 \ - -DP_INC=160 +PDEF_ST := -DP_BEGIN=$(PS_BEGIN) -DP_INC=$(PS_INC) -DP_MAX=$(PS_MAX) +PDEF_1S := -DP_BEGIN=$(P1_BEGIN) -DP_INC=$(P1_INC) -DP_MAX=$(P1_MAX) +PDEF_2S := -DP_BEGIN=$(P2_BEGIN) -DP_INC=$(P2_INC) -DP_MAX=$(P2_MAX) @@ -215,340 +217,129 @@ PDEF_MT := -DP_BEGIN=160 \ # --- Targets/rules ------------------------------------------------------------ # -all: all-st all-mt -blis: blis-st blis-mt -openblas: openblas-st openblas-mt -mkl: mkl-st mkl-mt +all: all-st all-1s all-2s +blis: blis-st blis-1s blis-2s +openblas: openblas-st openblas-1s openblas-2s +vendor: vendor-st vendor-1s vendor-2s +mkl: vendor +armpl: vendor all-st: blis-st openblas-st mkl-st -all-mt: blis-mt openblas-mt mkl-mt +all-1s: blis-1s openblas-1s mkl-1s +all-2s: blis-2s openblas-2s mkl-2s blis-st: blis-nat-st -blis-mt: blis-nat-mt +blis-1s: blis-nat-1s +blis-2s: blis-nat-2s -blis-ind: blis-ind-st blis-ind-mt -blis-nat: blis-nat-st blis-nat-mt +#blis-ind: blis-ind-st blis-ind-mt +blis-nat: blis-nat-st blis-nat-1s blis-nat-2s -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 +# Define the datatypes, operations, and implementations. +DTS := s d c z +OPS := gemm hemm herk trmm trsm +IMPLS := asm_blis openblas vendor -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 +# Define functions to construct object filenames from the datatypes and +# operations given an implementation. We define one function for single- +# threaded, single-socket, and dual-socket filenames. +get-st-objs = $(foreach dt,$(DTS),$(foreach op,$(OPS),test_$(dt)$(op)_$(PS_MAX)_$(1)_st.o)) +get-1s-objs = $(foreach dt,$(DTS),$(foreach op,$(OPS),test_$(dt)$(op)_$(P1_MAX)_$(1)_1s.o)) +get-2s-objs = $(foreach dt,$(DTS),$(foreach op,$(OPS),test_$(dt)$(op)_$(P2_MAX)_$(1)_2s.o)) -blis-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 \ - test_shemm_asm_blis_st.x \ - test_dhemm_asm_blis_st.x \ - test_chemm_asm_blis_st.x \ - test_zhemm_asm_blis_st.x \ - test_sherk_asm_blis_st.x \ - test_dherk_asm_blis_st.x \ - test_cherk_asm_blis_st.x \ - test_zherk_asm_blis_st.x \ - test_strmm_asm_blis_st.x \ - test_dtrmm_asm_blis_st.x \ - test_ctrmm_asm_blis_st.x \ - test_ztrmm_asm_blis_st.x \ - test_strsm_asm_blis_st.x \ - test_dtrsm_asm_blis_st.x \ - test_ctrsm_asm_blis_st.x \ - test_ztrsm_asm_blis_st.x +# Construct object and binary names for single-threaded, single-socket, and +# dual-socket files for BLIS, OpenBLAS, and a vendor library (e.g. MKL). +BLIS_NAT_ST_OBJS := $(call get-st-objs,asm_blis) +BLIS_NAT_ST_BINS := $(patsubst %.o,%.x,$(BLIS_NAT_ST_OBJS)) +BLIS_NAT_1S_OBJS := $(call get-1s-objs,asm_blis) +BLIS_NAT_1S_BINS := $(patsubst %.o,%.x,$(BLIS_NAT_1S_OBJS)) +BLIS_NAT_2S_OBJS := $(call get-2s-objs,asm_blis) +BLIS_NAT_2S_BINS := $(patsubst %.o,%.x,$(BLIS_NAT_2S_OBJS)) -blis-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 \ - test_shemm_asm_blis_mt.x \ - test_dhemm_asm_blis_mt.x \ - test_chemm_asm_blis_mt.x \ - test_zhemm_asm_blis_mt.x \ - test_sherk_asm_blis_mt.x \ - test_dherk_asm_blis_mt.x \ - test_cherk_asm_blis_mt.x \ - test_zherk_asm_blis_mt.x \ - test_strmm_asm_blis_mt.x \ - test_dtrmm_asm_blis_mt.x \ - test_ctrmm_asm_blis_mt.x \ - test_ztrmm_asm_blis_mt.x \ - test_strsm_asm_blis_mt.x \ - test_dtrsm_asm_blis_mt.x \ - test_ctrsm_asm_blis_mt.x \ - test_ztrsm_asm_blis_mt.x +OPENBLAS_ST_OBJS := $(call get-st-objs,openblas) +OPENBLAS_ST_BINS := $(patsubst %.o,%.x,$(OPENBLAS_ST_OBJS)) +OPENBLAS_1S_OBJS := $(call get-1s-objs,openblas) +OPENBLAS_1S_BINS := $(patsubst %.o,%.x,$(OPENBLAS_1S_OBJS)) +OPENBLAS_2S_OBJS := $(call get-2s-objs,openblas) +OPENBLAS_2S_BINS := $(patsubst %.o,%.x,$(OPENBLAS_2S_OBJS)) -openblas-st: \ - test_sgemm_openblas_st.x \ - test_dgemm_openblas_st.x \ - test_cgemm_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 +VENDOR_ST_OBJS := $(call get-st-objs,vendor) +VENDOR_ST_BINS := $(patsubst %.o,%.x,$(VENDOR_ST_OBJS)) +VENDOR_1S_OBJS := $(call get-1s-objs,vendor) +VENDOR_1S_BINS := $(patsubst %.o,%.x,$(VENDOR_1S_OBJS)) +VENDOR_2S_OBJS := $(call get-2s-objs,vendor) +VENDOR_2S_BINS := $(patsubst %.o,%.x,$(VENDOR_2S_OBJS)) -openblas-mt: \ - test_sgemm_openblas_mt.x \ - test_dgemm_openblas_mt.x \ - test_cgemm_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 +# Define some targets associated with the above object/binary files. +blis-nat-st: $(BLIS_NAT_ST_BINS) +blis-nat-1s: $(BLIS_NAT_1S_BINS) +blis-nat-2s: $(BLIS_NAT_2S_BINS) -mkl-st: \ - test_sgemm_mkl_st.x \ - test_dgemm_mkl_st.x \ - test_cgemm_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 +openblas-st: $(OPENBLAS_ST_BINS) +openblas-1s: $(OPENBLAS_1S_BINS) +openblas-2s: $(OPENBLAS_2S_BINS) -mkl-mt: \ - test_sgemm_mkl_mt.x \ - test_dgemm_mkl_mt.x \ - test_cgemm_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 +vendor-st: $(VENDOR_ST_BINS) +vendor-1s: $(VENDOR_1S_BINS) +vendor-2s: $(VENDOR_2S_BINS) +mkl-st: vendor-st +mkl-1s: vendor-1s +mkl-2s: vendor-2s +armpl-st: vendor-st +armpl-1s: vendor-1s +armpl-2s: vendor-2s + +# Mark the object files as intermediate so that make will remove them +# automatically after building the binaries on which they depend. +.INTERMEDIATE: $(BLIS_NAT_ST_OBJS) $(OPENBLAS_ST_OBJS) $(VENDOR_ST_OBJS) +.INTERMEDIATE: $(BLIS_NAT_1S_OBJS) $(OPENBLAS_1S_OBJS) $(VENDOR_1S_OBJS) +.INTERMEDIATE: $(BLIS_NAT_2S_OBJS) $(OPENBLAS_2S_OBJS) $(VENDOR_2S_OBJS) # --Object file rules -- -$(TEST_OBJ_PATH)/%.o: $(TEST_SRC_PATH)/%.c - $(CC) $(CFLAGS) -c $< -o $@ +#$(TEST_OBJ_PATH)/%.o: $(TEST_SRC_PATH)/%.c +# $(CC) $(CFLAGS) -c $< -o $@ -# blis 3mhw -test_z%_3mhw_blis_st.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_ST) $(DT_Z) $(BLI_DEF) $(D3MHW) $(STR_3MHW) $(STR_ST) -c $< -o $@ +# A function to return the datatype cpp macro def from the datatype +# character. +get-dt-cpp = -DDT=bli_$(1)type -test_c%_3mhw_blis_st.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_ST) $(DT_C) $(BLI_DEF) $(D3MHW) $(STR_3MHW) $(STR_ST) -c $< -o $@ +# A function to return other cpp macros that help the test driver +# identify the implementation. +get-bl-cpp = $(strip \ + $(if $(findstring blis,$(1)),$(STR_NAT) $(BLI_DEF),\ + $(if $(findstring openblas,$(1)),$(STR_OBL) $(BLA_DEF),\ + $(STR_VEN) $(BLA_DEF)))) -test_z%_3mhw_blis_mt.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_MT) $(DT_Z) $(BLI_DEF) $(D3MHW) $(STR_3MHW) $(STR_MT) -c $< -o $@ +define make-st-rule +test_$(1)$(2)_$(PS_MAX)_$(3)_st.o: test_$(op).c Makefile + $(CC) $(CFLAGS) $(PDEF_ST) $(call get-dt-cpp,$(1)) $(call get-bl-cpp,$(3)) $(DNAT) $(STR_ST) -c $$< -o $$@ +endef -test_c%_3mhw_blis_mt.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_MT) $(DT_C) $(BLI_DEF) $(D3MHW) $(STR_3MHW) $(STR_MT) -c $< -o $@ +define make-1s-rule +test_$(1)$(2)_$(P1_MAX)_$(3)_1s.o: test_$(op).c Makefile + $(CC) $(CFLAGS) $(PDEF_1S) $(call get-dt-cpp,$(1)) $(call get-bl-cpp,$(3)) $(DNAT) $(STR_1S) -c $$< -o $$@ +endef -# blis 3m1 -test_z%_3m1_blis_st.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_ST) $(DT_Z) $(BLI_DEF) $(D3M1) $(STR_3M1) $(STR_ST) -c $< -o $@ +define make-2s-rule +test_$(1)$(2)_$(P2_MAX)_$(3)_2s.o: test_$(op).c Makefile + $(CC) $(CFLAGS) $(PDEF_2S) $(call get-dt-cpp,$(1)) $(call get-bl-cpp,$(3)) $(DNAT) $(STR_2S) -c $$< -o $$@ +endef -test_c%_3m1_blis_st.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_ST) $(DT_C) $(BLI_DEF) $(D3M1) $(STR_3M1) $(STR_ST) -c $< -o $@ +$(foreach dt,$(DTS), \ +$(foreach op,$(OPS), \ +$(foreach im,$(IMPLS),$(eval $(call make-st-rule,$(dt),$(op),$(im)))))) -test_z%_3m1_blis_mt.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_MT) $(DT_Z) $(BLI_DEF) $(D3M1) $(STR_3M1) $(STR_MT) -c $< -o $@ +$(foreach dt,$(DTS), \ +$(foreach op,$(OPS), \ +$(foreach im,$(IMPLS),$(eval $(call make-1s-rule,$(dt),$(op),$(im)))))) -test_c%_3m1_blis_mt.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_MT) $(DT_C) $(BLI_DEF) $(D3M1) $(STR_3M1) $(STR_MT) -c $< -o $@ - -# blis 4mhw -test_z%_4mhw_blis_st.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_ST) $(DT_Z) $(BLI_DEF) $(D4MHW) $(STR_4MHW) $(STR_ST) -c $< -o $@ - -test_c%_4mhw_blis_st.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_ST) $(DT_C) $(BLI_DEF) $(D4MHW) $(STR_4MHW) $(STR_ST) -c $< -o $@ - -test_z%_4mhw_blis_mt.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_MT) $(DT_Z) $(BLI_DEF) $(D4MHW) $(STR_4MHW) $(STR_MT) -c $< -o $@ - -test_c%_4mhw_blis_mt.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_MT) $(DT_C) $(BLI_DEF) $(D4MHW) $(STR_4MHW) $(STR_MT) -c $< -o $@ - -# blis 4m1b -test_z%_4m1b_blis_st.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_ST) $(DT_Z) $(BLI_DEF) $(D4M1B) $(STR_4M1B) $(STR_ST) -c $< -o $@ - -test_c%_4m1b_blis_st.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_ST) $(DT_C) $(BLI_DEF) $(D4M1B) $(STR_4M1B) $(STR_ST) -c $< -o $@ - -test_z%_4m1b_blis_mt.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_MT) $(DT_Z) $(BLI_DEF) $(D4M1B) $(STR_4M1B) $(STR_MT) -c $< -o $@ - -test_c%_4m1b_blis_mt.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_MT) $(DT_C) $(BLI_DEF) $(D4M1B) $(STR_4M1B) $(STR_MT) -c $< -o $@ - -# blis 4m1a -test_z%_4m1a_blis_st.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_ST) $(DT_Z) $(BLI_DEF) $(D4M1A) $(STR_4M1A) $(STR_ST) -c $< -o $@ - -test_c%_4m1a_blis_st.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_ST) $(DT_C) $(BLI_DEF) $(D4M1A) $(STR_4M1A) $(STR_ST) -c $< -o $@ - -test_z%_4m1a_blis_mt.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_MT) $(DT_Z) $(BLI_DEF) $(D4M1A) $(STR_4M1A) $(STR_MT) -c $< -o $@ - -test_c%_4m1a_blis_mt.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_MT) $(DT_C) $(BLI_DEF) $(D4M1A) $(STR_4M1A) $(STR_MT) -c $< -o $@ - -# blis 1m -test_z%_1m_blis_st.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_ST) $(DT_Z) $(BLI_DEF) $(D1M) $(STR_1M) $(STR_ST) -c $< -o $@ - -test_c%_1m_blis_st.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_ST) $(DT_C) $(BLI_DEF) $(D1M) $(STR_1M) $(STR_ST) -c $< -o $@ - -test_z%_1m_blis_mt.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_MT) $(DT_Z) $(BLI_DEF) $(D1M) $(STR_1M) $(STR_MT) -c $< -o $@ - -test_c%_1m_blis_mt.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_MT) $(DT_C) $(BLI_DEF) $(D1M) $(STR_1M) $(STR_MT) -c $< -o $@ - -# blis asm -test_d%_asm_blis_st.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_ST) $(DT_D) $(BLI_DEF) $(DNAT) $(STR_NAT) $(STR_ST) -c $< -o $@ - -test_s%_asm_blis_st.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_ST) $(DT_S) $(BLI_DEF) $(DNAT) $(STR_NAT) $(STR_ST) -c $< -o $@ - -test_z%_asm_blis_st.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_ST) $(DT_Z) $(BLI_DEF) $(DNAT) $(STR_NAT) $(STR_ST) -c $< -o $@ - -test_c%_asm_blis_st.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_ST) $(DT_C) $(BLI_DEF) $(DNAT) $(STR_NAT) $(STR_ST) -c $< -o $@ - -test_d%_asm_blis_mt.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_MT) $(DT_D) $(BLI_DEF) $(DNAT) $(STR_NAT) $(STR_MT) -c $< -o $@ - -test_s%_asm_blis_mt.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_MT) $(DT_S) $(BLI_DEF) $(DNAT) $(STR_NAT) $(STR_MT) -c $< -o $@ - -test_z%_asm_blis_mt.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_MT) $(DT_Z) $(BLI_DEF) $(DNAT) $(STR_NAT) $(STR_MT) -c $< -o $@ - -test_c%_asm_blis_mt.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_MT) $(DT_C) $(BLI_DEF) $(DNAT) $(STR_NAT) $(STR_MT) -c $< -o $@ - -# openblas -test_d%_openblas_st.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_ST) $(DT_D) $(BLA_DEF) $(DNAT) $(STR_OBL) $(STR_ST) -c $< -o $@ - -test_s%_openblas_st.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_ST) $(DT_S) $(BLA_DEF) $(DNAT) $(STR_OBL) $(STR_ST) -c $< -o $@ - -test_z%_openblas_st.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_ST) $(DT_Z) $(BLA_DEF) $(DNAT) $(STR_OBL) $(STR_ST) -c $< -o $@ - -test_c%_openblas_st.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_ST) $(DT_C) $(BLA_DEF) $(DNAT) $(STR_OBL) $(STR_ST) -c $< -o $@ - -test_d%_openblas_mt.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_MT) $(DT_D) $(BLA_DEF) $(DNAT) $(STR_OBL) $(STR_MT) -c $< -o $@ - -test_s%_openblas_mt.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_MT) $(DT_S) $(BLA_DEF) $(DNAT) $(STR_OBL) $(STR_MT) -c $< -o $@ - -test_z%_openblas_mt.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_MT) $(DT_Z) $(BLA_DEF) $(DNAT) $(STR_OBL) $(STR_MT) -c $< -o $@ - -test_c%_openblas_mt.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_MT) $(DT_C) $(BLA_DEF) $(DNAT) $(STR_OBL) $(STR_MT) -c $< -o $@ - -# mkl -test_d%_mkl_st.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_ST) $(DT_D) $(BLA_DEF) $(DNAT) $(STR_MKL) $(STR_ST) -c $< -o $@ - -test_s%_mkl_st.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_ST) $(DT_S) $(BLA_DEF) $(DNAT) $(STR_MKL) $(STR_ST) -c $< -o $@ - -test_z%_mkl_st.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_ST) $(DT_Z) $(BLA_DEF) $(DNAT) $(STR_MKL) $(STR_ST) -c $< -o $@ - -test_c%_mkl_st.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_ST) $(DT_C) $(BLA_DEF) $(DNAT) $(STR_MKL) $(STR_ST) -c $< -o $@ - -test_d%_mkl_mt.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_MT) $(DT_D) $(BLA_DEF) $(DNAT) $(STR_MKL) $(STR_MT) -c $< -o $@ - -test_s%_mkl_mt.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_MT) $(DT_S) $(BLA_DEF) $(DNAT) $(STR_MKL) $(STR_MT) -c $< -o $@ - -test_z%_mkl_mt.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_MT) $(DT_Z) $(BLA_DEF) $(DNAT) $(STR_MKL) $(STR_MT) -c $< -o $@ - -test_c%_mkl_mt.o: test_%.c Makefile - $(CC) $(CFLAGS) $(PDEF_MT) $(DT_C) $(BLA_DEF) $(DNAT) $(STR_MKL) $(STR_MT) -c $< -o $@ +$(foreach dt,$(DTS), \ +$(foreach op,$(OPS), \ +$(foreach im,$(IMPLS),$(eval $(call make-2s-rule,$(dt),$(op),$(im)))))) # -- Executable file rules -- @@ -558,23 +349,34 @@ test_c%_mkl_mt.o: test_%.c Makefile # compatibility layer. This prevents BLIS from inadvertently getting called # for the BLAS routines we are trying to test with. -test_%_openblas_st.x: test_%_openblas_st.o $(LIBBLIS_LINK) - $(LINKER) $< $(OPENBLAS_LIB) $(LIBBLIS_LINK) $(LDFLAGS) -o $@ +test_%_$(PS_MAX)_openblas_st.x: test_%_$(PS_MAX)_openblas_st.o $(LIBBLIS_LINK) + $(LINKER) $(strip $< $(OPENBLAS_LIB) $(LIBBLIS_LINK) $(LDFLAGS) -o $@) -test_%_openblas_mt.x: test_%_openblas_mt.o $(LIBBLIS_LINK) - $(LINKER) $< $(OPENBLASP_LIB) $(LIBBLIS_LINK) $(LDFLAGS) -o $@ +test_%_$(P1_MAX)_openblas_1s.x: test_%_$(P1_MAX)_openblas_1s.o $(LIBBLIS_LINK) + $(LINKER) $(strip $< $(OPENBLASP_LIB) $(LIBBLIS_LINK) $(LDFLAGS) -o $@) -test_%_mkl_st.x: test_%_mkl_st.o $(LIBBLIS_LINK) - $(LINKER) $< $(MKL_LIB) $(LIBBLIS_LINK) $(LDFLAGS) -o $@ +test_%_$(P2_MAX)_openblas_2s.x: test_%_$(P2_MAX)_openblas_2s.o $(LIBBLIS_LINK) + $(LINKER) $(strip $< $(OPENBLASP_LIB) $(LIBBLIS_LINK) $(LDFLAGS) -o $@) -test_%_mkl_mt.x: test_%_mkl_mt.o $(LIBBLIS_LINK) - $(LINKER) $< $(MKLP_LIB) $(LIBBLIS_LINK) $(LDFLAGS) -o $@ -test_%_blis_st.x: test_%_blis_st.o $(LIBBLIS_LINK) - $(LINKER) $< $(LIBBLIS_LINK) $(LDFLAGS) -o $@ +test_%_$(PS_MAX)_vendor_st.x: test_%_$(PS_MAX)_vendor_st.o $(LIBBLIS_LINK) + $(LINKER) $(strip $< $(VENDOR_LIB) $(LIBBLIS_LINK) $(LDFLAGS) -o $@) -test_%_blis_mt.x: test_%_blis_mt.o $(LIBBLIS_LINK) - $(LINKER) $< $(LIBBLIS_LINK) $(LDFLAGS) -o $@ +test_%_$(P1_MAX)_vendor_1s.x: test_%_$(P1_MAX)_vendor_1s.o $(LIBBLIS_LINK) + $(LINKER) $(strip $< $(VENDORP_LIB) $(LIBBLIS_LINK) $(LDFLAGS) -o $@) + +test_%_$(P2_MAX)_vendor_2s.x: test_%_$(P2_MAX)_vendor_2s.o $(LIBBLIS_LINK) + $(LINKER) $(strip $< $(VENDORP_LIB) $(LIBBLIS_LINK) $(LDFLAGS) -o $@) + + +test_%_$(PS_MAX)_asm_blis_st.x: test_%_$(PS_MAX)_asm_blis_st.o $(LIBBLIS_LINK) + $(LINKER) $(strip $< $(LIBBLIS_LINK) $(LDFLAGS) -o $@) + +test_%_$(P1_MAX)_asm_blis_1s.x: test_%_$(P1_MAX)_asm_blis_1s.o $(LIBBLIS_LINK) + $(LINKER) $(strip $< $(LIBBLIS_LINK) $(LDFLAGS) -o $@) + +test_%_$(P2_MAX)_asm_blis_2s.x: test_%_$(P2_MAX)_asm_blis_2s.o $(LIBBLIS_LINK) + $(LINKER) $(strip $< $(LIBBLIS_LINK) $(LDFLAGS) -o $@) # -- Clean rules -- diff --git a/test/3m4m/matlab/plot_all.m b/test/3m4m/matlab/plot_all.m deleted file mode 100644 index e5b478f23..000000000 --- a/test/3m4m/matlab/plot_all.m +++ /dev/null @@ -1,9 +0,0 @@ -% tx2 -plot_panel_4x5(2.2,8,1, '../results/tx2/st', 'tx2', 'ARMPL'); close; clear all; -plot_panel_4x5(2.2,8,28,'../results/tx2/jc4ic7','tx2_jc4ic7','ARMPL'); close; clear all; -plot_panel_4x5(2.2,8,56,'../results/tx2/jc8ic7','tx2_jc8ic7','ARMPL'); close; clear all; - -% skx -plot_panel_4x5(2.0,32,1,'../results/skx/st/20190218','skx','MKL'); close; clear all; -plot_panel_4x5(2.0,32,26,'../results/skx/jc2ic13/20190218','skx_jc2ic13','MKL'); close; clear all; -plot_panel_4x5(2.0,32,52,'../results/skx/jc4ic13/20190218','skx_jc4ic13','MKL'); close; clear all; diff --git a/test/3m4m/matlab/plot_l3_perf.m b/test/3m4m/matlab/plot_l3_perf.m index 181871039..63ec55660 100644 --- a/test/3m4m/matlab/plot_l3_perf.m +++ b/test/3m4m/matlab/plot_l3_perf.m @@ -99,7 +99,7 @@ vend_ln = line( x_axis( :, 1 ), data_vend( :, flopscol ) / nth, ... xlim( ax1, [x_begin x_end] ); ylim( ax1, [y_begin y_end] ); -if x_end == 10000 || x_end == 8000 +if x_end == 10000 || x_end == 8000 || x_end == 6000 x_tick2 = x_end - 2000; x_tick1 = x_tick2/2; xticks( ax1, [ x_tick1 x_tick2 ] ); diff --git a/test/3m4m/matlab/plot_panel_4x5.m b/test/3m4m/matlab/plot_panel_4x5.m index 71b0b803d..740ca5666 100644 --- a/test/3m4m/matlab/plot_panel_4x5.m +++ b/test/3m4m/matlab/plot_panel_4x5.m @@ -1,6 +1,7 @@ function r_val = plot_panel_4x5( cfreq, ... dflopspercycle, ... nth, ... + thr_str, ... dirpath, ... arch_str, ... vend_str ) @@ -12,18 +13,12 @@ function r_val = plot_panel_4x5( cfreq, ... % results. filetemp_blis = '%s/output_%s_%s_asm_blis.m'; filetemp_open = '%s/output_%s_%s_openblas.m'; -filetemp_mkl = '%s/output_%s_%s_mkl.m'; +filetemp_vend = '%s/output_%s_%s_vendor.m'; % Create a variable name "template" for the variables contained in the % files outlined above. vartemp = 'data_%s_%s_%s( :, : )'; -if nth == 1 - thr_str = 'st'; -else - thr_str = 'mt'; -end - % Define the datatypes and operations we will be plotting. dts = [ 's' 'd' 'c' 'z' ]; ops( 1, : ) = 'gemm'; @@ -63,26 +58,26 @@ for opi = 1:n_opnames % Construct filenames for the data files from templates. file_blis = sprintf( filetemp_blis, dirpath, thr_str, opname ); file_open = sprintf( filetemp_open, dirpath, thr_str, opname ); - file_mkl = sprintf( filetemp_mkl, dirpath, thr_str, opname ); + file_vend = sprintf( filetemp_vend, dirpath, thr_str, opname ); % Load the data files. %str = sprintf( ' Loading %s', file_blis ); disp(str); run( file_blis ) %str = sprintf( ' Loading %s', file_open ); disp(str); run( file_open ) - %str = sprintf( ' Loading %s', file_mkl ); disp(str); - run( file_mkl ) + %str = sprintf( ' Loading %s', file_vend ); disp(str); + run( file_vend ) % Construct variable names for the variables in the data files. var_blis = sprintf( vartemp, thr_str, opname, 'asm_blis' ); var_open = sprintf( vartemp, thr_str, opname, 'openblas' ); - var_vend = sprintf( vartemp, thr_str, opname, 'mkl' ); + var_vend = sprintf( vartemp, thr_str, opname, 'vendor' ); % Use eval() to instantiate the variable names constructed above, % copying each to a simplified name. data_blis = eval( var_blis ); % e.g. data_st_sgemm_asm_blis( :, : ); data_open = eval( var_open ); % e.g. data_st_sgemm_openblas( :, : ); - data_vend = eval( var_vend ); % e.g. data_st_sgemm_mkl( :, : ); + data_vend = eval( var_vend ); % e.g. data_st_sgemm_vendor( :, : ); % Plot one result in an m x n grid of plots, via the subplot() % function. diff --git a/test/3m4m/matlab/runme.m b/test/3m4m/matlab/runme.m new file mode 100644 index 000000000..2a34a2233 --- /dev/null +++ b/test/3m4m/matlab/runme.m @@ -0,0 +1,9 @@ +% tx2 +plot_panel_4x5(2.2,8,1, 'st','../results/tx2/st', 'tx2', 'ARMPL'); close; clear all; +plot_panel_4x5(2.2,8,28,'1s','../results/tx2/jc4ic7','tx2_jc4ic7','ARMPL'); close; clear all; +plot_panel_4x5(2.2,8,56,'2s','../results/tx2/jc8ic7','tx2_jc8ic7','ARMPL'); close; clear all; + +% skx +plot_panel_4x5(2.0,32,1, 'st','../results/skx/st/20190218', 'skx', 'MKL'); close; clear all; +plot_panel_4x5(2.0,32,26,'1s','../results/skx/jc2ic13/20190218','skx_jc2ic13','MKL'); close; clear all; +plot_panel_4x5(2.0,32,52,'2s','../results/skx/jc4ic13/20190218','skx_jc4ic13','MKL'); close; clear all; diff --git a/test/3m4m/runme.sh b/test/3m4m/runme.sh index 50fd61ae8..f7f33a772 100755 --- a/test/3m4m/runme.sh +++ b/test/3m4m/runme.sh @@ -3,37 +3,33 @@ # File pefixes. exec_root="test" out_root="output" +delay=0.1 #sys="blis" #sys="stampede2" -sys="lonestar5" +#sys="lonestar5" #sys="ul252" +sys="ul264" # Bind threads to processors. #export OMP_PROC_BIND=true #export GOMP_CPU_AFFINITY="0 2 4 6 8 10 12 14 16 18 20 22 1 3 5 7 9 11 13 15 17 19 21 23" +#export GOMP_CPU_AFFINITY="0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103" -# Modify LD_LIBRARY_PATH. if [ ${sys} = "blis" ]; then export GOMP_CPU_AFFINITY="0 1 2 3" - jc_nt=1 # 5th loop - ic_nt=4 # 3rd loop - jr_nt=1 # 2nd loop - ir_nt=1 # 1st loop - nt=4 + threads="jc2ic2jr1_4000 + jc2ic2jr1_6000" elif [ ${sys} = "stampede2" ]; then echo "Need to set GOMP_CPU_AFFINITY." exit 1 - jc_nt=4 # 5th loop - ic_nt=12 # 3rd loop - jr_nt=1 # 2nd loop - ir_nt=1 # 1st loop - nt=48 + threads="jc4ic6jr1_6000 + jc4ic12jr1_8000" elif [ ${sys} = "lonestar5" ]; then @@ -42,148 +38,115 @@ elif [ ${sys} = "lonestar5" ]; then # A hack to use libiomp5 with gcc. #export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/apps/intel/16.0.1.150/compilers_and_libraries_2016.1.150/linux/compiler/lib/intel64" - # runner-up: - #jc_nt=6 # 5th loop - #ic_nt=4 # 3rd loop - #jr_nt=1 # 2nd loop - - jc_nt=2 # 5th loop - ic_nt=3 # 3rd loop - jr_nt=2 # 2nd loop - - ir_nt=1 # 1st loop - nt=12 + threads="jc2ic3jr2_6000 + jc4ic3jr2_8000" elif [ ${sys} = "ul252" ]; then export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/home/field/intel/mkl/lib/intel64" - #export GOMP_CPU_AFFINITY="0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103" export GOMP_CPU_AFFINITY="0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51" - #jc_nt=4 # 5th loop - jc_nt=2 # 5th loop - ic_nt=13 # 3rd loop - jr_nt=1 # 2nd loop - ir_nt=1 # 1st loop - #nt=52 - nt=26 + threads="jc2ic13jr1_6000 + jc4ic13jr1_8000" + +elif [ ${sys} = "ul264" ]; then + + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/home/field/intel/mkl/lib/intel64" + export GOMP_CPU_AFFINITY="0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63" + + threads="jc1ic8jr4_6000 + jc2ic8jr4_8000" + fi -echo "Setting BLIS threading params for ${sys}: jc${jc_nt}ic${ic_nt}jr${jr_nt}." +# Datatypes to test. +test_dts="d s z c" + +# Operations to test. +test_ops="gemm hemm herk trmm trsm" +test_ops="gemm" + +# Implementations to test. +impls="all" +#impls="other" +#impls="blis" + +if [ "${impls}" = "blis" ]; then + + test_impls="asm_blis" + +elif [ "${impls}" = "other" ]; then + + test_impls="openblas vendor" + +else + + test_impls="openblas asm_blis vendor" +fi # Save a copy of GOMP_CPU_AFFINITY so that if we have to unset it, we can # restore the value. GOMP_CPU_AFFINITYsave=${GOMP_CPU_AFFINITY} -# Threadedness to test. -threads="mt" -threads_r="mt" -#threads="st" -#threads_r="st" - -# Datatypes to test. -dts="" -dts_r="" -dts="z c" -dts_r="d s" - -# Operations to test. -l3_ops="gemm hemm herk trmm trsm" -test_ops="${l3_ops}" -test_ops_r="${l3_ops}" - -# Complex domain implementations to test. -#test_impls="3mhw_blis 3m1_blis 4mhw_blis 4m1b_blis 4m1a_blis 1m_blis" -#test_impls="openblas mkl asm_blis" - -# Implementations to test. -impls="allasm" - -if [ ${impls} = "allasm" ]; then - - test_impls_r="openblas asm_blis mkl" - test_impls="openblas asm_blis mkl" - -elif [ ${impls} = "comp" ]; then - - test_impls_r="openblas mkl" - test_impls="openblas mkl" - -elif [ ${impls} = "blis" ]; then - - test_impls_r="asm_blis" - test_impls="asm_blis" -fi # First perform real test cases. -for th in ${threads_r}; do - - for dt in ${dts_r}; do - - for im in ${test_impls_r}; do - - for op in ${test_ops_r}; do - - # Set the number of threads according to th. - if [ ${th} = "mt" ]; then - - export BLIS_JC_NT=${jc_nt} - export BLIS_IC_NT=${ic_nt} - export BLIS_JR_NT=${jr_nt} - export BLIS_IR_NT=${ir_nt} - export OPENBLAS_NUM_THREADS=${nt} - export MKL_NUM_THREADS=${nt} - export nt_use=${nt} - - # Unset GOMP_CPU_AFFINITY for OpenBLAS. - if [ ${im} = "openblas" ]; then - - unset GOMP_CPU_AFFINITY - else - export GOMP_CPU_AFFINITY="${GOMP_CPU_AFFINITYsave}" - fi - else - - export BLIS_JC_NT=1 - export BLIS_IC_NT=1 - export BLIS_JR_NT=1 - export BLIS_IR_NT=1 - export OPENBLAS_NUM_THREADS=1 - export MKL_NUM_THREADS=1 - export nt_use=1 - fi - - # Construct the name of the test executable. - exec_name="${exec_root}_${dt}${op}_${im}_${th}.x" - - # Construct the name of the output file. - out_file="${out_root}_${th}_${dt}${op}_${im}.m" - - echo "Running (nt = ${nt_use}) ./${exec_name} > ${out_file}" - - # Run executable. - ./${exec_name} > ${out_file} - - sleep 1 - - done - done - done -done - -# Now perform complex test cases. for th in ${threads}; do - for dt in ${dts}; do + # Start with one way of parallelism in each loop. We will now begin + # parsing the 'th' variable to update one or more of these threading + # parameters. + jc_nt=1; pc_nt=1; ic_nt=1; jr_nt=1; ir_nt=1 + + # Strip everything before and after the underscore so that what remains + # is the problem size and threading parameter string, respectively. + psize=${th##*_}; thinfo=${th%%_*} + + # Identify each threading parameter and insert a space before it. + thsep=$(echo -e ${thinfo} | sed -e "s/\([jip][cr]\)/ \1/g" ) + + nt=1 + + for loopnum in ${thsep}; do + + # Given the current string, which identifies a loop and the + # number of ways of parallelism for that loop, strip out + # the ways and loop separately to identify each. + loop=$(echo -e ${loopnum} | sed -e "s/[0-9]//g" ) + num=$(echo -e ${loopnum} | sed -e "s/[a-z]//g" ) + + # Construct a string that we can evaluate to set the number + # of ways of parallelism for the current loop. + loop_nt_eq_num="${loop}_nt=${num}" + + # Update the total number of threads. + nt=$(expr ${nt} \* ${num}) + + # Evaluate the string to assign the ways to the variable. + eval ${loop_nt_eq_num} + + done + + echo "Switching to: jc${jc_nt} pc${pc_nt} ic${ic_nt} jr${jr_nt} ir${ir_nt} (nt = ${nt}) p_max${psize}" + + + for dt in ${test_dts}; do for im in ${test_impls}; do for op in ${test_ops}; do + # Find the threading suffix by probing the executable. + binname=$(ls ${exec_root}_${dt}${op}_${psize}_${im}_*.x) + suf_ext=${binname##*_} + suf=${suf_ext%%.*} + + #echo "found file: ${binname} with suffix ${suf}" + # Set the number of threads according to th. - if [ ${th} = "mt" ]; then + if [ "${suf}" = "1s" ] || [ "${suf}" = "2s" ]; then export BLIS_JC_NT=${jc_nt} + export BLIS_PC_NT=${pc_nt} export BLIS_IC_NT=${ic_nt} export BLIS_JR_NT=${jr_nt} export BLIS_IR_NT=${ir_nt} @@ -191,9 +154,11 @@ for th in ${threads}; do export MKL_NUM_THREADS=${nt} export nt_use=${nt} - # Unset GOMP_CPU_AFFINITY for OpenBLAS. + # Multithreaded OpenBLAS seems to have a problem running + # properly if GOMP_CPU_AFFINITY is set. So we temporarily + # unset it here if we are about to execute OpenBLAS, but + # otherwise restore it. if [ ${im} = "openblas" ]; then - unset GOMP_CPU_AFFINITY else export GOMP_CPU_AFFINITY="${GOMP_CPU_AFFINITYsave}" @@ -201,6 +166,7 @@ for th in ${threads}; do else export BLIS_JC_NT=1 + export BLIS_PC_NT=1 export BLIS_IC_NT=1 export BLIS_JR_NT=1 export BLIS_IR_NT=1 @@ -210,19 +176,21 @@ for th in ${threads}; do fi # Construct the name of the test executable. - exec_name="${exec_root}_${dt}${op}_${im}_${th}.x" + exec_name="${exec_root}_${dt}${op}_${psize}_${im}_${suf}.x" # Construct the name of the output file. - out_file="${out_root}_${th}_${dt}${op}_${im}.m" + out_file="${out_root}_${suf}_${dt}${op}_${im}.m" - echo "Running (nt = ${nt_use}) ./${exec_name} > ${out_file}" + #echo "Running (nt = ${nt_use}) ./${exec_name} > ${out_file}" + echo "Running ./${exec_name} > ${out_file}" # Run executable. - ./${exec_name} > ${out_file} + #./${exec_name} > ${out_file} - sleep 1 + sleep ${delay} done done done done + diff --git a/test/3m4m/test_gemm.c b/test/3m4m/test_gemm.c index 8ba53d63a..67c0a845d 100644 --- a/test/3m4m/test_gemm.c +++ b/test/3m4m/test_gemm.c @@ -44,7 +44,7 @@ int main( int argc, char** argv ) obj_t alpha, beta; dim_t m, n, k; dim_t p; - dim_t p_begin, p_end, p_inc; + dim_t p_begin, p_max, p_inc; int m_input, n_input, k_input; ind_t ind; num_t dt; @@ -70,7 +70,7 @@ int main( int argc, char** argv ) ind = IND; p_begin = P_BEGIN; - p_end = P_END; + p_max = P_MAX; p_inc = P_INC; m_input = -1; @@ -116,12 +116,9 @@ int main( int argc, char** argv ) // Begin with initializing the last entry to zero so that // matlab allocates space for the entire array once up-front. - for ( p = p_begin; p + p_inc <= p_end; p += p_inc ) ; -#ifdef BLIS - printf( "data_%s_%cgemm_%s_blis", THR_STR, dt_ch, STR ); -#else - printf( "data_%s_%cgemm_%s", THR_STR, dt_ch, STR ); -#endif + for ( p = p_begin; p + p_inc <= p_max; p += p_inc ) ; + + printf( "data_%s_%cgemm_%s", THR_STR, dt_ch, STR ); printf( "( %2lu, 1:4 ) = [ %4lu %4lu %4lu %7.2f ];\n", ( unsigned long )(p - p_begin + 1)/p_inc + 1, ( unsigned long )0, @@ -129,7 +126,7 @@ int main( int argc, char** argv ) ( unsigned long )0, 0.0 ); - for ( p = p_begin; p <= p_end; p += p_inc ) + for ( p = p_begin; p <= p_max; p += p_inc ) { if ( m_input < 0 ) m = p / ( dim_t )abs(m_input); @@ -157,7 +154,6 @@ int main( int argc, char** argv ) bli_setsc( (2.0/1.0), 0.0, &alpha ); bli_setsc( (1.0/1.0), 0.0, &beta ); - bli_copym( &c, &c_save ); #if 0 //def BLIS @@ -173,7 +169,6 @@ int main( int argc, char** argv ) dtime = bli_clock(); - #ifdef PRINT bli_printm( "a", &a, "%4.1f", "" ); bli_printm( "b", &b, "%4.1f", "" ); @@ -190,107 +185,106 @@ int main( int argc, char** argv ) #else - if ( bli_is_float( dt ) ) - { - f77_int mm = bli_obj_length( &c ); - f77_int kk = bli_obj_width_after_trans( &a ); - f77_int nn = 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 ); - float* alphap = bli_obj_buffer( &alpha ); - float* ap = bli_obj_buffer( &a ); - float* bp = bli_obj_buffer( &b ); - float* betap = bli_obj_buffer( &beta ); - float* cp = bli_obj_buffer( &c ); + if ( bli_is_float( dt ) ) + { + f77_int mm = bli_obj_length( &c ); + f77_int kk = bli_obj_width_after_trans( &a ); + f77_int nn = 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 ); + float* alphap = bli_obj_buffer( &alpha ); + float* ap = bli_obj_buffer( &a ); + float* bp = bli_obj_buffer( &b ); + float* betap = bli_obj_buffer( &beta ); + float* cp = bli_obj_buffer( &c ); - sgemm_( &f77_transa, - &f77_transb, - &mm, - &nn, - &kk, - alphap, - ap, &lda, - bp, &ldb, - betap, - cp, &ldc ); - } - else if ( bli_is_double( dt ) ) - { - f77_int mm = bli_obj_length( &c ); - f77_int kk = bli_obj_width_after_trans( &a ); - f77_int nn = 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 ); - double* alphap = bli_obj_buffer( &alpha ); - double* ap = bli_obj_buffer( &a ); - double* bp = bli_obj_buffer( &b ); - double* betap = bli_obj_buffer( &beta ); - double* cp = bli_obj_buffer( &c ); + sgemm_( &f77_transa, + &f77_transb, + &mm, + &nn, + &kk, + alphap, + ap, &lda, + bp, &ldb, + betap, + cp, &ldc ); + } + else if ( bli_is_double( dt ) ) + { + f77_int mm = bli_obj_length( &c ); + f77_int kk = bli_obj_width_after_trans( &a ); + f77_int nn = 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 ); + double* alphap = bli_obj_buffer( &alpha ); + double* ap = bli_obj_buffer( &a ); + double* bp = bli_obj_buffer( &b ); + double* betap = bli_obj_buffer( &beta ); + double* cp = bli_obj_buffer( &c ); - dgemm_( &f77_transa, - &f77_transb, - &mm, - &nn, - &kk, - alphap, - ap, &lda, - bp, &ldb, - betap, - cp, &ldc ); - } - else if ( bli_is_scomplex( dt ) ) - { - f77_int mm = bli_obj_length( &c ); - f77_int kk = bli_obj_width_after_trans( &a ); - f77_int nn = 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 ); - scomplex* alphap = bli_obj_buffer( &alpha ); - scomplex* ap = bli_obj_buffer( &a ); - scomplex* bp = bli_obj_buffer( &b ); - scomplex* betap = bli_obj_buffer( &beta ); - scomplex* cp = bli_obj_buffer( &c ); + dgemm_( &f77_transa, + &f77_transb, + &mm, + &nn, + &kk, + alphap, + ap, &lda, + bp, &ldb, + betap, + cp, &ldc ); + } + else if ( bli_is_scomplex( dt ) ) + { + f77_int mm = bli_obj_length( &c ); + f77_int kk = bli_obj_width_after_trans( &a ); + f77_int nn = 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 ); + scomplex* alphap = bli_obj_buffer( &alpha ); + scomplex* ap = bli_obj_buffer( &a ); + scomplex* bp = bli_obj_buffer( &b ); + scomplex* betap = bli_obj_buffer( &beta ); + scomplex* cp = bli_obj_buffer( &c ); - cgemm_( &f77_transa, - &f77_transb, - &mm, - &nn, - &kk, - alphap, - ap, &lda, - bp, &ldb, - betap, - cp, &ldc ); - } - else if ( bli_is_dcomplex( dt ) ) - { - f77_int mm = bli_obj_length( &c ); - f77_int kk = bli_obj_width_after_trans( &a ); - f77_int nn = 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 ); - dcomplex* alphap = bli_obj_buffer( &alpha ); - dcomplex* ap = bli_obj_buffer( &a ); - dcomplex* bp = bli_obj_buffer( &b ); - dcomplex* betap = bli_obj_buffer( &beta ); - dcomplex* cp = bli_obj_buffer( &c ); + cgemm_( &f77_transa, + &f77_transb, + &mm, + &nn, + &kk, + alphap, + ap, &lda, + bp, &ldb, + betap, + cp, &ldc ); + } + else if ( bli_is_dcomplex( dt ) ) + { + f77_int mm = bli_obj_length( &c ); + f77_int kk = bli_obj_width_after_trans( &a ); + f77_int nn = 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 ); + dcomplex* alphap = bli_obj_buffer( &alpha ); + dcomplex* ap = bli_obj_buffer( &a ); + dcomplex* bp = bli_obj_buffer( &b ); + dcomplex* betap = bli_obj_buffer( &beta ); + dcomplex* cp = bli_obj_buffer( &c ); - zgemm_( &f77_transa, - //zgemm3m_( &f77_transa, - &f77_transb, - &mm, - &nn, - &kk, - alphap, - ap, &lda, - bp, &ldb, - betap, - cp, &ldc ); - } + zgemm_( &f77_transa, + &f77_transb, + &mm, + &nn, + &kk, + alphap, + ap, &lda, + bp, &ldb, + betap, + cp, &ldc ); + } #endif #ifdef PRINT @@ -298,7 +292,6 @@ int main( int argc, char** argv ) exit(1); #endif - dtime_save = bli_clock_min_diff( dtime_save, dtime ); } @@ -306,11 +299,7 @@ int main( int argc, char** argv ) if ( bli_is_complex( dt ) ) gflops *= 4.0; -#ifdef BLIS - printf( "data_%s_%cgemm_%s_blis", THR_STR, dt_ch, STR ); -#else - printf( "data_%s_%cgemm_%s", THR_STR, dt_ch, STR ); -#endif + printf( "data_%s_%cgemm_%s", THR_STR, dt_ch, STR ); printf( "( %2lu, 1:4 ) = [ %4lu %4lu %4lu %7.2f ];\n", ( unsigned long )(p - p_begin + 1)/p_inc + 1, ( unsigned long )m, diff --git a/test/3m4m/test_hemm.c b/test/3m4m/test_hemm.c index bbf404379..46cd3708a 100644 --- a/test/3m4m/test_hemm.c +++ b/test/3m4m/test_hemm.c @@ -44,7 +44,7 @@ int main( int argc, char** argv ) obj_t alpha, beta; dim_t m, n; dim_t p; - dim_t p_begin, p_end, p_inc; + dim_t p_begin, p_max, p_inc; int m_input, n_input; ind_t ind; num_t dt; @@ -70,7 +70,7 @@ int main( int argc, char** argv ) ind = IND; p_begin = P_BEGIN; - p_end = P_END; + p_max = P_MAX; p_inc = P_INC; m_input = -1; @@ -115,19 +115,16 @@ int main( int argc, char** argv ) // Begin with initializing the last entry to zero so that // matlab allocates space for the entire array once up-front. - for ( p = p_begin; p + p_inc <= p_end; p += p_inc ) ; -#ifdef BLIS - printf( "data_%s_%chemm_%s_blis", THR_STR, dt_ch, STR ); -#else - printf( "data_%s_%chemm_%s", THR_STR, dt_ch, STR ); -#endif + for ( p = p_begin; p + p_inc <= p_max; p += p_inc ) ; + + printf( "data_%s_%chemm_%s", THR_STR, dt_ch, STR ); printf( "( %2lu, 1:3 ) = [ %4lu %4lu %7.2f ];\n", ( unsigned long )(p - p_begin + 1)/p_inc + 1, ( unsigned long )0, ( unsigned long )0, 0.0 ); - for ( p = p_begin; p <= p_end; p += p_inc ) + for ( p = p_begin; p <= p_max; p += p_inc ) { if ( m_input < 0 ) m = p / ( dim_t )abs(m_input); @@ -161,7 +158,6 @@ int main( int argc, char** argv ) bli_setsc( (2.0/1.0), 0.0, &alpha ); bli_setsc( (1.0/1.0), 0.0, &beta ); - bli_copym( &c, &c_save ); #if 0 //def BLIS @@ -177,7 +173,6 @@ int main( int argc, char** argv ) dtime = bli_clock(); - #ifdef PRINT bli_printm( "a", &a, "%4.1f", "" ); bli_printm( "b", &b, "%4.1f", "" ); @@ -195,98 +190,98 @@ int main( int argc, char** argv ) #else - if ( bli_is_float( dt ) ) - { - f77_int mm = bli_obj_length( &c ); - f77_int nn = 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 ); - float* alphap = bli_obj_buffer( &alpha ); - float* ap = bli_obj_buffer( &a ); - float* bp = bli_obj_buffer( &b ); - float* betap = bli_obj_buffer( &beta ); - float* cp = bli_obj_buffer( &c ); + if ( bli_is_float( dt ) ) + { + f77_int mm = bli_obj_length( &c ); + f77_int nn = 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 ); + float* alphap = bli_obj_buffer( &alpha ); + float* ap = bli_obj_buffer( &a ); + float* bp = bli_obj_buffer( &b ); + float* betap = bli_obj_buffer( &beta ); + float* cp = bli_obj_buffer( &c ); - ssymm_( &f77_side, - &f77_uploa, - &mm, - &nn, - alphap, - ap, &lda, - bp, &ldb, - betap, - cp, &ldc ); - } - else if ( bli_is_double( dt ) ) - { - f77_int mm = bli_obj_length( &c ); - f77_int nn = 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 ); - double* alphap = bli_obj_buffer( &alpha ); - double* ap = bli_obj_buffer( &a ); - double* bp = bli_obj_buffer( &b ); - double* betap = bli_obj_buffer( &beta ); - double* cp = bli_obj_buffer( &c ); + ssymm_( &f77_side, + &f77_uploa, + &mm, + &nn, + alphap, + ap, &lda, + bp, &ldb, + betap, + cp, &ldc ); + } + else if ( bli_is_double( dt ) ) + { + f77_int mm = bli_obj_length( &c ); + f77_int nn = 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 ); + double* alphap = bli_obj_buffer( &alpha ); + double* ap = bli_obj_buffer( &a ); + double* bp = bli_obj_buffer( &b ); + double* betap = bli_obj_buffer( &beta ); + double* cp = bli_obj_buffer( &c ); - dsymm_( &f77_side, - &f77_uploa, - &mm, - &nn, - alphap, - ap, &lda, - bp, &ldb, - betap, - cp, &ldc ); - } - else if ( bli_is_scomplex( dt ) ) - { - f77_int mm = bli_obj_length( &c ); - f77_int nn = 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 ); - scomplex* alphap = bli_obj_buffer( &alpha ); - scomplex* ap = bli_obj_buffer( &a ); - scomplex* bp = bli_obj_buffer( &b ); - scomplex* betap = bli_obj_buffer( &beta ); - scomplex* cp = bli_obj_buffer( &c ); + dsymm_( &f77_side, + &f77_uploa, + &mm, + &nn, + alphap, + ap, &lda, + bp, &ldb, + betap, + cp, &ldc ); + } + else if ( bli_is_scomplex( dt ) ) + { + f77_int mm = bli_obj_length( &c ); + f77_int nn = 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 ); + scomplex* alphap = bli_obj_buffer( &alpha ); + scomplex* ap = bli_obj_buffer( &a ); + scomplex* bp = bli_obj_buffer( &b ); + scomplex* betap = bli_obj_buffer( &beta ); + scomplex* cp = bli_obj_buffer( &c ); - chemm_( &f77_side, - &f77_uploa, - &mm, - &nn, - alphap, - ap, &lda, - bp, &ldb, - betap, - cp, &ldc ); - } - else if ( bli_is_dcomplex( dt ) ) - { - f77_int mm = bli_obj_length( &c ); - f77_int nn = 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 ); - dcomplex* alphap = bli_obj_buffer( &alpha ); - dcomplex* ap = bli_obj_buffer( &a ); - dcomplex* bp = bli_obj_buffer( &b ); - dcomplex* betap = bli_obj_buffer( &beta ); - dcomplex* cp = bli_obj_buffer( &c ); + chemm_( &f77_side, + &f77_uploa, + &mm, + &nn, + alphap, + ap, &lda, + bp, &ldb, + betap, + cp, &ldc ); + } + else if ( bli_is_dcomplex( dt ) ) + { + f77_int mm = bli_obj_length( &c ); + f77_int nn = 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 ); + dcomplex* alphap = bli_obj_buffer( &alpha ); + dcomplex* ap = bli_obj_buffer( &a ); + dcomplex* bp = bli_obj_buffer( &b ); + dcomplex* betap = bli_obj_buffer( &beta ); + dcomplex* cp = bli_obj_buffer( &c ); - zhemm_( &f77_side, - &f77_uploa, - &mm, - &nn, - alphap, - ap, &lda, - bp, &ldb, - betap, - cp, &ldc ); - } + zhemm_( &f77_side, + &f77_uploa, + &mm, + &nn, + alphap, + ap, &lda, + bp, &ldb, + betap, + cp, &ldc ); + } #endif #ifdef PRINT @@ -294,7 +289,6 @@ int main( int argc, char** argv ) exit(1); #endif - dtime_save = bli_clock_min_diff( dtime_save, dtime ); } @@ -305,11 +299,7 @@ int main( int argc, char** argv ) if ( bli_is_complex( dt ) ) gflops *= 4.0; -#ifdef BLIS - printf( "data_%s_%chemm_%s_blis", THR_STR, dt_ch, STR ); -#else - printf( "data_%s_%chemm_%s", THR_STR, dt_ch, STR ); -#endif + printf( "data_%s_%chemm_%s", THR_STR, dt_ch, STR ); printf( "( %2lu, 1:3 ) = [ %4lu %4lu %7.2f ];\n", ( unsigned long )(p - p_begin + 1)/p_inc + 1, ( unsigned long )m, diff --git a/test/3m4m/test_herk.c b/test/3m4m/test_herk.c index d6a1d1fa3..67ebff128 100644 --- a/test/3m4m/test_herk.c +++ b/test/3m4m/test_herk.c @@ -46,7 +46,7 @@ int main( int argc, char** argv ) obj_t alpha, beta; dim_t m, k; dim_t p; - dim_t p_begin, p_end, p_inc; + dim_t p_begin, p_max, p_inc; int m_input, k_input; ind_t ind; num_t dt, dt_real; @@ -73,7 +73,7 @@ int main( int argc, char** argv ) ind = IND; p_begin = P_BEGIN; - p_end = P_END; + p_max = P_MAX; p_inc = P_INC; m_input = -1; @@ -118,19 +118,16 @@ int main( int argc, char** argv ) // Begin with initializing the last entry to zero so that // matlab allocates space for the entire array once up-front. - for ( p = p_begin; p + p_inc <= p_end; p += p_inc ) ; -#ifdef BLIS - printf( "data_%s_%cherk_%s_blis", THR_STR, dt_ch, STR ); -#else - printf( "data_%s_%cherk_%s", THR_STR, dt_ch, STR ); -#endif + for ( p = p_begin; p + p_inc <= p_max; p += p_inc ) ; + + printf( "data_%s_%cherk_%s", THR_STR, dt_ch, STR ); printf( "( %2lu, 1:3 ) = [ %4lu %4lu %7.2f ];\n", ( unsigned long )(p - p_begin + 1)/p_inc + 1, ( unsigned long )0, ( unsigned long )0, 0.0 ); - for ( p = p_begin; p <= p_end; p += p_inc ) + for ( p = p_begin; p <= p_max; p += p_inc ) { if ( m_input < 0 ) m = p / ( dim_t )abs(m_input); @@ -162,7 +159,6 @@ int main( int argc, char** argv ) bli_setsc( (2.0/1.0), 0.0, &alpha ); bli_setsc( (1.0/1.0), 0.0, &beta ); - bli_copym( &c, &c_save ); #if 0 //def BLIS @@ -176,10 +172,8 @@ int main( int argc, char** argv ) { bli_copym( &c_save, &c ); - dtime = bli_clock(); - #ifdef PRINT bli_printm( "a", &a, "%4.1f", "" ); bli_printm( "c", &c, "%4.1f", "" ); @@ -194,86 +188,86 @@ int main( int argc, char** argv ) #else - if ( bli_is_float( dt ) ) - { - f77_int mm = bli_obj_length( &c ); - f77_int kk = bli_obj_width_after_trans( &a ); - f77_int lda = bli_obj_col_stride( &a ); - f77_int ldc = bli_obj_col_stride( &c ); - float* alphap = bli_obj_buffer( &alpha ); - float* ap = bli_obj_buffer( &a ); - float* betap = bli_obj_buffer( &beta ); - float* cp = bli_obj_buffer( &c ); + if ( bli_is_float( dt ) ) + { + f77_int mm = bli_obj_length( &c ); + f77_int kk = bli_obj_width_after_trans( &a ); + f77_int lda = bli_obj_col_stride( &a ); + f77_int ldc = bli_obj_col_stride( &c ); + float* alphap = bli_obj_buffer( &alpha ); + float* ap = bli_obj_buffer( &a ); + float* betap = bli_obj_buffer( &beta ); + float* cp = bli_obj_buffer( &c ); - ssyrk_( &f77_uploc, - &f77_transa, - &mm, - &kk, - alphap, - ap, &lda, - betap, - cp, &ldc ); - } - else if ( bli_is_double( dt ) ) - { - f77_int mm = bli_obj_length( &c ); - f77_int kk = bli_obj_width_after_trans( &a ); - f77_int lda = bli_obj_col_stride( &a ); - f77_int ldc = bli_obj_col_stride( &c ); - double* alphap = bli_obj_buffer( &alpha ); - double* ap = bli_obj_buffer( &a ); - double* betap = bli_obj_buffer( &beta ); - double* cp = bli_obj_buffer( &c ); + ssyrk_( &f77_uploc, + &f77_transa, + &mm, + &kk, + alphap, + ap, &lda, + betap, + cp, &ldc ); + } + else if ( bli_is_double( dt ) ) + { + f77_int mm = bli_obj_length( &c ); + f77_int kk = bli_obj_width_after_trans( &a ); + f77_int lda = bli_obj_col_stride( &a ); + f77_int ldc = bli_obj_col_stride( &c ); + double* alphap = bli_obj_buffer( &alpha ); + double* ap = bli_obj_buffer( &a ); + double* betap = bli_obj_buffer( &beta ); + double* cp = bli_obj_buffer( &c ); - dsyrk_( &f77_uploc, - &f77_transa, - &mm, - &kk, - alphap, - ap, &lda, - betap, - cp, &ldc ); - } - else if ( bli_is_scomplex( dt ) ) - { - f77_int mm = bli_obj_length( &c ); - f77_int kk = bli_obj_width_after_trans( &a ); - f77_int lda = bli_obj_col_stride( &a ); - f77_int ldc = bli_obj_col_stride( &c ); - float* alphap = bli_obj_buffer( &alpha ); - scomplex* ap = bli_obj_buffer( &a ); - float* betap = bli_obj_buffer( &beta ); - scomplex* cp = bli_obj_buffer( &c ); + dsyrk_( &f77_uploc, + &f77_transa, + &mm, + &kk, + alphap, + ap, &lda, + betap, + cp, &ldc ); + } + else if ( bli_is_scomplex( dt ) ) + { + f77_int mm = bli_obj_length( &c ); + f77_int kk = bli_obj_width_after_trans( &a ); + f77_int lda = bli_obj_col_stride( &a ); + f77_int ldc = bli_obj_col_stride( &c ); + float* alphap = bli_obj_buffer( &alpha ); + scomplex* ap = bli_obj_buffer( &a ); + float* betap = bli_obj_buffer( &beta ); + scomplex* cp = bli_obj_buffer( &c ); - cherk_( &f77_uploc, - &f77_transa, - &mm, - &kk, - alphap, - ap, &lda, - betap, - cp, &ldc ); - } - else if ( bli_is_dcomplex( dt ) ) - { - f77_int mm = bli_obj_length( &c ); - f77_int kk = bli_obj_width_after_trans( &a ); - f77_int lda = bli_obj_col_stride( &a ); - f77_int ldc = bli_obj_col_stride( &c ); - double* alphap = bli_obj_buffer( &alpha ); - dcomplex* ap = bli_obj_buffer( &a ); - double* betap = bli_obj_buffer( &beta ); - dcomplex* cp = bli_obj_buffer( &c ); + cherk_( &f77_uploc, + &f77_transa, + &mm, + &kk, + alphap, + ap, &lda, + betap, + cp, &ldc ); + } + else if ( bli_is_dcomplex( dt ) ) + { + f77_int mm = bli_obj_length( &c ); + f77_int kk = bli_obj_width_after_trans( &a ); + f77_int lda = bli_obj_col_stride( &a ); + f77_int ldc = bli_obj_col_stride( &c ); + double* alphap = bli_obj_buffer( &alpha ); + dcomplex* ap = bli_obj_buffer( &a ); + double* betap = bli_obj_buffer( &beta ); + dcomplex* cp = bli_obj_buffer( &c ); - zherk_( &f77_uploc, - &f77_transa, - &mm, - &kk, - alphap, - ap, &lda, - betap, - cp, &ldc ); - } + zherk_( &f77_uploc, + &f77_transa, + &mm, + &kk, + alphap, + ap, &lda, + betap, + cp, &ldc ); + } #endif #ifdef PRINT @@ -281,7 +275,6 @@ int main( int argc, char** argv ) exit(1); #endif - dtime_save = bli_clock_min_diff( dtime_save, dtime ); } @@ -289,11 +282,7 @@ int main( int argc, char** argv ) if ( bli_is_complex( dt ) ) gflops *= 4.0; -#ifdef BLIS - printf( "data_%s_%cherk_%s_blis", THR_STR, dt_ch, STR ); -#else - printf( "data_%s_%cherk_%s", THR_STR, dt_ch, STR ); -#endif + printf( "data_%s_%cherk_%s", THR_STR, dt_ch, STR ); printf( "( %2lu, 1:3 ) = [ %4lu %4lu %7.2f ];\n", ( unsigned long )(p - p_begin + 1)/p_inc + 1, ( unsigned long )m, diff --git a/test/3m4m/test_trmm.c b/test/3m4m/test_trmm.c index 6fca5fca3..a4ae5ef9b 100644 --- a/test/3m4m/test_trmm.c +++ b/test/3m4m/test_trmm.c @@ -46,7 +46,7 @@ int main( int argc, char** argv ) obj_t alpha; dim_t m, n; dim_t p; - dim_t p_begin, p_end, p_inc; + dim_t p_begin, p_max, p_inc; int m_input, n_input; ind_t ind; num_t dt; @@ -76,7 +76,7 @@ int main( int argc, char** argv ) ind = IND; p_begin = P_BEGIN; - p_end = P_END; + p_max = P_MAX; p_inc = P_INC; m_input = -1; @@ -133,19 +133,16 @@ int main( int argc, char** argv ) // Begin with initializing the last entry to zero so that // matlab allocates space for the entire array once up-front. - for ( p = p_begin; p + p_inc <= p_end; p += p_inc ) ; -#ifdef BLIS - printf( "data_%s_%ctrmm_%s_blis", THR_STR, dt_ch, STR ); -#else - printf( "data_%s_%ctrmm_%s", THR_STR, dt_ch, STR ); -#endif + for ( p = p_begin; p + p_inc <= p_max; p += p_inc ) ; + + printf( "data_%s_%ctrmm_%s", THR_STR, dt_ch, STR ); printf( "( %2lu, 1:3 ) = [ %4lu %4lu %7.2f ];\n", ( unsigned long )(p - p_begin + 1)/p_inc + 1, ( unsigned long )0, ( unsigned long )0, 0.0 ); - for ( p = p_begin; p <= p_end; p += p_inc ) + for ( p = p_begin; p <= p_max; p += p_inc ) { if ( m_input < 0 ) m = p / ( dim_t )abs(m_input); @@ -188,10 +185,8 @@ int main( int argc, char** argv ) { bli_copym( &c_save, &c ); - dtime = bli_clock(); - #ifdef PRINT bli_printm( "a", &a, "%4.1f", "" ); bli_printm( "c", &c, "%4.1f", "" ); @@ -206,86 +201,86 @@ int main( int argc, char** argv ) #else - if ( bli_is_float( dt ) ) - { - f77_int mm = bli_obj_length( &c ); - f77_int kk = bli_obj_width( &c ); - f77_int lda = bli_obj_col_stride( &a ); - f77_int ldc = bli_obj_col_stride( &c ); - float* alphap = bli_obj_buffer( &alpha ); - float* ap = bli_obj_buffer( &a ); - float* cp = bli_obj_buffer( &c ); + if ( bli_is_float( dt ) ) + { + f77_int mm = bli_obj_length( &c ); + f77_int kk = bli_obj_width( &c ); + f77_int lda = bli_obj_col_stride( &a ); + f77_int ldc = bli_obj_col_stride( &c ); + float* alphap = bli_obj_buffer( &alpha ); + float* ap = bli_obj_buffer( &a ); + float* cp = bli_obj_buffer( &c ); - strmm_( &f77_side, - &f77_uploa, - &f77_transa, - &f77_diaga, - &mm, - &kk, - alphap, - ap, &lda, - cp, &ldc ); - } - else if ( bli_is_double( dt ) ) - { - f77_int mm = bli_obj_length( &c ); - f77_int kk = bli_obj_width( &c ); - f77_int lda = bli_obj_col_stride( &a ); - f77_int ldc = bli_obj_col_stride( &c ); - double* alphap = bli_obj_buffer( &alpha ); - double* ap = bli_obj_buffer( &a ); - double* cp = bli_obj_buffer( &c ); + strmm_( &f77_side, + &f77_uploa, + &f77_transa, + &f77_diaga, + &mm, + &kk, + alphap, + ap, &lda, + cp, &ldc ); + } + else if ( bli_is_double( dt ) ) + { + f77_int mm = bli_obj_length( &c ); + f77_int kk = bli_obj_width( &c ); + f77_int lda = bli_obj_col_stride( &a ); + f77_int ldc = bli_obj_col_stride( &c ); + double* alphap = bli_obj_buffer( &alpha ); + double* ap = bli_obj_buffer( &a ); + double* cp = bli_obj_buffer( &c ); - dtrmm_( &f77_side, - &f77_uploa, - &f77_transa, - &f77_diaga, - &mm, - &kk, - alphap, - ap, &lda, - cp, &ldc ); - } - else if ( bli_is_scomplex( dt ) ) - { - f77_int mm = bli_obj_length( &c ); - f77_int kk = bli_obj_width( &c ); - f77_int lda = bli_obj_col_stride( &a ); - f77_int ldc = bli_obj_col_stride( &c ); - scomplex* alphap = bli_obj_buffer( &alpha ); - scomplex* ap = bli_obj_buffer( &a ); - scomplex* cp = bli_obj_buffer( &c ); + dtrmm_( &f77_side, + &f77_uploa, + &f77_transa, + &f77_diaga, + &mm, + &kk, + alphap, + ap, &lda, + cp, &ldc ); + } + else if ( bli_is_scomplex( dt ) ) + { + f77_int mm = bli_obj_length( &c ); + f77_int kk = bli_obj_width( &c ); + f77_int lda = bli_obj_col_stride( &a ); + f77_int ldc = bli_obj_col_stride( &c ); + scomplex* alphap = bli_obj_buffer( &alpha ); + scomplex* ap = bli_obj_buffer( &a ); + scomplex* cp = bli_obj_buffer( &c ); - ctrmm_( &f77_side, - &f77_uploa, - &f77_transa, - &f77_diaga, - &mm, - &kk, - alphap, - ap, &lda, - cp, &ldc ); - } - else if ( bli_is_dcomplex( dt ) ) - { - f77_int mm = bli_obj_length( &c ); - f77_int kk = bli_obj_width( &c ); - f77_int lda = bli_obj_col_stride( &a ); - f77_int ldc = bli_obj_col_stride( &c ); - dcomplex* alphap = bli_obj_buffer( &alpha ); - dcomplex* ap = bli_obj_buffer( &a ); - dcomplex* cp = bli_obj_buffer( &c ); + ctrmm_( &f77_side, + &f77_uploa, + &f77_transa, + &f77_diaga, + &mm, + &kk, + alphap, + ap, &lda, + cp, &ldc ); + } + else if ( bli_is_dcomplex( dt ) ) + { + f77_int mm = bli_obj_length( &c ); + f77_int kk = bli_obj_width( &c ); + f77_int lda = bli_obj_col_stride( &a ); + f77_int ldc = bli_obj_col_stride( &c ); + dcomplex* alphap = bli_obj_buffer( &alpha ); + dcomplex* ap = bli_obj_buffer( &a ); + dcomplex* cp = bli_obj_buffer( &c ); - ztrmm_( &f77_side, - &f77_uploa, - &f77_transa, - &f77_diaga, - &mm, - &kk, - alphap, - ap, &lda, - cp, &ldc ); - } + ztrmm_( &f77_side, + &f77_uploa, + &f77_transa, + &f77_diaga, + &mm, + &kk, + alphap, + ap, &lda, + cp, &ldc ); + } #endif #ifdef PRINT @@ -293,7 +288,6 @@ int main( int argc, char** argv ) exit(1); #endif - dtime_save = bli_clock_min_diff( dtime_save, dtime ); } @@ -304,11 +298,7 @@ int main( int argc, char** argv ) if ( bli_is_complex( dt ) ) gflops *= 4.0; -#ifdef BLIS - printf( "data_%s_%ctrmm_%s_blis", THR_STR, dt_ch, STR ); -#else - printf( "data_%s_%ctrmm_%s", THR_STR, dt_ch, STR ); -#endif + printf( "data_%s_%ctrmm_%s", THR_STR, dt_ch, STR ); printf( "( %2lu, 1:3 ) = [ %4lu %4lu %7.2f ];\n", ( unsigned long )(p - p_begin + 1)/p_inc + 1, ( unsigned long )m, diff --git a/test/3m4m/test_trsm.c b/test/3m4m/test_trsm.c index b3f2e33f3..88202dec5 100644 --- a/test/3m4m/test_trsm.c +++ b/test/3m4m/test_trsm.c @@ -46,7 +46,7 @@ int main( int argc, char** argv ) obj_t alpha; dim_t m, n; dim_t p; - dim_t p_begin, p_end, p_inc; + dim_t p_begin, p_max, p_inc; int m_input, n_input; ind_t ind; num_t dt; @@ -76,7 +76,7 @@ int main( int argc, char** argv ) ind = IND; p_begin = P_BEGIN; - p_end = P_END; + p_max = P_MAX; p_inc = P_INC; m_input = -1; @@ -133,19 +133,16 @@ int main( int argc, char** argv ) // Begin with initializing the last entry to zero so that // matlab allocates space for the entire array once up-front. - for ( p = p_begin; p + p_inc <= p_end; p += p_inc ) ; -#ifdef BLIS - printf( "data_%s_%ctrsm_%s_blis", THR_STR, dt_ch, STR ); -#else - printf( "data_%s_%ctrsm_%s", THR_STR, dt_ch, STR ); -#endif + for ( p = p_begin; p + p_inc <= p_max; p += p_inc ) ; + + printf( "data_%s_%ctrsm_%s", THR_STR, dt_ch, STR ); printf( "( %2lu, 1:3 ) = [ %4lu %4lu %7.2f ];\n", ( unsigned long )(p - p_begin + 1)/p_inc + 1, ( unsigned long )0, ( unsigned long )0, 0.0 ); - for ( p = p_begin; p <= p_end; p += p_inc ) + for ( p = p_begin; p <= p_max; p += p_inc ) { if ( m_input < 0 ) m = p / ( dim_t )abs(m_input); @@ -192,10 +189,8 @@ int main( int argc, char** argv ) { bli_copym( &c_save, &c ); - dtime = bli_clock(); - #ifdef PRINT bli_printm( "a", &a, "%4.1f", "" ); bli_printm( "c", &c, "%4.1f", "" ); @@ -210,86 +205,86 @@ int main( int argc, char** argv ) #else - if ( bli_is_float( dt ) ) - { - f77_int mm = bli_obj_length( &c ); - f77_int kk = bli_obj_width( &c ); - f77_int lda = bli_obj_col_stride( &a ); - f77_int ldc = bli_obj_col_stride( &c ); - float* alphap = bli_obj_buffer( &alpha ); - float* ap = bli_obj_buffer( &a ); - float* cp = bli_obj_buffer( &c ); + if ( bli_is_float( dt ) ) + { + f77_int mm = bli_obj_length( &c ); + f77_int kk = bli_obj_width( &c ); + f77_int lda = bli_obj_col_stride( &a ); + f77_int ldc = bli_obj_col_stride( &c ); + float* alphap = bli_obj_buffer( &alpha ); + float* ap = bli_obj_buffer( &a ); + float* cp = bli_obj_buffer( &c ); - strsm_( &f77_side, - &f77_uploa, - &f77_transa, - &f77_diaga, - &mm, - &kk, - alphap, - ap, &lda, - cp, &ldc ); - } - else if ( bli_is_double( dt ) ) - { - f77_int mm = bli_obj_length( &c ); - f77_int kk = bli_obj_width( &c ); - f77_int lda = bli_obj_col_stride( &a ); - f77_int ldc = bli_obj_col_stride( &c ); - double* alphap = bli_obj_buffer( &alpha ); - double* ap = bli_obj_buffer( &a ); - double* cp = bli_obj_buffer( &c ); + strsm_( &f77_side, + &f77_uploa, + &f77_transa, + &f77_diaga, + &mm, + &kk, + alphap, + ap, &lda, + cp, &ldc ); + } + else if ( bli_is_double( dt ) ) + { + f77_int mm = bli_obj_length( &c ); + f77_int kk = bli_obj_width( &c ); + f77_int lda = bli_obj_col_stride( &a ); + f77_int ldc = bli_obj_col_stride( &c ); + double* alphap = bli_obj_buffer( &alpha ); + double* ap = bli_obj_buffer( &a ); + double* cp = bli_obj_buffer( &c ); - dtrsm_( &f77_side, - &f77_uploa, - &f77_transa, - &f77_diaga, - &mm, - &kk, - alphap, - ap, &lda, - cp, &ldc ); - } - else if ( bli_is_scomplex( dt ) ) - { - f77_int mm = bli_obj_length( &c ); - f77_int kk = bli_obj_width( &c ); - f77_int lda = bli_obj_col_stride( &a ); - f77_int ldc = bli_obj_col_stride( &c ); - scomplex* alphap = bli_obj_buffer( &alpha ); - scomplex* ap = bli_obj_buffer( &a ); - scomplex* cp = bli_obj_buffer( &c ); + dtrsm_( &f77_side, + &f77_uploa, + &f77_transa, + &f77_diaga, + &mm, + &kk, + alphap, + ap, &lda, + cp, &ldc ); + } + else if ( bli_is_scomplex( dt ) ) + { + f77_int mm = bli_obj_length( &c ); + f77_int kk = bli_obj_width( &c ); + f77_int lda = bli_obj_col_stride( &a ); + f77_int ldc = bli_obj_col_stride( &c ); + scomplex* alphap = bli_obj_buffer( &alpha ); + scomplex* ap = bli_obj_buffer( &a ); + scomplex* cp = bli_obj_buffer( &c ); - ctrsm_( &f77_side, - &f77_uploa, - &f77_transa, - &f77_diaga, - &mm, - &kk, - alphap, - ap, &lda, - cp, &ldc ); - } - else if ( bli_is_dcomplex( dt ) ) - { - f77_int mm = bli_obj_length( &c ); - f77_int kk = bli_obj_width( &c ); - f77_int lda = bli_obj_col_stride( &a ); - f77_int ldc = bli_obj_col_stride( &c ); - dcomplex* alphap = bli_obj_buffer( &alpha ); - dcomplex* ap = bli_obj_buffer( &a ); - dcomplex* cp = bli_obj_buffer( &c ); + ctrsm_( &f77_side, + &f77_uploa, + &f77_transa, + &f77_diaga, + &mm, + &kk, + alphap, + ap, &lda, + cp, &ldc ); + } + else if ( bli_is_dcomplex( dt ) ) + { + f77_int mm = bli_obj_length( &c ); + f77_int kk = bli_obj_width( &c ); + f77_int lda = bli_obj_col_stride( &a ); + f77_int ldc = bli_obj_col_stride( &c ); + dcomplex* alphap = bli_obj_buffer( &alpha ); + dcomplex* ap = bli_obj_buffer( &a ); + dcomplex* cp = bli_obj_buffer( &c ); - ztrsm_( &f77_side, - &f77_uploa, - &f77_transa, - &f77_diaga, - &mm, - &kk, - alphap, - ap, &lda, - cp, &ldc ); - } + ztrsm_( &f77_side, + &f77_uploa, + &f77_transa, + &f77_diaga, + &mm, + &kk, + alphap, + ap, &lda, + cp, &ldc ); + } #endif #ifdef PRINT @@ -297,7 +292,6 @@ int main( int argc, char** argv ) exit(1); #endif - dtime_save = bli_clock_min_diff( dtime_save, dtime ); } @@ -308,11 +302,7 @@ int main( int argc, char** argv ) if ( bli_is_complex( dt ) ) gflops *= 4.0; -#ifdef BLIS - printf( "data_%s_%ctrsm_%s_blis", THR_STR, dt_ch, STR ); -#else - printf( "data_%s_%ctrsm_%s", THR_STR, dt_ch, STR ); -#endif + printf( "data_%s_%ctrsm_%s", THR_STR, dt_ch, STR ); printf( "( %2lu, 1:3 ) = [ %4lu %4lu %7.2f ];\n", ( unsigned long )(p - p_begin + 1)/p_inc + 1, ( unsigned long )m, From f0e70dfbf3fee4c4e382c2c4e87c25454cbc79a1 Mon Sep 17 00:00:00 2001 From: "Field G. Van Zee" Date: Thu, 7 Mar 2019 01:04:05 +0000 Subject: [PATCH 15/17] Very minor updates to test/3m4m for ul252. Details: - Very minor updates to the newly revamped test/3m4m drivers when used on a Xeon Platinum (SkylakeX). --- test/3m4m/Makefile | 6 +++--- test/3m4m/runme.sh | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/3m4m/Makefile b/test/3m4m/Makefile index 89dddad73..86dc25033 100644 --- a/test/3m4m/Makefile +++ b/test/3m4m/Makefile @@ -135,9 +135,9 @@ VENDORP_LIB := $(MKLP_LIB) # # Single core (single-threaded) -PS_BEGIN := 40 -PS_MAX := 2000 -PS_INC := 40 +PS_BEGIN := 48 +PS_MAX := 2400 +PS_INC := 48 # Single-socket (multithreaded) P1_BEGIN := 120 diff --git a/test/3m4m/runme.sh b/test/3m4m/runme.sh index f7f33a772..433f4d3bc 100755 --- a/test/3m4m/runme.sh +++ b/test/3m4m/runme.sh @@ -8,8 +8,8 @@ delay=0.1 #sys="blis" #sys="stampede2" #sys="lonestar5" -#sys="ul252" -sys="ul264" +sys="ul252" +#sys="ul264" # Bind threads to processors. #export OMP_PROC_BIND=true @@ -46,7 +46,8 @@ elif [ ${sys} = "ul252" ]; then export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/home/field/intel/mkl/lib/intel64" export GOMP_CPU_AFFINITY="0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51" - threads="jc2ic13jr1_6000 + threads="jc1ic1jr1_2400 + jc2ic13jr1_6000 jc4ic13jr1_8000" elif [ ${sys} = "ul264" ]; then @@ -64,7 +65,6 @@ test_dts="d s z c" # Operations to test. test_ops="gemm hemm herk trmm trsm" -test_ops="gemm" # Implementations to test. impls="all" @@ -185,7 +185,7 @@ for th in ${threads}; do echo "Running ./${exec_name} > ${out_file}" # Run executable. - #./${exec_name} > ${out_file} + ./${exec_name} > ${out_file} sleep ${delay} From ab89a40582ec7acf802e59b0763bed099a02edd8 Mon Sep 17 00:00:00 2001 From: "Field G. Van Zee" Date: Thu, 7 Mar 2019 16:26:12 -0600 Subject: [PATCH 16/17] More minor updates and edits to test/3m4m. Details: - Further updates to matlab scripts, mostly for compatibility with GNU Octave. - More tweaks to runme.sh. - Updates to runme.m that allow copy-paste into matlab interactive session to generate graphs. --- test/3m4m/matlab/plot_l3_perf.m | 98 ++++++++++++++++++------------- test/3m4m/matlab/plot_panel_4x5.m | 20 +++---- test/3m4m/matlab/runme.m | 22 +++++-- test/3m4m/runme.sh | 17 +++--- 4 files changed, 92 insertions(+), 65 deletions(-) diff --git a/test/3m4m/matlab/plot_l3_perf.m b/test/3m4m/matlab/plot_l3_perf.m index 63ec55660..8717fb5eb 100644 --- a/test/3m4m/matlab/plot_l3_perf.m +++ b/test/3m4m/matlab/plot_l3_perf.m @@ -30,8 +30,13 @@ max_perf_core = (flopspercycle * cfreq) * 1; % Adjust title for real domain hemm and herk. title_opname = opname; if opname(1) == 's' || opname(1) == 'd' - if strcmp( extractAfter( opname, 1 ), 'hemm' ) || ... - strcmp( extractAfter( opname, 1 ), 'herk' ) +% if strcmp( extractAfter( opname, 1 ), 'hemm' ) || ... +% strcmp( extractAfter( opname, 1 ), 'herk' ) +% title_opname(2:3) = 'sy'; +% end + opname_u = opname; opname_u(1) = '_'; + if strcmp( opname_u, '_hemm' ) || ... + strcmp( opname_u, '_herk' ) title_opname(2:3) = 'sy'; end end @@ -99,52 +104,61 @@ vend_ln = line( x_axis( :, 1 ), data_vend( :, flopscol ) / nth, ... xlim( ax1, [x_begin x_end] ); ylim( ax1, [y_begin y_end] ); -if x_end == 10000 || x_end == 8000 || x_end == 6000 +if 6000 <= x_end && x_end < 10000 x_tick2 = x_end - 2000; x_tick1 = x_tick2/2; xticks( ax1, [ x_tick1 x_tick2 ] ); +elseif 4000 <= x_end && x_end < 6000 + x_tick2 = x_end - 1000; + x_tick1 = x_tick2/2; + xticks( ax1, [ x_tick1 x_tick2 ] ); +elseif 2000 <= x_end && x_end < 3000 + x_tick2 = x_end - 400; + x_tick1 = x_tick2/2; + xticks( ax1, [ x_tick1 x_tick2 ] ); end -if rows == 4 && cols == 5 && ... - theid == 3 - if nth == 1 - leg = legend( ... - [ ... - blis_ln ... - open_ln ... - vend_ln ... - ], ... - blis_legend, ... - open_legend, ... - vend_legend, ... - 'Location', legend_loc ); - set( leg,'Box','off' ); - set( leg,'Color','none' ); - set( leg,'FontSize',fontsize-3 ); - set( leg,'Units','inches' ); - %set( leg,'Position',[3.15 10.2 0.7 0.3 ] ); % 1600 1200 - %set( leg,'Position',[4.20 12.7 0.7 0.3 ] ); % (0,0) - set( leg,'Position',[11.20 12.7 0.7 0.3 ] ); % (0,2) - else - leg = legend( ... - [ ... - blis_ln ... - open_ln ... - vend_ln ... - ], ... - blis_legend, ... - open_legend, ... - vend_legend, ... - 'Location', legend_loc ); - set( leg,'Box','off' ); - set( leg,'Color','none' ); - set( leg,'FontSize',fontsize-3 ); - set( leg,'Units','inches' ); - %set( leg,'Position',[3.15 10.2 0.7 0.3 ] ); % 1600 1200 - %set( leg,'Position',[17.60 14.30 0.7 0.3 ] ); % (0,4) - set( leg,'Position',[11.20 12.7 0.7 0.3 ] ); % (0,2) - end +if rows == 4 && cols == 5 + if nth == 1 && theid == 3 + leg = legend( ... + [ ... + blis_ln ... + open_ln ... + vend_ln ... + ], ... + blis_legend, ... + open_legend, ... + vend_legend, ... + 'Location', legend_loc ); + set( leg,'Box','off' ); + set( leg,'Color','none' ); + set( leg,'FontSize',fontsize-3 ); + set( leg,'Units','inches' ); + set( leg,'Position',[11.20 12.75 0.7 0.3 ] ); % (0,2br) + elseif nth > 1 && theid == 4 + leg = legend( ... + [ ... + blis_ln ... + open_ln ... + vend_ln ... + ], ... + blis_legend, ... + open_legend, ... + vend_legend, ... + 'Location', legend_loc ); + set( leg,'Box','off' ); + set( leg,'Color','none' ); + set( leg,'FontSize',fontsize-3 ); + set( leg,'Units','inches' ); + %set( leg,'Position',[7.70 12.75 0.7 0.3 ] ); % (0,1br) + %set( leg,'Position',[10.47 14.28 0.7 0.3 ] ); % (0,2tl) + set( leg,'Position',[11.20 12.75 0.7 0.3 ] ); % (0,2br) + %set( leg,'Position',[13.95 14.28 0.7 0.3 ] ); % (0,3tl) + %set( leg,'Position',[14.70 12.75 0.7 0.3 ] ); % (0,3br) + %set( leg,'Position',[17.45 14.28 0.7 0.3 ] ); % (0,4tl) + %set( leg,'Position',[18.22 12.75 0.7 0.3 ] ); % (0,4br) + end end set( ax1,'FontSize',fontsize ); diff --git a/test/3m4m/matlab/plot_panel_4x5.m b/test/3m4m/matlab/plot_panel_4x5.m index 740ca5666..40e212a68 100644 --- a/test/3m4m/matlab/plot_panel_4x5.m +++ b/test/3m4m/matlab/plot_panel_4x5.m @@ -32,20 +32,20 @@ ops( 5, : ) = 'trsm'; opnames = gen_opnames( ops, dts ); n_opnames = size( opnames, 1 ); -%fig = figure; -%fig = figure('Position', [100, 100, 1600, 1200]); fig = figure('Position', [100, 100, 2000, 1500]); orient( fig, 'portrait' ); -%set(gcf,'Position',[0 0 2000 900]); set(gcf,'PaperUnits', 'inches'); -%set(gcf,'PaperSize', [16 12.4]); -%set(gcf,'PaperPosition', [0 0 16 12.4]); -set(gcf,'PaperSize', [11 15.0]); -set(gcf,'PaperPosition', [0 0 11 15.0]); -%set(gcf,'PaperPositionMode','auto'); -set(gcf,'PaperPositionMode','manual'); +if 1 == 1 % matlab + set(gcf,'PaperSize', [11 15.0]); + set(gcf,'PaperPosition', [0 0 11 15.0]); + set(gcf,'PaperPositionMode','manual'); +else % octave 4.x + set(gcf,'PaperSize', [15 19.0]); + set(gcf,'PaperPositionMode','auto'); +end set(gcf,'PaperOrientation','landscape'); + % Iterate over the list of datatype-specific operation names. for opi = 1:n_opnames %for opi = 1:1 @@ -94,7 +94,7 @@ for opi = 1:n_opnames end % Construct the name of the file to which we will output the graph. -outfile = sprintf( 'l3_perf_%s_nt%d', arch_str, nth ); +outfile = sprintf( 'l3_perf_%s_nt%d.pdf', arch_str, nth ); % Output the graph to pdf format. %print(gcf, 'gemm_md','-fillpage','-dpdf'); diff --git a/test/3m4m/matlab/runme.m b/test/3m4m/matlab/runme.m index 2a34a2233..2da7d7442 100644 --- a/test/3m4m/matlab/runme.m +++ b/test/3m4m/matlab/runme.m @@ -1,9 +1,19 @@ % tx2 -plot_panel_4x5(2.2,8,1, 'st','../results/tx2/st', 'tx2', 'ARMPL'); close; clear all; -plot_panel_4x5(2.2,8,28,'1s','../results/tx2/jc4ic7','tx2_jc4ic7','ARMPL'); close; clear all; -plot_panel_4x5(2.2,8,56,'2s','../results/tx2/jc8ic7','tx2_jc8ic7','ARMPL'); close; clear all; +plot_panel_4x5(2.20,8,1, 'st','../results/tx2/20190205/st', 'tx2', 'ARMPL'); close; clear all; +plot_panel_4x5(2.20,8,28,'1s','../results/tx2/20190205/jc4ic7','tx2_jc4ic7','ARMPL'); close; clear all; +plot_panel_4x5(2.20,8,56,'2s','../results/tx2/20190205/jc8ic7','tx2_jc8ic7','ARMPL'); close; clear all; % skx -plot_panel_4x5(2.0,32,1, 'st','../results/skx/st/20190218', 'skx', 'MKL'); close; clear all; -plot_panel_4x5(2.0,32,26,'1s','../results/skx/jc2ic13/20190218','skx_jc2ic13','MKL'); close; clear all; -plot_panel_4x5(2.0,32,52,'2s','../results/skx/jc4ic13/20190218','skx_jc4ic13','MKL'); close; clear all; +plot_panel_4x5(2.00,32,1, 'st','../results/skx/20190306/st', 'skx', 'MKL'); close; clear all; +plot_panel_4x5(2.00,32,26,'1s','../results/skx/20190306/jc2ic13','skx_jc2ic13','MKL'); close; clear all; +plot_panel_4x5(2.00,32,52,'2s','../results/skx/20190306/jc4ic13','skx_jc4ic13','MKL'); close; clear all; + +% has +plot_panel_4x5(3.25,16,1, 'st','../results/has/20190206/st', 'has', 'MKL'); close; clear all; +plot_panel_4x5(3.00,16,12,'1s','../results/has/20190206/jc2ic3jr2','has_jc2ic3jr2','MKL'); close; clear all; +plot_panel_4x5(3.00,16,24,'2s','../results/has/20190206/jc4ic3jr2','has_jc4ic3jr2','MKL'); close; clear all; + +% epyc +plot_panel_4x5(3.00,8,1, 'st','../results/epyc/20190306/st', 'epyc', 'MKL'); close; clear all; +plot_panel_4x5(2.55,8,32,'1s','../results/epyc/20190306/jc1ic8jr4','epyc_jc1ic8jr4','MKL'); close; clear all; +plot_panel_4x5(2.55,8,64,'2s','../results/epyc/20190306/jc2ic8jr4','epyc_jc2ic8jr4','MKL'); close; clear all; diff --git a/test/3m4m/runme.sh b/test/3m4m/runme.sh index 433f4d3bc..aeed7d98b 100755 --- a/test/3m4m/runme.sh +++ b/test/3m4m/runme.sh @@ -5,10 +5,10 @@ exec_root="test" out_root="output" delay=0.1 -#sys="blis" +sys="blis" #sys="stampede2" #sys="lonestar5" -sys="ul252" +#sys="ul252" #sys="ul264" # Bind threads to processors. @@ -20,15 +20,16 @@ if [ ${sys} = "blis" ]; then export GOMP_CPU_AFFINITY="0 1 2 3" - threads="jc2ic2jr1_4000 - jc2ic2jr1_6000" + threads="jc1ic1jr1_2400 + jc2ic2jr1_4000" elif [ ${sys} = "stampede2" ]; then echo "Need to set GOMP_CPU_AFFINITY." exit 1 - threads="jc4ic6jr1_6000 + threads="jc1ic1jr1_2400 + jc4ic6jr1_6000 jc4ic12jr1_8000" elif [ ${sys} = "lonestar5" ]; then @@ -38,7 +39,8 @@ elif [ ${sys} = "lonestar5" ]; then # A hack to use libiomp5 with gcc. #export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/apps/intel/16.0.1.150/compilers_and_libraries_2016.1.150/linux/compiler/lib/intel64" - threads="jc2ic3jr2_6000 + threads="jc1ic1jr1_2400 + jc2ic3jr2_6000 jc4ic3jr2_8000" elif [ ${sys} = "ul252" ]; then @@ -55,7 +57,8 @@ elif [ ${sys} = "ul264" ]; then export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/home/field/intel/mkl/lib/intel64" export GOMP_CPU_AFFINITY="0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63" - threads="jc1ic8jr4_6000 + threads="jc1ic1jr1_2400 + jc1ic8jr4_6000 jc2ic8jr4_8000" fi From b938c16b0c9e839335ac2c14944b82890143d02f Mon Sep 17 00:00:00 2001 From: "Field G. Van Zee" Date: Thu, 7 Mar 2019 16:40:39 -0600 Subject: [PATCH 17/17] Renamed test/3m4m to test/3. Details: - Renamed '3m4m' directory to '3', which captures the directory nicely since it builds test drivers to test level-3 operations. - These test drivers ceased to be used to test the 3m and 4m (or even 1m) induced methods long ago, hence the name change. --- test/{3m4m => 3}/Makefile | 0 test/{3m4m => 3}/matlab/gen_opnames.m | 0 test/{3m4m => 3}/matlab/plot_l3_perf.m | 0 test/{3m4m => 3}/matlab/plot_panel_4x5.m | 0 test/{3m4m => 3}/matlab/runme.m | 0 test/{3m4m => 3}/runme.sh | 0 test/{3m4m => 3}/test_gemm.c | 0 test/{3m4m => 3}/test_hemm.c | 0 test/{3m4m => 3}/test_herk.c | 0 test/{3m4m => 3}/test_trmm.c | 0 test/{3m4m => 3}/test_trsm.c | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename test/{3m4m => 3}/Makefile (100%) rename test/{3m4m => 3}/matlab/gen_opnames.m (100%) rename test/{3m4m => 3}/matlab/plot_l3_perf.m (100%) rename test/{3m4m => 3}/matlab/plot_panel_4x5.m (100%) rename test/{3m4m => 3}/matlab/runme.m (100%) rename test/{3m4m => 3}/runme.sh (100%) rename test/{3m4m => 3}/test_gemm.c (100%) rename test/{3m4m => 3}/test_hemm.c (100%) rename test/{3m4m => 3}/test_herk.c (100%) rename test/{3m4m => 3}/test_trmm.c (100%) rename test/{3m4m => 3}/test_trsm.c (100%) diff --git a/test/3m4m/Makefile b/test/3/Makefile similarity index 100% rename from test/3m4m/Makefile rename to test/3/Makefile diff --git a/test/3m4m/matlab/gen_opnames.m b/test/3/matlab/gen_opnames.m similarity index 100% rename from test/3m4m/matlab/gen_opnames.m rename to test/3/matlab/gen_opnames.m diff --git a/test/3m4m/matlab/plot_l3_perf.m b/test/3/matlab/plot_l3_perf.m similarity index 100% rename from test/3m4m/matlab/plot_l3_perf.m rename to test/3/matlab/plot_l3_perf.m diff --git a/test/3m4m/matlab/plot_panel_4x5.m b/test/3/matlab/plot_panel_4x5.m similarity index 100% rename from test/3m4m/matlab/plot_panel_4x5.m rename to test/3/matlab/plot_panel_4x5.m diff --git a/test/3m4m/matlab/runme.m b/test/3/matlab/runme.m similarity index 100% rename from test/3m4m/matlab/runme.m rename to test/3/matlab/runme.m diff --git a/test/3m4m/runme.sh b/test/3/runme.sh similarity index 100% rename from test/3m4m/runme.sh rename to test/3/runme.sh diff --git a/test/3m4m/test_gemm.c b/test/3/test_gemm.c similarity index 100% rename from test/3m4m/test_gemm.c rename to test/3/test_gemm.c diff --git a/test/3m4m/test_hemm.c b/test/3/test_hemm.c similarity index 100% rename from test/3m4m/test_hemm.c rename to test/3/test_hemm.c diff --git a/test/3m4m/test_herk.c b/test/3/test_herk.c similarity index 100% rename from test/3m4m/test_herk.c rename to test/3/test_herk.c diff --git a/test/3m4m/test_trmm.c b/test/3/test_trmm.c similarity index 100% rename from test/3m4m/test_trmm.c rename to test/3/test_trmm.c diff --git a/test/3m4m/test_trsm.c b/test/3/test_trsm.c similarity index 100% rename from test/3m4m/test_trsm.c rename to test/3/test_trsm.c