This is an archive of the discontinued LLVM Phabricator instance.

Differential D13837

WebAssembly: fix the syntax for comparisons
ClosedPublic

Authored by jfb on Oct 16 2015, 5:10 PM.

Details

Reviewers
binji
Commits
rG4f43e80ecef0: WebAssembly: fix the syntax for comparisons
rL250591: WebAssembly: fix the syntax for comparisons
Summary

It has also slightly changed.

Diff Detail

Event Timeline

jfb updated this revision to Diff 37658.Oct 16 2015, 5:10 PM
jfb retitled this revision from to WebAssembly: fix the syntax for comparisons.
jfb updated this object.
jfb added a reviewer: binji.
jfb added subscribers: sunfish, llvm-commits.
Herald added subscribers: dschuff, jfb. · View Herald TranscriptOct 16 2015, 5:10 PM
Closed by commit rL250591: WebAssembly: fix the syntax for comparisons (authored by jfb). · Explain WhyOct 16 2015, 5:14 PM
This revision was automatically updated to reflect the committed changes.
binji edited edge metadata.Oct 17 2015, 12:39 PM

lgtm

Revision Contents

PathSize
lib/
Target/
WebAssembly/
16 lines
test/
CodeGen/
WebAssembly/
16 lines
16 lines

Diff 37658

lib/Target/WebAssembly/WebAssemblyInstrInteger.td

Show All 22 Lines
defm IOR : BinaryInt<or>; defm IOR : 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 SLT : ComparisonInt<SETLT>; defm LT_S : ComparisonInt<SETLT>;
defm SLE : ComparisonInt<SETLE>; defm LE_S : ComparisonInt<SETLE>;
defm ULT : ComparisonInt<SETULT>; defm LT_U : ComparisonInt<SETULT>;
defm ULE : ComparisonInt<SETULE>; defm LE_U : ComparisonInt<SETULE>;
defm SGT : ComparisonInt<SETGT>; defm GT_S : ComparisonInt<SETGT>;
defm SGE : ComparisonInt<SETGE>; defm GE_S : ComparisonInt<SETGE>;
defm UGT : ComparisonInt<SETUGT>; defm GT_U : ComparisonInt<SETUGT>;
defm UGE : ComparisonInt<SETUGE>; defm GE_U : ComparisonInt<SETUGE>;
defm CLZ : UnaryInt<ctlz>; defm CLZ : UnaryInt<ctlz>;
defm CTZ : UnaryInt<cttz>; defm CTZ : UnaryInt<cttz>;
defm POPCNT : UnaryInt<ctpop>; defm POPCNT : UnaryInt<ctpop>;
// Expand the "don't care" operations to supported operations. // Expand the "don't care" operations to supported operations.
def : Pat<(ctlz_zero_undef I32:$src), (CLZ_I32 I32:$src)>; def : Pat<(ctlz_zero_undef I32:$src), (CLZ_I32 I32:$src)>;
def : Pat<(ctlz_zero_undef I64:$src), (CLZ_I64 I64:$src)>; def : Pat<(ctlz_zero_undef I64:$src), (CLZ_I64 I64:$src)>;
def : Pat<(cttz_zero_undef I32:$src), (CTZ_I32 I32:$src)>; def : Pat<(cttz_zero_undef I32:$src), (CTZ_I32 I32:$src)>;
def : Pat<(cttz_zero_undef I64:$src), (CTZ_I64 I64:$src)>; def : Pat<(cttz_zero_undef I64:$src), (CTZ_I64 I64:$src)>;

test/CodeGen/WebAssembly/comparisons_i32.ll

Show All 27 Lines
; CHECK-NEXT: set_local 4, pop{{$}} ; CHECK-NEXT: set_local 4, pop{{$}}
define i32 @ne_i32(i32 %x, i32 %y) { define i32 @ne_i32(i32 %x, i32 %y) {
%a = icmp ne i32 %x, %y %a = icmp ne i32 %x, %y
%b = zext i1 %a to i32 %b = zext i1 %a to i32
ret i32 %b ret i32 %b
} }
; CHECK-LABEL: slt_i32: ; CHECK-LABEL: slt_i32:
; CHECK: slt (get_local 3), (get_local 2){{$}} ; CHECK: i32.lt_s (get_local 3), (get_local 2){{$}}
; CHECK-NEXT: set_local 4, pop{{$}} ; CHECK-NEXT: set_local 4, pop{{$}}
define i32 @slt_i32(i32 %x, i32 %y) { define i32 @slt_i32(i32 %x, i32 %y) {
%a = icmp slt i32 %x, %y %a = icmp slt i32 %x, %y
%b = zext i1 %a to i32 %b = zext i1 %a to i32
ret i32 %b ret i32 %b
} }
; CHECK-LABEL: sle_i32: ; CHECK-LABEL: sle_i32:
; CHECK: sle (get_local 3), (get_local 2){{$}} ; CHECK: i32.le_s (get_local 3), (get_local 2){{$}}
; CHECK-NEXT: set_local 4, pop{{$}} ; CHECK-NEXT: set_local 4, pop{{$}}
define i32 @sle_i32(i32 %x, i32 %y) { define i32 @sle_i32(i32 %x, i32 %y) {
%a = icmp sle i32 %x, %y %a = icmp sle i32 %x, %y
%b = zext i1 %a to i32 %b = zext i1 %a to i32
ret i32 %b ret i32 %b
} }
; CHECK-LABEL: ult_i32: ; CHECK-LABEL: ult_i32:
; CHECK: ult (get_local 3), (get_local 2){{$}} ; CHECK: i32.lt_u (get_local 3), (get_local 2){{$}}
; CHECK-NEXT: set_local 4, pop{{$}} ; CHECK-NEXT: set_local 4, pop{{$}}
define i32 @ult_i32(i32 %x, i32 %y) { define i32 @ult_i32(i32 %x, i32 %y) {
%a = icmp ult i32 %x, %y %a = icmp ult i32 %x, %y
%b = zext i1 %a to i32 %b = zext i1 %a to i32
ret i32 %b ret i32 %b
} }
; CHECK-LABEL: ule_i32: ; CHECK-LABEL: ule_i32:
; CHECK: ule (get_local 3), (get_local 2){{$}} ; CHECK: i32.le_u (get_local 3), (get_local 2){{$}}
; CHECK-NEXT: set_local 4, pop{{$}} ; CHECK-NEXT: set_local 4, pop{{$}}
define i32 @ule_i32(i32 %x, i32 %y) { define i32 @ule_i32(i32 %x, i32 %y) {
%a = icmp ule i32 %x, %y %a = icmp ule i32 %x, %y
%b = zext i1 %a to i32 %b = zext i1 %a to i32
ret i32 %b ret i32 %b
} }
; CHECK-LABEL: sgt_i32: ; CHECK-LABEL: sgt_i32:
; CHECK: sgt (get_local 3), (get_local 2){{$}} ; CHECK: i32.gt_s (get_local 3), (get_local 2){{$}}
; CHECK-NEXT: set_local 4, pop{{$}} ; CHECK-NEXT: set_local 4, pop{{$}}
define i32 @sgt_i32(i32 %x, i32 %y) { define i32 @sgt_i32(i32 %x, i32 %y) {
%a = icmp sgt i32 %x, %y %a = icmp sgt i32 %x, %y
%b = zext i1 %a to i32 %b = zext i1 %a to i32
ret i32 %b ret i32 %b
} }
; CHECK-LABEL: sge_i32: ; CHECK-LABEL: sge_i32:
; CHECK: sge (get_local 3), (get_local 2){{$}} ; CHECK: i32.ge_s (get_local 3), (get_local 2){{$}}
; CHECK-NEXT: set_local 4, pop{{$}} ; CHECK-NEXT: set_local 4, pop{{$}}
define i32 @sge_i32(i32 %x, i32 %y) { define i32 @sge_i32(i32 %x, i32 %y) {
%a = icmp sge i32 %x, %y %a = icmp sge i32 %x, %y
%b = zext i1 %a to i32 %b = zext i1 %a to i32
ret i32 %b ret i32 %b
} }
; CHECK-LABEL: ugt_i32: ; CHECK-LABEL: ugt_i32:
; CHECK: ugt (get_local 3), (get_local 2){{$}} ; CHECK: i32.gt_u (get_local 3), (get_local 2){{$}}
; CHECK-NEXT: set_local 4, pop{{$}} ; CHECK-NEXT: set_local 4, pop{{$}}
define i32 @ugt_i32(i32 %x, i32 %y) { define i32 @ugt_i32(i32 %x, i32 %y) {
%a = icmp ugt i32 %x, %y %a = icmp ugt i32 %x, %y
%b = zext i1 %a to i32 %b = zext i1 %a to i32
ret i32 %b ret i32 %b
} }
; CHECK-LABEL: uge_i32: ; CHECK-LABEL: uge_i32:
; CHECK: uge (get_local 3), (get_local 2){{$}} ; CHECK: i32.ge_u (get_local 3), (get_local 2){{$}}
; CHECK-NEXT: set_local 4, pop{{$}} ; CHECK-NEXT: set_local 4, pop{{$}}
define i32 @uge_i32(i32 %x, i32 %y) { define i32 @uge_i32(i32 %x, i32 %y) {
%a = icmp uge i32 %x, %y %a = icmp uge i32 %x, %y
%b = zext i1 %a to i32 %b = zext i1 %a to i32
ret i32 %b ret i32 %b
} }

test/CodeGen/WebAssembly/comparisons_i64.ll

Show All 27 Lines
; CHECK-NEXT: set_local 4, pop{{$}} ; CHECK-NEXT: set_local 4, pop{{$}}
define i32 @ne_i64(i64 %x, i64 %y) { define i32 @ne_i64(i64 %x, i64 %y) {
%a = icmp ne i64 %x, %y %a = icmp ne i64 %x, %y
%b = zext i1 %a to i32 %b = zext i1 %a to i32
ret i32 %b ret i32 %b
} }
; CHECK-LABEL: slt_i64: ; CHECK-LABEL: slt_i64:
; CHECK: slt (get_local 3), (get_local 2){{$}} ; CHECK: i64.lt_s (get_local 3), (get_local 2){{$}}
; CHECK-NEXT: set_local 4, pop{{$}} ; CHECK-NEXT: set_local 4, pop{{$}}
define i32 @slt_i64(i64 %x, i64 %y) { define i32 @slt_i64(i64 %x, i64 %y) {
%a = icmp slt i64 %x, %y %a = icmp slt i64 %x, %y
%b = zext i1 %a to i32 %b = zext i1 %a to i32
ret i32 %b ret i32 %b
} }
; CHECK-LABEL: sle_i64: ; CHECK-LABEL: sle_i64:
; CHECK: sle (get_local 3), (get_local 2){{$}} ; CHECK: i64.le_s (get_local 3), (get_local 2){{$}}
; CHECK-NEXT: set_local 4, pop{{$}} ; CHECK-NEXT: set_local 4, pop{{$}}
define i32 @sle_i64(i64 %x, i64 %y) { define i32 @sle_i64(i64 %x, i64 %y) {
%a = icmp sle i64 %x, %y %a = icmp sle i64 %x, %y
%b = zext i1 %a to i32 %b = zext i1 %a to i32
ret i32 %b ret i32 %b
} }
; CHECK-LABEL: ult_i64: ; CHECK-LABEL: ult_i64:
; CHECK: ult (get_local 3), (get_local 2){{$}} ; CHECK: i64.lt_u (get_local 3), (get_local 2){{$}}
; CHECK-NEXT: set_local 4, pop{{$}} ; CHECK-NEXT: set_local 4, pop{{$}}
define i32 @ult_i64(i64 %x, i64 %y) { define i32 @ult_i64(i64 %x, i64 %y) {
%a = icmp ult i64 %x, %y %a = icmp ult i64 %x, %y
%b = zext i1 %a to i32 %b = zext i1 %a to i32
ret i32 %b ret i32 %b
} }
; CHECK-LABEL: ule_i64: ; CHECK-LABEL: ule_i64:
; CHECK: ule (get_local 3), (get_local 2){{$}} ; CHECK: i64.le_u (get_local 3), (get_local 2){{$}}
; CHECK-NEXT: set_local 4, pop{{$}} ; CHECK-NEXT: set_local 4, pop{{$}}
define i32 @ule_i64(i64 %x, i64 %y) { define i32 @ule_i64(i64 %x, i64 %y) {
%a = icmp ule i64 %x, %y %a = icmp ule i64 %x, %y
%b = zext i1 %a to i32 %b = zext i1 %a to i32
ret i32 %b ret i32 %b
} }
; CHECK-LABEL: sgt_i64: ; CHECK-LABEL: sgt_i64:
; CHECK: sgt (get_local 3), (get_local 2){{$}} ; CHECK: i64.gt_s (get_local 3), (get_local 2){{$}}
; CHECK-NEXT: set_local 4, pop{{$}} ; CHECK-NEXT: set_local 4, pop{{$}}
define i32 @sgt_i64(i64 %x, i64 %y) { define i32 @sgt_i64(i64 %x, i64 %y) {
%a = icmp sgt i64 %x, %y %a = icmp sgt i64 %x, %y
%b = zext i1 %a to i32 %b = zext i1 %a to i32
ret i32 %b ret i32 %b
} }
; CHECK-LABEL: sge_i64: ; CHECK-LABEL: sge_i64:
; CHECK: sge (get_local 3), (get_local 2){{$}} ; CHECK: i64.ge_s (get_local 3), (get_local 2){{$}}
; CHECK-NEXT: set_local 4, pop{{$}} ; CHECK-NEXT: set_local 4, pop{{$}}
define i32 @sge_i64(i64 %x, i64 %y) { define i32 @sge_i64(i64 %x, i64 %y) {
%a = icmp sge i64 %x, %y %a = icmp sge i64 %x, %y
%b = zext i1 %a to i32 %b = zext i1 %a to i32
ret i32 %b ret i32 %b
} }
; CHECK-LABEL: ugt_i64: ; CHECK-LABEL: ugt_i64:
; CHECK: ugt (get_local 3), (get_local 2){{$}} ; CHECK: i64.gt_u (get_local 3), (get_local 2){{$}}
; CHECK-NEXT: set_local 4, pop{{$}} ; CHECK-NEXT: set_local 4, pop{{$}}
define i32 @ugt_i64(i64 %x, i64 %y) { define i32 @ugt_i64(i64 %x, i64 %y) {
%a = icmp ugt i64 %x, %y %a = icmp ugt i64 %x, %y
%b = zext i1 %a to i32 %b = zext i1 %a to i32
ret i32 %b ret i32 %b
} }
; CHECK-LABEL: uge_i64: ; CHECK-LABEL: uge_i64:
; CHECK: uge (get_local 3), (get_local 2){{$}} ; CHECK: i64.ge_u (get_local 3), (get_local 2){{$}}
; CHECK-NEXT: set_local 4, pop{{$}} ; CHECK-NEXT: set_local 4, pop{{$}}
define i32 @uge_i64(i64 %x, i64 %y) { define i32 @uge_i64(i64 %x, i64 %y) {
%a = icmp uge i64 %x, %y %a = icmp uge i64 %x, %y
%b = zext i1 %a to i32 %b = zext i1 %a to i32
ret i32 %b ret i32 %b
} }