Empty match for func_name_separator and update test

pmatos · pmatos · commit 02787fa0d191 · 2023-09-21T12:37:59.000+02:00
diff --git a/llvm/test/CodeGen/SPIRV/extensions/SPV_INTEL_optnone.ll b/llvm/test/CodeGen/SPIRV/extensions/SPV_INTEL_optnone.ll
@@ -1,19 +1,15 @@
 ; 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,CHECK-EXTENSION
-; RUN: llc -O0 -mtriple=spirv32-unknown-unknown %s -o - | FileCheck %s --check-prefix=CHECK,CHECK-NO-EXTENSION
+; RUN: llc -O0 -mtriple=spirv32-unknown-unknown --spirv-extensions=SPV_INTEL_optnone %s -o - | FileCheck %s --check-prefixes=CHECK,CHECK-EXTENSION
+; RUN: llc -O0 -mtriple=spirv32-unknown-unknown %s -o - | FileCheck %s --check-prefixes=CHECK,CHECK-NO-EXTENSION
 
 ; CHECK-EXTENSION: OpCapability OptNoneINTEL
 ; CHECK-EXTENSION: OpExtension "SPV_INTEL_optnone"
 ; CHECK-NO-EXTENSION-NOT: OpCapability OptNoneINTEL
 ; CHECK-NO-EXTENSION-NOT: OpExtension "SPV_INTEL_optnone"
 
-;; Per SPIR-V spec:
-;; FunctionControlDontInlineMask = 0x2 (2)
-; CHECK-EXTENSION: %[[#]] = OpFunction %[[#]] DontInline
-
 ; Function Attrs: nounwind optnone noinline
 define spir_func void @_Z3foov() #0 {
-; CHECK-LABEL: _Z3foov:
+; CHECK-LABEL: _Z3foov
 ; CHECK:       %4 = OpFunction %2 DontInline %3
 ; CHECK-NEXT:    %5 = OpLabel
 ; CHECK-NEXT:    OpReturn
@@ -23,6 +19,7 @@ entry:
 }
 
 attributes #0 = { nounwind optnone noinline }
+
 ;; NOTE: These prefixes are unused and the list is autogenerated. Do not add tests below this line:
 ; CHECK-EXTENSION: {{.*}}
 ; CHECK-NO-EXTENSION: {{.*}}
diff --git a/llvm/utils/UpdateTestChecks/asm.py b/llvm/utils/UpdateTestChecks/asm.py
@@ -206,7 +206,7 @@ class string:
 # 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'OpName (?P<var>%[0-9]+) "(?P<func>[^"]+)".*(?P<body>(?P=var) = OpFunction.+?OpFunctionEnd)',
+    r'OpName (?P<var>%[0-9]+) "(?P<func>[^"]+)(?P<func_name_separator>)".*(?P<body>(?P=var) = OpFunction.+?OpFunctionEnd)',
     flags=(re.M | re.S),
 )
 

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ class string:`
`206`	`206`	`# for this function. Then we match that when the variable is assigned with`
`207`	`207`	`# OpFunction and match its body.`
`208`	`208`	`ASM_FUNCTION_SPIRV_RE = re.compile(`
`209`		`- r'OpName (?P<var>%[0-9]+) "(?P<func>[^"]+)".*(?P<body>(?P=var) = OpFunction.+?OpFunctionEnd)',`
	`209`	`+ r'OpName (?P<var>%[0-9]+) "(?P<func>[^"]+)(?P<func_name_separator>)".*(?P<body>(?P=var) = OpFunction.+?OpFunctionEnd)',`
`210`	`210`	`flags=(re.M \| re.S),`
`211`	`211`	`)`
`212`	`212`