Commit Graph

1483 Commits

Author SHA1 Message Date
whitequark
af43c66149 artiq_compile: set file_import prefix, like in artiq_run. 2015-11-21 17:37:14 +08:00
whitequark
a01e328b4a transforms.interleaver: don't assume all delay expressions are folded. 2015-11-21 17:24:00 +08:00
whitequark
5cd12ffd28 compiler.iodelay: fold MUToS and SToMU. 2015-11-21 17:23:20 +08:00
whitequark
82b470891f transforms.interleaver: handle function calls (as atomic so far).
This commit solves issue #2 described in 50e7b44; a function call
is now a valid decomposition for a delay instruction, and this
metadata is propagated when the interleaver converts delays.

However, the interleaver does not yet detect that a called function
is compound, i.e. it is not correct.
2015-11-21 03:34:24 +08:00
whitequark
57dd163d37 transforms.artiq_ir_generator: fix decomposition of explicit delay_mu(). 2015-11-21 03:27:06 +08:00
whitequark
cb3b811fd7 compiler: maintain both the IR and iodelay forms of delay expressions.
After this commit, the delay instruction (again) does not generate
any LLVM IR: all heavy lifting is relegated to the delay and delay_mu
intrinsics. When the interleave transform needs to adjust the global
timeline, it synthesizes a delay_mu intrinsnic. This way,
the interleave transformation becomes composable, as the input and
the output IR invariants are the same.

Also, code generation is adjusted so that a basic block is split off
not only after a delay call, but also before one; otherwise, e.g.,
code immediately at the beginning of a `with parallel:` branch
would have no choice but to execute after another branch has already
advanced the timeline.

This takes care of issue #1 described in 50e7b44 and is a step
to solving issue #2.
2015-11-21 03:22:47 +08:00
whitequark
50e7b44d04 compiler: actually implement interleaving correctly (calls are still broken).
The previous implementation was completely wrong: it always advanced
the global timeline by the same amount as the non-interleaved basic
block did.

The new implementation only advances the global timeline by
the difference between its current time and the virtual time of
the branch, which requires it to adjust the delay instructions.

Previously, the delay expression was present in the IR twice: once
as the iodelay.Expr transformation-visible form, and once as regular
IR instructions, with the latter form being passed to the delay_mu
builtin and advancing the runtime timeline.

As a result of this change, this strategy is no longer valid:
we can meaningfully mutate the iodelay.Expr form but not the IR
instruction form. Thus, IR instructions are no longer generated for
delay expressions, and the LLVM lowering pass now has to lower
the iodelay.Expr objects as well.

This works OK for flat `with parallel:` expressions, but breaks down
outside of `with parallel:` or when calls are present. The reasons
it breaks down are as follows:

  * Outside of `with parallel:`, delay() and delay_mu() must accept
    any expression, but iodelay.Expr's are not nearly expressive
    enough. So, the IR instruction form must actually be kept as well.

  * A delay instruction is currently inserted after a call to
    a user-defined function; this delay instruction introduces
    a point where basic block reordering is possible as well as
    provides delay information. However, the callee knows nothing
    about the context in which it is called, which means that
    the runtime timeline is advanced twice. So, a new terminator
    instruction must be added that combines the properties of delay
    and call instructions (and another for delay and invoke as well).
2015-11-21 00:02:47 +08:00
whitequark
73c358a59a Reformat. 2015-11-20 23:33:06 +08:00
whitequark
cb9e7d15bf compiler.iodelay: subtraction certainly shouldn't be commutative. 2015-11-20 22:15:03 +08:00
whitequark
cc623c13b4 Reformat. 2015-11-20 21:45:34 +08:00
whitequark
d0f86e05d0 transforms.interleaver: add safety check. 2015-11-20 17:27:04 +08:00
whitequark
88b7990714 transforms.iodelay_estimator: fail statements with indeterminate delay inside with parallel. 2015-11-20 17:10:25 +08:00
whitequark
28fa68730a Merge branch 'master' into new-py2llvm 2015-11-20 15:55:29 +08:00
9826b19c9a gui/scan: adapt layout to show more decimals 2015-11-20 11:20:15 +08:00
whitequark
00ec574d73 transforms.interleaver: implement (without inlining). 2015-11-20 00:03:26 +08:00
whitequark
025bfbe746 transforms.llvm_ir_generator: accept delay instructions.
The delay instruction is just like a branch (discontinuity
in instruction flow), but it also carries metadata: how long
did the execution of its basic block take. This metadata only
matters during inlining and interleaving, so we treat it here
as a mere branch.
2015-11-19 23:55:52 +08:00
whitequark
9639a831bc transforms.artiq_ir_generator: correctly emit IfExpT with control flow.
This can happen with nested if expressions, as well as if
the if expression includes delays.
2015-11-19 23:44:39 +08:00
whitequark
2543daa5cf transforms.artiq_ir_generator: don't emit delay instruction for zero delay.
Call nodes with iodelay=Const(0) can be generated outside of
`with parallel:`, where Interleaver won't and LLVMIRGenerator can't
lower them.
2015-11-19 23:24:46 +08:00
whitequark
58db347e01 transforms.iodelay_estimator: fix uninitialized access. 2015-11-19 23:23:39 +08:00
108aed569e gui/models/DictSyncTreeSepModel: add getitem 2015-11-17 22:53:11 +08:00
537fa2287b gui/models/DictSyncTreeSepModel: fix item row update 2015-11-17 22:39:46 +08:00
7bebc52959 gui/explorer: reduce impact of Qt selection display bug 2015-11-17 22:38:01 +08:00
250ab6b489 gui/explorer: tree view 2015-11-17 19:46:26 +08:00
9c5db288a5 gui/datasets: tree view 2015-11-17 19:46:17 +08:00
107d8f0ffa gui/models: add DictSyncTreeSepModel 2015-11-17 19:45:28 +08:00
whitequark
48a2bb10d5 transforms.interleaver: add boilerplate. 2015-11-17 05:22:20 +03:00
whitequark
de9d7eb2e4 compiler: add delay IR instruction. 2015-11-17 05:16:43 +03:00
whitequark
956d2afcb2 compiler.iodelay: fold Max further. 2015-11-17 03:06:07 +03:00
whitequark
7d2fca291d compiler.iodelay: add missing import. 2015-11-17 01:30:19 +03:00
whitequark
e619154c81 transforms.iodelay_estimator: fix handling of with sequential. 2015-11-17 01:22:48 +03:00
whitequark
506725f78a transforms.iodelay_estimator: fix handling of methods. 2015-11-17 01:19:22 +03:00
whitequark
b0c6b70971 transforms.asttyped_rewriter: fix class redefinition diagnostic. 2015-11-17 01:17:25 +03:00
whitequark
9e0a5b9404 transforms.iodelay_estimator: skip statements, not modules on _UnknownDelay. 2015-11-17 01:00:10 +03:00
whitequark
44d0a35409 transforms.iodelay_estimator: actually iterate to fixpoint. 2015-11-17 00:59:40 +03:00
whitequark
10f82ff2c8 transforms.iodelay_estimator: do not unify indeterminate delays. 2015-11-17 00:59:09 +03:00
whitequark
841e01a8bb compiler.iodelay: fix typo in Var.__eq__. 2015-11-17 00:53:12 +03:00
whitequark
a2d73c8b05 compiler.types: dump type variable iodelay explicitly. 2015-11-17 00:51:56 +03:00
whitequark
e67705dc27 compiler.iodelay: fix typo in BinOp.__eq__. 2015-11-17 00:51:37 +03:00
whitequark
629aacec09 compiler.iodelay: add forgotten Conv.__eq__. 2015-11-17 00:51:22 +03:00
whitequark
fd46690cf5 compiler: make IR dumps vastly more readable. 2015-11-17 00:23:34 +03:00
whitequark
eefa9e2ea6 transforms.inferencer: fix typo. 2015-11-17 00:02:15 +03:00
723ef71a87 master/repository: fix experiment name conflict handling 2015-11-16 22:46:40 +08:00
whitequark
c8cfa7c7bd compiler: give suggestions in diagnostics for unbound variable.
This uses the Jaro-Winkler edit distance, which seemed like the best
fit for identifiers, even though it is intended for people's names.
2015-11-15 23:09:40 +03:00
d32c2c091f master: scan subdirectories in repos 2015-11-14 00:06:52 +08:00
3cbd7c4c13 gui: support multiple log docks 2015-11-12 01:13:57 +08:00
fa89e165b2 gui/datasets: fix display update 2015-11-11 17:09:35 +08:00
11fbea4161 sync_struct/Subscriber: support lists of notify callbacks 2015-11-11 17:09:07 +08:00
62c0eb85b1 gui/console: use network clients directly 2015-11-11 17:02:51 +08:00
4166f4e928 frontend: use atexit_register_coroutine in other tools 2015-11-11 16:22:12 +08:00
69f5e378fe sync_struct/Subscriber: remove unused multi-target functionality 2015-11-11 12:44:20 +08:00
77330c7c68 gui/moninj: suppress spurious core device address warnings 2015-11-11 12:43:25 +08:00
c3f99eda8f gui: centralize subscribers 2015-11-11 12:13:19 +08:00
ae99af27ee runtime,gateware: use new misoc identifier 2015-11-10 22:44:38 +08:00
whitequark
9670939ca6 compiler.analyses.domination: fix PostDominatorTree. 2015-11-09 12:49:27 +03:00
whitequark
19fae9181c compiler.analyses.domination: implement new dominator tree algorithm. 2015-11-09 11:51:54 +03:00
44c0c617f3 master/worker: add ARTIQ version to HDF5 output 2015-11-09 12:32:29 +08:00
2df2e141f7 update versioneer 2015-11-09 12:19:01 +08:00
594162325b use versioneer 2015-11-09 11:33:38 +08:00
3c63e5bc61 runtime/liblwip: fix symbolic link creation 2015-11-09 11:07:22 +08:00
e749bae302 package everything to rebuild core device binaries 2015-11-09 10:47:14 +08:00
whitequark
a0c6f75f9b compiler.types: fix obsolete iodelay references. 2015-11-07 15:14:19 +03:00
whitequark
51f04f6311 Explicitly use the python3.5 binary everywhere. 2015-11-07 13:39:39 +03:00
whitequark
0b5e1d174c Unbreak artiq_flash.sh. 2015-11-07 13:26:14 +03:00
whitequark
d6d0a3e3e9 Merge branch 'master' into new-py2llvm 2015-11-07 12:57:18 +03:00
whitequark
da622937f6 Merge commit 'd0b5c3ba7fb' into new-py2llvm 2015-11-07 09:41:34 +03:00
a7c9c95085 gui/explorer: support requesting termination of all instances 2015-11-05 19:04:10 +08:00
ad5a32fb6e targets/kc705: remove unneeded argument on qc2 2015-11-04 20:09:37 +08:00
38740a4abe runtime: log startup kernel start 2015-11-04 12:34:18 +08:00
087c2fd078 runtime: fix generation of service_table.h 2015-11-04 11:22:56 +08:00
3404a6565b frontend/artiq_flash: reorganize device binaries 2015-11-04 10:40:46 +08:00
e26147b2ac gateware,runtime: use new migen/misoc 2015-11-04 00:35:03 +08:00
644a410c90 thorlabs_tcube: fix -P case handling 2015-11-03 17:55:00 +08:00
whitequark
3a1b77ae6b analyses.domination: add PostDominatorTree. 2015-11-01 09:49:39 +03:00
a2c074cc33 gui: fix RPC client teardown 2015-11-01 00:03:46 +08:00
8e24a018ea gui/log: fix filter initialization race condition 2015-11-01 00:01:45 +08:00
f57145c4f3 gui: support triggering repository rescan 2015-10-31 23:58:39 +08:00
0a36b03a12 gui/log: work around Qt scrolling bug. Closes #151 2015-10-31 10:25:01 +08:00
d8b98ae5d4 gui/log: fix performance problems 2015-10-31 00:34:14 +08:00
b61eb866b6 gui: log freetext filter 2015-10-30 19:58:33 +08:00
f3ee97a4ff fix typo 2015-10-30 19:58:15 +08:00
58f55fc630 artiq_flash: check that xc3sprog is found. closes #162 2015-10-30 15:52:03 +08:00
2c77c80b4f master: expose more scheduler APIs to the experiments 2015-10-30 13:41:18 +08:00
whitequark
f70f7fb89b Merge branch 'master' into new-py2llvm 2015-10-30 04:29:35 +03:00
0e375e4980 gui: fix shortcut pipeline 2015-10-30 00:50:18 +08:00
f0eed1182a protocols/pyon: improve error reporting of non-serializable type 2015-10-29 09:42:45 +08:00
32c95f24d0 worker: reduce some logging levels 2015-10-29 09:34:41 +08:00
0d53f7ab0d ignore ProcessLookupError when killing subprocesses. Closes #167 2015-10-28 20:57:28 +08:00
40b4129c65 Only support scalars and numpy arrays in HDF5 output. Update documentation. Closes #145 2015-10-28 18:33:42 +08:00
ec328cf5e1 master/worker_db: reduce exception backtrace clutter of get_dataset. Closes #168 2015-10-28 17:50:48 +08:00
828b48ad89 master/scheduler: reduce logging severity of worker exception backtraces to debug 2015-10-28 17:48:50 +08:00
1ada15ae5d master: simplify worker/parent RPC 2015-10-28 17:35:57 +08:00
4e35a247d1 pdq2_client: remove unnecessary calls 2015-10-28 09:48:14 +08:00
3789273e29 pdq2_client: remove init call 2015-10-28 09:47:01 +08:00
d708002fb9 devices/pdq2: add RPC getter functions 2015-10-28 09:46:17 +08:00
179416dac7 gui: delete shortcuts 2015-10-27 18:20:25 +08:00
f872d92d22 gui/schedule: improve delete status bar message 2015-10-27 18:20:11 +08:00
138ba7e2fa gui: add addItems to populate log level comboboxes 2015-10-27 18:10:31 +08:00
967d4eda63 gui: shortcut support 2015-10-27 17:59:34 +08:00
9f2ff32948 test/sync_struct: nparray mutation 2015-10-26 23:41:05 +08:00
a6d38b8a97 gui/datasets: fix source decoding 2015-10-26 00:32:49 +08:00