Enable user-customization of packing

build/libblis-symbols.def

@@ -1307,7 +1307,6 @@ bli_pba_init_pools
 bli_pba_pool_size
 bli_pba_query
 bli_pba_release
-bli_pba_rntm_set_pba
 bli_memsys_finalize
 bli_memsys_init
 bli_mkherm

frame/1m/bli_l1m_ft_ker.h

@@ -50,21 +50,23 @@
 typedef void (*PASTECH3(ch,opname,_ker,tsuf)) \
      ( \
        struc_t         strucc, \
-       doff_t          diagoffc, \
        diag_t          diagc, \
        uplo_t          uploc, \
        conj_t          conjc, \
        pack_t          schema, \
        bool            invdiag, \
-       dim_t           m_panel, \
-       dim_t           n_panel, \
-       dim_t           m_panel_max, \
-       dim_t           n_panel_max, \
+       dim_t           panel_dim, \
+       dim_t           panel_len, \
+       dim_t           panel_dim_max, \
+       dim_t           panel_len_max, \
+       dim_t           panel_dim_off, \
+       dim_t           panel_len_off, \
        ctype* restrict kappa, \
-       ctype* restrict c, inc_t rs_c, inc_t cs_c, \
-       ctype* restrict p, inc_t rs_p, inc_t cs_p, \
+       ctype* restrict c, inc_t incc, inc_t ldc, \
+       ctype* restrict p,             inc_t ldp, \
                           inc_t is_p, \
-       cntx_t*         cntx  \
+       cntx_t*         cntx, \
+       void*           params \
      );
 
 INSERT_GENTDEF( packm )

frame/1m/bli_l1m_oft_var.h

@@ -48,6 +48,7 @@ typedef void (*PASTECH(opname,_var_oft)) \
   obj_t*  a, \
   obj_t*  p, \
   cntx_t* cntx, \
+  rntm_t* rntm, \
   cntl_t* cntl, \
   thrinfo_t* thread  \
 );

frame/1m/packm/bli_packm.h

@@ -33,15 +33,15 @@
 
 */
 
+#include "bli_packm_alloc.h"
 #include "bli_packm_cntl.h"
 #include "bli_packm_check.h"
 #include "bli_packm_init.h"
 #include "bli_packm_int.h"
+#include "bli_packm_scalar.h"
 
 #include "bli_packm_part.h"
 
-#include "bli_packm_var.h"
-
 #include "bli_packm_struc_cxk.h"
 #include "bli_packm_struc_cxk_1er.h"
 
@@ -50,6 +50,8 @@
 
 // Mixed datatype support.
 #ifdef BLIS_ENABLE_GEMM_MD
-#include "bli_packm_md.h"
+#include "bli_packm_struc_cxk_md.h"
 #endif
 
+#include "bli_packm_blk_var1.h"
+

frame/1m/packm/bli_packm_var.h → frame/1m/packm/bli_packm_alloc.c

@@ -5,7 +5,7 @@
    libraries.
 
    Copyright (C) 2014, The University of Texas at Austin
-   Copyright (C) 2018 - 2019, Advanced Micro Devices, Inc.
+   Copyright (C) 2016, Hewlett Packard Enterprise Development LP
 
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions are
@@ -33,78 +33,67 @@
 
 */
 
-//
-// Prototype object-based interfaces.
-//
-
-#undef  GENPROT
-#define GENPROT( opname ) \
-\
-BLIS_EXPORT_BLIS void PASTEMAC0(opname) \
-     ( \
-       obj_t*   c, \
-       obj_t*   p, \
-       cntx_t*  cntx, \
-       cntl_t*  cntl, \
-       thrinfo_t* t  \
-     );
-
-GENPROT( packm_unb_var1 )
-GENPROT( packm_blk_var1 )
-
-//
-// Prototype BLAS-like interfaces with void pointer operands.
-//
-
-#undef  GENTPROT
-#define GENTPROT( ctype, ch, varname ) \
-\
-void PASTEMAC(ch,varname) \
-     ( \
-       struc_t strucc, \
-       doff_t  diagoffc, \
-       diag_t  diagc, \
-       uplo_t  uploc, \
-       trans_t transc, \
-       dim_t   m, \
-       dim_t   n, \
-       dim_t   m_max, \
-       dim_t   n_max, \
-       void*   kappa, \
-       void*   c, inc_t rs_c, inc_t cs_c, \
-       void*   p, inc_t rs_p, inc_t cs_p, \
-       cntx_t* cntx  \
-     );
-
-INSERT_GENTPROT_BASIC0( packm_unb_var1 )
-
-#undef  GENTPROT
-#define GENTPROT( ctype, ch, varname ) \
-\
-void PASTEMAC(ch,varname) \
-     ( \
-       struc_t strucc, \
-       doff_t  diagoffc, \
-       diag_t  diagc, \
-       uplo_t  uploc, \
-       trans_t transc, \
-       pack_t  schema, \
-       bool    invdiag, \
-       bool    revifup, \
-       bool    reviflo, \
-       dim_t   m, \
-       dim_t   n, \
-       dim_t   m_max, \
-       dim_t   n_max, \
-       void*   kappa, \
-       void*   c, inc_t rs_c, inc_t cs_c, \
-       void*   p, inc_t rs_p, inc_t cs_p, \
-                  inc_t is_p, \
-                  dim_t pd_p, inc_t ps_p, \
-       void_fp packm_ker, \
-       cntx_t* cntx, \
-       thrinfo_t* thread  \
-     );
-
-INSERT_GENTPROT_BASIC0( packm_blk_var1 )
+#include "blis.h"
+
+void* bli_packm_alloc
+      (
+        siz_t      size_needed,
+        rntm_t*    rntm,
+        cntl_t*    cntl,
+        thrinfo_t* thread
+      )
+{
+	// Query the pack buffer type from the control tree node.
+	packbuf_t pack_buf_type = bli_cntl_packm_params_pack_buf_type( cntl );
+
+	// Query the address of the mem_t entry within the control tree node.
+	mem_t* cntl_mem_p = bli_cntl_pack_mem( cntl );
+
+	mem_t* local_mem_p;
+	mem_t  local_mem_s;
+
+	siz_t cntl_mem_size = 0;
+
+	if ( bli_mem_is_alloc( cntl_mem_p ) )
+        cntl_mem_size = bli_mem_size( cntl_mem_p );
+
+	if ( cntl_mem_size < size_needed )
+	{
+		if ( bli_thread_am_ochief( thread ) )
+		{
+			// The chief thread releases the existing block associated with
+			// the mem_t entry in the control tree, and then re-acquires a
+			// new block, saving the associated mem_t entry to local_mem_s.
+	        if ( bli_mem_is_alloc( cntl_mem_p ) )
+            {
+    			bli_pba_release
+    			(
+    			  rntm,
+    			  cntl_mem_p
+    			);
+            }
+			bli_pba_acquire_m
+			(
+			  rntm,
+			  size_needed,
+			  pack_buf_type,
+			  &local_mem_s
+			);
+		}
+
+		// Broadcast the address of the chief thread's local mem_t entry to
+		// all threads.
+		local_mem_p = bli_thread_broadcast( thread, &local_mem_s );
+
+		// Save the chief thread's local mem_t entry to the mem_t field in
+		// this thread's control tree node.
+		*cntl_mem_p = *local_mem_p;
+
+        // Barrier so that the master thread doesn't return from the function
+        // before we are done reading.
+	    bli_thread_barrier( thread );
+	}
+
+    return bli_mem_buffer( cntl_mem_p );
+}
 

frame/3/bli_l3_packm.h → frame/1m/packm/bli_packm_alloc.h

@@ -5,7 +5,6 @@
    libraries.
 
    Copyright (C) 2014, The University of Texas at Austin
-   Copyright (C) 2018 - 2019, Advanced Micro Devices, Inc.
 
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions are
@@ -33,13 +32,11 @@
 
 */
 
-void bli_l3_packm
-     (
-       obj_t*  x,
-       obj_t*  x_pack,
-       cntx_t* cntx,
-       rntm_t* rntm,
-       cntl_t* cntl,
-       thrinfo_t* thread
-     );
+BLIS_EXPORT_BLIS  void* bli_packm_alloc
+      (
+        siz_t      size_needed,
+        rntm_t*    rntm,
+        cntl_t*    cntl,
+        thrinfo_t* thread
+      );