This is an archive of the discontinued LLVM Phabricator instance.

Differential D120521

[WebAssembly] Covert llvm/test/MC/WebAssembly/reloc-code.ll to asm. NFC
ClosedPublic

Authored by sbc100 on Feb 24 2022, 2:52 PM.

Details

Reviewers
dschuff
pmatos
Commits
rGdb7b1af8ef8f: [WebAssembly] Covert llvm/test/MC/WebAssembly/reloc-code.ll to asm. NFC
Summary

Also increase coverage of call_indirect via explictly function table
(enabled when reference types is enabled) in
llvm/test/CodeGen/WebAssembly/call-indirect.ll (I believe this
was an oversight that it was not added in https://reviews.llvm.org/D90948)

Diff Detail

Event Timeline

sbc100 created this revision.Feb 24 2022, 2:52 PM
Herald added subscribers: wingo, ecnelises, sunfish and 2 others. · View Herald TranscriptFeb 24 2022, 2:52 PM
sbc100 requested review of this revision.Feb 24 2022, 2:52 PM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 24 2022, 2:52 PM
Herald added subscribers: llvm-commits, aheejin. · View Herald Transcript
sbc100 added reviewers: dschuff, pmatos.Feb 24 2022, 2:52 PM
sbc100 updated this revision to Diff 411240.Feb 24 2022, 2:53 PM

formatting

Harbormaster completed remote builds in B151358: Diff 411240.Feb 24 2022, 3:44 PM
pmatos accepted this revision.Feb 25 2022, 5:41 AM

lgtm

This revision is now accepted and ready to land.Feb 25 2022, 5:41 AM
This revision was landed with ongoing or failed builds.Feb 25 2022, 7:12 AM
Closed by commit rGdb7b1af8ef8f: [WebAssembly] Covert llvm/test/MC/WebAssembly/reloc-code.ll to asm. NFC (authored by sbc100). · Explain Why
This revision was automatically updated to reflect the committed changes.
sbc100 added a commit: rGdb7b1af8ef8f: [WebAssembly] Covert llvm/test/MC/WebAssembly/reloc-code.ll to asm. NFC.

Revision Contents

PathSize
llvm/
test/
CodeGen/
WebAssembly/
6 lines
MC/
WebAssembly/
129 lines

Diff 411408

llvm/test/CodeGen/WebAssembly/call-indirect.ll

; RUN: llc < %s -asm-verbose=false -O2 | FileCheck --check-prefix=CHECK %s ; RUN: llc < %s -asm-verbose=false -O2 | FileCheck --check-prefixes=CHECK,NOREF %s
; RUN: llc < %s -asm-verbose=false -mattr=+reference-types -O2 | FileCheck --check-prefixes=CHECK,REF %s
; RUN: llc < %s -asm-verbose=false -O2 --filetype=obj | obj2yaml | FileCheck --check-prefix=OBJ %s ; RUN: llc < %s -asm-verbose=false -O2 --filetype=obj | obj2yaml | FileCheck --check-prefix=OBJ %s
; Test that compilation units with call_indirect but without any ; Test that compilation units with call_indirect but without any
; function pointer declarations still get a table. ; function pointer declarations still get a table.
target triple = "wasm32-unknown-unknown" target triple = "wasm32-unknown-unknown"
; CHECK-LABEL: call_indirect_void: ; CHECK-LABEL: call_indirect_void:
; CHECK-NEXT: .functype call_indirect_void (i32) -> () ; CHECK-NEXT: .functype call_indirect_void (i32) -> ()
; CHECK-NEXT: local.get 0 ; CHECK-NEXT: local.get 0
; CHECK-NEXT: call_indirect () -> () ; REF: call_indirect __indirect_function_table, () -> ()
; NOREF: call_indirect () -> ()
; CHECK-NEXT: end_function ; CHECK-NEXT: end_function
define void @call_indirect_void(void ()* %callee) { define void @call_indirect_void(void ()* %callee) {
call void %callee() call void %callee()
ret void ret void
} }
; OBJ: Imports: ; OBJ: Imports:
; OBJ-NEXT: - Module: env ; OBJ-NEXT: - Module: env
; OBJ-NEXT: Field: __linear_memory ; OBJ-NEXT: Field: __linear_memory
; OBJ-NEXT: Kind: MEMORY ; OBJ-NEXT: Kind: MEMORY
; OBJ-NEXT: Memory: ; OBJ-NEXT: Memory:
; OBJ-NEXT: Minimum: 0x0 ; OBJ-NEXT: Minimum: 0x0
; OBJ-NEXT: - Module: env ; OBJ-NEXT: - Module: env
; OBJ-NEXT: Field: __indirect_function_table ; OBJ-NEXT: Field: __indirect_function_table
; OBJ-NEXT: Kind: TABLE ; OBJ-NEXT: Kind: TABLE

llvm/test/MC/WebAssembly/reloc-code.ll

  • This file was deleted.
; RUN: llc -filetype=obj %s -o - | llvm-readobj -r --expand-relocs - | FileCheck %s
; RUN: llc -filetype=obj -mattr=+reference-types %s -o - | llvm-readobj -r --expand-relocs - | FileCheck --check-prefix=REF %s
target triple = "wasm32-unknown-unknown"
; Pointers to functions of two different types
@a = global i64 ()* inttoptr (i64 5 to i64 ()*), align 8
@b = global i32 ()* inttoptr (i32 7 to i32 ()*), align 8
; External functions
declare i32 @c()
declare i32 @d()
define i32 @f1() {
entry:
%aa = load i64 ()*, i64 ()** @a, align 8
%bb = load i32 ()*, i32 ()** @b, align 8
%tmp1 = call i64 %aa()
%tmp2 = call i32 %bb()
%tmp3 = call i32 @c()
%tmp4 = call i32 @d()
ret i32 %tmp2
}
; CHECK: Format: WASM
; CHECK: Relocations [
; CHECK-NEXT: Section (5) CODE {
; CHECK-NEXT: Relocation {
; CHECK-NEXT: Type: R_WASM_MEMORY_ADDR_LEB (3)
; CHECK-NEXT: Offset: 0x9
; CHECK-NEXT: Symbol: b
; CHECK-NEXT: Addend: 0
; CHECK-NEXT: }
; CHECK-NEXT: Relocation {
; CHECK-NEXT: Type: R_WASM_MEMORY_ADDR_LEB (3)
; CHECK-NEXT: Offset: 0x14
; CHECK-NEXT: Symbol: a
; CHECK-NEXT: Addend: 0
; CHECK-NEXT: }
; CHECK-NEXT: Relocation {
; CHECK-NEXT: Type: R_WASM_TYPE_INDEX_LEB (6)
; CHECK-NEXT: Offset: 0x1A
; CHECK-NEXT: Index: 0x1
; CHECK-NEXT: }
; CHECK-NEXT: Relocation {
; CHECK-NEXT: Type: R_WASM_TYPE_INDEX_LEB (6)
; CHECK-NEXT: Offset: 0x24
; CHECK-NEXT: Index: 0x0
; CHECK-NEXT: }
; CHECK-NEXT: Relocation {
; CHECK-NEXT: Type: R_WASM_FUNCTION_INDEX_LEB (0)
; CHECK-NEXT: Offset: 0x2D
; CHECK-NEXT: Symbol: c
; CHECK-NEXT: }
; CHECK-NEXT: Relocation {
; CHECK-NEXT: Type: R_WASM_FUNCTION_INDEX_LEB (0)
; CHECK-NEXT: Offset: 0x34
; CHECK-NEXT: Symbol: d
; CHECK-NEXT: }
; CHECK-NEXT: }
; CHECK-NEXT: ]
; REF: Format: WASM
; REF: Relocations [
; REF-NEXT: Section (5) CODE {
; REF-NEXT: Relocation {
; REF-NEXT: Type: R_WASM_MEMORY_ADDR_LEB (3)
; REF-NEXT: Offset: 0x9
; REF-NEXT: Symbol: b
; REF-NEXT: Addend: 0
; REF-NEXT: }
; REF-NEXT: Relocation {
; REF-NEXT: Type: R_WASM_MEMORY_ADDR_LEB (3)
; REF-NEXT: Offset: 0x14
; REF-NEXT: Symbol: a
; REF-NEXT: Addend: 0
; REF-NEXT: }
; REF-NEXT: Relocation {
; REF-NEXT: Type: R_WASM_TYPE_INDEX_LEB (6)
; REF-NEXT: Offset: 0x1A
; REF-NEXT: Index: 0x1
; REF-NEXT: }
; REF-NEXT: Relocation {
; REF-NEXT: Type: R_WASM_TABLE_NUMBER_LEB (20)
; REF-NEXT: Offset: 0x1F
; REF-NEXT: Symbol: __indirect_function_table
; REF-NEXT: }
; REF-NEXT: Relocation {
; REF-NEXT: Type: R_WASM_TYPE_INDEX_LEB (6)
; REF-NEXT: Offset: 0x28
; REF-NEXT: Index: 0x0
; REF-NEXT: }
; REF-NEXT: Relocation {
; REF-NEXT: Type: R_WASM_TABLE_NUMBER_LEB (20)
; REF-NEXT: Offset: 0x2D
; REF-NEXT: Symbol: __indirect_function_table
; REF-NEXT: }
; REF-NEXT: Relocation {
; REF-NEXT: Type: R_WASM_FUNCTION_INDEX_LEB (0)
; REF-NEXT: Offset: 0x35
; REF-NEXT: Symbol: c
; REF-NEXT: }
; REF-NEXT: Relocation {
; REF-NEXT: Type: R_WASM_FUNCTION_INDEX_LEB (0)
; REF-NEXT: Offset: 0x3C
; REF-NEXT: Symbol: d
; REF-NEXT: }
; REF-NEXT: }
; REF-NEXT: ]

llvm/test/MC/WebAssembly/reloc-code.s

  • This file was added.
# RUN: llvm-mc -triple=wasm32-unknown-unknown -filetype=obj %s -o - | llvm-readobj -r --expand-relocs - | FileCheck %s
# RUN: llvm-mc -triple=wasm32-unknown-unknown -mattr=+reference-types -filetype=obj %s -o - | llvm-readobj -r --expand-relocs - | FileCheck --check-prefix=REF %s
# External functions
.functype c () -> (i32)
.functype d () -> (i32)
.globl f1
.globl a
.globl b
f1:
.functype f1 () -> (i32)
# Call functions at `a` and `b` indirectly.
i32.const 0
i32.load a
call_indirect () -> (i64)
drop
i32.const 0
i32.load b
call_indirect () -> (i32)
drop
# Call functions `c` and `d` directly
call c
drop
call d
end_function
# Pointers to functions of two different types
.section .data.a,"",@
.p2align 3
a:
.int32 5
.size a, 4
.section .data.b,"",@
.p2align 3
b:
.int32 7
.size b, 4
# CHECK: Format: WASM
# CHECK: Relocations [
# CHECK-NEXT: Section (5) CODE {
# CHECK-NEXT: Relocation {
# CHECK-NEXT: Type: R_WASM_MEMORY_ADDR_LEB (3)
# CHECK-NEXT: Offset: 0x7
# CHECK-NEXT: Symbol: a
# CHECK-NEXT: Addend: 0
# CHECK-NEXT: }
# CHECK-NEXT: Relocation {
# CHECK-NEXT: Type: R_WASM_TYPE_INDEX_LEB (6)
# CHECK-NEXT: Offset: 0xD
# CHECK-NEXT: Index: 0x1
# CHECK-NEXT: }
# CHECK-NEXT: Relocation {
# CHECK-NEXT: Type: R_WASM_MEMORY_ADDR_LEB (3)
# CHECK-NEXT: Offset: 0x18
# CHECK-NEXT: Symbol: b
# CHECK-NEXT: Addend: 0
# CHECK-NEXT: }
# CHECK-NEXT: Relocation {
# CHECK-NEXT: Type: R_WASM_TYPE_INDEX_LEB (6)
# CHECK-NEXT: Offset: 0x1E
# CHECK-NEXT: Index: 0x0
# CHECK-NEXT: }
# CHECK-NEXT: Relocation {
# CHECK-NEXT: Type: R_WASM_FUNCTION_INDEX_LEB (0)
# CHECK-NEXT: Offset: 0x26
# CHECK-NEXT: Symbol: c
# CHECK-NEXT: }
# CHECK-NEXT: Relocation {
# CHECK-NEXT: Type: R_WASM_FUNCTION_INDEX_LEB (0)
# CHECK-NEXT: Offset: 0x2D
# CHECK-NEXT: Symbol: d
# CHECK-NEXT: }
# CHECK-NEXT: }
# CHECK-NEXT: ]
# REF: Format: WASM
# REF: Relocations [
# REF-NEXT: Section (5) CODE {
# REF-NEXT: Relocation {
# REF-NEXT: Type: R_WASM_MEMORY_ADDR_LEB (3)
# REF-NEXT: Offset: 0x7
# REF-NEXT: Symbol: a
# REF-NEXT: Addend: 0
# REF-NEXT: }
# REF-NEXT: Relocation {
# REF-NEXT: Type: R_WASM_TYPE_INDEX_LEB (6)
# REF-NEXT: Offset: 0xD
# REF-NEXT: Index: 0x1
# REF-NEXT: }
# REF-NEXT: Relocation {
# REF-NEXT: Type: R_WASM_TABLE_NUMBER_LEB (20)
# REF-NEXT: Offset: 0x12
# REF-NEXT: Symbol: __indirect_function_table
# REF-NEXT: }
# REF-NEXT: Relocation {
# REF-NEXT: Type: R_WASM_MEMORY_ADDR_LEB (3)
# REF-NEXT: Offset: 0x1C
# REF-NEXT: Symbol: b
# REF-NEXT: Addend: 0
# REF-NEXT: }
# REF-NEXT: Relocation {
# REF-NEXT: Type: R_WASM_TYPE_INDEX_LEB (6)
# REF-NEXT: Offset: 0x22
# REF-NEXT: Index: 0x0
# REF-NEXT: }
# REF-NEXT: Relocation {
# REF-NEXT: Type: R_WASM_TABLE_NUMBER_LEB (20)
# REF-NEXT: Offset: 0x27
# REF-NEXT: Symbol: __indirect_function_table
# REF-NEXT: }
# REF-NEXT: Relocation {
# REF-NEXT: Type: R_WASM_FUNCTION_INDEX_LEB (0)
# REF-NEXT: Offset: 0x2E
# REF-NEXT: Symbol: c
# REF-NEXT: }
# REF-NEXT: Relocation {
# REF-NEXT: Type: R_WASM_FUNCTION_INDEX_LEB (0)
# REF-NEXT: Offset: 0x35
# REF-NEXT: Symbol: d
# REF-NEXT: }
# REF-NEXT: }
# REF-NEXT: ]
llvm/test/CodeGen/WebAssembly/call-indirect.ll