Remove --skip-check-label

pmatos · pmatos · commit 746bef5412dc · 2023-09-21T12:37:58.000+02:00
Simplify regexp based on suggestions and update testcase (now broken).
diff --git a/llvm/lib/Target/SPIRV/SPIRVAsmPrinter.cpp b/llvm/lib/Target/SPIRV/SPIRVAsmPrinter.cpp
@@ -118,7 +118,6 @@ void SPIRVAsmPrinter::emitFunctionHeader() {
     OutStreamer->getCommentOS()
         << "-- Begin function "
         << GlobalValue::dropLLVMManglingEscape(F.getName()) << '\n';
-    OutStreamer->addBlankLine();
   }
 
   auto Section = getObjFileLowering().SectionForGlobal(&F, TM);
diff --git a/llvm/test/CodeGen/SPIRV/extensions/SPV_INTEL_optnone.ll b/llvm/test/CodeGen/SPIRV/extensions/SPV_INTEL_optnone.ll
@@ -1,4 +1,4 @@
-; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --skip-check-label --version 3
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 3
 ; RUN: llc -O0 -mtriple=spirv32-unknown-unknown --spirv-extensions=SPV_INTEL_optnone %s -o - | FileCheck %s --check-prefix=CHECK-EXTENSION
 ; RUN: llc -O0 -mtriple=spirv32-unknown-unknown %s -o - | FileCheck %s --check-prefix=CHECK-NO-EXTENSION
 
@@ -13,12 +13,14 @@
 
 ; Function Attrs: nounwind optnone noinline
 define spir_func void @_Z3foov() #0 {
-; CHECK-EXTENSION:         %4 = OpFunction %2 DontInline %3
+; CHECK-EXTENSION-LABEL: _Z3foov:
+; CHECK-EXTENSION:       %4 = OpFunction %2 DontInline %3
 ; CHECK-EXTENSION-NEXT:    %5 = OpLabel
 ; CHECK-EXTENSION-NEXT:    OpReturn
 ; CHECK-EXTENSION-NEXT:    OpFunctionEnd
 ;
-; CHECK-NO-EXTENSION:         %4 = OpFunction %2 DontInline %3
+; CHECK-NO-EXTENSION-LABEL: _Z3foov:
+; CHECK-NO-EXTENSION:       %4 = OpFunction %2 DontInline %3
 ; CHECK-NO-EXTENSION-NEXT:    %5 = OpLabel
 ; CHECK-NO-EXTENSION-NEXT:    OpReturn
 ; CHECK-NO-EXTENSION-NEXT:    OpFunctionEnd
diff --git a/llvm/utils/UpdateTestChecks/asm.py b/llvm/utils/UpdateTestChecks/asm.py
@@ -202,15 +202,11 @@ class string:
     flags=(re.M | re.S),
 )
 
-# We parse the function name from the comments issued by the backend:
-# ; -- Begin function <name>
-# and then the final comment
-# ; -- End function
-# If these change in the future, we need to change the regex.
+# We parse the function name from OpName, and grab the variable name 'var'
+# for this function. Then we match that when the variable is assigned with
+# OpFunction and match its body.
 ASM_FUNCTION_SPIRV_RE = re.compile(
-    r"[ \t]+; \-\- Begin function (?P<func>[^\n]+)\n"
-    r"(?P<body>.*?)\n"
-    r"[ \t]+; \-\- End function",
+    r'OpName (?P<var>%[0-9]+) "(?P<func>[^"]+)".*(?P<body>(?P=var) = OpFunction.+?OpFunctionEnd)',
     flags=(re.M | re.S),
 )
 
diff --git a/llvm/utils/UpdateTestChecks/common.py b/llvm/utils/UpdateTestChecks/common.py
@@ -196,13 +196,6 @@ def __call__(self, parser, namespace, values, option_string=None):
         default=[],
         help="List of regular expressions such that, for matching global value declarations, literal integer values should be encoded in hex in the associated FileCheck directives",
     )
-    parser.add_argument(
-        "--skip-check-label",
-        action="store_true",
-        dest="skip_check_label",
-        default=False,
-        help="Skip CHECK-LABEL line generation per function",
-    )
     # FIXME: in 3.9, we can use argparse.BooleanOptionalAction. At that point,
     # we need to rename the flag to just -generate-body-for-unused-prefixes.
     parser.add_argument(
@@ -219,11 +212,10 @@ def __call__(self, parser, namespace, values, option_string=None):
     )
     args = parser.parse_args()
     # TODO: This should not be handled differently from the other options
-    global _verbose, _global_value_regex, _global_hex_value_regex, _skip_check_label
+    global _verbose, _global_value_regex, _global_hex_value_regex
     _verbose = args.verbose
     _global_value_regex = args.global_value_regex
     _global_hex_value_regex = args.global_hex_value_regex
-    _skip_check_label = args.skip_check_label
     return args
 
 
@@ -1314,7 +1306,7 @@ def add_checks(
                 output_lines.append(
                     "%s %s-SAME: %s" % (comment_marker, checkprefix, args_and_sig)
                 )
-            elif not _skip_check_label:
+            else:
                 output_lines.append(
                     check_label_format
                     % (

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,6 @@ void SPIRVAsmPrinter::emitFunctionHeader() {`
`118`	`118`	`OutStreamer->getCommentOS()`
`119`	`119`	`<< "-- Begin function "`
`120`	`120`	`<< GlobalValue::dropLLVMManglingEscape(F.getName()) << '\n';`
`121`		`- OutStreamer->addBlankLine();`
`122`	`121`	`}`
`123`	`122`
`124`	`123`	`auto Section = getObjFileLowering().SectionForGlobal(&F, TM);`