This is an archive of the discontinued LLVM Phabricator instance.

Differential D41511

[WebAssembly] Increase test coverage for weak aliases
ClosedPublic

Authored by sbc100 on Dec 21 2017, 1:10 PM.

Details

Reviewers
ncw
ruiu
Commits
rG5cfffbc875de: [WebAssembly] Increase test coverage for weak aliases
rL321385: [WebAssembly] Increase test coverage for weak aliases
rLLD321385: [WebAssembly] Increase test coverage for weak aliases
Summary

Relies on llvm fix: https://reviews.llvm.org/D41510

Diff Detail

Event Timeline

sbc100 created this revision.Dec 21 2017, 1:10 PM
Herald added subscribers: llvm-commits, sunfish, aheejin and 3 others. · View Herald TranscriptDec 21 2017, 1:10 PM
sbc100 edited the summary of this revision. (Show Details)Dec 21 2017, 1:10 PM
sbc100 updated this revision to Diff 128051.Dec 22 2017, 12:33 PM
  • remove comment
Harbormaster completed remote builds in B13399: Diff 128051.Dec 22 2017, 12:33 PM
sbc100 added reviewers: ncw, ruiu.Dec 22 2017, 12:34 PM
This revision was not accepted when it landed; it landed in state Needs Review.Dec 22 2017, 12:36 PM
Closed by commit rLLD321385: [WebAssembly] Increase test coverage for weak aliases (authored by sbc). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
test/
wasm/
Inputs/
14 lines
2 lines
2 lines
12 lines
12 lines
25 lines

Diff 128051

test/wasm/Inputs/weak-alias.ll

Show All 14 Lines
define i32 @call_alias() #0 { define i32 @call_alias() #0 {
entry: entry:
%call = call i32 @alias_fn() %call = call i32 @alias_fn()
ret i32 %call ret i32 %call
} }
define i32 @call_alias_ptr() #0 { define i32 @call_alias_ptr() #0 {
entry: entry:
; TODO(sbc): This code currently causes linker failures: %fnptr = alloca i32 ()*, align 8
; LLVM ERROR: symbol not found table index space: alias_fn store i32 ()* @alias_fn, i32 ()** %fnptr, align 8
; See: https://github.com/WebAssembly/tool-conventions/issues/34# %0 = load i32 ()*, i32 ()** %fnptr, align 8
; %fnptr = alloca i32 ()*, align 8 %call = call i32 %0()
; store i32 ()* @alias_fn, i32 ()** %fnptr, align 8 ret i32 %call
; %0 = load i32 ()*, i32 ()** %fnptr, align 8
; %call = call i32 %0()
; ret i32 %call
ret i32 1
} }
define i32 @call_direct_ptr() #0 { define i32 @call_direct_ptr() #0 {
entry: entry:
%fnptr = alloca i32 ()*, align 8 %fnptr = alloca i32 ()*, align 8
store i32 ()* @direct_fn, i32 ()** %fnptr, align 8 store i32 ()* @direct_fn, i32 ()** %fnptr, align 8
%0 = load i32 ()*, i32 ()** %fnptr, align 8 %0 = load i32 ()*, i32 ()** %fnptr, align 8
%call = call i32 %0() %call = call i32 %0()
ret i32 %call ret i32 %call
} }

test/wasm/Inputs/weak-symbol1.ll

define weak i32 @weakFn() #0 { define weak i32 @weakFn() #0 {
entry: entry:
ret i32 1 ret i32 1
} }
define i32 @exportWeak1() { define i32 @exportWeak1() {
entry: entry:
ret i32 ptrtoint (i32 ()* @weakFn to i32) ret i32 ptrtoint (i32 ()* @weakFn to i32)
} }
@weakGlobal = weak global i32 1

test/wasm/Inputs/weak-symbol2.ll

define weak i32 @weakFn() #0 { define weak i32 @weakFn() #0 {
entry: entry:
ret i32 2 ret i32 2
} }
define i32 @exportWeak2() { define i32 @exportWeak2() {
entry: entry:
ret i32 ptrtoint (i32 ()* @weakFn to i32) ret i32 ptrtoint (i32 ()* @weakFn to i32)
} }
@weakGlobal = weak global i32 2

test/wasm/weak-alias-overide.ll

Show All 30 Lines
; CHECK-NEXT: ParamTypes: ; CHECK-NEXT: ParamTypes:
; CHECK-NEXT: - Type: FUNCTION ; CHECK-NEXT: - Type: FUNCTION
; CHECK-NEXT: FunctionTypes: [ 0, 1, 0, 0, 0, 0, 0 ] ; CHECK-NEXT: FunctionTypes: [ 0, 1, 0, 0, 0, 0, 0 ]
; CHECK-NEXT: - Type: TABLE ; CHECK-NEXT: - Type: TABLE
; CHECK-NEXT: Tables: ; CHECK-NEXT: Tables:
; CHECK-NEXT: - ElemType: ANYFUNC ; CHECK-NEXT: - ElemType: ANYFUNC
; CHECK-NEXT: Limits: ; CHECK-NEXT: Limits:
; CHECK-NEXT: Flags: [ HAS_MAX ] ; CHECK-NEXT: Flags: [ HAS_MAX ]
; CHECK-NEXT: Initial: 0x00000002 ; CHECK-NEXT: Initial: 0x00000003
; CHECK-NEXT: Maximum: 0x00000002 ; CHECK-NEXT: Maximum: 0x00000003
; CHECK-NEXT: - Type: MEMORY ; CHECK-NEXT: - Type: MEMORY
; CHECK-NEXT: Memories: ; CHECK-NEXT: Memories:
; CHECK-NEXT: - Initial: 0x00000002 ; CHECK-NEXT: - Initial: 0x00000002
; CHECK-NEXT: - Type: GLOBAL ; CHECK-NEXT: - Type: GLOBAL
; CHECK-NEXT: Globals: ; CHECK-NEXT: Globals:
; CHECK-NEXT: - Type: I32 ; CHECK-NEXT: - Type: I32
; CHECK-NEXT: Mutable: true ; CHECK-NEXT: Mutable: true
; CHECK-NEXT: InitExpr: ; CHECK-NEXT: InitExpr:
Show All 25 Lines
; CHECK-NEXT: - Name: call_direct_ptr ; CHECK-NEXT: - Name: call_direct_ptr
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 6 ; CHECK-NEXT: Index: 6
; CHECK-NEXT: - Type: ELEM ; CHECK-NEXT: - Type: ELEM
; CHECK-NEXT: Segments: ; CHECK-NEXT: Segments:
; CHECK-NEXT: - Offset: ; CHECK-NEXT: - Offset:
; CHECK-NEXT: Opcode: I32_CONST ; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 1 ; CHECK-NEXT: Value: 1
; CHECK-NEXT: Functions: [ 2 ] ; CHECK-NEXT: Functions: [ 0, 2 ]
; CHECK-NEXT: - Type: CODE ; CHECK-NEXT: - Type: CODE
; CHECK-NEXT: Functions: ; CHECK-NEXT: Functions:
; CHECK-NEXT: - Locals: ; CHECK-NEXT: - Locals:
; CHECK-NEXT: Body: 41010B ; CHECK-NEXT: Body: 41010B
; CHECK-NEXT: - Locals: ; CHECK-NEXT: - Locals:
; CHECK-NEXT: Body: 1080808080001A0B ; CHECK-NEXT: Body: 1080808080001A0B
; CHECK-NEXT: - Locals: ; CHECK-NEXT: - Locals:
; CHECK-NEXT: Body: 41000B ; CHECK-NEXT: Body: 41000B
; CHECK-NEXT: - Locals: ; CHECK-NEXT: - Locals:
; CHECK-NEXT: Body: 1082808080000B ; CHECK-NEXT: Body: 1082808080000B
; CHECK-NEXT: - Locals: ; CHECK-NEXT: - Locals:
; CHECK-NEXT: Body: 1080808080000B ; CHECK-NEXT: Body: 1080808080000B
; CHECK-NEXT: - Locals: ; CHECK-NEXT: - Locals:
; CHECK-NEXT: Body: 41010B ; CHECK-NEXT: - Type: I32
; CHECK-NEXT: Count: 2
; CHECK-NEXT: Body: 23808080800041106B220024808080800020004181808080003602081080808080002101200041106A24808080800020010B
; CHECK-NEXT: - Locals: ; CHECK-NEXT: - Locals:
; CHECK-NEXT: - Type: I32 ; CHECK-NEXT: - Type: I32
; CHECK-NEXT: Count: 2 ; CHECK-NEXT: Count: 2
; CHECK-NEXT: Body: 23808080800041106B220024808080800020004181808080003602081082808080002101200041106A24808080800020010B ; CHECK-NEXT: Body: 23808080800041106B220024808080800020004182808080003602081082808080002101200041106A24808080800020010B
; CHECK-NEXT: - Type: CUSTOM ; CHECK-NEXT: - Type: CUSTOM
; CHECK-NEXT: Name: linking ; CHECK-NEXT: Name: linking
; CHECK-NEXT: DataSize: 0 ; CHECK-NEXT: DataSize: 0
; CHECK-NEXT: - Type: CUSTOM ; CHECK-NEXT: - Type: CUSTOM
; CHECK-NEXT: Name: name ; CHECK-NEXT: Name: name
; CHECK-NEXT: FunctionNames: ; CHECK-NEXT: FunctionNames:
; CHECK-NEXT: - Index: 0 ; CHECK-NEXT: - Index: 0
; CHECK-NEXT: Name: alias_fn ; CHECK-NEXT: Name: alias_fn
Show All 13 Lines

test/wasm/weak-alias.ll

Show All 24 Lines
; CHECK-NEXT: ParamTypes: ; CHECK-NEXT: ParamTypes:
; CHECK-NEXT: - Type: FUNCTION ; CHECK-NEXT: - Type: FUNCTION
; CHECK-NEXT: FunctionTypes: [ 0, 0, 0, 0, 0, 0 ] ; CHECK-NEXT: FunctionTypes: [ 0, 0, 0, 0, 0, 0 ]
; CHECK-NEXT: - Type: TABLE ; CHECK-NEXT: - Type: TABLE
; CHECK-NEXT: Tables: ; CHECK-NEXT: Tables:
; CHECK-NEXT: - ElemType: ANYFUNC ; CHECK-NEXT: - ElemType: ANYFUNC
; CHECK-NEXT: Limits: ; CHECK-NEXT: Limits:
; CHECK-NEXT: Flags: [ HAS_MAX ] ; CHECK-NEXT: Flags: [ HAS_MAX ]
; CHECK-NEXT: Initial: 0x00000002 ; CHECK-NEXT: Initial: 0x00000003
; CHECK-NEXT: Maximum: 0x00000002 ; CHECK-NEXT: Maximum: 0x00000003
; CHECK-NEXT: - Type: MEMORY ; CHECK-NEXT: - Type: MEMORY
; CHECK-NEXT: Memories: ; CHECK-NEXT: Memories:
; CHECK-NEXT: - Initial: 0x00000002 ; CHECK-NEXT: - Initial: 0x00000002
; CHECK-NEXT: - Type: GLOBAL ; CHECK-NEXT: - Type: GLOBAL
; CHECK-NEXT: Globals: ; CHECK-NEXT: Globals:
; CHECK-NEXT: - Type: I32 ; CHECK-NEXT: - Type: I32
; CHECK-NEXT: Mutable: true ; CHECK-NEXT: Mutable: true
; CHECK-NEXT: InitExpr: ; CHECK-NEXT: InitExpr:
Show All 25 Lines
; CHECK-NEXT: - Name: call_direct_ptr ; CHECK-NEXT: - Name: call_direct_ptr
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 5 ; CHECK-NEXT: Index: 5
; CHECK-NEXT: - Type: ELEM ; CHECK-NEXT: - Type: ELEM
; CHECK-NEXT: Segments: ; CHECK-NEXT: Segments:
; CHECK-NEXT: - Offset: ; CHECK-NEXT: - Offset:
; CHECK-NEXT: Opcode: I32_CONST ; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 1 ; CHECK-NEXT: Value: 1
; CHECK-NEXT: Functions: [ 1 ] ; CHECK-NEXT: Functions: [ 1, 1 ]
; CHECK-NEXT: - Type: CODE ; CHECK-NEXT: - Type: CODE
; CHECK-NEXT: Functions: ; CHECK-NEXT: Functions:
; CHECK-NEXT: - Locals: ; CHECK-NEXT: - Locals:
; CHECK-NEXT: Body: 1081808080000B ; CHECK-NEXT: Body: 1081808080000B
; CHECK-NEXT: - Locals: ; CHECK-NEXT: - Locals:
; CHECK-NEXT: Body: 41000B ; CHECK-NEXT: Body: 41000B
; CHECK-NEXT: - Locals: ; CHECK-NEXT: - Locals:
; CHECK-NEXT: Body: 1081808080000B ; CHECK-NEXT: Body: 1081808080000B
; CHECK-NEXT: - Locals: ; CHECK-NEXT: - Locals:
; CHECK-NEXT: Body: 1081808080000B ; CHECK-NEXT: Body: 1081808080000B
; CHECK-NEXT: - Locals: ; CHECK-NEXT: - Locals:
; CHECK-NEXT: Body: 41010B
; CHECK-NEXT: - Locals:
; CHECK-NEXT: - Type: I32 ; CHECK-NEXT: - Type: I32
; CHECK-NEXT: Count: 2 ; CHECK-NEXT: Count: 2
; CHECK-NEXT: Body: 23808080800041106B220024808080800020004181808080003602081081808080002101200041106A24808080800020010B ; CHECK-NEXT: Body: 23808080800041106B220024808080800020004181808080003602081081808080002101200041106A24808080800020010B
; CHECK-NEXT: - Locals:
; CHECK-NEXT: - Type: I32
; CHECK-NEXT: Count: 2
; CHECK-NEXT: Body: 23808080800041106B220024808080800020004182808080003602081081808080002101200041106A24808080800020010B
; CHECK-NEXT: - Type: CUSTOM ; CHECK-NEXT: - Type: CUSTOM
; CHECK-NEXT: Name: linking ; CHECK-NEXT: Name: linking
; CHECK-NEXT: DataSize: 0 ; CHECK-NEXT: DataSize: 0
; CHECK-NEXT: - Type: CUSTOM ; CHECK-NEXT: - Type: CUSTOM
; CHECK-NEXT: Name: name ; CHECK-NEXT: Name: name
; CHECK-NEXT: FunctionNames: ; CHECK-NEXT: FunctionNames:
; CHECK-NEXT: - Index: 0 ; CHECK-NEXT: - Index: 0
; CHECK-NEXT: Name: _start ; CHECK-NEXT: Name: _start
Show All 11 Lines

test/wasm/weak-symbols.ll

; RUN: llc -filetype=obj -mtriple=wasm32-unknown-unknown-wasm %p/Inputs/weak-symbol1.ll -o %t1.o ; RUN: llc -filetype=obj -mtriple=wasm32-unknown-unknown-wasm %p/Inputs/weak-symbol1.ll -o %t1.o
; RUN: llc -filetype=obj -mtriple=wasm32-unknown-unknown-wasm %p/Inputs/weak-symbol2.ll -o %t2.o ; RUN: llc -filetype=obj -mtriple=wasm32-unknown-unknown-wasm %p/Inputs/weak-symbol2.ll -o %t2.o
; RUN: llc -filetype=obj -mtriple=wasm32-unknown-unknown-wasm %s -o %t.o ; RUN: llc -filetype=obj -mtriple=wasm32-unknown-unknown-wasm %s -o %t.o
; RUN: lld -flavor wasm -o %t.wasm %t.o %t1.o %t2.o ; RUN: lld -flavor wasm -o %t.wasm %t.o %t1.o %t2.o
; RUN: obj2yaml %t.wasm | FileCheck %s ; RUN: obj2yaml %t.wasm | FileCheck %s
declare i32 @weakFn() local_unnamed_addr declare i32 @weakFn() local_unnamed_addr
@weakGlobal = external global i32
define void @_start() local_unnamed_addr { define i32 @_start() local_unnamed_addr {
entry: entry:
%call = call i32 @weakFn() %call = call i32 @weakFn()
ret void %val = load i32, i32* @weakGlobal, align 4
ret i32 %val
} }
; CHECK: --- !WASM ; CHECK: --- !WASM
; CHECK-NEXT: FileHeader: ; CHECK-NEXT: FileHeader:
; CHECK-NEXT: Version: 0x00000001 ; CHECK-NEXT: Version: 0x00000001
; CHECK-NEXT: Sections: ; CHECK-NEXT: Sections:
; CHECK-NEXT: - Type: TYPE ; CHECK-NEXT: - Type: TYPE
; CHECK-NEXT: Signatures: ; CHECK-NEXT: Signatures:
; CHECK-NEXT: - Index: 0 ; CHECK-NEXT: - Index: 0
; CHECK-NEXT: ReturnType: NORESULT
; CHECK-NEXT: ParamTypes:
; CHECK-NEXT: - Index: 1
; CHECK-NEXT: ReturnType: I32 ; CHECK-NEXT: ReturnType: I32
; CHECK-NEXT: ParamTypes: ; CHECK-NEXT: ParamTypes:
; CHECK-NEXT: - Type: FUNCTION ; CHECK-NEXT: - Type: FUNCTION
; CHECK-NEXT: FunctionTypes: [ 0, 1, 1, 1, 1 ] ; CHECK-NEXT: FunctionTypes: [ 0, 0, 0, 0, 0 ]
; CHECK-NEXT: - Type: TABLE ; CHECK-NEXT: - Type: TABLE
; CHECK-NEXT: Tables: ; CHECK-NEXT: Tables:
; CHECK-NEXT: - ElemType: ANYFUNC ; CHECK-NEXT: - ElemType: ANYFUNC
; CHECK-NEXT: Limits: ; CHECK-NEXT: Limits:
; CHECK-NEXT: Flags: [ HAS_MAX ] ; CHECK-NEXT: Flags: [ HAS_MAX ]
; CHECK-NEXT: Initial: 0x00000002 ; CHECK-NEXT: Initial: 0x00000002
; CHECK-NEXT: Maximum: 0x00000002 ; CHECK-NEXT: Maximum: 0x00000002
; CHECK-NEXT: - Type: MEMORY ; CHECK-NEXT: - Type: MEMORY
; CHECK-NEXT: Memories: ; CHECK-NEXT: Memories:
; CHECK-NEXT: - Initial: 0x00000002 ; CHECK-NEXT: - Initial: 0x00000002
; CHECK-NEXT: - Type: GLOBAL ; CHECK-NEXT: - Type: GLOBAL
; CHECK-NEXT: Globals: ; CHECK-NEXT: Globals:
; 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: 66560 ; CHECK-NEXT: Value: 66576
; CHECK-NEXT: - Type: EXPORT ; CHECK-NEXT: - Type: EXPORT
; CHECK-NEXT: Exports: ; CHECK-NEXT: Exports:
; CHECK-NEXT: - Name: memory ; CHECK-NEXT: - Name: memory
; CHECK-NEXT: Kind: MEMORY ; CHECK-NEXT: Kind: MEMORY
; CHECK-NEXT: Index: 0 ; CHECK-NEXT: Index: 0
; CHECK-NEXT: - Name: _start ; CHECK-NEXT: - Name: _start
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 0 ; CHECK-NEXT: Index: 0
Show All 10 Lines
; CHECK-NEXT: Segments: ; CHECK-NEXT: Segments:
; CHECK-NEXT: - Offset: ; CHECK-NEXT: - Offset:
; CHECK-NEXT: Opcode: I32_CONST ; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 1 ; CHECK-NEXT: Value: 1
; CHECK-NEXT: Functions: [ 1 ] ; CHECK-NEXT: Functions: [ 1 ]
; CHECK-NEXT: - Type: CODE ; CHECK-NEXT: - Type: CODE
; CHECK-NEXT: Functions: ; CHECK-NEXT: Functions:
; CHECK-NEXT: - Locals: ; CHECK-NEXT: - Locals:
; CHECK-NEXT: Body: 1081808080001A0B ; CHECK-NEXT: Body: 1081808080001A4100280280888080000B
; CHECK-NEXT: - Locals: ; CHECK-NEXT: - Locals:
; CHECK-NEXT: Body: 41010B ; CHECK-NEXT: Body: 41010B
; CHECK-NEXT: - Locals: ; CHECK-NEXT: - Locals:
; CHECK-NEXT: Body: 4181808080000B ; CHECK-NEXT: Body: 4181808080000B
; CHECK-NEXT: - Locals: ; CHECK-NEXT: - Locals:
; CHECK-NEXT: Body: 41020B ; CHECK-NEXT: Body: 41020B
; CHECK-NEXT: - Locals: ; CHECK-NEXT: - Locals:
; CHECK-NEXT: Body: 4181808080000B ; CHECK-NEXT: Body: 4181808080000B
; CHECK-NEXT: - Type: DATA
; CHECK-NEXT: Segments:
; CHECK-NEXT: - SectionOffset: 7
; CHECK-NEXT: MemoryIndex: 0
; CHECK-NEXT: Offset:
; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 1024
; CHECK-NEXT: Content: '0100000002000000'
; CHECK-NEXT: - Type: CUSTOM ; CHECK-NEXT: - Type: CUSTOM
; CHECK-NEXT: Name: linking ; CHECK-NEXT: Name: linking
; CHECK-NEXT: DataSize: 0 ; CHECK-NEXT: DataSize: 8
; CHECK-NEXT: - Type: CUSTOM ; CHECK-NEXT: - Type: CUSTOM
; CHECK-NEXT: Name: name ; CHECK-NEXT: Name: name
; CHECK-NEXT: FunctionNames: ; CHECK-NEXT: FunctionNames:
; CHECK-NEXT: - Index: 0 ; CHECK-NEXT: - Index: 0
; CHECK-NEXT: Name: _start ; CHECK-NEXT: Name: _start
; CHECK-NEXT: - Index: 2 ; CHECK-NEXT: - Index: 2
; CHECK-NEXT: Name: exportWeak1 ; CHECK-NEXT: Name: exportWeak1
; CHECK-NEXT: - Index: 4 ; CHECK-NEXT: - Index: 4
; CHECK-NEXT: Name: exportWeak2 ; CHECK-NEXT: Name: exportWeak2
; CHECK-NEXT: ... ; CHECK-NEXT: ...