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: 9e0a5b940494
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: 80f0bfe0ad8b
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Nov 16, 2015

  1. lit-test: update to follow IR serialization changes.

    whitequark committed Nov 16, 2015
    Copy the full SHA
    3fb12b7 View commit details

  2. lit-test: add test for iodelay order invariance.

    whitequark committed Nov 16, 2015
    Copy the full SHA
    80f0bfe View commit details
Showing with 14 additions and 4 deletions.
  1. +3 −3 lit-test/test/inferencer/class.py
  2. +1 −1 lit-test/test/inferencer/error_method.py
  3. +10 −0 lit-test/test/iodelay/order_invariance.py
6 changes: 3 additions & 3 deletions lit-test/test/inferencer/class.py
View file
Original file line number Diff line number Diff line change
@@ -8,12 +8,12 @@ def f():
def m(self):
pass

# CHECK-L: c:<constructor c {a: int(width='a), f: ()->NoneType, m: (self:<instance c>)->NoneType}>
# CHECK-L: c:<constructor c {a: int(width='a), f: ()->NoneType delay('b), m: (self:<instance c>)->NoneType delay('c)}>
c
# CHECK-L: .a:int(width='a)
c.a
# CHECK-L: .f:()->NoneType
# CHECK-L: .f:()->NoneType delay('b)
c.f

# CHECK-L: .m:method(fn=(self:<instance c>)->NoneType, self=<instance c>)
# CHECK-L: .m:method(fn=(self:<instance c>)->NoneType delay('c), self=<instance c>)
c().m()
2 changes: 1 addition & 1 deletion lit-test/test/inferencer/error_method.py
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ def f():
def g(self):
pass

# CHECK-L: ${LINE:+1}: error: function 'f()->NoneType' of class 'c' cannot accept a self argument
# CHECK-L: ${LINE:+1}: error: function 'f()->NoneType delay('a)' of class 'c' cannot accept a self argument
c().f()

c.g(1)
10 changes: 10 additions & 0 deletions lit-test/test/iodelay/order_invariance.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# RUN: %python -m artiq.compiler.testbench.signature %s >%t
# RUN: OutputCheck %s --file-to-check=%t

# CHECK-L: g: ()->NoneType delay(s->mu(2.0) mu)
def g():
f()
f()

def f():
delay(1.0)