[llvm] 15be150 - [NFC][ARM] Fix update_llc_test_checks for thumbv7-apple-ios, autogenerate switch-minsize.ll

Wed Jun 23 06:34:45 PDT 2021

Author: Roman Lebedev
Date: 2021-06-23T16:31:19+03:00
New Revision: 15be15073ef6eb2c4fd734917322909d405f16e2

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

LOG: [NFC][ARM] Fix update_llc_test_checks for thumbv7-apple-ios, autogenerate switch-minsize.ll

Added: 
    

Modified: 
    llvm/test/CodeGen/ARM/switch-minsize.ll
    llvm/utils/UpdateTestChecks/asm.py

Removed: 
    


################################################################################
diff  --git a/llvm/test/CodeGen/ARM/switch-minsize.ll b/llvm/test/CodeGen/ARM/switch-minsize.ll
index 92af6b35c3c5..20f1530f8d48 100644

--- a/llvm/test/CodeGen/ARM/switch-minsize.ll
+++ b/llvm/test/CodeGen/ARM/switch-minsize.ll
@@ -1,21 +1,48 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
 ; RUN: llc < %s | FileCheck %s
 
 target datalayout = "e-m:o-p:32:32-f64:32:64-v64:32:64-v128:32:128-a:0:32-n32-S32"
 target triple = "thumbv7-apple-ios8.0.0"
 
-; CHECK: beq
-; CHECK: beq
-; CHECK: beq
-; CHECK: cbnz
 declare void @g(i32)
 define void @f(i32 %val) optsize minsize {
+; CHECK-LABEL: f:
+; CHECK:       @ %bb.0:
+; CHECK-NEXT:    str lr, [sp, #-4]!
+; CHECK-NEXT:    movw r1, #1154
+; CHECK-NEXT:    cmp r0, r1
+; CHECK-NEXT:    beq LBB0_5
+; CHECK-NEXT:  @ %bb.1:
+; CHECK-NEXT:    cmp r0, #9
+; CHECK-NEXT:    beq LBB0_4
+; CHECK-NEXT:  @ %bb.2:
+; CHECK-NEXT:    movw r1, #994
+; CHECK-NEXT:    cmp r0, r1
+; CHECK-NEXT:    beq LBB0_6
+; CHECK-NEXT:  @ %bb.3:
+; CHECK-NEXT:    cbnz r0, LBB0_7
+; CHECK-NEXT:  LBB0_4: @ %two
+; CHECK-NEXT:    movs r0, #1
+; CHECK-NEXT:    b LBB0_8
+; CHECK-NEXT:  LBB0_5: @ %four
+; CHECK-NEXT:    movs r0, #87
+; CHECK-NEXT:    b LBB0_8
+; CHECK-NEXT:  LBB0_6: @ %three
+; CHECK-NEXT:    movs r0, #78
+; CHECK-NEXT:    b LBB0_8
+; CHECK-NEXT:  LBB0_7: @ %def
+; CHECK-NEXT:    movs r0, #11
+; CHECK-NEXT:  LBB0_8: @ %two
+; CHECK-NEXT:    bl _g
+; CHECK-NEXT:    ldr lr, [sp], #4
+; CHECK-NEXT:    bx lr
   switch i32 %val, label %def [
     i32 0, label %one
     i32 9, label %two
     i32 994, label %three
     i32 1154, label %four
   ]
-  
+
 one:
   call void @g(i32 1)
   ret void

diff  --git a/llvm/utils/UpdateTestChecks/asm.py b/llvm/utils/UpdateTestChecks/asm.py
index 7a10417d2fe3..8b1c28117146 100644
--- a/llvm/utils/UpdateTestChecks/asm.py
+++ b/llvm/utils/UpdateTestChecks/asm.py
@@ -147,14 +147,6 @@ class string:
      r'^[ \t]*@[ \t]--[ \t]End[ \t]function',
      flags=(re.M | re.S))
 
-ASM_FUNCTION_THUMB_IOS_RE = re.compile(
-     r'^_(?P<func>[^:]+):[ \t]*\n'
-     r'^Lfunc_begin(?P<id>[0-9][1-9]*):\n'
-     r'(?P<body>.*?)'
-     r'^Lfunc_end(?P=id):\n'
-     r'^[ \t]*@[ \t]--[ \t]End[ \t]function',
-     flags=(re.M | re.S))
-
 ASM_FUNCTION_WASM32_RE = re.compile(
     r'^_?(?P<func>[^:]+):[ \t]*#+[ \t]*@"?(?P=func)"?\n'
     r'(?P<body>.*?)\n'
@@ -382,7 +374,7 @@ def get_run_handler(triple):
       'thumb': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE),
       'thumb-macho': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_MACHO_RE),
       'thumbv5-macho': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_MACHO_RE),
-      'thumbv7-apple-ios' : (scrub_asm_arm_eabi, ASM_FUNCTION_THUMB_IOS_RE),
+      'thumbv7-apple-ios' : (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_IOS_RE),
       'm68k': (scrub_asm_m68k, ASM_FUNCTION_M68K_RE),
       'mips': (scrub_asm_mips, ASM_FUNCTION_MIPS_RE),
       'msp430': (scrub_asm_msp430, ASM_FUNCTION_MSP430_RE),


        
