diff options
author | Anthony Barbier <anthony.barbier@arm.com> | 2017-10-26 15:23:08 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:35:24 +0000 |
commit | 7068f9900d136312318ff430aef588b14e0c87ad (patch) | |
tree | b57ca81231860f1d8755e6f18e5be7c959fb60c6 /tests/SConscript | |
parent | d60737592736715dcfd0520535c48190d4ac77d2 (diff) | |
download | ComputeLibrary-7068f9900d136312318ff430aef588b14e0c87ad.tar.gz |
COMPMID-631: Merge branches/gles_compute branch
Last commit:
commit b25c5f68042b0c81bf611d59a1bb8535e1c42497
Author: Xinghang Zhou <xinghang.zhou@arm.com>
Date: Wed Oct 25 18:48:10 2017 +0800
Synced validation's tolerances of GCSoftmax from cl side
Change-Id: Ibe72054205c1c8721845d679a31af7ed0a7c5cf6
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/93283
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Diffstat (limited to 'tests/SConscript')
-rw-r--r-- | tests/SConscript | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/tests/SConscript b/tests/SConscript index 37c96d2f22..311eeedde1 100644 --- a/tests/SConscript +++ b/tests/SConscript @@ -68,6 +68,8 @@ test_env.Append(CPPPATH = ["#3rdparty/include"]) test_env.Append(LIBPATH = ["#3rdparty/%s/%s" % (env['os'], env['arch'])]) test_env.Append(LIBPATH = ["#build/%s" % env['build_dir']]) test_env.Append(LIBPATH = ["#build/%s/opencl-1.2-stubs" % env['build_dir']]) +if env['gles_compute'] and env['os'] != 'android': + test_env.Append(LIBPATH = ["#build/%s/opengles-3.1/stubs" % env['build_dir']]) Import("arm_compute_test_framework") test_env.Append(LIBS = arm_compute_test_framework) @@ -109,6 +111,27 @@ if env['neon']: files_validation += Glob('validation/NEON/*/' + filter_pattern) files_validation += Glob('validation/NEON/' + filter_pattern) +if env['gles_compute']: + if env['os'] != 'android': + Import('egl') + Import('glesv2') + + test_env.Append(CPPPATH = ["#opengles-3.1/include", "#opengles-3.1/mali_include"]) + test_env.Append(LIBS = ["EGL", "GLESv2"]) + else: + if env['arch'] != 'armv7a': + test_env.Append(LIBS = ["EGL", "GLESv3"]) + else: + test_env.Append(LIBS = ["EGL", "GLESv2"]) + + test_env.Append(CPPDEFINES=['ARM_COMPUTE_GC']) + + files_benchmark += Glob('benchmark/GLES_COMPUTE/*/*.cpp') + files_benchmark += Glob('benchmark/GLES_COMPUTE/*.cpp') + + files_validation += Glob('validation/GLES_COMPUTE/*/*.cpp') + files_validation += Glob('validation/GLES_COMPUTE/*.cpp') + if env['os'] == 'android': test_env.Append(LIBS = ["log"]) else: @@ -121,6 +144,9 @@ if test_env['benchmark_tests']: if env['opencl']: Depends(arm_compute_benchmark, opencl) + if env['gles_compute'] and env['os'] != 'android': + Depends(arm_compute_benchmark, egl) + Depends(arm_compute_benchmark, glesv2) Default(arm_compute_benchmark) Export('arm_compute_benchmark') @@ -132,6 +158,9 @@ if test_env['validation_tests']: if env['opencl']: Depends(arm_compute_validation, opencl) + if env['gles_compute'] and env['os'] != 'android': + Depends(arm_compute_validation, egl) + Depends(arm_compute_validation, glesv2) Default(arm_compute_validation) Export('arm_compute_validation') |