Fix some i128 shift-related bugs in x64 backend.
This fixes #2672 and #2679, and also fixes an incorrect instruction emission (`test` with small immediate) that we had missed earlier. The shift-related fixes have to do with (i) shifts by 0 bits, as a special case that must be handled; and (ii) shifts by a 128-bit amount, which we can handle by just dropping the upper half (we only use 3--7 bits of shift amount). This adjusts the lowerings appropriately, and also adds run-tests to ensure that the lowerings actually execute correctly (previously we only had compile-tests with golden lowerings; I'd like to correct this for more ops eventually, adding run-tests beyond what the Wasm spec and frontend covers).
This commit is contained in:
Chris Fallin
@@ -644,212 +644,9 @@ block0(v0: i128):
|
||||
; nextln: ret
|
||||
}
|
||||
|
||||
function %f21(i128, i32) -> i128 {
|
||||
; check: pushq %rbp
|
||||
; nextln: movq %rsp, %rbp
|
||||
; Shifts are covered by run-tests in shift-i128-run.clif.
|
||||
|
||||
block0(v0: i128, v1: i32):
|
||||
v2 = ushr v0, v1
|
||||
return v2
|
||||
|
||||
; check: movq %rdi, %rax
|
||||
; nextln: movq %rsi, %rdi
|
||||
; nextln: movq %rdi, %rsi
|
||||
; nextln: movq %rdx, %rcx
|
||||
; nextln: shrq %cl, %rsi
|
||||
; nextln: movq %rdx, %rcx
|
||||
; nextln: shrq %cl, %rax
|
||||
; nextln: movl $$64, %ecx
|
||||
; nextln: subq %rdx, %rcx
|
||||
; nextln: shlq %cl, %rdi
|
||||
; nextln: orq %rax, %rdi
|
||||
; nextln: xorq %rax, %rax
|
||||
; nextln: xorq %rcx, %rcx
|
||||
; nextln: andq $$64, %rdx
|
||||
; nextln: cmovzq %rsi, %rax
|
||||
; nextln: cmovzq %rdi, %rcx
|
||||
; nextln: cmovnzq %rsi, %rcx
|
||||
; nextln: movq %rax, %rdx
|
||||
; nextln: movq %rcx, %rax
|
||||
|
||||
; nextln: movq %rbp, %rsp
|
||||
; nextln: popq %rbp
|
||||
; nextln: ret
|
||||
}
|
||||
|
||||
function %f22(i128, i32) -> i128 {
|
||||
; check: pushq %rbp
|
||||
; nextln: movq %rsp, %rbp
|
||||
|
||||
block0(v0: i128, v1: i32):
|
||||
v2 = ishl v0, v1
|
||||
return v2
|
||||
|
||||
; check: movq %rsi, %rax
|
||||
; nextln: movq %rdi, %rsi
|
||||
; nextln: movq %rdx, %rcx
|
||||
; nextln: shlq %cl, %rsi
|
||||
; nextln: movq %rdx, %rcx
|
||||
; nextln: shlq %cl, %rax
|
||||
; nextln: movl $$64, %ecx
|
||||
; nextln: subq %rdx, %rcx
|
||||
; nextln: shrq %cl, %rdi
|
||||
; nextln: orq %rax, %rdi
|
||||
; nextln: xorq %rax, %rax
|
||||
; nextln: xorq %rcx, %rcx
|
||||
; nextln: andq $$64, %rdx
|
||||
; nextln: cmovzq %rdi, %rcx
|
||||
; nextln: cmovzq %rsi, %rax
|
||||
; nextln: cmovnzq %rsi, %rcx
|
||||
; nextln: movq %rcx, %rdx
|
||||
|
||||
; nextln: movq %rbp, %rsp
|
||||
; nextln: popq %rbp
|
||||
; nextln: ret
|
||||
}
|
||||
|
||||
function %f23(i128, i32) -> i128 {
|
||||
; check: pushq %rbp
|
||||
; nextln: movq %rsp, %rbp
|
||||
|
||||
block0(v0: i128, v1: i32):
|
||||
v2 = sshr v0, v1
|
||||
return v2
|
||||
|
||||
; check: movq %rdi, %r8
|
||||
; nextln: movq %rsi, %rdi
|
||||
; nextln: movq %rdi, %rsi
|
||||
; nextln: movq %rdx, %rcx
|
||||
; nextln: sarq %cl, %rsi
|
||||
; nextln: movq %rdx, %rcx
|
||||
; nextln: sarq %cl, %r8
|
||||
; nextln: movl $$64, %ecx
|
||||
; nextln: subq %rdx, %rcx
|
||||
; nextln: movq %rdi, %rax
|
||||
; nextln: shlq %cl, %rax
|
||||
; nextln: orq %r8, %rax
|
||||
; nextln: sarq $$63, %rdi
|
||||
; nextln: xorq %rcx, %rcx
|
||||
; nextln: andq $$64, %rdx
|
||||
; nextln: cmovzq %rsi, %rdi
|
||||
; nextln: cmovzq %rax, %rcx
|
||||
; nextln: cmovnzq %rsi, %rcx
|
||||
; nextln: movq %rcx, %rax
|
||||
; nextln: movq %rdi, %rdx
|
||||
|
||||
; nextln: movq %rbp, %rsp
|
||||
; nextln: popq %rbp
|
||||
; nextln: ret
|
||||
}
|
||||
|
||||
function %f24(i128, i32) -> i128 {
|
||||
; check: pushq %rbp
|
||||
; nextln: movq %rsp, %rbp
|
||||
|
||||
block0(v0: i128, v1: i32):
|
||||
v2 = rotr.i128 v0, v1
|
||||
return v2
|
||||
|
||||
; check: movq %rsi, %r9
|
||||
; nextln: movq %rdx, %rcx
|
||||
; nextln: shrq %cl, %r9
|
||||
; nextln: movq %rdi, %rax
|
||||
; nextln: movq %rdx, %rcx
|
||||
; nextln: shrq %cl, %rax
|
||||
; nextln: movl $$64, %ecx
|
||||
; nextln: subq %rdx, %rcx
|
||||
; nextln: movq %rsi, %r10
|
||||
; nextln: shlq %cl, %r10
|
||||
; nextln: orq %rax, %r10
|
||||
; nextln: xorq %r8, %r8
|
||||
; nextln: xorq %rax, %rax
|
||||
; nextln: movq %rdx, %rcx
|
||||
; nextln: andq $$64, %rcx
|
||||
; nextln: cmovzq %r9, %r8
|
||||
; nextln: cmovzq %r10, %rax
|
||||
; nextln: cmovnzq %r9, %rax
|
||||
; nextln: movl $$128, %r9d
|
||||
; nextln: subq %rdx, %r9
|
||||
; nextln: movq %rdi, %rdx
|
||||
; nextln: movq %r9, %rcx
|
||||
; nextln: shlq %cl, %rdx
|
||||
; nextln: movq %r9, %rcx
|
||||
; nextln: shlq %cl, %rsi
|
||||
; nextln: movl $$64, %ecx
|
||||
; nextln: subq %r9, %rcx
|
||||
; nextln: movq %rdi, %r10
|
||||
; nextln: shrq %cl, %r10
|
||||
; nextln: orq %rsi, %r10
|
||||
; nextln: xorq %rsi, %rsi
|
||||
; nextln: xorq %rdi, %rdi
|
||||
; nextln: andq $$64, %r9
|
||||
; nextln: cmovzq %r10, %rdi
|
||||
; nextln: cmovzq %rdx, %rsi
|
||||
; nextln: cmovnzq %rdx, %rdi
|
||||
; nextln: orq %rax, %rsi
|
||||
; nextln: orq %r8, %rdi
|
||||
; nextln: movq %rsi, %rax
|
||||
; nextln: movq %rdi, %rdx
|
||||
|
||||
; nextln: movq %rbp, %rsp
|
||||
; nextln: popq %rbp
|
||||
; nextln: ret
|
||||
}
|
||||
|
||||
function %f25(i128, i32) -> i128 {
|
||||
; check: pushq %rbp
|
||||
; nextln: movq %rsp, %rbp
|
||||
|
||||
block0(v0: i128, v1: i32):
|
||||
v2 = rotl.i128 v0, v1
|
||||
return v2
|
||||
|
||||
; check: movq %rdi, %r9
|
||||
; nextln: movq %rdx, %rcx
|
||||
; nextln: shlq %cl, %r9
|
||||
; nextln: movq %rsi, %rax
|
||||
; nextln: movq %rdx, %rcx
|
||||
; nextln: shlq %cl, %rax
|
||||
; nextln: movl $$64, %ecx
|
||||
; nextln: subq %rdx, %rcx
|
||||
; nextln: movq %rdi, %r10
|
||||
; nextln: shrq %cl, %r10
|
||||
; nextln: orq %rax, %r10
|
||||
; nextln: xorq %r8, %r8
|
||||
; nextln: xorq %rax, %rax
|
||||
; nextln: movq %rdx, %rcx
|
||||
; nextln: andq $$64, %rcx
|
||||
; nextln: cmovzq %r10, %rax
|
||||
; nextln: cmovzq %r9, %r8
|
||||
; nextln: cmovnzq %r9, %rax
|
||||
; nextln: movl $$128, %r9d
|
||||
; nextln: subq %rdx, %r9
|
||||
; nextln: movq %rsi, %rdx
|
||||
; nextln: movq %r9, %rcx
|
||||
; nextln: shrq %cl, %rdx
|
||||
; nextln: movq %r9, %rcx
|
||||
; nextln: shrq %cl, %rdi
|
||||
; nextln: movl $$64, %ecx
|
||||
; nextln: subq %r9, %rcx
|
||||
; nextln: shlq %cl, %rsi
|
||||
; nextln: orq %rdi, %rsi
|
||||
; nextln: xorq %rdi, %rdi
|
||||
; nextln: xorq %rcx, %rcx
|
||||
; nextln: andq $$64, %r9
|
||||
; nextln: cmovzq %rdx, %rdi
|
||||
; nextln: cmovzq %rsi, %rcx
|
||||
; nextln: cmovnzq %rdx, %rcx
|
||||
; nextln: orq %r8, %rcx
|
||||
; nextln: orq %rax, %rdi
|
||||
; nextln: movq %rcx, %rax
|
||||
; nextln: movq %rdi, %rdx
|
||||
|
||||
; nextln: movq %rbp, %rsp
|
||||
; nextln: popq %rbp
|
||||
; nextln: ret
|
||||
}
|
||||
|
||||
function %f26(i128, i64) {
|
||||
function %f21(i128, i64) {
|
||||
; check: pushq %rbp
|
||||
; nextln: movq %rsp, %rbp
|
||||
|
||||
@@ -865,7 +662,7 @@ block0(v0: i128, v1: i64):
|
||||
; nextln: ret
|
||||
}
|
||||
|
||||
function %f27(i64) -> i128 {
|
||||
function %f22(i64) -> i128 {
|
||||
; check: pushq %rbp
|
||||
; nextln: movq %rsp, %rbp
|
||||
|
||||
@@ -883,7 +680,7 @@ block0(v0: i64):
|
||||
; nextln: ret
|
||||
}
|
||||
|
||||
function %f28(i128, b1) -> i128 {
|
||||
function %f23(i128, b1) -> i128 {
|
||||
block0(v0: i128, v1: b1):
|
||||
v2 = iconst.i128 0
|
||||
brnz v1, block1(v2)
|
||||
@@ -930,7 +727,7 @@ block2(v6: i128):
|
||||
|
||||
}
|
||||
|
||||
function %f29(i128, i128, i64, i128, i128, i128) -> i128 {
|
||||
function %f24(i128, i128, i64, i128, i128, i128) -> i128 {
|
||||
|
||||
block0(v0: i128, v1: i128, v2: i64, v3: i128, v4: i128, v5: i128):
|
||||
v6 = iadd.i128 v0, v1
|
||||
@@ -974,7 +771,7 @@ block0(v0: i128, v1: i128, v2: i64, v3: i128, v4: i128, v5: i128):
|
||||
|
||||
}
|
||||
|
||||
function %f30(i128) -> i128, i128, i128, i64, i128, i128 {
|
||||
function %f25(i128) -> i128, i128, i128, i64, i128, i128 {
|
||||
; check: pushq %rbp
|
||||
; nextln: movq %rsp, %rbp
|
||||
|
||||
@@ -996,7 +793,7 @@ block0(v0: i128):
|
||||
|
||||
}
|
||||
|
||||
function %f31(i128, i128) -> i128, i128 {
|
||||
function %f26(i128, i128) -> i128, i128 {
|
||||
fn0 = %g(i128, i128) -> i128, i128
|
||||
block0(v0: i128, v1: i128):
|
||||
v2, v3 = call fn0(v0, v1)
|
||||
@@ -1027,7 +824,7 @@ block0(v0: i128, v1: i128):
|
||||
|
||||
}
|
||||
|
||||
function %f32(i128) -> i128 {
|
||||
function %f27(i128) -> i128 {
|
||||
block0(v0: i128):
|
||||
v1 = clz.i128 v0
|
||||
return v1
|
||||
@@ -1056,7 +853,7 @@ block0(v0: i128):
|
||||
|
||||
}
|
||||
|
||||
function %f33(i128) -> i128 {
|
||||
function %f28(i128) -> i128 {
|
||||
block0(v0: i128):
|
||||
v1 = ctz.i128 v0
|
||||
return v1
|
||||
@@ -1080,3 +877,18 @@ block0(v0: i128):
|
||||
; nextln: movq %rbp, %rsp
|
||||
; nextln: popq %rbp
|
||||
; nextln: ret
|
||||
|
||||
function %f29(i8, i128) -> i8 {
|
||||
block0(v0: i8, v1: i128):
|
||||
v2 = ishl v0, v1
|
||||
return v2
|
||||
}
|
||||
|
||||
; check: pushq %rbp
|
||||
; nextln: movq %rsp, %rbp
|
||||
; nextln: movq %rsi, %rcx
|
||||
; nextln: shll %cl, %edi
|
||||
; nextln: movq %rdi, %rax
|
||||
; nextln: movq %rbp, %rsp
|
||||
; nextln: popq %rbp
|
||||
; nextln: ret
|
||||
|
||||
@@ -2,105 +2,63 @@ test run
|
||||
target x86_64
|
||||
feature "experimental_x64"
|
||||
|
||||
function %ishl1() -> b1 {
|
||||
block0:
|
||||
v0 = iconst.i64 0x01010101_01010101
|
||||
v1 = iconcat v0, v0
|
||||
v2 = iconst.i32 2
|
||||
v3 = ishl.i128 v1, v2
|
||||
v4 = iconst.i64 0x04040404_04040404
|
||||
v5 = iconcat v4, v4
|
||||
v6 = icmp eq v3, v5
|
||||
return v6
|
||||
function %ishl(i64, i64, i8) -> i64, i64 {
|
||||
block0(v0: i64, v1: i64, v2: i8):
|
||||
v3 = iconcat v0, v1
|
||||
v4 = ishl.i128 v3, v2
|
||||
v5, v6 = isplit v4
|
||||
return v5, v6
|
||||
}
|
||||
; run
|
||||
; run: %ishl(0x01010101_01010101, 0x01010101_01010101, 2) == [0x04040404_04040404, 0x04040404_04040404]
|
||||
; run: %ishl(0x01010101_01010101, 0x01010101_01010101, 9) == [0x02020202_02020200, 0x02020202_02020202]
|
||||
; run: %ishl(0x01010101_01010101, 0xffffffff_ffffffff, 66) == [0x00000000_00000000, 0x04040404_04040404]
|
||||
; run: %ishl(0x01010101_01010101, 0x01010101_01010101, 0) == [0x01010101_01010101, 0x01010101_01010101]
|
||||
; run: %ishl(0x01010101_01010101, 0x01010101_01010101, 128) == [0x01010101_01010101, 0x01010101_01010101]
|
||||
|
||||
function %ishl2() -> b1 {
|
||||
block0:
|
||||
v0 = iconst.i64 0x01010101_01010101
|
||||
v1 = iconst.i64 0x01010101_01010101
|
||||
v2 = iconcat v0, v1
|
||||
v3 = iconst.i32 9
|
||||
v4 = ishl.i128 v2, v3
|
||||
v5 = iconst.i64 0x02020202_02020200
|
||||
v6 = iconst.i64 0x02020202_02020202
|
||||
v7 = iconcat v5, v6
|
||||
v8 = icmp eq v4, v7
|
||||
return v8
|
||||
function %ushr(i64, i64, i8) -> i64, i64 {
|
||||
block0(v0: i64, v1: i64, v2: i8):
|
||||
v3 = iconcat v0, v1
|
||||
v4 = ushr.i128 v3, v2
|
||||
v5, v6 = isplit v4
|
||||
return v5, v6
|
||||
}
|
||||
; run
|
||||
; run: %ushr(0x01010101_01010101, 0x01010101_01010101, 2) == [0x40404040_40404040, 0x00404040_40404040]
|
||||
; run: %ushr(0x01010101_01010101, 0x01010101_01010101, 66) == [0x00404040_40404040, 0x00000000_00000000]
|
||||
; run: %ushr(0x01010101_01010101, 0x01010101_01010101, 0) == [0x01010101_01010101, 0x01010101_01010101]
|
||||
; run: %ushr(0x01010101_01010101, 0x01010101_01010101, 128) == [0x01010101_01010101, 0x01010101_01010101]
|
||||
|
||||
function %ishl3() -> b1 {
|
||||
block0:
|
||||
v0 = iconst.i64 0x01010101_01010101
|
||||
v1 = iconst.i64 0xffffffff_ffffffff
|
||||
v2 = iconcat v0, v1
|
||||
v3 = iconst.i32 66
|
||||
v4 = ishl.i128 v2, v3
|
||||
v5 = iconst.i64 0x00000000_00000000
|
||||
v6 = iconst.i64 0x04040404_04040404
|
||||
v7 = iconcat v5, v6
|
||||
v8 = icmp eq v4, v7
|
||||
return v8
|
||||
function %sshr(i64, i64, i8) -> i64, i64 {
|
||||
block0(v0: i64, v1: i64, v2: i8):
|
||||
v3 = iconcat v0, v1
|
||||
v4 = sshr.i128 v3, v2
|
||||
v5, v6 = isplit v4
|
||||
return v5, v6
|
||||
}
|
||||
; run
|
||||
; run: %sshr(0x01010101_01010101, 0x81010101_01010101, 2) == [0x40404040_40404040, 0xe0404040_40404040]
|
||||
; run: %sshr(0x12345678_9abcdef0, 0x80101010_10101010, 66) == [0xe0040404_04040404, 0xffffffff_ffffffff]
|
||||
; run: %sshr(0x12345678_9abcdef0, 0x80101010_10101010, 0) == [0x12345678_9abcdef0, 0x80101010_10101010]
|
||||
; run: %sshr(0x12345678_9abcdef0, 0x80101010_10101010, 128) == [0x12345678_9abcdef0, 0x80101010_10101010]
|
||||
|
||||
function %ushr1() -> b1 {
|
||||
block0:
|
||||
v0 = iconst.i64 0x01010101_01010101
|
||||
v1 = iconst.i64 0x01010101_01010101
|
||||
v2 = iconcat v0, v1
|
||||
v3 = iconst.i32 2
|
||||
v4 = ushr.i128 v2, v3
|
||||
v5 = iconst.i64 0x40404040_40404040
|
||||
v6 = iconst.i64 0x00404040_40404040
|
||||
v7 = iconcat v5, v6
|
||||
v8 = icmp eq v4, v7
|
||||
return v8
|
||||
function %rotl(i64, i64, i8) -> i64, i64 {
|
||||
block0(v0: i64, v1: i64, v2: i8):
|
||||
v3 = iconcat v0, v1
|
||||
v4 = rotl.i128 v3, v2
|
||||
v5, v6 = isplit v4
|
||||
return v5, v6
|
||||
}
|
||||
; run
|
||||
; run: %rotl(0x01010101_01010101, 0x01010101_01010101, 9) == [0x02020202_02020202, 0x02020202_02020202]
|
||||
; run: %rotl(0x01010101_01010101, 0x01010101_01010101, 73) == [0x02020202_02020202, 0x02020202_02020202]
|
||||
; run: %rotl(0x01010101_01010101, 0x01010101_01010101, 0) == [0x01010101_01010101, 0x01010101_01010101]
|
||||
; run: %rotl(0x01010101_01010101, 0x01010101_01010101, 128) == [0x01010101_01010101, 0x01010101_01010101]
|
||||
|
||||
function %ushr2() -> b1 {
|
||||
block0:
|
||||
v0 = iconst.i64 0x01010101_01010101
|
||||
v1 = iconst.i64 0x01010101_01010101
|
||||
v2 = iconcat v0, v1
|
||||
v3 = iconst.i32 66
|
||||
v4 = ushr.i128 v2, v3
|
||||
v5 = iconst.i64 0x00404040_40404040
|
||||
v6 = iconst.i64 0x00000000_00000000
|
||||
v7 = iconcat v5, v6
|
||||
v8 = icmp eq v4, v7
|
||||
return v8
|
||||
function %rotr(i64, i64, i8) -> i64, i64 {
|
||||
block0(v0: i64, v1: i64, v2: i8):
|
||||
v3 = iconcat v0, v1
|
||||
v4 = rotr.i128 v3, v2
|
||||
v5, v6 = isplit v4
|
||||
return v5, v6
|
||||
}
|
||||
; run
|
||||
|
||||
function %sshr1() -> b1 {
|
||||
block0:
|
||||
v0 = iconst.i64 0x01010101_01010101
|
||||
v1 = iconst.i64 0x81010101_01010101
|
||||
v2 = iconcat v0, v1
|
||||
v3 = iconst.i32 2
|
||||
v4 = sshr.i128 v2, v3
|
||||
v5 = iconst.i64 0x40404040_40404040
|
||||
v6 = iconst.i64 0xe0404040_40404040
|
||||
v7 = iconcat v5, v6
|
||||
v8 = icmp eq v4, v7
|
||||
return v8
|
||||
}
|
||||
; run
|
||||
|
||||
function %sshr2() -> b1 {
|
||||
block0:
|
||||
v0 = iconst.i64 0x12345678_9abcdef0
|
||||
v1 = iconst.i64 0x80101010_10101010
|
||||
v2 = iconcat v0, v1
|
||||
v3 = iconst.i32 66
|
||||
v4 = sshr.i128 v2, v3
|
||||
v5 = iconst.i64 0xe0040404_04040404
|
||||
v6 = iconst.i64 0xffffffff_ffffffff
|
||||
v7 = iconcat v5, v6
|
||||
v8 = icmp eq v4, v7
|
||||
return v8
|
||||
}
|
||||
; run
|
||||
; run: %rotr(0x01010101_01010101, 0x01010101_01010101, 9) == [0x80808080_80808080, 0x80808080_80808080]
|
||||
; run: %rotr(0x01010101_01010101, 0x01010101_01010101, 73) == [0x80808080_80808080, 0x80808080_80808080]
|
||||
; run: %rotr(0x01010101_01010101, 0x01010101_01010101, 0) == [0x01010101_01010101, 0x01010101_01010101]
|
||||
; run: %rotr(0x01010101_01010101, 0x01010101_01010101, 128) == [0x01010101_01010101, 0x01010101_01010101]
|
||||
|
||||
Reference in New Issue
Block a user