[WebAssembly] Rename several functions and types according to the new spec.

llvm-svn: 248644
diff --git a/llvm/test/CodeGen/WebAssembly/fp32.ll b/llvm/test/CodeGen/WebAssembly/fp32.ll
index 754ff95..35f6c42 100644
--- a/llvm/test/CodeGen/WebAssembly/fp32.ll
+++ b/llvm/test/CodeGen/WebAssembly/fp32.ll
@@ -95,16 +95,16 @@
   ret float %a
 }
 
-; CHECK-LABEL: (func $nearestint32
-; CHECK: (setlocal @1 (nearestint @0))
-define float @nearestint32(float %x) {
+; CHECK-LABEL: (func $nearest32
+; CHECK: (setlocal @1 (nearest @0))
+define float @nearest32(float %x) {
   %a = call float @llvm.nearbyint.f32(float %x)
   ret float %a
 }
 
-; CHECK-LABEL: (func $nearestint32_via_rint
-; CHECK: (setlocal @1 (nearestint @0))
-define float @nearestint32_via_rint(float %x) {
+; CHECK-LABEL: (func $nearest32_via_rint
+; CHECK: (setlocal @1 (nearest @0))
+define float @nearest32_via_rint(float %x) {
   %a = call float @llvm.rint.f32(float %x)
   ret float %a
 }
diff --git a/llvm/test/CodeGen/WebAssembly/fp64.ll b/llvm/test/CodeGen/WebAssembly/fp64.ll
index af4d945..cbe1ed4 100644
--- a/llvm/test/CodeGen/WebAssembly/fp64.ll
+++ b/llvm/test/CodeGen/WebAssembly/fp64.ll
@@ -95,16 +95,16 @@
   ret double %a
 }
 
-; CHECK-LABEL: (func $nearestint64
-; CHECK: (setlocal @1 (nearestint @0))
-define double @nearestint64(double %x) {
+; CHECK-LABEL: (func $nearest64
+; CHECK: (setlocal @1 (nearest @0))
+define double @nearest64(double %x) {
   %a = call double @llvm.nearbyint.f64(double %x)
   ret double %a
 }
 
-; CHECK-LABEL: (func $nearestint64_via_rint
-; CHECK: (setlocal @1 (nearestint @0))
-define double @nearestint64_via_rint(double %x) {
+; CHECK-LABEL: (func $nearest64_via_rint
+; CHECK: (setlocal @1 (nearest @0))
+define double @nearest64_via_rint(double %x) {
   %a = call double @llvm.rint.f64(double %x)
   ret double %a
 }
diff --git a/llvm/test/CodeGen/WebAssembly/load-ext.ll b/llvm/test/CodeGen/WebAssembly/load-ext.ll
index 6700db6..0d244a4 100644
--- a/llvm/test/CodeGen/WebAssembly/load-ext.ll
+++ b/llvm/test/CodeGen/WebAssembly/load-ext.ll
@@ -6,7 +6,7 @@
 target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: (func $sext_i8_i32
-; CHECK: (setlocal @1 (load_sx_i8_i32 @0))
+; CHECK: (setlocal @1 (load_s_i8_i32 @0))
 define i32 @sext_i8_i32(i8 *%p) {
   %v = load i8, i8* %p
   %e = sext i8 %v to i32
@@ -14,7 +14,7 @@
 }
 
 ; CHECK-LABEL: (func $zext_i8_i32
-; CHECK: (setlocal @1 (load_zx_i8_i32 @0))
+; CHECK: (setlocal @1 (load_u_i8_i32 @0))
 define i32 @zext_i8_i32(i8 *%p) {
   %v = load i8, i8* %p
   %e = zext i8 %v to i32
@@ -22,7 +22,7 @@
 }
 
 ; CHECK-LABEL: (func $sext_i16_i32
-; CHECK: (setlocal @1 (load_sx_i16_i32 @0))
+; CHECK: (setlocal @1 (load_s_i16_i32 @0))
 define i32 @sext_i16_i32(i16 *%p) {
   %v = load i16, i16* %p
   %e = sext i16 %v to i32
@@ -30,7 +30,7 @@
 }
 
 ; CHECK-LABEL: (func $zext_i16_i32
-; CHECK: (setlocal @1 (load_zx_i16_i32 @0))
+; CHECK: (setlocal @1 (load_u_i16_i32 @0))
 define i32 @zext_i16_i32(i16 *%p) {
   %v = load i16, i16* %p
   %e = zext i16 %v to i32
@@ -38,7 +38,7 @@
 }
 
 ; CHECK-LABEL: (func $sext_i8_i64
-; CHECK: (setlocal @1 (load_sx_i8_i64 @0))
+; CHECK: (setlocal @1 (load_s_i8_i64 @0))
 define i64 @sext_i8_i64(i8 *%p) {
   %v = load i8, i8* %p
   %e = sext i8 %v to i64
@@ -46,7 +46,7 @@
 }
 
 ; CHECK-LABEL: (func $zext_i8_i64
-; CHECK: (setlocal @1 (load_zx_i8_i64 @0))
+; CHECK: (setlocal @1 (load_u_i8_i64 @0))
 define i64 @zext_i8_i64(i8 *%p) {
   %v = load i8, i8* %p
   %e = zext i8 %v to i64
@@ -54,7 +54,7 @@
 }
 
 ; CHECK-LABEL: (func $sext_i16_i64
-; CHECK: (setlocal @1 (load_sx_i16_i64 @0))
+; CHECK: (setlocal @1 (load_s_i16_i64 @0))
 define i64 @sext_i16_i64(i16 *%p) {
   %v = load i16, i16* %p
   %e = sext i16 %v to i64
@@ -62,7 +62,7 @@
 }
 
 ; CHECK-LABEL: (func $zext_i16_i64
-; CHECK: (setlocal @1 (load_zx_i16_i64 @0))
+; CHECK: (setlocal @1 (load_u_i16_i64 @0))
 define i64 @zext_i16_i64(i16 *%p) {
   %v = load i16, i16* %p
   %e = zext i16 %v to i64
@@ -70,7 +70,7 @@
 }
 
 ; CHECK-LABEL: (func $sext_i32_i64
-; CHECK: (setlocal @1 (load_sx_i32_i64 @0))
+; CHECK: (setlocal @1 (load_s_i32_i64 @0))
 define i64 @sext_i32_i64(i32 *%p) {
   %v = load i32, i32* %p
   %e = sext i32 %v to i64
@@ -78,7 +78,7 @@
 }
 
 ; CHECK-LABEL: (func $zext_i32_i64
-; CHECK: (setlocal @1 (load_zx_i32_i64 @0))
+; CHECK: (setlocal @1 (load_u_i32_i64 @0))
 define i64 @zext_i32_i64(i32 *%p) {
   %v = load i32, i32* %p
   %e = zext i32 %v to i64
diff --git a/llvm/test/CodeGen/WebAssembly/load-store-i1.ll b/llvm/test/CodeGen/WebAssembly/load-store-i1.ll
index a40567e..effe2fe 100644
--- a/llvm/test/CodeGen/WebAssembly/load-store-i1.ll
+++ b/llvm/test/CodeGen/WebAssembly/load-store-i1.ll
@@ -5,43 +5,43 @@
 target datalayout = "e-p:32:32-i64:64-n32:64-S128"
 target triple = "wasm32-unknown-unknown"
 
-; CHECK-LABEL: (func $load_unsigned_i1_i32
-; CHECK:      (setlocal @1 (load_zx_i8_i32 @0))
+; CHECK-LABEL: (func $load_u_i1_i32
+; CHECK:      (setlocal @1 (load_u_i8_i32 @0))
 ; CHECK-NEXT: (return @1)
-define i32 @load_unsigned_i1_i32(i1* %p) {
+define i32 @load_u_i1_i32(i1* %p) {
   %v = load i1, i1* %p
   %e = zext i1 %v to i32
   ret i32 %e
 }
 
-; CHECK-LABEL: (func $load_signed_i1_i32
-; CHECK:      (setlocal @1 (load_zx_i8_i32 @0))
+; CHECK-LABEL: (func $load_s_i1_i32
+; CHECK:      (setlocal @1 (load_u_i8_i32 @0))
 ; CHECK-NEXT: (setlocal @2 (immediate 31))
 ; CHECK-NEXT: (setlocal @3 (shl @1 @2))
 ; CHECK-NEXT: (setlocal @4 (shr_s @3 @2))
 ; CHECK-NEXT: (return @4)
-define i32 @load_signed_i1_i32(i1* %p) {
+define i32 @load_s_i1_i32(i1* %p) {
   %v = load i1, i1* %p
   %e = sext i1 %v to i32
   ret i32 %e
 }
 
-; CHECK-LABEL: (func $load_unsigned_i1_i64
-; CHECK:      (setlocal @1 (load_zx_i8_i64 @0))
+; CHECK-LABEL: (func $load_u_i1_i64
+; CHECK:      (setlocal @1 (load_u_i8_i64 @0))
 ; CHECK-NEXT: (return @1)
-define i64 @load_unsigned_i1_i64(i1* %p) {
+define i64 @load_u_i1_i64(i1* %p) {
   %v = load i1, i1* %p
   %e = zext i1 %v to i64
   ret i64 %e
 }
 
-; CHECK-LABEL: (func $load_signed_i1_i64
-; CHECK:      (setlocal @1 (load_zx_i8_i64 @0))
+; CHECK-LABEL: (func $load_s_i1_i64
+; CHECK:      (setlocal @1 (load_u_i8_i64 @0))
 ; CHECK-NEXT: (setlocal @2 (immediate 63))
 ; CHECK-NEXT: (setlocal @3 (shl @1 @2))
 ; CHECK-NEXT: (setlocal @4 (shr_s @3 @2))
 ; CHECK-NEXT: (return @4)
-define i64 @load_signed_i1_i64(i1* %p) {
+define i64 @load_s_i1_i64(i1* %p) {
   %v = load i1, i1* %p
   %e = sext i1 %v to i64
   ret i64 %e