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: 37b80247f157
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: e53f26dba002
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 23, 2015

  1. Copy the full SHA
    32fe4a8 View commit details
  2. lit-test: add interleaving/pure_impure_tie.

    whitequark committed Nov 23, 2015
    Copy the full SHA
    e53f26d View commit details
Showing with 15 additions and 1 deletion.
  1. +1 −1 artiq/compiler/transforms/llvm_ir_generator.py
  2. +14 −0 lit-test/test/interleaving/pure_impure_tie.py
2 changes: 1 addition & 1 deletion artiq/compiler/transforms/llvm_ir_generator.py
Original file line number Diff line number Diff line change
@@ -541,7 +541,7 @@ def process_SetLocal(self, insn):
# The environment argument is an i8*, so that all closures can
# unify with each other regardless of environment type or size.
# We fixup the type on assignment into the "$outer" slot.
assert isinstance(insn.value(), ir.EnvironmentArgument)
assert insn.var_name == '$outer'
llvalue = self.llbuilder.bitcast(llvalue, llptr.type.pointee)
return self.llbuilder.store(llvalue, llptr)

14 changes: 14 additions & 0 deletions lit-test/test/interleaving/pure_impure_tie.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# RUN: %python -m artiq.compiler.testbench.jit %s >%t
# RUN: OutputCheck %s --file-to-check=%t

def f():
delay_mu(2)

def g():
with parallel:
f()
delay_mu(2)
print(now_mu())

# CHECK-L: 2
g()