[llvm] [BOLT][NFC] Add tests with multiple CUs (PR #93615)

via llvm-commits llvm-commits at lists.llvm.org
Tue May 28 15:19:17 PDT 2024


llvmbot wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-bolt

Author: Sayhaan Siddiqui (sayhaan)

<details>
<summary>Changes</summary>

Adds DWARF4 and DWARF5 tests with multiple CUs

>From [T187352032](https://www.internalfb.com/intern/tasks/?t=187352032)

---

Patch is 34.73 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/93615.diff


4 Files Affected:

- (added) bolt/test/X86/Inputs/dwarf4-subprogram-multiple-ranges-other.s (+331) 
- (added) bolt/test/X86/Inputs/dwarf5-subprogram-multiple-ranges-other.s (+385) 
- (added) bolt/test/X86/dwarf4-subprogram-multiple-ranges-cus.test (+24) 
- (added) bolt/test/X86/dwarf5-subprogram-multiple-ranges-cus.test (+24) 


``````````diff
diff --git a/bolt/test/X86/Inputs/dwarf4-subprogram-multiple-ranges-other.s b/bolt/test/X86/Inputs/dwarf4-subprogram-multiple-ranges-other.s
new file mode 100644
index 0000000000000..355c44fbf0e8f
--- /dev/null
+++ b/bolt/test/X86/Inputs/dwarf4-subprogram-multiple-ranges-other.s
@@ -0,0 +1,331 @@
+# clang++ -fbasic-block-sections=all -ffunction-sections -g2 -gdwarf-4
+# int doStuff(int val) {
+#   if (val)
+#     ++val;
+#   return val;
+# }
+#
+# int main(int argc, const char** argv) {
+#     return  doStuff(argc);
+# }
+	.text
+	.file	"main.cpp"
+	.section	.text._Z7doStuffi,"ax", at progbits
+	.globl	_Z7doStuffi                     # -- Begin function _Z7doStuffi
+	.p2align	4, 0x90
+	.type	_Z7doStuffi, at function
+_Z7doStuffi:                            # @_Z7doStuffi
+.Lfunc_begin0:
+	.file	1 "/subprogramRanges" "main.cpp"
+	.loc	1 1 0                           # main.cpp:1:0
+	.cfi_startproc
+# %bb.0:                                # %entry
+	pushq	%rbp
+	.cfi_def_cfa_offset 16
+	.cfi_offset %rbp, -16
+	movq	%rsp, %rbp
+	.cfi_def_cfa_register %rbp
+	movl	%edi, -4(%rbp)
+.Ltmp0:
+	.loc	1 2 7 prologue_end              # main.cpp:2:7
+	cmpl	$0, -4(%rbp)
+.Ltmp1:
+	.loc	1 2 7 is_stmt 0                 # main.cpp:2:7
+	je	_Z7doStuffi.__part.2
+	jmp	_Z7doStuffi.__part.1
+.LBB_END0_0:
+	.cfi_endproc
+	.section	.text._Z7doStuffi,"ax", at progbits,unique,1
+_Z7doStuffi.__part.1:                   # %if.then
+	.cfi_startproc
+	.cfi_def_cfa %rbp, 16
+	.cfi_offset %rbp, -16
+	.loc	1 3 5 is_stmt 1                 # main.cpp:3:5
+	movl	-4(%rbp), %eax
+	addl	$1, %eax
+	movl	%eax, -4(%rbp)
+	jmp	_Z7doStuffi.__part.2
+.LBB_END0_1:
+	.size	_Z7doStuffi.__part.1, .LBB_END0_1-_Z7doStuffi.__part.1
+	.cfi_endproc
+	.section	.text._Z7doStuffi,"ax", at progbits,unique,2
+_Z7doStuffi.__part.2:                   # %if.end
+	.cfi_startproc
+	.cfi_def_cfa %rbp, 16
+	.cfi_offset %rbp, -16
+	.loc	1 4 10                          # main.cpp:4:10
+	movl	-4(%rbp), %eax
+	.loc	1 4 3 epilogue_begin is_stmt 0  # main.cpp:4:3
+	popq	%rbp
+	.cfi_def_cfa %rsp, 8
+	retq
+.LBB_END0_2:
+	.size	_Z7doStuffi.__part.2, .LBB_END0_2-_Z7doStuffi.__part.2
+	.cfi_endproc
+	.section	.text._Z7doStuffi,"ax", at progbits
+.Lfunc_end0:
+	.size	_Z7doStuffi, .Lfunc_end0-_Z7doStuffi
+                                        # -- End function
+	.section	.text.main,"ax", at progbits
+	.globl	main                            # -- Begin function main
+	.p2align	4, 0x90
+	.type	main, at function
+main:                                   # @main
+.Lfunc_begin1:
+	.loc	1 7 0 is_stmt 1                 # main.cpp:7:0
+	.cfi_startproc
+# %bb.0:                                # %entry
+	pushq	%rbp
+	.cfi_def_cfa_offset 16
+	.cfi_offset %rbp, -16
+	movq	%rsp, %rbp
+	.cfi_def_cfa_register %rbp
+	subq	$16, %rsp
+	movl	$0, -4(%rbp)
+	movl	%edi, -8(%rbp)
+	movq	%rsi, -16(%rbp)
+.Ltmp2:
+	.loc	1 8 21 prologue_end             # main.cpp:8:21
+	movl	-8(%rbp), %edi
+	.loc	1 8 13 is_stmt 0                # main.cpp:8:13
+	callq	_Z7doStuffi
+	.loc	1 8 5 epilogue_begin            # main.cpp:8:5
+	addq	$16, %rsp
+	popq	%rbp
+	.cfi_def_cfa %rsp, 8
+	retq
+.LBB_END1_0:
+	.cfi_endproc
+.Lfunc_end1:
+	.size	main, .Lfunc_end1-main
+                                        # -- End function
+	.section	.debug_abbrev,"", at progbits
+	.byte	1                               # Abbreviation Code
+	.byte	17                              # DW_TAG_compile_unit
+	.byte	1                               # DW_CHILDREN_yes
+	.byte	37                              # DW_AT_producer
+	.byte	14                              # DW_FORM_strp
+	.byte	19                              # DW_AT_language
+	.byte	5                               # DW_FORM_data2
+	.byte	3                               # DW_AT_name
+	.byte	14                              # DW_FORM_strp
+	.byte	16                              # DW_AT_stmt_list
+	.byte	23                              # DW_FORM_sec_offset
+	.byte	27                              # DW_AT_comp_dir
+	.byte	14                              # DW_FORM_strp
+	.byte	17                              # DW_AT_low_pc
+	.byte	1                               # DW_FORM_addr
+	.byte	85                              # DW_AT_ranges
+	.byte	23                              # DW_FORM_sec_offset
+	.byte	0                               # EOM(1)
+	.byte	0                               # EOM(2)
+	.byte	2                               # Abbreviation Code
+	.byte	46                              # DW_TAG_subprogram
+	.byte	1                               # DW_CHILDREN_yes
+	.byte	85                              # DW_AT_ranges
+	.byte	23                              # DW_FORM_sec_offset
+	.byte	64                              # DW_AT_frame_base
+	.byte	24                              # DW_FORM_exprloc
+	.byte	110                             # DW_AT_linkage_name
+	.byte	14                              # DW_FORM_strp
+	.byte	3                               # DW_AT_name
+	.byte	14                              # DW_FORM_strp
+	.byte	58                              # DW_AT_decl_file
+	.byte	11                              # DW_FORM_data1
+	.byte	59                              # DW_AT_decl_line
+	.byte	11                              # DW_FORM_data1
+	.byte	73                              # DW_AT_type
+	.byte	19                              # DW_FORM_ref4
+	.byte	63                              # DW_AT_external
+	.byte	25                              # DW_FORM_flag_present
+	.byte	0                               # EOM(1)
+	.byte	0                               # EOM(2)
+	.byte	3                               # Abbreviation Code
+	.byte	5                               # DW_TAG_formal_parameter
+	.byte	0                               # DW_CHILDREN_no
+	.byte	2                               # DW_AT_location
+	.byte	24                              # DW_FORM_exprloc
+	.byte	3                               # DW_AT_name
+	.byte	14                              # DW_FORM_strp
+	.byte	58                              # DW_AT_decl_file
+	.byte	11                              # DW_FORM_data1
+	.byte	59                              # DW_AT_decl_line
+	.byte	11                              # DW_FORM_data1
+	.byte	73                              # DW_AT_type
+	.byte	19                              # DW_FORM_ref4
+	.byte	0                               # EOM(1)
+	.byte	0                               # EOM(2)
+	.byte	4                               # Abbreviation Code
+	.byte	46                              # DW_TAG_subprogram
+	.byte	1                               # DW_CHILDREN_yes
+	.byte	17                              # DW_AT_low_pc
+	.byte	1                               # DW_FORM_addr
+	.byte	18                              # DW_AT_high_pc
+	.byte	6                               # DW_FORM_data4
+	.byte	64                              # DW_AT_frame_base
+	.byte	24                              # DW_FORM_exprloc
+	.byte	3                               # DW_AT_name
+	.byte	14                              # DW_FORM_strp
+	.byte	58                              # DW_AT_decl_file
+	.byte	11                              # DW_FORM_data1
+	.byte	59                              # DW_AT_decl_line
+	.byte	11                              # DW_FORM_data1
+	.byte	73                              # DW_AT_type
+	.byte	19                              # DW_FORM_ref4
+	.byte	63                              # DW_AT_external
+	.byte	25                              # DW_FORM_flag_present
+	.byte	0                               # EOM(1)
+	.byte	0                               # EOM(2)
+	.byte	5                               # Abbreviation Code
+	.byte	36                              # DW_TAG_base_type
+	.byte	0                               # DW_CHILDREN_no
+	.byte	3                               # DW_AT_name
+	.byte	14                              # DW_FORM_strp
+	.byte	62                              # DW_AT_encoding
+	.byte	11                              # DW_FORM_data1
+	.byte	11                              # DW_AT_byte_size
+	.byte	11                              # DW_FORM_data1
+	.byte	0                               # EOM(1)
+	.byte	0                               # EOM(2)
+	.byte	6                               # Abbreviation Code
+	.byte	15                              # DW_TAG_pointer_type
+	.byte	0                               # DW_CHILDREN_no
+	.byte	73                              # DW_AT_type
+	.byte	19                              # DW_FORM_ref4
+	.byte	0                               # EOM(1)
+	.byte	0                               # EOM(2)
+	.byte	7                               # Abbreviation Code
+	.byte	38                              # DW_TAG_const_type
+	.byte	0                               # DW_CHILDREN_no
+	.byte	73                              # DW_AT_type
+	.byte	19                              # DW_FORM_ref4
+	.byte	0                               # EOM(1)
+	.byte	0                               # EOM(2)
+	.byte	0                               # EOM(3)
+	.section	.debug_info,"", at progbits
+.Lcu_begin0:
+	.long	.Ldebug_info_end0-.Ldebug_info_start0 # Length of Unit
+.Ldebug_info_start0:
+	.short	4                               # DWARF version number
+	.long	.debug_abbrev                   # Offset Into Abbrev. Section
+	.byte	8                               # Address Size (in bytes)
+	.byte	1                               # Abbrev [1] 0xb:0x97 DW_TAG_compile_unit
+	.long	.Linfo_string0                  # DW_AT_producer
+	.short	33                              # DW_AT_language
+	.long	.Linfo_string1                  # DW_AT_name
+	.long	.Lline_table_start0             # DW_AT_stmt_list
+	.long	.Linfo_string2                  # DW_AT_comp_dir
+	.quad	0                               # DW_AT_low_pc
+	.long	.Ldebug_ranges1                 # DW_AT_ranges
+	.byte	2                               # Abbrev [2] 0x2a:0x24 DW_TAG_subprogram
+	.long	.Ldebug_ranges0                 # DW_AT_ranges
+	.byte	1                               # DW_AT_frame_base
+	.byte	86
+	.long	.Linfo_string3                  # DW_AT_linkage_name
+	.long	.Linfo_string4                  # DW_AT_name
+	.byte	1                               # DW_AT_decl_file
+	.byte	1                               # DW_AT_decl_line
+	.long	132                             # DW_AT_type
+                                        # DW_AT_external
+	.byte	3                               # Abbrev [3] 0x3f:0xe DW_TAG_formal_parameter
+	.byte	2                               # DW_AT_location
+	.byte	145
+	.byte	124
+	.long	.Linfo_string7                  # DW_AT_name
+	.byte	1                               # DW_AT_decl_file
+	.byte	1                               # DW_AT_decl_line
+	.long	132                             # DW_AT_type
+	.byte	0                               # End Of Children Mark
+	.byte	4                               # Abbrev [4] 0x4e:0x36 DW_TAG_subprogram
+	.quad	.Lfunc_begin1                   # DW_AT_low_pc
+	.long	.Lfunc_end1-.Lfunc_begin1       # DW_AT_high_pc
+	.byte	1                               # DW_AT_frame_base
+	.byte	86
+	.long	.Linfo_string6                  # DW_AT_name
+	.byte	1                               # DW_AT_decl_file
+	.byte	7                               # DW_AT_decl_line
+	.long	132                             # DW_AT_type
+                                        # DW_AT_external
+	.byte	3                               # Abbrev [3] 0x67:0xe DW_TAG_formal_parameter
+	.byte	2                               # DW_AT_location
+	.byte	145
+	.byte	120
+	.long	.Linfo_string8                  # DW_AT_name
+	.byte	1                               # DW_AT_decl_file
+	.byte	7                               # DW_AT_decl_line
+	.long	132                             # DW_AT_type
+	.byte	3                               # Abbrev [3] 0x75:0xe DW_TAG_formal_parameter
+	.byte	2                               # DW_AT_location
+	.byte	145
+	.byte	112
+	.long	.Linfo_string9                  # DW_AT_name
+	.byte	1                               # DW_AT_decl_file
+	.byte	7                               # DW_AT_decl_line
+	.long	139                             # DW_AT_type
+	.byte	0                               # End Of Children Mark
+	.byte	5                               # Abbrev [5] 0x84:0x7 DW_TAG_base_type
+	.long	.Linfo_string5                  # DW_AT_name
+	.byte	5                               # DW_AT_encoding
+	.byte	4                               # DW_AT_byte_size
+	.byte	6                               # Abbrev [6] 0x8b:0x5 DW_TAG_pointer_type
+	.long	144                             # DW_AT_type
+	.byte	6                               # Abbrev [6] 0x90:0x5 DW_TAG_pointer_type
+	.long	149                             # DW_AT_type
+	.byte	7                               # Abbrev [7] 0x95:0x5 DW_TAG_const_type
+	.long	154                             # DW_AT_type
+	.byte	5                               # Abbrev [5] 0x9a:0x7 DW_TAG_base_type
+	.long	.Linfo_string10                 # DW_AT_name
+	.byte	6                               # DW_AT_encoding
+	.byte	1                               # DW_AT_byte_size
+	.byte	0                               # End Of Children Mark
+.Ldebug_info_end0:
+	.section	.debug_ranges,"", at progbits
+.Ldebug_ranges0:
+	.quad	_Z7doStuffi.__part.1
+	.quad	.LBB_END0_1
+	.quad	_Z7doStuffi.__part.2
+	.quad	.LBB_END0_2
+	.quad	.Lfunc_begin0
+	.quad	.Lfunc_end0
+	.quad	0
+	.quad	0
+.Ldebug_ranges1:
+	.quad	_Z7doStuffi.__part.1
+	.quad	.LBB_END0_1
+	.quad	_Z7doStuffi.__part.2
+	.quad	.LBB_END0_2
+	.quad	.Lfunc_begin0
+	.quad	.Lfunc_end0
+	.quad	.Lfunc_begin1
+	.quad	.Lfunc_end1
+	.quad	0
+	.quad	0
+	.section	.debug_str,"MS", at progbits,1
+.Linfo_string0:
+	.asciz	"clang version 17.0.0 (https://github.com/llvm/llvm-project.git 640e07c49037cca41a1bfbeb916b569d8c950aea)" # string offset=0
+.Linfo_string1:
+	.asciz	"main.cpp"                      # string offset=105
+.Linfo_string2:
+	.asciz	"/subprogramRanges" # string offset=114
+.Linfo_string3:
+	.asciz	"_Z7doStuffi"                   # string offset=169
+.Linfo_string4:
+	.asciz	"doStuff"                       # string offset=181
+.Linfo_string5:
+	.asciz	"int"                           # string offset=189
+.Linfo_string6:
+	.asciz	"main"                          # string offset=193
+.Linfo_string7:
+	.asciz	"val"                           # string offset=198
+.Linfo_string8:
+	.asciz	"argc"                          # string offset=202
+.Linfo_string9:
+	.asciz	"argv"                          # string offset=207
+.Linfo_string10:
+	.asciz	"char"                          # string offset=212
+	.ident	"clang version 17.0.0 (https://github.com/llvm/llvm-project.git 640e07c49037cca41a1bfbeb916b569d8c950aea)"
+	.section	".note.GNU-stack","", at progbits
+	.addrsig
+	.addrsig_sym _Z7doStuffi
+	.section	.debug_line,"", at progbits
+.Lline_table_start0:
diff --git a/bolt/test/X86/Inputs/dwarf5-subprogram-multiple-ranges-other.s b/bolt/test/X86/Inputs/dwarf5-subprogram-multiple-ranges-other.s
new file mode 100644
index 0000000000000..d296f61f9b9f0
--- /dev/null
+++ b/bolt/test/X86/Inputs/dwarf5-subprogram-multiple-ranges-other.s
@@ -0,0 +1,385 @@
+# clang++ -fbasic-block-sections=all -ffunction-sections -g2 -gdwarf-5
+# int doStuff(int val) {
+#   if (val)
+#     ++val;
+#   return val;
+# }
+#
+# int main(int argc, const char** argv) {
+#     return  doStuff(argc);
+# }
+	.text
+	.file	"main.cpp"
+	.section	.text._Z7doStuffi,"ax", at progbits
+	.globl	_Z7doStuffi                     # -- Begin function _Z7doStuffi
+	.p2align	4, 0x90
+	.type	_Z7doStuffi, at function
+_Z7doStuffi:                            # @_Z7doStuffi
+.Lfunc_begin0:
+	.file	0 "/subprogramRanges" "main.cpp" md5 0x45fd34ef778739dca24be206894f1d15
+	.loc	0 1 0                           # main.cpp:1:0
+	.cfi_startproc
+# %bb.0:                                # %entry
+	pushq	%rbp
+	.cfi_def_cfa_offset 16
+	.cfi_offset %rbp, -16
+	movq	%rsp, %rbp
+	.cfi_def_cfa_register %rbp
+	movl	%edi, -4(%rbp)
+.Ltmp0:
+	.loc	0 2 7 prologue_end              # main.cpp:2:7
+	cmpl	$0, -4(%rbp)
+.Ltmp1:
+	.loc	0 2 7 is_stmt 0                 # main.cpp:2:7
+	je	_Z7doStuffi.__part.2
+	jmp	_Z7doStuffi.__part.1
+.LBB_END0_0:
+	.cfi_endproc
+	.section	.text._Z7doStuffi,"ax", at progbits,unique,1
+_Z7doStuffi.__part.1:                   # %if.then
+	.cfi_startproc
+	.cfi_def_cfa %rbp, 16
+	.cfi_offset %rbp, -16
+	.loc	0 3 5 is_stmt 1                 # main.cpp:3:5
+	movl	-4(%rbp), %eax
+	addl	$1, %eax
+	movl	%eax, -4(%rbp)
+	jmp	_Z7doStuffi.__part.2
+.LBB_END0_1:
+	.size	_Z7doStuffi.__part.1, .LBB_END0_1-_Z7doStuffi.__part.1
+	.cfi_endproc
+	.section	.text._Z7doStuffi,"ax", at progbits,unique,2
+_Z7doStuffi.__part.2:                   # %if.end
+	.cfi_startproc
+	.cfi_def_cfa %rbp, 16
+	.cfi_offset %rbp, -16
+	.loc	0 4 10                          # main.cpp:4:10
+	movl	-4(%rbp), %eax
+	.loc	0 4 3 epilogue_begin is_stmt 0  # main.cpp:4:3
+	popq	%rbp
+	.cfi_def_cfa %rsp, 8
+	retq
+.LBB_END0_2:
+	.size	_Z7doStuffi.__part.2, .LBB_END0_2-_Z7doStuffi.__part.2
+	.cfi_endproc
+	.section	.text._Z7doStuffi,"ax", at progbits
+.Lfunc_end0:
+	.size	_Z7doStuffi, .Lfunc_end0-_Z7doStuffi
+                                        # -- End function
+	.section	.text.main,"ax", at progbits
+	.globl	main                            # -- Begin function main
+	.p2align	4, 0x90
+	.type	main, at function
+main:                                   # @main
+.Lfunc_begin1:
+	.loc	0 7 0 is_stmt 1                 # main.cpp:7:0
+	.cfi_startproc
+# %bb.0:                                # %entry
+	pushq	%rbp
+	.cfi_def_cfa_offset 16
+	.cfi_offset %rbp, -16
+	movq	%rsp, %rbp
+	.cfi_def_cfa_register %rbp
+	subq	$16, %rsp
+	movl	$0, -4(%rbp)
+	movl	%edi, -8(%rbp)
+	movq	%rsi, -16(%rbp)
+.Ltmp2:
+	.loc	0 8 21 prologue_end             # main.cpp:8:21
+	movl	-8(%rbp), %edi
+	.loc	0 8 13 is_stmt 0                # main.cpp:8:13
+	callq	_Z7doStuffi
+	.loc	0 8 5 epilogue_begin            # main.cpp:8:5
+	addq	$16, %rsp
+	popq	%rbp
+	.cfi_def_cfa %rsp, 8
+	retq
+.LBB_END1_0:
+	.cfi_endproc
+.Lfunc_end1:
+	.size	main, .Lfunc_end1-main
+                                        # -- End function
+	.section	.debug_abbrev,"", at progbits
+	.byte	1                               # Abbreviation Code
+	.byte	17                              # DW_TAG_compile_unit
+	.byte	1                               # DW_CHILDREN_yes
+	.byte	37                              # DW_AT_producer
+	.byte	37                              # DW_FORM_strx1
+	.byte	19                              # DW_AT_language
+	.byte	5                               # DW_FORM_data2
+	.byte	3                               # DW_AT_name
+	.byte	37                              # DW_FORM_strx1
+	.byte	114                             # DW_AT_str_offsets_base
+	.byte	23                              # DW_FORM_sec_offset
+	.byte	16                              # DW_AT_stmt_list
+	.byte	23                              # DW_FORM_sec_offset
+	.byte	27                              # DW_AT_comp_dir
+	.byte	37                              # DW_FORM_strx1
+	.byte	17                              # DW_AT_low_pc
+	.byte	1                               # DW_FORM_addr
+	.byte	85                              # DW_AT_ranges
+	.byte	35                              # DW_FORM_rnglistx
+	.byte	115                             # DW_AT_addr_base
+	.byte	23                              # DW_FORM_sec_offset
+	.byte	116                             # DW_AT_rnglists_base
+	.byte	23                              # DW_FORM_sec_offset
+	.byte	0                               # EOM(1)
+	.byte	0                               # EOM(2)
+	.byte	2                               # Abbreviation Code
+	.byte	46                              # DW_TAG_subprogram
+	.byte	1                               # DW_CHILDREN_yes
+	.byte	85                              # DW_AT_ranges
+	.byte	35                              # DW_FORM_rnglistx
+	.byte	64                              # DW_AT_frame_base
+	.byte	24                              # DW_FORM_exprloc
+	.byte	110                             # DW_AT_linkage_name
+	.byte	37                              # DW_FORM_strx1
+	.byte	3                               # DW_AT_name
+	.byte	37                              # DW_FORM_strx1
+	.byte	58                              # DW_AT_decl_file
+	.byte	11                              # DW_FORM_data1
+	.byte	59                              # DW_AT_decl_line
+	.byte	11                              # DW_FORM_data1
+	.byte	73                              # DW_AT_type
+	.byte...
[truncated]

``````````

</details>


https://github.com/llvm/llvm-project/pull/93615


More information about the llvm-commits mailing list