From 975327a609e55ad9c53bfeee63443128ce20006c Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Wed, 28 Dec 2022 15:35:09 -0800 Subject: [PATCH] [dfsan][test] Replace REQUIRES: x86_64-target-arch with lit.cfg.py check Make it easier to support a new architecture. Reviewed By: #sanitizers, vitalybuka Differential Revision: https://reviews.llvm.org/D140744 --- compiler-rt/test/dfsan/atomic.cpp | 2 -- compiler-rt/test/dfsan/basic.c | 2 -- compiler-rt/test/dfsan/conditional_callbacks.c | 2 -- compiler-rt/test/dfsan/conditional_callbacks_sig.c | 2 -- compiler-rt/test/dfsan/custom.cpp | 2 -- compiler-rt/test/dfsan/dfsan_get_track_origins.c | 2 -- compiler-rt/test/dfsan/event_callbacks.c | 2 -- compiler-rt/test/dfsan/fast8labels.c | 2 -- compiler-rt/test/dfsan/flags.c | 2 -- compiler-rt/test/dfsan/flush.c | 2 -- compiler-rt/test/dfsan/fncall.c | 2 -- compiler-rt/test/dfsan/force_zero.c | 2 -- compiler-rt/test/dfsan/fork.cpp | 2 -- compiler-rt/test/dfsan/gep.c | 2 -- compiler-rt/test/dfsan/interceptors.c | 2 -- compiler-rt/test/dfsan/libatomic.c | 2 -- compiler-rt/test/dfsan/lit.cfg.py | 2 +- compiler-rt/test/dfsan/lookup_table.c | 2 -- compiler-rt/test/dfsan/mmap_at_init.c | 2 -- compiler-rt/test/dfsan/origin_add_label.c | 2 -- compiler-rt/test/dfsan/origin_branch.c | 2 -- compiler-rt/test/dfsan/origin_disabled.c | 2 -- compiler-rt/test/dfsan/origin_id_stack_trace.c | 2 -- compiler-rt/test/dfsan/origin_invalid.c | 2 -- compiler-rt/test/dfsan/origin_ld_lost.c | 2 -- compiler-rt/test/dfsan/origin_ldst.c | 2 -- compiler-rt/test/dfsan/origin_limit.c | 2 -- compiler-rt/test/dfsan/origin_memcpy.c | 2 -- compiler-rt/test/dfsan/origin_memmove.c | 2 -- compiler-rt/test/dfsan/origin_memset.c | 2 -- compiler-rt/test/dfsan/origin_of_first_taint.c | 2 -- compiler-rt/test/dfsan/origin_overlapped.c | 2 -- compiler-rt/test/dfsan/origin_set_label.c | 2 -- compiler-rt/test/dfsan/origin_stack_trace.c | 2 -- compiler-rt/test/dfsan/origin_track_ld.c | 2 -- compiler-rt/test/dfsan/origin_unaligned_memtrans.c | 2 -- compiler-rt/test/dfsan/origin_untainted.c | 2 -- compiler-rt/test/dfsan/origin_with_sigactions.c | 2 -- compiler-rt/test/dfsan/origin_with_signals.cpp | 2 -- compiler-rt/test/dfsan/pair.cpp | 2 -- compiler-rt/test/dfsan/propagate.c | 2 -- compiler-rt/test/dfsan/pthread.c | 2 -- compiler-rt/test/dfsan/reaches_function.c | 2 -- compiler-rt/test/dfsan/release_shadow_space.c | 2 -- compiler-rt/test/dfsan/sigaction.c | 2 -- compiler-rt/test/dfsan/sigaction_stress_test.c | 2 -- compiler-rt/test/dfsan/stack_trace.c | 2 -- compiler-rt/test/dfsan/struct.c | 2 -- compiler-rt/test/dfsan/threaded_flush.c | 2 -- compiler-rt/test/dfsan/trace-cmp.c | 2 -- compiler-rt/test/dfsan/vararg.c | 2 -- compiler-rt/test/dfsan/write_callback.c | 2 -- 52 files changed, 1 insertion(+), 103 deletions(-) diff --git a/compiler-rt/test/dfsan/atomic.cpp b/compiler-rt/test/dfsan/atomic.cpp index 973c605..22ee323 100644 --- a/compiler-rt/test/dfsan/atomic.cpp +++ b/compiler-rt/test/dfsan/atomic.cpp @@ -1,8 +1,6 @@ // RUN: %clangxx_dfsan %s -fno-exceptions -o %t && %run %t // RUN: %clangxx_dfsan -DORIGIN_TRACKING -mllvm -dfsan-track-origins=1 %s -fno-exceptions -o %t && %run %t // -// REQUIRES: x86_64-target-arch -// // Use -fno-exceptions to turn off exceptions to avoid instrumenting // __cxa_begin_catch, std::terminate and __gxx_personality_v0. // diff --git a/compiler-rt/test/dfsan/basic.c b/compiler-rt/test/dfsan/basic.c index 783b33d..2010553 100644 --- a/compiler-rt/test/dfsan/basic.c +++ b/compiler-rt/test/dfsan/basic.c @@ -1,6 +1,4 @@ // RUN: %clang_dfsan %s -o %t && %run %t -// -// REQUIRES: x86_64-target-arch // Tests that labels are propagated through loads and stores. diff --git a/compiler-rt/test/dfsan/conditional_callbacks.c b/compiler-rt/test/dfsan/conditional_callbacks.c index 53d9f28..3059932 100644 --- a/compiler-rt/test/dfsan/conditional_callbacks.c +++ b/compiler-rt/test/dfsan/conditional_callbacks.c @@ -5,8 +5,6 @@ // RUN: %clang_dfsan -fno-sanitize=dataflow -O2 -fPIE -DCALLBACKS -DORIGINS -c %s -o %t-callbacks-orig.o // RUN: %clang_dfsan -fsanitize-ignorelist=%S/Inputs/flags_abilist.txt -O2 -mllvm -dfsan-conditional-callbacks -mllvm -dfsan-track-origins=1 -DORIGINS %s %t-callbacks-orig.o -o %t-orig // RUN: %run %t-orig FooBarBaz 2>&1 | FileCheck %s -// -// REQUIRES: x86_64-target-arch // Tests that callbacks are inserted for conditionals when // -dfsan-conditional-callbacks is specified. diff --git a/compiler-rt/test/dfsan/conditional_callbacks_sig.c b/compiler-rt/test/dfsan/conditional_callbacks_sig.c index 174f2fe..218c02c 100644 --- a/compiler-rt/test/dfsan/conditional_callbacks_sig.c +++ b/compiler-rt/test/dfsan/conditional_callbacks_sig.c @@ -1,8 +1,6 @@ // RUN: %clang_dfsan -fno-sanitize=dataflow -O2 -fPIE -DCALLBACKS -c %s -o %t-callbacks.o // RUN: %clang_dfsan -fsanitize-ignorelist=%S/Inputs/flags_abilist.txt -O2 -mllvm -dfsan-conditional-callbacks %s %t-callbacks.o -o %t // RUN: %run %t FooBarBaz 2>&1 | FileCheck %s -// -// REQUIRES: x86_64-target-arch #include #include diff --git a/compiler-rt/test/dfsan/custom.cpp b/compiler-rt/test/dfsan/custom.cpp index e15fb61..6fb1e5b 100644 --- a/compiler-rt/test/dfsan/custom.cpp +++ b/compiler-rt/test/dfsan/custom.cpp @@ -4,8 +4,6 @@ // RUN: %clang_dfsan -DORIGIN_TRACKING -mllvm -dfsan-track-origins=1 -mllvm -dfsan-combine-pointer-labels-on-load=false %s -o %t && DFSAN_OPTIONS="strict_data_dependencies=0" %run %t // // Tests custom implementations of various glibc functions. -// -// REQUIRES: x86_64-target-arch #pragma clang diagnostic ignored "-Wformat-extra-args" diff --git a/compiler-rt/test/dfsan/dfsan_get_track_origins.c b/compiler-rt/test/dfsan/dfsan_get_track_origins.c index 4013fed..a339322 100644 --- a/compiler-rt/test/dfsan/dfsan_get_track_origins.c +++ b/compiler-rt/test/dfsan/dfsan_get_track_origins.c @@ -1,8 +1,6 @@ // RUN: %clang_dfsan -DTRACK_ORIGINS=2 -mllvm -dfsan-track-origins=2 %s -o %t && %run %t // RUN: %clang_dfsan -DTRACK_ORIGINS=1 -mllvm -dfsan-track-origins=1 %s -o %t && %run %t // RUN: %clang_dfsan -DTRACK_ORIGINS=0 %s -o %t && %run %t -// -// REQUIRES: x86_64-target-arch #include diff --git a/compiler-rt/test/dfsan/event_callbacks.c b/compiler-rt/test/dfsan/event_callbacks.c index d85c9e3..f940e7a 100644 --- a/compiler-rt/test/dfsan/event_callbacks.c +++ b/compiler-rt/test/dfsan/event_callbacks.c @@ -1,8 +1,6 @@ // RUN: %clang_dfsan -fno-sanitize=dataflow -O2 -fPIE -DCALLBACKS -c %s -o %t-callbacks.o // RUN: %clang_dfsan -O2 -mllvm -dfsan-event-callbacks %s %t-callbacks.o -o %t // RUN: %run %t FooBarBaz 2>&1 | FileCheck %s -// -// REQUIRES: x86_64-target-arch // Tests that callbacks are inserted for store events when // -dfsan-event-callbacks is specified. diff --git a/compiler-rt/test/dfsan/fast8labels.c b/compiler-rt/test/dfsan/fast8labels.c index 0fa26ca..22dded4 100644 --- a/compiler-rt/test/dfsan/fast8labels.c +++ b/compiler-rt/test/dfsan/fast8labels.c @@ -1,8 +1,6 @@ // RUN: %clang_dfsan %s -o %t // RUN: %run %t // -// REQUIRES: x86_64-target-arch -// #include #include diff --git a/compiler-rt/test/dfsan/flags.c b/compiler-rt/test/dfsan/flags.c index 1a21209..3f68dbc 100644 --- a/compiler-rt/test/dfsan/flags.c +++ b/compiler-rt/test/dfsan/flags.c @@ -1,8 +1,6 @@ // RUN: %clang_dfsan %s -fsanitize-ignorelist=%S/Inputs/flags_abilist.txt -mllvm -dfsan-debug-nonzero-labels -o %t && DFSAN_OPTIONS=warn_unimplemented=1 %run %t 2>&1 | FileCheck %s // RUN: %clang_dfsan %s -fsanitize-ignorelist=%S/Inputs/flags_abilist.txt -mllvm -dfsan-debug-nonzero-labels -o %t && DFSAN_OPTIONS=warn_unimplemented=0 %run %t 2>&1 | count 0 // RUN: %clang_dfsan %s -fsanitize-ignorelist=%S/Inputs/flags_abilist.txt -mllvm -dfsan-debug-nonzero-labels -o %t && DFSAN_OPTIONS=warn_nonzero_labels=1 %run %t 2>&1 | FileCheck --check-prefix=CHECK-NONZERO %s -// -// REQUIRES: x86_64-target-arch // Tests that flags work correctly. diff --git a/compiler-rt/test/dfsan/flush.c b/compiler-rt/test/dfsan/flush.c index 6c74ce5..a60335a 100644 --- a/compiler-rt/test/dfsan/flush.c +++ b/compiler-rt/test/dfsan/flush.c @@ -1,8 +1,6 @@ // Tests dfsan_flush(). // RUN: %clang_dfsan %s -o %t && %run %t // RUN: %clang_dfsan -DORIGIN_TRACKING -mllvm -dfsan-track-origins=1 %s -o %t && %run %t -// -// REQUIRES: x86_64-target-arch #include #include diff --git a/compiler-rt/test/dfsan/fncall.c b/compiler-rt/test/dfsan/fncall.c index 3a3efd7..d54fac3 100644 --- a/compiler-rt/test/dfsan/fncall.c +++ b/compiler-rt/test/dfsan/fncall.c @@ -1,7 +1,5 @@ // RUN: %clang_dfsan %s -o %t && %run %t // -// REQUIRES: x86_64-target-arch -// // Tests that labels are propagated through function calls. #include diff --git a/compiler-rt/test/dfsan/force_zero.c b/compiler-rt/test/dfsan/force_zero.c index 6e1e87a..a3966f8 100644 --- a/compiler-rt/test/dfsan/force_zero.c +++ b/compiler-rt/test/dfsan/force_zero.c @@ -1,7 +1,5 @@ // RUN: %clang_dfsan %s -fsanitize-ignorelist=%S/Inputs/flags_abilist.txt -DFORCE_ZERO_LABELS -o %t && %run %t // RUN: %clang_dfsan %s -o %t && %run %t -// -// REQUIRES: x86_64-target-arch #include diff --git a/compiler-rt/test/dfsan/fork.cpp b/compiler-rt/test/dfsan/fork.cpp index 15016c5..c4c23f3 100644 --- a/compiler-rt/test/dfsan/fork.cpp +++ b/compiler-rt/test/dfsan/fork.cpp @@ -7,8 +7,6 @@ // // RUN: %clangxx_dfsan -mllvm -dfsan-track-origins=1 %s -o %t // RUN: DFSAN_OPTIONS=store_context_size=1000,origin_history_size=0,origin_history_per_stack_limit=0 %run %t 2>&1 | FileCheck %s -// -// REQUIRES: x86_64-target-arch #include #include diff --git a/compiler-rt/test/dfsan/gep.c b/compiler-rt/test/dfsan/gep.c index d3f507f..973b423 100644 --- a/compiler-rt/test/dfsan/gep.c +++ b/compiler-rt/test/dfsan/gep.c @@ -1,7 +1,5 @@ // RUN: %clang_dfsan %s -mllvm -dfsan-combine-offset-labels-on-gep=false -Wno-error=int-conversion -o %t && %run %t // RUN: %clang_dfsan %s -DPROP_OFFSET_LABELS -Wno-error=int-conversion -o %t && %run %t -// -// REQUIRES: x86_64-target-arch // Tests that labels are propagated through GEP. diff --git a/compiler-rt/test/dfsan/interceptors.c b/compiler-rt/test/dfsan/interceptors.c index 029832b..3c111a9 100644 --- a/compiler-rt/test/dfsan/interceptors.c +++ b/compiler-rt/test/dfsan/interceptors.c @@ -2,8 +2,6 @@ // RUN: %clang_dfsan -DORIGIN_TRACKING -mllvm -dfsan-track-origins=1 -mllvm -dfsan-combine-pointer-labels-on-load=false %s -o %t && %run %t // // Tests custom implementations of various glibc functions. -// -// REQUIRES: x86_64-target-arch #include diff --git a/compiler-rt/test/dfsan/libatomic.c b/compiler-rt/test/dfsan/libatomic.c index 9a3b926..188804f 100644 --- a/compiler-rt/test/dfsan/libatomic.c +++ b/compiler-rt/test/dfsan/libatomic.c @@ -2,8 +2,6 @@ // RUN: %clang_dfsan -g3 -DDATA_BYTES=3 -DORIGIN_TRACKING -mllvm -dfsan-track-origins=1 %s -fno-exceptions -latomic -o %t && %run %t // RUN: %clang_dfsan -g3 -DDATA_BYTES=32 %s -fno-exceptions -latomic -o %t && %run %t // RUN: %clang_dfsan -g3 -DDATA_BYTES=32 -DORIGIN_TRACKING -mllvm -dfsan-track-origins=1 %s -fno-exceptions -latomic -o %t && %run %t -// -// REQUIRES: x86_64-target-arch #include #include diff --git a/compiler-rt/test/dfsan/lit.cfg.py b/compiler-rt/test/dfsan/lit.cfg.py index 4df9e98..91a8b47 100644 --- a/compiler-rt/test/dfsan/lit.cfg.py +++ b/compiler-rt/test/dfsan/lit.cfg.py @@ -24,5 +24,5 @@ config.substitutions.append( ("%clangxx_dfsan ", build_invocation(clang_dfsan_cx config.suffixes = ['.c', '.cpp'] # DataFlowSanitizer tests are currently supported on Linux only. -if config.host_os not in ['Linux']: +if not (config.host_os in ['Linux'] and config.target_arch in ['x86_64']): config.unsupported = True diff --git a/compiler-rt/test/dfsan/lookup_table.c b/compiler-rt/test/dfsan/lookup_table.c index 76d38c1..b97d991 100644 --- a/compiler-rt/test/dfsan/lookup_table.c +++ b/compiler-rt/test/dfsan/lookup_table.c @@ -1,8 +1,6 @@ // RUN: %clang_dfsan %s -mllvm -dfsan-combine-offset-labels-on-gep=false -mllvm -dfsan-combine-pointer-labels-on-load=false -mllvm -dfsan-combine-taint-lookup-table=remap_to_upper -DLOOKUP_TABLE -o %t && %run %t // RUN: %clang_dfsan %s -mllvm -dfsan-combine-offset-labels-on-gep=false -mllvm -dfsan-combine-pointer-labels-on-load=false -mllvm -dfsan-combine-taint-lookup-table=no_match -o %t && %run %t // RUN: %clang_dfsan %s -mllvm -dfsan-combine-offset-labels-on-gep=false -mllvm -dfsan-combine-pointer-labels-on-load=false -o %t && %run %t -// -// REQUIRES: x86_64-target-arch #include #include diff --git a/compiler-rt/test/dfsan/mmap_at_init.c b/compiler-rt/test/dfsan/mmap_at_init.c index 65a5ccd..a8d7535 100644 --- a/compiler-rt/test/dfsan/mmap_at_init.c +++ b/compiler-rt/test/dfsan/mmap_at_init.c @@ -2,8 +2,6 @@ // RUN: %clang_dfsan %s %t-calloc.o -o %t // RUN: %run %t // -// REQUIRES: x86_64-target-arch -// // Tests that calling mmap() during during dfsan initialization works. #include diff --git a/compiler-rt/test/dfsan/origin_add_label.c b/compiler-rt/test/dfsan/origin_add_label.c index 058c3c6..e0facfe 100644 --- a/compiler-rt/test/dfsan/origin_add_label.c +++ b/compiler-rt/test/dfsan/origin_add_label.c @@ -5,8 +5,6 @@ // RUN: %clang_dfsan -gmlt -mllvm -dfsan-track-origins=1 -mllvm -dfsan-instrument-with-call-threshold=0 %s -o %t && \ // RUN: %run %t >%t.out 2>&1 // RUN: FileCheck %s < %t.out -// -// REQUIRES: x86_64-target-arch #include diff --git a/compiler-rt/test/dfsan/origin_branch.c b/compiler-rt/test/dfsan/origin_branch.c index 16ffda2..ec15506 100644 --- a/compiler-rt/test/dfsan/origin_branch.c +++ b/compiler-rt/test/dfsan/origin_branch.c @@ -1,8 +1,6 @@ // RUN: %clang_dfsan -gmlt -mllvm -dfsan-track-origins=1 %s -o %t && \ // RUN: %run %t >%t.out 2>&1 // RUN: FileCheck %s < %t.out -// -// REQUIRES: x86_64-target-arch #include diff --git a/compiler-rt/test/dfsan/origin_disabled.c b/compiler-rt/test/dfsan/origin_disabled.c index d2e9c65..6342585 100644 --- a/compiler-rt/test/dfsan/origin_disabled.c +++ b/compiler-rt/test/dfsan/origin_disabled.c @@ -1,7 +1,5 @@ // RUN: %clang_dfsan -gmlt %s -o %t && %run %t >%t.out 2>&1 // RUN: FileCheck %s < %t.out -// -// REQUIRES: x86_64-target-arch #include diff --git a/compiler-rt/test/dfsan/origin_id_stack_trace.c b/compiler-rt/test/dfsan/origin_id_stack_trace.c index 5958a8a..f1289f0 100644 --- a/compiler-rt/test/dfsan/origin_id_stack_trace.c +++ b/compiler-rt/test/dfsan/origin_id_stack_trace.c @@ -5,8 +5,6 @@ // RUN: %clang_dfsan -gmlt -mllvm -dfsan-track-origins=1 -mllvm -dfsan-instrument-with-call-threshold=0 %s -o %t && \ // RUN: %run %t >%t.out 2>&1 // RUN: FileCheck %s < %t.out -// -// REQUIRES: x86_64-target-arch #include #include diff --git a/compiler-rt/test/dfsan/origin_invalid.c b/compiler-rt/test/dfsan/origin_invalid.c index bc54609..b01d49a 100644 --- a/compiler-rt/test/dfsan/origin_invalid.c +++ b/compiler-rt/test/dfsan/origin_invalid.c @@ -1,8 +1,6 @@ // RUN: %clang_dfsan -gmlt -mllvm -dfsan-track-origins=1 %s -o %t && \ // RUN: %run %t >%t.out 2>&1 // RUN: FileCheck %s < %t.out -// -// REQUIRES: x86_64-target-arch #include diff --git a/compiler-rt/test/dfsan/origin_ld_lost.c b/compiler-rt/test/dfsan/origin_ld_lost.c index 3229e5c..776342e 100644 --- a/compiler-rt/test/dfsan/origin_ld_lost.c +++ b/compiler-rt/test/dfsan/origin_ld_lost.c @@ -2,8 +2,6 @@ // RUN: %run %t >%t.out 2>&1 // RUN: FileCheck %s < %t.out // -// REQUIRES: x86_64-target-arch -// // Test origin tracking can lost origins at 2-byte load with addr % 4 == 3. #include diff --git a/compiler-rt/test/dfsan/origin_ldst.c b/compiler-rt/test/dfsan/origin_ldst.c index 5aa7f33..1a950b4 100644 --- a/compiler-rt/test/dfsan/origin_ldst.c +++ b/compiler-rt/test/dfsan/origin_ldst.c @@ -22,8 +22,6 @@ // RUN: %run %t >%t.out 2>&1 // RUN: FileCheck %s < %t.out // -// REQUIRES: x86_64-target-arch -// // Test origin tracking is accurate in terms of partial store/load, and // different aligments. Do not test alignments that are not power of 2. // Compilers do not always allow this. diff --git a/compiler-rt/test/dfsan/origin_limit.c b/compiler-rt/test/dfsan/origin_limit.c index 7998854..2cc7c5f 100644 --- a/compiler-rt/test/dfsan/origin_limit.c +++ b/compiler-rt/test/dfsan/origin_limit.c @@ -8,8 +8,6 @@ // // RUN: DFSAN_OPTIONS=origin_history_size=0 %run %t >%t.out 2>&1 // RUN: FileCheck %s --check-prefix=CHECK0 < %t.out -// -// REQUIRES: x86_64-target-arch #include diff --git a/compiler-rt/test/dfsan/origin_memcpy.c b/compiler-rt/test/dfsan/origin_memcpy.c index 183580d..5632f25 100644 --- a/compiler-rt/test/dfsan/origin_memcpy.c +++ b/compiler-rt/test/dfsan/origin_memcpy.c @@ -5,8 +5,6 @@ // RUN: %clang_dfsan -gmlt -DOFFSET=10 -mllvm -dfsan-track-origins=1 %s -o %t && \ // RUN: %run %t >%t.out 2>&1 // RUN: FileCheck %s --check-prefix=CHECK10 < %t.out -// -// REQUIRES: x86_64-target-arch #include diff --git a/compiler-rt/test/dfsan/origin_memmove.c b/compiler-rt/test/dfsan/origin_memmove.c index 00c3fe5..9ec0504 100644 --- a/compiler-rt/test/dfsan/origin_memmove.c +++ b/compiler-rt/test/dfsan/origin_memmove.c @@ -5,8 +5,6 @@ // RUN: %clang_dfsan -gmlt -DOFFSET=10 -mllvm -dfsan-track-origins=1 %s -o %t && \ // RUN: %run %t >%t.out 2>&1 // RUN: FileCheck %s --check-prefix=CHECK10 < %t.out -// -// REQUIRES: x86_64-target-arch #include diff --git a/compiler-rt/test/dfsan/origin_memset.c b/compiler-rt/test/dfsan/origin_memset.c index 86d4034..bdd3e85 100644 --- a/compiler-rt/test/dfsan/origin_memset.c +++ b/compiler-rt/test/dfsan/origin_memset.c @@ -5,8 +5,6 @@ // RUN: %clang_dfsan -gmlt -DOFFSET=10 -mllvm -dfsan-track-origins=1 %s -o %t && \ // RUN: %run %t >%t.out 2>&1 // RUN: FileCheck %s --check-prefix=CHECK10 < %t.out -// -// REQUIRES: x86_64-target-arch #include diff --git a/compiler-rt/test/dfsan/origin_of_first_taint.c b/compiler-rt/test/dfsan/origin_of_first_taint.c index 45cd614..fc582fa 100644 --- a/compiler-rt/test/dfsan/origin_of_first_taint.c +++ b/compiler-rt/test/dfsan/origin_of_first_taint.c @@ -1,7 +1,5 @@ // RUN: %clang_dfsan -gmlt -mllvm -dfsan-track-origins=1 %s -o %t && \ // RUN: %run %t 2>&1 | FileCheck %s -// -// REQUIRES: x86_64-target-arch #include #include diff --git a/compiler-rt/test/dfsan/origin_overlapped.c b/compiler-rt/test/dfsan/origin_overlapped.c index 60774c8..1758d60a 100644 --- a/compiler-rt/test/dfsan/origin_overlapped.c +++ b/compiler-rt/test/dfsan/origin_overlapped.c @@ -1,8 +1,6 @@ // RUN: %clang_dfsan -gmlt -mllvm -dfsan-track-origins=1 %s -o %t && \ // RUN: %run %t >%t.out 2>&1 // RUN: FileCheck %s < %t.out -// -// REQUIRES: x86_64-target-arch #include diff --git a/compiler-rt/test/dfsan/origin_set_label.c b/compiler-rt/test/dfsan/origin_set_label.c index b8727a6..6b4a35a 100644 --- a/compiler-rt/test/dfsan/origin_set_label.c +++ b/compiler-rt/test/dfsan/origin_set_label.c @@ -5,8 +5,6 @@ // RUN: %clang_dfsan -gmlt -mllvm -dfsan-track-origins=1 -mllvm -dfsan-instrument-with-call-threshold=0 %s -o %t && \ // RUN: %run %t >%t.out 2>&1 // RUN: FileCheck %s < %t.out -// -// REQUIRES: x86_64-target-arch #include diff --git a/compiler-rt/test/dfsan/origin_stack_trace.c b/compiler-rt/test/dfsan/origin_stack_trace.c index c8b964b..e7f167c 100644 --- a/compiler-rt/test/dfsan/origin_stack_trace.c +++ b/compiler-rt/test/dfsan/origin_stack_trace.c @@ -5,8 +5,6 @@ // RUN: %clang_dfsan -gmlt -mllvm -dfsan-track-origins=1 -mllvm -dfsan-instrument-with-call-threshold=0 %s -o %t && \ // RUN: %run %t >%t.out 2>&1 // RUN: FileCheck %s < %t.out -// -// REQUIRES: x86_64-target-arch #include #include diff --git a/compiler-rt/test/dfsan/origin_track_ld.c b/compiler-rt/test/dfsan/origin_track_ld.c index 7affff4..8186c7d 100644 --- a/compiler-rt/test/dfsan/origin_track_ld.c +++ b/compiler-rt/test/dfsan/origin_track_ld.c @@ -1,8 +1,6 @@ // RUN: %clang_dfsan -gmlt -mllvm -dfsan-track-origins=2 %s -o %t && \ // RUN: %run %t > %t.out 2>&1 // RUN: FileCheck %s < %t.out -// -// REQUIRES: x86_64-target-arch #include diff --git a/compiler-rt/test/dfsan/origin_unaligned_memtrans.c b/compiler-rt/test/dfsan/origin_unaligned_memtrans.c index 9da96bf..b465af1 100644 --- a/compiler-rt/test/dfsan/origin_unaligned_memtrans.c +++ b/compiler-rt/test/dfsan/origin_unaligned_memtrans.c @@ -5,8 +5,6 @@ // RUN: %clang_dfsan -gmlt -DOFFSET=10 -mllvm -dfsan-track-origins=1 %s -o %t && \ // RUN: %run %t >%t.out 2>&1 // RUN: FileCheck %s --check-prefix=CHECK10 < %t.out -// -// REQUIRES: x86_64-target-arch #include diff --git a/compiler-rt/test/dfsan/origin_untainted.c b/compiler-rt/test/dfsan/origin_untainted.c index da508cf..cc6ebc5 100644 --- a/compiler-rt/test/dfsan/origin_untainted.c +++ b/compiler-rt/test/dfsan/origin_untainted.c @@ -1,8 +1,6 @@ // RUN: %clang_dfsan -gmlt -mllvm -dfsan-track-origins=1 %s -o %t && \ // RUN: %run %t >%t.out 2>&1 // RUN: FileCheck %s < %t.out -// -// REQUIRES: x86_64-target-arch #include diff --git a/compiler-rt/test/dfsan/origin_with_sigactions.c b/compiler-rt/test/dfsan/origin_with_sigactions.c index d58d842..95395ba 100644 --- a/compiler-rt/test/dfsan/origin_with_sigactions.c +++ b/compiler-rt/test/dfsan/origin_with_sigactions.c @@ -18,8 +18,6 @@ // RUN: %clang_dfsan -gmlt -mllvm -dfsan-instrument-with-call-threshold=0 -mllvm -dfsan-track-origins=1 %s -o %t && \ // RUN: %run %t >%t.out 2>&1 // RUN: FileCheck %s < %t.out -// -// REQUIRES: x86_64-target-arch #include diff --git a/compiler-rt/test/dfsan/origin_with_signals.cpp b/compiler-rt/test/dfsan/origin_with_signals.cpp index 7518f52..22ea439 100644 --- a/compiler-rt/test/dfsan/origin_with_signals.cpp +++ b/compiler-rt/test/dfsan/origin_with_signals.cpp @@ -10,8 +10,6 @@ // RUN: %clangxx_dfsan -gmlt -mllvm -dfsan-instrument-with-call-threshold=0 -mllvm -dfsan-track-origins=1 %s -o %t && \ // RUN: %run %t >%t.out 2>&1 // RUN: FileCheck %s < %t.out -// -// REQUIRES: x86_64-target-arch #include diff --git a/compiler-rt/test/dfsan/pair.cpp b/compiler-rt/test/dfsan/pair.cpp index c794a34..94bbfc7 100644 --- a/compiler-rt/test/dfsan/pair.cpp +++ b/compiler-rt/test/dfsan/pair.cpp @@ -1,7 +1,5 @@ // RUN: %clangxx_dfsan %s -mllvm -dfsan-track-select-control-flow=false -mllvm -dfsan-combine-pointer-labels-on-load=false -O0 -DO0 -o %t && %run %t // RUN: %clangxx_dfsan %s -mllvm -dfsan-track-select-control-flow=false -mllvm -dfsan-combine-pointer-labels-on-load=false -O1 -o %t && %run %t -// -// REQUIRES: x86_64-target-arch #include #include diff --git a/compiler-rt/test/dfsan/propagate.c b/compiler-rt/test/dfsan/propagate.c index 1480235..6a16058 100644 --- a/compiler-rt/test/dfsan/propagate.c +++ b/compiler-rt/test/dfsan/propagate.c @@ -1,6 +1,4 @@ // RUN: %clang_dfsan %s -o %t && %run %t -// -// REQUIRES: x86_64-target-arch // Tests that labels are propagated through computation and that union labels // are properly created. diff --git a/compiler-rt/test/dfsan/pthread.c b/compiler-rt/test/dfsan/pthread.c index f89b77b..c5b195c 100644 --- a/compiler-rt/test/dfsan/pthread.c +++ b/compiler-rt/test/dfsan/pthread.c @@ -7,8 +7,6 @@ // RUN: %clang_dfsan -gmlt -mllvm -dfsan-track-origins=1 -mllvm -dfsan-instrument-with-call-threshold=0 %s -o %t && \ // RUN: %run %t >%t.out 2>&1 // RUN: FileCheck %s < %t.out -// -// REQUIRES: x86_64-target-arch #include diff --git a/compiler-rt/test/dfsan/reaches_function.c b/compiler-rt/test/dfsan/reaches_function.c index 46a2b7b..9e2bcee 100644 --- a/compiler-rt/test/dfsan/reaches_function.c +++ b/compiler-rt/test/dfsan/reaches_function.c @@ -6,8 +6,6 @@ // RUN: %clang_dfsan -gmlt -fsanitize-ignorelist=%S/Inputs/flags_abilist.txt -O2 -mllvm -dfsan-reaches-function-callbacks=1 -mllvm -dfsan-track-origins=2 %s %t-callbacks.o -o %t // RUN: %run %t 2>&1 | FileCheck --check-prefix=CHECK-ORIGIN-TRACKING %s -// REQUIRES: x86_64-target-arch - // Tests that callbacks are inserted for reached functions when // -dfsan-reaches-function-callbacks is specified. diff --git a/compiler-rt/test/dfsan/release_shadow_space.c b/compiler-rt/test/dfsan/release_shadow_space.c index 7dbd228..675640a 100644 --- a/compiler-rt/test/dfsan/release_shadow_space.c +++ b/compiler-rt/test/dfsan/release_shadow_space.c @@ -2,8 +2,6 @@ // DFSAN_OPTIONS=no_huge_pages_for_shadow=true RUN: %clang_dfsan %s -o %t && %run %t // DFSAN_OPTIONS=no_huge_pages_for_shadow=false RUN: %clang_dfsan %s -DORIGIN_TRACKING -mllvm -dfsan-track-origins=1 -o %t && %run %t // DFSAN_OPTIONS=no_huge_pages_for_shadow=true RUN: %clang_dfsan %s -DORIGIN_TRACKING -mllvm -dfsan-track-origins=1 -o %t && %run %t -// -// REQUIRES: x86_64-target-arch #include #include diff --git a/compiler-rt/test/dfsan/sigaction.c b/compiler-rt/test/dfsan/sigaction.c index 2774863..5b22d06 100644 --- a/compiler-rt/test/dfsan/sigaction.c +++ b/compiler-rt/test/dfsan/sigaction.c @@ -1,7 +1,5 @@ // RUN: %clang_dfsan -DUSE_SIGNAL_ACTION -Wno-error=int-conversion %s -o %t && %run %t // RUN: %clang_dfsan -Wno-error=int-conversion %s -o %t && %run %t -// -// REQUIRES: x86_64-target-arch #include diff --git a/compiler-rt/test/dfsan/sigaction_stress_test.c b/compiler-rt/test/dfsan/sigaction_stress_test.c index 8c25fe5..18a1f34 100644 --- a/compiler-rt/test/dfsan/sigaction_stress_test.c +++ b/compiler-rt/test/dfsan/sigaction_stress_test.c @@ -3,8 +3,6 @@ // RUN: %clangxx_dfsan -mllvm -dfsan-track-origins=1 -mllvm -dfsan-instrument-with-call-threshold=0 %s -o %t && %run %t // // Test that the state of shadows from a sigaction handler are consistent. -// -// REQUIRES: x86_64-target-arch #include #include diff --git a/compiler-rt/test/dfsan/stack_trace.c b/compiler-rt/test/dfsan/stack_trace.c index 8033a59..adeb877 100644 --- a/compiler-rt/test/dfsan/stack_trace.c +++ b/compiler-rt/test/dfsan/stack_trace.c @@ -1,7 +1,5 @@ // RUN: %clang_dfsan -gmlt %s -o %t && %run %t >%t.out 2>&1 // RUN: FileCheck %s < %t.out -// -// REQUIRES: x86_64-target-arch #include #include diff --git a/compiler-rt/test/dfsan/struct.c b/compiler-rt/test/dfsan/struct.c index 31d0d6c..7ba0016 100644 --- a/compiler-rt/test/dfsan/struct.c +++ b/compiler-rt/test/dfsan/struct.c @@ -1,7 +1,5 @@ // RUN: %clang_dfsan %s -O1 -o %t && %run %t // RUN: %clang_dfsan %s -O0 -DO0 -o %t && %run %t -// -// REQUIRES: x86_64-target-arch #include #include diff --git a/compiler-rt/test/dfsan/threaded_flush.c b/compiler-rt/test/dfsan/threaded_flush.c index 3f34648..94f4d80 100644 --- a/compiler-rt/test/dfsan/threaded_flush.c +++ b/compiler-rt/test/dfsan/threaded_flush.c @@ -1,8 +1,6 @@ // Tests that doing dfsan_flush() while another thread is executing doesn't // segfault. // RUN: %clang_dfsan %s -o %t && %run %t -// -// REQUIRES: x86_64-target-arch #include #include diff --git a/compiler-rt/test/dfsan/trace-cmp.c b/compiler-rt/test/dfsan/trace-cmp.c index a5e70e9..0645363 100644 --- a/compiler-rt/test/dfsan/trace-cmp.c +++ b/compiler-rt/test/dfsan/trace-cmp.c @@ -3,8 +3,6 @@ // // RUN: %clang_dfsan -fsanitize-coverage=trace-pc-guard,pc-table,func,trace-cmp %s -o %t // RUN: %run %t 2>&1 | FileCheck %s -// -// REQUIRES: x86_64-target-arch #include #include diff --git a/compiler-rt/test/dfsan/vararg.c b/compiler-rt/test/dfsan/vararg.c index f9e62ac..966522a 100644 --- a/compiler-rt/test/dfsan/vararg.c +++ b/compiler-rt/test/dfsan/vararg.c @@ -1,8 +1,6 @@ // RUN: %clang_dfsan %s -o %t // RUN: not %run %t 2>&1 | FileCheck %s // RUN: %run %t foo -// -// REQUIRES: x86_64-target-arch #include diff --git a/compiler-rt/test/dfsan/write_callback.c b/compiler-rt/test/dfsan/write_callback.c index 43cdc22..f5308ce 100644 --- a/compiler-rt/test/dfsan/write_callback.c +++ b/compiler-rt/test/dfsan/write_callback.c @@ -1,6 +1,4 @@ // RUN: %clang_dfsan %s -o %t && %run %t | FileCheck %s -// -// REQUIRES: x86_64-target-arch // Tests that the custom implementation of write() does writes with or without // a callback set using dfsan_set_write_callback(). -- 2.7.4