narayana
/
ravi
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

in arithmetic operations use constants directly when possible

Browse Source
pull/81/head
Dibyendu Majumdar 9 years ago
parent e094d07618
commit e36acf332b
7 changed files with 68 additions and 85 deletions
Show Stats Download Patch File Download Diff File

4
include/ravi_llvmcodegen.h
Unescape View File

@ -676,6 +676,10 @@ public:
// constant
llvm::Value *emit_load_register_or_constant_i(RaviFunctionDef *def, int K);
// Load a register or constant - if constant is int then return a direct LLVM
// constant
llvm::Value *emit_load_register_or_constant_n(RaviFunctionDef *def, int K);
// emit code to load the lua_Number value from register
llvm::Instruction *emit_load_reg_n(RaviFunctionDef *def, llvm::Value *ra);

1
ravi-tests/basics.lua
Unescape View File

@ -295,6 +295,7 @@ print("test SUBNF ok")
x=function() local a: integer = 42; return a-5; end
ravi.dumplua(x)
assert(ravi.compile(x))
--ravi.dumpllvm(x)
assert(x() == 37)
print("test SUBIN ok")

2
ravi-tests/fannkuchen.ravi
Unescape View File

@ -69,7 +69,7 @@ local function fannkuch(n: integer)
end
local n = tonumber(arg and arg[1]) or 11
assert(ravi.compile(fannkuch,1))
assert(ravi.compile(fannkuch))
local t1 = os.clock()
local sum, flips = fannkuch(n)
local t2 = os.clock()

7
ravi-tests/matmul1.ravi
Unescape View File

@ -156,13 +156,10 @@ print("time taken ", t2-t1)
local y: integer = cast(n/2+1, "integer")
print(matrix.getrow(a, y)[y])
--ravi.dumplua(matrix.mul)
--matrix.print(matrix.gen(2))
--matrix.print(matrix.T(matrix.gen(2)))
--matrix.print(matrix.mul(matrix.gen(2), matrix.gen(2)))
--ravi.dumpllvmasm(matrix.mul2)
--ravi.dumpllvm(matrix.mul2)
-- ravi.dumplua(matrix.mul)
--ravi.dumplua(matrix.gen)

122
src/ravi_llvmarith1.cpp
Unescape View File

@ -65,11 +65,9 @@ void RaviCodeGenerator::emit_ADDFN(RaviFunctionDef *def, int A, int B, int C) {
void RaviCodeGenerator::emit_ADDFF(RaviFunctionDef *def, int A, int B, int C) {
emit_load_base(def);
llvm::Value *ra = emit_gep_register(def, A);
llvm::Value *rb = emit_gep_register_or_constant(def, B);
llvm::Value *rc = emit_gep_register_or_constant(def, C);
llvm::Instruction *lhs = emit_load_reg_n(def, rb);
llvm::Instruction *rhs = emit_load_reg_n(def, rc);
llvm::Value *result = def->builder->CreateFAdd(lhs, rhs);
llvm::Value *rb = emit_load_register_or_constant_n(def, B);
llvm::Value *rc = emit_load_register_or_constant_n(def, C);
llvm::Value *result = def->builder->CreateFAdd(rb, rc);
emit_store_reg_n_withtype(def, result, ra);
}
@ -77,12 +75,10 @@ void RaviCodeGenerator::emit_ADDFF(RaviFunctionDef *def, int A, int B, int C) {
void RaviCodeGenerator::emit_ADDFI(RaviFunctionDef *def, int A, int B, int C) {
emit_load_base(def);
llvm::Value *ra = emit_gep_register(def, A);
llvm::Value *rb = emit_gep_register_or_constant(def, B);
llvm::Value *rc = emit_gep_register_or_constant(def, C);
llvm::Instruction *lhs = emit_load_reg_n(def, rb);
llvm::Instruction *rhs = emit_load_reg_i(def, rc);
llvm::Value *rb = emit_load_register_or_constant_n(def, B);
llvm::Value *rc = emit_load_register_or_constant_i(def, C);
llvm::Value *result = def->builder->CreateFAdd(
lhs, def->builder->CreateSIToFP(rhs, def->types->lua_NumberT));
rb, def->builder->CreateSIToFP(rc, def->types->lua_NumberT));
emit_store_reg_n_withtype(def, result, ra);
}
@ -91,11 +87,9 @@ void RaviCodeGenerator::emit_ADDII(RaviFunctionDef *def, int A, int B, int C) {
emit_load_base(def);
llvm::Value *ra = emit_gep_register(def, A);
llvm::Value *rb = emit_gep_register_or_constant(def, B);
llvm::Value *rc = emit_gep_register_or_constant(def, C);
llvm::Instruction *lhs = emit_load_reg_i(def, rb);
llvm::Instruction *rhs = emit_load_reg_i(def, rc);
llvm::Value *result = def->builder->CreateAdd(lhs, rhs, "", false, true);
llvm::Value *rb = emit_load_register_or_constant_i(def, B);
llvm::Value *rc = emit_load_register_or_constant_i(def, C);
llvm::Value *result = def->builder->CreateAdd(rb, rc, "", false, true);
emit_store_reg_i_withtype(def, result, ra);
}
@ -115,11 +109,9 @@ void RaviCodeGenerator::emit_ADDIN(RaviFunctionDef *def, int A, int B, int C) {
void RaviCodeGenerator::emit_SUBFF(RaviFunctionDef *def, int A, int B, int C) {
emit_load_base(def);
llvm::Value *ra = emit_gep_register(def, A);
llvm::Value *rb = emit_gep_register_or_constant(def, B);
llvm::Value *rc = emit_gep_register_or_constant(def, C);
llvm::Instruction *lhs = emit_load_reg_n(def, rb);
llvm::Instruction *rhs = emit_load_reg_n(def, rc);
llvm::Value *result = def->builder->CreateFSub(lhs, rhs);
llvm::Value *rb = emit_load_register_or_constant_n(def, B);
llvm::Value *rc = emit_load_register_or_constant_n(def, C);
llvm::Value *result = def->builder->CreateFSub(rb, rc);
emit_store_reg_n_withtype(def, result, ra);
}
@ -127,12 +119,10 @@ void RaviCodeGenerator::emit_SUBFF(RaviFunctionDef *def, int A, int B, int C) {
void RaviCodeGenerator::emit_SUBFI(RaviFunctionDef *def, int A, int B, int C) {
emit_load_base(def);
llvm::Value *ra = emit_gep_register(def, A);
llvm::Value *rb = emit_gep_register_or_constant(def, B);
llvm::Value *rc = emit_gep_register_or_constant(def, C);
llvm::Instruction *lhs = emit_load_reg_n(def, rb);
llvm::Instruction *rhs = emit_load_reg_i(def, rc);
llvm::Value *rb = emit_load_register_or_constant_n(def, B);
llvm::Value *rc = emit_load_register_or_constant_i(def, C);
llvm::Value *result = def->builder->CreateFSub(
lhs, def->builder->CreateSIToFP(rhs, def->types->lua_NumberT));
rb, def->builder->CreateSIToFP(rc, def->types->lua_NumberT));
emit_store_reg_n_withtype(def, result, ra);
}
@ -140,12 +130,10 @@ void RaviCodeGenerator::emit_SUBFI(RaviFunctionDef *def, int A, int B, int C) {
void RaviCodeGenerator::emit_SUBIF(RaviFunctionDef *def, int A, int B, int C) {
emit_load_base(def);
llvm::Value *ra = emit_gep_register(def, A);
llvm::Value *rb = emit_gep_register_or_constant(def, B);
llvm::Value *rc = emit_gep_register_or_constant(def, C);
llvm::Instruction *lhs = emit_load_reg_i(def, rb);
llvm::Instruction *rhs = emit_load_reg_n(def, rc);
llvm::Value *rb = emit_load_register_or_constant_i(def, B);
llvm::Value *rc = emit_load_register_or_constant_n(def, C);
llvm::Value *result = def->builder->CreateFSub(
def->builder->CreateSIToFP(lhs, def->types->lua_NumberT), rhs);
def->builder->CreateSIToFP(rb, def->types->lua_NumberT), rc);
emit_store_reg_n_withtype(def, result, ra);
}
@ -153,11 +141,9 @@ void RaviCodeGenerator::emit_SUBIF(RaviFunctionDef *def, int A, int B, int C) {
void RaviCodeGenerator::emit_SUBII(RaviFunctionDef *def, int A, int B, int C) {
emit_load_base(def);
llvm::Value *ra = emit_gep_register(def, A);
llvm::Value *rb = emit_gep_register_or_constant(def, B);
llvm::Value *rc = emit_gep_register_or_constant(def, C);
llvm::Instruction *lhs = emit_load_reg_i(def, rb);
llvm::Instruction *rhs = emit_load_reg_i(def, rc);
llvm::Value *result = def->builder->CreateSub(lhs, rhs, "", false, true);
llvm::Value *rb = emit_load_register_or_constant_i(def, B);
llvm::Value *rc = emit_load_register_or_constant_i(def, C);
llvm::Value *result = def->builder->CreateSub(rb, rc, "", false, true);
emit_store_reg_i_withtype(def, result, ra);
}
@ -215,10 +201,9 @@ void RaviCodeGenerator::emit_SUBNI(RaviFunctionDef *def, int A, int B, int C) {
void RaviCodeGenerator::emit_MULFN(RaviFunctionDef *def, int A, int B, int C) {
emit_load_base(def);
llvm::Value *ra = emit_gep_register(def, A);
llvm::Value *rb = emit_gep_register_or_constant(def, B);
llvm::Instruction *lhs = emit_load_reg_n(def, rb);
llvm::Value *rb = emit_load_register_or_constant_n(def, B);
llvm::Value *result = def->builder->CreateFMul(
lhs,
rb,
def->builder->CreateSIToFP(llvm::ConstantInt::get(def->types->C_intT, C),
def->types->lua_NumberT));
emit_store_reg_n_withtype(def, result, ra);
@ -228,11 +213,9 @@ void RaviCodeGenerator::emit_MULFN(RaviFunctionDef *def, int A, int B, int C) {
void RaviCodeGenerator::emit_MULFF(RaviFunctionDef *def, int A, int B, int C) {
emit_load_base(def);
llvm::Value *ra = emit_gep_register(def, A);
llvm::Value *rb = emit_gep_register_or_constant(def, B);
llvm::Value *rc = emit_gep_register_or_constant(def, C);
llvm::Instruction *lhs = emit_load_reg_n(def, rb);
llvm::Instruction *rhs = emit_load_reg_n(def, rc);
llvm::Value *result = def->builder->CreateFMul(lhs, rhs);
llvm::Value *rb = emit_load_register_or_constant_n(def, B);
llvm::Value *rc = emit_load_register_or_constant_n(def, C);
llvm::Value *result = def->builder->CreateFMul(rb, rc);
emit_store_reg_n_withtype(def, result, ra);
}
@ -240,12 +223,10 @@ void RaviCodeGenerator::emit_MULFF(RaviFunctionDef *def, int A, int B, int C) {
void RaviCodeGenerator::emit_MULFI(RaviFunctionDef *def, int A, int B, int C) {
emit_load_base(def);
llvm::Value *ra = emit_gep_register(def, A);
llvm::Value *rb = emit_gep_register_or_constant(def, B);
llvm::Value *rc = emit_gep_register_or_constant(def, C);
llvm::Instruction *lhs = emit_load_reg_n(def, rb);
llvm::Instruction *rhs = emit_load_reg_i(def, rc);
llvm::Value *rb = emit_load_register_or_constant_n(def, B);
llvm::Value *rc = emit_load_register_or_constant_i(def, C);
llvm::Value *result = def->builder->CreateFMul(
lhs, def->builder->CreateSIToFP(rhs, def->types->lua_NumberT));
rb, def->builder->CreateSIToFP(rc, def->types->lua_NumberT));
emit_store_reg_n_withtype(def, result, ra);
}
@ -254,11 +235,9 @@ void RaviCodeGenerator::emit_MULII(RaviFunctionDef *def, int A, int B, int C) {
emit_load_base(def);
llvm::Value *ra = emit_gep_register(def, A);
llvm::Value *rb = emit_gep_register_or_constant(def, B);
llvm::Value *rc = emit_gep_register_or_constant(def, C);
llvm::Instruction *lhs = emit_load_reg_i(def, rb);
llvm::Instruction *rhs = emit_load_reg_i(def, rc);
llvm::Value *result = def->builder->CreateMul(lhs, rhs, "", false, true);
llvm::Value *rb = emit_load_register_or_constant_i(def, B);
llvm::Value *rc = emit_load_register_or_constant_i(def, C);
llvm::Value *result = def->builder->CreateMul(rb, rc, "", false, true);
emit_store_reg_i_withtype(def, result, ra);
}
@ -278,11 +257,9 @@ void RaviCodeGenerator::emit_MULIN(RaviFunctionDef *def, int A, int B, int C) {
void RaviCodeGenerator::emit_DIVFF(RaviFunctionDef *def, int A, int B, int C) {
emit_load_base(def);
llvm::Value *ra = emit_gep_register(def, A);
llvm::Value *rb = emit_gep_register_or_constant(def, B);
llvm::Value *rc = emit_gep_register_or_constant(def, C);
llvm::Instruction *lhs = emit_load_reg_n(def, rb);
llvm::Instruction *rhs = emit_load_reg_n(def, rc);
llvm::Value *result = def->builder->CreateFDiv(lhs, rhs);
llvm::Value *rb = emit_load_register_or_constant_n(def, B);
llvm::Value *rc = emit_load_register_or_constant_n(def, C);
llvm::Value *result = def->builder->CreateFDiv(rb, rc);
emit_store_reg_n_withtype(def, result, ra);
}
@ -290,12 +267,10 @@ void RaviCodeGenerator::emit_DIVFF(RaviFunctionDef *def, int A, int B, int C) {
void RaviCodeGenerator::emit_DIVFI(RaviFunctionDef *def, int A, int B, int C) {
emit_load_base(def);
llvm::Value *ra = emit_gep_register(def, A);
llvm::Value *rb = emit_gep_register_or_constant(def, B);
llvm::Value *rc = emit_gep_register_or_constant(def, C);
llvm::Instruction *lhs = emit_load_reg_n(def, rb);
llvm::Instruction *rhs = emit_load_reg_i(def, rc);
llvm::Value *rb = emit_load_register_or_constant_n(def, B);
llvm::Value *rc = emit_load_register_or_constant_i(def, C);
llvm::Value *result = def->builder->CreateFDiv(
lhs, def->builder->CreateSIToFP(rhs, def->types->lua_NumberT));
rb, def->builder->CreateSIToFP(rc, def->types->lua_NumberT));
emit_store_reg_n_withtype(def, result, ra);
}
@ -303,12 +278,10 @@ void RaviCodeGenerator::emit_DIVFI(RaviFunctionDef *def, int A, int B, int C) {
void RaviCodeGenerator::emit_DIVIF(RaviFunctionDef *def, int A, int B, int C) {
emit_load_base(def);
llvm::Value *ra = emit_gep_register(def, A);
llvm::Value *rb = emit_gep_register_or_constant(def, B);
llvm::Value *rc = emit_gep_register_or_constant(def, C);
llvm::Instruction *lhs = emit_load_reg_i(def, rb);
llvm::Instruction *rhs = emit_load_reg_n(def, rc);
llvm::Value *rb = emit_load_register_or_constant_i(def, B);
llvm::Value *rc = emit_load_register_or_constant_n(def, C);
llvm::Value *result = def->builder->CreateFDiv(
def->builder->CreateSIToFP(lhs, def->types->lua_NumberT), rhs);
def->builder->CreateSIToFP(rb, def->types->lua_NumberT), rc);
emit_store_reg_n_withtype(def, result, ra);
}
@ -316,13 +289,11 @@ void RaviCodeGenerator::emit_DIVIF(RaviFunctionDef *def, int A, int B, int C) {
void RaviCodeGenerator::emit_DIVII(RaviFunctionDef *def, int A, int B, int C) {
emit_load_base(def);
llvm::Value *ra = emit_gep_register(def, A);
llvm::Value *rb = emit_gep_register_or_constant(def, B);
llvm::Value *rc = emit_gep_register_or_constant(def, C);
llvm::Instruction *lhs = emit_load_reg_i(def, rb);
llvm::Instruction *rhs = emit_load_reg_i(def, rc);
llvm::Value *rb = emit_load_register_or_constant_i(def, B);
llvm::Value *rc = emit_load_register_or_constant_i(def, C);
llvm::Value *result = def->builder->CreateFDiv(
def->builder->CreateSIToFP(lhs, def->types->lua_NumberT),
def->builder->CreateSIToFP(rhs, def->types->lua_NumberT));
def->builder->CreateSIToFP(rb, def->types->lua_NumberT),
def->builder->CreateSIToFP(rc, def->types->lua_NumberT));
emit_store_reg_n_withtype(def, result, ra);
}
@ -333,8 +304,6 @@ void RaviCodeGenerator::emit_BITWISE_BINARY_OP(RaviFunctionDef *def, OpCode op,
emit_load_base(def);
llvm::Value *ra = emit_gep_register(def, A);
// llvm::Value *rb = emit_gep_register_or_constant(def, B);
// llvm::Value *rc = emit_gep_register_or_constant(def, C);
llvm::Value *lhs = emit_load_register_or_constant_i(def, B);
llvm::Value *rhs = emit_load_register_or_constant_i(def, C);
@ -385,7 +354,6 @@ void RaviCodeGenerator::emit_BITWISE_SHIFT_OP(RaviFunctionDef *def, OpCode op,
void RaviCodeGenerator::emit_BNOT_I(RaviFunctionDef *def, int A, int B) {
emit_load_base(def);
llvm::Value *ra = emit_gep_register(def, A);
// llvm::Value *rb = emit_gep_register_or_constant(def, B);
llvm::Value *lhs = emit_load_register_or_constant_i(def, B);
llvm::Value *rhs = llvm::ConstantInt::get(def->types->lua_IntegerT, -1);
llvm::Value *result = def->builder->CreateXor(lhs, rhs, "");

16
src/ravi_llvmcodegen.cpp
Unescape View File

@ -191,6 +191,18 @@ RaviCodeGenerator::emit_load_register_or_constant_i(RaviFunctionDef *def,
}
}
llvm::Value *
RaviCodeGenerator::emit_load_register_or_constant_n(RaviFunctionDef *def,
int B) {
if (ISK(B) && def->p->k[INDEXK(B)].tt_ == LUA_TNUMFLT) {
TValue *Konst = &def->p->k[INDEXK(B)];
return llvm::ConstantFP::get(def->types->lua_NumberT, Konst->value_.n);
} else {
llvm::Value *rb = emit_gep_register_or_constant(def, B);
return emit_load_reg_n(def, rb);
}
}
llvm::Instruction *RaviCodeGenerator::emit_load_reg_n(RaviFunctionDef *def,
llvm::Value *rb) {
#if RAVI_NAN_TAGGING
@ -1219,7 +1231,9 @@ void RaviCodeGenerator::compile(lua_State *L, Proto *p, bool doDump,
llvm::Constant *comparison_function =
((op == OP_EQ || op == OP_RAVI_EQ_II || op == OP_RAVI_EQ_FF)
? def->luaV_equalobjF
: ((op == OP_LT || op == OP_RAVI_LT_II || op == OP_RAVI_LT_FF) ? def->luaV_lessthanF : def->luaV_lessequalF));
: ((op == OP_LT || op == OP_RAVI_LT_II || op == OP_RAVI_LT_FF)
? def->luaV_lessthanF
: def->luaV_lessequalF));
// OP_EQ is followed by OP_JMP - we process this
// along with OP_EQ
pc++;

1
src/ravi_llvmtable.cpp
Unescape View File

@ -105,7 +105,6 @@ void RaviCodeGenerator::emit_GETTABLE_AF(RaviFunctionDef *def, int A, int B,
llvm::BasicBlock::Create(def->jitState->context(), "if.end");
def->builder->CreateCondBr(cmp, then_block, else_block);
def->builder->SetInsertPoint(then_block);
llvm::Value *ptr = def->builder->CreateGEP(data, key);
llvm::Instruction *value = def->builder->CreateLoad(ptr);
value->setMetadata(llvm::LLVMContext::MD_tbaa, def->types->tbaa_pdoubleT);

Write Preview
Loading…
Cancel
Save