From 33fd07bd27be3cba183b7cacef63ea220c770c23 Mon Sep 17 00:00:00 2001 From: Ioan-Cristian Szabo Date: Thu, 26 Oct 2017 15:42:24 +0100 Subject: COMPMID-634: Enable clang with libc++ to compile for Android (32 and 64 bits) Change-Id: I693f64e70cd478e93675a8b04360128ded3b60d4 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/93015 Tested-by: Kaizen Reviewed-by: Anthony Barbier --- scripts/check_bad_style.sh | 6 +++--- scripts/clang_tidy_rules.py | 6 +----- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'scripts') diff --git a/scripts/check_bad_style.sh b/scripts/check_bad_style.sh index ab2b1a016d..827163f02c 100755 --- a/scripts/check_bad_style.sh +++ b/scripts/check_bad_style.sh @@ -57,15 +57,15 @@ grep -Hnir --exclude-dir=assembly "#else$\|#endif$" $DIRECTORIES | tee bad_style if [[ $(cat bad_style.log | wc -l) > 0 ]] then echo "" - echo "ERROR: #else and #endif should be followed by a comment of the guard they refer to (e.g /* ARM_COMPUTE_ENABLE_FP16 */ )" + echo "ERROR: #else and #endif should be followed by a comment of the guard they refer to (e.g /* ARM_COMPUTE_AARCH64_V8_2 */ )" exit -1 fi -grep -Hnir --exclude-dir=assembly "ARM_COMPUTE_ENABLE_FP16" ./tests/validation/CL | tee bad_style.log +grep -Hnir --exclude-dir=assembly "ARM_COMPUTE_AARCH64_V8_2" ./tests/validation/CL | tee bad_style.log if [[ $(cat bad_style.log | wc -l) > 0 ]] then echo "" - echo "ERROR: Found ARM_COMPUTE_ENABLE_FP16 in CL tests though F16 is always supported for OpenCL" + echo "ERROR: Found ARM_COMPUTE_AARCH64_V8_2 in CL tests though armv8.2 features (FP16) are always supported for OpenCL" exit -1 fi diff --git a/scripts/clang_tidy_rules.py b/scripts/clang_tidy_rules.py index e5e357e59d..b811847ba8 100755 --- a/scripts/clang_tidy_rules.py +++ b/scripts/clang_tidy_rules.py @@ -11,12 +11,10 @@ def get_list_includes(): def get_list_flags( filename, arch): assert arch in ["armv7", "aarch64"] flags = ["-std=c++11"] - if "tests/validation_old" in filename: - flags.append("-DBOOST") flags.append("-DARM_COMPUTE_CPP_SCHEDULER=1") flags.append("-DARM_COMPUTE_CL") if arch == "aarch64": - flags.append("-DARM_COMPUTE_ENABLE_FP16") + flags.append("-DARM_COMPUTE_AARCH64_V8_2") return flags def filter_files( list_files ): @@ -28,8 +26,6 @@ def filter_files( list_files ): continue if "openvx-arm_compute" in f: continue - if "tests/validation_old" in f: - continue # Skip OMPScheduler as it causes problems in clang if "OMPScheduler.cpp" in f: continue -- cgit v1.2.1