M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

compiler: do not write back kernel constant attributes. 

Fixes #322.
This commit is contained in:
whitequark 2016-03-27 23:39:02 +00:00
parent f4e6b18690
commit ca7463a054
2 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
artiq/compiler/transforms/llvm_ir_generator.py
View File

@ -450,7 +450,7 @@ class LLVMIRGenerator:
lldatalayout = llvm.create_target_data(self.llmodule.data_layout) lldatalayout = llvm.create_target_data(self.llmodule.data_layout)
llrpcattrty = self.llcontext.get_identified_type("A") llrpcattrty = self.llcontext.get_identified_type("A")
llrpcattrty.elements = [lli32, lli32, llptr, llptr] llrpcattrty.elements = [lli32, llptr, llptr]
lldescty = self.llcontext.get_identified_type("D") lldescty = self.llcontext.get_identified_type("D")
lldescty.elements = [llrpcattrty.as_pointer().as_pointer(), llptr.as_pointer()] lldescty.elements = [llrpcattrty.as_pointer().as_pointer(), llptr.as_pointer()]
@ -465,12 +465,7 @@ class LLVMIRGenerator:
else: else:
type_name = "I.{}".format(typ.name) type_name = "I.{}".format(typ.name)
def llrpcattr_of_attr(name, typ): def llrpcattr_of_attr(offset, name, typ):
size = self.llty_of_type(typ). \
get_abi_size(lldatalayout, context=self.llcontext)
alignment = self.llty_of_type(typ). \
get_abi_alignment(lldatalayout, context=self.llcontext)
def rpc_tag_error(typ): def rpc_tag_error(typ):
print(typ) print(typ)
assert False assert False
@ -483,8 +478,7 @@ class LLVMIRGenerator:
llrpctag = ll.Constant(llptr, None) llrpctag = ll.Constant(llptr, None)
llrpcattrinit = ll.Constant(llrpcattrty, [ llrpcattrinit = ll.Constant(llrpcattrty, [
ll.Constant(lli32, size), ll.Constant(lli32, offset),
ll.Constant(lli32, alignment),
llrpctag, llrpctag,
self.llstr_of_str(name) self.llstr_of_str(name)
]) ])
@ -501,8 +495,27 @@ class LLVMIRGenerator:
return llrpcattr return llrpcattr
llrpcattrs = [llrpcattr_of_attr(attr, typ.attributes[attr]) offset = 0
for attr in typ.attributes] llrpcattrs = []
for attr in typ.attributes:
attrtyp = typ.attributes[attr]
size = self.llty_of_type(attrtyp). \
get_abi_size(lldatalayout, context=self.llcontext)
alignment = self.llty_of_type(attrtyp). \
get_abi_alignment(lldatalayout, context=self.llcontext)
if offset % alignment != 0:
offset += alignment - (offset % alignment)
if types.is_instance(typ) and attr not in typ.constant_attributes:
llrpcattrs.append(llrpcattr_of_attr(offset, attr, attrtyp))
offset += size
if len(llrpcattrs) == 1:
# Don't bother serializing objects that only have __objectid__
# since there's nothing to writeback anyway.
continue
llrpcattraryty = ll.ArrayType(llrpcattrty.as_pointer(), len(llrpcattrs) + 1) llrpcattraryty = ll.ArrayType(llrpcattrty.as_pointer(), len(llrpcattrs) + 1)
llrpcattrary = ll.GlobalVariable(self.llmodule, llrpcattraryty, llrpcattrary = ll.GlobalVariable(self.llmodule, llrpcattraryty,

11
artiq/runtime/ksupport.c
View File

@ -411,8 +411,7 @@ int recv_rpc(void *slot) {
} }
struct attr_desc { struct attr_desc {
uint32_t size; uint32_t offset;
uint32_t alignment;
const char *tag; const char *tag;
const char *name; const char *name;
}; };
@ -435,20 +434,14 @@ void attribute_writeback(void *utypes) {
while(*objects) { while(*objects) {
void *object = *objects++; void *object = *objects++;
size_t offset = 0;
struct attr_desc **attrs = type->attributes; struct attr_desc **attrs = type->attributes;
while(*attrs) { while(*attrs) {
struct attr_desc *attr = *attrs++; struct attr_desc *attr = *attrs++;
if(offset % attr->alignment != 0)
offset += attr->alignment - (offset % attr->alignment);
if(attr->tag) { if(attr->tag) {
uintptr_t value = (uintptr_t)object + offset; uintptr_t value = (uintptr_t)object + attr->offset;
send_rpc(0, attr->tag, &object, &attr->name, value); send_rpc(0, attr->tag, &object, &attr->name, value);
} }
offset += attr->size;
} }
} }
} }