[llvm] f31ea86 - Revert "[Utils] Add a switch controlling prefix warnings in UpdateTestChecks"

[Mircea Trofin via llvm-commits]

Author: Mircea Trofin
Date: 2021-02-08T11:21:56-08:00
New Revision: f31ea86c808cbd841a348e35eb548b0046c8fdf7

URL: https://github.com/llvm/llvm-project/commit/f31ea86c808cbd841a348e35eb548b0046c8fdf7
DIFF: https://github.com/llvm/llvm-project/commit/f31ea86c808cbd841a348e35eb548b0046c8fdf7.diff

LOG: Revert "[Utils] Add a switch controlling prefix warnings in UpdateTestChecks"

This reverts commit 87f8a08ce36e5bc72f11129d2cf36b5848f86f63.

Added: 
    

Modified: 
    llvm/test/tools/UpdateTestChecks/update_llc_test_checks/common-label-different-bodies.test
    llvm/utils/UpdateTestChecks/common.py

Removed: 
    


################################################################################
diff  --git a/llvm/test/tools/UpdateTestChecks/update_llc_test_checks/common-label-
diff erent-bodies.test b/llvm/test/tools/UpdateTestChecks/update_llc_test_checks/common-label-
diff erent-bodies.test
index 4109ce9c24be..409114db02b3 100644
--- a/llvm/test/tools/UpdateTestChecks/update_llc_test_checks/common-label-
diff erent-bodies.test
+++ b/llvm/test/tools/UpdateTestChecks/update_llc_test_checks/common-label-
diff erent-bodies.test
@@ -3,9 +3,7 @@
 # RUN: cp -f %S/Inputs/common-label-
diff erent-bodies-1.ll %t-1.ll
 # RUN: cp -f %S/Inputs/common-label-
diff erent-bodies-2.ll %t-2.ll
 # RUN: cp -f %S/Inputs/common-label-
diff erent-bodies-3.ll %t-3.ll
-# RUN: cp -f %S/Inputs/common-label-
diff erent-bodies-3.ll %t-4.ll
-# RUN: %update_llc_test_checks %t-1.ll 2>&1 | FileCheck %s --check-prefix=WARNINGS
-# RUN: %update_llc_test_checks --disable-verbose-prefix-warnings %t-4.ll 2>&1 | FileCheck %s --check-prefix=NOWARNINGS --allow-empty
+# RUN: %update_llc_test_checks %t-1.ll
 # RUN: %update_llc_test_checks %t-2.ll
 # RUN: %update_llc_test_checks %t-3.ll
 # RUN: FileCheck --input-file=%t-1.ll %s
@@ -13,7 +11,4 @@
 # RUN: FileCheck --input-file=%t-3.ll %s
 
 # CHECK: B-LABEL: fold_v2i64
-# CHECK-NOT: A-LABEL: fold_v2i64
-# WARNINGS: WARNING: Function fold_v2i64 had conflicting output from 
diff erent RUN lines for prefix A
-# WARNINGS: WARNING: Prefix A had conflicting output from 
diff erent RUN lines for all functions
-# NOWARNINGS-NOT: WARNING
\ No newline at end of file
+# CHECK-NOT: A-LABEL: fold_v2i64
\ No newline at end of file

diff  --git a/llvm/utils/UpdateTestChecks/common.py b/llvm/utils/UpdateTestChecks/common.py
index a77dc6319f0e..4befaec651ae 100644
--- a/llvm/utils/UpdateTestChecks/common.py
+++ b/llvm/utils/UpdateTestChecks/common.py
@@ -30,14 +30,9 @@ def parse_commandline_args(parser):
                        help='Activate CHECK line generation from this point forward')
   parser.add_argument('--disable', action='store_false', dest='enabled',
                       help='Deactivate CHECK line generation from this point forward')
-  parser.add_argument('--disable-verbose-prefix-warnings', action='store_false', 
-                      default=True,
-                      dest='verbose_prefix_warnings',
-                      help='Disable warnings about unused prefixes.')
   args = parser.parse_args()
-  global _verbose, _verbose_prefix_warnings
+  global _verbose
   _verbose = args.verbose
-  _verbose_prefix_warnings = args.verbose_prefix_warnings
   return args
 
 
@@ -277,9 +272,8 @@ def __init__(self, run_list, flags, scrubber_args):
         self._func_order.update({prefix: []})
 
   def finish_and_get_func_dict(self):
-    if _verbose_prefix_warnings:
-      for prefix in self._get_failed_prefixes():
-        warn('Prefix %s had conflicting output from 
diff erent RUN lines for all functions' % (prefix,))
+    for prefix in self._get_failed_prefixes():
+      warn('Prefix %s had conflicting output from 
diff erent RUN lines for all functions' % (prefix,))
     return self._func_dict
 
   def func_order(self):
@@ -335,9 +329,6 @@ def process_run_line(self, function_re, scrubber, raw_tool_output, prefixes):
               # so the body can't be common accross RUN lines. We use None to
               # indicate that.
               self._func_dict[prefix][func] = None
-              if _verbose_prefix_warnings:
-                warn('Function %s had conflicting output from 
diff erent RUN lines for prefix %s' % (
-                    func, prefix))
               continue
 
         self._func_dict[prefix][func] = function_body(