This is an archive of the discontinued LLVM Phabricator instance.

Differential D14362

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

Authored by dschuff on Nov 4 2015, 5:06 PM.

Details

Reviewers
sunfish
Commits
rG8a76b04a6384: [WebAssembly] Rename ior operator to or to match the spec
rL252174: [WebAssembly] Rename ior operator to or to match the spec
Summary

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

Diff Detail

Event Timeline

dschuff updated this revision to Diff 39295.Nov 4 2015, 5:06 PM
dschuff retitled this revision from to [WebAssembly] Rename ior operator to or to match the spec.
dschuff updated this object.
dschuff added a reviewer: sunfish.
dschuff added subscribers: llvm-commits, jfb.
Herald added a subscriber: dschuff. · View Herald TranscriptNov 4 2015, 5:06 PM
sunfish accepted this revision.Nov 4 2015, 5:26 PM
sunfish edited edge metadata.

lgtm

This revision is now accepted and ready to land.Nov 4 2015, 5:26 PM
Closed by commit rL252174: [WebAssembly] Rename ior operator to or to match the spec (authored by dschuff). · Explain WhyNov 5 2015, 9:10 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
Target/
WebAssembly/
2 lines
test/
CodeGen/
WebAssembly/
6 lines
6 lines
6 lines
6 lines

Diff 39295

lib/Target/WebAssembly/WebAssemblyInstrInteger.td

Show All 14 Lines
defm ADD : BinaryInt<add>; defm ADD : BinaryInt<add>;
defm SUB : BinaryInt<sub>; defm SUB : BinaryInt<sub>;
defm MUL : BinaryInt<mul>; defm MUL : BinaryInt<mul>;
defm DIV_S : BinaryInt<sdiv>; defm DIV_S : BinaryInt<sdiv>;
defm DIV_U : BinaryInt<udiv>; defm DIV_U : BinaryInt<udiv>;
defm REM_S : BinaryInt<srem>; defm REM_S : BinaryInt<srem>;
defm REM_U : BinaryInt<urem>; defm REM_U : BinaryInt<urem>;
defm AND : BinaryInt<and>; defm AND : BinaryInt<and>;
defm IOR : BinaryInt<or>; defm OR : BinaryInt<or>;
defm XOR : BinaryInt<xor>; defm XOR : BinaryInt<xor>;
defm SHL : BinaryInt<shl>; defm SHL : BinaryInt<shl>;
defm SHR_U : BinaryInt<srl>; defm SHR_U : BinaryInt<srl>;
defm SHR_S : BinaryInt<sra>; defm SHR_S : BinaryInt<sra>;
defm EQ : ComparisonInt<SETEQ>; defm EQ : ComparisonInt<SETEQ>;
defm NE : ComparisonInt<SETNE>; defm NE : ComparisonInt<SETNE>;
defm LT_S : ComparisonInt<SETLT>; defm LT_S : ComparisonInt<SETLT>;
Show All 22 Lines

test/CodeGen/WebAssembly/comparisons_f32.ll

Show All 35 Lines
; CHECK-NEXT: get_local 0{{$}} ; CHECK-NEXT: get_local 0{{$}}
; CHECK-NEXT: set_local 2, pop{{$}} ; CHECK-NEXT: set_local 2, pop{{$}}
; CHECK-NEXT: get_local 1{{$}} ; CHECK-NEXT: get_local 1{{$}}
; CHECK-NEXT: set_local 3, pop{{$}} ; CHECK-NEXT: set_local 3, pop{{$}}
; CHECK-NEXT: ne (get_local 3), (get_local 3){{$}} ; CHECK-NEXT: ne (get_local 3), (get_local 3){{$}}
; CHECK-NEXT: set_local 4, pop{{$}} ; CHECK-NEXT: set_local 4, pop{{$}}
; CHECK-NEXT: ne (get_local 2), (get_local 2){{$}} ; CHECK-NEXT: ne (get_local 2), (get_local 2){{$}}
; CHECK-NEXT: set_local 5, pop{{$}} ; 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: set_local 6, pop{{$}}
; CHECK-NEXT: return (get_local 6){{$}} ; CHECK-NEXT: return (get_local 6){{$}}
define i32 @uno_f32(float %x, float %y) { define i32 @uno_f32(float %x, float %y) {
%a = fcmp uno float %x, %y %a = fcmp uno float %x, %y
%b = zext i1 %a to i32 %b = zext i1 %a to i32
ret i32 %b ret i32 %b
} }
▲ Show 20 Lines • Show All 72 Lines • ▼ Show 20 Lines
; CHECK-NEXT: get_local 0{{$}} ; CHECK-NEXT: get_local 0{{$}}
; CHECK-NEXT: set_local 3, pop{{$}} ; CHECK-NEXT: set_local 3, pop{{$}}
; CHECK-NEXT: eq (get_local 3), (get_local 2){{$}} ; CHECK-NEXT: eq (get_local 3), (get_local 2){{$}}
; CHECK-NEXT: set_local 4, pop{{$}} ; CHECK-NEXT: set_local 4, pop{{$}}
; CHECK-NEXT: ne (get_local 2), (get_local 2){{$}} ; CHECK-NEXT: ne (get_local 2), (get_local 2){{$}}
; CHECK-NEXT: set_local 5, pop{{$}} ; CHECK-NEXT: set_local 5, pop{{$}}
; CHECK-NEXT: ne (get_local 3), (get_local 3){{$}} ; CHECK-NEXT: ne (get_local 3), (get_local 3){{$}}
; CHECK-NEXT: set_local 6, pop{{$}} ; 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: 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: set_local 8, pop{{$}}
; CHECK-NEXT: return (get_local 8){{$}} ; CHECK-NEXT: return (get_local 8){{$}}
define i32 @ueq_f32(float %x, float %y) { define i32 @ueq_f32(float %x, float %y) {
%a = fcmp ueq float %x, %y %a = fcmp ueq float %x, %y
%b = zext i1 %a to i32 %b = zext i1 %a to i32
ret i32 %b ret i32 %b
} }
▲ Show 20 Lines • Show All 44 Lines • Show Last 20 Lines

test/CodeGen/WebAssembly/comparisons_f64.ll

Show All 35 Lines
; CHECK-NEXT: get_local 0{{$}} ; CHECK-NEXT: get_local 0{{$}}
; CHECK-NEXT: set_local 2, pop{{$}} ; CHECK-NEXT: set_local 2, pop{{$}}
; CHECK-NEXT: get_local 1{{$}} ; CHECK-NEXT: get_local 1{{$}}
; CHECK-NEXT: set_local 3, pop{{$}} ; CHECK-NEXT: set_local 3, pop{{$}}
; CHECK-NEXT: ne (get_local 3), (get_local 3){{$}} ; CHECK-NEXT: ne (get_local 3), (get_local 3){{$}}
; CHECK-NEXT: set_local 4, pop{{$}} ; CHECK-NEXT: set_local 4, pop{{$}}
; CHECK-NEXT: ne (get_local 2), (get_local 2){{$}} ; CHECK-NEXT: ne (get_local 2), (get_local 2){{$}}
; CHECK-NEXT: set_local 5, pop{{$}} ; 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: set_local 6, pop{{$}}
; CHECK-NEXT: return (get_local 6){{$}} ; CHECK-NEXT: return (get_local 6){{$}}
define i32 @uno_f64(double %x, double %y) { define i32 @uno_f64(double %x, double %y) {
%a = fcmp uno double %x, %y %a = fcmp uno double %x, %y
%b = zext i1 %a to i32 %b = zext i1 %a to i32
ret i32 %b ret i32 %b
} }
▲ Show 20 Lines • Show All 72 Lines • ▼ Show 20 Lines
; CHECK-NEXT: get_local 0{{$}} ; CHECK-NEXT: get_local 0{{$}}
; CHECK-NEXT: set_local 3, pop{{$}} ; CHECK-NEXT: set_local 3, pop{{$}}
; CHECK-NEXT: eq (get_local 3), (get_local 2){{$}} ; CHECK-NEXT: eq (get_local 3), (get_local 2){{$}}
; CHECK-NEXT: set_local 4, pop{{$}} ; CHECK-NEXT: set_local 4, pop{{$}}
; CHECK-NEXT: ne (get_local 2), (get_local 2){{$}} ; CHECK-NEXT: ne (get_local 2), (get_local 2){{$}}
; CHECK-NEXT: set_local 5, pop{{$}} ; CHECK-NEXT: set_local 5, pop{{$}}
; CHECK-NEXT: ne (get_local 3), (get_local 3){{$}} ; CHECK-NEXT: ne (get_local 3), (get_local 3){{$}}
; CHECK-NEXT: set_local 6, pop{{$}} ; 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: 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: set_local 8, pop{{$}}
; CHECK-NEXT: return (get_local 8){{$}} ; CHECK-NEXT: return (get_local 8){{$}}
define i32 @ueq_f64(double %x, double %y) { define i32 @ueq_f64(double %x, double %y) {
%a = fcmp ueq double %x, %y %a = fcmp ueq double %x, %y
%b = zext i1 %a to i32 %b = zext i1 %a to i32
ret i32 %b ret i32 %b
} }
▲ Show 20 Lines • Show All 44 Lines • Show Last 20 Lines

test/CodeGen/WebAssembly/i32.ll

Show First 20 Lines • Show All 139 Lines • ▼ Show 20 Lines
; CHECK-NEXT: and (get_local 3), (get_local 2){{$}} ; CHECK-NEXT: and (get_local 3), (get_local 2){{$}}
; CHECK-NEXT: set_local 4, pop{{$}} ; CHECK-NEXT: set_local 4, pop{{$}}
; CHECK-NEXT: return (get_local 4){{$}} ; CHECK-NEXT: return (get_local 4){{$}}
define i32 @and32(i32 %x, i32 %y) { define i32 @and32(i32 %x, i32 %y) {
%a = and i32 %x, %y %a = and i32 %x, %y
ret i32 %a ret i32 %a
} }
; CHECK-LABEL: ior32: ; CHECK-LABEL: or32:
; CHECK-NEXT: .param i32{{$}} ; CHECK-NEXT: .param i32{{$}}
; CHECK-NEXT: .param i32{{$}} ; CHECK-NEXT: .param i32{{$}}
; CHECK-NEXT: .result i32{{$}} ; CHECK-NEXT: .result i32{{$}}
; CHECK-NEXT: .local i32, i32, i32{{$}} ; CHECK-NEXT: .local i32, i32, i32{{$}}
; CHECK-NEXT: get_local 1{{$}} ; CHECK-NEXT: get_local 1{{$}}
; CHECK-NEXT: set_local 2, pop{{$}} ; CHECK-NEXT: set_local 2, pop{{$}}
; CHECK-NEXT: get_local 0{{$}} ; CHECK-NEXT: get_local 0{{$}}
; CHECK-NEXT: set_local 3, pop{{$}} ; 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: set_local 4, pop{{$}}
; CHECK-NEXT: return (get_local 4){{$}} ; 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 %a = or i32 %x, %y
ret i32 %a ret i32 %a
} }
; CHECK-LABEL: xor32: ; CHECK-LABEL: xor32:
; CHECK-NEXT: .param i32{{$}} ; CHECK-NEXT: .param i32{{$}}
; CHECK-NEXT: .param i32{{$}} ; CHECK-NEXT: .param i32{{$}}
; CHECK-NEXT: .result i32{{$}} ; CHECK-NEXT: .result i32{{$}}
▲ Show 20 Lines • Show All 133 Lines • Show Last 20 Lines

test/CodeGen/WebAssembly/i64.ll

Show First 20 Lines • Show All 139 Lines • ▼ Show 20 Lines
; CHECK-NEXT: and (get_local 3), (get_local 2){{$}} ; CHECK-NEXT: and (get_local 3), (get_local 2){{$}}
; CHECK-NEXT: set_local 4, pop{{$}} ; CHECK-NEXT: set_local 4, pop{{$}}
; CHECK-NEXT: return (get_local 4){{$}} ; CHECK-NEXT: return (get_local 4){{$}}
define i64 @and64(i64 %x, i64 %y) { define i64 @and64(i64 %x, i64 %y) {
%a = and i64 %x, %y %a = and i64 %x, %y
ret i64 %a ret i64 %a
} }
; CHECK-LABEL: ior64: ; CHECK-LABEL: or64:
; CHECK-NEXT: .param i64{{$}} ; CHECK-NEXT: .param i64{{$}}
; CHECK-NEXT: .param i64{{$}} ; CHECK-NEXT: .param i64{{$}}
; CHECK-NEXT: .result i64{{$}} ; CHECK-NEXT: .result i64{{$}}
; CHECK-NEXT: .local i64, i64, i64{{$}} ; CHECK-NEXT: .local i64, i64, i64{{$}}
; CHECK-NEXT: get_local 1{{$}} ; CHECK-NEXT: get_local 1{{$}}
; CHECK-NEXT: set_local 2, pop{{$}} ; CHECK-NEXT: set_local 2, pop{{$}}
; CHECK-NEXT: get_local 0{{$}} ; CHECK-NEXT: get_local 0{{$}}
; CHECK-NEXT: set_local 3, pop{{$}} ; 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: set_local 4, pop{{$}}
; CHECK-NEXT: return (get_local 4){{$}} ; 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 %a = or i64 %x, %y
ret i64 %a ret i64 %a
} }
; CHECK-LABEL: xor64: ; CHECK-LABEL: xor64:
; CHECK-NEXT: .param i64{{$}} ; CHECK-NEXT: .param i64{{$}}
; CHECK-NEXT: .param i64{{$}} ; CHECK-NEXT: .param i64{{$}}
; CHECK-NEXT: .result i64{{$}} ; CHECK-NEXT: .result i64{{$}}
▲ Show 20 Lines • Show All 133 Lines • Show Last 20 Lines