From 1ec6b735879a5e7e4c32131e5bb470bc3b586cd3 Mon Sep 17 00:00:00 2001 From: RuQing Xu Date: Fri, 13 Aug 2021 03:33:44 +0900 Subject: [PATCH] Rename Config Name to the Same as Kernel Name applem1 -> aaplmx (the same as kernel name) - It is said that both A14 and M1 have this coprocessor. As I'm planning to merge the firestorm branch to upstream, specifying one delicated config for M1 might be a bit confusing. Further, as this support is unstable by-definition, I cannot signal users that this config is recommended over firestorm. - Apart from this, I suppose I'm free to name this config (& kernel): AMX (by D. Johnson) -> AAPL(Apple's stock id)MX. --- .../bli_cntx_init_aaplmx.c} | 4 ++-- .../bli_family_applem1.h => aaplmx/bli_family_aaplmx.h} | 0 config/{applem1 => aaplmx}/make_defs.mk | 2 +- config_registry | 2 +- frame/base/bli_arch.c | 4 ++-- frame/base/bli_gks.c | 8 ++++---- frame/include/bli_arch_config.h | 8 ++++---- frame/include/bli_type_defs.h | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) rename config/{applem1/bli_cntx_init_applem1.c => aaplmx/bli_cntx_init_aaplmx.c} (98%) rename config/{applem1/bli_family_applem1.h => aaplmx/bli_family_aaplmx.h} (100%) rename config/{applem1 => aaplmx}/make_defs.mk (99%) diff --git a/config/applem1/bli_cntx_init_applem1.c b/config/aaplmx/bli_cntx_init_aaplmx.c similarity index 98% rename from config/applem1/bli_cntx_init_applem1.c rename to config/aaplmx/bli_cntx_init_aaplmx.c index 9fbbeb77..9b277055 100644 --- a/config/applem1/bli_cntx_init_applem1.c +++ b/config/aaplmx/bli_cntx_init_aaplmx.c @@ -34,13 +34,13 @@ #include "blis.h" -void bli_cntx_init_applem1( cntx_t* cntx ) +void bli_cntx_init_aaplmx( cntx_t* cntx ) { blksz_t blkszs[ BLIS_NUM_BLKSZS ]; blksz_t thresh[ BLIS_NUM_THRESH ]; // Set default kernel blocksizes and functions. - bli_cntx_init_applem1_ref( cntx ); + bli_cntx_init_aaplmx_ref( cntx ); // ------------------------------------------------------------------------- diff --git a/config/applem1/bli_family_applem1.h b/config/aaplmx/bli_family_aaplmx.h similarity index 100% rename from config/applem1/bli_family_applem1.h rename to config/aaplmx/bli_family_aaplmx.h diff --git a/config/applem1/make_defs.mk b/config/aaplmx/make_defs.mk similarity index 99% rename from config/applem1/make_defs.mk rename to config/aaplmx/make_defs.mk index f605efce..f5964bb1 100644 --- a/config/applem1/make_defs.mk +++ b/config/aaplmx/make_defs.mk @@ -35,7 +35,7 @@ # Declare the name of the current configuration and add it to the # running list of configurations included by common.mk. -THIS_CONFIG := applem1 +THIS_CONFIG := aaplmx #CONFIGS_INCL += $(THIS_CONFIG) # diff --git a/config_registry b/config_registry index c155e4ec..55ad6d7c 100644 --- a/config_registry +++ b/config_registry @@ -36,7 +36,7 @@ bulldozer: bulldozer # ARM architectures. armsve: armsve/armsve a64fx: a64fx/armsve -applem1: applem1/armv8a/aaplmx +aaplmx: aaplmx/armv8a/aaplmx thunderx2: thunderx2/armv8a cortexa57: cortexa57/armv8a cortexa53: cortexa53/armv8a diff --git a/frame/base/bli_arch.c b/frame/base/bli_arch.c index 05565bdf..39256806 100644 --- a/frame/base/bli_arch.c +++ b/frame/base/bli_arch.c @@ -179,8 +179,8 @@ void bli_arch_set_id( void ) #ifdef BLIS_FAMILY_A64FX id = BLIS_ARCH_A64FX; #endif - #ifdef BLIS_FAMILY_APPLEM1 - id = BLIS_ARCH_APPLEM1; + #ifdef BLIS_FAMILY_AAPLMX + id = BLIS_ARCH_AAPLMX; #endif #ifdef BLIS_FAMILY_THUNDERX2 id = BLIS_ARCH_THUNDERX2; diff --git a/frame/base/bli_gks.c b/frame/base/bli_gks.c index 22690551..be9bdf97 100644 --- a/frame/base/bli_gks.c +++ b/frame/base/bli_gks.c @@ -154,10 +154,10 @@ void bli_gks_init( void ) bli_cntx_init_a64fx_ref, bli_cntx_init_a64fx_ind ); #endif -#ifdef BLIS_CONFIG_APPLEM1 - bli_gks_register_cntx( BLIS_ARCH_APPLEM1, bli_cntx_init_applem1, - bli_cntx_init_applem1_ref, - bli_cntx_init_applem1_ind ); +#ifdef BLIS_CONFIG_AAPLMX + bli_gks_register_cntx( BLIS_ARCH_AAPLMX, bli_cntx_init_aaplmx, + bli_cntx_init_aaplmx_ref, + bli_cntx_init_aaplmx_ind ); #endif #ifdef BLIS_CONFIG_CORTEXA15 bli_gks_register_cntx( BLIS_ARCH_CORTEXA15, bli_cntx_init_cortexa15, diff --git a/frame/include/bli_arch_config.h b/frame/include/bli_arch_config.h index 4006462f..c454ca85 100644 --- a/frame/include/bli_arch_config.h +++ b/frame/include/bli_arch_config.h @@ -89,8 +89,8 @@ CNTX_INIT_PROTS( armsve ) #ifdef BLIS_CONFIG_A64FX CNTX_INIT_PROTS( a64fx ) #endif -#ifdef BLIS_CONFIG_APPLEM1 -CNTX_INIT_PROTS( applem1 ) +#ifdef BLIS_CONFIG_AAPLMX +CNTX_INIT_PROTS( aaplmx ) #endif #ifdef BLIS_CONFIG_THUNDERX2 CNTX_INIT_PROTS( thunderx2 ) @@ -198,8 +198,8 @@ CNTX_INIT_PROTS( generic ) #ifdef BLIS_FAMILY_A64FX #include "bli_family_a64fx.h" #endif -#ifdef BLIS_FAMILY_APPLEM1 -#include "bli_family_applem1.h" +#ifdef BLIS_FAMILY_AAPLMX +#include "bli_family_aaplmx.h" #endif #ifdef BLIS_FAMILY_THUNDERX2 #include "bli_family_thunderx2.h" diff --git a/frame/include/bli_type_defs.h b/frame/include/bli_type_defs.h index 15cda699..bf03a566 100644 --- a/frame/include/bli_type_defs.h +++ b/frame/include/bli_type_defs.h @@ -1012,7 +1012,7 @@ typedef enum // ARM BLIS_ARCH_ARMSVE, BLIS_ARCH_A64FX, - BLIS_ARCH_APPLEM1, + BLIS_ARCH_AAPLMX, BLIS_ARCH_THUNDERX2, BLIS_ARCH_CORTEXA57, BLIS_ARCH_CORTEXA53,