This is an archive of the discontinued LLVM Phabricator instance.

Differential D67736

[WebAssembly] Sort output data sections to place .bss last
ClosedPublic

Authored by tlively on Sep 18 2019, 3:29 PM.

Details

Reviewers
sbc100
Commits
rG21143b93a6ee: [WebAssembly] Sort output data sections to place .bss last
rLLD372284: [WebAssembly] Sort output data sections to place .bss last
rL372284: [WebAssembly] Sort output data sections to place .bss last
Summary

This was always the intended behavior, but had not been
implemented. This ordering is important for Emscripten when generating
.mem files while compiling to JS, since only zeros at the end of
initialized memory can be dropped.

Fixes https://github.com/emscripten-core/emscripten/issues/8999

Diff Detail

Event Timeline

tlively created this revision.Sep 18 2019, 3:29 PM
Herald added a project: Restricted Project. · View Herald TranscriptSep 18 2019, 3:29 PM
Herald added subscribers: llvm-commits, sunfish, aheejin and 2 others. · View Herald Transcript
Harbormaster completed remote builds in B38281: Diff 220761.Sep 18 2019, 3:31 PM
sbc100 added a comment.Sep 18 2019, 4:42 PM

Nice!

lld/wasm/Writer.cpp
690

Its possible to have custom segment names. See Writer.cpp:getOutputDataSegmentName. Seems strange that no tests use this feature though .. maybe I'm misunderstanding something?

Perhaps just create a partial order that puts bss last?

695

Drop the curlies for single line blocks

tlively updated this revision to Diff 220779.Sep 18 2019, 5:40 PM
  • Add test for custom section names and change sorting to handle them
Harbormaster completed remote builds in B38286: Diff 220779.Sep 18 2019, 5:41 PM
sbc100 accepted this revision.Sep 18 2019, 5:58 PM
sbc100 added inline comments.
lld/wasm/Writer.cpp
690

It it worth sorting things other than bss? Don't make much difference I suppose.

This revision is now accepted and ready to land.Sep 18 2019, 5:58 PM
tlively marked an inline comment as done.Sep 18 2019, 6:05 PM
tlively added inline comments.
lld/wasm/Writer.cpp
690

Eh, probably not, but changing all the tests was a pain and I don't want to do it again :) Perhaps someone will find it useful to have similar sections together some day.

Closed by commit rL372284: [WebAssembly] Sort output data sections to place .bss last (authored by tlively). · Explain WhySep 18 2019, 6:13 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lld/
test/
wasm/
60 lines
52 lines
30 lines
4 lines
60 lines
2 lines
2 lines
wasm/
4 lines
21 lines

Diff 220761

lld/test/wasm/data-layout.ll

Show All 20 Lines
; CHECK-NEXT: - Initial: 0x00000002 ; CHECK-NEXT: - Initial: 0x00000002
; CHECK-NEXT: - Type: GLOBAL ; CHECK-NEXT: - Type: GLOBAL
; CHECK-NEXT: Globals: ; CHECK-NEXT: Globals:
; CHECK-NEXT: - Index: 0 ; CHECK-NEXT: - Index: 0
; CHECK-NEXT: Type: I32 ; CHECK-NEXT: Type: I32
; CHECK-NEXT: Mutable: true ; CHECK-NEXT: Mutable: true
; CHECK-NEXT: InitExpr: ; CHECK-NEXT: InitExpr:
; CHECK-NEXT: Opcode: I32_CONST ; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 66608 ; CHECK-NEXT: Value: 66624
; CHECK-NEXT: - Index: 1 ; CHECK-NEXT: - Index: 1
; CHECK-NEXT: Type: I32 ; CHECK-NEXT: Type: I32
; CHECK-NEXT: Mutable: false ; CHECK-NEXT: Mutable: false
; CHECK-NEXT: InitExpr: ; CHECK-NEXT: InitExpr:
; CHECK-NEXT: Opcode: I32_CONST ; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 1071 ; CHECK-NEXT: Value: 1080
; CHECK-NEXT: - Index: 2 ; CHECK-NEXT: - Index: 2
; CHECK-NEXT: Type: I32 ; CHECK-NEXT: Type: I32
; CHECK-NEXT: Mutable: false ; CHECK-NEXT: Mutable: false
; CHECK-NEXT: InitExpr: ; CHECK-NEXT: InitExpr:
; CHECK-NEXT: Opcode: I32_CONST ; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 66608 ; CHECK-NEXT: Value: 66624
; CHECK: - Type: DATA ; CHECK: - Type: DATA
; CHECK-NEXT: Segments: ; CHECK-NEXT: Segments:
; CHECK-NEXT: - SectionOffset: 7 ; CHECK-NEXT: - SectionOffset: 7
; CHECK-NEXT: InitFlags: 0 ; CHECK-NEXT: InitFlags: 0
; CHECK-NEXT: Offset: ; CHECK-NEXT: Offset:
; CHECK-NEXT: Opcode: I32_CONST ; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 1024 ; CHECK-NEXT: Value: 1024
; CHECK-NEXT: Content: '0100000000000000000000000000000003000000000000002804000024040000' ; CHECK-NEXT: Content: 68656C6C6F0A00
; CHECK-NEXT: - SectionOffset: 45 ; CHECK-NEXT: - SectionOffset: 20
; CHECK-NEXT: InitFlags: 0 ; CHECK-NEXT: InitFlags: 0
; CHECK-NEXT: Offset: ; CHECK-NEXT: Offset:
; CHECK-NEXT: Opcode: I32_CONST ; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 1056 ; CHECK-NEXT: Value: 1040
; CHECK-NEXT: Content: '0000000000000000' ; CHECK-NEXT: Content: '0100000000000000000000000000000003000000000000000004000034040000'
; CHECK-NEXT: - SectionOffset: 59 ; CHECK-NEXT: - SectionOffset: 58
; CHECK-NEXT: InitFlags: 0 ; CHECK-NEXT: InitFlags: 0
; CHECK-NEXT: Offset: ; CHECK-NEXT: Offset:
; CHECK-NEXT: Opcode: I32_CONST ; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 1064 ; CHECK-NEXT: Value: 1072
; CHECK-NEXT: Content: 68656C6C6F0A00 ; CHECK-NEXT: Content: '0000000000000000'
; CHECK-NEXT: - Type: CUSTOM ; CHECK-NEXT: - Type: CUSTOM
; RUN: wasm-ld -no-gc-sections --allow-undefined --no-entry \ ; RUN: wasm-ld -no-gc-sections --allow-undefined --no-entry \
; RUN: --initial-memory=131072 --max-memory=131072 -o %t_max.wasm %t.o \ ; RUN: --initial-memory=131072 --max-memory=131072 -o %t_max.wasm %t.o \
; RUN: %t.hello.o ; RUN: %t.hello.o
; RUN: obj2yaml %t_max.wasm | FileCheck %s -check-prefix=CHECK-MAX ; RUN: obj2yaml %t_max.wasm | FileCheck %s -check-prefix=CHECK-MAX
Show All 16 Lines
; RUN: wasm-ld --relocatable -o %t_reloc.wasm %t.o %t.hello.o ; RUN: wasm-ld --relocatable -o %t_reloc.wasm %t.o %t.hello.o
; RUN: obj2yaml %t_reloc.wasm | FileCheck %s -check-prefix=RELOC ; RUN: obj2yaml %t_reloc.wasm | FileCheck %s -check-prefix=RELOC
; RELOC: - Type: DATA ; RELOC: - Type: DATA
; RELOC-NEXT: Relocations: ; RELOC-NEXT: Relocations:
; RELOC-NEXT: - Type: R_WASM_MEMORY_ADDR_I32 ; RELOC-NEXT: - Type: R_WASM_MEMORY_ADDR_I32
; RELOC-NEXT: Index: 3 ; RELOC-NEXT: Index: 3
; RELOC-NEXT: Offset: 0x00000018 ; RELOC-NEXT: Offset: 0x00000024
; RELOC-NEXT: - Type: R_WASM_MEMORY_ADDR_I32 ; RELOC-NEXT: - Type: R_WASM_MEMORY_ADDR_I32
; RELOC-NEXT: Index: 4 ; RELOC-NEXT: Index: 4
; RELOC-NEXT: Offset: 0x0000002E ; RELOC-NEXT: Offset: 0x0000002D
; RELOC-NEXT: Addend: 4 ; RELOC-NEXT: Addend: 4
; RELOC-NEXT: Segments: ; RELOC-NEXT: Segments:
; RELOC-NEXT: - SectionOffset: 6 ; RELOC-NEXT: - SectionOffset: 6
; RELOC-NEXT: InitFlags: 0 ; RELOC-NEXT: InitFlags: 0
; RELOC-NEXT: Offset: ; RELOC-NEXT: Offset:
; RELOC-NEXT: Opcode: I32_CONST ; RELOC-NEXT: Opcode: I32_CONST
; RELOC-NEXT: Value: 0 ; RELOC-NEXT: Value: 0
; RELOC-NEXT: Content: 68656C6C6F0A00
; RELOC-NEXT: - SectionOffset: 18
; RELOC-NEXT: InitFlags: 0
; RELOC-NEXT: Offset:
; RELOC-NEXT: Opcode: I32_CONST
; RELOC-NEXT: Value: 8
; RELOC-NEXT: Content: '01000000' ; RELOC-NEXT: Content: '01000000'
; RELOC-NEXT: - SectionOffset: 15 ; RELOC-NEXT: - SectionOffset: 27
; RELOC-NEXT: InitFlags: 0 ; RELOC-NEXT: InitFlags: 0
; RELOC-NEXT: Offset: ; RELOC-NEXT: Offset:
; RELOC-NEXT: Opcode: I32_CONST ; RELOC-NEXT: Opcode: I32_CONST
; RELOC-NEXT: Value: 16 ; RELOC-NEXT: Value: 16
; RELOC-NEXT: Content: '03000000' ; RELOC-NEXT: Content: '03000000'
; RELOC-NEXT: - SectionOffset: 24 ; RELOC-NEXT: - SectionOffset: 36
; RELOC-NEXT: InitFlags: 0 ; RELOC-NEXT: InitFlags: 0
; RELOC-NEXT: Offset: ; RELOC-NEXT: Offset:
; RELOC-NEXT: Opcode: I32_CONST ; RELOC-NEXT: Opcode: I32_CONST
; RELOC-NEXT: Value: 24 ; RELOC-NEXT: Value: 24
; RELOC-NEXT: Content: '28000000' ; RELOC-NEXT: Content: '00000000'
; RELOC-NEXT: - SectionOffset: 33 ; RELOC-NEXT: - SectionOffset: 45
; RELOC-NEXT: InitFlags: 0 ; RELOC-NEXT: InitFlags: 0
; RELOC-NEXT: Offset: ; RELOC-NEXT: Offset:
; RELOC-NEXT: Opcode: I32_CONST ; RELOC-NEXT: Opcode: I32_CONST
; RELOC-NEXT: Value: 28 ; RELOC-NEXT: Value: 28
; RELOC-NEXT: Content: '0000000000000000' ; RELOC-NEXT: Content: '24000000'
; RELOC-NEXT: - SectionOffset: 46 ; RELOC-NEXT: - SectionOffset: 54
; RELOC-NEXT: InitFlags: 0
; RELOC-NEXT: Offset:
; RELOC-NEXT: Opcode: I32_CONST
; RELOC-NEXT: Value: 36
; RELOC-NEXT: Content: '20000000'
; RELOC-NEXT: - SectionOffset: 55
; RELOC-NEXT: InitFlags: 0 ; RELOC-NEXT: InitFlags: 0
; RELOC-NEXT: Offset: ; RELOC-NEXT: Offset:
; RELOC-NEXT: Opcode: I32_CONST ; RELOC-NEXT: Opcode: I32_CONST
; RELOC-NEXT: Value: 40 ; RELOC-NEXT: Value: 32
; RELOC-NEXT: Content: 68656C6C6F0A00 ; RELOC-NEXT: Content: '0000000000000000'
; RELOC: SymbolTable: ; RELOC: SymbolTable:
; RELOC-NEXT: - Index: 0 ; RELOC-NEXT: - Index: 0
; RELOC-NEXT: Kind: DATA ; RELOC-NEXT: Kind: DATA
; RELOC-NEXT: Name: foo ; RELOC-NEXT: Name: foo
; RELOC-NEXT: Flags: [ VISIBILITY_HIDDEN ] ; RELOC-NEXT: Flags: [ VISIBILITY_HIDDEN ]
; RELOC-NEXT: Segment: 0 ; RELOC-NEXT: Segment: 1
; RELOC-NEXT: Size: 4 ; RELOC-NEXT: Size: 4
; RELOC-NEXT: - Index: 1 ; RELOC-NEXT: - Index: 1
; RELOC-NEXT: Kind: DATA ; RELOC-NEXT: Kind: DATA
; RELOC-NEXT: Name: aligned_bar ; RELOC-NEXT: Name: aligned_bar
; RELOC-NEXT: Flags: [ VISIBILITY_HIDDEN ] ; RELOC-NEXT: Flags: [ VISIBILITY_HIDDEN ]
; RELOC-NEXT: Segment: 1 ; RELOC-NEXT: Segment: 2
; RELOC-NEXT: Size: 4 ; RELOC-NEXT: Size: 4
; RELOC-NEXT: - Index: 2 ; RELOC-NEXT: - Index: 2
; RELOC-NEXT: Kind: DATA ; RELOC-NEXT: Kind: DATA
; RELOC-NEXT: Name: external_ref ; RELOC-NEXT: Name: external_ref
; RELOC-NEXT: Flags: [ ] ; RELOC-NEXT: Flags: [ ]
; RELOC-NEXT: Segment: 2 ; RELOC-NEXT: Segment: 3
; RELOC-NEXT: Size: 4 ; RELOC-NEXT: Size: 4
; RELOC-NEXT: - Index: 3 ; RELOC-NEXT: - Index: 3
; RELOC-NEXT: Kind: DATA ; RELOC-NEXT: Kind: DATA
; RELOC-NEXT: Name: hello_str ; RELOC-NEXT: Name: hello_str
; RELOC-NEXT: Flags: [ ] ; RELOC-NEXT: Flags: [ ]
; RELOC-NEXT: Segment: 5 ; RELOC-NEXT: Segment: 0
; RELOC-NEXT: Size: 7 ; RELOC-NEXT: Size: 7

lld/test/wasm/data-segment-merging.ll

Show All 13 Lines
; RUN: wasm-ld -no-gc-sections --no-entry -o %t.merged.wasm %t.o ; RUN: wasm-ld -no-gc-sections --no-entry -o %t.merged.wasm %t.o
; RUN: obj2yaml %t.merged.wasm | FileCheck %s --check-prefix=MERGE ; RUN: obj2yaml %t.merged.wasm | FileCheck %s --check-prefix=MERGE
; MERGE-LABEL: - Type: DATA ; MERGE-LABEL: - Type: DATA
; MERGE-NEXT: Segments: ; MERGE-NEXT: Segments:
; MERGE-NEXT: - SectionOffset: 7 ; MERGE-NEXT: - SectionOffset: 7
; MERGE-NEXT: InitFlags: 0 ; MERGE-NEXT: InitFlags: 0
; MERGE-NEXT: Offset: ; MERGE-NEXT: Offset:
; MERGE: Content: 68656C6C6F00676F6F6462796500776861746576657200002A000000 ; MERGE: Content: 636F6E7374616E74000000002B
; MERGE-NEXT: - SectionOffset: 41 ; MERGE-NEXT: - SectionOffset: 26
; MERGE-NEXT: InitFlags: 0 ; MERGE-NEXT: InitFlags: 0
; MERGE-NEXT: Offset: ; MERGE-NEXT: Offset:
; MERGE: Content: 636F6E7374616E74000000002B ; MERGE: Content: 68656C6C6F00676F6F6462796500776861746576657200002A000000
; MERGE-NEXT: - Type: CUSTOM ; MERGE-NEXT: - Type: CUSTOM
; MERGE-NEXT: Name: name ; MERGE-NEXT: Name: name
; MERGE-NEXT: FunctionNames: ; MERGE-NEXT: FunctionNames:
; MERGE-NEXT: - Index: 0 ; MERGE-NEXT: - Index: 0
; MERGE-NEXT: Name: __wasm_call_ctors ; MERGE-NEXT: Name: __wasm_call_ctors
; MERGE-NOT: - Index: ; MERGE-NOT: - Index:
; RUN: wasm-ld -no-gc-sections --no-entry --no-merge-data-segments -o %t.separate.wasm %t.o ; RUN: wasm-ld -no-gc-sections --no-entry --no-merge-data-segments -o %t.separate.wasm %t.o
; RUN: obj2yaml %t.separate.wasm | FileCheck %s --check-prefix=SEPARATE ; RUN: obj2yaml %t.separate.wasm | FileCheck %s --check-prefix=SEPARATE
; SEPARATE-NOT: DATACOUNT ; SEPARATE-NOT: DATACOUNT
; SEPARATE-LABEL: - Type: DATA ; SEPARATE-LABEL: - Type: DATA
; SEPARATE-NEXT: Segments: ; SEPARATE-NEXT: Segments:
; SEPARATE-NEXT: - SectionOffset: 7 ; SEPARATE-NEXT: - SectionOffset: 7
; SEPARATE-NEXT: InitFlags: 0 ; SEPARATE-NEXT: InitFlags: 0
; SEPARATE-NEXT: Offset: ; SEPARATE-NEXT: Offset:
; SEPARATE: Content: 68656C6C6F00 ; SEPARATE: Content: 636F6E7374616E7400
; SEPARATE-NEXT: - SectionOffset: 19 ; SEPARATE-NEXT: - SectionOffset: 22
; SEPARATE-NEXT: InitFlags: 0 ; SEPARATE-NEXT: InitFlags: 0
; SEPARATE-NEXT: Offset: ; SEPARATE-NEXT: Offset:
; SEPARATE: Content: 676F6F6462796500 ; SEPARATE: Content: 2B
; SEPARATE-NEXT: - SectionOffset: 33 ; SEPARATE-NEXT: - SectionOffset: 29
; SEPARATE-NEXT: InitFlags: 0 ; SEPARATE-NEXT: InitFlags: 0
; SEPARATE-NEXT: Offset: ; SEPARATE-NEXT: Offset:
; SEPARATE: Content: '776861746576657200' ; SEPARATE: Content: 68656C6C6F00
; SEPARATE-NEXT: - SectionOffset: 48 ; SEPARATE-NEXT: - SectionOffset: 41
; SEPARATE-NEXT: InitFlags: 0 ; SEPARATE-NEXT: InitFlags: 0
; SEPARATE-NEXT: Offset: ; SEPARATE-NEXT: Offset:
; SEPARATE: Content: 2A000000 ; SEPARATE: Content: 676F6F6462796500
; SEPARATE-NEXT: - SectionOffset: 58 ; SEPARATE-NEXT: - SectionOffset: 55
; SEPARATE-NEXT: InitFlags: 0 ; SEPARATE-NEXT: InitFlags: 0
; SEPARATE-NEXT: Offset: ; SEPARATE-NEXT: Offset:
; SEPARATE: Content: 636F6E7374616E7400 ; SEPARATE: Content: '776861746576657200'
; SEPARATE-NEXT: - SectionOffset: 73 ; SEPARATE-NEXT: - SectionOffset: 70
; SEPARATE-NEXT: InitFlags: 0 ; SEPARATE-NEXT: InitFlags: 0
; SEPARATE-NEXT: Offset: ; SEPARATE-NEXT: Offset:
; SEPARATE: Content: 2B ; SEPARATE: Content: 2A000000
; SEPARATE-NEXT: - Type: CUSTOM ; SEPARATE-NEXT: - Type: CUSTOM
; SEPARATE-NEXT: Name: name ; SEPARATE-NEXT: Name: name
; SEPARATE-NEXT: FunctionNames: ; SEPARATE-NEXT: FunctionNames:
; SEPARATE-NEXT: - Index: 0 ; SEPARATE-NEXT: - Index: 0
; SEPARATE-NEXT: Name: __wasm_call_ctors ; SEPARATE-NEXT: Name: __wasm_call_ctors
; SEPARATE-NOT: - Index: ; SEPARATE-NOT: - Index:
; RUN: wasm-ld -no-gc-sections --no-entry --shared-memory --max-memory=131072 -o %t.merged.passive.wasm %t.passive.o ; RUN: wasm-ld -no-gc-sections --no-entry --shared-memory --max-memory=131072 -o %t.merged.passive.wasm %t.passive.o
; RUN: obj2yaml %t.merged.passive.wasm | FileCheck %s --check-prefix=PASSIVE-MERGE ; RUN: obj2yaml %t.merged.passive.wasm | FileCheck %s --check-prefix=PASSIVE-MERGE
; PASSIVE-MERGE-LABEL: - Type: DATACOUNT ; PASSIVE-MERGE-LABEL: - Type: DATACOUNT
; PASSIVE-MERGE-NEXT: Count: 2 ; PASSIVE-MERGE-NEXT: Count: 2
; PASSIVE-MERGE-LABEL: - Type: DATA ; PASSIVE-MERGE-LABEL: - Type: DATA
; PASSIVE-MERGE-NEXT: Segments: ; PASSIVE-MERGE-NEXT: Segments:
; PASSIVE-MERGE-NEXT: - SectionOffset: 3 ; PASSIVE-MERGE-NEXT: - SectionOffset: 3
; PASSIVE-MERGE-NEXT: InitFlags: 1 ; PASSIVE-MERGE-NEXT: InitFlags: 1
; PASSIVE-MERGE-NEXT: Content: 68656C6C6F00676F6F6462796500776861746576657200002A000000
; PASSIVE-MERGE-NEXT: - SectionOffset: 33
; PASSIVE-MERGE-NEXT: InitFlags: 1
; PASSIVE-MERGE-NEXT: Content: 636F6E7374616E74000000002B ; PASSIVE-MERGE-NEXT: Content: 636F6E7374616E74000000002B
; PASSIVE-MERGE-NEXT: - SectionOffset: 18
; PASSIVE-MERGE-NEXT: InitFlags: 1
; PASSIVE-MERGE-NEXT: Content: 68656C6C6F00676F6F6462796500776861746576657200002A000000
; PASSIVE-MERGE-NEXT: - Type: CUSTOM ; PASSIVE-MERGE-NEXT: - Type: CUSTOM
; PASSIVE-MERGE-NEXT: Name: name ; PASSIVE-MERGE-NEXT: Name: name
; PASSIVE-MERGE-NEXT: FunctionNames: ; PASSIVE-MERGE-NEXT: FunctionNames:
; PASSIVE-MERGE-NEXT: - Index: 0 ; PASSIVE-MERGE-NEXT: - Index: 0
; PASSIVE-MERGE-NEXT: Name: __wasm_call_ctors ; PASSIVE-MERGE-NEXT: Name: __wasm_call_ctors
; PASSIVE-MERGE-NEXT: - Index: 1 ; PASSIVE-MERGE-NEXT: - Index: 1
; PASSIVE-MERGE-NEXT: Name: __wasm_init_memory ; PASSIVE-MERGE-NEXT: Name: __wasm_init_memory
; PASSIVE-MERGE-NEXT: - Index: 2 ; PASSIVE-MERGE-NEXT: - Index: 2
; PASSIVE-MERGE-NEXT: Name: __wasm_init_tls ; PASSIVE-MERGE-NEXT: Name: __wasm_init_tls
; RUN: wasm-ld -no-gc-sections --no-entry --shared-memory --max-memory=131072 -no-merge-data-segments -o %t.separate.passive.wasm %t.passive.o ; RUN: wasm-ld -no-gc-sections --no-entry --shared-memory --max-memory=131072 -no-merge-data-segments -o %t.separate.passive.wasm %t.passive.o
; RUN: obj2yaml %t.separate.passive.wasm | FileCheck %s --check-prefix=PASSIVE-SEPARATE ; RUN: obj2yaml %t.separate.passive.wasm | FileCheck %s --check-prefix=PASSIVE-SEPARATE
; PASSIVE-SEPARATE-LABEL: - Type: DATACOUNT ; PASSIVE-SEPARATE-LABEL: - Type: DATACOUNT
; PASSIVE-SEPARATE-NEXT: Count: 6 ; PASSIVE-SEPARATE-NEXT: Count: 6
; PASSIVE-SEPARATE-LABEL: - Type: DATA ; PASSIVE-SEPARATE-LABEL: - Type: DATA
; PASSIVE-SEPARATE-NEXT: Segments: ; PASSIVE-SEPARATE-NEXT: Segments:
; PASSIVE-SEPARATE-NEXT: - SectionOffset: 3 ; PASSIVE-SEPARATE-NEXT: - SectionOffset: 3
; PASSIVE-SEPARATE-NEXT: InitFlags: 1 ; PASSIVE-SEPARATE-NEXT: InitFlags: 1
; PASSIVE-SEPARATE-NEXT: Content: 636F6E7374616E7400
; PASSIVE-SEPARATE-NEXT: - SectionOffset: 14
; PASSIVE-SEPARATE-NEXT: InitFlags: 1
; PASSIVE-SEPARATE-NEXT: Content: 2B
; PASSIVE-SEPARATE-NEXT: - SectionOffset: 17
; PASSIVE-SEPARATE-NEXT: InitFlags: 1
; PASSIVE-SEPARATE-NEXT: Content: 68656C6C6F00 ; PASSIVE-SEPARATE-NEXT: Content: 68656C6C6F00
; PASSIVE-SEPARATE-NEXT: - SectionOffset: 11 ; PASSIVE-SEPARATE-NEXT: - SectionOffset: 25
; PASSIVE-SEPARATE-NEXT: InitFlags: 1 ; PASSIVE-SEPARATE-NEXT: InitFlags: 1
; PASSIVE-SEPARATE-NEXT: Content: 676F6F6462796500 ; PASSIVE-SEPARATE-NEXT: Content: 676F6F6462796500
; PASSIVE-SEPARATE-NEXT: - SectionOffset: 21 ; PASSIVE-SEPARATE-NEXT: - SectionOffset: 35
; PASSIVE-SEPARATE-NEXT: InitFlags: 1 ; PASSIVE-SEPARATE-NEXT: InitFlags: 1
; PASSIVE-SEPARATE-NEXT: Content: '776861746576657200' ; PASSIVE-SEPARATE-NEXT: Content: '776861746576657200'
; PASSIVE-SEPARATE-NEXT: - SectionOffset: 32 ; PASSIVE-SEPARATE-NEXT: - SectionOffset: 46
; PASSIVE-SEPARATE-NEXT: InitFlags: 1 ; PASSIVE-SEPARATE-NEXT: InitFlags: 1
; PASSIVE-SEPARATE-NEXT: Content: 2A000000 ; PASSIVE-SEPARATE-NEXT: Content: 2A000000
; PASSIVE-SEPARATE-NEXT: - SectionOffset: 38
; PASSIVE-SEPARATE-NEXT: InitFlags: 1
; PASSIVE-SEPARATE-NEXT: Content: 636F6E7374616E7400
; PASSIVE-SEPARATE-NEXT: - SectionOffset: 49
; PASSIVE-SEPARATE-NEXT: InitFlags: 1
; PASSIVE-SEPARATE-NEXT: Content: 2B
; PASSIVE-SEPARATE-NEXT: - Type: CUSTOM ; PASSIVE-SEPARATE-NEXT: - Type: CUSTOM
; PASSIVE-SEPARATE-NEXT: Name: name ; PASSIVE-SEPARATE-NEXT: Name: name
; PASSIVE-SEPARATE-NEXT: FunctionNames: ; PASSIVE-SEPARATE-NEXT: FunctionNames:
; PASSIVE-SEPARATE-NEXT: - Index: 0 ; PASSIVE-SEPARATE-NEXT: - Index: 0
; PASSIVE-SEPARATE-NEXT: Name: __wasm_call_ctors ; PASSIVE-SEPARATE-NEXT: Name: __wasm_call_ctors
; PASSIVE-SEPARATE-NEXT: - Index: 1 ; PASSIVE-SEPARATE-NEXT: - Index: 1
; PASSIVE-SEPARATE-NEXT: Name: __wasm_init_memory ; PASSIVE-SEPARATE-NEXT: Name: __wasm_init_memory
; PASSIVE-SEPARATE-NEXT: - Index: 2 ; PASSIVE-SEPARATE-NEXT: - Index: 2
; PASSIVE-SEPARATE-NEXT: Name: __wasm_init_tls ; PASSIVE-SEPARATE-NEXT: Name: __wasm_init_tls

lld/test/wasm/data-segments.ll

Show All 31 Lines
; ACTIVE-NEXT: Body: 0B ; ACTIVE-NEXT: Body: 0B
; ACTIVE-NEXT: - Type: DATA ; ACTIVE-NEXT: - Type: DATA
; ACTIVE-NEXT: Segments: ; ACTIVE-NEXT: Segments:
; ACTIVE-NEXT: - SectionOffset: 7 ; ACTIVE-NEXT: - SectionOffset: 7
; ACTIVE-NEXT: InitFlags: 0 ; ACTIVE-NEXT: InitFlags: 0
; ACTIVE-NEXT: Offset: ; ACTIVE-NEXT: Offset:
; ACTIVE-NEXT: Opcode: I32_CONST ; ACTIVE-NEXT: Opcode: I32_CONST
; ACTIVE-NEXT: Value: 1024 ; ACTIVE-NEXT: Value: 1024
; ACTIVE-NEXT: Content: 68656C6C6F00676F6F646279650000002A000000 ; ACTIVE-NEXT: Content: 636F6E7374616E74000000002B
; ACTIVE-NEXT: - SectionOffset: 34 ; ACTIVE-NEXT: - SectionOffset: 26
; ACTIVE-NEXT: InitFlags: 0 ; ACTIVE-NEXT: InitFlags: 0
; ACTIVE-NEXT: Offset: ; ACTIVE-NEXT: Offset:
; ACTIVE-NEXT: Opcode: I32_CONST ; ACTIVE-NEXT: Opcode: I32_CONST
; ACTIVE-NEXT: Value: 1044 ; ACTIVE-NEXT: Value: 1040
; ACTIVE-NEXT: Content: '0000000000 ; ACTIVE-NEXT: Content: 68656C6C6F00676F6F646279650000002A000000
; ACTIVE-SAME: 0000000000' ; ACTIVE-NEXT: - SectionOffset: 53
; ACTIVE-NEXT: - SectionOffset: 10041
; ACTIVE-NEXT: InitFlags: 0 ; ACTIVE-NEXT: InitFlags: 0
; ACTIVE-NEXT: Offset: ; ACTIVE-NEXT: Offset:
; ACTIVE-NEXT: Opcode: I32_CONST ; ACTIVE-NEXT: Opcode: I32_CONST
; ACTIVE-NEXT: Value: 11044 ; ACTIVE-NEXT: Value: 1060
; ACTIVE-NEXT: Content: 636F6E7374616E74000000002B ; ACTIVE-NEXT: Content: '0000000000
; ACTIVE-SAME: 0000000000'
; ACTIVE-NEXT: - Type: CUSTOM ; ACTIVE-NEXT: - Type: CUSTOM
; ACTIVE-NEXT: Name: name ; ACTIVE-NEXT: Name: name
; ACTIVE-NEXT: FunctionNames: ; ACTIVE-NEXT: FunctionNames:
; ACTIVE-NEXT: - Index: 0 ; ACTIVE-NEXT: - Index: 0
; ACTIVE-NEXT: Name: __wasm_call_ctors ; ACTIVE-NEXT: Name: __wasm_call_ctors
; PASSIVE-LABEL: - Type: START ; PASSIVE-LABEL: - Type: START
; PASSIVE-NEXT: StartFunction: 1 ; PASSIVE-NEXT: StartFunction: 1
; PASSIVE-LABEL: - Type: CODE ; PASSIVE-LABEL: - Type: CODE
; PASSIVE-NEXT: Functions: ; PASSIVE-NEXT: Functions:
; PASSIVE-NEXT: - Index: 0 ; PASSIVE-NEXT: - Index: 0
; PASSIVE-NEXT: Locals: [] ; PASSIVE-NEXT: Locals: []
; PASSIVE-NEXT: Body: 0B ; PASSIVE-NEXT: Body: 0B
; PASSIVE-NEXT: - Index: 1 ; PASSIVE-NEXT: - Index: 1
; PASSIVE-NEXT: Locals: [] ; PASSIVE-NEXT: Locals: []
; PASSIVE-NEXT: Body: 41B4D60041004101FE480200044041B4D6004101427FFE0102001A0541800841004114FC08000041940841004190CE00FC08010041A4D6004100410DFC08020041B4D6004102FE17020041B4D600417FFE0002001A0BFC0900FC0901FC09020B ; PASSIVE-NEXT: Body: 41B4D60041004101FE480200044041B4D6004101427FFE0102001A054180084100410DFC08000041900841004114FC08010041A40841004190CE00FC08020041B4D6004102FE17020041B4D600417FFE0002001A0BFC0900FC0901FC09020B
; PASSIVE-NEXT: - Index: 2 ; PASSIVE-NEXT: - Index: 2
; PASSIVE-NEXT: Locals: [] ; PASSIVE-NEXT: Locals: []
; PASSIVE-NEXT: Body: 0B ; PASSIVE-NEXT: Body: 0B
; PASSIVE-NEXT: - Type: DATA ; PASSIVE-NEXT: - Type: DATA
; PASSIVE-NEXT: Segments: ; PASSIVE-NEXT: Segments:
; PASSIVE-NEXT: - SectionOffset: 3 ; PASSIVE-NEXT: - SectionOffset: 3
; PASSIVE-NEXT: InitFlags: 1 ; PASSIVE-NEXT: InitFlags: 1
; PASSIVE-NEXT: Content: 636F6E7374616E74000000002B
; PASSIVE-NEXT: - SectionOffset: 18
; PASSIVE-NEXT: InitFlags: 1
; PASSIVE-NEXT: Content: 68656C6C6F00676F6F646279650000002A000000 ; PASSIVE-NEXT: Content: 68656C6C6F00676F6F646279650000002A000000
; PASSIVE-NEXT: - SectionOffset: 26 ; PASSIVE-NEXT: - SectionOffset: 41
; PASSIVE-NEXT: InitFlags: 1 ; PASSIVE-NEXT: InitFlags: 1
; PASSIVE-NEXT: Content: '0000000000 ; PASSIVE-NEXT: Content: '0000000000
; PASSIVE-SAME: 0000000000' ; PASSIVE-SAME: 0000000000'
; PASSIVE-NEXT: - SectionOffset: 10028
; PASSIVE-NEXT: InitFlags: 1
; PASSIVE-NEXT: Content: 636F6E7374616E74000000002B
; PASSIVE-NEXT: - Type: CUSTOM ; PASSIVE-NEXT: - Type: CUSTOM
; PASSIVE-NEXT: Name: name ; PASSIVE-NEXT: Name: name
; PASSIVE-NEXT: FunctionNames: ; PASSIVE-NEXT: FunctionNames:
; PASSIVE-NEXT: - Index: 0 ; PASSIVE-NEXT: - Index: 0
; PASSIVE-NEXT: Name: __wasm_call_ctors ; PASSIVE-NEXT: Name: __wasm_call_ctors
; PASSIVE-NEXT: - Index: 1 ; PASSIVE-NEXT: - Index: 1
; PASSIVE-NEXT: Name: __wasm_init_memory ; PASSIVE-NEXT: Name: __wasm_init_memory
; PASSIVE-NEXT: - Index: 2 ; PASSIVE-NEXT: - Index: 2
; PASSIVE-NEXT: Name: __wasm_init_tls ; PASSIVE-NEXT: Name: __wasm_init_tls

lld/test/wasm/reloc-addend.ll

; RUN: llc -filetype=obj %s -o %t.o ; RUN: llc -filetype=obj %s -o %t.o
; RUN: wasm-ld -r -o %t.wasm %t.o ; RUN: wasm-ld -r -o %t.wasm %t.o
; RUN: obj2yaml %t.wasm | FileCheck %s ; RUN: obj2yaml %t.wasm | FileCheck %s
target triple = "wasm32-unknown-unknown" target triple = "wasm32-unknown-unknown"
@foo = hidden global [76 x i32] zeroinitializer, align 16 @foo = hidden global [76 x i32] zeroinitializer, align 16
; bar points to the 16th element, which happens to be 64 bytes ; bar points to the 16th element, which happens to be 64 bytes
; This generates an addend of 64 which, is the value at which ; This generates an addend of 64 which, is the value at which
; signed and unsigned LEB encodes will differ. ; signed and unsigned LEB encodes will differ.
@bar = hidden local_unnamed_addr global i32* getelementptr inbounds ([76 x i32], [76 x i32]* @foo, i32 0, i32 16), align 4 @bar = hidden local_unnamed_addr global i32* getelementptr inbounds ([76 x i32], [76 x i32]* @foo, i32 0, i32 16), align 4
; CHECK: - Type: DATA ; CHECK: - Type: DATA
; CHECK-NEXT: Relocations: ; CHECK-NEXT: Relocations:
; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_I32 ; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_I32
; CHECK-NEXT: Index: 0 ; CHECK-NEXT: Index: 0
; CHECK-NEXT: Offset: 0x0000013D ; CHECK-NEXT: Offset: 0x00000006
; CHECK-NEXT: Addend: 64 ; CHECK-NEXT: Addend: 64

lld/test/wasm/relocatable.ll

Show First 20 Lines • Show All 107 Lines • ▼ Show 20 Lines
; CHECK-NEXT: - Index: 3 ; CHECK-NEXT: - Index: 3
; CHECK-NEXT: Locals: ; CHECK-NEXT: Locals:
; CHECK-NEXT: Body: 4180808080001080808080000B ; CHECK-NEXT: Body: 4180808080001080808080000B
; CHECK-NEXT: - Index: 4 ; CHECK-NEXT: - Index: 4
; CHECK-NEXT: Locals: ; CHECK-NEXT: Locals:
; CHECK-NEXT: Body: 1081808080001A1082808080001A41010B ; CHECK-NEXT: Body: 1081808080001A1082808080001A41010B
; CHECK-NEXT: - Index: 5 ; CHECK-NEXT: - Index: 5
; CHECK-NEXT: Locals: ; CHECK-NEXT: Locals:
; CHECK-NEXT: Body: 419C808080000B ; CHECK-NEXT: Body: 4187808080000B
; NORMAL-NEXT: - Type: DATA ; NORMAL-NEXT: - Type: DATA
; NORMAL-NEXT: Relocations: ; NORMAL-NEXT: Relocations:
; NORMAL-NEXT: - Type: R_WASM_TABLE_INDEX_I32 ; NORMAL-NEXT: - Type: R_WASM_TABLE_INDEX_I32
; NORMAL-NEXT: Index: 3 ; NORMAL-NEXT: Index: 3
; NORMAL-NEXT: Offset: 0x00000012 ; NORMAL-NEXT: Offset: 0x0000001A
; NORMAL-NEXT: - Type: R_WASM_TABLE_INDEX_I32 ; NORMAL-NEXT: - Type: R_WASM_TABLE_INDEX_I32
; NORMAL-NEXT: Index: 4 ; NORMAL-NEXT: Index: 4
; NORMAL-NEXT: Offset: 0x0000001B ; NORMAL-NEXT: Offset: 0x00000023
; NORMAL-NEXT: - Type: R_WASM_TABLE_INDEX_I32 ; NORMAL-NEXT: - Type: R_WASM_TABLE_INDEX_I32
; NORMAL-NEXT: Index: 5 ; NORMAL-NEXT: Index: 5
; NORMAL-NEXT: Offset: 0x00000024 ; NORMAL-NEXT: Offset: 0x0000002C
; NORMAL-NEXT: - Type: R_WASM_MEMORY_ADDR_I32 ; NORMAL-NEXT: - Type: R_WASM_MEMORY_ADDR_I32
; NORMAL-NEXT: Index: 12 ; NORMAL-NEXT: Index: 12
; NORMAL-NEXT: Offset: 0x0000002D ; NORMAL-NEXT: Offset: 0x00000035
; NORMAL-NEXT: Segments: ; NORMAL-NEXT: Segments:
; NORMAL-NEXT: - SectionOffset: 6 ; NORMAL-NEXT: - SectionOffset: 6
; NORMAL-NEXT: InitFlags: 0 ; NORMAL-NEXT: InitFlags: 0
; NORMAL-NEXT: Offset: ; NORMAL-NEXT: Offset:
; NORMAL-NEXT: Opcode: I32_CONST ; NORMAL-NEXT: Opcode: I32_CONST
; NORMAL-NEXT: Value: 0 ; NORMAL-NEXT: Value: 0
; NORMAL-NEXT: Content: 68656C6C6F0A00 ; NORMAL-NEXT: Content: 68656C6C6F0A00
; NORMAL-NEXT: - SectionOffset: 18 ; NORMAL-NEXT: - SectionOffset: 18
; NORMAL-NEXT: InitFlags: 0 ; NORMAL-NEXT: InitFlags: 0
; NORMAL-NEXT: Offset: ; NORMAL-NEXT: Offset:
; NORMAL-NEXT: Opcode: I32_CONST ; NORMAL-NEXT: Opcode: I32_CONST
; NORMAL-NEXT: Value: 8 ; NORMAL-NEXT: Value: 7
; NORMAL-NEXT: Content: '01000000' ; NORMAL-NEXT: Content: '616263'
; NORMAL-NEXT: - SectionOffset: 27 ; NORMAL-NEXT: - SectionOffset: 26
; NORMAL-NEXT: InitFlags: 0 ; NORMAL-NEXT: InitFlags: 0
; NORMAL-NEXT: Offset: ; NORMAL-NEXT: Offset:
; NORMAL-NEXT: Opcode: I32_CONST ; NORMAL-NEXT: Opcode: I32_CONST
; NORMAL-NEXT: Value: 12 ; NORMAL-NEXT: Value: 12
; NORMAL-NEXT: Content: '02000000' ; NORMAL-NEXT: Content: '01000000'
; NORMAL-NEXT: - SectionOffset: 36 ; NORMAL-NEXT: - SectionOffset: 35
; NORMAL-NEXT: InitFlags: 0 ; NORMAL-NEXT: InitFlags: 0
; NORMAL-NEXT: Offset: ; NORMAL-NEXT: Offset:
; NORMAL-NEXT: Opcode: I32_CONST ; NORMAL-NEXT: Opcode: I32_CONST
; NORMAL-NEXT: Value: 16 ; NORMAL-NEXT: Value: 16
; NORMAL-NEXT: Content: '03000000' ; NORMAL-NEXT: Content: '02000000'
; NORMAL-NEXT: - SectionOffset: 45 ; NORMAL-NEXT: - SectionOffset: 44
; NORMAL-NEXT: InitFlags: 0 ; NORMAL-NEXT: InitFlags: 0
; NORMAL-NEXT: Offset: ; NORMAL-NEXT: Offset:
; NORMAL-NEXT: Opcode: I32_CONST ; NORMAL-NEXT: Opcode: I32_CONST
; NORMAL-NEXT: Value: 24 ; NORMAL-NEXT: Value: 20
; NORMAL-NEXT: Content: '00000000' ; NORMAL-NEXT: Content: '03000000'
; NORMAL-NEXT: - SectionOffset: 54 ; NORMAL-NEXT: - SectionOffset: 53
; NORMAL-NEXT: InitFlags: 0 ; NORMAL-NEXT: InitFlags: 0
; NORMAL-NEXT: Offset: ; NORMAL-NEXT: Offset:
; NORMAL-NEXT: Opcode: I32_CONST ; NORMAL-NEXT: Opcode: I32_CONST
; NORMAL-NEXT: Value: 28 ; NORMAL-NEXT: Value: 24
; NORMAL-NEXT: Content: '616263' ; NORMAL-NEXT: Content: '00000000'
; NORMAL-NEXT: - Type: CUSTOM ; NORMAL-NEXT: - Type: CUSTOM
; NORMAL-NEXT: Name: linking ; NORMAL-NEXT: Name: linking
; NORMAL-NEXT: Version: 2 ; NORMAL-NEXT: Version: 2
; NORMAL-NEXT: SymbolTable: ; NORMAL-NEXT: SymbolTable:
; NORMAL-NEXT: - Index: 0 ; NORMAL-NEXT: - Index: 0
; NORMAL-NEXT: Kind: FUNCTION ; NORMAL-NEXT: Kind: FUNCTION
; NORMAL-NEXT: Name: hello ; NORMAL-NEXT: Name: hello
; NORMAL-NEXT: Flags: [ VISIBILITY_HIDDEN ] ; NORMAL-NEXT: Flags: [ VISIBILITY_HIDDEN ]
Show All 28 Lines
; NORMAL-NEXT: Kind: FUNCTION ; NORMAL-NEXT: Kind: FUNCTION
; NORMAL-NEXT: Name: func_comdat ; NORMAL-NEXT: Name: func_comdat
; NORMAL-NEXT: Flags: [ BINDING_WEAK ] ; NORMAL-NEXT: Flags: [ BINDING_WEAK ]
; NORMAL-NEXT: Function: 5 ; NORMAL-NEXT: Function: 5
; NORMAL-NEXT: - Index: 7 ; NORMAL-NEXT: - Index: 7
; NORMAL-NEXT: Kind: DATA ; NORMAL-NEXT: Kind: DATA
; NORMAL-NEXT: Name: data_comdat ; NORMAL-NEXT: Name: data_comdat
; NORMAL-NEXT: Flags: [ BINDING_WEAK ] ; NORMAL-NEXT: Flags: [ BINDING_WEAK ]
; NORMAL-NEXT: Segment: 5 ; NORMAL-NEXT: Segment: 1
; NORMAL-NEXT: Size: 3 ; NORMAL-NEXT: Size: 3
; NORMAL-NEXT: - Index: 8 ; NORMAL-NEXT: - Index: 8
; NORMAL-NEXT: Kind: DATA ; NORMAL-NEXT: Kind: DATA
; NORMAL-NEXT: Name: func_addr1 ; NORMAL-NEXT: Name: func_addr1
; NORMAL-NEXT: Flags: [ VISIBILITY_HIDDEN ] ; NORMAL-NEXT: Flags: [ VISIBILITY_HIDDEN ]
; NORMAL-NEXT: Segment: 1 ; NORMAL-NEXT: Segment: 2
; NORMAL-NEXT: Size: 4 ; NORMAL-NEXT: Size: 4
; NORMAL-NEXT: - Index: 9 ; NORMAL-NEXT: - Index: 9
; NORMAL-NEXT: Kind: DATA ; NORMAL-NEXT: Kind: DATA
; NORMAL-NEXT: Name: func_addr2 ; NORMAL-NEXT: Name: func_addr2
; NORMAL-NEXT: Flags: [ VISIBILITY_HIDDEN ] ; NORMAL-NEXT: Flags: [ VISIBILITY_HIDDEN ]
; NORMAL-NEXT: Segment: 2 ; NORMAL-NEXT: Segment: 3
; NORMAL-NEXT: Size: 4 ; NORMAL-NEXT: Size: 4
; NORMAL-NEXT: - Index: 10 ; NORMAL-NEXT: - Index: 10
; NORMAL-NEXT: Kind: DATA ; NORMAL-NEXT: Kind: DATA
; NORMAL-NEXT: Name: func_addr3 ; NORMAL-NEXT: Name: func_addr3
; NORMAL-NEXT: Flags: [ VISIBILITY_HIDDEN ] ; NORMAL-NEXT: Flags: [ VISIBILITY_HIDDEN ]
; NORMAL-NEXT: Segment: 3 ; NORMAL-NEXT: Segment: 4
; NORMAL-NEXT: Size: 4 ; NORMAL-NEXT: Size: 4
; NORMAL-NEXT: - Index: 11 ; NORMAL-NEXT: - Index: 11
; NORMAL-NEXT: Kind: DATA ; NORMAL-NEXT: Kind: DATA
; NORMAL-NEXT: Name: data_addr1 ; NORMAL-NEXT: Name: data_addr1
; NORMAL-NEXT: Flags: [ VISIBILITY_HIDDEN ] ; NORMAL-NEXT: Flags: [ VISIBILITY_HIDDEN ]
; NORMAL-NEXT: Segment: 4 ; NORMAL-NEXT: Segment: 5
; NORMAL-NEXT: Size: 4 ; NORMAL-NEXT: Size: 4
; NORMAL-NEXT: - Index: 12 ; NORMAL-NEXT: - Index: 12
; NORMAL-NEXT: Kind: DATA ; NORMAL-NEXT: Kind: DATA
; NORMAL-NEXT: Name: data_import ; NORMAL-NEXT: Name: data_import
; NORMAL-NEXT: Flags: [ UNDEFINED ] ; NORMAL-NEXT: Flags: [ UNDEFINED ]
; NORMAL-NEXT: SegmentInfo: ; NORMAL-NEXT: SegmentInfo:
; NORMAL-NEXT: - Index: 0 ; NORMAL-NEXT: - Index: 0
; NORMAL-NEXT: Name: .rodata.hello_str ; NORMAL-NEXT: Name: .rodata.hello_str
; NORMAL-NEXT: Alignment: 0 ; NORMAL-NEXT: Alignment: 0
; NORMAL-NEXT: Flags: [ ] ; NORMAL-NEXT: Flags: [ ]
; NORMAL-NEXT: - Index: 1 ; NORMAL-NEXT: - Index: 1
; NORMAL-NEXT: Name: .rodata.data_comdat
; NORMAL-NEXT: Alignment: 0
; NORMAL-NEXT: Flags: [ ]
; NORMAL-NEXT: - Index: 2
; NORMAL-NEXT: Name: .data.func_addr1 ; NORMAL-NEXT: Name: .data.func_addr1
; NORMAL-NEXT: Alignment: 2 ; NORMAL-NEXT: Alignment: 2
; NORMAL-NEXT: Flags: [ ] ; NORMAL-NEXT: Flags: [ ]
; NORMAL-NEXT: - Index: 2 ; NORMAL-NEXT: - Index: 3
; NORMAL-NEXT: Name: .data.func_addr2 ; NORMAL-NEXT: Name: .data.func_addr2
; NORMAL-NEXT: Alignment: 2 ; NORMAL-NEXT: Alignment: 2
; NORMAL-NEXT: Flags: [ ] ; NORMAL-NEXT: Flags: [ ]
; NORMAL-NEXT: - Index: 3 ; NORMAL-NEXT: - Index: 4
; NORMAL-NEXT: Name: .data.func_addr3 ; NORMAL-NEXT: Name: .data.func_addr3
; NORMAL-NEXT: Alignment: 2 ; NORMAL-NEXT: Alignment: 2
; NORMAL-NEXT: Flags: [ ] ; NORMAL-NEXT: Flags: [ ]
; NORMAL-NEXT: - Index: 4 ; NORMAL-NEXT: - Index: 5
; NORMAL-NEXT: Name: .data.data_addr1 ; NORMAL-NEXT: Name: .data.data_addr1
; NORMAL-NEXT: Alignment: 3 ; NORMAL-NEXT: Alignment: 3
; NORMAL-NEXT: Flags: [ ] ; NORMAL-NEXT: Flags: [ ]
; NORMAL-NEXT: - Index: 5
; NORMAL-NEXT: Name: .rodata.data_comdat
; NORMAL-NEXT: Alignment: 0
; NORMAL-NEXT: Flags: [ ]
; NORMAL-NEXT: Comdats: ; NORMAL-NEXT: Comdats:
; NORMAL-NEXT: - Name: func_comdat ; NORMAL-NEXT: - Name: func_comdat
; NORMAL-NEXT: Entries: ; NORMAL-NEXT: Entries:
; NORMAL-NEXT: - Kind: FUNCTION ; NORMAL-NEXT: - Kind: FUNCTION
; NORMAL-NEXT: Index: 5 ; NORMAL-NEXT: Index: 5
; NORMAL-NEXT: - Kind: DATA ; NORMAL-NEXT: - Kind: DATA
; NORMAL-NEXT: Index: 5 ; NORMAL-NEXT: Index: 1
; NORMAL-NEXT: - Type: CUSTOM ; NORMAL-NEXT: - Type: CUSTOM
; NORMAL-NEXT: Name: name ; NORMAL-NEXT: Name: name
; NORMAL-NEXT: FunctionNames: ; NORMAL-NEXT: FunctionNames:
; NORMAL-NEXT: - Index: 0 ; NORMAL-NEXT: - Index: 0
; NORMAL-NEXT: Name: puts ; NORMAL-NEXT: Name: puts
; NORMAL-NEXT: - Index: 1 ; NORMAL-NEXT: - Index: 1
; NORMAL-NEXT: Name: foo_import ; NORMAL-NEXT: Name: foo_import
; NORMAL-NEXT: - Index: 2 ; NORMAL-NEXT: - Index: 2
; NORMAL-NEXT: Name: bar_import ; NORMAL-NEXT: Name: bar_import
; NORMAL-NEXT: - Index: 3 ; NORMAL-NEXT: - Index: 3
; NORMAL-NEXT: Name: hello ; NORMAL-NEXT: Name: hello
; NORMAL-NEXT: - Index: 4 ; NORMAL-NEXT: - Index: 4
; NORMAL-NEXT: Name: my_func ; NORMAL-NEXT: Name: my_func
; NORMAL-NEXT: - Index: 5 ; NORMAL-NEXT: - Index: 5
; NORMAL-NEXT: Name: func_comdat ; NORMAL-NEXT: Name: func_comdat
; NORMAL-NEXT:... ; NORMAL-NEXT:...

lld/test/wasm/tls-align.ll

Show All 18 Lines
; CHECK: - Type: GLOBAL ; CHECK: - Type: GLOBAL
; CHECK-NEXT: Globals: ; CHECK-NEXT: Globals:
; CHECK-NEXT: - Index: 0 ; CHECK-NEXT: - Index: 0
; CHECK-NEXT: Type: I32 ; CHECK-NEXT: Type: I32
; CHECK-NEXT: Mutable: true ; CHECK-NEXT: Mutable: true
; CHECK-NEXT: InitExpr: ; CHECK-NEXT: InitExpr:
; CHECK-NEXT: Opcode: I32_CONST ; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 66608 ; CHECK-NEXT: Value: 66592
; __tls_base ; __tls_base
; CHECK-NEXT: - Index: 1 ; CHECK-NEXT: - Index: 1
; CHECK-NEXT: Type: I32 ; CHECK-NEXT: Type: I32
; CHECK-NEXT: Mutable: true ; CHECK-NEXT: Mutable: true
; CHECK-NEXT: InitExpr: ; CHECK-NEXT: InitExpr:
; CHECK-NEXT: Opcode: I32_CONST ; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 0 ; CHECK-NEXT: Value: 0
Show All 16 Lines

lld/test/wasm/tls.ll

Show First 20 Lines • Show All 60 Lines • ▼ Show 20 Lines
; CHECK-NEXT: Value: 4 ; CHECK-NEXT: Value: 4
; CHECK: - Type: CODE ; CHECK: - Type: CODE
; CHECK-NEXT: Functions: ; CHECK-NEXT: Functions:
; Skip __wasm_call_ctors and __wasm_init_memory ; Skip __wasm_call_ctors and __wasm_init_memory
; CHECK: - Index: 2 ; CHECK: - Index: 2
; CHECK-NEXT: Locals: [] ; CHECK-NEXT: Locals: []
; CHECK-NEXT: Body: 20002401200041004108FC0801000B ; CHECK-NEXT: Body: 20002401200041004108FC0800000B
; Expected body of __wasm_init_tls: ; Expected body of __wasm_init_tls:
; local.get 0 ; local.get 0
; global.set 1 ; global.set 1
; local.get 0 ; local.get 0
; i32.const 0 ; i32.const 0
; i32.const 8 ; i32.const 8
; memory.init 1, 0 ; memory.init 1, 0
Show All 29 Lines

lld/wasm/OutputSegment.h

Show All 14 Lines
namespace lld { namespace lld {
namespace wasm { namespace wasm {
class InputSegment; class InputSegment;
class OutputSegment { class OutputSegment {
public: public:
OutputSegment(StringRef n, uint32_t index) : name(n), index(index) {} OutputSegment(StringRef n) : name(n) {}
void addInputSegment(InputSegment *inSeg) { void addInputSegment(InputSegment *inSeg) {
alignment = std::max(alignment, inSeg->getAlignment()); alignment = std::max(alignment, inSeg->getAlignment());
inputSegments.push_back(inSeg); inputSegments.push_back(inSeg);
size = llvm::alignTo(size, 1ULL << inSeg->getAlignment()); size = llvm::alignTo(size, 1ULL << inSeg->getAlignment());
inSeg->outputSeg = this; inSeg->outputSeg = this;
inSeg->outputSegmentOffset = size; inSeg->outputSegmentOffset = size;
size += inSeg->getSize(); size += inSeg->getSize();
} }
StringRef name; StringRef name;
const uint32_t index; uint32_t index = 0;
uint32_t initFlags = 0; uint32_t initFlags = 0;
uint32_t sectionOffset = 0; uint32_t sectionOffset = 0;
uint32_t alignment = 0; uint32_t alignment = 0;
uint32_t startVA = 0; uint32_t startVA = 0;
std::vector<InputSegment *> inputSegments; std::vector<InputSegment *> inputSegments;
// Sum of the size of the all the input segments // Sum of the size of the all the input segments
uint32_t size = 0; uint32_t size = 0;
Show All 9 Lines

lld/wasm/Writer.cpp

Show First 20 Lines • Show All 257 Lines • ▼ Show 20 Linesvoid Writer::layoutMemory() {
if (WasmSym::initMemoryFlag) { if (WasmSym::initMemoryFlag) {
memoryPtr = alignTo(memoryPtr, 4); memoryPtr = alignTo(memoryPtr, 4);
WasmSym::initMemoryFlag->setVirtualAddress(memoryPtr); WasmSym::initMemoryFlag->setVirtualAddress(memoryPtr);
log(formatv("mem: {0,-15} offset={1,-8} size={2,-8} align={3}", log(formatv("mem: {0,-15} offset={1,-8} size={2,-8} align={3}",
"__wasm_init_memory_flag", memoryPtr, 4, 4)); "__wasm_init_memory_flag", memoryPtr, 4, 4));
memoryPtr += 4; memoryPtr += 4;
} }
// TODO: Add .bss space here.
if (WasmSym::dataEnd) if (WasmSym::dataEnd)
WasmSym::dataEnd->setVirtualAddress(memoryPtr); WasmSym::dataEnd->setVirtualAddress(memoryPtr);
log("mem: static data = " + Twine(memoryPtr - dataStart)); log("mem: static data = " + Twine(memoryPtr - dataStart));
if (config->shared) { if (config->shared) {
out.dylinkSec->memSize = memoryPtr; out.dylinkSec->memSize = memoryPtr;
return; return;
▲ Show 20 Lines • Show All 387 Lines • ▼ Show 20 Linesvoid Writer::createOutputSegments() {
for (ObjFile *file : symtab->objectFiles) { for (ObjFile *file : symtab->objectFiles) {
for (InputSegment *segment : file->segments) { for (InputSegment *segment : file->segments) {
if (!segment->live) if (!segment->live)
continue; continue;
StringRef name = getOutputDataSegmentName(segment->getName()); StringRef name = getOutputDataSegmentName(segment->getName());
OutputSegment *&s = segmentMap[name]; OutputSegment *&s = segmentMap[name];
if (s == nullptr) { if (s == nullptr) {
LLVM_DEBUG(dbgs() << "new segment: " << name << "\n"); LLVM_DEBUG(dbgs() << "new segment: " << name << "\n");
s = make<OutputSegment>(name, segments.size()); s = make<OutputSegment>(name);
if (config->sharedMemory || name == ".tdata") if (config->sharedMemory || name == ".tdata")
s->initFlags = WASM_SEGMENT_IS_PASSIVE; s->initFlags = WASM_SEGMENT_IS_PASSIVE;
segments.push_back(s); segments.push_back(s);
} }
s->addInputSegment(segment); s->addInputSegment(segment);
LLVM_DEBUG(dbgs() << "added data: " << name << ": " << s->size << "\n"); LLVM_DEBUG(dbgs() << "added data: " << name << ": " << s->size << "\n");
} }
} }
// Sort segments by type, placing .bss last
std::stable_sort(segments.begin(), segments.end(),
[](const OutputSegment *a, const OutputSegment *b) {
for (auto &name : {".rodata", ".data", ".tdata", ".bss"}) {
bool matchA = a->name.startswith(name);
bool matchB = b->name.startswith(name);
if (matchA && !matchB)
return true;
if (matchB)
return false;
}
llvm_unreachable("Unexpected segment name");
sbc100Unsubmitted
Not Done
ReplyInline Actions

Its possible to have custom segment names. See Writer.cpp:getOutputDataSegmentName. Seems strange that no tests use this feature though .. maybe I'm misunderstanding something?

Perhaps just create a partial order that puts bss last?

sbc100: Its possible to have custom segment names. See Writer.cpp:getOutputDataSegmentName. Seems…
sbc100Unsubmitted
Not Done
ReplyInline Actions

It it worth sorting things other than bss? Don't make much difference I suppose.

sbc100: It it worth sorting things other than bss? Don't make much difference I suppose.
tlivelyAuthorUnsubmitted
Done
ReplyInline Actions

Eh, probably not, but changing all the tests was a pain and I don't want to do it again :) Perhaps someone will find it useful to have similar sections together some day.

tlively: Eh, probably not, but changing all the tests was a pain and I don't want to do it again :)…
});
for (size_t i = 0; i < segments.size(); ++i) {
segments[i]->index = i;
}
sbc100Unsubmitted
Not Done
ReplyInline Actions

Drop the curlies for single line blocks

sbc100: Drop the curlies for single line blocks
} }
static void createFunction(DefinedFunction *func, StringRef bodyContent) { static void createFunction(DefinedFunction *func, StringRef bodyContent) {
std::string functionBody; std::string functionBody;
{ {
raw_string_ostream os(functionBody); raw_string_ostream os(functionBody);
writeUleb128(os, bodyContent.size(), "function size"); writeUleb128(os, bodyContent.size(), "function size");
os << bodyContent; os << bodyContent;
▲ Show 20 Lines • Show All 389 Lines • Show Last 20 Lines