[llvm] r252174 - [WebAssembly] Rename ior operator to or to match the spec

Derek Schuff via llvm-commits llvm-commits at lists.llvm.org
Thu Nov 5 09:08:11 PST 2015


Author: dschuff
Date: Thu Nov  5 11:08:11 2015
New Revision: 252174

URL: http://llvm.org/viewvc/llvm-project?rev=252174&view=rev
Log:
[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

Modified:
    llvm/trunk/lib/Target/WebAssembly/WebAssemblyInstrInteger.td
    llvm/trunk/test/CodeGen/WebAssembly/comparisons_f32.ll
    llvm/trunk/test/CodeGen/WebAssembly/comparisons_f64.ll
    llvm/trunk/test/CodeGen/WebAssembly/i32.ll
    llvm/trunk/test/CodeGen/WebAssembly/i64.ll

Modified: llvm/trunk/lib/Target/WebAssembly/WebAssemblyInstrInteger.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/WebAssembly/WebAssemblyInstrInteger.td?rev=252174&r1=252173&r2=252174&view=diff
==============================================================================
--- llvm/trunk/lib/Target/WebAssembly/WebAssemblyInstrInteger.td (original)
+++ llvm/trunk/lib/Target/WebAssembly/WebAssemblyInstrInteger.td Thu Nov  5 11:08:11 2015
@@ -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>;

Modified: llvm/trunk/test/CodeGen/WebAssembly/comparisons_f32.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/WebAssembly/comparisons_f32.ll?rev=252174&r1=252173&r2=252174&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/WebAssembly/comparisons_f32.ll (original)
+++ llvm/trunk/test/CodeGen/WebAssembly/comparisons_f32.ll Thu Nov  5 11:08:11 2015
@@ -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) {

Modified: llvm/trunk/test/CodeGen/WebAssembly/comparisons_f64.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/WebAssembly/comparisons_f64.ll?rev=252174&r1=252173&r2=252174&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/WebAssembly/comparisons_f64.ll (original)
+++ llvm/trunk/test/CodeGen/WebAssembly/comparisons_f64.ll Thu Nov  5 11:08:11 2015
@@ -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) {

Modified: llvm/trunk/test/CodeGen/WebAssembly/i32.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/WebAssembly/i32.ll?rev=252174&r1=252173&r2=252174&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/WebAssembly/i32.ll (original)
+++ llvm/trunk/test/CodeGen/WebAssembly/i32.ll Thu Nov  5 11:08:11 2015
@@ -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
 }

Modified: llvm/trunk/test/CodeGen/WebAssembly/i64.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/WebAssembly/i64.ll?rev=252174&r1=252173&r2=252174&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/WebAssembly/i64.ll (original)
+++ llvm/trunk/test/CodeGen/WebAssembly/i64.ll Thu Nov  5 11:08:11 2015
@@ -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
 }




More information about the llvm-commits mailing list