Merge pull request #1 from sifive/pr/ahutchinson/whitespace_fixes

Added whitespace and other formatting fixes
flame · Apr 4, 2023 · 5b51f1f · 5b51f1f
2 parents d367fcc + cfe0b35
commit 5b51f1f
Show file tree

Hide file tree

Showing 7 changed files with 221 additions and 220 deletions.
diff --git a/config/sifive_x280/bli_cntx_init_sifive_x280.c b/config/sifive_x280/bli_cntx_init_sifive_x280.c
diff --git a/config/sifive_x280/make_defs.mk b/config/sifive_x280/make_defs.mk
@@ -1,6 +1,6 @@
 #
 #
-#  BLIS    
+#  BLIS
 #  An object-based framework for developing high-performance BLAS-like
 #  libraries.
 #
@@ -49,10 +49,11 @@ THIS_CONFIG    := sifive_x280
 CMISCFLAGS_SIFIVE := -mcmodel=medany -march=rv64gcv_zba_zbb_zvl512b -mabi=lp64d
 CPPROCFLAGS    :=
 CMISCFLAGS     := $(CMISCFLAGS_SIFIVE) -fdata-sections -ffunction-sections \
-  -fdiagnostics-color=always -fno-rtti -fno-exceptions -std=gnu++17 
+                  -fdiagnostics-color=always -fno-rtti -fno-exceptions \
+                  -std=gnu++17
 CPICFLAGS      := -fPIC
-CWARNFLAGS     := -Wall -Wextra -Wno-unused-function \
-  -Wno-unused-parameter -Wno-sign-compare -Wno-unused-variable
+CWARNFLAGS     := -Wall -Wextra -Wno-unused-function -Wno-unused-parameter \
+                  -Wno-sign-compare -Wno-unused-variable
 
 ifneq ($(DEBUG_TYPE),off)
 CDBGFLAGS      := -g
@@ -66,7 +67,7 @@ endif
 
 # Flags specific to optimized kernels.
 CKOPTFLAGS     := $(COPTFLAGS)
-CKVECFLAGS     := 
+CKVECFLAGS     :=
 
 # Flags specific to reference kernels.
 CROPTFLAGS     := $(CKOPTFLAGS)

diff --git a/config_registry b/config_registry
@@ -14,10 +14,7 @@ amd64_legacy:   excavator steamroller piledriver bulldozer generic
 amd64:          zen3 zen2 zen generic
 arm64:          armsve firestorm thunderx2 cortexa57 cortexa53 generic
 arm32:          cortexa15 cortexa9 generic
-power:		power10 power9 generic
-
-# SiFive architectures
-sifive_x280:        sifive_x280
+power:          power10 power9 generic
 
 # Intel architectures.
 skx:         skx/skx/haswell/zen
@@ -50,5 +47,8 @@ power10:     power10
 power9:      power9
 bgq:         bgq
 
+# SiFive architectures.
+sifive_x280: sifive_x280
+
 # Generic architectures.
 generic:     generic
diff --git a/frame/base/bli_arch.c b/frame/base/bli_arch.c
@@ -180,11 +180,6 @@ arch_t bli_arch_query_id_impl( void )
 		id = bli_cpuid_query_id();
 		#endif
 
-                // SiFive microarchitectures.
-                #ifdef BLIS_FAMILY_SIFIVE_X280
-                id = BLIS_ARCH_SIFIVE_X280;
-                #endif
-
 		// Intel microarchitectures.
 		#ifdef BLIS_FAMILY_SKX
 		id = BLIS_ARCH_SKX;
@@ -268,6 +263,11 @@ arch_t bli_arch_query_id_impl( void )
 		id = BLIS_ARCH_BGQ;
 		#endif
 
+		// SiFive microarchitectures.
+		#ifdef BLIS_FAMILY_SIFIVE_X280
+		id = BLIS_ARCH_SIFIVE_X280;
+		#endif
+
 		// Generic microarchitecture.
 		#ifdef BLIS_FAMILY_GENERIC
 		id = BLIS_ARCH_GENERIC;
@@ -294,8 +294,6 @@ arch_t bli_arch_query_id_impl( void )
 // enum value given to the corresponding BLIS_ARCH_ value.
 static const char* config_name[ BLIS_NUM_ARCHS ] =
 {
-    "sifive_x280",
-
     "skx",
     "knl",
     "knc",
@@ -325,6 +323,8 @@ static const char* config_name[ BLIS_NUM_ARCHS ] =
     "power7",
     "bgq",
 
+    "sifive_x280",
+
     "generic"
 };
 

diff --git a/frame/base/bli_gks.c b/frame/base/bli_gks.c
@@ -71,14 +71,6 @@ void bli_gks_init( void )
 		// Register a context for each architecture that was #define'd in
 		// bli_config.h.
 
-		// -- SiFive architectures ----------------------------------------------
-
-#ifdef BLIS_CONFIG_SIFIVE_X280
-		bli_gks_register_cntx( BLIS_ARCH_SIFIVE_X280, bli_cntx_init_sifive_x280,
-		                                              bli_cntx_init_sifive_x280_ref,
-		                                              bli_cntx_init_sifive_x280_ind );
-#endif
-
 		// -- Intel architectures ----------------------------------------------
 
 #ifdef BLIS_CONFIG_SKX
@@ -223,6 +215,14 @@ void bli_gks_init( void )
 		                                              bli_cntx_init_bgq_ind );
 #endif
 
+		// -- SiFive architectures ----------------------------------------------
+
+#ifdef BLIS_CONFIG_SIFIVE_X280
+		bli_gks_register_cntx( BLIS_ARCH_SIFIVE_X280, bli_cntx_init_sifive_x280,
+		                                              bli_cntx_init_sifive_x280_ref,
+		                                              bli_cntx_init_sifive_x280_ind );
+#endif
+
 		// -- Generic architectures --------------------------------------------
 
 #ifdef BLIS_CONFIG_GENERIC

diff --git a/frame/include/bli_arch_config.h b/frame/include/bli_arch_config.h
@@ -41,12 +41,6 @@
 // -- Context initialization prototypes ----------------------------------------
 //
 
-// -- SiFive architectures --
-
-#ifdef BLIS_CONFIG_SIFIVE_X280
-CNTX_INIT_PROTS( sifive_x280 )
-#endif
-
 // -- Intel64 architectures --
 
 #ifdef BLIS_CONFIG_SKX
@@ -137,6 +131,12 @@ CNTX_INIT_PROTS( power7 )
 CNTX_INIT_PROTS( bgq )
 #endif
 
+// -- SiFive architectures --
+
+#ifdef BLIS_CONFIG_SIFIVE_X280
+CNTX_INIT_PROTS( sifive_x280 )
+#endif
+
 // -- Generic --
 
 #ifdef BLIS_CONFIG_GENERIC
@@ -148,12 +148,6 @@ CNTX_INIT_PROTS( generic )
 // -- Architecture family-specific headers -------------------------------------
 //
 
-// -- SiFive families --
-
-#ifdef BLIS_FAMILY_SIFIVE_X280
-#include "bli_family_sifive_x280.h"
-#endif
-
 // -- x86_64 families --
 
 #ifdef BLIS_FAMILY_INTEL64
@@ -272,6 +266,12 @@ CNTX_INIT_PROTS( generic )
 #include "bli_family_bgq.h"
 #endif
 
+// -- SiFive families --
+
+#ifdef BLIS_FAMILY_SIFIVE_X280
+#include "bli_family_sifive_x280.h"
+#endif
+
 // -- Generic --
 
 #ifdef BLIS_FAMILY_GENERIC
@@ -283,11 +283,6 @@ CNTX_INIT_PROTS( generic )
 // -- kernel set prototypes ----------------------------------------------------
 //
 
-// -- SiFive RISC-V architectures --
-#ifdef BLIS_KERNELS_SIFIVE_X280
-#include "bli_kernels_sifive_x280.h"
-#endif
-
 // -- Intel64 architectures --
 #ifdef BLIS_KERNELS_SKX
 #include "bli_kernels_skx.h"
@@ -359,6 +354,11 @@ CNTX_INIT_PROTS( generic )
 #include "bli_kernels_bgq.h"
 #endif
 
+// -- SiFive RISC-V architectures --
+#ifdef BLIS_KERNELS_SIFIVE_X280
+#include "bli_kernels_sifive_x280.h"
+#endif
+
 
 
 #endif

diff --git a/frame/include/bli_type_defs.h b/frame/include/bli_type_defs.h
@@ -928,9 +928,6 @@ typedef enum
 	// NOTE: The C language standard guarantees that the first enum value
 	// starts at 0.
 
-	// SiFive
-	BLIS_ARCH_SIFIVE_X280,
-
 	// Intel
 	BLIS_ARCH_SKX,
 	BLIS_ARCH_KNL,
@@ -968,6 +965,9 @@ typedef enum
 	BLIS_ARCH_POWER7,
 	BLIS_ARCH_BGQ,
 
+	// SiFive
+	BLIS_ARCH_SIFIVE_X280,
+
 	// Generic architecture/configuration
 	BLIS_ARCH_GENERIC,