Skip to content

Commit 85a03d6

Browse files
zhaomaosuzhaomaosu
committed
Merge from 'main' to 'sycl-web' (170 commits)
 CONFLICT (content): Merge conflict in llvm/test/Instrumentation/InstrOrderFile/basic.ll
2 parents 08b30cf + e931c2e commit 85a03d6

File tree

986 files changed

+42559
-23421
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

986 files changed

+42559
-23421
lines changed

‎bolt/include/bolt/Passes/ShrinkWrapping.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -308,12 +308,12 @@ class ShrinkWrapping {
308308
std::vector<std::vector<MCInst *>> BestSavePos;
309309

310310
/// Pass stats
311-
static std::atomic_uint64_t SpillsMovedRegularMode;
312-
static std::atomic_uint64_t SpillsMovedPushPopMode;
313-
static std::atomic_uint64_t SpillsMovedDynamicCount;
314-
static std::atomic_uint64_t SpillsFailedDynamicCount;
315-
static std::atomic_uint64_t InstrDynamicCount;
316-
static std::atomic_uint64_t StoreDynamicCount;
311+
static std::atomic<std::uint64_t> SpillsMovedRegularMode;
312+
static std::atomic<std::uint64_t> SpillsMovedPushPopMode;
313+
static std::atomic<std::uint64_t> SpillsMovedDynamicCount;
314+
static std::atomic<std::uint64_t> SpillsFailedDynamicCount;
315+
static std::atomic<std::uint64_t> InstrDynamicCount;
316+
static std::atomic<std::uint64_t> StoreDynamicCount;
317317

318318
Optional<unsigned> AnnotationIndex;
319319

‎bolt/lib/Passes/ShrinkWrapping.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -712,12 +712,12 @@ void StackLayoutModifier::initialize() {
712712
IsInitialized = true;
713713
}
714714

715-
std::atomic_uint64_t ShrinkWrapping::SpillsMovedRegularMode{0};
716-
std::atomic_uint64_t ShrinkWrapping::SpillsMovedPushPopMode{0};
717-
std::atomic_uint64_t ShrinkWrapping::SpillsMovedDynamicCount{0};
718-
std::atomic_uint64_t ShrinkWrapping::SpillsFailedDynamicCount{0};
719-
std::atomic_uint64_t ShrinkWrapping::InstrDynamicCount{0};
720-
std::atomic_uint64_t ShrinkWrapping::StoreDynamicCount{0};
715+
std::atomic<std::uint64_t> ShrinkWrapping::SpillsMovedRegularMode{0};
716+
std::atomic<std::uint64_t> ShrinkWrapping::SpillsMovedPushPopMode{0};
717+
std::atomic<std::uint64_t> ShrinkWrapping::SpillsMovedDynamicCount{0};
718+
std::atomic<std::uint64_t> ShrinkWrapping::SpillsFailedDynamicCount{0};
719+
std::atomic<std::uint64_t> ShrinkWrapping::InstrDynamicCount{0};
720+
std::atomic<std::uint64_t> ShrinkWrapping::StoreDynamicCount{0};
721721

722722
using BBIterTy = BinaryBasicBlock::iterator;
723723

‎bolt/test/X86/Inputs/dwarf4-split-dwarf-no-address-helper.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ _Z6helperi: # @_Z6helperi
111111
.byte 1 # DW_AT_name
112112
.byte 1 # DW_AT_decl_file
113113
.byte 1 # DW_AT_decl_line
114-
.long 53 # DW_AT_type
114+
.long 48 # DW_AT_type
115115
# DW_AT_external
116116
.byte 3 # Abbrev [3] 0x29:0xb DW_TAG_formal_parameter
117117
.byte 2 # DW_AT_location
@@ -120,7 +120,7 @@ _Z6helperi: # @_Z6helperi
120120
.byte 3 # DW_AT_name
121121
.byte 1 # DW_AT_decl_file
122122
.byte 1 # DW_AT_decl_line
123-
.long 53 # DW_AT_type
123+
.long 48 # DW_AT_type
124124
.byte 0 # End Of Children Mark
125125
.byte 4 # Abbrev [4] 0x35:0x4 DW_TAG_base_type
126126
.byte 2 # DW_AT_name

‎bolt/test/X86/Inputs/dwarf5-loclist-offset-form-helper.s

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ fooVar:
289289
.long .Laddr_table_base0 # DW_AT_addr_base
290290
.byte 2 # Abbrev [2] 0x27:0xb DW_TAG_variable
291291
.byte 3 # DW_AT_name
292-
.long 50 # DW_AT_type
292+
.long 46 # DW_AT_type
293293
# DW_AT_external
294294
.byte 0 # DW_AT_decl_file
295295
.byte 1 # DW_AT_decl_line
@@ -306,11 +306,11 @@ fooVar:
306306
.byte 1 # DW_AT_frame_base
307307
.byte 87
308308
# DW_AT_call_all_calls
309-
.long 74 # DW_AT_abstract_origin
309+
.long 70 # DW_AT_abstract_origin
310310
.byte 5 # Abbrev [5] 0x42:0x7 DW_TAG_formal_parameter
311311
.byte 1 # DW_AT_location
312312
.byte 85
313-
.long 79 # DW_AT_abstract_origin
313+
.long 75 # DW_AT_abstract_origin
314314
.byte 0 # End Of Children Mark
315315
.byte 6 # Abbrev [6] 0x4a:0xe DW_TAG_subprogram
316316
.byte 5 # DW_AT_linkage_name
@@ -323,10 +323,10 @@ fooVar:
323323
.byte 7 # DW_AT_name
324324
.byte 0 # DW_AT_decl_file
325325
.byte 2 # DW_AT_decl_line
326-
.long 88 # DW_AT_type
326+
.long 84 # DW_AT_type
327327
.byte 0 # End Of Children Mark
328328
.byte 8 # Abbrev [8] 0x58:0x5 DW_TAG_pointer_type
329-
.long 50 # DW_AT_type
329+
.long 46 # DW_AT_type
330330
.byte 9 # Abbrev [9] 0x5d:0x31 DW_TAG_subprogram
331331
.byte 2 # DW_AT_low_pc
332332
.long .Lfunc_end1-.Lfunc_begin1 # DW_AT_high_pc
@@ -337,23 +337,23 @@ fooVar:
337337
.byte 9 # DW_AT_name
338338
.byte 0 # DW_AT_decl_file
339339
.byte 6 # DW_AT_decl_line
340-
.long 50 # DW_AT_type
340+
.long 46 # DW_AT_type
341341
# DW_AT_external
342342
.byte 10 # Abbrev [10] 0x6d:0xa DW_TAG_formal_parameter
343343
.byte 1 # DW_AT_location
344344
.byte 85
345345
.byte 10 # DW_AT_name
346346
.byte 0 # DW_AT_decl_file
347347
.byte 6 # DW_AT_decl_line
348-
.long 50 # DW_AT_type
348+
.long 46 # DW_AT_type
349349
.byte 11 # Abbrev [11] 0x77:0x9 DW_TAG_variable
350350
.long .Ldebug_loc0 # DW_AT_location
351351
.byte 7 # DW_AT_name
352352
.byte 0 # DW_AT_decl_file
353353
.byte 7 # DW_AT_decl_line
354-
.long 50 # DW_AT_type
354+
.long 46 # DW_AT_type
355355
.byte 12 # Abbrev [12] 0x80:0xd DW_TAG_inlined_subroutine
356-
.long 74 # DW_AT_abstract_origin
356+
.long 70 # DW_AT_abstract_origin
357357
.byte 2 # DW_AT_low_pc
358358
.long .Ltmp1-.Lfunc_begin1 # DW_AT_high_pc
359359
.byte 0 # DW_AT_call_file

‎bolt/test/X86/Inputs/dwarf5-loclist-offset-form-main.s

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -267,14 +267,14 @@ main: # @main
267267
.byte 7 # DW_AT_name
268268
.byte 0 # DW_AT_decl_file
269269
.byte 1 # DW_AT_decl_line
270-
.long 130 # DW_AT_type
270+
.long 132 # DW_AT_type
271271
.byte 3 # Abbrev [3] 0x3d:0xa DW_TAG_formal_parameter
272272
.byte 1 # DW_AT_location
273273
.byte 84
274274
.byte 8 # DW_AT_name
275275
.byte 0 # DW_AT_decl_file
276276
.byte 1 # DW_AT_decl_line
277-
.long 130 # DW_AT_type
277+
.long 132 # DW_AT_type
278278
.byte 0 # End Of Children Mark
279279
.byte 4 # Abbrev [4] 0x48:0x36 DW_TAG_subprogram
280280
.byte 1 # DW_AT_low_pc
@@ -285,45 +285,45 @@ main: # @main
285285
.byte 5 # DW_AT_name
286286
.byte 0 # DW_AT_decl_file
287287
.byte 7 # DW_AT_decl_line
288-
.long 126 # DW_AT_type
288+
.long 128 # DW_AT_type
289289
# DW_AT_external
290290
.byte 3 # Abbrev [3] 0x57:0xa DW_TAG_formal_parameter
291291
.byte 1 # DW_AT_location
292292
.byte 85
293293
.byte 9 # DW_AT_name
294294
.byte 0 # DW_AT_decl_file
295295
.byte 7 # DW_AT_decl_line
296-
.long 126 # DW_AT_type
296+
.long 128 # DW_AT_type
297297
.byte 3 # Abbrev [3] 0x61:0xa DW_TAG_formal_parameter
298298
.byte 1 # DW_AT_location
299299
.byte 84
300300
.byte 10 # DW_AT_name
301301
.byte 0 # DW_AT_decl_file
302302
.byte 7 # DW_AT_decl_line
303-
.long 135 # DW_AT_type
303+
.long 137 # DW_AT_type
304304
.byte 5 # Abbrev [5] 0x6b:0x9 DW_TAG_variable
305305
.long .Ldebug_loc0 # DW_AT_location
306306
.byte 7 # DW_AT_name
307307
.byte 0 # DW_AT_decl_file
308308
.byte 8 # DW_AT_decl_line
309-
.long 126 # DW_AT_type
309+
.long 128 # DW_AT_type
310310
.byte 5 # Abbrev [5] 0x74:0x9 DW_TAG_variable
311311
.long .Ldebug_loc1 # DW_AT_location
312312
.byte 8 # DW_AT_name
313313
.byte 0 # DW_AT_decl_file
314314
.byte 9 # DW_AT_decl_line
315-
.long 126 # DW_AT_type
315+
.long 128 # DW_AT_type
316316
.byte 0 # End Of Children Mark
317317
.byte 6 # Abbrev [6] 0x7e:0x4 DW_TAG_base_type
318318
.byte 6 # DW_AT_name
319319
.byte 5 # DW_AT_encoding
320320
.byte 4 # DW_AT_byte_size
321321
.byte 7 # Abbrev [7] 0x82:0x5 DW_TAG_pointer_type
322-
.long 126 # DW_AT_type
322+
.long 128 # DW_AT_type
323323
.byte 7 # Abbrev [7] 0x87:0x5 DW_TAG_pointer_type
324-
.long 140 # DW_AT_type
324+
.long 142 # DW_AT_type
325325
.byte 7 # Abbrev [7] 0x8c:0x5 DW_TAG_pointer_type
326-
.long 145 # DW_AT_type
326+
.long 147 # DW_AT_type
327327
.byte 6 # Abbrev [6] 0x91:0x4 DW_TAG_base_type
328328
.byte 11 # DW_AT_name
329329
.byte 6 # DW_AT_encoding

0 commit comments

Comments
 (0)