1
0
forked from M-Labs/nac3
Commit Graph

484 Commits

Author SHA1 Message Date
adb5c69e67 nac3core: min builtin function 2022-03-08 21:59:37 +08:00
f7e62ab5b7 nac3ast/parser/core: use i128 for u64 constants 2022-03-08 18:21:14 +08:00
9f6c7b3359 nac3core: type conversion to/from uint 2022-03-08 13:42:45 +08:00
142e99a0f1 nac3core: fix broken tests 2022-03-08 13:34:08 +08:00
79c469301a basic unsigned integer support 2022-03-08 13:34:02 +08:00
8602852241 nac3core: use signed extension to convert i32 to i64 2022-03-06 04:49:02 +08:00
42fbe8e383 nac3core: fix err msg of too many args 2022-03-05 03:59:45 +08:00
63b0f29728 Fix broken tests 2022-03-05 00:27:51 +08:00
294943e303 nac3core: get exception ID from symbol resolver
We need to store the exception class somewhere in order to create them
back in the host. Fixes #200
2022-03-05 00:26:35 +08:00
59ac5aae8a fix error message string (2) 2022-03-02 08:33:13 +08:00
da039e3acf fix error message string 2022-03-02 08:04:15 +08:00
323d77a455 nac3artiq: improve error message for out of range error 2022-02-28 23:09:14 +08:00
5d8e87d923 more readable type annotation error string 2022-02-28 16:24:03 +08:00
846d1726ef nac3core: fixed keyword arguments handling 2022-02-26 16:34:30 +08:00
0686e83f4c nac3core/typecheck: fixed incorrect rollback 2022-02-25 20:01:11 +08:00
e710b6c320 nac3core: fix exception final branch handling
According to https://github.com/m-labs/artiq/pull/1855
Passed the test cases from 1855.
Fixes #196.
2022-02-25 17:42:47 +08:00
cc769a7006 nac3core: reset unification table state before printing errors
Fixes nondeterministic error messages due to nondeterministic
unification order. As all unification operations will be restored, the
error messages should not be affected by the unification order before
the failure operation.
2022-02-25 14:47:19 +08:00
5cd4fe6507 update tests 2022-02-23 11:50:03 +08:00
75fde1bbf7 update tests 2022-02-23 11:39:47 +08:00
17792b76b7 rename exception symbols 2022-02-23 11:04:35 +08:00
d3cb5d6e52 Fixed type error messages 2022-02-22 17:22:15 +08:00
3ad25c8f07 nac3core: sort error messages for determinism 2022-02-22 14:33:43 +08:00
ede3706ca8 type_inferencer: special case tuple index error message 2022-02-21 18:41:42 +08:00
f97f93d92c applied rustfmt and clippy auto fix 2022-02-21 18:27:46 +08:00
d9cb506f6a nac3core: refactored for better error messages 2022-02-21 18:24:19 +08:00
352831b2ca nac3core: removed legacy location definition 2022-02-13 22:39:24 +08:00
21d9182ba2 nac3core: disallow methods/fields in Exception subclass
Fixes #192
2022-02-13 21:45:22 +08:00
14d25b3b9d Fixed broken tests 2022-02-13 17:21:42 +08:00
b18626b149 Fix compilation and test failures 2022-02-12 22:50:32 +08:00
750d912eb4 nac3core: do list bound check and negative index handling
Raise error when index out of range. Note that we use llvm.expect to
tell the optimizer that we expect not to raise an exception, so the
normal path performance would be better. If this assumption is violated,
the exception overhead might be slightly larger, but the percentage
increase in overhead should not be high since exception unwinding is
already pretty slow.
2022-02-12 22:50:32 +08:00
bf52e294ee nac3artiq: RPC support 2022-02-12 22:50:32 +08:00
e303248261 nac3core: exception type check and codegen 2022-02-12 22:50:32 +08:00
7ea5a5f84d nac3core: codegen refactoring
- No longer check if the statement will return. Instead, we check if
  the current basic block is terminated, which is simpler and handles
  exception/break/continue better.
- Use invoke statement when unwind is needed.
- Moved codegen for a block of statements into a separate function.
2022-02-12 22:13:59 +08:00
b267a656a8 nac3core: added exception type and fixed primitive representation
- Added `Exception` primitive type and some builtin exception types.
  Note that all exception types share the same layout, and should
  inherit from the base `Exception` type. There are some hacks in the
  toplevel module for handling exception types, we should revisit and
  fix them later.
- Added new primitive types to concrete type module, otherwise there
  would be some weird type errors.
- Changed the representation of strings to CSlice<u8>, instead of
  CString.
2022-02-12 22:13:59 +08:00
050c862c1a nac3core: function codegen callback changes
Added code generator argument to the callback, so it would be easier to
write complicated codegen with that callback. To prepare for RPC
codegen.
2022-02-12 21:24:41 +08:00
d6ab73afb0 nac3core: style 2022-02-07 02:18:56 +08:00
6f9f455152 nac3core: list slice irrt use one function to handle var size 2022-02-07 02:09:50 +08:00
e50f1017fa nac3core: irrt list of tuple use struct value representation 2022-02-07 02:09:50 +08:00
77608346b1 nac3core: handle tuple by value 2022-02-07 02:09:50 +08:00
1288624218 lock insta version (#179) 2022-01-31 15:18:49 +08:00
de065cfa14 update dependencies 2022-01-31 12:28:40 +08:00
ace0e2a2c6 nac3core: fix use of size_t in list comprehension, cleanup 2022-01-25 03:35:59 +08:00
fd4bf12808 fix grammar of some type error messages 2022-01-14 16:56:23 +08:00
ae8f82ccb0 nac3core: fix broken tests 2022-01-14 16:28:37 +08:00
4a1a4dc076 nac3core/artiq/standalone: symbol resolver return error msg for type error of host variables 2022-01-14 16:28:34 +08:00
eba9fc8a69 nac3core: add missing location for type inference 2022-01-14 03:05:11 +08:00
4976e89ae2 nac3core: list slice support 2022-01-13 16:53:32 +08:00
82509d60ec remove obvious comment 2022-01-13 12:31:28 +08:00
2579ecbd19 nac3core: irrt module get attribute id using name instead of hard code 2022-01-11 17:25:07 +08:00
44f4c4f028 nac3core: build script use Path::join 2022-01-09 12:06:45 +08:00
8ef9e74aaf move rustfmt.toml upper 2022-01-09 11:31:06 +08:00
b88f17ed42 switch to clang-unwrapped, build IRRT with wasm32 2022-01-09 10:56:28 +08:00
1ee857de6a nac3core: format, fix clippy warning 2022-01-09 01:12:18 +08:00
4a65d82db5 introduce IRRT, implement power
based on code by Yijia
M-Labs/nac3#160
2022-01-09 00:57:50 +08:00
7193e3f328 nac3core: codegen fix empty list llvm type 2021-12-30 05:09:21 +08:00
85e06d431a nac3core: improve some type annotation error messages (#87) 2021-12-28 10:49:14 +08:00
9b3b47ce50 fix broken tests 2021-12-28 01:38:16 +08:00
88f0da7bdd add file name to AST node location 2021-12-28 01:28:55 +08:00
1bd966965e fixed M-Labs/nac3#146 2021-12-27 22:56:50 +08:00
fa04768a77 redo "nac3core: fix #84"
This reverts commit 86005da8e1.
2021-12-27 22:56:26 +08:00
86005da8e1 Revert "nac3core: fix #84"
This reverts commit 0902d8adf4.
2021-12-26 08:35:27 +08:00
5aa6749241 remove num-traits 2021-12-26 00:32:08 +08:00
80d3ab1b0f remove bigints 2021-12-26 00:23:54 +08:00
d2a5cd6d57 update to LLVM 13 2021-12-25 22:49:47 +08:00
9e3f75255e update inkwell. Closes #67 2021-12-25 22:17:06 +08:00
0902d8adf4 nac3core: fix #84 2021-12-23 15:26:48 +08:00
66320679be improve error messages
#112, #110, #108, #87

Reviewed-on: M-Labs/nac3#145
Co-authored-by: ychenfo <yc@m-labs.hk>
Co-committed-by: ychenfo <yc@m-labs.hk>
2021-12-22 08:52:19 +08:00
0ff995722c Revert "nac3core: add missing expr concrete type check"
This reverts commit cb450372d6.
2021-12-20 18:13:45 +08:00
e2b44a066b return int32 in len(). Closes #141 2021-12-20 17:44:42 +08:00
cb450372d6 nac3core: add missing expr concrete type check 2021-12-19 18:01:49 +08:00
ff27a1697e nac3core: fix for loop type inference 2021-12-19 18:01:49 +08:00
91625dd327 update kernel-only attribute annotation
Reviewed-on: M-Labs/nac3#127
Co-authored-by: ychenfo <yc@m-labs.hk>
Co-committed-by: ychenfo <yc@m-labs.hk>
2021-12-19 11:04:53 +08:00
b5637a04e9 nac3core: use official implementation for len 2021-12-13 10:44:33 +08:00
2c6601d97c nac3core: fix len on range with step of different sign 2021-12-13 10:44:33 +08:00
82359b81a2 nac3core: fix bool to int conversion 2021-12-13 04:13:43 +08:00
4d2fd9582a nac3core: fix broken tests 2021-12-09 01:37:05 +08:00
b7892ce952 nac3core: add len support for list and range 2021-12-09 01:37:00 +08:00
01d3249646 nac3core: add missing llvm range type 2021-12-09 01:16:05 +08:00
3f73896477 remove a small amount of LLVM bloat
Also avoids libffi.dll dependency on Windows.
2021-12-08 17:41:34 +08:00
4526c28edb Merge branch 'windows' 2021-12-02 22:26:55 +08:00
25fc9db66d cargo: specify inkwell LLVM target explicitly
Windows LLVM linking otherwise breaks on the non-existing targets.
2021-12-02 22:24:33 +08:00
1c31aa6e8e consistent naming 2021-12-02 10:45:46 +08:00
aa2d79fea6 Merge branch 'master' into built_in_floor_ceil 2021-12-02 01:08:55 +08:00
1e6848ab92 nac3core: distinguish i64 and i32 in bool conversion 2021-12-02 01:02:42 +08:00
142f82f987 remove debug prints 2021-12-01 22:48:06 +08:00
dfd3548ed2 TypeVar and virtual support in Symbol Resolver (#99)
Add `TypeVar` and `virtual` support for Symbol Resolver in nac3artiq and nac3standalone

Reviewed-on: M-Labs/nac3#99
Co-authored-by: ychenfo <yc@m-labs.hk>
Co-committed-by: ychenfo <yc@m-labs.hk>
2021-12-01 22:44:53 +08:00
fa2fe8ed5d nac3core: add ceil and floor 2021-12-01 03:23:58 +08:00
7ede4f15b6 nac3core: move builtin definitions to another file 2021-12-01 02:52:00 +08:00
0fe346106d nac3core: fix converting int to bool (#119) 2021-11-30 03:02:26 +08:00
4b17511b4a Merge branch 'master' into KernelInvariant 2021-11-27 21:29:27 +08:00
7ee82de312 nac3core: fixed weird type inference error 2021-11-27 20:27:46 +08:00
de8fc264d7 fix unsupported default parameter error message 2021-11-23 15:34:44 +08:00
4587088835 Constant Default Parameter Support (#98)
Add support for constant default parameter

Reviewed-on: M-Labs/nac3#98
Co-authored-by: ychenfo <yc@m-labs.hk>
Co-committed-by: ychenfo <yc@m-labs.hk>
2021-11-23 07:32:09 +08:00
49476d06e1 nac3core: clearer comments 2021-11-22 15:06:16 +08:00
664e02cec4 nac3core: fix clippy warning 2021-11-22 14:55:39 +08:00
01b51b62ee nac3core: composer better error msg in for uninit field 2021-11-21 06:11:55 +08:00
d336200bf4 nac3core: fix broken tests due to the fix of rigid typevar handling 2021-11-21 06:11:55 +08:00
a50df6560e nac3core: fix handling on rigid typevar 2021-11-21 06:11:55 +08:00
a9635f0979 nac3core: top level use codegen official get_subst_key 2021-11-21 06:11:55 +08:00
c2706fa720 nac3core: fix polymorphic class method partial instantiation 2021-11-21 06:11:55 +08:00
f5ec103c82 nac3artiq: kernel invariant support 2021-11-20 21:15:15 +08:00
ba08deada6 nac3core: refactor codegen 2021-11-20 19:50:25 +08:00
8ab3ee9cce nac3core: AugAssign support (#82) 2021-11-13 12:24:22 +08:00
96607432c1 nac3core: use Python 3.9 list/tuple annotations in test
Closes #85
2021-11-11 20:05:08 +08:00
ffa89e9308 fix clippy warnings 2021-11-06 23:00:18 +08:00
b1e83a1fd4 nac3core: type check invariants
This rejects code that tries to assign to KernelInvariant fields and
methods.
2021-11-06 22:48:08 +08:00
99b29d8ded Merge branch 'master' into with_nac3comment 2021-11-05 20:46:29 +08:00
3db95b120b nac3core: implements bool conversion function 2021-11-05 20:34:34 +08:00
8dbb4ad58a nac3core/toplevel: make test less fragile
test results should not depend on internal states if possible
2021-11-05 20:28:21 +08:00
b239806558 nac3core: adapt to ast change due to comment support 2021-11-04 15:02:51 +08:00
bf7e2c295a integrate nac3parser 2021-11-03 17:11:00 +08:00
e89bc93b5f ignore expressions in class definition body (#26) 2021-11-02 23:30:12 +08:00
47f563908a basic string support (#30) 2021-11-02 23:22:49 +08:00
0e914ab7e9 composer: add range keyword 2021-11-02 18:56:14 +08:00
613020a717 test: add missing id_to_name entry 2021-11-02 18:34:48 +08:00
624dfe8cd1 upgrade to LLVM 12 2021-11-02 14:00:20 +08:00
083eacc268 with parallel/sequential support
Behavior of parallel and sequential:
Each function call (indirectly, can be inside a sequential block) within a parallel
block will update the end variable to the maximum now_mu in the block.
Each function call directly inside a parallel block will reset the timeline after
execution. A parallel block within a sequential block (or not within any block) will
set the timeline to the max now_mu within the block (and the outer max now_mu will also
be updated).

Implementation: We track the start and end separately.
- If there is a start variable, it indicates that we are directly inside a
parallel block and we have to reset the timeline after every function call.
- If there is a end variable, it indicates that we are (indirectly) inside a
parallel block, and we should update the max end value.

Note: requires testing, it is difficult to inspect the output IR
2021-10-31 23:54:37 +08:00
558c3f03ef nac3core/codegen: list comprehension support 2021-10-24 16:53:43 +08:00
45673b0ecc nac3core/codegen: cleanup 2021-10-24 16:53:43 +08:00
181607008d nac3core/codegen: supports list iter 2021-10-24 14:39:50 +08:00
fb92b6d364 nac3core: supports range iterator 2021-10-23 23:53:36 +08:00
2f6ba69770 nac3core/typecheck: check if value is none 2021-10-23 21:31:14 +08:00
cc83bbc63a nac3core/codegen: fix broken test 2021-10-17 13:07:45 +08:00
279f47f633 nac3core/codegen: avoid sending unifiers
Previously, we have to copy types from one unification table to another,
and make the table sendable. This requires cloning (processing) the
whole table 3 times per function call which is not efficient and uses
more memory than required when the unification table is large.

We now use a concrete type table to only copy the type we need. This
reduces the overhead as we only need to process the unification table
for once (when we do the function codegen), and reduces memory usage by
a bit (but not noticeable when the unification table is small, i.e. the
types are simple).
2021-10-17 13:02:18 +08:00
9850cbe313 nac3core/codegen: optimize for every function
This speeds up compilation and reduces memory usage.
2021-10-17 12:56:11 +08:00
1f5bea2448 nac3core/codegen: refactor according to #23 2021-10-16 22:17:36 +08:00
c4259d14d1 fixed some clippy warnings 2021-10-16 18:08:13 +08:00
26076c37ba nac3core/typecheck: supports recursive type inference 2021-10-16 15:56:49 +08:00
fd0b11087e nac3core: use round instead of rint. Closes #61 2021-10-11 08:18:52 +08:00
77542170fd nac3core: fixes #60 2021-10-10 15:01:06 +08:00
a3ce5be10b nac3core: fixes #32 and #57 2021-10-09 16:20:49 +08:00
11144301ca nac3artiq: added simple host value support 2021-10-06 16:07:42 +08:00
4fcb54e463 nac3core: fix #46, better toplevel return type error msg 2021-10-03 18:07:45 +08:00
24b2111c64 nac3core: fix #45 toplevel better error msg for methods/functions 2021-10-03 17:25:28 +08:00
f5ce1afe0b fix tests and switch to insta
Use a library called 'insta' to better organize those longer correct test outputs in toplevel tests. 'insta' creates `.snap` files as snapshots of the test output, and will automatically do the diff if the output is different. This makes maintaining test cases with larger outputs a lot easier.

Reviewed-on: M-Labs/nac3#42
Co-authored-by: ychenfo <yc@m-labs.hk>
Co-committed-by: ychenfo <yc@m-labs.hk>
2021-10-03 16:39:12 +08:00
ba93931758 implement timeline functions for RISC-V (WIP) 2021-10-02 19:05:35 +08:00
1d2a32b140 nac3core/toplevel: impl scalar conversion
Implemented scalar conversion functions as builtin functions.
`round` for int64 is now implemented as `round64`.
2021-09-30 23:39:29 +08:00
f0fdfe42cb nac3core: better impl of #24 2021-09-30 17:07:48 +08:00
8d839db553 typo 2021-09-27 19:12:18 +08:00
64404bba20 syscall -> extern (#21) 2021-09-27 10:13:03 +08:00
d4ed76d76e nac3core: implementing #24 2021-09-26 22:17:09 +08:00
3c121dfcda nac3core/toplevel/composer: fixes #29 2021-09-25 22:02:19 +08:00
693ac7d336 nac3core/toplevel: added personality symbol config 2021-09-25 21:44:00 +08:00
799ed58d21 nac3core/type_inferencer: avoid type var for assign 2021-09-22 19:25:47 +08:00
105d605e6d nac3core: fix clippy warnings 2021-09-22 18:04:06 +08:00
97f5b7c324 fixed performance regression 2021-09-22 18:04:06 +08:00
7d48883583 fixed tests 2021-09-22 18:04:06 +08:00
084efe92af nac3core: use string interning 2021-09-22 18:04:06 +08:00
891056631f nac3core: use Arc to reduce copy 2021-09-22 18:04:06 +08:00
1b5ac3cd25 nac3core: do not alloc call if it is monomorphic 2021-09-22 18:04:06 +08:00