From d208f4f1c2da9e407f86022959c32e8ab9a4aa6e Mon Sep 17 00:00:00 2001 From: Pablo Marquez Tello Date: Tue, 19 Jul 2022 12:19:46 +0100 Subject: Enable march=armv8.6-a in non multi-isa builds * scons arch=armv8.6-a translates to -march=armv8.6-a * scons arch=armv8.6-a-sve translates to -march=armv8.6-a+sve * scons arch=armv8.6-a-sve2 translates to -march=armv8.6-a+sve2 * Resolves COMPMID-5408 Change-Id: I0901e1de864d00109759509af7cc2b5c9ae1cd75 Signed-off-by: Pablo Marquez Tello Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/7943 Reviewed-by: Gunes Bayir Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins Benchmark: Arm Jenkins --- SConstruct | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'SConstruct') diff --git a/SConstruct b/SConstruct index 7bdbb113ef..7f0ebc1a0b 100644 --- a/SConstruct +++ b/SConstruct @@ -306,6 +306,17 @@ else: # NONE "multi_isa" builds env.Append(CXXFLAGS = ['-mfloat-abi=softfp']) else: env.Append(CXXFLAGS = ['-mfloat-abi=hard']) + elif 'v8.6-a' in env['arch']: + if 'armv8.6-a-sve2' == env['arch']: + env.Append(CXXFLAGS = ['-march=armv8.6-a+sve2']) + elif 'armv8.6-a-sve' == env['arch']: + env.Append(CXXFLAGS = ['-march=armv8.6-a+sve']) + elif 'armv8.6-a' == env['arch']: + env.Append(CXXFLAGS = ['-march=armv8.6-a']) + + env.Append(CPPDEFINES = ['ARM_COMPUTE_ENABLE_I8MM', 'ARM_COMPUTE_ENABLE_BF16','ARM_COMPUTE_ENABLE_FP16']) + if "disable_mmla_fp" not in env['custom_options']: + env.Append(CPPDEFINES = ['ARM_COMPUTE_ENABLE_SVEF32MM']) elif 'v8' in env['arch']: # Preserve the V8 archs for non-multi-ISA variants if 'sve2' in env['arch']: @@ -319,10 +330,6 @@ else: # NONE "multi_isa" builds else: env.Append(CXXFLAGS = ['-march=armv8-a']) - if 'v8.6-a' in env['arch']: - env.Append(CPPDEFINES = ['ARM_COMPUTE_ENABLE_I8MM', 'ARM_COMPUTE_ENABLE_BF16']) - if "disable_mmla_fp" not in env['custom_options']: - env.Append(CPPDEFINES = ['ARM_COMPUTE_ENABLE_SVEF32MM']) if 'v8.' in env['arch']: env.Append(CPPDEFINES = ['ARM_COMPUTE_ENABLE_FP16']) -- cgit v1.2.1