This is an archive of the discontinued LLVM Phabricator instance.

Differential D41460

[WebAssembly] Improve weak alias tests cases
ClosedPublic

Authored by sbc100 on Dec 20 2017, 12:03 PM.

Details

Reviewers
ncw
Commits
rGc6e4d73f313c: [WebAssembly] Improve weak alias tests cases
rLLD321241: [WebAssembly] Improve weak alias tests cases
rL321241: [WebAssembly] Improve weak alias tests cases
Summary

Based on: https://github.com/WebAssembly/tool-conventions/issues/34

Currently both these tests exhibit some incorrect behavior.
Namly that call_alias will always end up calling direct_fn even
when the alias is overridden.

Also, calling alias_fn via the indirect function table is currently
broken (see TODO comment).

Diff Detail

Event Timeline

sbc100 created this revision.Dec 20 2017, 12:03 PM
Harbormaster completed remote builds in B13339: Diff 127771.Dec 20 2017, 12:03 PM
Herald added subscribers: llvm-commits, sunfish, aheejin and 3 others. · View Herald TranscriptDec 20 2017, 12:03 PM
sbc100 updated this revision to Diff 127773.Dec 20 2017, 12:24 PM
  • more test
Harbormaster completed remote builds in B13340: Diff 127773.Dec 20 2017, 12:24 PM
sbc100 updated this revision to Diff 127788.Dec 20 2017, 2:30 PM
  • update test
Harbormaster completed remote builds in B13346: Diff 127788.Dec 20 2017, 2:30 PM
sbc100 added a reviewer: ncw.Dec 20 2017, 2:31 PM
sbc100 edited the summary of this revision. (Show Details)
This revision was not accepted when it landed; it landed in state Needs Review.Dec 20 2017, 6:30 PM
Closed by commit rL321241: [WebAssembly] Improve weak alias tests cases (authored by sbc). · Explain Why
This revision was automatically updated to reflect the committed changes.
ncw added a comment.Dec 21 2017, 3:06 AM

I haven't looked into this in detail (I'd need to hand-inspect the wasm-dis output to be sure that the obj2yaml output is actually correct). But I'm sure you've done that! Fine by me.

Revision Contents

PathSize
test/
wasm/
Inputs/
36 lines
55 lines
51 lines

Diff 127788

test/wasm/Inputs/weak-alias.ll

; Function Attrs: norecurse nounwind readnone ; Function Attrs: norecurse nounwind readnone
define i32 @foo() #0 { define i32 @direct_fn() #0 {
entry: entry:
ret i32 0 ret i32 0
} }
@bar = weak alias i32 (), i32 ()* @foo @alias_fn = weak alias i32 (), i32 ()* @direct_fn
define i32 @call_bar() #0 { define i32 @call_direct() #0 {
entry: entry:
%call = call i32 @bar() %call = call i32 @direct_fn()
ret i32 %call
}
define i32 @call_alias() #0 {
entry:
%call = call i32 @alias_fn()
ret i32 %call
}
define i32 @call_alias_ptr() #0 {
entry:
; TODO(sbc): This code currently causes linker failures:
; LLVM ERROR: symbol not found table index space: alias_fn
; See: https://github.com/WebAssembly/tool-conventions/issues/34#
; %fnptr = alloca i32 ()*, align 8
; store i32 ()* @alias_fn, i32 ()** %fnptr, align 8
; %0 = load i32 ()*, i32 ()** %fnptr, align 8
; %call = call i32 %0()
; ret i32 %call
ret i32 1
}
define i32 @call_direct_ptr() #0 {
entry:
%fnptr = alloca i32 ()*, align 8
store i32 ()* @direct_fn, i32 ()** %fnptr, align 8
%0 = load i32 ()*, i32 ()** %fnptr, align 8
%call = call i32 %0()
ret i32 %call ret i32 %call
} }

test/wasm/weak-alias-overide.ll

; RUN: llc -mtriple=wasm32-unknown-unknown-wasm -filetype=obj -o %t.o %s ; RUN: llc -mtriple=wasm32-unknown-unknown-wasm -filetype=obj -o %t.o %s
; RUN: llc -mtriple=wasm32-unknown-unknown-wasm -filetype=obj %S/Inputs/weak-alias.ll -o %t2.o ; RUN: llc -mtriple=wasm32-unknown-unknown-wasm -filetype=obj %S/Inputs/weak-alias.ll -o %t2.o
; RUN: lld -flavor wasm %t.o %t2.o -o %t.wasm ; RUN: lld -flavor wasm %t.o %t2.o -o %t.wasm
; RUN: obj2yaml %t.wasm | FileCheck %s ; RUN: obj2yaml %t.wasm | FileCheck %s
; Test that the strongly defined bar is used correctly despite the existence ; Test that the strongly defined alias_fn from this file is used both here
; of the weak alias ; and in call_alias.
define i32 @bar() local_unnamed_addr #1 { define i32 @alias_fn() local_unnamed_addr #1 {
ret i32 1 ret i32 1
} }
; Function Attrs: nounwind uwtable ; Function Attrs: nounwind uwtable
define void @_start() local_unnamed_addr #1 { define void @_start() local_unnamed_addr #1 {
entry: entry:
%call = tail call i32 @bar() #2 %call = tail call i32 @alias_fn() #2
ret void ret void
} }
; 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: I32 ; CHECK-NEXT: ReturnType: I32
; CHECK-NEXT: ParamTypes: ; CHECK-NEXT: ParamTypes:
; CHECK-NEXT: - Index: 1 ; CHECK-NEXT: - Index: 1
; CHECK-NEXT: ReturnType: NORESULT ; CHECK-NEXT: ReturnType: NORESULT
; CHECK-NEXT: ParamTypes: ; CHECK-NEXT: ParamTypes:
; CHECK-NEXT: - Type: FUNCTION ; CHECK-NEXT: - Type: FUNCTION
; CHECK-NEXT: FunctionTypes: [ 0, 1, 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: 0x00000001 ; CHECK-NEXT: Initial: 0x00000002
; CHECK-NEXT: Maximum: 0x00000001 ; 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: 66560
; 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: 1 ; CHECK-NEXT: Index: 1
; CHECK-NEXT: - Name: bar ; CHECK-NEXT: - Name: alias_fn
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 0 ; CHECK-NEXT: Index: 0
; CHECK-NEXT: - Name: foo ; CHECK-NEXT: - Name: direct_fn
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 2 ; CHECK-NEXT: Index: 2
; CHECK-NEXT: - Name: call_bar ; CHECK-NEXT: - Name: call_direct
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 3 ; CHECK-NEXT: Index: 3
; CHECK-NEXT: - Name: call_alias
; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 4
; CHECK-NEXT: - Name: call_alias_ptr
; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 5
; CHECK-NEXT: - Name: call_direct_ptr
; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 6
; CHECK-NEXT: - Type: ELEM
; CHECK-NEXT: Segments:
; CHECK-NEXT: - Offset:
; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 1
; CHECK-NEXT: Functions: [ 0 ]
; 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: 1080808080000B ; CHECK-NEXT: Body: 1080808080000B
; CHECK-NEXT: - Locals:
; CHECK-NEXT: Body: 1080808080000B
; CHECK-NEXT: - Locals:
; CHECK-NEXT: Body: 41010B
; CHECK-NEXT: - Locals:
; CHECK-NEXT: - Type: I32
; CHECK-NEXT: Count: 2
; CHECK-NEXT: Body: 23808080800041106B220024808080800020004181808080003602081080808080002101200041106A24808080800020010B
; 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: bar ; CHECK-NEXT: Name: alias_fn
; CHECK-NEXT: - Index: 1 ; CHECK-NEXT: - Index: 1
; CHECK-NEXT: Name: _start ; CHECK-NEXT: Name: _start
; CHECK-NEXT: - Index: 2 ; CHECK-NEXT: - Index: 2
; CHECK-NEXT: Name: foo ; CHECK-NEXT: Name: direct_fn
; CHECK-NEXT: - Index: 3 ; CHECK-NEXT: - Index: 3
; CHECK-NEXT: Name: call_bar ; CHECK-NEXT: Name: call_direct
; CHECK-NEXT: - Index: 4
; CHECK-NEXT: Name: call_alias
; CHECK-NEXT: - Index: 5
; CHECK-NEXT: Name: call_alias_ptr
; CHECK-NEXT: - Index: 6
; CHECK-NEXT: Name: call_direct_ptr
; CHECK-NEXT: ... ; CHECK-NEXT: ...

test/wasm/weak-alias.ll

; RUN: llc -mtriple=wasm32-unknown-unknown-wasm -filetype=obj -o %t.o %s ; RUN: llc -mtriple=wasm32-unknown-unknown-wasm -filetype=obj -o %t.o %s
; RUN: llc -mtriple=wasm32-unknown-unknown-wasm -filetype=obj %S/Inputs/weak-alias.ll -o %t2.o ; RUN: llc -mtriple=wasm32-unknown-unknown-wasm -filetype=obj %S/Inputs/weak-alias.ll -o %t2.o
; RUN: lld -flavor wasm %t.o %t2.o -o %t.wasm ; RUN: lld -flavor wasm %t.o %t2.o -o %t.wasm
; RUN: obj2yaml %t.wasm | FileCheck %s ; RUN: obj2yaml %t.wasm | FileCheck %s
; Test that weak aliases (bar is a weak alias of foo) are linked correctly ; Test that weak aliases (alias_fn is a weak alias of direct_fn) are linked correctly
declare i32 @bar() local_unnamed_addr #1 declare i32 @alias_fn() local_unnamed_addr #1
; Function Attrs: nounwind uwtable ; Function Attrs: nounwind uwtable
define i32 @_start() local_unnamed_addr #1 { define i32 @_start() local_unnamed_addr #1 {
entry: entry:
%call = tail call i32 @bar() #2 %call = tail call i32 @alias_fn() #2
ret i32 %call ret i32 %call
} }
; 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: I32 ; CHECK-NEXT: ReturnType: I32
; CHECK-NEXT: ParamTypes: ; CHECK-NEXT: ParamTypes:
; CHECK-NEXT: - Type: FUNCTION ; CHECK-NEXT: - Type: FUNCTION
; CHECK-NEXT: FunctionTypes: [ 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: 0x00000001 ; CHECK-NEXT: Initial: 0x00000002
; CHECK-NEXT: Maximum: 0x00000001 ; 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: 66560
; 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
; CHECK-NEXT: - Name: bar ; CHECK-NEXT: - Name: alias_fn
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Index: 1
; CHECK-NEXT: - Name: foo ; CHECK-NEXT: - Name: direct_fn
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Index: 1
; CHECK-NEXT: - Name: call_bar ; CHECK-NEXT: - Name: call_direct
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 2 ; CHECK-NEXT: Index: 2
; CHECK-NEXT: - Name: call_alias
; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 3
; CHECK-NEXT: - Name: call_alias_ptr
; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 4
; CHECK-NEXT: - Name: call_direct_ptr
; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 5
; CHECK-NEXT: - Type: ELEM
; CHECK-NEXT: Segments:
; CHECK-NEXT: - Offset:
; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 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: 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: Body: 1081808080000B
; CHECK-NEXT: - Locals:
; CHECK-NEXT: Body: 41010B
; CHECK-NEXT: - Locals:
; CHECK-NEXT: - Type: I32
; CHECK-NEXT: Count: 2
; CHECK-NEXT: Body: 23808080800041106B220024808080800020004181808080003602081081808080002101200041106A24808080800020010B
; 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
; CHECK-NEXT: - Index: 1 ; CHECK-NEXT: - Index: 1
; CHECK-NEXT: Name: foo ; CHECK-NEXT: Name: direct_fn
; CHECK-NEXT: - Index: 2 ; CHECK-NEXT: - Index: 2
; CHECK-NEXT: Name: call_bar ; CHECK-NEXT: Name: call_direct
; CHECK-NEXT: - Index: 3
; CHECK-NEXT: Name: call_alias
; CHECK-NEXT: - Index: 4
; CHECK-NEXT: Name: call_alias_ptr
; CHECK-NEXT: - Index: 5
; CHECK-NEXT: Name: call_direct_ptr
; CHECK-NEXT: ... ; CHECK-NEXT: ...