Skip to content

Commit 055eba8

Browse files
committed
[sanitizers] Make it possible to XFAIL on the effective target, not just the default.
Summary: The triple is not the right thing to XFAIL on since LIT only sees the default triple and not the effective triple chosen by any -target option in the RUN directives. This discrepancy is shown in the table below: Default Triple | Options | XFAIL | LIT's expected result | Desired expectation =================+===================================+========+=======================+==================== mips-linux-gnu | -target mips-linux-gnu | | Pass | Pass mips-linux-gnu | -target mips64-linux-gnu -mabi=64 | | Pass | Pass mips-linux-gnu | -target mips-linux-gnu | mips | Fail | Fail mips-linux-gnu | -target mips64-linux-gnu -mabi=64 | mips | Fail | Fail/Pass* (debatable**) mips-linux-gnu | -target mips-linux-gnu | mips- | Fail | Fail mips-linux-gnu | -target mips64-linux-gnu -mabi=64 | mips- | Fail | Pass* mips-linux-gnu | -target mips-linux-gnu | mips64 | Pass | Pass mips-linux-gnu | -target mips64-linux-gnu -mabi=64 | mips64 | Pass | Fail* mips64-linux-gnu | -target mips-linux-gnu | | Pass | Pass mips64-linux-gnu | -target mips64-linux-gnu -mabi=64 | | Pass | Pass mips64-linux-gnu | -target mips-linux-gnu | mips | Fail | Fail* mips64-linux-gnu | -target mips64-linux-gnu -mabi=64 | mips | Fail | Fail/Pass (debatable**) mips64-linux-gnu | -target mips-linux-gnu | mips- | Pass | Fail* mips64-linux-gnu | -target mips64-linux-gnu -mabi=64 | mips- | Pass | Pass mips64-linux-gnu | -target mips-linux-gnu | mips64 | Fail | Pass* mips64-linux-gnu | -target mips64-linux-gnu -mabi=64 | mips64 | Fail | Fail x64_64-linux-gnu | -target i386-linux-gnu | | Pass | Pass x64_64-linux-gnu | -target x86_64-linux-gnu | | Pass | Pass x64_64-linux-gnu | -target i386-linux-gnu | i386 | Pass | Fail* x64_64-linux-gnu | -target x86_64-linux-gnu | i386 | Pass | Pass x64_64-linux-gnu | -target i386-linux-gnu | x86_64 | Fail | Pass x64_64-linux-gnu | -target x86_64-linux-gnu | x86_64 | Fail | Fail* * These all differ from LIT's current behaviour. ** People's expectations vary depending on whether they know that LIT does a substring match on the default triple or think it's an exact match on an architecture. This patch adds "target-is-${target_arch}" to the available features list and updates the mips XFAIL's to use them. XFAIL'ing on these features will correctly account for the target being tested. Making the table: Options | XFAIL | LIT's expected result ==================================+==================+====================== -target mips-linux-gnu | | Pass -target mips64-linux-gnu -mabi=64 | | Pass -target mips-linux-gnu | target-is-mips | Fail -target mips64-linux-gnu -mabi=64 | target-is-mips | Pass -target mips-linux-gnu | target-is-mips64 | Pass -target mips64-linux-gnu -mabi=64 | target-is-mips64 | Fail -target i386-linux-gnu | | Pass -target x86_64-linux-gnu | | Pass -target i386-linux-gnu | target-is-i386 | Fail -target x86_64-linux-gnu | target-is-i386 | Pass -target i386-linux-gnu | target-is-x86_64 | Pass -target x86_64-linux-gnu | target-is-x86_64 | Fail Reviewers: probinson Subscribers: probinson, kubabrecka, llvm-commits, samsonov Differential Revision: https://reviews.llvm.org/D22802 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@278116 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 662d549 commit 055eba8

11 files changed

+76
-9
lines changed

docs/TestingGuide.rst

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
========================================
2+
Compiler-rt Testing Infrastructure Guide
3+
========================================
4+
5+
.. contents::
6+
:local:
7+
8+
Overview
9+
========
10+
11+
This document is the reference manual for the compiler-rt modifications to the
12+
testing infrastructure. Documentation for the infrastructure itself can be found at
13+
:ref:`llvm_testing_guide`.
14+
15+
LLVM testing infrastructure organization
16+
========================================
17+
18+
The compiler-rt testing infrastructure contains regression tests which are run
19+
as part of the usual ``make check-all`` and are expected to always pass -- they
20+
should be run before every commit.
21+
22+
Quick start
23+
===========
24+
25+
The regressions tests are in the "compiler-rt" module and are normally checked
26+
out in the directory ``llvm/projects/compiler-rt/test``. Use ``make check-all``
27+
to run the regression tests after building compiler-rt.
28+
29+
REQUIRES, XFAIL, etc.
30+
---------------------
31+
32+
Sometimes it is necessary to restrict a test to a specific target or mark it as
33+
an "expected fail" or XFAIL. This is normally achieved using ``REQUIRES:`` or
34+
``XFAIL:`` with a substring of LLVM's default target triple. Unfortunately, the
35+
behaviour of this is somewhat quirky in compiler-rt. There are two main
36+
pitfalls to avoid.
37+
38+
The first pitfall is that these directives perform a substring match on the
39+
triple and as such ``XFAIL: mips`` affects more triples than expected. For
40+
example, ``mips-linux-gnu``, ``mipsel-linux-gnu``, ``mips64-linux-gnu``, and
41+
``mips64el-linux-gnu`` will all match a ``XFAIL: mips`` directive. Including a
42+
trailing ``-`` such as in ``XFAIL: mips-`` can help to mitigate this quirk but
43+
even that has issues as described below.
44+
45+
The second pitfall is that the default target triple is often inappropriate for
46+
compiler-rt tests since compiler-rt tests may be compiled for multiple targets.
47+
For example, a typical build on an ``x86_64-linux-gnu`` host will often run the
48+
tests for both x86_64 and i386. In this situation ``XFAIL: x86_64`` will mark
49+
both the x86_64 and i386 tests as an expected failure while ``XFAIL: i386``
50+
will have no effect at all.
51+
52+
To remedy both pitfalls, compiler-rt tests provide a feature string which can
53+
be used to specify a single target. This string is of the form
54+
``target-is-${arch}`` where ``${arch}}`` is one of the values from the
55+
following lines of the CMake output::
56+
57+
-- Compiler-RT supported architectures: x86_64;i386
58+
-- Builtin supported architectures: i386;x86_64
59+
60+
So for example ``XFAIL: target-is-x86_64`` will mark a test as expected to fail
61+
on x86_64 without also affecting the i386 test and ``XFAIL: target-is-i386``
62+
will mark a test as expected to fail on i386 even if the default target triple
63+
is ``x86_64-linux-gnu``. Directives that use these ``target-is-${arch}`` string
64+
require exact matches so ``XFAIL: target-is-mips``,
65+
``XFAIL: target-is-mipsel``, ``XFAIL: target-is-mips64``, and
66+
``XFAIL: target-is-mips64el`` all refer to different MIPS targets.

test/asan/TestCases/Linux/local_alias.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77
// FIXME: https://github.com/google/sanitizers/issues/316
88
// XFAIL: android
9-
// XFAIL: mips64
9+
// XFAIL: target-is-mips64
1010
//
1111
// RUN: %clangxx_asan -DBUILD_INSTRUMENTED_DSO=1 -fPIC -shared -mllvm -asan-use-private-alias %s -o %t-INSTRUMENTED-SO.so
1212
// RUN: %clangxx -DBUILD_UNINSTRUMENTED_DSO=1 -fPIC -shared %s -o %t-UNINSTRUMENTED-SO.so

test/asan/TestCases/Linux/odr-violation.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// FIXME: https://code.google.com/p/address-sanitizer/issues/detail?id=316
22
// XFAIL: android
3-
// XFAIL: mips64
3+
// XFAIL: target-is-mips64
44
//
55
// We use fast_unwind_on_malloc=0 to have full unwinding even w/o frame
66
// pointers. This setting is not on by default because it's too expensive.

test/lit.common.configured.in

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ set_default("emulator", "@COMPILER_RT_EMULATOR@")
2828
set_default("sanitizer_can_use_cxxabi", @SANITIZER_CAN_USE_CXXABI_PYBOOL@)
2929
set_default("has_lld", @COMPILER_RT_HAS_LLD_SOURCES_PYBOOL@)
3030
set_default("can_symbolize", @CAN_SYMBOLIZE@)
31+
config.available_features.add('target-is-%s' % config.target_arch)
3132

3233
# LLVM tools dir can be passed in lit parameters, so try to
3334
# apply substitution.

test/tsan/ignore_lib4.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// RUN: %env_tsan_opts=suppressions='%t.supp' %run %t 2>&1 | FileCheck %s
55

66
// Longjmp assembly has not been implemented for mips64 yet
7-
// XFAIL: mips64
7+
// XFAIL: target-is-mips64
88
// powerpc64 big endian bots failed with "FileCheck error: '-' is empty" due
99
// to a segmentation fault.
1010
// UNSUPPORTED: powerpc64-unknown-linux-gnu

test/tsan/longjmp.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
22

33
// Longjmp assembly has not been implemented for mips64 yet
4-
// XFAIL: mips64
4+
// XFAIL: target-is-mips64
55

66
#include <stdio.h>
77
#include <stdlib.h>

test/tsan/longjmp2.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
22

33
// Longjmp assembly has not been implemented for mips64 yet
4-
// XFAIL: mips64
4+
// XFAIL: target-is-mips64
55

66
#include <stdio.h>
77
#include <stdlib.h>

test/tsan/longjmp3.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %clang_tsan -O1 %s -o %t && %deflake %run %t 2>&1 | FileCheck %s
22

33
// Longjmp assembly has not been implemented for mips64 yet
4-
// XFAIL: mips64
4+
// XFAIL: target-is-mips64
55

66
#include <pthread.h>
77
#include <stdio.h>

test/tsan/longjmp4.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %clang_tsan -O1 %s -o %t && %deflake %run %t 2>&1 | FileCheck %s
22

33
// Longjmp assembly has not been implemented for mips64 yet
4-
// XFAIL: mips64
4+
// XFAIL: target-is-mips64
55

66
#include <pthread.h>
77
#include <stdio.h>

test/tsan/map32bit.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// https://github.com/google/sanitizers/issues/412
99

1010
// MAP_32BIT flag for mmap is supported only for x86_64.
11-
// XFAIL: mips64
11+
// XFAIL: target-is-mips64
1212
// XFAIL: aarch64
1313
// XFAIL: powerpc64
1414

test/tsan/signal_longjmp.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// https://github.com/google/sanitizers/issues/482
55

66
// Longjmp assembly has not been implemented for mips64 yet
7-
// XFAIL: mips64
7+
// XFAIL: target-is-mips64
88
// This test fails on powerpc64 BE (VMA=44), a segmentation fault
99
// error happens at the second assignment
1010
// "((volatile int *volatile)mem)[1] = 1".

0 commit comments

Comments
 (0)