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

implement a NaN tagging alternative value type

Browse Source
pull/81/head
Dibyendu Majumdar 9 years ago
parent 12b17db642
commit 9b62208c7c
5 changed files with 154 additions and 29 deletions
Show Stats Download Patch File Download Diff File

6
include/ravi_llvmcodegen.h
Unescape View File

@ -154,6 +154,9 @@ struct LuaLLVMTypes {
llvm::StructType *TValueT;
llvm::PointerType *pTValueT;
llvm::StructType *HiLoT;
llvm::PointerType *pHiLoT;
llvm::StructType *TStringT;
llvm::PointerType *pTStringT;
llvm::PointerType *ppTStringT;
@ -299,6 +302,9 @@ struct LuaLLVMTypes {
llvm::MDNode *tbaa_RaviArray_typeT;
llvm::MDNode *tbaa_RaviArray_dataT;
llvm::MDNode *tbaa_RaviArray_lenT;
llvm::MDNode *tbaa_HiLoT;
llvm::MDNode *tbaa_HiLo_loT;
llvm::MDNode *tbaa_HiLo_hiT;
};
class RAVI_API RaviJITStateImpl;

69
src/ravi_llvmcodegen.cpp
Unescape View File

@ -162,9 +162,17 @@ llvm::Value *RaviCodeGenerator::emit_gep_ra(RaviFunctionDef *def,
llvm::Instruction *RaviCodeGenerator::emit_load_reg_n(RaviFunctionDef *def,
llvm::Value *rb) {
#if RAVI_NAN_TAGGING
llvm::Value *tt_ptr = emit_gep(def, "value.tt.ptr", rb, 0, 1);
llvm::Value *rb_n =
def->builder->CreateBitCast(tt_ptr, def->types->plua_NumberT);
llvm::Instruction *lhs = def->builder->CreateLoad(rb_n);
lhs->setMetadata(llvm::LLVMContext::MD_tbaa, def->types->tbaa_pdoubleT);
#else
llvm::Value *rb_n = def->builder->CreateBitCast(rb, def->types->plua_NumberT);
llvm::Instruction *lhs = def->builder->CreateLoad(rb_n);
lhs->setMetadata(llvm::LLVMContext::MD_tbaa, def->types->tbaa_TValue_nT);
#endif
return lhs;
}
@ -220,10 +228,18 @@ RaviCodeGenerator::emit_load_reg_h_intarray(RaviFunctionDef *def,
void RaviCodeGenerator::emit_store_reg_n(RaviFunctionDef *def,
llvm::Value *result,
llvm::Value *dest_ptr) {
#if RAVI_NAN_TAGGING
llvm::Value *tt_ptr = emit_gep(def, "value.tt.ptr", dest_ptr, 0, 1);
llvm::Value *ra_n =
def->builder->CreateBitCast(tt_ptr, def->types->plua_NumberT);
llvm::Instruction *store = def->builder->CreateStore(result, ra_n);
store->setMetadata(llvm::LLVMContext::MD_tbaa, def->types->tbaa_pdoubleT);
#else
llvm::Value *ra_n =
def->builder->CreateBitCast(dest_ptr, def->types->plua_NumberT);
llvm::Instruction *store = def->builder->CreateStore(result, ra_n);
store->setMetadata(llvm::LLVMContext::MD_tbaa, def->types->tbaa_TValue_nT);
#endif
}
void RaviCodeGenerator::emit_store_reg_i(RaviFunctionDef *def,
@ -246,19 +262,36 @@ void RaviCodeGenerator::emit_store_reg_b(RaviFunctionDef *def,
void RaviCodeGenerator::emit_store_type(RaviFunctionDef *def,
llvm::Value *value, int type) {
llvm::Value *desttype = emit_gep(def, "dest.tt", value, 0, 1);
lua_assert(type == LUA_TNUMFLT || type == LUA_TNUMINT ||
type == LUA_TBOOLEAN);
#if RAVI_NAN_TAGGING
// The whole point of NaN tagging!
if (type == LUA_TNUMFLT || type == LUA_TNUMBER)
return;
int code = (type | RAVI_NAN_TAG);
llvm::Value *hi_ptr = emit_gep(def, "hi.ptr", value, 0, 1, 1);
llvm::Instruction *store = def->builder->CreateStore(
llvm::ConstantInt::get(def->types->C_intT, code), hi_ptr);
store->setMetadata(llvm::LLVMContext::MD_tbaa, def->types->tbaa_HiLo_hiT);
#else
llvm::Value *desttype = emit_gep(def, "dest.tt", value, 0, 1);
llvm::Instruction *store =
def->builder->CreateStore(def->types->kInt[type], desttype);
store->setMetadata(llvm::LLVMContext::MD_tbaa, def->types->tbaa_TValue_ttT);
#endif
}
llvm::Instruction *RaviCodeGenerator::emit_load_type(RaviFunctionDef *def,
llvm::Value *value) {
#if RAVI_NAN_TAGGING
llvm::Value *hi_ptr = emit_gep(def, "hi.ptr", value, 0, 1, 1);
llvm::Instruction *tt = def->builder->CreateLoad(hi_ptr, "hi");
tt->setMetadata(llvm::LLVMContext::MD_tbaa, def->types->tbaa_HiLo_hiT);
#else
llvm::Value *tt_ptr = emit_gep(def, "value.tt.ptr", value, 0, 1);
llvm::Instruction *tt = def->builder->CreateLoad(tt_ptr, "value.tt");
tt->setMetadata(llvm::LLVMContext::MD_tbaa, def->types->tbaa_TValue_ttT);
#endif
return tt;
}
@ -266,15 +299,49 @@ llvm::Value *RaviCodeGenerator::emit_is_value_of_type(RaviFunctionDef *def,
llvm::Value *value_type,
LuaTypeCode lua_type,
const char *varname) {
#if RAVI_NAN_TAGGING
if (lua_type == LUA__TNUMFLT || lua_type == LUA__TNUMBER) {
//%and = and i32 % 1, 2147221504
//% cmp = icmp ne i32 %and, 2147221504
llvm::Value *andNaN = def->builder->CreateAnd(
value_type, llvm::ConstantInt::get(def->types->C_intT, RAVI_NAN_TAG),
"and.NaN");
return def->builder->CreateICmpNE(
andNaN, llvm::ConstantInt::get(def->types->C_intT, RAVI_NAN_TAG),
"is.numflt");
} else {
llvm::Constant *expect =
llvm::ConstantInt::get(def->types->C_intT, lua_type | RAVI_NAN_TAG);
return def->builder->CreateICmpEQ(value_type, expect, "is.type");
}
#else
return def->builder->CreateICmpEQ(value_type, def->types->kInt[int(lua_type)],
varname);
#endif
}
llvm::Value *RaviCodeGenerator::emit_is_not_value_of_type(
RaviFunctionDef *def, llvm::Value *value_type, LuaTypeCode lua_type,
const char *varname) {
#if RAVI_NAN_TAGGING
if (lua_type == LUA__TNUMFLT || lua_type == LUA__TNUMBER) {
//%and = and i32 % 1, 2147221504
//% cmp = icmp ne i32 %and, 2147221504
llvm::Value *andNaN = def->builder->CreateAnd(
value_type, llvm::ConstantInt::get(def->types->C_intT, RAVI_NAN_TAG),
"and.NaN");
return def->builder->CreateICmpEQ(
andNaN, llvm::ConstantInt::get(def->types->C_intT, RAVI_NAN_TAG),
"is.numflt");
} else {
llvm::Constant *expect =
llvm::ConstantInt::get(def->types->C_intT, lua_type | RAVI_NAN_TAG);
return def->builder->CreateICmpNE(value_type, expect, "is.type");
}
#else
return def->builder->CreateICmpNE(value_type, def->types->kInt[int(lua_type)],
varname);
#endif
}
llvm::Instruction *

16
src/ravi_llvmload.cpp
Unescape View File

@ -408,11 +408,27 @@ void RaviCodeGenerator::emit_assign(RaviFunctionDef *def, llvm::Value *dest,
store->setMetadata(llvm::LLVMContext::MD_tbaa, def->types->tbaa_TValue_nT);
// destvalue->type = srcvalue->type
#if RAVI_NAN_TAGGING
llvm::Value *srctype = emit_gep(def, "srctype", src, 0, 1, 0);
llvm::Value *desttype = emit_gep(def, "desttype", dest, 0, 1, 0);
// TODO note assumption below that lua_Number is double
load = def->builder->CreateLoad(srctype);
load->setMetadata(llvm::LLVMContext::MD_tbaa, def->types->tbaa_HiLo_loT);
store = def->builder->CreateStore(load, desttype);
store->setMetadata(llvm::LLVMContext::MD_tbaa, def->types->tbaa_HiLo_loT);
srctype = emit_gep(def, "srctype", src, 0, 1, 1);
desttype = emit_gep(def, "desttype", dest, 0, 1, 1);
load = def->builder->CreateLoad(srctype);
load->setMetadata(llvm::LLVMContext::MD_tbaa, def->types->tbaa_HiLo_hiT);
store = def->builder->CreateStore(load, desttype);
store->setMetadata(llvm::LLVMContext::MD_tbaa, def->types->tbaa_HiLo_hiT);
#else
llvm::Value *srctype = emit_gep(def, "srctype", src, 0, 1);
llvm::Value *desttype = emit_gep(def, "desttype", dest, 0, 1);
load = def->builder->CreateLoad(srctype);
load->setMetadata(llvm::LLVMContext::MD_tbaa, def->types->tbaa_TValue_ttT);
store = def->builder->CreateStore(load, desttype);
store->setMetadata(llvm::LLVMContext::MD_tbaa, def->types->tbaa_TValue_ttT);
#endif
}
}

9
src/ravi_llvmreturn.cpp
Unescape View File

@ -90,10 +90,11 @@ void RaviCodeGenerator::emit_RETURN(RaviFunctionDef *def, llvm::Value *L_ci,
//* b = luaD_poscall(L, ra);
CreateCall2(def->builder, def->luaD_poscallF, def->L, ra_ptr);
// llvm::Value *msg1 =
// def->builder->CreateGlobalString("Returning from compiled function\n");
// def->builder->CreateCall(def->printfFunc, emit_gep(def, "msg", msg1, 0,
// 0));
#if 0
llvm::Value *msg1 =
def->builder->CreateGlobalString("Returning from compiled function\n");
def->builder->CreateCall(def->printfFunc, emit_gep(def, "msg", msg1, 0, 0));
#endif
def->builder->CreateRet(def->types->kInt[1]);
}

83
src/ravi_llvmtypes.cpp
Unescape View File

@ -77,7 +77,7 @@ LuaLLVMTypes::LuaLLVMTypes(llvm::LLVMContext &context) : mdbuilder(context) {
ravitype_tT = llvm::Type::getIntNTy(context, sizeof(ravitype_t) * 8);
lua_StateT = llvm::StructType::create(context, "ravi.lua_State");
lua_StateT = llvm::StructType::create(context, "struct.lua_State");
plua_StateT = llvm::PointerType::get(lua_StateT, 0);
lua_KContextT = C_ptrdiff_t;
@ -105,7 +105,7 @@ LuaLLVMTypes::LuaLLVMTypes(llvm::LLVMContext &context) : mdbuilder(context) {
elements, false);
plua_AllocT = llvm::PointerType::get(lua_AllocT, 0);
lua_DebugT = llvm::StructType::create(context, "ravi.lua_Debug");
lua_DebugT = llvm::StructType::create(context, "struct.lua_Debug");
plua_DebugT = llvm::PointerType::get(lua_DebugT, 0);
elements.clear();
@ -120,7 +120,7 @@ LuaLLVMTypes::LuaLLVMTypes(llvm::LLVMContext &context) : mdbuilder(context) {
// lu_byte tt;
// lu_byte marked
// };
GCObjectT = llvm::StructType::create(context, "ravi.GCObject");
GCObjectT = llvm::StructType::create(context, "struct.GCObject");
pGCObjectT = llvm::PointerType::get(GCObjectT, 0);
elements.clear();
elements.push_back(pGCObjectT);
@ -143,24 +143,42 @@ LuaLLVMTypes::LuaLLVMTypes(llvm::LLVMContext &context) : mdbuilder(context) {
// lua_Integer i; /* integer numbers */
// lua_Number n; /* float numbers */
// };
ValueT = llvm::StructType::create(context, "ravi.Value");
ValueT = llvm::StructType::create(context, "union.Value");
elements.clear();
elements.push_back(lua_NumberT);
ValueT->setBody(elements);
// TODO Needs to handle big endian
//struct ravi_HiLo {
// int lo;
// int hi;
//} HiLo;
HiLoT = llvm::StructType::create(context, "struct.HiLo");
elements.clear();
elements.push_back(C_intT);
elements.push_back(C_intT);
HiLoT->setBody(elements);
pHiLoT = llvm::PointerType::get(HiLoT, 0);
// NOTE: Following structure changes when NaN tagging is enabled
// struct TValue {
// union Value value_;
// int tt_;
// };
TValueT = llvm::StructType::create(context, "ravi.TValue");
TValueT = llvm::StructType::create(context, "struct.TValue");
elements.clear();
elements.push_back(ValueT);
#if RAVI_NAN_TAGGING
elements.push_back(HiLoT);
#else
elements.push_back(C_intT);
#endif
TValueT->setBody(elements);
pTValueT = llvm::PointerType::get(TValueT, 0);
StkIdT = pTValueT;
///*
//** Header for string value; string bytes follow the end of this structure
//** (aligned according to 'UTString'; see next).
@ -183,7 +201,7 @@ LuaLLVMTypes::LuaLLVMTypes(llvm::LLVMContext &context) : mdbuilder(context) {
// L_Umaxalign dummy; /* ensures maximum alignment for strings */
// TString tsv;
//} UTString;
TStringT = llvm::StructType::create(context, "ravi.TString");
TStringT = llvm::StructType::create(context, "struct.TString");
pTStringT = llvm::PointerType::get(TStringT, 0);
ppTStringT = llvm::PointerType::get(pTStringT, 0);
elements.clear();
@ -197,7 +215,7 @@ LuaLLVMTypes::LuaLLVMTypes(llvm::LLVMContext &context) : mdbuilder(context) {
TStringT->setBody(elements);
// Table
TableT = llvm::StructType::create(context, "ravi.Table");
TableT = llvm::StructType::create(context, "struct.Table");
pTableT = llvm::PointerType::get(TableT, 0);
ppTableT = llvm::PointerType::get(pTableT, 0);
@ -214,7 +232,7 @@ LuaLLVMTypes::LuaLLVMTypes(llvm::LLVMContext &context) : mdbuilder(context) {
// size_t len; /* number of bytes */
// union Value user_; /* user value */
//} Udata;
UdataT = llvm::StructType::create(context, "ravi.Udata");
UdataT = llvm::StructType::create(context, "struct.Udata");
elements.clear();
elements.push_back(pGCObjectT);
elements.push_back(lu_byteT);
@ -235,7 +253,7 @@ LuaLLVMTypes::LuaLLVMTypes(llvm::LLVMContext &context) : mdbuilder(context) {
// lu_byte idx; /* index of upvalue (in stack or in outer function's list)
// */
//}Upvaldesc;
UpvaldescT = llvm::StructType::create(context, "ravi.Upvaldesc");
UpvaldescT = llvm::StructType::create(context, "struct.Upvaldesc");
elements.clear();
elements.push_back(pTStringT); /* name */
elements.push_back(ravitype_tT); /* type */
@ -255,7 +273,7 @@ LuaLLVMTypes::LuaLLVMTypes(llvm::LLVMContext &context) : mdbuilder(context) {
// ravitype_t ravi_type; /* RAVI type of the variable - RAVI_TANY if unknown
// */
//} LocVar;
LocVarT = llvm::StructType::create(context, "ravi.LocVar");
LocVarT = llvm::StructType::create(context, "struct.LocVar");
elements.clear();
elements.push_back(pTStringT); /* varname */
elements.push_back(C_intT); /* startpc */
@ -264,12 +282,12 @@ LuaLLVMTypes::LuaLLVMTypes(llvm::LLVMContext &context) : mdbuilder(context) {
LocVarT->setBody(elements);
pLocVarT = llvm::PointerType::get(LocVarT, 0);
LClosureT = llvm::StructType::create(context, "ravi.LClosure");
LClosureT = llvm::StructType::create(context, "struct.LClosure");
pLClosureT = llvm::PointerType::get(LClosureT, 0);
ppLClosureT = llvm::PointerType::get(pLClosureT, 0);
pppLClosureT = llvm::PointerType::get(ppLClosureT, 0);
RaviJITProtoT = llvm::StructType::create(context, "ravi.RaviJITProto");
RaviJITProtoT = llvm::StructType::create(context, "struct.RaviJITProto");
elements.clear();
elements.push_back(lu_byteT); /* jit_status*/
elements.push_back(lu_byteT); /* jit_flags */
@ -308,7 +326,7 @@ LuaLLVMTypes::LuaLLVMTypes(llvm::LLVMContext &context) : mdbuilder(context) {
// RaviJITProto *ravi_jit;
//} Proto;
ProtoT = llvm::StructType::create(context, "ravi.Proto");
ProtoT = llvm::StructType::create(context, "struct.Proto");
pProtoT = llvm::PointerType::get(ProtoT, 0);
ppProtoT = llvm::PointerType::get(pProtoT, 0);
elements.clear();
@ -342,7 +360,7 @@ LuaLLVMTypes::LuaLLVMTypes(llvm::LLVMContext &context) : mdbuilder(context) {
//** Lua Upvalues
//*/
// typedef struct UpVal UpVal;
UpValT = llvm::StructType::create(context, "ravi.UpVal");
UpValT = llvm::StructType::create(context, "struct.UpVal");
pUpValT = llvm::PointerType::get(UpValT, 0);
///*
@ -357,7 +375,7 @@ LuaLLVMTypes::LuaLLVMTypes(llvm::LLVMContext &context) : mdbuilder(context) {
// TValue upvalue[1]; /* list of upvalues */
//} CClosure;
CClosureT = llvm::StructType::create(context, "ravi.CClosure");
CClosureT = llvm::StructType::create(context, "struct.CClosure");
elements.clear();
elements.push_back(pGCObjectT);
elements.push_back(lu_byteT);
@ -388,6 +406,8 @@ LuaLLVMTypes::LuaLLVMTypes(llvm::LLVMContext &context) : mdbuilder(context) {
//** Tables
//*/
// NOTE following structure changes when NaN Tagging is enabled
// typedef union TKey {
// struct {
// TValuefields;
@ -395,10 +415,14 @@ LuaLLVMTypes::LuaLLVMTypes(llvm::LLVMContext &context) : mdbuilder(context) {
// } nk;
// TValue tvk;
//} TKey;
TKeyT = llvm::StructType::create(context, "ravi.TKey");
TKeyT = llvm::StructType::create(context, "struct.TKey");
elements.clear();
elements.push_back(ValueT);
#if RAVI_NAN_TAGGING
elements.push_back(HiLoT);
#else
elements.push_back(C_intT);
#endif
elements.push_back(C_intT); /* next */
TKeyT->setBody(elements);
pTKeyT = llvm::PointerType::get(TKeyT, 0);
@ -407,7 +431,7 @@ LuaLLVMTypes::LuaLLVMTypes(llvm::LLVMContext &context) : mdbuilder(context) {
// TValue i_val;
// TKey i_key;
//} Node;
NodeT = llvm::StructType::create(context, "ravi.Node");
NodeT = llvm::StructType::create(context, "struct.Node");
elements.clear();
elements.push_back(TValueT); /* i_val */
elements.push_back(TKeyT); /* i_key */
@ -422,7 +446,7 @@ LuaLLVMTypes::LuaLLVMTypes(llvm::LLVMContext &context) : mdbuilder(context) {
// lu_byte array_modifier; /* Flags that affect how the array is handled */
//} RaviArray;
RaviArrayT = llvm::StructType::create(context, "ravi.RaviArray");
RaviArrayT = llvm::StructType::create(context, "struct.RaviArray");
elements.clear();
elements.push_back(C_pcharT);
elements.push_back(C_intT);
@ -460,7 +484,7 @@ LuaLLVMTypes::LuaLLVMTypes(llvm::LLVMContext &context) : mdbuilder(context) {
TableT->setBody(elements);
// struct lua_longjmp; /* defined in ldo.c */
lua_longjumpT = llvm::StructType::create(context, "ravi.lua_longjmp");
lua_longjumpT = llvm::StructType::create(context, "struct.lua_longjmp");
plua_longjumpT = llvm::PointerType::get(lua_longjumpT, 0);
// lzio.h
@ -469,7 +493,7 @@ LuaLLVMTypes::LuaLLVMTypes(llvm::LLVMContext &context) : mdbuilder(context) {
// size_t n;
// size_t buffsize;
//} Mbuffer;
MbufferT = llvm::StructType::create(context, "ravi.Mbuffer");
MbufferT = llvm::StructType::create(context, "struct.Mbuffer");
elements.clear();
elements.push_back(llvm::Type::getInt8PtrTy(context)); /* buffer */
elements.push_back(C_size_t); /* n */
@ -481,7 +505,7 @@ LuaLLVMTypes::LuaLLVMTypes(llvm::LLVMContext &context) : mdbuilder(context) {
// int nuse; /* number of elements */
// int size;
//} stringtable;
stringtableT = llvm::StructType::create(context, "ravi.stringtable");
stringtableT = llvm::StructType::create(context, "struct.stringtable");
elements.clear();
elements.push_back(ppTStringT); /* hash */
elements.push_back(C_intT); /* nuse */
@ -530,7 +554,7 @@ LuaLLVMTypes::LuaLLVMTypes(llvm::LLVMContext &context) : mdbuilder(context) {
elements.push_back(lua_KContextT); /* ctx */
CallInfo_cT = llvm::StructType::create(elements);
CallInfoT = llvm::StructType::create(context, "ravi.CallInfo");
CallInfoT = llvm::StructType::create(context, "struct.CallInfo");
pCallInfoT = llvm::PointerType::get(CallInfoT, 0);
elements.clear();
elements.push_back(StkIdT); /* func */
@ -548,7 +572,7 @@ LuaLLVMTypes::LuaLLVMTypes(llvm::LLVMContext &context) : mdbuilder(context) {
// typedef struct ravi_State ravi_State;
ravi_StateT = llvm::StructType::create(context, "ravi.ravi_State");
ravi_StateT = llvm::StructType::create(context, "struct.ravi_State");
pravi_StateT = llvm::PointerType::get(ravi_StateT, 0);
///*
@ -593,7 +617,7 @@ LuaLLVMTypes::LuaLLVMTypes(llvm::LLVMContext &context) : mdbuilder(context) {
// ravi_State *ravi_state;
//} global_State;
global_StateT = llvm::StructType::create(context, "ravi.global_State");
global_StateT = llvm::StructType::create(context, "struct.global_State");
pglobal_StateT = llvm::PointerType::get(global_StateT, 0);
///*
@ -1088,6 +1112,17 @@ LuaLLVMTypes::LuaLLVMTypes(llvm::LLVMContext &context) : mdbuilder(context) {
mdbuilder.createTBAAStructTagNode(tbaa_TableT, tbaa_intT, 36);
tbaa_RaviArray_typeT =
mdbuilder.createTBAAStructTagNode(tbaa_TableT, tbaa_charT, 44);
// TODO Needs to handle big endian
nodes.clear();
nodes.push_back(std::pair<llvm::MDNode *, uint64_t>(tbaa_intT, 0)); /* lo */
nodes.push_back(std::pair<llvm::MDNode *, uint64_t>(tbaa_intT, 4)); /* hi */
tbaa_HiLoT = mdbuilder.createTBAAStructTypeNode("HiLo", nodes);
tbaa_HiLo_loT =
mdbuilder.createTBAAStructTagNode(tbaa_HiLoT, tbaa_intT, 0);
tbaa_HiLo_hiT =
mdbuilder.createTBAAStructTagNode(tbaa_HiLoT, tbaa_intT, 4);
}
void LuaLLVMTypes::dump() {

Write Preview
Loading…
Cancel
Save