Skip to content

Commit 34c3c3a

Browse files
sys-igcigcbot
sys-igc
authored and
igcbot
committed
[Autobackout][FunctionalRegression]Revert of change: aeefdeb: Reverse sequence of locals in DWARF
Reverse sequence of locals in `DWARF` to unify locals order printed by debugger on CPU and GPU
1 parent dd4b423 commit 34c3c3a

File tree

4 files changed

+36
-38
lines changed

4 files changed

+36
-38
lines changed

‎IGC/DebugInfo/DwarfDebug.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -727,10 +727,7 @@ DIE *DwarfDebug::createScopeChildrenDIE(CompileUnit *TheCU, LexicalScope *Scope,
727727

728728
{
729729
// Collect lexical scope variables.
730-
DbgVariablesVect Variables = ScopeVariables.lookup(Scope);
731-
// Reverse the vector of the variables to unify locals order
732-
// printed by cpu & gpu under debugger.
733-
std::reverse(Variables.begin(), Variables.end());
730+
const DbgVariablesVect &Variables = ScopeVariables.lookup(Scope);
734731
std::copy(Variables.begin(), Variables.end(),
735732
std::back_inserter(dbgVariables));
736733
}

‎IGC/VectorCompiler/test/DebugInfo/basic_var_locs.ll

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,40 +23,40 @@ target triple = "genx64-unknown-unknown"
2323
; RUN: llvm-dwarfdump dbginfo_%basename_t_vector_add_dwarf.elf | FileCheck %s --check-prefix DWARFDUMP
2424

2525
; CHECK: DW_TAG_variable
26-
; DWARFDUMP: DW_AT_name ("ovector")
27-
; CHECK-NEXT: DW_AT_name : ovector
26+
; DWARFDUMP: DW_AT_name ("offset")
27+
; CHECK-NEXT: DW_AT_name : offset
2828
; CHECK-NEXT: DW_AT_decl_file
2929
; CHECK-NEXT: DW_AT_decl_line
30-
; DWARFDUMP: DW_AT_type ({{0x[0-9a-f]+}} "int[16]")
30+
; DWARFDUMP: DW_AT_type ({{0x[0-9a-f]+}} "unsigned int")
3131
; CHECK-NEXT: DW_AT_type
32-
; CHECK-NEXT: DW_AT_location : {{(0x)?}}[[OVEC_LOC:[0-9a-f]+]] (location list)
32+
; CHECK-NEXT: DW_AT_location : {{(0x)?}}[[OFF_LOC:[0-9a-f]+]] (location list)
3333

3434
; CHECK: DW_TAG_variable
35-
; DWARFDUMP: DW_AT_name ("ivector2")
36-
; CHECK-NEXT: DW_AT_name : ivector2
35+
; DWARFDUMP: DW_AT_name ("ivector1")
36+
; CHECK-NEXT: DW_AT_name : ivector1
3737
; CHECK-NEXT: DW_AT_decl_file
3838
; CHECK-NEXT: DW_AT_decl_line
3939
; DWARFDUMP: DW_AT_type ({{0x[0-9a-f]+}} "int[16]")
4040
; CHECK-NEXT: DW_AT_type
41-
; CHECK-NEXT: DW_AT_location : {{(0x)?}}[[IVEC2_LOC:[0-9a-f]+]] (location list)
41+
; CHECK-NEXT: DW_AT_location : {{(0x)?}}[[IVEC1_LOC:[0-9a-f]+]] (location list)
4242

4343
; CHECK: DW_TAG_variable
44-
; DWARFDUMP: DW_AT_name ("ivector1")
45-
; CHECK-NEXT: DW_AT_name : ivector1
44+
; DWARFDUMP: DW_AT_name ("ivector2")
45+
; CHECK-NEXT: DW_AT_name : ivector2
4646
; CHECK-NEXT: DW_AT_decl_file
4747
; CHECK-NEXT: DW_AT_decl_line
4848
; DWARFDUMP: DW_AT_type ({{0x[0-9a-f]+}} "int[16]")
4949
; CHECK-NEXT: DW_AT_type
50-
; CHECK-NEXT: DW_AT_location : {{(0x)?}}[[IVEC1_LOC:[0-9a-f]+]] (location list)
50+
; CHECK-NEXT: DW_AT_location : {{(0x)?}}[[IVEC2_LOC:[0-9a-f]+]] (location list)
5151

5252
; CHECK: DW_TAG_variable
53-
; DWARFDUMP: DW_AT_name ("offset")
54-
; CHECK-NEXT: DW_AT_name : offset
53+
; DWARFDUMP: DW_AT_name ("ovector")
54+
; CHECK-NEXT: DW_AT_name : ovector
5555
; CHECK-NEXT: DW_AT_decl_file
5656
; CHECK-NEXT: DW_AT_decl_line
57-
; DWARFDUMP: DW_AT_type ({{0x[0-9a-f]+}} "unsigned int")
57+
; DWARFDUMP: DW_AT_type ({{0x[0-9a-f]+}} "int[16]")
5858
; CHECK-NEXT: DW_AT_type
59-
; CHECK-NEXT: DW_AT_location : {{(0x)?}}[[OFF_LOC:[0-9a-f]+]] (location list)
59+
; CHECK-NEXT: DW_AT_location : {{(0x)?}}[[OVEC_LOC:[0-9a-f]+]] (location list)
6060

6161
; locations in location-list
6262
; CHECK-DAG: [[OFF_LOC]] {{[^(]+}}(DW_OP_lit[[#]]; DW_OP_{{lit|const1u: }}[[#]]; DW_OP_INTEL_regval_bits: 32; DW_OP_constu: 6; DW_OP_shl; DW_OP_stack_value)

‎IGC/VectorCompiler/test/DebugInfo/basic_var_locs_small.ll

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,40 +23,41 @@ target triple = "genx64-unknown-unknown"
2323
; RUN: llvm-dwarfdump dbginfo_%basename_t_vector_add_dwarf.elf | FileCheck %s --check-prefix DWARFDUMP
2424

2525
; CHECK: DW_TAG_variable
26-
; DWARFDUMP: DW_AT_name ("ovector")
27-
; CHECK-NEXT: DW_AT_name : ovector
26+
; DWARFDUMP: DW_AT_name ("offset")
27+
; CHECK-NEXT: DW_AT_name : offset
2828
; CHECK-NEXT: DW_AT_decl_file
2929
; CHECK-NEXT: DW_AT_decl_line
30-
; DWARFDUMP: DW_AT_type ({{0x[0-9a-f]+}} "int[8]")
30+
; DWARFDUMP: DW_AT_type ({{0x[0-9a-f]+}} "unsigned int")
3131
; CHECK-NEXT: DW_AT_type
32-
; CHECK-NEXT: DW_AT_location : {{(0x)?}}[[OVEC_LOC:[0-9a-f]+]] (location list)
32+
; CHECK-NEXT: DW_AT_location : {{(0x)?}}[[OFF_LOC:[0-9a-f]+]] (location list)
33+
3334

3435
; CHECK: DW_TAG_variable
35-
; DWARFDUMP: DW_AT_name ("ivector2")
36-
; CHECK-NEXT: DW_AT_name : ivector2
36+
; DWARFDUMP: DW_AT_name ("ivector1")
37+
; CHECK-NEXT: DW_AT_name : ivector1
3738
; CHECK-NEXT: DW_AT_decl_file
3839
; CHECK-NEXT: DW_AT_decl_line
3940
; DWARFDUMP: DW_AT_type ({{0x[0-9a-f]+}} "int[8]")
4041
; CHECK-NEXT: DW_AT_type
41-
; CHECK-NEXT: DW_AT_location : {{(0x)?}}[[IVEC2_LOC:[0-9a-f]+]] (location list)
42+
; CHECK-NEXT: DW_AT_location : {{(0x)?}}[[IVEC1_LOC:[0-9a-f]+]] (location list)
4243

4344
; CHECK: DW_TAG_variable
44-
; DWARFDUMP: DW_AT_name ("ivector1")
45-
; CHECK-NEXT: DW_AT_name : ivector1
45+
; DWARFDUMP: DW_AT_name ("ivector2")
46+
; CHECK-NEXT: DW_AT_name : ivector2
4647
; CHECK-NEXT: DW_AT_decl_file
4748
; CHECK-NEXT: DW_AT_decl_line
4849
; DWARFDUMP: DW_AT_type ({{0x[0-9a-f]+}} "int[8]")
4950
; CHECK-NEXT: DW_AT_type
50-
; CHECK-NEXT: DW_AT_location : {{(0x)?}}[[IVEC1_LOC:[0-9a-f]+]] (location list)
51+
; CHECK-NEXT: DW_AT_location : {{(0x)?}}[[IVEC2_LOC:[0-9a-f]+]] (location list)
5152

5253
; CHECK: DW_TAG_variable
53-
; DWARFDUMP: DW_AT_name ("offset")
54-
; CHECK-NEXT: DW_AT_name : offset
54+
; DWARFDUMP: DW_AT_name ("ovector")
55+
; CHECK-NEXT: DW_AT_name : ovector
5556
; CHECK-NEXT: DW_AT_decl_file
5657
; CHECK-NEXT: DW_AT_decl_line
57-
; DWARFDUMP: DW_AT_type ({{0x[0-9a-f]+}} "unsigned int")
58+
; DWARFDUMP: DW_AT_type ({{0x[0-9a-f]+}} "int[8]")
5859
; CHECK-NEXT: DW_AT_type
59-
; CHECK-NEXT: DW_AT_location : {{(0x)?}}[[OFF_LOC:[0-9a-f]+]] (location list)
60+
; CHECK-NEXT: DW_AT_location : {{(0x)?}}[[OVEC_LOC:[0-9a-f]+]] (location list)
6061

6162
; CHECK-DAG: [[OFF_LOC]] {{[^(]+}}(DW_OP_lit[[#]]; DW_OP_{{lit|const1u: }}[[#]]; DW_OP_INTEL_regval_bits: 32; DW_OP_constu: 6; DW_OP_shl; DW_OP_stack_value)
6263
; CHECK-DAG: [[IVEC1_LOC]] {{[^(]+}}(DW_OP_{{reg|regx: }}[[#]] ({{r|xmm}}[[#]]); DW_OP_bit_piece: size: 256 offset: 0 )

‎IGC/VectorCompiler/test/DebugInfo/var_loc_ptr.ll

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@
1919
; CHECK-NEXT: DW_AT_type : <{{0x[0-9a-f]+}}>
2020
; CHECK-NEXT: DW_AT_location : {{(0x)?}}[[BUF_LOC:[0-9a-f]+]] (location list)
2121

22-
; CHECK: DW_AT_name : data
22+
; CHECK: DW_AT_name : artificial_vect
2323
; CHECK-NEXT: DW_AT_decl_file : 1
24-
; CHECK-NEXT: DW_AT_decl_line : 7
24+
; CHECK-NEXT: DW_AT_decl_line : 777
2525
; CHECK-NEXT: DW_AT_type : <[[VECT_TYPE:0x[0-9a-f]+]]>
26-
; CHECK-NEXT: DW_AT_const_value : 64 byte block: 0 0 0 0 1 0 0 0 2 0 0 0 3 0 0 0 4 0 0 0 5 0 0 0 6 0 0 0 7 0 0 0 8 0 0 0 9 0 0 0 a 0 0 0 b 0 0 0 c 0 0 0 d 0 0 0 e 0 0 0 f 0 0 0
26+
; CHECK-NEXT: DW_AT_location : {{(0x)?}}[[VECT_LOC:[0-9a-f]+]] (location list)
2727

28-
; CHECK: DW_AT_name : artificial_vect
28+
; CHECK: DW_AT_name : data
2929
; CHECK-NEXT: DW_AT_decl_file : 1
30-
; CHECK-NEXT: DW_AT_decl_line : 777
30+
; CHECK-NEXT: DW_AT_decl_line : 7
3131
; CHECK-NEXT: DW_AT_type : <[[VECT_TYPE]]>
32-
; CHECK-NEXT: DW_AT_location : {{(0x)?}}[[VECT_LOC:[0-9a-f]+]] (location list)
32+
; CHECK-NEXT: DW_AT_const_value : 64 byte block: 0 0 0 0 1 0 0 0 2 0 0 0 3 0 0 0 4 0 0 0 5 0 0 0 6 0 0 0 7 0 0 0 8 0 0 0 9 0 0 0 a 0 0 0 b 0 0 0 c 0 0 0 d 0 0 0 e 0 0 0 f 0 0 0
3333

3434
; debug_loc section
3535
; CHECK-DAG: [[BUF_LOC]] {{[^(]+}}(DW_OP_lit[[#]]; DW_OP_{{lit|const1u: }}[[#]]; DW_OP_INTEL_regval_bits: 64; DW_OP_stack_value)

0 commit comments

Comments
 (0)