diff options
author | Joel E. Denny <jdenny.ornl@gmail.com> | 2018-07-11 19:03:00 +0000 |
---|---|---|
committer | Joel E. Denny <jdenny.ornl@gmail.com> | 2018-07-11 19:03:00 +0000 |
commit | 614c986175872eefadaaac94919670bcf18acf4b (patch) | |
tree | af9225162c606630d71848010f662fb5515a7886 /llvm/docs/CommandGuide/FileCheck.rst | |
parent | 72b014051c66b57e006dd801a696fd8a453b5a13 (diff) | |
download | bcm5719-llvm-614c986175872eefadaaac94919670bcf18acf4b.tar.gz bcm5719-llvm-614c986175872eefadaaac94919670bcf18acf4b.zip |
Revert r336830: [FileCheck] Don't permit overlapping CHECK-DAG
Companion patches are failing to commit, and this patch alone breaks
many tests.
llvm-svn: 336833
Diffstat (limited to 'llvm/docs/CommandGuide/FileCheck.rst')
-rw-r--r-- | llvm/docs/CommandGuide/FileCheck.rst | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/llvm/docs/CommandGuide/FileCheck.rst b/llvm/docs/CommandGuide/FileCheck.rst index ac7e81024d1..ae662b5215c 100644 --- a/llvm/docs/CommandGuide/FileCheck.rst +++ b/llvm/docs/CommandGuide/FileCheck.rst @@ -95,13 +95,6 @@ OPTIONS Show the version number of this program. -.. option:: --allow-deprecated-dag-overlap - - Enable overlapping among matches in a group of consecutive ``CHECK-DAG:`` - directives. This option is deprecated and is only provided for convenience - as old tests are migrated to the new non-overlapping ``CHECK-DAG:`` - implementation. - EXIT STATUS ----------- @@ -367,25 +360,6 @@ real bugs away. In those cases, to enforce the order, use a non-DAG directive between DAG-blocks. -A ``CHECK-DAG:`` directive skips matches that overlap the matches of any -preceding ``CHECK-DAG:`` directives in the same ``CHECK-DAG:`` block. Not only -is this non-overlapping behavior consistent with other directives, but it's -also necessary to handle sets of non-unique strings or patterns. For example, -the following directives look for unordered log entries for two tasks in a -parallel program, such as the OpenMP runtime: - -.. code-block:: text - - // CHECK-DAG: [[THREAD_ID:[0-9]+]]: task_begin - // CHECK-DAG: [[THREAD_ID]]: task_end - // - // CHECK-DAG: [[THREAD_ID:[0-9]+]]: task_begin - // CHECK-DAG: [[THREAD_ID]]: task_end - -The second pair of directives is guaranteed not to match the same log entries -as the first pair even though the patterns are identical and even if the text -of the log entries is identical because the thread ID manages to be reused. - The "CHECK-LABEL:" directive ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |