[update_llc_test_checks][VE] Handle .Lfoo$local in functon regex

[arichardson]

Summary

While working on https://reviews.llvm.org/D131429, I got a test diff in
one of the VE tests and running update_llc_test_checks.py deleted all the
code for that function. This updates the regex to handle this new output.

[kaz7]

It's looks like this patch itself IS removing landing pad instructions from builtin_sjlj_landingpad.ll although the explanation of this patch is saying opposite.

[arichardson]

In D131431#3712222, @kaz7 wrote:

It's looks like this patch itself IS removing landing pad instructions from builtin_sjlj_landingpad.ll although the explanation of this patch is saying opposite.

I re-ran the update script on that file, and now it correctly detects the function boundary: Everything below .Lfunc_end0: should not have been added as a CHECK line but because the regex was wrong before it matched everything up to the next function.

[kaz7]

Ah, Ok. I've understood what you are trying to fix now. You are trying to correct regexp for VE in UpdateTestChecks/asm.py. I couldn't correct it, so I just hand-write this builtin_sjlj_landingpad.ll test when I created this.

Thank you!

In D131431#3712337, @arichardson wrote:

In D131431#3712222, @kaz7 wrote:

It's looks like this patch itself IS removing landing pad instructions from builtin_sjlj_landingpad.ll although the explanation of this patch is saying opposite.

I re-ran the update script on that file, and now it correctly detects the function boundary: Everything below .Lfunc_end0: should not have been added as a CHECK line but because the regex was wrong before it matched everything up to the next function.

I was saying that removed lines including .LJIT0_0 and GCC_except_table0 are the part of function foo. Those are exception tables generated by llvm. And I left them when I write this test by hand with a thought that I'd like to check the contents of exception tables. On the other hand, you are right. Everything below .Lfunc_end0: should not have been added since it is the purpose of this UpdateTestChecks/asm.py. I'll find other way to check exception tables.

LGTM.

[arichardson]

In D131431#3714480, @kaz7 wrote:

Ah, Ok. I've understood what you are trying to fix now. You are trying to correct regexp for VE in UpdateTestChecks/asm.py. I couldn't correct it, so I just hand-write this builtin_sjlj_landingpad.ll test when I created this.

Thank you!

In D131431#3712337, @arichardson wrote:

In D131431#3712222, @kaz7 wrote:

It's looks like this patch itself IS removing landing pad instructions from builtin_sjlj_landingpad.ll although the explanation of this patch is saying opposite.

I re-ran the update script on that file, and now it correctly detects the function boundary: Everything below .Lfunc_end0: should not have been added as a CHECK line but because the regex was wrong before it matched everything up to the next function.

I was saying that removed lines including .LJIT0_0 and GCC_except_table0 are the part of function foo. Those are exception tables generated by llvm. And I left them when I write this test by hand with a thought that I'd like to check the contents of exception tables. On the other hand, you are right. Everything below .Lfunc_end0: should not have been added since it is the purpose of this UpdateTestChecks/asm.py. I'll find other way to check exception tables.

LGTM.

Ah if you actually want to check those tables, you can add manual checks with UTC_ARGS: --disable. Will update this commit

[kaz7]

Thank you, but I would like to consider what option is the best for this case. So, please merge this patch as is. Thank you again for fixing the problem in regexp.

llvm/test/CodeGen/VE/Scalar/builtin_sjlj_landingpad.ll

 ; PIC-NEXT:    lea %s12, _Unwind_SjLj_Unregister@plt_lo(-24)
 ; PIC-NEXT:    and %s12, %s12, (32)0
 ; PIC-NEXT:    sic %s16
 ; PIC-NEXT:    lea.sl %s12, _Unwind_SjLj_Unregister@plt_hi(%s16, %s12)
 ; PIC-NEXT:    lea %s0, -104(, %s9)
 ; PIC-NEXT:    bsic %s10, (, %s12)
 ; PIC-NEXT:    or %s0, 1, (0)1
 ; PIC-NEXT:    br.l.t .LBB0_2
-; PIC-NEXT:  .Lfunc_end0:
-; PIC-NEXT:    .size  foo, .Lfunc_end0-foo
-; PIC-NEXT:    .size .Lfoo$local, .Lfunc_end0-foo
-; PIC-NEXT:    .section .rodata,"a",@progbits
-; PIC-NEXT:    .p2align 2
-; PIC-NEXT:  .LJTI0_0:
-; PIC-NEXT:    .4byte .LBB0_6-foo
-; PIC-NEXT:    .section .gcc_except_table,"a",@progbits
-; PIC-NEXT:    .p2align 2
-; PIC-NEXT:  GCC_except_table0:
-; PIC-NEXT:  .Lexception0:
-; PIC-NEXT:    .byte  255 # @LPStart Encoding = omit
-; PIC-NEXT:    .byte  0 # @TType Encoding = absptr
-; PIC-NEXT:    .uleb128 .Lttbase0-.Lttbaseref0
-; PIC-NEXT:  .Lttbaseref0:
-; PIC-NEXT:    .byte  3 # Call site Encoding = udata4
-; PIC-NEXT:    .uleb128 .Lcst_end0-.Lcst_begin0
-; PIC-NEXT:  .Lcst_begin0:
-; PIC-NEXT:    .byte  0 # >> Call Site 0 <<
-; PIC-NEXT:        #   On exception at call site 0
-; PIC-NEXT:    .byte  1 #   Action: 1
-; PIC-NEXT:  .Lcst_end0:
-; PIC-NEXT:    .byte  1 # >> Action Record 1 <<
-; PIC-NEXT:        #   Catch TypeInfo 1
-; PIC-NEXT:    .byte  0 #   No further actions
-; PIC-NEXT:    .p2align 2
-; PIC-NEXT:        # >> Catch TypeInfos <<
-; PIC-NEXT:    .8byte SomeGlobal                      # TypeInfo 1
-; PIC-NEXT:  .Lttbase0:
-; PIC-NEXT:    .p2align 2
-; PIC-NEXT:        # -- End function
 entry:
   invoke void @errorbar() to label %exit unwind label %handle
 
 handle:
   %error = landingpad { i8*, i32 } catch i8* @SomeGlobal
   ret i32 1
 
 exit:
   ret i32 0
 }
 
 declare dso_local void @errorbar() local_unnamed_addr
 
 declare dso_local i32 @__gxx_personality_sj0(...)

llvm/test/tools/UpdateTestChecks/update_llc_test_checks/Inputs/ve-basic.ll.expected

 ; CHECK-NEXT:    and %s0, %s0, (32)0
 ; CHECK-NEXT:    lea.sl %s12, ext@hi(, %s0)
 ; CHECK-NEXT:    bsic %s10, (, %s12)
 ; CHECK-NEXT:    or %s0, 2, (0)1
 ; CHECK-NEXT:    or %s11, 0, %s9
 ; CHECK-NEXT:    ld %s10, 8(, %s11)
 ; CHECK-NEXT:    ld %s9, (, %s11)
 ; CHECK-NEXT:    b.l.t (, %s10)
+;
+; PIC-LABEL: dsolocal:
+; PIC:       # %bb.0: # %entry
+; PIC-NEXT:    st %s9, (, %s11)
+; PIC-NEXT:    st %s10, 8(, %s11)
+; PIC-NEXT:    st %s15, 24(, %s11)
+; PIC-NEXT:    st %s16, 32(, %s11)
+; PIC-NEXT:    or %s9, 0, %s11
+; PIC-NEXT:    lea %s11, -240(, %s11)
+; PIC-NEXT:    brge.l.t %s11, %s8, .LBB1_2
+; PIC-NEXT:  # %bb.1: # %entry
+; PIC-NEXT:    ld %s61, 24(, %s14)
+; PIC-NEXT:    or %s62, 0, %s0
+; PIC-NEXT:    lea %s63, 315
+; PIC-NEXT:    shm.l %s63, (%s61)
+; PIC-NEXT:    shm.l %s8, 8(%s61)
+; PIC-NEXT:    shm.l %s11, 16(%s61)
+; PIC-NEXT:    monc
+; PIC-NEXT:    or %s0, 0, %s62
+; PIC-NEXT:  .LBB1_2: # %entry
+; PIC-NEXT:    lea %s15, _GLOBAL_OFFSET_TABLE_@pc_lo(-24)
+; PIC-NEXT:    and %s15, %s15, (32)0
+; PIC-NEXT:    sic %s16
+; PIC-NEXT:    lea.sl %s15, _GLOBAL_OFFSET_TABLE_@pc_hi(%s16, %s15)
+; PIC-NEXT:    lea %s12, ext@plt_lo(-24)
+; PIC-NEXT:    and %s12, %s12, (32)0
+; PIC-NEXT:    sic %s16
+; PIC-NEXT:    lea.sl %s12, ext@plt_hi(%s16, %s12)
+; PIC-NEXT:    bsic %s10, (, %s12)
+; PIC-NEXT:    or %s0, 2, (0)1
+; PIC-NEXT:    or %s11, 0, %s9
+; PIC-NEXT:    ld %s16, 32(, %s11)
+; PIC-NEXT:    ld %s15, 24(, %s11)
+; PIC-NEXT:    ld %s10, 8(, %s11)
+; PIC-NEXT:    ld %s9, (, %s11)
+; PIC-NEXT:    b.l.t (, %s10)
 entry:
   call void @ext()
   ret i32 2
 }
 
 declare void @ext()
 
 define i32 @load() {

llvm/utils/UpdateTestChecks/asm.py

 ASM_FUNCTION_WASM32_RE = re.compile(
     r'^_?(?P<func>[^:]+):[ \t]*#+[ \t]*@"?(?P=func)"?\n'
     r'(?P<body>.*?)\n'
     r'^\s*(\.Lfunc_end[0-9]+:\n|end_function)',
     flags=(re.M | re.S))
 
 ASM_FUNCTION_VE_RE = re.compile(
     r'^_?(?P<func>[^:]+):[ \t]*#+[ \t]*@(?P=func)\n'
+    r'(?:\s*\.?L(?P=func)\$local:\n)?'  # optional .L<func>$local: due to -fno-semantic-interposition
+    r'(?:\s*\.type\s+\.?L(?P=func)\$local,@function\n)?'  # optional .type .L<func>$local
+    r'(?:\s*\.?Lfunc_begin[^:\n]*:\n)?[^:]*?'
     r'(?P<body>^##?[ \t]+[^:]+:.*?)\s*'
     r'.Lfunc_end[0-9]+:\n',
     flags=(re.M | re.S))
 
 ASM_FUNCTION_CSKY_RE = re.compile(
     r'^_?(?P<func>[^:]+):[ \t]*#+[ \t]*@(?P=func)\n(?:\s*\.?Lfunc_begin[^:\n]*:\n)?[^:]*?'
     r'(?P<body>^##?[ \t]+[^:]+:.*?)\s*'
     r'.Lfunc_end[0-9]+:\n',