srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

compiler: mark loaded pointers as !dereferenceable. 

Also, lower the bound for test_pulse_rate_dds, since we generate
better code for it now.
This commit is contained in:
whitequark 2016-03-31 12:04:38 +00:00 committed by Sebastien Bourdeauducq
parent 03b6555d9d
commit 1120c264b1
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,6 +175,7 @@ class LLVMIRGenerator:
self.llmodule = ll.Module(context=self.llcontext, name=module_name) self.llmodule = ll.Module(context=self.llcontext, name=module_name)
self.llmodule.triple = target.triple self.llmodule.triple = target.triple
self.llmodule.data_layout = target.data_layout self.llmodule.data_layout = target.data_layout
self.lldatalayout = llvm.create_target_data(self.llmodule.data_layout)
self.function_flags = None self.function_flags = None
self.llfunction = None self.llfunction = None
self.llmap = {} self.llmap = {}
@ -459,8 +460,6 @@ class LLVMIRGenerator:
if llobject is not None: if llobject is not None:
llobjects[typ].append(llobject.bitcast(llptr)) llobjects[typ].append(llobject.bitcast(llptr))
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, llptr, llptr] llrpcattrty.elements = [lli32, llptr, llptr]
@ -512,9 +511,9 @@ class LLVMIRGenerator:
for attr in typ.attributes: for attr in typ.attributes:
attrtyp = typ.attributes[attr] attrtyp = typ.attributes[attr]
size = self.llty_of_type(attrtyp). \ size = self.llty_of_type(attrtyp). \
get_abi_size(lldatalayout, context=self.llcontext) get_abi_size(self.lldatalayout, context=self.llcontext)
alignment = self.llty_of_type(attrtyp). \ alignment = self.llty_of_type(attrtyp). \
get_abi_alignment(lldatalayout, context=self.llcontext) get_abi_alignment(self.lldatalayout, context=self.llcontext)
if offset % alignment != 0: if offset % alignment != 0:
offset += alignment - (offset % alignment) offset += alignment - (offset % alignment)
@ -688,13 +687,19 @@ class LLVMIRGenerator:
llouterenv.metadata['nonnull'] = self.empty_metadata llouterenv.metadata['nonnull'] = self.empty_metadata
return self.llptr_to_var(llouterenv, env_ty.params["$outer"], var_name) return self.llptr_to_var(llouterenv, env_ty.params["$outer"], var_name)
def mark_dereferenceable(self, load):
assert isinstance(load, ll.LoadInstr) and isinstance(load.type, ll.PointerType)
pointee_size = load.type.pointee.get_abi_size(self.lldatalayout, context=self.llcontext)
metadata = self.llmodule.add_metadata([ll.Constant(lli64, pointee_size)])
load.metadata['dereferenceable'] = metadata
def process_GetLocal(self, insn): def process_GetLocal(self, insn):
env = insn.environment() env = insn.environment()
llptr = self.llptr_to_var(self.map(env), env.type, insn.var_name) llptr = self.llptr_to_var(self.map(env), env.type, insn.var_name)
llptr.name = "ptr.{}.{}".format(env.name, insn.var_name) llptr.name = "ptr.{}.{}".format(env.name, insn.var_name)
llvalue = self.llbuilder.load(llptr, name="val.{}.{}".format(env.name, insn.var_name)) llvalue = self.llbuilder.load(llptr, name="val.{}.{}".format(env.name, insn.var_name))
if isinstance(llvalue.type, ll.PointerType): if isinstance(llvalue.type, ll.PointerType):
llvalue.metadata['nonnull'] = self.empty_metadata self.mark_dereferenceable(llvalue)
return llvalue return llvalue
def process_SetLocal(self, insn): def process_SetLocal(self, insn):
@ -818,7 +823,7 @@ class LLVMIRGenerator:
if types.is_instance(typ) and attr in typ.constant_attributes: if types.is_instance(typ) and attr in typ.constant_attributes:
llvalue.metadata['invariant.load'] = self.empty_metadata llvalue.metadata['invariant.load'] = self.empty_metadata
if isinstance(llvalue.type, ll.PointerType): if isinstance(llvalue.type, ll.PointerType):
llvalue.metadata['nonnull'] = self.empty_metadata self.mark_dereferenceable(llvalue)
return llvalue return llvalue
def process_SetAttr(self, insn): def process_SetAttr(self, insn):
@ -849,7 +854,7 @@ class LLVMIRGenerator:
inbounds=True) inbounds=True)
llvalue = self.llbuilder.load(llelt) llvalue = self.llbuilder.load(llelt)
if isinstance(llvalue.type, ll.PointerType): if isinstance(llvalue.type, ll.PointerType):
llvalue.metadata['nonnull'] = self.empty_metadata self.mark_dereferenceable(llvalue)
return llvalue return llvalue
def process_SetElem(self, insn): def process_SetElem(self, insn):

6
artiq/test/coredevice/test_rtio.py
View File

@ -105,6 +105,8 @@ class PulseRate(EnvExperiment):
class PulseRateDDS(EnvExperiment): class PulseRateDDS(EnvExperiment):
kernel_constant_attributes = {"core", "core_dds", "dds0", "dds1"}
def build(self): def build(self):
self.setattr_device("core") self.setattr_device("core")
self.setattr_device("core_dds") self.setattr_device("core_dds")
@ -113,7 +115,7 @@ class PulseRateDDS(EnvExperiment):
@kernel @kernel
def run(self): def run(self):
dt = seconds_to_mu(150*us) dt = seconds_to_mu(50*us)
while True: while True:
delay(10*ms) delay(10*ms)
for i in range(100): for i in range(100):
@ -263,7 +265,7 @@ class CoredeviceTest(ExperimentCase):
rate = self.dataset_mgr.get("pulse_rate") rate = self.dataset_mgr.get("pulse_rate")
print(rate) print(rate)
self.assertGreater(rate, 100*us) self.assertGreater(rate, 100*us)
self.assertLess(rate, 400*us) self.assertLess(rate, 150*us)
def test_loopback_count(self): def test_loopback_count(self):
npulses = 2 npulses = 2