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/comparisons_f32.ll b/llvm/test/CodeGen/WebAssembly/comparisons_f32.ll
index 3994f24..cd3633d 100644
--- a/llvm/test/CodeGen/WebAssembly/comparisons_f32.ll
+++ b/llvm/test/CodeGen/WebAssembly/comparisons_f32.ll
@@ -10,17 +10,18 @@
; CHECK-NEXT: .param f32{{$}}
; CHECK-NEXT: .param f32{{$}}
; CHECK-NEXT: .result i32{{$}}
-; CHECK-NEXT: @0{{$}}
-; CHECK-NEXT: set_local @2, pop{{$}}
-; CHECK-NEXT: @1{{$}}
-; CHECK-NEXT: set_local @3, pop{{$}}
-; CHECK-NEXT: eq @3, @3{{$}}
-; CHECK-NEXT: set_local @4, pop{{$}}
-; CHECK-NEXT: eq @2, @2{{$}}
-; CHECK-NEXT: set_local @5, pop{{$}}
-; CHECK-NEXT: and @5, @4{{$}}
-; CHECK-NEXT: set_local @6, pop{{$}}
-; CHECK-NEXT: return @6{{$}}
+; CHECK-NEXT: .local f32, f32, i32, i32, i32{{$}}
+; CHECK-NEXT: get_local 0{{$}}
+; CHECK-NEXT: set_local 2, pop{{$}}
+; CHECK-NEXT: get_local 1{{$}}
+; CHECK-NEXT: set_local 3, pop{{$}}
+; CHECK-NEXT: eq (get_local 3), (get_local 3){{$}}
+; CHECK-NEXT: set_local 4, pop{{$}}
+; CHECK-NEXT: eq (get_local 2), (get_local 2){{$}}
+; CHECK-NEXT: set_local 5, pop{{$}}
+; CHECK-NEXT: and (get_local 5), (get_local 4){{$}}
+; CHECK-NEXT: set_local 6, pop{{$}}
+; CHECK-NEXT: return (get_local 6){{$}}
define i32 @ord_f32(float %x, float %y) {
%a = fcmp ord float %x, %y
%b = zext i1 %a to i32
@@ -31,17 +32,18 @@
; CHECK-NEXT: .param f32{{$}}
; CHECK-NEXT: .param f32{{$}}
; CHECK-NEXT: .result i32{{$}}
-; CHECK-NEXT: @0{{$}}
-; CHECK-NEXT: set_local @2, pop{{$}}
-; CHECK-NEXT: @1{{$}}
-; CHECK-NEXT: set_local @3, pop{{$}}
-; CHECK-NEXT: ne @3, @3{{$}}
-; CHECK-NEXT: set_local @4, pop{{$}}
-; CHECK-NEXT: ne @2, @2{{$}}
-; CHECK-NEXT: set_local @5, pop{{$}}
-; CHECK-NEXT: ior @5, @4{{$}}
-; CHECK-NEXT: set_local @6, pop{{$}}
-; CHECK-NEXT: return @6{{$}}
+; CHECK-NEXT: .local f32, f32, i32, i32, i32{{$}}
+; CHECK-NEXT: get_local 0{{$}}
+; CHECK-NEXT: set_local 2, pop{{$}}
+; CHECK-NEXT: get_local 1{{$}}
+; CHECK-NEXT: set_local 3, pop{{$}}
+; CHECK-NEXT: ne (get_local 3), (get_local 3){{$}}
+; CHECK-NEXT: set_local 4, pop{{$}}
+; CHECK-NEXT: ne (get_local 2), (get_local 2){{$}}
+; CHECK-NEXT: set_local 5, pop{{$}}
+; CHECK-NEXT: ior (get_local 5), (get_local 4){{$}}
+; CHECK-NEXT: set_local 6, pop{{$}}
+; CHECK-NEXT: return (get_local 6){{$}}
define i32 @uno_f32(float %x, float %y) {
%a = fcmp uno float %x, %y
%b = zext i1 %a to i32
@@ -52,13 +54,14 @@
; CHECK-NEXT: .param f32{{$}}
; CHECK-NEXT: .param f32{{$}}
; CHECK-NEXT: .result i32{{$}}
-; CHECK-NEXT: @1{{$}}
-; CHECK-NEXT: set_local @2, pop{{$}}
-; CHECK-NEXT: @0{{$}}
-; CHECK-NEXT: set_local @3, pop{{$}}
-; CHECK-NEXT: eq @3, @2{{$}}
-; CHECK-NEXT: set_local @4, pop{{$}}
-; CHECK-NEXT: return @4{{$}}
+; CHECK-NEXT: .local f32, f32, 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: eq (get_local 3), (get_local 2){{$}}
+; CHECK-NEXT: set_local 4, pop{{$}}
+; CHECK-NEXT: return (get_local 4){{$}}
define i32 @oeq_f32(float %x, float %y) {
%a = fcmp oeq float %x, %y
%b = zext i1 %a to i32
@@ -66,8 +69,8 @@
}
; CHECK-LABEL: une_f32:
-; CHECK: ne @3, @2{{$}}
-; CHECK-NEXT: set_local @4, pop{{$}}
+; CHECK: ne (get_local 3), (get_local 2){{$}}
+; CHECK-NEXT: set_local 4, pop{{$}}
define i32 @une_f32(float %x, float %y) {
%a = fcmp une float %x, %y
%b = zext i1 %a to i32
@@ -75,8 +78,8 @@
}
; CHECK-LABEL: olt_f32:
-; CHECK: lt @3, @2{{$}}
-; CHECK-NEXT: set_local @4, pop{{$}}
+; CHECK: lt (get_local 3), (get_local 2){{$}}
+; CHECK-NEXT: set_local 4, pop{{$}}
define i32 @olt_f32(float %x, float %y) {
%a = fcmp olt float %x, %y
%b = zext i1 %a to i32
@@ -84,8 +87,8 @@
}
; CHECK-LABEL: ole_f32:
-; CHECK: le @3, @2{{$}}
-; CHECK-NEXT: set_local @4, pop{{$}}
+; CHECK: le (get_local 3), (get_local 2){{$}}
+; CHECK-NEXT: set_local 4, pop{{$}}
define i32 @ole_f32(float %x, float %y) {
%a = fcmp ole float %x, %y
%b = zext i1 %a to i32
@@ -93,8 +96,8 @@
}
; CHECK-LABEL: ogt_f32:
-; CHECK: gt @3, @2{{$}}
-; CHECK-NEXT: set_local @4, pop{{$}}
+; CHECK: gt (get_local 3), (get_local 2){{$}}
+; CHECK-NEXT: set_local 4, pop{{$}}
define i32 @ogt_f32(float %x, float %y) {
%a = fcmp ogt float %x, %y
%b = zext i1 %a to i32
@@ -102,8 +105,8 @@
}
; CHECK-LABEL: oge_f32:
-; CHECK: ge @3, @2{{$}}
-; CHECK-NEXT: set_local @4, pop{{$}}
+; CHECK: ge (get_local 3), (get_local 2){{$}}
+; CHECK-NEXT: set_local 4, pop{{$}}
define i32 @oge_f32(float %x, float %y) {
%a = fcmp oge float %x, %y
%b = zext i1 %a to i32
@@ -116,21 +119,22 @@
; CHECK-NEXT: .param f32{{$}}
; CHECK-NEXT: .param f32{{$}}
; CHECK-NEXT: .result i32{{$}}
-; CHECK-NEXT: @1{{$}}
-; CHECK-NEXT: set_local @2, pop{{$}}
-; CHECK-NEXT: @0{{$}}
-; CHECK-NEXT: set_local @3, pop{{$}}
-; CHECK-NEXT: eq @3, @2{{$}}
-; CHECK-NEXT: set_local @4, pop{{$}}
-; CHECK-NEXT: ne @2, @2{{$}}
-; CHECK-NEXT: set_local @5, pop{{$}}
-; CHECK-NEXT: ne @3, @3{{$}}
-; CHECK-NEXT: set_local @6, pop{{$}}
-; CHECK-NEXT: ior @6, @5{{$}}
-; CHECK-NEXT: set_local @7, pop{{$}}
-; CHECK-NEXT: ior @4, @7{{$}}
-; CHECK-NEXT: set_local @8, pop{{$}}
-; CHECK-NEXT: return @8{{$}}
+; CHECK-NEXT: .local f32, f32, i32, i32, 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: eq (get_local 3), (get_local 2){{$}}
+; CHECK-NEXT: set_local 4, pop{{$}}
+; CHECK-NEXT: ne (get_local 2), (get_local 2){{$}}
+; CHECK-NEXT: set_local 5, pop{{$}}
+; CHECK-NEXT: ne (get_local 3), (get_local 3){{$}}
+; CHECK-NEXT: set_local 6, pop{{$}}
+; CHECK-NEXT: ior (get_local 6), (get_local 5){{$}}
+; CHECK-NEXT: set_local 7, pop{{$}}
+; CHECK-NEXT: ior (get_local 4), (get_local 7){{$}}
+; CHECK-NEXT: set_local 8, pop{{$}}
+; CHECK-NEXT: return (get_local 8){{$}}
define i32 @ueq_f32(float %x, float %y) {
%a = fcmp ueq float %x, %y
%b = zext i1 %a to i32
@@ -138,8 +142,8 @@
}
; CHECK-LABEL: one_f32:
-; CHECK: ne @3, @2{{$}}
-; CHECK-NEXT: set_local @4, pop{{$}}
+; CHECK: ne (get_local 3), (get_local 2){{$}}
+; CHECK-NEXT: set_local 4, pop{{$}}
define i32 @one_f32(float %x, float %y) {
%a = fcmp one float %x, %y
%b = zext i1 %a to i32
@@ -147,8 +151,8 @@
}
; CHECK-LABEL: ult_f32:
-; CHECK: lt @3, @2{{$}}
-; CHECK-NEXT: set_local @4, pop{{$}}
+; CHECK: lt (get_local 3), (get_local 2){{$}}
+; CHECK-NEXT: set_local 4, pop{{$}}
define i32 @ult_f32(float %x, float %y) {
%a = fcmp ult float %x, %y
%b = zext i1 %a to i32
@@ -156,8 +160,8 @@
}
; CHECK-LABEL: ule_f32:
-; CHECK: le @3, @2{{$}}
-; CHECK-NEXT: set_local @4, pop{{$}}
+; CHECK: le (get_local 3), (get_local 2){{$}}
+; CHECK-NEXT: set_local 4, pop{{$}}
define i32 @ule_f32(float %x, float %y) {
%a = fcmp ule float %x, %y
%b = zext i1 %a to i32
@@ -165,8 +169,8 @@
}
; CHECK-LABEL: ugt_f32:
-; CHECK: gt @3, @2{{$}}
-; CHECK-NEXT: set_local @4, pop{{$}}
+; CHECK: gt (get_local 3), (get_local 2){{$}}
+; CHECK-NEXT: set_local 4, pop{{$}}
define i32 @ugt_f32(float %x, float %y) {
%a = fcmp ugt float %x, %y
%b = zext i1 %a to i32
@@ -174,8 +178,8 @@
}
; CHECK-LABEL: uge_f32:
-; CHECK: ge @3, @2{{$}}
-; CHECK-NEXT: set_local @4, pop{{$}}
+; CHECK: ge (get_local 3), (get_local 2){{$}}
+; CHECK-NEXT: set_local 4, pop{{$}}
define i32 @uge_f32(float %x, float %y) {
%a = fcmp uge float %x, %y
%b = zext i1 %a to i32