WebAssembly: NFC rename shr/sar

Renamed from: https://github.com/WebAssembly/design/pull/332

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@247028 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/WebAssembly/WebAssemblyInstrInteger.td b/lib/Target/WebAssembly/WebAssemblyInstrInteger.td
index 16ed7acbb9d369e4b565c87441357c6ba5f09971..16a21082bd397812edf5e89e6a5c6b4908ca0544 100644 (file)
--- a/lib/Target/WebAssembly/WebAssemblyInstrInteger.td
+++ b/lib/Target/WebAssembly/WebAssemblyInstrInteger.td
@@ -23,8 +23,8 @@ defm AND : BinaryInt<and>;
 defm IOR : BinaryInt<or>;
 defm XOR : BinaryInt<xor>;
 defm SHL : BinaryInt<shl>;
 defm IOR : BinaryInt<or>;
 defm XOR : BinaryInt<xor>;
 defm SHL : BinaryInt<shl>;

-defm SHR : BinaryInt<srl>;
-defm SAR : BinaryInt<sra>;
+defm SHR_U : BinaryInt<srl>;
+defm SHR_S : BinaryInt<sra>;

 
 defm EQ : ComparisonInt<SETEQ>;
 defm NE : ComparisonInt<SETNE>;
 
 defm EQ : ComparisonInt<SETEQ>;
 defm NE : ComparisonInt<SETNE>;

diff --git a/test/CodeGen/WebAssembly/integer32.ll b/test/CodeGen/WebAssembly/integer32.ll
index 5051d0db30e539093d3c67d9707fcbcf971f120e..78cf9642448471d9a328b27020a93ab57fde2ccf 100644 (file)
--- a/test/CodeGen/WebAssembly/integer32.ll
+++ b/test/CodeGen/WebAssembly/integer32.ll
@@ -134,7 +134,7 @@ define i32 @shl32(i32 %x, i32 %y) {
 ; CHECK-NEXT: (param i32) (param i32) (result i32)
 ; CHECK-NEXT: (setlocal @0 (argument 1))
 ; CHECK-NEXT: (setlocal @1 (argument 0))
 ; CHECK-NEXT: (param i32) (param i32) (result i32)
 ; CHECK-NEXT: (setlocal @0 (argument 1))
 ; CHECK-NEXT: (setlocal @1 (argument 0))

-; CHECK-NEXT: (setlocal @2 (shr @1 @0))
+; CHECK-NEXT: (setlocal @2 (shr_u @1 @0))

 ; CHECK-NEXT: (return @2)
 define i32 @shr32(i32 %x, i32 %y) {
   %a = lshr i32 %x, %y
 ; CHECK-NEXT: (return @2)
 define i32 @shr32(i32 %x, i32 %y) {
   %a = lshr i32 %x, %y


@@ -145,7 +145,7 @@ define i32 @shr32(i32 %x, i32 %y) {
 ; CHECK-NEXT: (param i32) (param i32) (result i32)
 ; CHECK-NEXT: (setlocal @0 (argument 1))
 ; CHECK-NEXT: (setlocal @1 (argument 0))
 ; CHECK-NEXT: (param i32) (param i32) (result i32)
 ; CHECK-NEXT: (setlocal @0 (argument 1))
 ; CHECK-NEXT: (setlocal @1 (argument 0))

-; CHECK-NEXT: (setlocal @2 (sar @1 @0))
+; CHECK-NEXT: (setlocal @2 (shr_s @1 @0))

 ; CHECK-NEXT: (return @2)
 define i32 @sar32(i32 %x, i32 %y) {
   %a = ashr i32 %x, %y
 ; CHECK-NEXT: (return @2)
 define i32 @sar32(i32 %x, i32 %y) {
   %a = ashr i32 %x, %y

diff --git a/test/CodeGen/WebAssembly/integer64.ll b/test/CodeGen/WebAssembly/integer64.ll
index ee971082c131b7003b57eb07eb1fca6139271031..b1c99c54f61ae30ee6ec18edd4a0e5dfdb216635 100644 (file)
--- a/test/CodeGen/WebAssembly/integer64.ll
+++ b/test/CodeGen/WebAssembly/integer64.ll
@@ -134,7 +134,7 @@ define i64 @shl64(i64 %x, i64 %y) {
 ; CHECK-NEXT: (param i64) (param i64) (result i64)
 ; CHECK-NEXT: (setlocal @0 (argument 1))
 ; CHECK-NEXT: (setlocal @1 (argument 0))
 ; CHECK-NEXT: (param i64) (param i64) (result i64)
 ; CHECK-NEXT: (setlocal @0 (argument 1))
 ; CHECK-NEXT: (setlocal @1 (argument 0))

-; CHECK-NEXT: (setlocal @2 (shr @1 @0))
+; CHECK-NEXT: (setlocal @2 (shr_u @1 @0))

 ; CHECK-NEXT: (return @2)
 define i64 @shr64(i64 %x, i64 %y) {
   %a = lshr i64 %x, %y
 ; CHECK-NEXT: (return @2)
 define i64 @shr64(i64 %x, i64 %y) {
   %a = lshr i64 %x, %y


@@ -145,7 +145,7 @@ define i64 @shr64(i64 %x, i64 %y) {
 ; CHECK-NEXT: (param i64) (param i64) (result i64)
 ; CHECK-NEXT: (setlocal @0 (argument 1))
 ; CHECK-NEXT: (setlocal @1 (argument 0))
 ; CHECK-NEXT: (param i64) (param i64) (result i64)
 ; CHECK-NEXT: (setlocal @0 (argument 1))
 ; CHECK-NEXT: (setlocal @1 (argument 0))

-; CHECK-NEXT: (setlocal @2 (sar @1 @0))
+; CHECK-NEXT: (setlocal @2 (shr_s @1 @0))

 ; CHECK-NEXT: (return @2)
 define i64 @sar64(i64 %x, i64 %y) {
   %a = ashr i64 %x, %y
 ; CHECK-NEXT: (return @2)
 define i64 @sar64(i64 %x, i64 %y) {
   %a = ashr i64 %x, %y

diff --git a/test/CodeGen/WebAssembly/load-store-i1.ll b/test/CodeGen/WebAssembly/load-store-i1.ll
index 99b689e0cb2447855392ee3ea5dd8ad92d2b072e..5ba6361bd0c341f4cc009544333e573529aa53c4 100644 (file)
--- a/test/CodeGen/WebAssembly/load-store-i1.ll
+++ b/test/CodeGen/WebAssembly/load-store-i1.ll
@@ -18,7 +18,7 @@ define i32 @load_unsigned_i1_i32(i1* %p) {
 ; CHECK:      (setlocal @1 (load_zx_i8_i32 @0))
 ; CHECK-NEXT: (setlocal @2 (immediate 31))
 ; CHECK-NEXT: (setlocal @3 (shl @1 @2))
 ; CHECK:      (setlocal @1 (load_zx_i8_i32 @0))
 ; CHECK-NEXT: (setlocal @2 (immediate 31))
 ; CHECK-NEXT: (setlocal @3 (shl @1 @2))

-; CHECK-NEXT: (setlocal @4 (sar @3 @2))
+; CHECK-NEXT: (setlocal @4 (shr_s @3 @2))

 ; CHECK-NEXT: (return @4)
 define i32 @load_signed_i1_i32(i1* %p) {
   %v = load i1, i1* %p
 ; CHECK-NEXT: (return @4)
 define i32 @load_signed_i1_i32(i1* %p) {
   %v = load i1, i1* %p


@@ -39,7 +39,7 @@ define i64 @load_unsigned_i1_i64(i1* %p) {
 ; CHECK:      (setlocal @1 (load_zx_i8_i64 @0))
 ; CHECK-NEXT: (setlocal @2 (immediate 63))
 ; CHECK-NEXT: (setlocal @3 (shl @1 @2))
 ; CHECK:      (setlocal @1 (load_zx_i8_i64 @0))
 ; CHECK-NEXT: (setlocal @2 (immediate 63))
 ; CHECK-NEXT: (setlocal @3 (shl @1 @2))

-; CHECK-NEXT: (setlocal @4 (sar @3 @2))
+; CHECK-NEXT: (setlocal @4 (shr_s @3 @2))

 ; CHECK-NEXT: (return @4)
 define i64 @load_signed_i1_i64(i1* %p) {
   %v = load i1, i1* %p
 ; CHECK-NEXT: (return @4)
 define i64 @load_signed_i1_i64(i1* %p) {
   %v = load i1, i1* %p