Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update_llc_test_checks.py script fix #23

Open
wants to merge 1 commit into
base: nanomips
Choose a base branch
from
Open

update_llc_test_checks.py script fix #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ...ateTestChecks/update_llc_test_checks/Inputs/aarch64_generated_funcs.ll.generated.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,15 @@ attributes #0 = { noredzone nounwind ssp uwtable "frame-pointer"="all" }
; CHECK-NEXT: str w8, [sp, #16]
; CHECK-NEXT: b .LBB0_5
; CHECK-NEXT: .LBB0_3:
; CHECK-NEXT: bl OUTLINED_FUNCTION_0
; CHECK-NEXT: bl OUTLINED_FUNCTION[[SUFFIX0:.*]]
; CHECK-NEXT: ldur w8, [x29, #-8]
; CHECK-NEXT: cbnz w8, .LBB0_2
; CHECK-NEXT: .LBB0_4:
; CHECK-NEXT: mov w8, #1
; CHECK-NEXT: bl OUTLINED_FUNCTION_0
; CHECK-NEXT: bl OUTLINED_FUNCTION[[SUFFIX0]]
; CHECK-NEXT: .LBB0_5:
; CHECK-NEXT: ldp x29, x30, [sp, #32] // 16-byte Folded Reload
; CHECK-NEXT: b OUTLINED_FUNCTION_1
; CHECK-NEXT: b OUTLINED_FUNCTION[[SUFFIX1:.*]]
;
; CHECK-LABEL: main:
; CHECK: // %bb.0:
Expand All @@ -114,9 +114,9 @@ attributes #0 = { noredzone nounwind ssp uwtable "frame-pointer"="all" }
; CHECK-NEXT: stp w10, w9, [x29, #-12]
; CHECK-NEXT: ldp x29, x30, [sp, #32] // 16-byte Folded Reload
; CHECK-NEXT: stp w12, w11, [sp, #12]
; CHECK-NEXT: b OUTLINED_FUNCTION_1
; CHECK-NEXT: b OUTLINED_FUNCTION[[SUFFIX1]]
;
; CHECK-LABEL: OUTLINED_FUNCTION_0:
; CHECK: OUTLINED_FUNCTION[[SUFFIX0]]:
; CHECK: // %bb.0:
; CHECK-NEXT: mov w9, #2
; CHECK-NEXT: mov w10, #3
Expand All @@ -125,7 +125,7 @@ attributes #0 = { noredzone nounwind ssp uwtable "frame-pointer"="all" }
; CHECK-NEXT: stp w11, w10, [sp, #12]
; CHECK-NEXT: ret
;
; CHECK-LABEL: OUTLINED_FUNCTION_1:
; CHECK: OUTLINED_FUNCTION[[SUFFIX1]]:
; CHECK: // %bb.0:
; CHECK-NEXT: mov w0, wzr
; CHECK-NEXT: add sp, sp, #48 // =48
Expand Down
8 changes: 4 additions & 4 deletions ...eTestChecks/update_llc_test_checks/Inputs/aarch64_generated_funcs.ll.nogenerated.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ define dso_local i32 @check_boundaries() #0 {
; CHECK-NEXT: str w8, [sp, #16]
; CHECK-NEXT: b .LBB0_5
; CHECK-NEXT: .LBB0_3:
; CHECK-NEXT: bl OUTLINED_FUNCTION_0
; CHECK-NEXT: bl OUTLINED_FUNCTION[[SUFFIX0:.*]]
; CHECK-NEXT: ldur w8, [x29, #-8]
; CHECK-NEXT: cbnz w8, .LBB0_2
; CHECK-NEXT: .LBB0_4:
; CHECK-NEXT: mov w8, #1
; CHECK-NEXT: bl OUTLINED_FUNCTION_0
; CHECK-NEXT: bl OUTLINED_FUNCTION[[SUFFIX0]]
; CHECK-NEXT: .LBB0_5:
; CHECK-NEXT: ldp x29, x30, [sp, #32] // 16-byte Folded Reload
; CHECK-NEXT: b OUTLINED_FUNCTION_1
; CHECK-NEXT: b OUTLINED_FUNCTION[[SUFFIX1:.*]]
%1 = alloca i32, align 4
%2 = alloca i32, align 4
%3 = alloca i32, align 4
Expand Down Expand Up @@ -91,7 +91,7 @@ define dso_local i32 @main() #0 {
; CHECK-NEXT: stp w10, w9, [x29, #-12]
; CHECK-NEXT: ldp x29, x30, [sp, #32] // 16-byte Folded Reload
; CHECK-NEXT: stp w12, w11, [sp, #12]
; CHECK-NEXT: b OUTLINED_FUNCTION_1
; CHECK-NEXT: b OUTLINED_FUNCTION[[SUFFIX1]]
%1 = alloca i32, align 4
%2 = alloca i32, align 4
%3 = alloca i32, align 4
Expand Down
6 changes: 3 additions & 3 deletions .../UpdateTestChecks/update_llc_test_checks/Inputs/arm_generated_funcs.ll.generated.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ attributes #0 = { noredzone nounwind ssp uwtable "frame-pointer"="all" }
; CHECK-NEXT: b .LBB0_3
; CHECK-NEXT: .LBB0_2:
; CHECK-NEXT: mov r1, lr
; CHECK-NEXT: bl OUTLINED_FUNCTION_0
; CHECK-NEXT: bl OUTLINED_FUNCTION[[SUFFIX0:.*]]
; CHECK-NEXT: mov lr, r1
; CHECK-NEXT: .LBB0_3:
; CHECK-NEXT: ldr r0, [sp, #12]
Expand All @@ -88,7 +88,7 @@ attributes #0 = { noredzone nounwind ssp uwtable "frame-pointer"="all" }
; CHECK-NEXT: b .LBB0_6
; CHECK-NEXT: .LBB0_5:
; CHECK-NEXT: mov r1, lr
; CHECK-NEXT: bl OUTLINED_FUNCTION_0
; CHECK-NEXT: bl OUTLINED_FUNCTION[[SUFFIX0]]
; CHECK-NEXT: mov lr, r1
; CHECK-NEXT: .LBB0_6:
; CHECK-NEXT: mov r0, #0
Expand Down Expand Up @@ -124,7 +124,7 @@ attributes #0 = { noredzone nounwind ssp uwtable "frame-pointer"="all" }
; CHECK-NEXT: .LCPI1_0:
; CHECK-NEXT: .long x
;
; CHECK-LABEL: OUTLINED_FUNCTION_0:
; CHECK: OUTLINED_FUNCTION[[SUFFIX0]]:
; CHECK: @ %bb.0:
; CHECK-NEXT: mov r0, #2
; CHECK-NEXT: str r0, [sp, #8]
Expand Down
4 changes: 2 additions & 2 deletions ...pdateTestChecks/update_llc_test_checks/Inputs/arm_generated_funcs.ll.nogenerated.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ define dso_local i32 @check_boundaries() #0 {
; CHECK-NEXT: b .LBB0_3
; CHECK-NEXT: .LBB0_2:
; CHECK-NEXT: mov r1, lr
; CHECK-NEXT: bl OUTLINED_FUNCTION_0
; CHECK-NEXT: bl OUTLINED_FUNCTION[[SUFFIX0:.*]]
; CHECK-NEXT: mov lr, r1
; CHECK-NEXT: .LBB0_3:
; CHECK-NEXT: ldr r0, [sp, #12]
Expand All @@ -29,7 +29,7 @@ define dso_local i32 @check_boundaries() #0 {
; CHECK-NEXT: b .LBB0_6
; CHECK-NEXT: .LBB0_5:
; CHECK-NEXT: mov r1, lr
; CHECK-NEXT: bl OUTLINED_FUNCTION_0
; CHECK-NEXT: bl OUTLINED_FUNCTION[[SUFFIX0]]
; CHECK-NEXT: mov lr, r1
; CHECK-NEXT: .LBB0_6:
; CHECK-NEXT: mov r0, #0
Expand Down
12 changes: 6 additions & 6 deletions .../UpdateTestChecks/update_llc_test_checks/Inputs/x86_generated_funcs.ll.generated.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@ attributes #0 = { noredzone nounwind ssp uwtable "frame-pointer"="all" }
; CHECK-NEXT: movl $1, -4(%rbp)
; CHECK-NEXT: jmp .LBB0_6
; CHECK-NEXT: .LBB0_1:
; CHECK-NEXT: callq OUTLINED_FUNCTION_0
; CHECK-NEXT: callq OUTLINED_FUNCTION[[SUFFIX0:.*]]
; CHECK-NEXT: cmpl $0, -8(%rbp)
; CHECK-NEXT: jne .LBB0_5
; CHECK-NEXT: .LBB0_4:
; CHECK-NEXT: callq OUTLINED_FUNCTION_0
; CHECK-NEXT: callq OUTLINED_FUNCTION[[SUFFIX0]]
; CHECK-NEXT: .LBB0_6:
; CHECK-NEXT: xorl %eax, %eax
; CHECK-NEXT: addq $20, %rsp
Expand All @@ -104,26 +104,26 @@ attributes #0 = { noredzone nounwind ssp uwtable "frame-pointer"="all" }
; CHECK-NEXT: .cfi_def_cfa_register %rbp
; CHECK-NEXT: subq $20, %rsp
; CHECK-NEXT: movl $0, -20(%rbp)
; CHECK-NEXT: callq OUTLINED_FUNCTION_1
; CHECK-NEXT: callq OUTLINED_FUNCTION[[SUFFIX1:.*]]
; CHECK-NEXT: movl $1, x(%rip)
; CHECK-NEXT: #APP
; CHECK-NEXT: #NO_APP
; CHECK-NEXT: callq OUTLINED_FUNCTION_1
; CHECK-NEXT: callq OUTLINED_FUNCTION[[SUFFIX1]]
; CHECK-NEXT: xorl %eax, %eax
; CHECK-NEXT: addq $20, %rsp
; CHECK-NEXT: popq %rbp
; CHECK-NEXT: .cfi_def_cfa %rsp, 8
; CHECK-NEXT: retq
;
; CHECK-LABEL: OUTLINED_FUNCTION_0:
; CHECK: OUTLINED_FUNCTION[[SUFFIX0]]:
; CHECK: # %bb.0:
; CHECK-NEXT: movl $1, -8(%rbp)
; CHECK-NEXT: movl $2, -16(%rbp)
; CHECK-NEXT: movl $3, -4(%rbp)
; CHECK-NEXT: movl $4, -12(%rbp)
; CHECK-NEXT: retq
;
; CHECK-LABEL: OUTLINED_FUNCTION_1:
; CHECK: OUTLINED_FUNCTION[[SUFFIX1]]:
; CHECK: # %bb.0:
; CHECK-NEXT: movl $1, -16(%rbp)
; CHECK-NEXT: movl $2, -12(%rbp)
Expand Down
8 changes: 4 additions & 4 deletions ...pdateTestChecks/update_llc_test_checks/Inputs/x86_generated_funcs.ll.nogenerated.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ define dso_local i32 @check_boundaries() #0 {
; CHECK-NEXT: movl $1, -4(%rbp)
; CHECK-NEXT: jmp .LBB0_6
; CHECK-NEXT: .LBB0_1:
; CHECK-NEXT: callq OUTLINED_FUNCTION_0
; CHECK-NEXT: callq OUTLINED_FUNCTION[[SUFFIX0:.*]]
; CHECK-NEXT: cmpl $0, -8(%rbp)
; CHECK-NEXT: jne .LBB0_5
; CHECK-NEXT: .LBB0_4:
; CHECK-NEXT: callq OUTLINED_FUNCTION_0
; CHECK-NEXT: callq OUTLINED_FUNCTION[[SUFFIX0]]
; CHECK-NEXT: .LBB0_6:
; CHECK-NEXT: xorl %eax, %eax
; CHECK-NEXT: addq $20, %rsp
Expand Down Expand Up @@ -81,11 +81,11 @@ define dso_local i32 @main() #0 {
; CHECK-NEXT: .cfi_def_cfa_register %rbp
; CHECK-NEXT: subq $20, %rsp
; CHECK-NEXT: movl $0, -20(%rbp)
; CHECK-NEXT: callq OUTLINED_FUNCTION_1
; CHECK-NEXT: callq OUTLINED_FUNCTION[[SUFFIX1:.*]]
; CHECK-NEXT: movl $1, x(%rip)
; CHECK-NEXT: #APP
; CHECK-NEXT: #NO_APP
; CHECK-NEXT: callq OUTLINED_FUNCTION_1
; CHECK-NEXT: callq OUTLINED_FUNCTION[[SUFFIX1]]
; CHECK-NEXT: xorl %eax, %eax
; CHECK-NEXT: addq $20, %rsp
; CHECK-NEXT: popq %rbp
Expand Down
4 changes: 2 additions & 2 deletions llvm/utils/UpdateTestChecks/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ class string:
_prefix_filecheck_ir_name = ''

outlined_fn_to_filecheck_var = {}
outlined_function_counter = 0

def parse_commandline_args(parser):
parser.add_argument('--include-generated-funcs', action='store_true',
Expand Down Expand Up @@ -633,8 +634,7 @@ def transform_line_vars(match):

def add_checks(output_lines, comment_marker, prefix_list, func_dict, func_name, check_label_format, is_asm, is_analyze, global_vars_seen_dict):
global outlined_function_counter
outlined_function_counter = 0

global outlined_fn_to_filecheck_var
# prefix_exclusions are prefixes we cannot use to print the function because it doesn't exist in run lines that use these prefixes as well.
prefix_exclusions = set()
printed_prefixes = []
Expand Down