Author: Joel E. Denny Date: 2020-05-11T19:41:22-04:00 New Revision: d0e7fd6b624b1943f3780a69883690017d2efad2
URL: https://github.com/llvm/llvm-project/commit/d0e7fd6b624b1943f3780a69883690017d2efad2 DIFF: https://github.com/llvm/llvm-project/commit/d0e7fd6b624b1943f3780a69883690017d2efad2.diff LOG: Revert "[FileCheck] Support comment directives" This reverts commit 9a9a5f9893c8db05cebc8818eb8485bff61f7c74 to try to fix a bot: http://lab.llvm.org:8011/builders/llvm-clang-x86_64-expensive-checks-win/builds/23489 Added: Modified: clang/test/CodeGen/default-address-space.c clang/test/CodeGenOpenCL/addr-space-struct-arg.cl clang/test/Driver/hip-device-libs.hip llvm/docs/CommandGuide/FileCheck.rst llvm/include/llvm/Support/FileCheck.h llvm/lib/Support/FileCheck.cpp llvm/test/Assembler/drop-debug-info-nonzero-alloca.ll llvm/test/FileCheck/first-character-match.txt llvm/test/FileCheck/validate-check-prefix.txt llvm/utils/FileCheck/FileCheck.cpp Removed: llvm/test/FileCheck/comment/after-words.txt llvm/test/FileCheck/comment/bad-comment-prefix.txt llvm/test/FileCheck/comment/blank-comments.txt llvm/test/FileCheck/comment/suffixes.txt llvm/test/FileCheck/comment/suppresses-checks.txt llvm/test/FileCheck/comment/unused-check-prefixes.txt llvm/test/FileCheck/comment/unused-comment-prefixes.txt llvm/test/FileCheck/comment/within-checks.txt ################################################################################ diff --git a/clang/test/CodeGen/default-address-space.c b/clang/test/CodeGen/default-address-space.c index 6b3d7bc2e32a..21ba2b3269c2 100644 --- a/clang/test/CodeGen/default-address-space.c +++ b/clang/test/CodeGen/default-address-space.c @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -triple amdgcn---amdgiz -emit-llvm < %s | FileCheck -check-prefixes=CHECK %s +// RUN: %clang_cc1 -triple amdgcn---amdgiz -emit-llvm < %s | FileCheck -check-prefixes=CHECK,COM %s // CHECK-DAG: @foo = addrspace(1) global i32 0 int foo; @@ -11,17 +11,17 @@ int ban[10]; int *A; int *B; -// CHECK-LABEL: define i32 @test1() +// COM-LABEL: define i32 @test1() // CHECK: load i32, i32* addrspacecast{{[^@]+}} @foo int test1() { return foo; } -// CHECK-LABEL: define i32 @test2(i32 %i) -// CHECK: %[[addr:.*]] = getelementptr +// COM-LABEL: define i32 @test2(i32 %i) +// COM: %[[addr:.*]] = getelementptr // CHECK: load i32, i32* %[[addr]] // CHECK-NEXT: ret i32 int test2(int i) { return ban[i]; } -// CHECK-LABEL: define void @test3() +// COM-LABEL: define void @test3() // CHECK: load i32*, i32** addrspacecast{{.*}} @B // CHECK: load i32, i32* // CHECK: load i32*, i32** addrspacecast{{.*}} @A diff --git a/clang/test/CodeGenOpenCL/addr-space-struct-arg.cl b/clang/test/CodeGenOpenCL/addr-space-struct-arg.cl index e1f3f6fe1419..35cc54c50d6f 100644 --- a/clang/test/CodeGenOpenCL/addr-space-struct-arg.cl +++ b/clang/test/CodeGenOpenCL/addr-space-struct-arg.cl @@ -1,6 +1,6 @@ -// RUN: %clang_cc1 %s -emit-llvm -o - -O0 -ffake-address-space-map -triple i686-pc-darwin | FileCheck -enable-var-scope -check-prefixes=ALL,X86 %s -// RUN: %clang_cc1 %s -emit-llvm -o - -O0 -triple amdgcn | FileCheck -enable-var-scope -check-prefixes=ALL,AMDGCN %s -// RUN: %clang_cc1 %s -emit-llvm -o - -cl-std=CL2.0 -O0 -triple amdgcn | FileCheck -enable-var-scope -check-prefixes=ALL,AMDGCN,AMDGCN20 %s +// RUN: %clang_cc1 %s -emit-llvm -o - -O0 -ffake-address-space-map -triple i686-pc-darwin | FileCheck -enable-var-scope -check-prefixes=COM,X86 %s +// RUN: %clang_cc1 %s -emit-llvm -o - -O0 -triple amdgcn | FileCheck -enable-var-scope -check-prefixes=COM,AMDGCN %s +// RUN: %clang_cc1 %s -emit-llvm -o - -cl-std=CL2.0 -O0 -triple amdgcn | FileCheck -enable-var-scope -check-prefixes=COM,AMDGCN,AMDGCN20 %s // RUN: %clang_cc1 %s -emit-llvm -o - -cl-std=CL1.2 -O0 -triple spir-unknown-unknown-unknown | FileCheck -enable-var-scope -check-prefixes=SPIR %s typedef int int2 __attribute__((ext_vector_type(2))); @@ -50,7 +50,7 @@ Mat4X4 __attribute__((noinline)) foo(Mat3X3 in) { return out; } -// ALL-LABEL: define {{.*}} void @ker +// COM-LABEL: define {{.*}} void @ker // Expect two mem copies: one for the argument "in", and one for // the return value. // X86: call void @llvm.memcpy.p0i8.p1i8.i32(i8* @@ -70,7 +70,7 @@ Mat64X64 __attribute__((noinline)) foo_large(Mat32X32 in) { return out; } -// ALL-LABEL: define {{.*}} void @ker_large +// COM-LABEL: define {{.*}} void @ker_large // Expect two mem copies: one for the argument "in", and one for // the return value. // X86: call void @llvm.memcpy.p0i8.p1i8.i32(i8* diff --git a/clang/test/Driver/hip-device-libs.hip b/clang/test/Driver/hip-device-libs.hip index 6afc48e31dd2..cb1747c2d798 100644 --- a/clang/test/Driver/hip-device-libs.hip +++ b/clang/test/Driver/hip-device-libs.hip @@ -10,7 +10,7 @@ // RUN: --cuda-gpu-arch=gfx803 \ // RUN: --hip-device-lib-path=%S/Inputs/hip_dev_lib \ // RUN: %S/Inputs/hip_multiple_inputs/b.hip \ -// RUN: 2>&1 | FileCheck %s --check-prefixes=ALL,FLUSHD +// RUN: 2>&1 | FileCheck %s --check-prefixes=COM,FLUSHD // Test subtarget with flushing off by ddefault. @@ -18,7 +18,7 @@ // RUN: --cuda-gpu-arch=gfx900 \ // RUN: --hip-device-lib-path=%S/Inputs/hip_dev_lib \ // RUN: %S/Inputs/hip_multiple_inputs/b.hip \ -// RUN: 2>&1 | FileCheck %s --check-prefixes=ALL,NOFLUSHD +// RUN: 2>&1 | FileCheck %s --check-prefixes=COM,NOFLUSHD // Test explicit flag, opposite of target default. @@ -27,7 +27,7 @@ // RUN: -fcuda-flush-denormals-to-zero \ // RUN: --hip-device-lib-path=%S/Inputs/hip_dev_lib \ // RUN: %S/Inputs/hip_multiple_inputs/b.hip \ -// RUN: 2>&1 | FileCheck %s --check-prefixes=ALL,FLUSHD +// RUN: 2>&1 | FileCheck %s --check-prefixes=COM,FLUSHD // Test explicit flag, opposite of target default. @@ -36,7 +36,7 @@ // RUN: -fno-cuda-flush-denormals-to-zero \ // RUN: --hip-device-lib-path=%S/Inputs/hip_dev_lib \ // RUN: %S/Inputs/hip_multiple_inputs/b.hip \ -// RUN: 2>&1 | FileCheck %s --check-prefixes=ALL,NOFLUSHD +// RUN: 2>&1 | FileCheck %s --check-prefixes=COM,NOFLUSHD // Test explicit flag, same as target default. @@ -45,7 +45,7 @@ // RUN: -fno-cuda-flush-denormals-to-zero \ // RUN: --hip-device-lib-path=%S/Inputs/hip_dev_lib \ // RUN: %S/Inputs/hip_multiple_inputs/b.hip \ -// RUN: 2>&1 | FileCheck %s --check-prefixes=ALL,NOFLUSHD +// RUN: 2>&1 | FileCheck %s --check-prefixes=COM,NOFLUSHD // Test explicit flag, same as target default. @@ -54,7 +54,7 @@ // RUN: -fcuda-flush-denormals-to-zero \ // RUN: --hip-device-lib-path=%S/Inputs/hip_dev_lib \ // RUN: %S/Inputs/hip_multiple_inputs/b.hip \ -// RUN: 2>&1 | FileCheck %s --check-prefixes=ALL,FLUSHD +// RUN: 2>&1 | FileCheck %s --check-prefixes=COM,FLUSHD // Test last flag wins, not flushing @@ -63,7 +63,7 @@ // RUN: -fcuda-flush-denormals-to-zero -fno-cuda-flush-denormals-to-zero \ // RUN: --hip-device-lib-path=%S/Inputs/hip_dev_lib \ // RUN: %S/Inputs/hip_multiple_inputs/b.hip \ -// RUN: 2>&1 | FileCheck %s --check-prefixes=ALL,NOFLUSHD +// RUN: 2>&1 | FileCheck %s --check-prefixes=COM,NOFLUSHD // RUN: %clang -### -target x86_64-linux-gnu \ @@ -71,7 +71,7 @@ // RUN: -fcuda-flush-denormals-to-zero -fno-cuda-flush-denormals-to-zero \ // RUN: --hip-device-lib-path=%S/Inputs/hip_dev_lib \ // RUN: %S/Inputs/hip_multiple_inputs/b.hip \ -// RUN: 2>&1 | FileCheck %s --check-prefixes=ALL,NOFLUSHD +// RUN: 2>&1 | FileCheck %s --check-prefixes=COM,NOFLUSHD // RUN: %clang -### -target x86_64-linux-gnu \ @@ -79,7 +79,7 @@ // RUN: -fno-cuda-flush-denormals-to-zero -fcuda-flush-denormals-to-zero \ // RUN: --hip-device-lib-path=%S/Inputs/hip_dev_lib \ // RUN: %S/Inputs/hip_multiple_inputs/b.hip \ -// RUN: 2>&1 | FileCheck %s --check-prefixes=ALL,FLUSHD +// RUN: 2>&1 | FileCheck %s --check-prefixes=COM,FLUSHD // RUN: %clang -### -target x86_64-linux-gnu \ @@ -87,7 +87,7 @@ // RUN: -fno-cuda-flush-denormals-to-zero -fcuda-flush-denormals-to-zero \ // RUN: --hip-device-lib-path=%S/Inputs/hip_dev_lib \ // RUN: %S/Inputs/hip_multiple_inputs/b.hip \ -// RUN: 2>&1 | FileCheck %s --check-prefixes=ALL,FLUSHD +// RUN: 2>&1 | FileCheck %s --check-prefixes=COM,FLUSHD // Test environment variable HIP_DEVICE_LIB_PATH @@ -96,11 +96,11 @@ // RUN: %clang -### -target x86_64-linux-gnu \ // RUN: --cuda-gpu-arch=gfx900 \ // RUN: %S/Inputs/hip_multiple_inputs/b.hip \ -// RUN: 2>&1 | FileCheck %s --check-prefixes=ALL +// RUN: 2>&1 | FileCheck %s --check-prefixes=COM -// ALL: {{"[^"]*clang[^"]*"}} -// ALL-SAME: "-mlink-builtin-bitcode" "{{.*}}hip.amdgcn.bc" -// ALL-SAME: "-mlink-builtin-bitcode" "{{.*}}ocml.amdgcn.bc" -// ALL-SAME: "-mlink-builtin-bitcode" "{{.*}}ockl.amdgcn.bc" +// COM: {{"[^"]*clang[^"]*"}} +// COM-SAME: "-mlink-builtin-bitcode" "{{.*}}hip.amdgcn.bc" +// COM-SAME: "-mlink-builtin-bitcode" "{{.*}}ocml.amdgcn.bc" +// COM-SAME: "-mlink-builtin-bitcode" "{{.*}}ockl.amdgcn.bc" // FLUSHD-SAME: "-mlink-builtin-bitcode" "{{.*}}oclc_daz_opt_on.amdgcn.bc" // NOFLUSHD-SAME: "-mlink-builtin-bitcode" "{{.*}}oclc_daz_opt_off.amdgcn.bc" diff --git a/llvm/docs/CommandGuide/FileCheck.rst b/llvm/docs/CommandGuide/FileCheck.rst index 7d9a69e127b9..55fc3f0cabfe 100644 --- a/llvm/docs/CommandGuide/FileCheck.rst +++ b/llvm/docs/CommandGuide/FileCheck.rst @@ -39,31 +39,15 @@ and from the command line. match. By default, these patterns are prefixed with "``CHECK:``". If you'd like to use a diff erent prefix (e.g. because the same input file is checking multiple diff erent tool or options), the - :option:`--check-prefix` argument allows you to specify (without the trailing - "``:``") one or more prefixes to match. Multiple prefixes are useful for tests - which might change for diff erent run options, but most lines remain the same. - - FileCheck does not permit duplicate prefixes, even if one is a check prefix - and one is a comment prefix (see :option:`--comment-prefixes` below). + :option:`--check-prefix` argument allows you to specify one or more + prefixes to match. Multiple prefixes are useful for tests which might + change for diff erent run options, but most lines remain the same. .. option:: --check-prefixes prefix1,prefix2,... An alias of :option:`--check-prefix` that allows multiple prefixes to be specified as a comma separated list. -.. option:: --comment-prefixes prefix1,prefix2,... - - By default, FileCheck ignores any occurrence in ``match-filename`` of any check - prefix if it is preceded on the same line by "``COM:``" or "``RUN:``". See the - section `The "COM:" directive`_ for usage details. - - These default comment prefixes can be overridden by - :option:`--comment-prefixes` if they are not appropriate for your testing - environment. However, doing so is not recommended in LLVM's LIT-based test - suites, which should be easier to maintain if they all follow a consistent - comment style. In that case, consider proposing a change to the default - comment prefixes instead. - .. option:: --input-file filename File to check (defaults to stdin). @@ -252,57 +236,6 @@ circumstances, for example, testing diff erent architectural variants with In this case, we're testing that we get the expected code generation with both 32-bit and 64-bit code generation. -The "COM:" directive -~~~~~~~~~~~~~~~~~~~~ - -Sometimes you want to disable a FileCheck directive without removing it -entirely, or you want to write comments that mention a directive by name. The -"``COM:``" directive makes it easy to do this. For example, you might have: - -.. code-block:: llvm - - ; X32: pinsrd_1: - ; X32: pinsrd $1, 4(%esp), %xmm0 - - ; COM: FIXME: X64 isn't working correctly yet for this part of codegen, but - ; COM: X64 will have something similar to X32: - ; COM: - ; COM: X64: pinsrd_1: - ; COM: X64: pinsrd $1, %edi, %xmm0 - -Without "``COM:``", you would need to use some combination of rewording and -directive syntax mangling to prevent FileCheck from recognizing the commented -occurrences of "``X32:``" and "``X64:``" above as directives. Moreover, -FileCheck diagnostics have been proposed that might complain about the above -occurrences of "``X64``" that don't have the trailing "``:``" because they look -like directive typos. Dodging all these problems can be tedious for a test -author, and directive syntax mangling can make the purpose of test code unclear. -"``COM:``" avoids all these problems. - -A few important usage notes: - -* "``COM:``" within another directive's pattern does *not* comment out the - remainder of the pattern. For example: - - .. code-block:: llvm - - ; X32: pinsrd $1, 4(%esp), %xmm0 COM: This is part of the X32 pattern! - - If you need to temporarily comment out part of a directive's pattern, move it - to another line. The reason is that FileCheck parses "``COM:``" in the same - manner as any other directive: only the first directive on the line is - recognized as a directive. - -* For the sake of LIT, FileCheck treats "``RUN:``" just like "``COM:``". If this - is not suitable for your test environment, see :option:`--comment-prefixes`. - -* FileCheck does not recognize "``COM``", "``RUN``", or any user-defined comment - prefix as a comment directive if it's combined with one of the usual check - directive suffixes, such as "``-NEXT:``" or "``-NOT:``", discussed below. - FileCheck treats such a combination as plain text instead. If it needs to act - as a comment directive for your test environment, define it as such with - :option:`--comment-prefixes`. - The "CHECK-NEXT:" directive ~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/llvm/include/llvm/Support/FileCheck.h b/llvm/include/llvm/Support/FileCheck.h index 2f0e641394d5..0d1f92bbbf80 100644 --- a/llvm/include/llvm/Support/FileCheck.h +++ b/llvm/include/llvm/Support/FileCheck.h @@ -25,7 +25,6 @@ namespace llvm { /// Contains info about various FileCheck options. struct FileCheckRequest { std::vector<StringRef> CheckPrefixes; - std::vector<StringRef> CommentPrefixes; bool NoCanonicalizeWhiteSpace = false; std::vector<StringRef> ImplicitCheckNot; std::vector<StringRef> GlobalDefines; @@ -54,7 +53,6 @@ enum FileCheckKind { CheckDAG, CheckLabel, CheckEmpty, - CheckComment, /// Indicates the pattern only matches the end of file. This is used for /// trailing CHECK-NOTs. diff --git a/llvm/lib/Support/FileCheck.cpp b/llvm/lib/Support/FileCheck.cpp index 9cdb14cf3b00..369b6dfa7edf 100644 --- a/llvm/lib/Support/FileCheck.cpp +++ b/llvm/lib/Support/FileCheck.cpp @@ -1110,8 +1110,6 @@ std::string Check::FileCheckType::getDescription(StringRef Prefix) const { return Prefix.str() + "-LABEL"; case Check::CheckEmpty: return Prefix.str() + "-EMPTY"; - case Check::CheckComment: - return std::string(Prefix); case Check::CheckEOF: return "implicit EOF"; case Check::CheckBadNot: @@ -1123,24 +1121,13 @@ std::string Check::FileCheckType::getDescription(StringRef Prefix) const { } static std::pair<Check::FileCheckType, StringRef> -FindCheckType(const FileCheckRequest &Req, StringRef Buffer, StringRef Prefix) { +FindCheckType(StringRef Buffer, StringRef Prefix) { if (Buffer.size() <= Prefix.size()) return {Check::CheckNone, StringRef()}; char NextChar = Buffer[Prefix.size()]; StringRef Rest = Buffer.drop_front(Prefix.size() + 1); - - // Check for comment. - if (Req.CommentPrefixes.end() != std::find(Req.CommentPrefixes.begin(), - Req.CommentPrefixes.end(), - Prefix)) { - if (NextChar == ':') - return {Check::CheckComment, Rest}; - // Ignore a comment prefix if it has a suffix like "-NOT". - return {Check::CheckNone, StringRef()}; - } - // Verify that the : is present after the prefix. if (NextChar == ':') return {Check::CheckPlain, Rest}; @@ -1219,9 +1206,8 @@ static size_t SkipWord(StringRef Str, size_t Loc) { /// If no valid prefix is found, the state of Buffer, LineNumber, and CheckTy /// is unspecified. static std::pair<StringRef, StringRef> -FindFirstMatchingPrefix(const FileCheckRequest &Req, Regex &PrefixRE, - StringRef &Buffer, unsigned &LineNumber, - Check::FileCheckType &CheckTy) { +FindFirstMatchingPrefix(Regex &PrefixRE, StringRef &Buffer, + unsigned &LineNumber, Check::FileCheckType &CheckTy) { SmallVector<StringRef, 2> Matches; while (!Buffer.empty()) { @@ -1249,7 +1235,7 @@ FindFirstMatchingPrefix(const FileCheckRequest &Req, Regex &PrefixRE, if (Skipped.empty() || !IsPartOfWord(Skipped.back())) { // Now extract the type. StringRef AfterSuffix; - std::tie(CheckTy, AfterSuffix) = FindCheckType(Req, Buffer, Prefix); + std::tie(CheckTy, AfterSuffix) = FindCheckType(Buffer, Prefix); // If we've found a valid check type for this prefix, we're done. if (CheckTy != Check::CheckNone) @@ -1330,7 +1316,7 @@ bool FileCheck::readCheckFile( // found. unsigned LineNumber = 1; - bool FoundUsedCheckPrefix = false; + bool FoundUsedPrefix = false; while (1) { Check::FileCheckType CheckTy; @@ -1338,11 +1324,10 @@ bool FileCheck::readCheckFile( StringRef UsedPrefix; StringRef AfterSuffix; std::tie(UsedPrefix, AfterSuffix) = - FindFirstMatchingPrefix(Req, PrefixRE, Buffer, LineNumber, CheckTy); + FindFirstMatchingPrefix(PrefixRE, Buffer, LineNumber, CheckTy); if (UsedPrefix.empty()) break; - if (CheckTy != Check::CheckComment) - FoundUsedCheckPrefix = true; + FoundUsedPrefix = true; assert(UsedPrefix.data() == Buffer.data() && "Failed to move Buffer's start forward, or pointed prefix outside " @@ -1385,17 +1370,9 @@ bool FileCheck::readCheckFile( // Remember the location of the start of the pattern, for diagnostics. SMLoc PatternLoc = SMLoc::getFromPointer(Buffer.data()); - // Extract the pattern from the buffer. - StringRef PatternBuffer = Buffer.substr(0, EOL); - Buffer = Buffer.substr(EOL); - - // If this is a comment, we're done. - if (CheckTy == Check::CheckComment) - continue; - // Parse the pattern. Pattern P(CheckTy, PatternContext.get(), LineNumber); - if (P.parsePattern(PatternBuffer, UsedPrefix, SM, Req)) + if (P.parsePattern(Buffer.substr(0, EOL), UsedPrefix, SM, Req)) return true; // Verify that CHECK-LABEL lines do not define or use variables @@ -1407,6 +1384,8 @@ bool FileCheck::readCheckFile( return true; } + Buffer = Buffer.substr(EOL); + // Verify that CHECK-NEXT/SAME/EMPTY lines have at least one CHECK line before them. if ((CheckTy == Check::CheckNext || CheckTy == Check::CheckSame || CheckTy == Check::CheckEmpty) && @@ -1435,7 +1414,7 @@ bool FileCheck::readCheckFile( // When there are no used prefixes we report an error except in the case that // no prefix is specified explicitly but -implicit-check-not is specified. - if (!FoundUsedCheckPrefix && + if (!FoundUsedPrefix && (ImplicitNegativeChecks.empty() || !Req.IsDefaultCheckPrefix)) { errs() << "error: no check strings found with prefix" << (Req.CheckPrefixes.size() > 1 ? "es " : " "); @@ -1895,76 +1874,50 @@ size_t FileCheckString::CheckDag(const SourceMgr &SM, StringRef Buffer, return StartPos; } -static bool ValidatePrefixes(StringRef Kind, StringSet<> &UniquePrefixes, +static bool ValidatePrefixes(StringSet<> &UniquePrefixes, ArrayRef<StringRef> SuppliedPrefixes) { for (StringRef Prefix : SuppliedPrefixes) { if (Prefix.empty()) { - errs() << "error: supplied " << Kind << " prefix must not be the empty " - << "string\n"; + errs() << "error: supplied check prefix must not be the empty string\n"; return false; } static const Regex Validator("^[a-zA-Z0-9_-]*$"); if (!Validator.match(Prefix)) { - errs() << "error: supplied " << Kind << " prefix must start with a " - << "letter and contain only alphanumeric characters, hyphens, and " + errs() << "error: supplied check prefix must start with a letter and " + << "contain only alphanumeric characters, hyphens, and " << "underscores: '" << Prefix << "'\n"; return false; } if (!UniquePrefixes.insert(Prefix).second) { - errs() << "error: supplied " << Kind << " prefix must be unique among " - << "check and comment prefixes: '" << Prefix << "'\n"; + errs() << "error: supplied check prefix must be unique among check " + << "prefixes: '" << Prefix << "'\n"; return false; } } return true; } -static const char *DefaultCheckPrefixes[] = {"CHECK"}; -static const char *DefaultCommentPrefixes[] = {"COM", "RUN"}; - bool FileCheck::ValidateCheckPrefixes() { StringSet<> UniquePrefixes; - // Add default prefixes to catch user-supplied duplicates of them below. - if (Req.CheckPrefixes.empty()) { - for (const char *Prefix : DefaultCheckPrefixes) - UniquePrefixes.insert(Prefix); - } - if (Req.CommentPrefixes.empty()) { - for (const char *Prefix : DefaultCommentPrefixes) - UniquePrefixes.insert(Prefix); - } - // Do not validate the default prefixes, or diagnostics about duplicates might - // incorrectly indicate that they were supplied by the user. - if (!ValidatePrefixes("check", UniquePrefixes, Req.CheckPrefixes)) - return false; - if (!ValidatePrefixes("comment", UniquePrefixes, Req.CommentPrefixes)) + if (!ValidatePrefixes(UniquePrefixes, Req.CheckPrefixes)) return false; return true; } Regex FileCheck::buildCheckPrefixRegex() { if (Req.CheckPrefixes.empty()) { - for (const char *Prefix : DefaultCheckPrefixes) - Req.CheckPrefixes.push_back(Prefix); + Req.CheckPrefixes.push_back("CHECK"); Req.IsDefaultCheckPrefix = true; } - if (Req.CommentPrefixes.empty()) { - for (const char *Prefix : DefaultCommentPrefixes) - Req.CommentPrefixes.push_back(Prefix); - } - // We already validated the contents of CheckPrefixes and CommentPrefixes so - // just concatenate them as alternatives. + // We already validated the contents of CheckPrefixes so just concatenate + // them as alternatives. SmallString<32> PrefixRegexStr; for (size_t I = 0, E = Req.CheckPrefixes.size(); I != E; ++I) { if (I != 0) PrefixRegexStr.push_back('|'); PrefixRegexStr.append(Req.CheckPrefixes[I]); } - for (StringRef Prefix : Req.CommentPrefixes) { - PrefixRegexStr.push_back('|'); - PrefixRegexStr.append(Prefix); - } return Regex(PrefixRegexStr); } diff --git a/llvm/test/Assembler/drop-debug-info-nonzero-alloca.ll b/llvm/test/Assembler/drop-debug-info-nonzero-alloca.ll index 3e2aefb0e11b..739edbacde99 100644 --- a/llvm/test/Assembler/drop-debug-info-nonzero-alloca.ll +++ b/llvm/test/Assembler/drop-debug-info-nonzero-alloca.ll @@ -1,7 +1,7 @@ -; RUN: llvm-as < %s -o %t.bc -data-layout=A5 2>&1 | FileCheck -check-prefixes=ALL,AS %s -; RUN: llvm-dis < %t.bc | FileCheck -check-prefixes=ALL,DIS %s -; RUN: opt < %s -S -data-layout=A5 2>&1 | FileCheck -check-prefixes=ALL,AS %s -; RUN: opt < %t.bc -S | FileCheck -check-prefixes=ALL,DIS %s +; RUN: llvm-as < %s -o %t.bc -data-layout=A5 2>&1 | FileCheck -check-prefixes=COM,AS %s +; RUN: llvm-dis < %t.bc | FileCheck -check-prefixes=COM,DIS %s +; RUN: opt < %s -S -data-layout=A5 2>&1 | FileCheck -check-prefixes=COM,AS %s +; RUN: opt < %t.bc -S | FileCheck -check-prefixes=COM,DIS %s define void @foo() { entry: @@ -12,7 +12,7 @@ entry: metadata i8* undef, metadata !DILocalVariable(scope: !1), metadata !DIExpression()) -; ALL-NOT: Allocation instruction pointer not in the stack address space! +; COM-NOT: Allocation instruction pointer not in the stack address space! ; AS: llvm.dbg.value intrinsic requires a !dbg attachment ; AS: warning: ignoring invalid debug info in <stdin> ret void diff --git a/llvm/test/FileCheck/comment/after-words.txt b/llvm/test/FileCheck/comment/after-words.txt deleted file mode 100644 index 46eeb657f015..000000000000 --- a/llvm/test/FileCheck/comment/after-words.txt +++ /dev/null @@ -1,16 +0,0 @@ -# Comment prefixes are not recognized at ends of words. - -RUN: echo 'foo' > %t.in -RUN: echo 'bar' >> %t.in -RUN: echo 'foo' >> %t.in -RUN: echo 'bar' >> %t.in -RUN: echo 'FOO-COM: CHECK: foo' > %t.chk -RUN: echo 'RUN_COM: CHECK: bar' >> %t.chk -RUN: echo 'RUN3COM: CHECK: foo' >> %t.chk -RUN: echo ' COMRUN: CHECK: bar' >> %t.chk -RUN: %ProtectFileCheckOutput FileCheck -vv %t.chk < %t.in 2>&1 | FileCheck %s - -CHECK: .chk:1:17: remark: CHECK: expected string found in input -CHECK: .chk:2:17: remark: CHECK: expected string found in input -CHECK: .chk:3:17: remark: CHECK: expected string found in input -CHECK: .chk:4:17: remark: CHECK: expected string found in input diff --git a/llvm/test/FileCheck/comment/bad-comment-prefix.txt b/llvm/test/FileCheck/comment/bad-comment-prefix.txt deleted file mode 100644 index 58a8873da321..000000000000 --- a/llvm/test/FileCheck/comment/bad-comment-prefix.txt +++ /dev/null @@ -1,48 +0,0 @@ -# Bad comment prefixes are diagnosed. - -# Check empty comment prefix. -RUN: %ProtectFileCheckOutput not FileCheck /dev/null < /dev/null 2>&1 \ -RUN: -comment-prefixes= | \ -RUN: FileCheck -check-prefix=PREFIX-EMPTY %s -RUN: %ProtectFileCheckOutput not FileCheck /dev/null < /dev/null 2>&1 \ -RUN: -comment-prefixes=,FOO | \ -RUN: FileCheck -check-prefix=PREFIX-EMPTY %s -RUN: %ProtectFileCheckOutput not FileCheck /dev/null < /dev/null 2>&1 \ -RUN: -comment-prefixes=FOO, | \ -RUN: FileCheck -check-prefix=PREFIX-EMPTY %s -RUN: %ProtectFileCheckOutput not FileCheck /dev/null < /dev/null 2>&1 \ -RUN: -comment-prefixes=FOO,,BAR | \ -RUN: FileCheck -check-prefix=PREFIX-EMPTY %s -PREFIX-EMPTY: error: supplied comment prefix must not be the empty string - -# Check invalid characters in comment prefix. -RUN: %ProtectFileCheckOutput not FileCheck /dev/null < /dev/null 2>&1 \ -RUN: -comment-prefixes=. | \ -RUN: FileCheck -check-prefix=PREFIX-BAD-CHAR1 %s -RUN: %ProtectFileCheckOutput not FileCheck /dev/null < /dev/null 2>&1 \ -RUN: -comment-prefixes='foo ' | \ -RUN: FileCheck -check-prefix=PREFIX-BAD-CHAR2 %s -PREFIX-BAD-CHAR1: error: supplied comment prefix must start with a letter and contain only alphanumeric characters, hyphens, and underscores: '.' -PREFIX-BAD-CHAR2: error: supplied comment prefix must start with a letter and contain only alphanumeric characters, hyphens, and underscores: 'foo ' - -# Check duplicate comment prefixes. -RUN: %ProtectFileCheckOutput not FileCheck /dev/null < /dev/null 2>&1 \ -RUN: -comment-prefixes=FOO,BAR,BAZ,BAR | \ -RUN: FileCheck -check-prefix=COMMENT-PREFIX-DUP %s -COMMENT-PREFIX-DUP: error: supplied comment prefix must be unique among check and comment prefixes: 'BAR' - -# Check user-supplied check prefix that duplicates a default comment prefix. -RUN: %ProtectFileCheckOutput not FileCheck /dev/null < /dev/null 2>&1 \ -RUN: -check-prefixes=FOO,COM | \ -RUN: FileCheck -check-prefix=CHECK-PREFIX-DUP-COM %s -RUN: %ProtectFileCheckOutput not FileCheck /dev/null < /dev/null 2>&1 \ -RUN: -check-prefixes=RUN,FOO | \ -RUN: FileCheck -check-prefix=CHECK-PREFIX-DUP-RUN_ %s -CHECK-PREFIX-DUP-COM: error: supplied check prefix must be unique among check and comment prefixes: 'COM' -CHECK-PREFIX-DUP-RUN_: error: supplied check prefix must be unique among check and comment prefixes: 'RUN' - -# Check user-supplied comment prefix that duplicates default check prefixes. -RUN: %ProtectFileCheckOutput not FileCheck /dev/null < /dev/null 2>&1 \ -RUN: -comment-prefixes=CHECK | \ -RUN: FileCheck -check-prefix=COMMENT-PREFIX-DUP-CHECK %s -COMMENT-PREFIX-DUP-CHECK: error: supplied comment prefix must be unique among check and comment prefixes: 'CHECK' diff --git a/llvm/test/FileCheck/comment/blank-comments.txt b/llvm/test/FileCheck/comment/blank-comments.txt deleted file mode 100644 index b035ddd750d0..000000000000 --- a/llvm/test/FileCheck/comment/blank-comments.txt +++ /dev/null @@ -1,9 +0,0 @@ -# Comment directives with blank contents are fine. - -RUN: echo 'foo' > %t.in -RUN: echo 'COM:' > %t.chk -RUN: echo 'CHECK: foo' >> %t.chk -RUN: echo ' COM: ' >> %t.chk -RUN: %ProtectFileCheckOutput FileCheck -vv %t.chk < %t.in 2>&1 | FileCheck %s - -CHECK: .chk:2:8: remark: CHECK: expected string found in input diff --git a/llvm/test/FileCheck/comment/suffixes.txt b/llvm/test/FileCheck/comment/suffixes.txt deleted file mode 100644 index 47805b46d0c9..000000000000 --- a/llvm/test/FileCheck/comment/suffixes.txt +++ /dev/null @@ -1,22 +0,0 @@ -# Comment prefixes plus check directive suffixes are not comment directives -# and are treated as plain text. - -RUN: echo foo > %t.in -RUN: echo bar >> %t.in -RUN: echo 'COM-NEXT: CHECK: foo' > %t.chk -RUN: echo 'RUN-NOT: CHECK: bar' >> %t.chk - -RUN: %ProtectFileCheckOutput FileCheck -vv %t.chk < %t.in 2>&1 | \ -RUN: FileCheck -check-prefix=CHECK1 %s - -CHECK1: .chk:1:18: remark: CHECK: expected string found in input -CHECK1: .chk:2:17: remark: CHECK: expected string found in input - -# But we can define them as comment prefixes. - -RUN: %ProtectFileCheckOutput \ -RUN: FileCheck -vv -comment-prefixes=COM,RUN,RUN-NOT %t.chk < %t.in 2>&1 | \ -RUN: FileCheck -check-prefix=CHECK2 %s - -CHECK2: .chk:1:18: remark: CHECK: expected string found in input -CHECK2-NOT: .chk:2 diff --git a/llvm/test/FileCheck/comment/suppresses-checks.txt b/llvm/test/FileCheck/comment/suppresses-checks.txt deleted file mode 100644 index 98f01811f53f..000000000000 --- a/llvm/test/FileCheck/comment/suppresses-checks.txt +++ /dev/null @@ -1,33 +0,0 @@ -# Comment directives successfully comment out check directives. - -# Check all default comment prefixes. -# Check that a comment directive at the beginning/end of the file is handled. -# Check that the preceding/following line's check directive is not affected. -RUN: echo 'foo' > %t-1.in -RUN: echo 'COM: CHECK: bar' > %t-1.chk -RUN: echo 'CHECK: foo' >> %t-1.chk -RUN: echo 'RUN: echo "CHECK: baz"' >> %t-1.chk -RUN: %ProtectFileCheckOutput FileCheck -vv %t-1.chk < %t-1.in 2>&1 | \ -RUN: FileCheck -DCHECK_LINE=2 %s - -# Check the case of one user-specified comment prefix. -# Check that a comment directive not at the beginning of a line is handled. -RUN: echo 'foo' > %t-2.in -RUN: echo 'CHECK: foo' > %t-2.chk -RUN: echo 'letters then space MY-PREFIX: CHECK: bar' >> %t-2.chk -RUN: %ProtectFileCheckOutput \ -RUN: FileCheck -vv %t-2.chk -comment-prefixes=MY-PREFIX < %t-2.in 2>&1 | \ -RUN: FileCheck -DCHECK_LINE=1 %s - -# Check the case of multiple user-specified comment prefixes. -RUN: echo 'foo' > %t-3.in -RUN: echo 'Bar_2: CHECK: Bar' > %t-3.chk -RUN: echo 'CHECK: foo' >> %t-3.chk -RUN: echo 'Foo_1: CHECK: Foo' >> %t-3.chk -RUN: echo 'Baz_3: CHECK: Baz' >> %t-3.chk -RUN: %ProtectFileCheckOutput \ -RUN: FileCheck -vv %t-3.chk -comment-prefixes=Foo_1,Bar_2 \ -RUN: -comment-prefixes=Baz_3 < %t-3.in 2>&1 | \ -RUN: FileCheck -DCHECK_LINE=2 %s - -CHECK: .chk:[[CHECK_LINE]]:8: remark: CHECK: expected string found in input diff --git a/llvm/test/FileCheck/comment/unused-check-prefixes.txt b/llvm/test/FileCheck/comment/unused-check-prefixes.txt deleted file mode 100644 index 6c3f8303d4f6..000000000000 --- a/llvm/test/FileCheck/comment/unused-check-prefixes.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Comment directives do not suppress diagnostics for unused check prefixes. - -RUN: echo 'foo' > %t.in -RUN: echo 'COM: foo' > %t.chk -RUN: echo 'RUN: echo' >> %t.chk -RUN: %ProtectFileCheckOutput not FileCheck %t.chk < %t.in 2>&1 | FileCheck %s - -CHECK: error: no check strings found with prefix 'CHECK:' diff --git a/llvm/test/FileCheck/comment/unused-comment-prefixes.txt b/llvm/test/FileCheck/comment/unused-comment-prefixes.txt deleted file mode 100644 index 29212ecb6aad..000000000000 --- a/llvm/test/FileCheck/comment/unused-comment-prefixes.txt +++ /dev/null @@ -1,16 +0,0 @@ -# Not using comment directives is always fine. - -RUN: echo 'foo' > %t.in -RUN: echo 'CHECK: foo' > %t.chk - -# Check the case of default comment prefixes. -RUN: %ProtectFileCheckOutput \ -RUN: FileCheck -vv %t.chk < %t.in 2>&1 | FileCheck %s - -# Specifying non-default comment prefixes doesn't mean you have to use them. -# For example, they might be applied to an entire test suite via -# FILECHECK_OPTS or via a wrapper command or substitution. -RUN: %ProtectFileCheckOutput \ -RUN: FileCheck -vv -comment-prefixes=FOO %t.chk < %t.in 2>&1 | FileCheck %s - -CHECK: .chk:1:8: remark: CHECK: expected string found in input diff --git a/llvm/test/FileCheck/comment/within-checks.txt b/llvm/test/FileCheck/comment/within-checks.txt deleted file mode 100644 index b488edbf3610..000000000000 --- a/llvm/test/FileCheck/comment/within-checks.txt +++ /dev/null @@ -1,8 +0,0 @@ -# A comment directive is not recognized within a check directive's pattern and -# thus does not comment out the remainder of the pattern. - -RUN: echo 'foo' > %t.in -RUN: echo 'CHECK: foo COM: bar' > %t.chk -RUN: %ProtectFileCheckOutput not FileCheck %t.chk < %t.in 2>&1 | FileCheck %s - -CHECK: .chk:1:8: error: CHECK: expected string not found in input diff --git a/llvm/test/FileCheck/first-character-match.txt b/llvm/test/FileCheck/first-character-match.txt index 3c8b1539cdc6..4b09c21df58d 100644 --- a/llvm/test/FileCheck/first-character-match.txt +++ b/llvm/test/FileCheck/first-character-match.txt @@ -1,2 +1,2 @@ -RUN: FileCheck -check-prefix=RUN --comment-prefixes=COM -input-file %s %s +RUN: FileCheck -check-prefix=RUN -input-file %s %s // Prefix is at the first character in the file. The run line then matches itself. diff --git a/llvm/test/FileCheck/validate-check-prefix.txt b/llvm/test/FileCheck/validate-check-prefix.txt index af43afded1b3..29f352cb1bd9 100644 --- a/llvm/test/FileCheck/validate-check-prefix.txt +++ b/llvm/test/FileCheck/validate-check-prefix.txt @@ -8,6 +8,6 @@ foobar ; BAD_PREFIX: supplied check prefix must start with a letter and contain only alphanumeric characters, hyphens, and underscores: 'A!' -; DUPLICATE_PREFIX: error: supplied check prefix must be unique among check and comment prefixes: 'REPEAT' +; DUPLICATE_PREFIX: error: supplied check prefix must be unique among check prefixes: 'REPEAT' ; EMPTY_PREFIX: error: supplied check prefix must not be the empty string diff --git a/llvm/utils/FileCheck/FileCheck.cpp b/llvm/utils/FileCheck/FileCheck.cpp index 3ee7c5a66a90..46821ece7cd9 100644 --- a/llvm/utils/FileCheck/FileCheck.cpp +++ b/llvm/utils/FileCheck/FileCheck.cpp @@ -44,14 +44,6 @@ static cl::alias CheckPrefixesAlias( cl::desc( "Alias for -check-prefix permitting multiple comma separated values")); -static cl::list<std::string> CommentPrefixes( - "comment-prefixes", cl::CommaSeparated, cl::Hidden, - cl::desc("Comma-separated list of comment prefixes to use from check file\n" - "(defaults to 'COM,RUN'). Please avoid using this feature in\n" - "LLVM's LIT-based test suites, which should be easier to\n" - "maintain if they all follow a consistent comment style. This\n" - "feature is meant for non-LIT test suites using FileCheck.")); - static cl::opt<bool> NoCanonicalizeWhiteSpace( "strict-whitespace", cl::desc("Do not treat all horizontal whitespace as equivalent")); @@ -287,8 +279,6 @@ std::string GetCheckTypeAbbreviation(Check::FileCheckType Ty) { return "label"; case Check::CheckEmpty: return "empty"; - case Check::CheckComment: - return "com"; case Check::CheckEOF: return "eof"; case Check::CheckBadNot: @@ -575,9 +565,6 @@ int main(int argc, char **argv) { for (StringRef Prefix : CheckPrefixes) Req.CheckPrefixes.push_back(Prefix); - for (StringRef Prefix : CommentPrefixes) - Req.CommentPrefixes.push_back(Prefix); - for (StringRef CheckNot : ImplicitCheckNot) Req.ImplicitCheckNot.push_back(CheckNot); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
