Skip to content

S
swiftshader
Commit 55f2e6d3 by David Sehr
Options

Optimize 64-bit shifts by constants for x86-32

Hopefully improves perf in fpclassifyd in ammp spec test. BUG=none R=stichnot@chromium.org Review URL: https://codereview.chromium.org/1351133003 .
parent 43632b95
Showing with 111 additions and 8 deletions
crosstest/test_arith.def
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
#define INT_VALUE_ARRAY \ #define INT_VALUE_ARRAY \
{ 0x0, 0x1, 0x7ffffffe, 0x7fffffff, \ { 0x0, 0x1, 0x7ffffffe, 0x7fffffff, \
0x80000000, 0x80000001, 0xfffffffe, 0xffffffff, \ 0x80000000, 0x80000001, 0xfffffffe, 0xffffffff, \
0x1e, 0x1f, 0x20, 0x21, 0x3e, 0x3f, 0x40, 0x41, \
0x7e, 0x7f, 0x80, 0x81, \ 0x7e, 0x7f, 0x80, 0x81, \
0xfe, 0xff, 0x100, 0x101, \ 0xfe, 0xff, 0x100, 0x101, \
0x7ffe, 0x7fff, 0x8000, 0x8001, \ 0x7ffe, 0x7fff, 0x8000, 0x8001, \
......
src/IceInstX86Base.h
...@@ -2103,7 +2103,7 @@ template <class Machine> class InstX86Shld final : public InstX86Base<Machine> { ...@@ -2103,7 +2103,7 @@ template <class Machine> class InstX86Shld final : public InstX86Base<Machine> {
public: public:
static InstX86Shld *create(Cfg *Func, Variable *Dest, Variable *Source1, static InstX86Shld *create(Cfg *Func, Variable *Dest, Variable *Source1,
Variable *Source2) { Operand *Source2) {
return new (Func->allocate<InstX86Shld>()) return new (Func->allocate<InstX86Shld>())
InstX86Shld(Func, Dest, Source1, Source2); InstX86Shld(Func, Dest, Source1, Source2);
} }
...@@ -2115,7 +2115,7 @@ public: ...@@ -2115,7 +2115,7 @@ public:
} }
private: private:
InstX86Shld(Cfg *Func, Variable *Dest, Variable *Source1, Variable *Source2); InstX86Shld(Cfg *Func, Variable *Dest, Variable *Source1, Operand *Source2);
}; };
/// Shrd instruction - shift across a pair of operands. /// Shrd instruction - shift across a pair of operands.
...@@ -2126,7 +2126,7 @@ template <class Machine> class InstX86Shrd final : public InstX86Base<Machine> { ...@@ -2126,7 +2126,7 @@ template <class Machine> class InstX86Shrd final : public InstX86Base<Machine> {
public: public:
static InstX86Shrd *create(Cfg *Func, Variable *Dest, Variable *Source1, static InstX86Shrd *create(Cfg *Func, Variable *Dest, Variable *Source1,
Variable *Source2) { Operand *Source2) {
return new (Func->allocate<InstX86Shrd>()) return new (Func->allocate<InstX86Shrd>())
InstX86Shrd(Func, Dest, Source1, Source2); InstX86Shrd(Func, Dest, Source1, Source2);
} }
...@@ -2138,7 +2138,7 @@ public: ...@@ -2138,7 +2138,7 @@ public:
} }
private: private:
InstX86Shrd(Cfg *Func, Variable *Dest, Variable *Source1, Variable *Source2); InstX86Shrd(Cfg *Func, Variable *Dest, Variable *Source1, Operand *Source2);
}; };
/// Conditional move instruction. /// Conditional move instruction.
......
src/IceInstX86BaseImpl.h
...@@ -74,7 +74,7 @@ InstX86Mul<Machine>::InstX86Mul(Cfg *Func, Variable *Dest, Variable *Source1, ...@@ -74,7 +74,7 @@ InstX86Mul<Machine>::InstX86Mul(Cfg *Func, Variable *Dest, Variable *Source1,
template <class Machine> template <class Machine>
InstX86Shld<Machine>::InstX86Shld(Cfg *Func, Variable *Dest, Variable *Source1, InstX86Shld<Machine>::InstX86Shld(Cfg *Func, Variable *Dest, Variable *Source1,
Variable *Source2) Operand *Source2)
: InstX86Base<Machine>(Func, InstX86Base<Machine>::Shld, 3, Dest) { : InstX86Base<Machine>(Func, InstX86Base<Machine>::Shld, 3, Dest) {
this->addSource(Dest); this->addSource(Dest);
this->addSource(Source1); this->addSource(Source1);
...@@ -83,7 +83,7 @@ InstX86Shld<Machine>::InstX86Shld(Cfg *Func, Variable *Dest, Variable *Source1, ...@@ -83,7 +83,7 @@ InstX86Shld<Machine>::InstX86Shld(Cfg *Func, Variable *Dest, Variable *Source1,
template <class Machine> template <class Machine>
InstX86Shrd<Machine>::InstX86Shrd(Cfg *Func, Variable *Dest, Variable *Source1, InstX86Shrd<Machine>::InstX86Shrd(Cfg *Func, Variable *Dest, Variable *Source1,
Variable *Source2) Operand *Source2)
: InstX86Base<Machine>(Func, InstX86Base<Machine>::Shrd, 3, Dest) { : InstX86Base<Machine>(Func, InstX86Base<Machine>::Shrd, 3, Dest) {
this->addSource(Dest); this->addSource(Dest);
this->addSource(Source1); this->addSource(Source1);
......
src/IceTargetLoweringX86Base.h
...@@ -568,13 +568,13 @@ protected: ...@@ -568,13 +568,13 @@ protected:
void _shl(Variable *Dest, Operand *Src0) { void _shl(Variable *Dest, Operand *Src0) {
Context.insert(Traits::Insts::Shl::create(Func, Dest, Src0)); Context.insert(Traits::Insts::Shl::create(Func, Dest, Src0));
} }
void _shld(Variable *Dest, Variable *Src0, Variable *Src1) { void _shld(Variable *Dest, Variable *Src0, Operand *Src1) {
Context.insert(Traits::Insts::Shld::create(Func, Dest, Src0, Src1)); Context.insert(Traits::Insts::Shld::create(Func, Dest, Src0, Src1));
} }
void _shr(Variable *Dest, Operand *Src0) { void _shr(Variable *Dest, Operand *Src0) {
Context.insert(Traits::Insts::Shr::create(Func, Dest, Src0)); Context.insert(Traits::Insts::Shr::create(Func, Dest, Src0));
} }
void _shrd(Variable *Dest, Variable *Src0, Variable *Src1) { void _shrd(Variable *Dest, Variable *Src0, Operand *Src1) {
Context.insert(Traits::Insts::Shrd::create(Func, Dest, Src0, Src1)); Context.insert(Traits::Insts::Shrd::create(Func, Dest, Src0, Src1));
} }
void _shufps(Variable *Dest, Operand *Src0, Operand *Src1) { void _shufps(Variable *Dest, Operand *Src0, Operand *Src1) {
......
tests_lit/llvm2ice_tests/shift.ll
...@@ -112,3 +112,105 @@ entry: ...@@ -112,3 +112,105 @@ entry:
} }
; CHECK-LABEL: ashrImmNeg ; CHECK-LABEL: ashrImmNeg
; CHECK: sar {{.*}},0xff ; CHECK: sar {{.*}},0xff
define i64 @shlImm64One(i64 %val) {
entry:
%result = shl i64 %val, 1
ret i64 %result
}
; CHECK-LABEL: shlImm64One
; CHECK: shl {{.*}},1
define i64 @shlImm64LessThan32(i64 %val) {
entry:
%result = shl i64 %val, 4
ret i64 %result
}
; CHECK-LABEL: shlImm64LessThan32
; CHECK: shl {{.*}},0x4
define i64 @shlImm64Equal32(i64 %val) {
entry:
%result = shl i64 %val, 32
ret i64 %result
}
; CHECK-LABEL: shlImm64Equal32
; CHECK-NOT: shl
define i64 @shlImm64GreaterThan32(i64 %val) {
entry:
%result = shl i64 %val, 40
ret i64 %result
}
; CHECK-LABEL: shlImm64GreaterThan32
; CHECK: shl {{.*}},0x8
define i64 @lshrImm64One(i64 %val) {
entry:
%result = lshr i64 %val, 1
ret i64 %result
}
; CHECK-LABEL: lshrImm64One
; CHECK: shr {{.*}},1
define i64 @lshrImm64LessThan32(i64 %val) {
entry:
%result = lshr i64 %val, 4
ret i64 %result
}
; CHECK-LABEL: lshrImm64LessThan32
; CHECK: shrd {{.*}},0x4
; CHECK: shr {{.*}},0x4
define i64 @lshrImm64Equal32(i64 %val) {
entry:
%result = lshr i64 %val, 32
ret i64 %result
}
; CHECK-LABEL: lshrImm64Equal32
; CHECK-NOT: shr
define i64 @lshrImm64GreaterThan32(i64 %val) {
entry:
%result = lshr i64 %val, 40
ret i64 %result
}
; CHECK-LABEL: lshrImm64GreaterThan32
; CHECK-NOT: shrd
; CHECK: shr {{.*}},0x8
define i64 @ashrImm64One(i64 %val) {
entry:
%result = ashr i64 %val, 1
ret i64 %result
}
; CHECK-LABEL: ashrImm64One
; CHECK: shrd {{.*}},0x1
; CHECK: sar {{.*}},1
define i64 @ashrImm64LessThan32(i64 %val) {
entry:
%result = ashr i64 %val, 4
ret i64 %result
}
; CHECK-LABEL: ashrImm64LessThan32
; CHECK: shrd {{.*}},0x4
; CHECK: sar {{.*}},0x4
define i64 @ashrImm64Equal32(i64 %val) {
entry:
%result = ashr i64 %val, 32
ret i64 %result
}
; CHECK-LABEL: ashrImm64Equal32
; CHECK: sar {{.*}},0x1f
; CHECK-NOT: shrd
define i64 @ashrImm64GreaterThan32(i64 %val) {
entry:
%result = ashr i64 %val, 40
ret i64 %result
}
; CHECK-LABEL: ashrImm64GreaterThan32
; CHECK: sar {{.*}},0x1f
; CHECK: shrd {{.*}},0x8
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment