Skip to content

Commit

Permalink
Rename Config Name to the Same as Kernel Name
Browse files Browse the repository at this point in the history
 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.
  • Loading branch information
xrq-phys committed Aug 12, 2021
1 parent dbbd39d commit 1ec6b73
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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 );

// -------------------------------------------------------------------------

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion config/applem1/make_defs.mk → config/aaplmx/make_defs.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)

#
Expand Down
2 changes: 1 addition & 1 deletion config_registry
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions frame/base/bli_arch.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions frame/base/bli_gks.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions frame/include/bli_arch_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion frame/include/bli_type_defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 1ec6b73

Please sign in to comment.