lukechilds
/
ethminer
mirror of https://github.com/lukechilds/ethminer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Revert not needed LLVM workarounds

cl-refactor
Paweł Bylica 10 years ago
parent
b4960f4f42
commit
f846adf915
2 changed files with 55 additions and 62 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 104
      libevmjit/Arith256.cpp
  2. 13
      libevmjit/Compiler.cpp

104
libevmjit/Arith256.cpp
View File

@ -360,18 +360,17 @@ llvm::Value* Arith256::mul(llvm::Value* _arg1, llvm::Value* _arg2)
std::pair<llvm::Value*, llvm::Value*> Arith256::div(llvm::Value* _arg1, llvm::Value* _arg2) std::pair<llvm::Value*, llvm::Value*> Arith256::div(llvm::Value* _arg1, llvm::Value* _arg2)
{ {
// FIXME: Disabled because of llvm::APInt::urem bug if (auto c1 = llvm::dyn_cast<llvm::ConstantInt>(_arg1))
// if (auto c1 = llvm::dyn_cast<llvm::ConstantInt>(_arg1)) {
// { if (auto c2 = llvm::dyn_cast<llvm::ConstantInt>(_arg2))
// if (auto c2 = llvm::dyn_cast<llvm::ConstantInt>(_arg2)) {
// { if (!c2->getValue())
// if (!c2->getValue()) return std::make_pair(Constant::get(0), Constant::get(0));
// return std::make_pair(Constant::get(0), Constant::get(0)); auto div = Constant::get(c1->getValue().udiv(c2->getValue()));
// auto div = Constant::get(c1->getValue().udiv(c2->getValue())); auto mod = Constant::get(c1->getValue().urem(c2->getValue()));
// auto mod = Constant::get(c1->getValue().urem(c2->getValue())); return std::make_pair(div, mod);
// return std::make_pair(div, mod); }
// } }
// }
auto r = createCall(getDivFunc(Type::Word), {_arg1, _arg2}); auto r = createCall(getDivFunc(Type::Word), {_arg1, _arg2});
auto div = m_builder.CreateExtractValue(r, 0, "div"); auto div = m_builder.CreateExtractValue(r, 0, "div");
@ -381,18 +380,17 @@ std::pair<llvm::Value*, llvm::Value*> Arith256::div(llvm::Value* _arg1, llvm::Va
std::pair<llvm::Value*, llvm::Value*> Arith256::sdiv(llvm::Value* _x, llvm::Value* _y) std::pair<llvm::Value*, llvm::Value*> Arith256::sdiv(llvm::Value* _x, llvm::Value* _y)
{ {
// FIXME: Disabled because of llvm::APInt::urem bug if (auto c1 = llvm::dyn_cast<llvm::ConstantInt>(_x))
// if (auto c1 = llvm::dyn_cast<llvm::ConstantInt>(_x)) {
// { if (auto c2 = llvm::dyn_cast<llvm::ConstantInt>(_y))
// if (auto c2 = llvm::dyn_cast<llvm::ConstantInt>(_y)) {
// { if (!c2->getValue())
// if (!c2->getValue()) return std::make_pair(Constant::get(0), Constant::get(0));
// return std::make_pair(Constant::get(0), Constant::get(0)); auto div = Constant::get(c1->getValue().sdiv(c2->getValue()));
// auto div = Constant::get(c1->getValue().sdiv(c2->getValue())); auto mod = Constant::get(c1->getValue().srem(c2->getValue()));
// auto mod = Constant::get(c1->getValue().srem(c2->getValue())); return std::make_pair(div, mod);
// return std::make_pair(div, mod); }
// } }
// }
auto xIsNeg = m_builder.CreateICmpSLT(_x, Constant::get(0)); auto xIsNeg = m_builder.CreateICmpSLT(_x, Constant::get(0));
auto xNeg = m_builder.CreateSub(Constant::get(0), _x); auto xNeg = m_builder.CreateSub(Constant::get(0), _x);
@ -447,42 +445,40 @@ llvm::Value* Arith256::exp(llvm::Value* _arg1, llvm::Value* _arg2)
llvm::Value* Arith256::addmod(llvm::Value* _arg1, llvm::Value* _arg2, llvm::Value* _arg3) llvm::Value* Arith256::addmod(llvm::Value* _arg1, llvm::Value* _arg2, llvm::Value* _arg3)
{ {
// FIXME: Disabled because of llvm::APInt::urem bug if (auto c1 = llvm::dyn_cast<llvm::ConstantInt>(_arg1))
// if (auto c1 = llvm::dyn_cast<llvm::ConstantInt>(_arg1)) {
// { if (auto c2 = llvm::dyn_cast<llvm::ConstantInt>(_arg2))
// if (auto c2 = llvm::dyn_cast<llvm::ConstantInt>(_arg2)) {
// { if (auto c3 = llvm::dyn_cast<llvm::ConstantInt>(_arg3))
// if (auto c3 = llvm::dyn_cast<llvm::ConstantInt>(_arg3)) {
// { if (!c3->getValue())
// if (!c3->getValue()) return Constant::get(0);
// return Constant::get(0); auto s = c1->getValue().zext(256+64) + c2->getValue().zext(256+64);
// auto s = c1->getValue().zext(256+64) + c2->getValue().zext(256+64); auto r = s.urem(c3->getValue().zext(256+64)).trunc(256);
// auto r = s.urem(c3->getValue().zext(256+64)).trunc(256); return Constant::get(r);
// return Constant::get(r); }
// } }
// } }
// }
return createCall(getAddModFunc(), {_arg1, _arg2, _arg3}); return createCall(getAddModFunc(), {_arg1, _arg2, _arg3});
} }
llvm::Value* Arith256::mulmod(llvm::Value* _arg1, llvm::Value* _arg2, llvm::Value* _arg3) llvm::Value* Arith256::mulmod(llvm::Value* _arg1, llvm::Value* _arg2, llvm::Value* _arg3)
{ {
// FIXME: Disabled because of llvm::APInt::urem bug if (auto c1 = llvm::dyn_cast<llvm::ConstantInt>(_arg1))
// if (auto c1 = llvm::dyn_cast<llvm::ConstantInt>(_arg1)) {
// { if (auto c2 = llvm::dyn_cast<llvm::ConstantInt>(_arg2))
// if (auto c2 = llvm::dyn_cast<llvm::ConstantInt>(_arg2)) {
// { if (auto c3 = llvm::dyn_cast<llvm::ConstantInt>(_arg3))
// if (auto c3 = llvm::dyn_cast<llvm::ConstantInt>(_arg3)) {
// { if (!c3->getValue())
// if (!c3->getValue()) return Constant::get(0);
// return Constant::get(0); auto p = c1->getValue().zext(512) * c2->getValue().zext(512);
// auto p = c1->getValue().zext(512) * c2->getValue().zext(512); auto r = p.urem(c3->getValue().zext(512)).trunc(256);
// auto r = p.urem(c3->getValue().zext(512)).trunc(256); return Constant::get(r);
// return Constant::get(r); }
// } }
// } }
// }
return createCall(getMulModFunc(), {_arg1, _arg2, _arg3}); return createCall(getMulModFunc(), {_arg1, _arg2, _arg3});
} }

13
libevmjit/Compiler.cpp
View File

@ -417,17 +417,14 @@ void Compiler::compileBasicBlock(BasicBlock& _basicBlock, RuntimeManager& _runti
case Instruction::BYTE: case Instruction::BYTE:
{ {
const auto byteNum = stack.pop(); const auto idx = stack.pop();
auto value = stack.pop(); auto value = Endianness::toBE(m_builder, stack.pop());
value = Endianness::toBE(m_builder, value); auto idxValid = m_builder.CreateICmpULT(idx, Constant::get(32), "idxValid");
auto bytes = m_builder.CreateBitCast(value, llvm::VectorType::get(Type::Byte, 32), "bytes"); auto bytes = m_builder.CreateBitCast(value, llvm::VectorType::get(Type::Byte, 32), "bytes");
auto safeByteNum = m_builder.CreateZExt(m_builder.CreateTrunc(byteNum, m_builder.getIntNTy(5)), Type::lowPrecision); // Trim index, large values can crash auto byte = m_builder.CreateExtractElement(bytes, idx, "byte");
auto byte = m_builder.CreateExtractElement(bytes, safeByteNum, "byte");
value = m_builder.CreateZExt(byte, Type::Word); value = m_builder.CreateZExt(byte, Type::Word);
value = m_builder.CreateSelect(idxValid, value, Constant::get(0));
auto byteNumValid = m_builder.CreateICmpULT(byteNum, Constant::get(32));
value = m_builder.CreateSelect(byteNumValid, value, Constant::get(0));
stack.push(value); stack.push(value);
break; break;
} }

Write Preview
Loading…
Cancel
Save