diff options
author | Pablo Marquez Tello <pablo.tello@arm.com> | 2023-12-07 15:27:26 +0000 |
---|---|---|
committer | Pablo Marquez Tello <pablo.tello@arm.com> | 2023-12-11 17:28:46 +0000 |
commit | 391f872c9fd9831cc2298a2a27eccfc21d727cb8 (patch) | |
tree | 8697b401ab3983c4b164bcfe3082e0b00058fce5 | |
parent | 066017249985d3ade9c1788721943c85077ef984 (diff) | |
download | ComputeLibrary-391f872c9fd9831cc2298a2a27eccfc21d727cb8.tar.gz |
Fix nightly test failure
* Both macros ARM_COMPUTE_ENABLE_FP16 and ENABLE_FP16_KERNELS
must be declared to enable FP16
* The failure was caused by not compiling the validation suite with the same
definitions used to compile the library. ARM_COMPUTE_ENABLE_FP16 was missing
and the call from the test into error_on_unsupported_cpu_fp16() failed.
* Resolves COMPMID-6727
Change-Id: I278c813aef799d9d0e21e5323b2b8e9e45252d6c
Signed-off-by: Pablo Marquez Tello <pablo.tello@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/10848
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: SiCong Li <sicong.li@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Benchmark: Arm Jenkins <bsgcomp@arm.com>
-rw-r--r-- | SConscript | 5 | ||||
-rw-r--r-- | SConstruct | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/SConscript b/SConscript index 31e7a5b4f4..6ad4c78aff 100644 --- a/SConscript +++ b/SConscript @@ -86,9 +86,10 @@ def build_multiisa_lib_objects(): lib_static_objs = [] # static objects lib_shared_objs = [] # shared objects + # note that ARM_COMPUTE_ENABLE_FP16 is enabled in update_data_type_layout_flags() to make + # sure the environment is progated to the validation suite arm_compute_env.Append(CPPDEFINES = ['ENABLE_NEON', 'ARM_COMPUTE_ENABLE_NEON', - 'ENABLE_SVE', 'ARM_COMPUTE_ENABLE_SVE', - 'ARM_COMPUTE_ENABLE_FP16', 'ARM_COMPUTE_ENABLE_BF16', + 'ENABLE_SVE', 'ARM_COMPUTE_ENABLE_SVE','ARM_COMPUTE_ENABLE_BF16', 'ARM_COMPUTE_ENABLE_I8MM', 'ARM_COMPUTE_ENABLE_SVEF32MM']) # Build all the common files for the base architecture diff --git a/SConstruct b/SConstruct index 746d4a6afe..cf8fb52bd6 100644 --- a/SConstruct +++ b/SConstruct @@ -64,11 +64,11 @@ def update_data_type_layout_flags(env, data_types, data_layouts): # Manage data-types if env['multi_isa']: if any(i in data_types for i in ['all', 'fp16']): - env.Append(CXXFLAGS = ['-DENABLE_FP16_KERNELS']) + env.Append(CXXFLAGS = ['-DENABLE_FP16_KERNELS', '-DARM_COMPUTE_ENABLE_FP16']) else: if not 'v8a' in env['arch'] and not 'v7a' in env['arch'] and not 'armv8r64' in env['arch']: if any(i in data_types for i in ['all', 'fp16']): - env.Append(CXXFLAGS = ['-DENABLE_FP16_KERNELS']) + env.Append(CXXFLAGS = ['-DENABLE_FP16_KERNELS','-DARM_COMPUTE_ENABLE_FP16']) if any(i in data_types for i in ['all', 'fp32']): env.Append(CXXFLAGS = ['-DENABLE_FP32_KERNELS']) |