From f2841629064fa4562a5f26f86dd586eddd303d35 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Thu, 5 Nov 2015 17:08:11 +0000 Subject: [PATCH] [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 --- lib/Target/WebAssembly/WebAssemblyInstrInteger.td | 2 +- test/CodeGen/WebAssembly/comparisons_f32.ll | 6 +++--- test/CodeGen/WebAssembly/comparisons_f64.ll | 6 +++--- test/CodeGen/WebAssembly/i32.ll | 6 +++--- test/CodeGen/WebAssembly/i64.ll | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/Target/WebAssembly/WebAssemblyInstrInteger.td b/lib/Target/WebAssembly/WebAssemblyInstrInteger.td index 6b9d504c2c0..6f8ed758148 100644 --- a/lib/Target/WebAssembly/WebAssemblyInstrInteger.td +++ b/lib/Target/WebAssembly/WebAssemblyInstrInteger.td @@ -20,7 +20,7 @@ defm DIV_U : BinaryInt; defm REM_S : BinaryInt; defm REM_U : BinaryInt; defm AND : BinaryInt; -defm IOR : BinaryInt; +defm OR : BinaryInt; defm XOR : BinaryInt; defm SHL : BinaryInt; defm SHR_U : BinaryInt; diff --git a/test/CodeGen/WebAssembly/comparisons_f32.ll b/test/CodeGen/WebAssembly/comparisons_f32.ll index cd3633d5591..c700b05b514 100644 --- 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 536c102a5b2..ae0236bd819 100644 --- 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 8261d6cb6a1..d958dba6136 100644 --- 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 c112ed32426..28d1ef98678 100644 --- 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 } -- 2.34.1