WebAssembly: update syntax
Summary:
Follow the same syntax as for the spec repo. Both have evolved slightly
independently and need to converge again.
This, along with wasmate changes, allows me to do the following:
echo "int add(int a, int b) { return a + b; }" > add.c
./out/bin/clang -O2 -S --target=wasm32-unknown-unknown add.c -o add.wack
./experimental/prototype-wasmate/wasmate.py add.wack > add.wast
./sexpr-wasm-prototype/out/sexpr-wasm add.wast -o add.wasm
./sexpr-wasm-prototype/third_party/v8-native-prototype/v8/v8/out/Release/d8 -e "print(WASM.instantiateModule(readbuffer('add.wasm'), {print:print}).add(42, 1337));"
As you'd expect, the d8 shell prints out the right value.
Reviewers: sunfish
Subscribers: jfb, llvm-commits, dschuff
Differential Revision: http://reviews.llvm.org/D13712
llvm-svn: 250480
diff --git a/llvm/test/CodeGen/WebAssembly/call.ll b/llvm/test/CodeGen/WebAssembly/call.ll
index 0d5ebb9..8cd5371 100644
--- a/llvm/test/CodeGen/WebAssembly/call.ll
+++ b/llvm/test/CodeGen/WebAssembly/call.ll
@@ -15,9 +15,10 @@
; CHECK-LABEL: call_i32_nullary:
; CHECK-NEXT: .result i32
+; CHECK-NEXT: .local i32
; CHECK-NEXT: call $i32_nullary
-; CHECK-NEXT: set_local @0, pop
-; CHECK-NEXT: return @0
+; CHECK-NEXT: set_local 0, pop
+; CHECK-NEXT: return (get_local 0)
define i32 @call_i32_nullary() {
%r = call i32 @i32_nullary()
ret i32 %r
@@ -25,9 +26,10 @@
; CHECK-LABEL: call_i64_nullary:
; CHECK-NEXT: .result i64
+; CHECK-NEXT: .local i64
; CHECK-NEXT: call $i64_nullary
-; CHECK-NEXT: set_local @0, pop
-; CHECK-NEXT: return @0
+; CHECK-NEXT: set_local 0, pop
+; CHECK-NEXT: return (get_local 0)
define i64 @call_i64_nullary() {
%r = call i64 @i64_nullary()
ret i64 %r
@@ -35,9 +37,10 @@
; CHECK-LABEL: call_float_nullary:
; CHECK-NEXT: .result f32
+; CHECK-NEXT: .local f32
; CHECK-NEXT: call $float_nullary
-; CHECK-NEXT: set_local @0, pop
-; CHECK-NEXT: return @0
+; CHECK-NEXT: set_local 0, pop
+; CHECK-NEXT: return (get_local 0)
define float @call_float_nullary() {
%r = call float @float_nullary()
ret float %r
@@ -45,9 +48,10 @@
; CHECK-LABEL: call_double_nullary:
; CHECK-NEXT: .result f64
+; CHECK-NEXT: .local f64
; CHECK-NEXT: call $double_nullary
-; CHECK-NEXT: set_local @0, pop
-; CHECK-NEXT: return @0
+; CHECK-NEXT: set_local 0, pop
+; CHECK-NEXT: return (get_local 0)
define double @call_double_nullary() {
%r = call double @double_nullary()
ret double %r
@@ -64,11 +68,12 @@
; CHECK-LABEL: call_i32_unary:
; CHECK-NEXT: .param i32
; CHECK-NEXT: .result i32
-; CHECK-NEXT: @0
-; CHECK-NEXT: set_local @1, pop
-; CHECK-NEXT: call $i32_unary, @1
-; CHECK-NEXT: set_local @2, pop
-; CHECK-NEXT: return @2
+; CHECK-NEXT: .local i32, i32
+; CHECK-NEXT: get_local 0
+; CHECK-NEXT: set_local 1, pop
+; CHECK-NEXT: call $i32_unary, (get_local 1)
+; CHECK-NEXT: set_local 2, pop
+; CHECK-NEXT: return (get_local 2)
define i32 @call_i32_unary(i32 %a) {
%r = call i32 @i32_unary(i32 %a)
ret i32 %r
@@ -78,13 +83,14 @@
; CHECK-NEXT: .param i32
; CHECK-NEXT: .param i32
; CHECK-NEXT: .result i32
-; CHECK-NEXT: @1
-; CHECK-NEXT: set_local @2, pop
-; CHECK-NEXT: @0
-; CHECK-NEXT: set_local @3, pop
-; CHECK-NEXT: call $i32_binary, @3, @2
-; CHECK-NEXT: set_local @4, pop
-; CHECK-NEXT: return @4
+; CHECK-NEXT: .local i32, i32, i32
+; CHECK-NEXT: get_local 1
+; CHECK-NEXT: set_local 2, pop
+; CHECK-NEXT: get_local 0
+; CHECK-NEXT: set_local 3, pop
+; CHECK-NEXT: call $i32_binary, (get_local 3), (get_local 2)
+; CHECK-NEXT: set_local 4, pop
+; CHECK-NEXT: return (get_local 4)
define i32 @call_i32_binary(i32 %a, i32 %b) {
%r = call i32 @i32_binary(i32 %a, i32 %b)
ret i32 %r
@@ -92,9 +98,10 @@
; CHECK-LABEL: call_indirect_void:
; CHECK-NEXT: .param i32
-; CHECK-NEXT: @0
-; CHECK-NEXT: set_local @1, pop
-; CHECK-NEXT: call_indirect @1
+; CHECK-NEXT: .local i32
+; CHECK-NEXT: get_local 0
+; CHECK-NEXT: set_local 1, pop
+; CHECK-NEXT: call_indirect (get_local 1)
; CHECK-NEXT: return
define void @call_indirect_void(void ()* %callee) {
call void %callee()
@@ -104,11 +111,12 @@
; CHECK-LABEL: call_indirect_i32:
; CHECK-NEXT: .param i32
; CHECK-NEXT: .result i32
-; CHECK-NEXT: @0
-; CHECK-NEXT: set_local @1, pop
-; CHECK-NEXT: call_indirect @1
-; CHECK-NEXT: set_local @2, pop
-; CHECK-NEXT: return @2
+; CHECK-NEXT: .local i32, i32
+; CHECK-NEXT: get_local 0
+; CHECK-NEXT: set_local 1, pop
+; CHECK-NEXT: call_indirect (get_local 1)
+; CHECK-NEXT: set_local 2, pop
+; CHECK-NEXT: return (get_local 2)
define i32 @call_indirect_i32(i32 ()* %callee) {
%t = call i32 %callee()
ret i32 %t