Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8aebab580f9b
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 37b0811a05ab
Choose a head ref
  • 2 commits
  • 5 files changed
  • 1 contributor

Commits on Sep 24, 2014

  1. Copy the full SHA
    cf1f126 View commit details
  2. Copy the full SHA
    37b0811 View commit details
Showing with 118 additions and 119 deletions.
  1. +3 −1 artiq/py2llvm/fractions.py
  2. +0 −38 examples/coredev_test.py
  3. +0 −31 examples/rtio_loopback.py
  4. +0 −49 examples/time_test.py
  5. +115 −0 test/full_stack.py
4 changes: 3 additions & 1 deletion artiq/py2llvm/fractions.py
Original file line number Diff line number Diff line change
@@ -19,7 +19,9 @@ def _gcd(a, b):

def init_module(module):
func_def = ast.parse(inspect.getsource(_gcd)).body[0]
module.compile_function(func_def, {"a": VInt(64), "b": VInt(64)})
function, _ = module.compile_function(func_def,
{"a": VInt(64), "b": VInt(64)})
function.linkage = lc.LINKAGE_INTERNAL


def _reduce(builder, a, b):
38 changes: 0 additions & 38 deletions examples/coredev_test.py

This file was deleted.

31 changes: 0 additions & 31 deletions examples/rtio_loopback.py

This file was deleted.

49 changes: 0 additions & 49 deletions examples/time_test.py

This file was deleted.

115 changes: 115 additions & 0 deletions test/full_stack.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
import unittest

from artiq.language.core import *
from artiq.language.units import *
from artiq.devices import corecom_serial, core, rtio_core
from artiq.sim import devices as sim_devices


def _run_on_device(k_class, **parameters):
with corecom_serial.CoreCom() as com:
coredev = core.Core(com)
k_inst = k_class(core=coredev, **parameters)
k_inst.run()


def _run_on_host(k_class, **parameters):
coredev = sim_devices.Core()
k_inst = k_class(core=coredev, **parameters)
k_inst.run()


class _Primes(AutoContext):
parameters = "output_list max"

@kernel
def run(self):
for x in range(1, self.max):
d = 2
prime = True
while d*d <= x:
if x % d == 0:
prime = False
break
d += 1
if prime:
self.output_list.append(x)


class _PulseLogger(AutoContext):
parameters = "name"

def print_on(self, t, f):
print("{} ON:{:4} @{}".format(self.name, f, t))

def print_off(self, t):
print("{} OFF @{}".format(self.name, t))

@kernel
def pulse(self, f, duration):
self.print_on(int(now()), f)
delay(duration)
self.print_off(int(now()))


class _PulseTest(AutoContext):
def build(self):
for name in "a", "b", "c", "d":
pl = _PulseLogger(self, name=name)
setattr(self, name, pl)

@kernel
def run(self):
for i in range(3):
with parallel:
with sequential:
self.a.pulse(100+i, 20*us)
self.b.pulse(200+i, 20*us)
with sequential:
self.c.pulse(300+i, 10*us)
self.d.pulse(400+i, 20*us)


class SimCompareCase(unittest.TestCase):
def test_primes(self):
l_device, l_host = [], []
_run_on_device(_Primes, max=100, output_list=l_device)
_run_on_host(_Primes, max=100, output_list=l_host)
self.assertEqual(l_device, l_host)

def test_pulses(self):
# TODO: compare results on host and device
# (this requires better unit management in the compiler)
_run_on_device(_PulseTest)


class _RTIOLoopback(AutoContext):
parameters = "i o npulses"

def report(self, n):
self.result = n

@kernel
def run(self):
with parallel:
with sequential:
for i in range(self.npulses):
delay(25*ns)
self.o.pulse(25*ns)
self.i.count_rising(10*us)
self.report(self.i.sync())


class RTIOCase(unittest.TestCase):
def test_loopback(self):
npulses = 4
with corecom_serial.CoreCom() as com:
coredev = core.Core(com)
lb = _RTIOLoopback(
core=coredev,
i=rtio_core.RTIOCounter(core=coredev, channel=0),
o=rtio_core.RTIOOut(core=coredev, channel=1),
npulses=npulses
)
lb.run()
self.assertEqual(lb.result, npulses)