Give options clearer names

Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
This commit is contained in:
Dave Rodgman 2023-05-24 23:24:16 +01:00
parent 6adaca6062
commit 5c5a6dece6

View File

@ -674,7 +674,7 @@
// Only supported by gcc, when optimisation is enabled; only option A works // Only supported by gcc, when optimisation is enabled; only option A works
#if defined(__OPTIMIZE__) && !defined(__ARMCC_VERSION) #if defined(__OPTIMIZE__) && !defined(__ARMCC_VERSION)
#define ARM_OPTION_A #define ARM_THUMB_1
#endif #endif
#elif defined(__thumb2__) // Thumb 2 ISA #elif defined(__thumb2__) // Thumb 2 ISA
@ -682,30 +682,30 @@
#if !defined(__ARMCC_VERSION) && !defined(__OPTIMIZE__) #if !defined(__ARMCC_VERSION) && !defined(__OPTIMIZE__)
// gcc -O0: only option B builds // gcc -O0: only option B builds
#if (__ARM_ARCH >= 6) && defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1) #if (__ARM_ARCH >= 6) && defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1)
#define ARM_OPTION_B #define ARM_V6_DSP
#endif #endif
#else #else
// gcc with optimisation, or armclang: any option builds // gcc with optimisation, or armclang: any option builds
#define ARM_OPTION_B_OR_C #define ARM_V6_DSP_OR_THUMB_2
#endif #endif
#elif defined(__arm__) // Arm ISA #elif defined(__arm__) // Arm ISA
// any option builds. A does not seem to work; B is about 2x faster than C (under emulation). // any option builds. A does not seem to work; B is about 2x faster than C (under emulation).
#define ARM_OPTION_B_OR_C #define ARM_V6_DSP_OR_THUMB_2
#endif /* Arm ISA selection */ #endif /* Arm ISA selection */
#if defined(ARM_OPTION_B_OR_C) #if defined(ARM_V6_DSP_OR_THUMB_2)
// Prefer B, if we have the right features for it // Prefer B, if we have the right features for it
#if (__ARM_ARCH >= 6) && defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1) #if (__ARM_ARCH >= 6) && defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1)
#define ARM_OPTION_B #define ARM_V6_DSP
#else #else
#define ARM_OPTION_C #define ARM_THUMB_2
#endif #endif
#endif /* defined(ARM_OPTION_B_OR_C) */ #endif /* defined(ARM_V6_DSP_OR_THUMB_2) */
#if defined(ARM_OPTION_A) #if defined(ARM_THUMB_1)
#define MULADDC_X1_INIT \ #define MULADDC_X1_INIT \
asm( \ asm( \
@ -760,7 +760,7 @@
"r6", "r7", "r8", "r9", "cc" \ "r6", "r7", "r8", "r9", "cc" \
); );
#elif defined(ARM_OPTION_B) #elif defined(ARM_V6_DSP)
#define MULADDC_X1_INIT \ #define MULADDC_X1_INIT \
{ \ { \
@ -825,7 +825,7 @@
); \ ); \
} }
#elif defined(ARM_OPTION_C) #elif defined(ARM_THUMB_2)
#define MULADDC_X1_INIT \ #define MULADDC_X1_INIT \
asm( \ asm( \