perf check: Add sanitizer feature and use to avoid test failure
Ian Rogers
reviewerPATCH 1/1 perf check: Add sanitizer feature and use to avoid test failure
Sanitizer builds can break expectations for test disassembly, particularly in the annotate test. Add features for the different sanitizer options seen in the source tree. Use the added sanitizer feature to skip the annotate test when sanitizers are in use.
Signed-off-by Ian Rogers <[email protected]>
--- tools/perf/builtin-check.c | 37 ++++++++++++++++++++++++++++++ tools/perf/tests/shell/annotate.sh | 6 +++++ 2 files changed, 43 insertions(+)
tools/perf/builtin-check.c +37 -0
@@ -9,6 +9,37 @@#include <string.h> #include <subcmd/parse-options.h> +#if defined(__has_feature) +#define HAS_COMPILER_FEATURE (feature) __has_feature(feature) +#else +#define HAS_COMPILER_FEATURE (feature) 0 +#endif + +#if defined(__SANITIZE_ADDRESS__) || defined(ADDRESS_SANITIZER ) || \ +HAS_COMPILER_FEATURE (address_sanitizer) +#define HAVE_SANITIZER_ADDRESS 1 +#define HAVE_SANITIZER_LEAK 1 +#elif defined(LEAK_SANITIZER ) ||HAS_COMPILER_FEATURE (leak_sanitizer) +#define HAVE_SANITIZER_LEAK 1 +#endif + +#if defined(MEMORY_SANITIZER ) ||HAS_COMPILER_FEATURE (memory_sanitizer) +#define HAVE_SANITIZER_MEMORY 1 +#endif + +#if defined(THREAD_SANITIZER ) ||HAS_COMPILER_FEATURE (thread_sanitizer) +#define HAVE_SANITIZER_THREAD 1 +#endif + +#if defined(UNDEFINED_SANITIZER ) ||HAS_COMPILER_FEATURE (undefined_sanitizer) +#define HAVE_SANITIZER_UNDEFINED 1 +#endif + +#if HAVE_SANITIZER_ADDRESS ||HAVE_SANITIZER_LEAK ||HAVE_SANITIZER_MEMORY || \ +HAVE_SANITIZER_THREAD ||HAVE_SANITIZER_UNDEFINED +#define HAVE_SANITIZER 1 +#endif +static const char *const check_subcommands[] = {"feature" ,NULL };static struct option check_options[] = {OPT_BOOLEAN ('q' ,"quiet" , &quiet,"do not show any warnings or messages" ),
@@ -47,6 +78,12 @@ struct feature_status supported_features[] = {FEATURE_STATUS ("libunwind" ,HAVE_LIBUNWIND_SUPPORT ),FEATURE_STATUS ("lzma" ,HAVE_LZMA_SUPPORT ),FEATURE_STATUS ("numa_num_possible_cpus" ,HAVE_LIBNUMA_SUPPORT ), +FEATURE_STATUS ("sanitizer" ,HAVE_SANITIZER ), +FEATURE_STATUS ("sanitizer_address" ,HAVE_SANITIZER_ADDRESS ), +FEATURE_STATUS ("sanitizer_leak" ,HAVE_SANITIZER_LEAK ), +FEATURE_STATUS ("sanitizer_memory" ,HAVE_SANITIZER_MEMORY ), +FEATURE_STATUS ("sanitizer_thread" ,HAVE_SANITIZER_THREAD ), +FEATURE_STATUS ("sanitizer_undefined" ,HAVE_SANITIZER_UNDEFINED ),FEATURE_STATUS ("syscall_table" ,HAVE_SYSCALL_TABLE_SUPPORT ),FEATURE_STATUS ("zlib" ,HAVE_ZLIB_SUPPORT ), FEATURE_STATUS("zstd", HAVE_ZSTD_SUPPORT),
tools/perf/tests/shell/annotate.sh +6 -0
@@ -4,6 +4,12 @@ set -e +if perf check feature -q sanitizer +then + echo "Skip test with sanitizers due to differing assembly code" + exit 2 +fi + shelldir=$(dirname "$0") # shellcheck source=lib/perf_has_symbol.sh
Signature · 1 line
2.47.0.105.g07ac214952-goog