[WebAssembly] Rename ior operator to or to match the spec

Summary: The spec uses "or" for inclusive-or and "xor" for exclusive-or

Reviewers: sunfish

Subscribers: jfb, llvm-commits, dschuff

Differential Revision: http://reviews.llvm.org/D14362

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

diff --git a/lib/Target/WebAssembly/WebAssemblyInstrInteger.td b/lib/Target/WebAssembly/WebAssemblyInstrInteger.td
index 6b9d504c2c01bd348daff4c6f5322fb6179b9149..6f8ed758148144aa1edf6a452b456c9a54bc53e6 100644 (file)
--- a/lib/Target/WebAssembly/WebAssemblyInstrInteger.td
+++ b/lib/Target/WebAssembly/WebAssemblyInstrInteger.td
@@ -20,7 +20,7 @@ defm DIV_U : BinaryInt<udiv>;
 defm REM_S : BinaryInt<srem>;
 defm REM_U : BinaryInt<urem>;
 defm AND : BinaryInt<and>;
-defm IOR : BinaryInt<or>;
+defm OR : BinaryInt<or>;
 defm XOR : BinaryInt<xor>;
 defm SHL : BinaryInt<shl>;
 defm SHR_U : BinaryInt<srl>;

diff --git a/test/CodeGen/WebAssembly/comparisons_f32.ll b/test/CodeGen/WebAssembly/comparisons_f32.ll
index cd3633d5591fa3c71e8284dd59af353e6ebbd79a..c700b05b51415fa9df7b57d522d1faf4a32fb676 100644 (file)
--- a/test/CodeGen/WebAssembly/comparisons_f32.ll
+++ b/test/CodeGen/WebAssembly/comparisons_f32.ll
@@ -41,7 +41,7 @@ define i32 @ord_f32(float %x, float %y) {
 ; 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: or (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) {
@@ -130,9 +130,9 @@ define i32 @oge_f32(float %x, float %y) {
 ; 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: or (get_local 6), (get_local 5){{$}}
 ; CHECK-NEXT: set_local 7, pop{{$}}
-; CHECK-NEXT: ior (get_local 4), (get_local 7){{$}}
+; CHECK-NEXT: or (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) {

diff --git a/test/CodeGen/WebAssembly/comparisons_f64.ll b/test/CodeGen/WebAssembly/comparisons_f64.ll
index 536c102a5b238feab8ad5dcac9ebdd0b63221758..ae0236bd81982c75c2e6a367b21db3170a2e5618 100644 (file)
--- a/test/CodeGen/WebAssembly/comparisons_f64.ll
+++ b/test/CodeGen/WebAssembly/comparisons_f64.ll
@@ -41,7 +41,7 @@ define i32 @ord_f64(double %x, double %y) {
 ; 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: or (get_local 5), (get_local 4){{$}}
 ; CHECK-NEXT: set_local 6, pop{{$}}
 ; CHECK-NEXT: return (get_local 6){{$}}
 define i32 @uno_f64(double %x, double %y) {
@@ -130,9 +130,9 @@ define i32 @oge_f64(double %x, double %y) {
 ; 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: or (get_local 6), (get_local 5){{$}}
 ; CHECK-NEXT: set_local 7, pop{{$}}
-; CHECK-NEXT: ior (get_local 4), (get_local 7){{$}}
+; CHECK-NEXT: or (get_local 4), (get_local 7){{$}}
 ; CHECK-NEXT: set_local 8, pop{{$}}
 ; CHECK-NEXT: return (get_local 8){{$}}
 define i32 @ueq_f64(double %x, double %y) {

diff --git a/test/CodeGen/WebAssembly/i32.ll b/test/CodeGen/WebAssembly/i32.ll
index 8261d6cb6a1c9af5250ea7bcd55690297ef6bff2..d958dba61360266d98b6151702649495ad6f02d5 100644 (file)
--- a/test/CodeGen/WebAssembly/i32.ll
+++ b/test/CodeGen/WebAssembly/i32.ll
@@ -145,7 +145,7 @@ define i32 @and32(i32 %x, i32 %y) {
   ret i32 %a
 }
 
-; CHECK-LABEL: ior32:
+; CHECK-LABEL: or32:
 ; CHECK-NEXT: .param i32{{$}}
 ; CHECK-NEXT: .param i32{{$}}
 ; CHECK-NEXT: .result i32{{$}}
@@ -154,10 +154,10 @@ define i32 @and32(i32 %x, i32 %y) {
 ; CHECK-NEXT: set_local 2, pop{{$}}
 ; CHECK-NEXT: get_local 0{{$}}
 ; CHECK-NEXT: set_local 3, pop{{$}}
-; CHECK-NEXT: ior (get_local 3), (get_local 2){{$}}
+; CHECK-NEXT: or (get_local 3), (get_local 2){{$}}
 ; CHECK-NEXT: set_local 4, pop{{$}}
 ; CHECK-NEXT: return (get_local 4){{$}}
-define i32 @ior32(i32 %x, i32 %y) {
+define i32 @or32(i32 %x, i32 %y) {
   %a = or i32 %x, %y
   ret i32 %a
 }

diff --git a/test/CodeGen/WebAssembly/i64.ll b/test/CodeGen/WebAssembly/i64.ll
index c112ed3242669e5d8d668e82b0778cbf6504e18f..28d1ef986788d677d70fc505e22ce3e2bd4e6c59 100644 (file)
--- a/test/CodeGen/WebAssembly/i64.ll
+++ b/test/CodeGen/WebAssembly/i64.ll
@@ -145,7 +145,7 @@ define i64 @and64(i64 %x, i64 %y) {
   ret i64 %a
 }
 
-; CHECK-LABEL: ior64:
+; CHECK-LABEL: or64:
 ; CHECK-NEXT: .param i64{{$}}
 ; CHECK-NEXT: .param i64{{$}}
 ; CHECK-NEXT: .result i64{{$}}
@@ -154,10 +154,10 @@ define i64 @and64(i64 %x, i64 %y) {
 ; CHECK-NEXT: set_local 2, pop{{$}}
 ; CHECK-NEXT: get_local 0{{$}}
 ; CHECK-NEXT: set_local 3, pop{{$}}
-; CHECK-NEXT: ior (get_local 3), (get_local 2){{$}}
+; CHECK-NEXT: or (get_local 3), (get_local 2){{$}}
 ; CHECK-NEXT: set_local 4, pop{{$}}
 ; CHECK-NEXT: return (get_local 4){{$}}
-define i64 @ior64(i64 %x, i64 %y) {
+define i64 @or64(i64 %x, i64 %y) {
   %a = or i64 %x, %y
   ret i64 %a
 }