[lld] r323838 - [WebAssembly] Reduce redundancy in tests
Sam Clegg via llvm-commits
llvm-commits at lists.llvm.org
Tue Jan 30 16:13:26 PST 2018
Author: sbc
Date: Tue Jan 30 16:13:26 2018
New Revision: 323838
URL: http://llvm.org/viewvc/llvm-project?rev=323838&view=rev
Log:
[WebAssembly] Reduce redundancy in tests
Add a simple start entry point input file and have the tests
reference that rather than duplicating these.
This allows more tests to be pure `.test` files rather than
`.ll`.
Differential Revision: https://reviews.llvm.org/D42662
Added:
lld/trunk/test/wasm/Inputs/start.ll
lld/trunk/test/wasm/invalid-stack-size.test
lld/trunk/test/wasm/load-undefined.test
- copied, changed from r323820, lld/trunk/test/wasm/load-undefined.ll
Removed:
lld/trunk/test/wasm/invalid-stack-size.ll
lld/trunk/test/wasm/load-undefined.ll
Modified:
lld/trunk/test/wasm/import-memory.test
lld/trunk/test/wasm/strip-debug.test
Added: lld/trunk/test/wasm/Inputs/start.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/wasm/Inputs/start.ll?rev=323838&view=auto
==============================================================================
--- lld/trunk/test/wasm/Inputs/start.ll (added)
+++ lld/trunk/test/wasm/Inputs/start.ll Tue Jan 30 16:13:26 2018
@@ -0,0 +1,6 @@
+target triple = "wasm32-unknown-unknown-wasm"
+
+define void @_start() local_unnamed_addr {
+entry:
+ ret void
+}
Modified: lld/trunk/test/wasm/import-memory.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/wasm/import-memory.test?rev=323838&r1=323837&r2=323838&view=diff
==============================================================================
--- lld/trunk/test/wasm/import-memory.test (original)
+++ lld/trunk/test/wasm/import-memory.test Tue Jan 30 16:13:26 2018
@@ -1,5 +1,5 @@
-# RUN: llc -filetype=obj %p/Inputs/ret32.ll -o %t.ret32.o
-# RUN: lld -flavor wasm -entry ret32 --import-memory -o %t.wasm %t.ret32.o
+# RUN: llc -filetype=obj %p/Inputs/start.ll -o %t.start.o
+# RUN: lld -flavor wasm --import-memory -o %t.wasm %t.start.o
# RUN: obj2yaml %t.wasm | FileCheck %s
# Verify the --import-memory flag creates a memory import
Removed: lld/trunk/test/wasm/invalid-stack-size.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/wasm/invalid-stack-size.ll?rev=323837&view=auto
==============================================================================
--- lld/trunk/test/wasm/invalid-stack-size.ll (original)
+++ lld/trunk/test/wasm/invalid-stack-size.ll (removed)
@@ -1,11 +0,0 @@
-; RUN: llc -filetype=obj %s -o %t.o
-; RUN: not lld -flavor wasm -o %t.wasm -z stack-size=1 %t.o 2>&1 | FileCheck %s
-
-target triple = "wasm32-unknown-unknown-wasm"
-
-define i32 @_start() local_unnamed_addr #1 {
-entry:
- ret i32 0
-}
-
-; CHECK: error: stack size must be 16-byte aligned
Added: lld/trunk/test/wasm/invalid-stack-size.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/wasm/invalid-stack-size.test?rev=323838&view=auto
==============================================================================
--- lld/trunk/test/wasm/invalid-stack-size.test (added)
+++ lld/trunk/test/wasm/invalid-stack-size.test Tue Jan 30 16:13:26 2018
@@ -0,0 +1,4 @@
+; RUN: llc -filetype=obj %p/Inputs/start.ll -o %t.o
+; RUN: not lld -flavor wasm -o %t.wasm -z stack-size=1 %t.o 2>&1 | FileCheck %s
+
+; CHECK: error: stack size must be 16-byte aligned
Removed: lld/trunk/test/wasm/load-undefined.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/wasm/load-undefined.ll?rev=323837&view=auto
==============================================================================
--- lld/trunk/test/wasm/load-undefined.ll (original)
+++ lld/trunk/test/wasm/load-undefined.ll (removed)
@@ -1,43 +0,0 @@
-; Verify that the -u / --undefined option is able to pull in symbols from
-; an archive, and doesn't error when uses to pull in a symbol already loaded.
-;
-; RUN: llc -filetype=obj %S/Inputs/ret64.ll -o %t.o
-; RUN: llc -filetype=obj %S/Inputs/ret32.ll -o %t2.o
-; RUN: llc -filetype=obj %s -o %t3.o
-; RUN: llvm-ar rcs %t2.a %t2.o
-; RUN: lld -flavor wasm %t3.o %t2.a %t.o -o %t.wasm -u ret32 --undefined ret64
-; RUN: obj2yaml %t.wasm | FileCheck %s
-
-target triple = "wasm32-unknown-unknown-wasm"
-
-define i32 @_start() local_unnamed_addr {
-entry:
- ret i32 1
-}
-
-; CHECK: - Type: EXPORT
-; CHECK-NEXT: Exports:
-; CHECK-NEXT: - Name: memory
-; CHECK-NEXT: Kind: MEMORY
-; CHECK-NEXT: Index: 0
-; CHECK-NEXT: - Name: _start
-; CHECK-NEXT: Kind: FUNCTION
-; CHECK-NEXT: Index: 0
-; CHECK-NEXT: - Name: ret32
-; CHECK-NEXT: Kind: FUNCTION
-; CHECK-NEXT: Index: 1
-; CHECK-NEXT: - Name: ret64
-; CHECK-NEXT: Kind: FUNCTION
-; CHECK-NEXT: Index: 2
-; CHECK-NEXT: - Name: __heap_base
-; CHECK-NEXT: Kind: GLOBAL
-; CHECK-NEXT: Index: 1
-; CHECK-NEXT: - Type:
-
-
-; Verify that referencing a symbol that doesn't exist won't work
-; RUN: not lld -flavor wasm %t3.o -o %t.wasm -u symboldoesnotexist 2>&1 | FileCheck -check-prefix=CHECK-UNDEFINED1 %s
-; CHECK-UNDEFINED1: error: undefined symbol: symboldoesnotexist
-
-; RUN: not lld -flavor wasm %t3.o -o %t.wasm --undefined symboldoesnotexist --allow-undefined 2>&1 | FileCheck -check-prefix=CHECK-UNDEFINED2 %s
-; CHECK-UNDEFINED2: function forced with --undefined not found: symboldoesnotexist
Copied: lld/trunk/test/wasm/load-undefined.test (from r323820, lld/trunk/test/wasm/load-undefined.ll)
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/wasm/load-undefined.test?p2=lld/trunk/test/wasm/load-undefined.test&p1=lld/trunk/test/wasm/load-undefined.ll&r1=323820&r2=323838&rev=323838&view=diff
==============================================================================
--- lld/trunk/test/wasm/load-undefined.ll (original)
+++ lld/trunk/test/wasm/load-undefined.test Tue Jan 30 16:13:26 2018
@@ -3,18 +3,11 @@
;
; RUN: llc -filetype=obj %S/Inputs/ret64.ll -o %t.o
; RUN: llc -filetype=obj %S/Inputs/ret32.ll -o %t2.o
-; RUN: llc -filetype=obj %s -o %t3.o
+; RUN: llc -filetype=obj %S/Inputs/start.ll -o %t.start.o
; RUN: llvm-ar rcs %t2.a %t2.o
-; RUN: lld -flavor wasm %t3.o %t2.a %t.o -o %t.wasm -u ret32 --undefined ret64
+; RUN: lld -flavor wasm %t.start.o %t2.a %t.o -o %t.wasm -u ret32 --undefined ret64
; RUN: obj2yaml %t.wasm | FileCheck %s
-target triple = "wasm32-unknown-unknown-wasm"
-
-define i32 @_start() local_unnamed_addr {
-entry:
- ret i32 1
-}
-
; CHECK: - Type: EXPORT
; CHECK-NEXT: Exports:
; CHECK-NEXT: - Name: memory
@@ -36,8 +29,8 @@ entry:
; Verify that referencing a symbol that doesn't exist won't work
-; RUN: not lld -flavor wasm %t3.o -o %t.wasm -u symboldoesnotexist 2>&1 | FileCheck -check-prefix=CHECK-UNDEFINED1 %s
+; RUN: not lld -flavor wasm %t.start.o -o %t.wasm -u symboldoesnotexist 2>&1 | FileCheck -check-prefix=CHECK-UNDEFINED1 %s
; CHECK-UNDEFINED1: error: undefined symbol: symboldoesnotexist
-; RUN: not lld -flavor wasm %t3.o -o %t.wasm --undefined symboldoesnotexist --allow-undefined 2>&1 | FileCheck -check-prefix=CHECK-UNDEFINED2 %s
+; RUN: not lld -flavor wasm %t.start.o -o %t.wasm --undefined symboldoesnotexist --allow-undefined 2>&1 | FileCheck -check-prefix=CHECK-UNDEFINED2 %s
; CHECK-UNDEFINED2: function forced with --undefined not found: symboldoesnotexist
Modified: lld/trunk/test/wasm/strip-debug.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/wasm/strip-debug.test?rev=323838&r1=323837&r2=323838&view=diff
==============================================================================
--- lld/trunk/test/wasm/strip-debug.test (original)
+++ lld/trunk/test/wasm/strip-debug.test Tue Jan 30 16:13:26 2018
@@ -1,5 +1,5 @@
-RUN: llc -filetype=obj %p/Inputs/ret32.ll -o %t.ret32.o
-RUN: lld -flavor wasm --strip-debug --entry=ret32 -o %t.wasm %t.ret32.o
+RUN: llc -filetype=obj %p/Inputs/start.ll -o %t.start.o
+RUN: lld -flavor wasm --strip-debug -o %t.wasm %t.start.o
RUN: obj2yaml %t.wasm | FileCheck %s
# Check that there is no name section
More information about the llvm-commits
mailing list