Merge branch 'no-designated-initializers' into new_control_trees

# Conflicts: # frame/include/bli_type_defs.h
flame · Mar 26, 2024 · d02de76 · d02de76
2 parents 01bfc69 + 9bdfd94
commit d02de76
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 51 deletions.
diff --git a/frame/base/bli_mem.h b/frame/base/bli_mem.h
@@ -138,10 +138,10 @@ BLIS_INLINE void bli_mem_set_size( siz_t size, mem_t* mem )
 
 #define BLIS_MEM_INITIALIZER \
         { \
-          BLIS_PBLK_INITIALIZER, \
-          BLIS_BUFFER_FOR_GEN_USE, \
-          NULL, \
-          0, \
+          /* .pblk     = */ BLIS_PBLK_INITIALIZER, \
+          /* .buf_type = */ BLIS_BUFFER_FOR_GEN_USE, \
+          /* .pool     = */ NULL, \
+          /* .size     = */ 0, \
         }
 
 

diff --git a/frame/base/bli_pool.h b/frame/base/bli_pool.h
@@ -102,8 +102,8 @@ BLIS_INLINE void bli_pblk_set_block_size( siz_t block_size, pblk_t* pblk )
 
 #define BLIS_PBLK_INITIALIZER \
         { \
-          NULL, \
-          0, \
+          /* .buf        = */ NULL, \
+          /* .block_size = */ 0, \
         }  \
 
 BLIS_INLINE void bli_pblk_clear( pblk_t* pblk )

diff --git a/frame/base/bli_rntm.h b/frame/base/bli_rntm.h
@@ -269,15 +269,15 @@ BLIS_INLINE void bli_rntm_clear_l3_sup( rntm_t* rntm )
 
 #define BLIS_RNTM_INITIALIZER \
         { \
-          BLIS_SINGLE, \
+          /* .thread_impl */ = BLIS_SINGLE, \
 \
-          FALSE, \
+          /* .auto_factor */ = FALSE, \
 \
-          1, \
-          { 1, 1, 1, 1, 1, 1 }, \
-          FALSE, \
-          FALSE, \
-          TRUE, \
+          /* .num_threads */ = 1, \
+          /* .thrloop     */ = { 1, 1, 1, 1, 1, 1 }, \
+          /* .pack_a      */ = FALSE, \
+          /* .pack_b      */ = FALSE, \
+          /* .l3_sup      */ = TRUE, \
         }  \
 
 #if 0

diff --git a/frame/include/bli_type_defs.h b/frame/include/bli_type_defs.h
@@ -1252,58 +1252,58 @@ typedef struct obj_s
 
 #define BLIS_OBJECT_INITIALIZER \
 { \
-	NULL, \
+	/* .root        */ = NULL, \
 \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	0, \
+	/* .off         */ = { 0, 0 }, \
+	/* .dim         */ = { 0, 0 }, \
+	/* .diag_off    */ = 0, \
 \
-	0x0 | BLIS_BITVAL_DENSE      | \
-	      BLIS_BITVAL_GENERAL, \
-	0x0, \
-	sizeof( float ), /* this is changed later. */ \
+	/* .info        */ = 0x0 | BLIS_BITVAL_DENSE      | \
+	/*              */         BLIS_BITVAL_GENERAL, \
+	/* .info2       */ = 0x0, \
+	/* .elem_size   */ = sizeof( float ), /* this is changed later. */ \
 \
-	NULL, \
-	0, \
-	0, \
-	1,  \
+	/* .buffer      */ = NULL, \
+	/* .rs          */ = 0, \
+	/* .cs          */ = 0, \
+	/* .is          */ = 1,  \
 \
-	{ 0.0, 0.0 }, \
+	/* .scalar      */ = { 0.0, 0.0 }, \
 \
-	0, \
-	0, \
-	0, \
-	0, \
-	0, \
-	0, \
+	/* .m_padded    */ = 0, \
+	/* .n_padded    */ = 0, \
+	/* .ps          */ = 0, \
+	/* .pd          */ = 0, \
+	/* .m_panel     */ = 0, \
+	/* .n_panel     */ = 0, \
 }
 
 #define BLIS_OBJECT_INITIALIZER_1X1 \
 { \
-	NULL, \
+	/* .root        */ = NULL, \
 \
-	{ 0, 0 }, \
-	{ 1, 1 }, \
-	0, \
+	/* .off         */ = { 0, 0 }, \
+	/* .dim         */ = { 1, 1 }, \
+	/* .diag_off    */ = 0, \
 \
-	0x0 | BLIS_BITVAL_DENSE      | \
-	      BLIS_BITVAL_GENERAL, \
-	0x0, \
-	sizeof( float ), /* this is changed later. */ \
+	/* .info        */ = 0x0 | BLIS_BITVAL_DENSE      | \
+	/*              */         BLIS_BITVAL_GENERAL, \
+	/* .info2       */ = 0x0, \
+	/* .elem_size   */ = sizeof( float ), /* this is changed later. */ \
 \
-	NULL, \
-	0, \
-	0, \
-	1,  \
+	/* .buffer      */ = NULL, \
+	/* .rs          */ = 0, \
+	/* .cs          */ = 0, \
+	/* .is          */ = 1,  \
 \
-	{ 0.0, 0.0 }, \
+	/* .scalar      */ = { 0.0, 0.0 }, \
 \
-	0, \
-	0, \
-	0, \
-	0, \
-	0, \
-	0, \
+	/* .m_padded    */ = 0, \
+	/* .n_padded    */ = 0, \
+	/* .ps          */ = 0, \
+	/* .pd          */ = 0, \
+	/* .m_panel     */ = 0, \
+	/* .n_panel     */ = 0, \
 }
 
 // Define these macros here since they must be updated if contents of