This is an archive of the discontinued LLVM Phabricator instance.

Differential D112590

[lld][WebAssebmly] Convert tests to use disassembly. NFC
ClosedPublic

Authored by sbc100 on Oct 26 2021, 6:34 PM.

Details

Reviewers
dschuff
tlively
Commits
rG1aeb4c4a4324: [lld][WebAssebmly] Convert tests to use disassembly. NFC

Diff Detail

Event Timeline

sbc100 created this revision.Oct 26 2021, 6:34 PM
Herald added a subscriber: wingo. · View Herald TranscriptOct 26 2021, 6:34 PM
sbc100 requested review of this revision.Oct 26 2021, 6:34 PM
Herald added a project: Restricted Project. · View Herald TranscriptOct 26 2021, 6:34 PM
Herald added subscribers: llvm-commits, aheejin. · View Herald Transcript
sbc100 added reviewers: dschuff, tlively.Oct 26 2021, 6:35 PM
Harbormaster completed remote builds in B130842: Diff 382502.Oct 26 2021, 6:46 PM
dschuff accepted this revision.Oct 27 2021, 10:27 AM

I didn't verify that the disassembly actually matches the body that we had before, but this looks good.

This revision is now accepted and ready to land.Oct 27 2021, 10:27 AM
Closed by commit rG1aeb4c4a4324: [lld][WebAssebmly] Convert tests to use disassembly. NFC (authored by sbc100). · Explain WhyOct 27 2021, 10:35 AM
This revision was automatically updated to reflect the committed changes.
sbc100 added a commit: rG1aeb4c4a4324: [lld][WebAssebmly] Convert tests to use disassembly. NFC.
lbenes added a subscriber: lbenes.Nov 5 2021, 5:48 PM

A branch containing this patch was accidentally pushed to GitHub: https://github.com/llvm/llvm-project/tree/efb284c07e

Can someone please remove it?

Revision Contents

PathSize
lld/
test/
wasm/
91 lines

Diff 382716

lld/test/wasm/tls.s

Show First 20 Lines • Show All 68 Lines • ▼ Show 20 Lines.section .custom_section.target_features,"",@
.int8 7 .int8 7
.ascii "atomics" .ascii "atomics"
.int8 43 .int8 43
.int8 11 .int8 11
.ascii "bulk-memory" .ascii "bulk-memory"
# RUN: wasm-ld -no-gc-sections --shared-memory --max-memory=131072 --no-entry -o %t.wasm %t.o # RUN: wasm-ld -no-gc-sections --shared-memory --max-memory=131072 --no-entry -o %t.wasm %t.o
# RUN: obj2yaml %t.wasm | FileCheck %s # RUN: obj2yaml %t.wasm | FileCheck %s
# RUN: llvm-objdump -d --no-show-raw-insn --no-leading-addr %t.wasm | FileCheck --check-prefix=ASM %s --
# RUN: wasm-ld -no-gc-sections --shared-memory --max-memory=131072 --no-merge-data-segments --no-entry -o %t2.wasm %t.o # RUN: wasm-ld -no-gc-sections --shared-memory --max-memory=131072 --no-merge-data-segments --no-entry -o %t2.wasm %t.o
# RUN: obj2yaml %t2.wasm | FileCheck %s # RUN: obj2yaml %t2.wasm | FileCheck %s
# CHECK: - Type: GLOBAL # CHECK: - Type: GLOBAL
# __stack_pointer
# 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: 66576 # CHECK-NEXT: Value: 66576
Show All 17 Lines
# CHECK-NEXT: - Index: 3 # CHECK-NEXT: - Index: 3
# 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: 4 # CHECK-NEXT: Value: 4
# CHECK: - Type: CODE # ASM: <__wasm_init_tls>:
# CHECK-NEXT: Functions: # ASM-EMPTY:
# Skip __wasm_call_ctors # ASM-NEXT: local.get 0
# CHECK: - Index: 1 # ASM-NEXT: global.set 1
# CHECK-NEXT: Locals: [] # ASM-NEXT: local.get 0
# CHECK-NEXT: Body: 2000240120004100410CFC0800000B # ASM-NEXT: i32.const 0
# ASM-NEXT: i32.const 12
# Expected body of __wasm_init_tls: # ASM-NEXT: memory.init 0, 0
# local.get 0 # ASM-NEXT: end
# global.set 1
# local.get 0 # ASM: <tls1_addr>:
# i32.const 0 # ASM-EMPTY:
# i32.const 12 # ASM-NEXT: global.get 1
# memory.init 1, 0 # ASM-NEXT: i32.const 0
# end # ASM-NEXT: i32.add
# ASM-NEXT: end
# CHECK-NEXT: - Index: 2
# CHECK-NEXT: Locals: [] # ASM: <tls2_addr>:
# CHECK-NEXT: Body: 2381808080004180808080006A0B # ASM-EMPTY:
# ASM-NEXT: global.get 1
# Expected body of tls1_addr: # ASM-NEXT: i32.const 4
# global.get 1 # ASM-NEXT: i32.add
# i32.const 0 # ASM-NEXT: end
# i32.add
# end # ASM: <tls3_addr>:
# ASM-EMPTY:
# CHECK-NEXT: - Index: 3 # ASM-NEXT: global.get 1
# CHECK-NEXT: Locals: [] # ASM-NEXT: i32.const 8
# CHECK-NEXT: Body: 2381808080004184808080006A0B # ASM-NEXT: i32.add
# ASM-NEXT: end
# Expected body of tls2_addr:
# global.get 1 # ASM: <tls_align>:
# i32.const 4 # ASM-EMPTY:
# i32.add # ASM-NEXT: global.get 3
# end # ASM-NEXT: end
# CHECK-NEXT: - Index: 4
# CHECK-NEXT: Locals: []
# CHECK-NEXT: Body: 2381808080004188808080006A0B
# Expected body of tls3_addr:
# global.get 1
# i32.const 4
# i32.add
# end
# CHECK-NEXT: - Index: 5
# CHECK-NEXT: Locals: []
# CHECK-NEXT: Body: 2383808080000B
# Expected body of tls_align:
# global.get 3
# end
# Also verify TLS usage with --relocatable # Also verify TLS usage with --relocatable
# RUN: wasm-ld --relocatable -o %t3.wasm %t.o # RUN: wasm-ld --relocatable -o %t3.wasm %t.o
# RUN: obj2yaml %t3.wasm | FileCheck %s --check-prefix=RELOC # RUN: obj2yaml %t3.wasm | FileCheck %s --check-prefix=RELOC
# RELOC: - Type: IMPORT # RELOC: - Type: IMPORT
# RELOC-NEXT: Imports: # RELOC-NEXT: Imports:
# RELOC-NEXT: - Module: env # RELOC-NEXT: - Module: env
Show All 20 Lines