forked from M-Labs/artiq-zynq
Compare commits
No commits in common. "24a4d79f0f54d3d56a014001f5b830eef3f4fb3a" and "d51e5e60c3ba337cdefff5e918eb35bd05a03e84" have entirely different histories.
24a4d79f0f
...
d51e5e60c3
90
README.md
90
README.md
|
|
@ -4,102 +4,60 @@ ARTIQ on Zynq
|
||||||
How to use
|
How to use
|
||||||
----------
|
----------
|
||||||
|
|
||||||
1. [Install ARTIQ](https://m-labs.hk/artiq/manual/installing.html). Get the corresponding version to the ``artiq-zynq`` version you are targeting.
|
1. Install the ARTIQ version that corresponds to the artiq-zynq version you are targeting.
|
||||||
2. To obtain firmware binaries, use AFWS or build your own; see [the ARTIQ manual](https://m-labs.hk/artiq/manual/building_developing.html) for detailed instructions or skip to "Development" below. ZC706 variants only can also be downloaded from latest successful build on [Hydra](https://nixbld.m-labs.hk/).
|
2. To obtain firmware binaries, select the latest successful build on [Hydra](https://nixbld.m-labs.hk/) for the targeted artiq-zynq version, or use AFWS. If using Hydra, search for the job named ``<board>-<variant>-sd`` (for example: ``zc706-nist_clock-sd`` or ``zc706-nist_qc2-sd``).
|
||||||
3. Place ``boot.bin`` file at the root ``/`` of a FAT-formatted SD card.
|
3. Place the ``boot.bin`` file, obtained from Hydra's "binary distribution" download link or from AFWS, at the root of a FAT-formatted SD card.
|
||||||
4. Optionally, create a ``config.txt`` configuration file containing ``key=value`` pairs on each line and place it at the root of the SD card. See below for valid keys. The ``ip``, ``ip6`` and ``mac`` keys can be used to set networking information. If these keys are not found, the firmware will use default values which may or may not be compatible with your network.
|
4. Optionally, create a ``config.txt`` configuration file at the root of the SD card containing ``key=value`` pairs on each line. Use the ``ip``, ``ip6`` and ``mac`` keys to respectively set the IPv4, IPv6 and MAC address of the board. Configuring an IPv6 address is entirely optional. If these keys are not found, the firmware will use default values that may or may not be compatible with your network.
|
||||||
5. Insert the SD card into the board and set the board to boot from the SD card. For ZC706, this is achieved by placing the large DIP switch SW11 into the 00110 position. On Kasli-SoC, place the BOOT MODE switches to SD.
|
5. Insert the SD card into the board and set up the board to boot from the SD card. For the ZC706, this is achieved by placing the large DIP switch SW11 in the 00110 position.
|
||||||
6. Power up the board. After successful boot the firmware should respond to ping at its IP addresses. Boot output can be observed from UART at 115200bps 8-N-1.
|
6. Power up the board. After the firmware starts successfully, it should respond to ping at its IP addresses, and boot messages can be observed from its UART at 115200bps.
|
||||||
7. Create and use an ARTIQ device database as usual.
|
7. Create and use an ARTIQ device database as usual, but set ``"target": "cortexa9"`` in the arguments of the core device.
|
||||||
|
|
||||||
Configuration
|
Configuration
|
||||||
-------------
|
-------------
|
||||||
|
|
||||||
Configuring the device is done using the ``config.txt`` text file at the root of the SD card plus optionally a ``config`` folder. When searching for a configuration key, the firmware first looks for a file named ``/config/[key].bin`` and, if it exists, returns the contents of that file. If not, it looks into ``/config.txt``, which should contain a list of ``key=value`` pairs, one per line. ``config.txt`` should be used for most keys but the ``config`` folder allows for setting configuration values which consist of binary data, such as the startup kernel.
|
Configuring the device is done using the ``config.txt`` text file at the root of the SD card, plus the contents of the ``config`` folder. When searching for a configuration key, the firmware first looks for a file named ``/config/[key].bin`` and, if it exists, returns the contents of that file. If not, it looks into ``/config.txt``, which contains a list of ``key=value`` pairs, one per line. The ``config`` folder allows configuration values that consist in binary data, such as the startup kernel.
|
||||||
|
|
||||||
The following configuration keys are available among others:
|
The following configuration keys are available:
|
||||||
|
|
||||||
- ``mac``: Ethernet MAC address.
|
- ``mac``: Ethernet MAC address.
|
||||||
- ``ip``: IPv4 address.
|
- ``ip``: IPv4 address.
|
||||||
- ``ip6``: IPv6 address.
|
- ``ip6``: IPv6 address.
|
||||||
- ``idle_kernel``: idle kernel in ELF format (as produced by ``artiq_compile``).
|
- ``startup``: startup kernel in ELF format (as produced by ``artiq_compile``).
|
||||||
- ``startup_kernel``: startup kernel in ELF format (as produced by ``artiq_compile``).
|
|
||||||
- ``rtio_clock``: source of RTIO clock; valid values are ``ext0_bypass`` and ``int_125``.
|
- ``rtio_clock``: source of RTIO clock; valid values are ``ext0_bypass`` and ``int_125``.
|
||||||
|
- ``boot``: SD card "boot.bin" file, for replacing the boot firmware/gateware. Write only.
|
||||||
|
|
||||||
See [ARTIQ manual](https://m-labs.hk/artiq/manual-beta/core_device.html#configuration-storage) for full list. Configurations can be read/written/removed with ``artiq_coremgmt``. Config erase is not implemented, as it isn't particularly useful.
|
Configurations can be read/written/removed via ``artiq_coremgmt``. Config erase is
|
||||||
|
not implemented as it seems not very useful.
|
||||||
For convenience, the ``boot`` key can be used with ``artiq_coremgmt`` and a ``boot.bin`` file to replace firmware/gateware in a running system. This key is read-only. When loading ``boot.bin`` onto the SD card directly, place it at the root and not in the ``config`` folder.
|
|
||||||
|
|
||||||
Development instructions
|
Development instructions
|
||||||
------------------------
|
------------------------
|
||||||
|
|
||||||
ARTIQ on Zynq is packaged using [Nix](https://nixos.org) Flakes. Install Nix 2.8+ and enable flakes by adding ``experimental-features = nix-command flakes`` to ``nix.conf`` (e.g. ``~/.config/nix/nix.conf``).
|
ARTIQ on Zynq is packaged using the [Nix](https://nixos.org) Flakes system. Install Nix 2.8+ and enable flakes by adding ``experimental-features = nix-command flakes`` to ``nix.conf`` (e.g. ``~/.config/nix/nix.conf``).
|
||||||
|
|
||||||
**Pure build with Nix:**
|
Pure build with Nix and execution on a remote JTAG server:
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
nix build .#zc706-nist_clock-jtag # or zc706-nist_qc2-jtag or zc706-nist_clock-sd or etc
|
nix build .#zc706-nist_clock-jtag # or zc706-nist_qc2-jtag or zc706-nist_clock_satellite-jtag etc.
|
||||||
|
./remote_run.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
Run ``nix flake show`` to see all valid build targets. Targets suffixed with ``-jtag`` produce separate firmware and gateware files, intended for use in booting via JTAG server/Ethernet, e.g. ``./remote_run.sh -i`` with a remote JTAG server. Targets suffixed with ``-sd`` will produce ``boot.bin`` file suitable for SD card boot. ``-firmware`` and ``-gateware`` respectively build firmware and gateware only.
|
Impure incremental build and execution on a remote JTAG server:
|
||||||
|
|
||||||
The Kasli-SoC target requires a system description file as input. See ARTIQ manual for exact instructions or use incremental build.
|
|
||||||
|
|
||||||
**Impure incremental build:**
|
|
||||||
|
|
||||||
For boards with fixed variants, i.e. ZC706, etc. :
|
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
nix develop
|
nix develop
|
||||||
cd src
|
cd src
|
||||||
gateware/<board>.py -g ../build/gateware -V <variant> # gateware
|
gateware/zc706.py -g ../build/gateware -V <variant> # build gateware
|
||||||
make GWARGS="-V <variant>" <runtime/satman> # firmware
|
make GWARGS="-V <variant>" <runtime/satman> # build firmware
|
||||||
```
|
cd ..
|
||||||
|
./remote_run.sh -i
|
||||||
For boards with system descriptions, i.e. Kasli-SoC, etc. :
|
|
||||||
|
|
||||||
```shell
|
|
||||||
nix develop
|
|
||||||
cd src
|
|
||||||
gateware/<board>.py -g ../build/gateware <description.json> # gateware
|
|
||||||
make TARGET=<board> GWARGS="path/to/description.json" <runtime/satman> # firmware
|
|
||||||
```
|
|
||||||
|
|
||||||
``szl.elf`` can be obtained with:
|
|
||||||
|
|
||||||
```shell
|
|
||||||
nix build git+https://git.m-labs.hk/m-labs/zynq-rs#<board>-szl
|
|
||||||
```
|
|
||||||
|
|
||||||
To generate ``boot.bin`` use ``mkbootimage``, e.g.:
|
|
||||||
|
|
||||||
```shell
|
|
||||||
echo "the_ROM_image:
|
|
||||||
{
|
|
||||||
[bootloader]result/szl.elf
|
|
||||||
gateware/top.bit
|
|
||||||
firmware/armv7-none-eabihf/release/<runtime/satman>
|
|
||||||
}
|
|
||||||
EOF" >> boot.bif
|
|
||||||
mkbootimage boot.bif boot.bin
|
|
||||||
```
|
```
|
||||||
|
|
||||||
Notes:
|
Notes:
|
||||||
|
|
||||||
- The impure build process is also compatible with non-Nix systems.
|
- The impure build process is also compatible with non-Nix systems.
|
||||||
|
- When calling make, you need to specify both the variant and firmware type.
|
||||||
- Firmware type must be either ``runtime`` for DRTIO-less or DRTIO master variants, or ``satman`` for DRTIO satellite.
|
- Firmware type must be either ``runtime`` for DRTIO-less or DRTIO master variants, or ``satman`` for DRTIO satellite.
|
||||||
- If the board is connected to the local machine by JTAG, use the ``local_run.sh`` script.
|
- If the board is connected to the local machine, use the ``local_run.sh`` script.
|
||||||
- A known Xilinx hardware bug prevents repeatedly loading the bootloader over JTAG without a POR reset. If booting over JTAG, install a jumper on ``PS_POR_B`` and use the POR reset script [here](https://git.m-labs.hk/M-Labs/zynq-rs/src/branch/master/kasli_soc_por.py).
|
|
||||||
|
|
||||||
Pre-Commit Hooks
|
|
||||||
----------------
|
|
||||||
|
|
||||||
You are strongly recommended to use the provided pre-commit hooks to automatically reformat files and check for non-optimal Rust/C/C++ practices. Run `pre-commit install` to install the hook and `pre-commit` will automatically run `cargo fmt`, `cargo clippy`, and `clang-format` for you.
|
|
||||||
|
|
||||||
Several things to note:
|
|
||||||
|
|
||||||
- If `cargo fmt`, `cargo clippy`, or `clang-format` returns an error, the pre-commit hook will fail. You should fix all errors before trying to commit again.
|
|
||||||
- If `cargo fmt` or `clang-format` reformats some files, the pre-commit hook will also fail. You should review the changes and, if satisfied, try to commit again.
|
|
||||||
|
|
||||||
License
|
License
|
||||||
-------
|
-------
|
||||||
|
|
|
||||||
|
|
@ -1,70 +0,0 @@
|
||||||
core_addr = "192.168.1.57"
|
|
||||||
|
|
||||||
device_db = {
|
|
||||||
"core": {
|
|
||||||
"type": "local",
|
|
||||||
"module": "artiq.coredevice.core",
|
|
||||||
"class": "Core",
|
|
||||||
"arguments": {
|
|
||||||
"host": core_addr,
|
|
||||||
"ref_period": 1e-9,
|
|
||||||
"target": "cortexa9",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"core_log": {
|
|
||||||
"type": "controller",
|
|
||||||
"host": "::1",
|
|
||||||
"port": 1068,
|
|
||||||
"command": "aqctl_corelog -p {port} --bind {bind} " + core_addr,
|
|
||||||
},
|
|
||||||
"core_moninj": {
|
|
||||||
"type": "controller",
|
|
||||||
"host": "::1",
|
|
||||||
"port_proxy": 1383,
|
|
||||||
"port": 1384,
|
|
||||||
"command": "aqctl_moninj_proxy --port-proxy {port_proxy} --port-control {port} --bind {bind} "
|
|
||||||
+ core_addr,
|
|
||||||
},
|
|
||||||
"core_analyzer": {
|
|
||||||
"type": "controller",
|
|
||||||
"host": "::1",
|
|
||||||
"port_proxy": 1385,
|
|
||||||
"port": 1386,
|
|
||||||
"command": "aqctl_coreanalyzer_proxy --port-proxy {port_proxy} --port-control {port} --bind {bind} "
|
|
||||||
+ core_addr,
|
|
||||||
},
|
|
||||||
"core_cache": {
|
|
||||||
"type": "local",
|
|
||||||
"module": "artiq.coredevice.cache",
|
|
||||||
"class": "CoreCache",
|
|
||||||
},
|
|
||||||
"core_dma": {"type": "local", "module": "artiq.coredevice.dma", "class": "CoreDMA"},
|
|
||||||
"led0": {
|
|
||||||
"type": "local",
|
|
||||||
"module": "artiq.coredevice.ttl",
|
|
||||||
"class": "TTLOut",
|
|
||||||
"arguments": {"channel": 0},
|
|
||||||
},
|
|
||||||
"led1": {
|
|
||||||
"type": "local",
|
|
||||||
"module": "artiq.coredevice.ttl",
|
|
||||||
"class": "TTLOut",
|
|
||||||
"arguments": {"channel": 1},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
device_db.update(
|
|
||||||
spi0={
|
|
||||||
"type": "local",
|
|
||||||
"module": "artiq.coredevice.spi2",
|
|
||||||
"class": "SPIMaster",
|
|
||||||
"arguments": {"channel": 2},
|
|
||||||
},
|
|
||||||
dds0={
|
|
||||||
"type": "local",
|
|
||||||
"module": "artiq.coredevice.ad9834",
|
|
||||||
"class": "AD9834",
|
|
||||||
"arguments": {"spi_device": "spi0"},
|
|
||||||
},
|
|
||||||
)
|
|
||||||
49
flake.lock
49
flake.lock
|
|
@ -11,11 +11,11 @@
|
||||||
"src-pythonparser": "src-pythonparser"
|
"src-pythonparser": "src-pythonparser"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1727765117,
|
"lastModified": 1720514025,
|
||||||
"narHash": "sha256-P4PgnsXNL4kXjSAhRpXzkq17j8bEaJAqNLSH2Vt+DY0=",
|
"narHash": "sha256-eU9Lux5olHTxRCwSiApKSPEdNhrlZ2OJ9ZqSofqp9Uk=",
|
||||||
"ref": "refs/heads/master",
|
"ref": "refs/heads/master",
|
||||||
"rev": "333623e24bdec00783bc89c1e8b6b49a74bc9e1c",
|
"rev": "7a50afd9a96be8e6510d5c952808f39f0b74202a",
|
||||||
"revCount": 9020,
|
"revCount": 8887,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/m-labs/artiq.git"
|
"url": "https://github.com/m-labs/artiq.git"
|
||||||
},
|
},
|
||||||
|
|
@ -37,11 +37,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720768567,
|
"lastModified": 1717637438,
|
||||||
"narHash": "sha256-3VoK7o5MtHtbHLrc6Pv+eQWFtaz5Gd/YWyV5TD3c5Ss=",
|
"narHash": "sha256-BXFidNm3Em8iChPGu1L0s2bY+f2yQ0VVid4MuOoTehw=",
|
||||||
"owner": "m-labs",
|
"owner": "m-labs",
|
||||||
"repo": "artiq-comtools",
|
"repo": "artiq-comtools",
|
||||||
"rev": "f93570d8f2ed5a3cfb3e1c16ab00f2540551e994",
|
"rev": "78d27026efe76a13f7b4698a554f55811369ec4d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -102,16 +102,16 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1727348695,
|
"lastModified": 1720386169,
|
||||||
"narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
|
"narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
|
"rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-unstable",
|
"ref": "nixos-24.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
@ -131,16 +131,15 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719454714,
|
"lastModified": 1720491570,
|
||||||
"narHash": "sha256-MojqG0lyUINkEk0b3kM2drsU5vyaF8DFZe/FAlZVOGs=",
|
"narHash": "sha256-PHS2BcQ9kxBpu9GKlDg3uAlrX/ahQOoAiVmwGl6BjD4=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "d1c527659cf076ecc4b96a91c702d080b213801e",
|
"rev": "b970af40fdc4bd80fd764796c5f97c15e2b564eb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"ref": "snapshot/2024-08-01",
|
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
@ -153,11 +152,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1724921939,
|
"lastModified": 1717637367,
|
||||||
"narHash": "sha256-/S5iip1LHLiCP2VY7PwClDteP9ZMRZvzzKR1LZuV3fs=",
|
"narHash": "sha256-4mSm9wl5EMgzzrW6w86IDUevkEOT99FESHGcxcyQbD0=",
|
||||||
"owner": "m-labs",
|
"owner": "m-labs",
|
||||||
"repo": "sipyco",
|
"repo": "sipyco",
|
||||||
"rev": "32ddd78ff3641b75054793ea0d5681c951766754",
|
"rev": "02b96ec2473a3c3d3c980899de2564ddce949dab",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -169,11 +168,11 @@
|
||||||
"src-migen": {
|
"src-migen": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1727677091,
|
"lastModified": 1720332047,
|
||||||
"narHash": "sha256-Zg3SQnTwMM/VkOGKogbPyuCC2NhLy8HB2SPEUWWNgCU=",
|
"narHash": "sha256-FdYVEHVtXHrzPhBqpXOTo9uHQAtuCsDPmAPY8JrfHOY=",
|
||||||
"owner": "m-labs",
|
"owner": "m-labs",
|
||||||
"repo": "migen",
|
"repo": "migen",
|
||||||
"rev": "c19ae9f8ae162ffe2d310a92bfce53ac2a821bc8",
|
"rev": "60739a161e64630ce7ba62d1a5bac1252b66c3b9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -240,11 +239,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1728110308,
|
"lastModified": 1717654016,
|
||||||
"narHash": "sha256-MAoFbcDgr+ZjptFCWfthK+tTnR1NcfuO6tvYhNM2Pwo=",
|
"narHash": "sha256-y/c0EZNDNlxb/yLy/D23X9PLoiQ8I9mXAA0zsVOy2t8=",
|
||||||
"ref": "refs/heads/master",
|
"ref": "refs/heads/master",
|
||||||
"rev": "cc20478d91e30e1448a4304df7003caed2981b71",
|
"rev": "0efbbe39fe643c03f15e29c208bff3247a987766",
|
||||||
"revCount": 651,
|
"revCount": 647,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.m-labs.hk/m-labs/zynq-rs"
|
"url": "https://git.m-labs.hk/m-labs/zynq-rs"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
11
flake.nix
11
flake.nix
|
|
@ -18,11 +18,11 @@
|
||||||
|
|
||||||
fastnumbers = pkgs.python3Packages.buildPythonPackage rec {
|
fastnumbers = pkgs.python3Packages.buildPythonPackage rec {
|
||||||
pname = "fastnumbers";
|
pname = "fastnumbers";
|
||||||
version = "5.1.0";
|
version = "2.2.1";
|
||||||
|
|
||||||
src = pkgs.python3Packages.fetchPypi {
|
src = pkgs.python3Packages.fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "sha256-4JLTP4uVwxcaL7NOV57+DFSwKQ3X+W/6onYkN2AdkKc=";
|
sha256 = "0j15i54p7nri6hkzn1wal9pxri4pgql01wgjccig6ar0v5jjbvsy";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -75,7 +75,7 @@
|
||||||
|
|
||||||
propagatedBuildInputs = with pkgs.python3Packages; [ setuptools click numpy toolz jinja2 ramda artiqpkgs.migen artiqpkgs.misoc ];
|
propagatedBuildInputs = with pkgs.python3Packages; [ setuptools click numpy toolz jinja2 ramda artiqpkgs.migen artiqpkgs.misoc ];
|
||||||
|
|
||||||
checkInputs = with pkgs.python3Packages; [ pytestCheckHook pytest-timeout ];
|
checkInputs = with pkgs.python3Packages; [ pytest-runner pytestCheckHook pytest-timeout ];
|
||||||
|
|
||||||
# migen/misoc version checks are broken with pyproject for some reason
|
# migen/misoc version checks are broken with pyproject for some reason
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
@ -126,7 +126,6 @@
|
||||||
lockFile = src/Cargo.lock;
|
lockFile = src/Cargo.lock;
|
||||||
outputHashes = {
|
outputHashes = {
|
||||||
"tar-no-std-0.1.8" = "sha256-xm17108v4smXOqxdLvHl9CxTCJslmeogjm4Y87IXFuM=";
|
"tar-no-std-0.1.8" = "sha256-xm17108v4smXOqxdLvHl9CxTCJslmeogjm4Y87IXFuM=";
|
||||||
"nalgebra-0.32.6" = "sha256-L/YudkVOtfGYoNQKBD7LMk/sMYgRDzPDdpGL5rO7G2I=";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -364,8 +363,7 @@
|
||||||
(board-package-set { target = "zc706"; variant = "acpki_nist_qc2_satellite_100mhz"; }) //
|
(board-package-set { target = "zc706"; variant = "acpki_nist_qc2_satellite_100mhz"; }) //
|
||||||
(board-package-set { target = "kasli_soc"; variant = "demo"; json = ./demo.json; }) //
|
(board-package-set { target = "kasli_soc"; variant = "demo"; json = ./demo.json; }) //
|
||||||
(board-package-set { target = "kasli_soc"; variant = "master"; json = ./kasli-soc-master.json; }) //
|
(board-package-set { target = "kasli_soc"; variant = "master"; json = ./kasli-soc-master.json; }) //
|
||||||
(board-package-set { target = "kasli_soc"; variant = "satellite"; json = ./kasli-soc-satellite.json; }) //
|
(board-package-set { target = "kasli_soc"; variant = "satellite"; json = ./kasli-soc-satellite.json; });
|
||||||
(board-package-set { target = "ebaz4205"; variant = "base"; });
|
|
||||||
|
|
||||||
hydraJobs = packages.x86_64-linux // { inherit zc706-hitl-tests; inherit gateware-sim; inherit fmt-check; };
|
hydraJobs = packages.x86_64-linux // { inherit zc706-hitl-tests; inherit gateware-sim; inherit fmt-check; };
|
||||||
|
|
||||||
|
|
@ -385,7 +383,6 @@
|
||||||
artiqpkgs.artiq
|
artiqpkgs.artiq
|
||||||
artiqpkgs.vivado
|
artiqpkgs.vivado
|
||||||
binutils-arm
|
binutils-arm
|
||||||
pre-commit
|
|
||||||
];
|
];
|
||||||
XARGO_RUST_SRC = "${rust}/lib/rustlib/src/rust/library";
|
XARGO_RUST_SRC = "${rust}/lib/rustlib/src/rust/library";
|
||||||
CLANG_EXTRA_INCLUDE_DIR = "${llvmPackages_11.clang-unwrapped.lib}/lib/clang/11.1.0/include";
|
CLANG_EXTRA_INCLUDE_DIR = "${llvmPackages_11.clang-unwrapped.lib}/lib/clang/11.1.0/include";
|
||||||
|
|
|
||||||
|
|
@ -1,32 +0,0 @@
|
||||||
BasedOnStyle: LLVM
|
|
||||||
|
|
||||||
Language: Cpp
|
|
||||||
Standard: Cpp11
|
|
||||||
|
|
||||||
AccessModifierOffset: -1
|
|
||||||
AlignEscapedNewlines: Left
|
|
||||||
AlwaysBreakAfterReturnType: None
|
|
||||||
AlwaysBreakTemplateDeclarations: Yes
|
|
||||||
AllowAllParametersOfDeclarationOnNextLine: false
|
|
||||||
AllowShortFunctionsOnASingleLine: Inline
|
|
||||||
BinPackParameters: false
|
|
||||||
BreakBeforeBinaryOperators: NonAssignment
|
|
||||||
BreakBeforeTernaryOperators: true
|
|
||||||
BreakConstructorInitializers: AfterColon
|
|
||||||
BreakInheritanceList: AfterColon
|
|
||||||
ColumnLimit: 120
|
|
||||||
ConstructorInitializerAllOnOneLineOrOnePerLine: true
|
|
||||||
ContinuationIndentWidth: 4
|
|
||||||
DerivePointerAlignment: false
|
|
||||||
IndentCaseLabels: true
|
|
||||||
IndentPPDirectives: None
|
|
||||||
IndentWidth: 4
|
|
||||||
MaxEmptyLinesToKeep: 1
|
|
||||||
PointerAlignment: Left
|
|
||||||
ReflowComments: true
|
|
||||||
SortIncludes: false
|
|
||||||
SortUsingDeclarations: true
|
|
||||||
SpaceAfterTemplateKeyword: false
|
|
||||||
SpacesBeforeTrailingComments: 2
|
|
||||||
TabWidth: 4
|
|
||||||
UseTab: Never
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
doc-valid-idents = ["CPython", "NumPy", ".."]
|
|
||||||
|
|
@ -1,32 +0,0 @@
|
||||||
# See https://pre-commit.com for more information
|
|
||||||
# See https://pre-commit.com/hooks.html for more hooks
|
|
||||||
|
|
||||||
default_stages: [commit]
|
|
||||||
|
|
||||||
repos:
|
|
||||||
- repo: local
|
|
||||||
hooks:
|
|
||||||
- id: cargo-fmt
|
|
||||||
name: artiq-zynq cargo format
|
|
||||||
entry: nix
|
|
||||||
language: system
|
|
||||||
types: [file, rust]
|
|
||||||
pass_filenames: false
|
|
||||||
description: Runs cargo fmt on the codebase.
|
|
||||||
args: [develop, -c, cargo, fmt, --manifest-path, src/Cargo.toml, --all]
|
|
||||||
- id: cargo-clippy
|
|
||||||
name: artiq-zynq cargo clippy
|
|
||||||
entry: nix
|
|
||||||
language: system
|
|
||||||
types: [file, rust]
|
|
||||||
pass_filenames: false
|
|
||||||
description: Runs cargo clippy on the codebase.
|
|
||||||
args: [develop, -c, cargo, clippy, --manifest-path, src/Cargo.toml, --tests]
|
|
||||||
- repo: https://github.com/pre-commit/mirrors-clang-format
|
|
||||||
rev: v19.1.0
|
|
||||||
hooks:
|
|
||||||
- id: clang-format
|
|
||||||
name: artiq-zynq clang-format
|
|
||||||
description: Runs clang-format on the codebase.
|
|
||||||
files: \.(cpp|h|hpp|c)$
|
|
||||||
args: [-style=file, -fallback-style=none, -assume-filename=src/.clang-format]
|
|
||||||
|
|
@ -2,15 +2,6 @@
|
||||||
# It is not intended for manual editing.
|
# It is not intended for manual editing.
|
||||||
version = 3
|
version = 3
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "approx"
|
|
||||||
version = "0.5.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6"
|
|
||||||
dependencies = [
|
|
||||||
"num-traits",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "arrayvec"
|
name = "arrayvec"
|
||||||
version = "0.7.4"
|
version = "0.7.4"
|
||||||
|
|
@ -255,7 +246,6 @@ dependencies = [
|
||||||
"libsupport_zynq",
|
"libsupport_zynq",
|
||||||
"log",
|
"log",
|
||||||
"log_buffer",
|
"log_buffer",
|
||||||
"nalgebra",
|
|
||||||
"nb 0.1.3",
|
"nb 0.1.3",
|
||||||
"unwind",
|
"unwind",
|
||||||
"vcell",
|
"vcell",
|
||||||
|
|
@ -392,19 +382,6 @@ version = "0.7.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c75de51135344a4f8ed3cfe2720dc27736f7711989703a0b43aadf3753c55577"
|
checksum = "c75de51135344a4f8ed3cfe2720dc27736f7711989703a0b43aadf3753c55577"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "nalgebra"
|
|
||||||
version = "0.32.6"
|
|
||||||
source = "git+https://git.m-labs.hk/M-Labs/nalgebra.git?rev=dd00f9b#dd00f9b46046e0b931d1b470166db02fd29591be"
|
|
||||||
dependencies = [
|
|
||||||
"approx",
|
|
||||||
"num-complex",
|
|
||||||
"num-rational",
|
|
||||||
"num-traits",
|
|
||||||
"simba",
|
|
||||||
"typenum",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "nb"
|
name = "nb"
|
||||||
version = "0.1.3"
|
version = "0.1.3"
|
||||||
|
|
@ -420,15 +397,6 @@ version = "1.0.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "546c37ac5d9e56f55e73b677106873d9d9f5190605e41a856503623648488cae"
|
checksum = "546c37ac5d9e56f55e73b677106873d9d9f5190605e41a856503623648488cae"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "num-complex"
|
|
||||||
version = "0.4.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "26873667bbbb7c5182d4a37c1add32cdf09f841af72da53318fdb81543c15085"
|
|
||||||
dependencies = [
|
|
||||||
"num-traits",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "num-derive"
|
name = "num-derive"
|
||||||
version = "0.3.3"
|
version = "0.3.3"
|
||||||
|
|
@ -440,26 +408,6 @@ dependencies = [
|
||||||
"syn",
|
"syn",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "num-integer"
|
|
||||||
version = "0.1.46"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
|
|
||||||
dependencies = [
|
|
||||||
"num-traits",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "num-rational"
|
|
||||||
version = "0.4.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a"
|
|
||||||
dependencies = [
|
|
||||||
"autocfg",
|
|
||||||
"num-integer",
|
|
||||||
"num-traits",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "num-traits"
|
name = "num-traits"
|
||||||
version = "0.2.15"
|
version = "0.2.15"
|
||||||
|
|
@ -467,15 +415,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
|
checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"autocfg",
|
"autocfg",
|
||||||
"libm",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "paste"
|
|
||||||
version = "1.0.15"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pin-project-lite"
|
name = "pin-project-lite"
|
||||||
version = "0.2.9"
|
version = "0.2.9"
|
||||||
|
|
@ -582,18 +523,6 @@ version = "0.1.20"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac"
|
checksum = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "simba"
|
|
||||||
version = "0.8.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "50582927ed6f77e4ac020c057f37a268fc6aebc29225050365aacbb9deeeddc4"
|
|
||||||
dependencies = [
|
|
||||||
"approx",
|
|
||||||
"num-complex",
|
|
||||||
"num-traits",
|
|
||||||
"paste",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "smoltcp"
|
name = "smoltcp"
|
||||||
version = "0.7.5"
|
version = "0.7.5"
|
||||||
|
|
@ -626,12 +555,6 @@ dependencies = [
|
||||||
"log",
|
"log",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "typenum"
|
|
||||||
version = "1.17.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "unicode-ident"
|
name = "unicode-ident"
|
||||||
version = "1.0.5"
|
version = "1.0.5"
|
||||||
|
|
|
||||||
|
|
@ -1,288 +0,0 @@
|
||||||
#!/usr/bin/env python
|
|
||||||
|
|
||||||
import argparse
|
|
||||||
|
|
||||||
import analyzer
|
|
||||||
import dma
|
|
||||||
from artiq.gateware import rtio
|
|
||||||
from artiq.gateware.rtio.phy import dds, spi2, ttl_simple
|
|
||||||
from artiq.gateware.rtio.xilinx_clocking import fix_serdes_timing_path
|
|
||||||
from config import write_csr_file, write_mem_file, write_rustc_cfg_file
|
|
||||||
from migen import *
|
|
||||||
from migen.build.generic_platform import IOStandard, Misc, Pins, Subsignal
|
|
||||||
from migen.build.platforms import ebaz4205
|
|
||||||
from migen_axi.integration.soc_core import SoCCore
|
|
||||||
from misoc.interconnect.csr import *
|
|
||||||
|
|
||||||
_ps = [
|
|
||||||
(
|
|
||||||
"ps",
|
|
||||||
0,
|
|
||||||
Subsignal("clk", Pins("E7"), IOStandard("LVCMOS33"), Misc("SLEW=FAST")),
|
|
||||||
Subsignal("por_b", Pins("C7"), IOStandard("LVCMOS33"), Misc("SLEW=FAST")),
|
|
||||||
Subsignal("srst_b", Pins("B10"), IOStandard("LVCMOS18"), Misc("SLEW=FAST")),
|
|
||||||
)
|
|
||||||
]
|
|
||||||
|
|
||||||
_ddr = [
|
|
||||||
(
|
|
||||||
"ddr",
|
|
||||||
0,
|
|
||||||
Subsignal(
|
|
||||||
"a",
|
|
||||||
Pins("N2 K2 M3 K3 M4 L1 L4 K4 K1 J4 F5 G4 E4 D4 F4"),
|
|
||||||
IOStandard("SSTL15"),
|
|
||||||
),
|
|
||||||
Subsignal("ba", Pins("L5 R4 J5"), IOStandard("SSTL15")),
|
|
||||||
Subsignal("cas_n", Pins("P5"), IOStandard("SSTL15")),
|
|
||||||
Subsignal("cke", Pins("N3"), IOStandard("SSTL15")),
|
|
||||||
Subsignal("cs_n", Pins("N1"), IOStandard("SSTL15")),
|
|
||||||
Subsignal("ck_n", Pins("M2"), IOStandard("DIFF_SSTL15"), Misc("SLEW=FAST")),
|
|
||||||
Subsignal("ck_p", Pins("L2"), IOStandard("DIFF_SSTL15"), Misc("SLEW=FAST")),
|
|
||||||
# Pins "T1 Y1" not connected
|
|
||||||
Subsignal("dm", Pins("A1 F1"), IOStandard("SSTL15_T_DCI"), Misc("SLEW=FAST")),
|
|
||||||
Subsignal(
|
|
||||||
"dq",
|
|
||||||
Pins("C3 B3 A2 A4 D3 D1 C1 E1 E2 E3 G3 H3 J3 H2 H1 J1"),
|
|
||||||
# Pins "P1 P3 R3 R1 T4 U4 U2 U3 V1 Y3 W1 Y4 Y2 W3 V2 V3" not connected
|
|
||||||
IOStandard("SSTL15_T_DCI"),
|
|
||||||
Misc("SLEW=FAST"),
|
|
||||||
),
|
|
||||||
Subsignal(
|
|
||||||
"dqs_n",
|
|
||||||
Pins("B2 F2"), # Pins "T2 W4" not connected
|
|
||||||
IOStandard("DIFF_SSTL15_T_DCI"),
|
|
||||||
Misc("SLEW=FAST"),
|
|
||||||
),
|
|
||||||
Subsignal(
|
|
||||||
"dqs_p",
|
|
||||||
Pins("C2 G2"), # Pins "R2 W5" not connected
|
|
||||||
IOStandard("DIFF_SSTL15_T_DCI"),
|
|
||||||
Misc("SLEW=FAST"),
|
|
||||||
),
|
|
||||||
Subsignal("vrn", Pins("G5"), IOStandard("SSTL15_T_DCI"), Misc("SLEW=FAST")),
|
|
||||||
Subsignal("vrp", Pins("H5"), IOStandard("SSTL15_T_DCI"), Misc("SLEW=FAST")),
|
|
||||||
Subsignal("drst_n", Pins("B4"), IOStandard("SSTL15"), Misc("SLEW=FAST")),
|
|
||||||
Subsignal("odt", Pins("N5"), IOStandard("SSTL15")),
|
|
||||||
Subsignal("ras_n", Pins("P4"), IOStandard("SSTL15")),
|
|
||||||
Subsignal("we_n", Pins("M5"), IOStandard("SSTL15")),
|
|
||||||
)
|
|
||||||
]
|
|
||||||
|
|
||||||
# Connector J3
|
|
||||||
_i2c = [
|
|
||||||
(
|
|
||||||
"i2c",
|
|
||||||
0,
|
|
||||||
Subsignal("scl", Pins("U12"), IOStandard("LVCMOS33")),
|
|
||||||
Subsignal("sda", Pins("V13"), IOStandard("LVCMOS33")),
|
|
||||||
)
|
|
||||||
]
|
|
||||||
|
|
||||||
_spi = [
|
|
||||||
(
|
|
||||||
"spi",
|
|
||||||
0,
|
|
||||||
Subsignal("clk", Pins("V20")),
|
|
||||||
Subsignal("mosi", Pins("U20")),
|
|
||||||
Subsignal("cs_n", Pins("P19")),
|
|
||||||
IOStandard("LVCMOS33"),
|
|
||||||
)
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
class EBAZ4205(SoCCore):
|
|
||||||
def __init__(self, rtio_clk=125e6, acpki=False):
|
|
||||||
self.acpki = acpki
|
|
||||||
|
|
||||||
platform = ebaz4205.Platform()
|
|
||||||
platform.toolchain.bitstream_commands.extend(
|
|
||||||
[
|
|
||||||
"set_property BITSTREAM.GENERAL.COMPRESS True [current_design]",
|
|
||||||
]
|
|
||||||
)
|
|
||||||
platform.add_extension(_ps)
|
|
||||||
platform.add_extension(_ddr)
|
|
||||||
platform.add_extension(_i2c)
|
|
||||||
platform.add_extension(_spi)
|
|
||||||
|
|
||||||
gmii = platform.request("gmii")
|
|
||||||
platform.add_period_constraint(gmii.rx_clk, 10)
|
|
||||||
platform.add_period_constraint(gmii.tx_clk, 10)
|
|
||||||
platform.add_platform_command(
|
|
||||||
"set_property CLOCK_DEDICATED_ROUTE FALSE [get_nets gmii_tx_clk_IBUF]"
|
|
||||||
)
|
|
||||||
|
|
||||||
ident = self.__class__.__name__
|
|
||||||
if self.acpki:
|
|
||||||
ident = "acpki_" + ident
|
|
||||||
SoCCore.__init__(self, platform=platform, csr_data_width=32, ident=ident)
|
|
||||||
fix_serdes_timing_path(platform)
|
|
||||||
self.config["RTIO_FREQUENCY"] = str(rtio_clk / 1e6)
|
|
||||||
platform.add_period_constraint(self.ps7.cd_sys.clk, 10)
|
|
||||||
|
|
||||||
self.comb += [
|
|
||||||
self.ps7.enet0.enet.gmii.tx_clk.eq(gmii.tx_clk),
|
|
||||||
self.ps7.enet0.enet.gmii.rx_clk.eq(gmii.rx_clk),
|
|
||||||
]
|
|
||||||
self.clock_domains.cd_eth_rx = ClockDomain(reset_less=False)
|
|
||||||
self.clock_domains.cd_eth_tx = ClockDomain(reset_less=False)
|
|
||||||
self.comb += [
|
|
||||||
ClockSignal("eth_rx").eq(gmii.rx_clk),
|
|
||||||
ClockSignal("eth_tx").eq(gmii.tx_clk),
|
|
||||||
]
|
|
||||||
self.sync.eth_tx += [
|
|
||||||
gmii.txd.eq(self.ps7.enet0.enet.gmii.txd),
|
|
||||||
gmii.tx_en.eq(self.ps7.enet0.enet.gmii.tx_en),
|
|
||||||
]
|
|
||||||
self.sync.eth_rx += [
|
|
||||||
self.ps7.enet0.enet.gmii.rxd.eq(gmii.rxd),
|
|
||||||
self.ps7.enet0.enet.gmii.rx_dv.eq(gmii.rx_dv),
|
|
||||||
]
|
|
||||||
|
|
||||||
# MDIO
|
|
||||||
mdio = platform.request("mdio")
|
|
||||||
self.comb += mdio.mdc.eq(self.ps7.enet0.enet.mdio.mdc)
|
|
||||||
self.specials += Instance(
|
|
||||||
"IOBUF",
|
|
||||||
i_I=self.ps7.enet0.enet.mdio.o,
|
|
||||||
io_IO=mdio.mdio,
|
|
||||||
o_O=self.ps7.enet0.enet.mdio.i,
|
|
||||||
i_T=~self.ps7.enet0.enet.mdio.t_n,
|
|
||||||
)
|
|
||||||
|
|
||||||
# I2C
|
|
||||||
i2c = self.platform.request("i2c")
|
|
||||||
self.specials += [
|
|
||||||
# SCL
|
|
||||||
Instance(
|
|
||||||
"IOBUF",
|
|
||||||
i_I=self.ps7.i2c0.scl.o,
|
|
||||||
io_IO=i2c.scl,
|
|
||||||
o_O=self.ps7.i2c0.scl.i,
|
|
||||||
i_T=~self.ps7.i2c0.scl.t_n,
|
|
||||||
),
|
|
||||||
# SDA
|
|
||||||
Instance(
|
|
||||||
"IOBUF",
|
|
||||||
i_I=self.ps7.i2c0.sda.o,
|
|
||||||
io_IO=i2c.sda,
|
|
||||||
o_O=self.ps7.i2c0.sda.i,
|
|
||||||
i_T=~self.ps7.i2c0.sda.t_n,
|
|
||||||
),
|
|
||||||
]
|
|
||||||
|
|
||||||
self.rtio_channels = []
|
|
||||||
for i in (0, 1):
|
|
||||||
print("USER LED at RTIO channel 0x{:06x}".format(len(self.rtio_channels)))
|
|
||||||
user_led = self.platform.request("user_led", i)
|
|
||||||
phy = ttl_simple.Output(user_led)
|
|
||||||
self.submodules += phy
|
|
||||||
self.rtio_channels.append(rtio.Channel.from_phy(phy))
|
|
||||||
|
|
||||||
print("SPI at RTIO channel 0x{:06x}".format(len(self.rtio_channels)))
|
|
||||||
spi_phy = spi2.SPIMaster(platform.request("spi"))
|
|
||||||
self.submodules += spi_phy
|
|
||||||
self.rtio_channels.append(rtio.Channel.from_phy(spi_phy, ififo_depth=4))
|
|
||||||
self.config["RTIO_LOG_CHANNEL"] = len(self.rtio_channels)
|
|
||||||
self.rtio_channels.append(rtio.LogChannel())
|
|
||||||
|
|
||||||
self.submodules.rtio_tsc = rtio.TSC(glbl_fine_ts_width=3)
|
|
||||||
self.submodules.rtio_core = rtio.Core(self.rtio_tsc, self.rtio_channels)
|
|
||||||
self.csr_devices.append("rtio_core")
|
|
||||||
if self.acpki:
|
|
||||||
import acpki
|
|
||||||
|
|
||||||
self.config["KI_IMPL"] = "acp"
|
|
||||||
self.submodules.rtio = acpki.KernelInitiator(
|
|
||||||
self.rtio_tsc,
|
|
||||||
bus=self.ps7.s_axi_acp,
|
|
||||||
user=self.ps7.s_axi_acp_user,
|
|
||||||
evento=self.ps7.event.o,
|
|
||||||
)
|
|
||||||
self.csr_devices.append("rtio")
|
|
||||||
else:
|
|
||||||
self.config["KI_IMPL"] = "csr"
|
|
||||||
self.submodules.rtio = rtio.KernelInitiator(self.rtio_tsc, now64=True)
|
|
||||||
self.csr_devices.append("rtio")
|
|
||||||
|
|
||||||
self.submodules.rtio_dma = dma.DMA(self.ps7.s_axi_hp0)
|
|
||||||
self.csr_devices.append("rtio_dma")
|
|
||||||
|
|
||||||
self.submodules.cri_con = rtio.CRIInterconnectShared(
|
|
||||||
[self.rtio.cri, self.rtio_dma.cri],
|
|
||||||
[self.rtio_core.cri],
|
|
||||||
enable_routing=True,
|
|
||||||
)
|
|
||||||
self.csr_devices.append("cri_con")
|
|
||||||
|
|
||||||
self.submodules.rtio_moninj = rtio.MonInj(self.rtio_channels)
|
|
||||||
self.csr_devices.append("rtio_moninj")
|
|
||||||
|
|
||||||
self.submodules.rtio_analyzer = analyzer.Analyzer(
|
|
||||||
self.rtio_tsc, self.rtio_core.cri, self.ps7.s_axi_hp1
|
|
||||||
)
|
|
||||||
self.csr_devices.append("rtio_analyzer")
|
|
||||||
|
|
||||||
|
|
||||||
class BASE(EBAZ4205):
|
|
||||||
def __init__(self, rtio_clk, acpki):
|
|
||||||
EBAZ4205.__init__(self, rtio_clk, acpki)
|
|
||||||
|
|
||||||
|
|
||||||
VARIANTS = {cls.__name__.lower(): cls for cls in [BASE]}
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
parser = argparse.ArgumentParser(
|
|
||||||
description="ARTIQ port to the EBAZ4205 control card of Ebit E9+ BTC miner"
|
|
||||||
)
|
|
||||||
parser.add_argument(
|
|
||||||
"-r", default=None, help="build Rust interface into the specified file"
|
|
||||||
)
|
|
||||||
parser.add_argument(
|
|
||||||
"-m", default=None, help="build Rust memory interface into the specified file"
|
|
||||||
)
|
|
||||||
parser.add_argument(
|
|
||||||
"-c",
|
|
||||||
default=None,
|
|
||||||
help="build Rust compiler configuration into the specified file",
|
|
||||||
)
|
|
||||||
parser.add_argument(
|
|
||||||
"-g", default=None, help="build gateware into the specified directory"
|
|
||||||
)
|
|
||||||
parser.add_argument("--rtio-clk", default=125e6, help="RTIO Clock Frequency (Hz)")
|
|
||||||
parser.add_argument(
|
|
||||||
"-V",
|
|
||||||
"--variant",
|
|
||||||
default="base",
|
|
||||||
help="variant: " "[acpki_]base" "(default: %(default)s)",
|
|
||||||
)
|
|
||||||
args = parser.parse_args()
|
|
||||||
|
|
||||||
rtio_clk = int(args.rtio_clk)
|
|
||||||
variant = args.variant.lower()
|
|
||||||
acpki = variant.startswith("acpki_")
|
|
||||||
if acpki:
|
|
||||||
variant = variant[6:]
|
|
||||||
|
|
||||||
try:
|
|
||||||
cls = VARIANTS[variant]
|
|
||||||
except KeyError:
|
|
||||||
raise SystemExit("Invalid variant (-V/--variant)")
|
|
||||||
|
|
||||||
soc = cls(rtio_clk=rtio_clk, acpki=acpki)
|
|
||||||
soc.finalize()
|
|
||||||
|
|
||||||
if args.r is not None:
|
|
||||||
write_csr_file(soc, args.r)
|
|
||||||
if args.m is not None:
|
|
||||||
write_mem_file(soc, args.m)
|
|
||||||
if args.c is not None:
|
|
||||||
write_rustc_cfg_file(soc, args.c)
|
|
||||||
if args.g is not None:
|
|
||||||
soc.build(build_dir=args.g)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
||||||
|
|
@ -10,7 +10,6 @@ name = "libboard_artiq"
|
||||||
[features]
|
[features]
|
||||||
target_zc706 = ["libboard_zynq/target_zc706", "libconfig/target_zc706"]
|
target_zc706 = ["libboard_zynq/target_zc706", "libconfig/target_zc706"]
|
||||||
target_kasli_soc = ["libboard_zynq/target_kasli_soc", "libconfig/target_kasli_soc"]
|
target_kasli_soc = ["libboard_zynq/target_kasli_soc", "libconfig/target_kasli_soc"]
|
||||||
target_ebaz4205 = ["libboard_zynq/target_ebaz4205", "libconfig/target_ebaz4205"]
|
|
||||||
calibrate_wrpll_skew = []
|
calibrate_wrpll_skew = []
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
|
|
|
||||||
|
|
@ -255,7 +255,6 @@ pub enum Packet {
|
||||||
destination: u8,
|
destination: u8,
|
||||||
id: u32,
|
id: u32,
|
||||||
run: bool,
|
run: bool,
|
||||||
timestamp: u64,
|
|
||||||
},
|
},
|
||||||
SubkernelLoadRunReply {
|
SubkernelLoadRunReply {
|
||||||
destination: u8,
|
destination: u8,
|
||||||
|
|
@ -268,14 +267,12 @@ pub enum Packet {
|
||||||
exception_src: u8,
|
exception_src: u8,
|
||||||
},
|
},
|
||||||
SubkernelExceptionRequest {
|
SubkernelExceptionRequest {
|
||||||
source: u8,
|
|
||||||
destination: u8,
|
destination: u8,
|
||||||
},
|
},
|
||||||
SubkernelException {
|
SubkernelException {
|
||||||
destination: u8,
|
|
||||||
last: bool,
|
last: bool,
|
||||||
length: u16,
|
length: u16,
|
||||||
data: [u8; MASTER_PAYLOAD_MAX_SIZE],
|
data: [u8; SAT_PAYLOAD_MAX_SIZE],
|
||||||
},
|
},
|
||||||
SubkernelMessage {
|
SubkernelMessage {
|
||||||
source: u8,
|
source: u8,
|
||||||
|
|
@ -515,7 +512,6 @@ impl Packet {
|
||||||
destination: reader.read_u8()?,
|
destination: reader.read_u8()?,
|
||||||
id: reader.read_u32()?,
|
id: reader.read_u32()?,
|
||||||
run: reader.read_bool()?,
|
run: reader.read_bool()?,
|
||||||
timestamp: reader.read_u64()?,
|
|
||||||
},
|
},
|
||||||
0xc5 => Packet::SubkernelLoadRunReply {
|
0xc5 => Packet::SubkernelLoadRunReply {
|
||||||
destination: reader.read_u8()?,
|
destination: reader.read_u8()?,
|
||||||
|
|
@ -528,17 +524,14 @@ impl Packet {
|
||||||
exception_src: reader.read_u8()?,
|
exception_src: reader.read_u8()?,
|
||||||
},
|
},
|
||||||
0xc9 => Packet::SubkernelExceptionRequest {
|
0xc9 => Packet::SubkernelExceptionRequest {
|
||||||
source: reader.read_u8()?,
|
|
||||||
destination: reader.read_u8()?,
|
destination: reader.read_u8()?,
|
||||||
},
|
},
|
||||||
0xca => {
|
0xca => {
|
||||||
let destination = reader.read_u8()?;
|
|
||||||
let last = reader.read_bool()?;
|
let last = reader.read_bool()?;
|
||||||
let length = reader.read_u16()?;
|
let length = reader.read_u16()?;
|
||||||
let mut data: [u8; MASTER_PAYLOAD_MAX_SIZE] = [0; MASTER_PAYLOAD_MAX_SIZE];
|
let mut data: [u8; SAT_PAYLOAD_MAX_SIZE] = [0; SAT_PAYLOAD_MAX_SIZE];
|
||||||
reader.read_exact(&mut data[0..length as usize])?;
|
reader.read_exact(&mut data[0..length as usize])?;
|
||||||
Packet::SubkernelException {
|
Packet::SubkernelException {
|
||||||
destination: destination,
|
|
||||||
last: last,
|
last: last,
|
||||||
length: length,
|
length: length,
|
||||||
data: data,
|
data: data,
|
||||||
|
|
@ -879,14 +872,12 @@ impl Packet {
|
||||||
destination,
|
destination,
|
||||||
id,
|
id,
|
||||||
run,
|
run,
|
||||||
timestamp,
|
|
||||||
} => {
|
} => {
|
||||||
writer.write_u8(0xc4)?;
|
writer.write_u8(0xc4)?;
|
||||||
writer.write_u8(source)?;
|
writer.write_u8(source)?;
|
||||||
writer.write_u8(destination)?;
|
writer.write_u8(destination)?;
|
||||||
writer.write_u32(id)?;
|
writer.write_u32(id)?;
|
||||||
writer.write_bool(run)?;
|
writer.write_bool(run)?;
|
||||||
writer.write_u64(timestamp)?;
|
|
||||||
}
|
}
|
||||||
Packet::SubkernelLoadRunReply { destination, succeeded } => {
|
Packet::SubkernelLoadRunReply { destination, succeeded } => {
|
||||||
writer.write_u8(0xc5)?;
|
writer.write_u8(0xc5)?;
|
||||||
|
|
@ -905,19 +896,12 @@ impl Packet {
|
||||||
writer.write_bool(with_exception)?;
|
writer.write_bool(with_exception)?;
|
||||||
writer.write_u8(exception_src)?;
|
writer.write_u8(exception_src)?;
|
||||||
}
|
}
|
||||||
Packet::SubkernelExceptionRequest { source, destination } => {
|
Packet::SubkernelExceptionRequest { destination } => {
|
||||||
writer.write_u8(0xc9)?;
|
writer.write_u8(0xc9)?;
|
||||||
writer.write_u8(source)?;
|
|
||||||
writer.write_u8(destination)?;
|
writer.write_u8(destination)?;
|
||||||
}
|
}
|
||||||
Packet::SubkernelException {
|
Packet::SubkernelException { last, length, data } => {
|
||||||
destination,
|
|
||||||
last,
|
|
||||||
length,
|
|
||||||
data,
|
|
||||||
} => {
|
|
||||||
writer.write_u8(0xca)?;
|
writer.write_u8(0xca)?;
|
||||||
writer.write_u8(destination)?;
|
|
||||||
writer.write_bool(last)?;
|
writer.write_bool(last)?;
|
||||||
writer.write_u16(length)?;
|
writer.write_u16(length)?;
|
||||||
writer.write_all(&data[0..length as usize])?;
|
writer.write_all(&data[0..length as usize])?;
|
||||||
|
|
@ -959,8 +943,6 @@ impl Packet {
|
||||||
Packet::SubkernelLoadRunReply { destination, .. } => Some(*destination),
|
Packet::SubkernelLoadRunReply { destination, .. } => Some(*destination),
|
||||||
Packet::SubkernelMessage { destination, .. } => Some(*destination),
|
Packet::SubkernelMessage { destination, .. } => Some(*destination),
|
||||||
Packet::SubkernelMessageAck { destination } => Some(*destination),
|
Packet::SubkernelMessageAck { destination } => Some(*destination),
|
||||||
Packet::SubkernelExceptionRequest { destination, .. } => Some(*destination),
|
|
||||||
Packet::SubkernelException { destination, .. } => Some(*destination),
|
|
||||||
Packet::DmaPlaybackStatus { destination, .. } => Some(*destination),
|
Packet::DmaPlaybackStatus { destination, .. } => Some(*destination),
|
||||||
Packet::SubkernelFinished { destination, .. } => Some(*destination),
|
Packet::SubkernelFinished { destination, .. } => Some(*destination),
|
||||||
_ => None,
|
_ => None,
|
||||||
|
|
|
||||||
|
|
@ -32,9 +32,3 @@ unwind = { path = "../libunwind" }
|
||||||
libc = { path = "../libc" }
|
libc = { path = "../libc" }
|
||||||
io = { path = "../libio" }
|
io = { path = "../libio" }
|
||||||
libboard_artiq = { path = "../libboard_artiq" }
|
libboard_artiq = { path = "../libboard_artiq" }
|
||||||
|
|
||||||
[dependencies.nalgebra]
|
|
||||||
git = "https://git.m-labs.hk/M-Labs/nalgebra.git"
|
|
||||||
rev = "dd00f9b"
|
|
||||||
default-features = false
|
|
||||||
features = ["libm", "alloc"]
|
|
||||||
|
|
|
||||||
|
|
@ -14,10 +14,8 @@
|
||||||
|
|
||||||
use core::mem;
|
use core::mem;
|
||||||
|
|
||||||
use core_io::Error as ReadError;
|
use cslice::CSlice;
|
||||||
use cslice::{AsCSlice, CSlice};
|
|
||||||
use dwarf::eh::{self, EHAction, EHContext};
|
use dwarf::eh::{self, EHAction, EHContext};
|
||||||
use io::{Cursor, ProtoRead};
|
|
||||||
use libc::{c_int, c_void, uintptr_t};
|
use libc::{c_int, c_void, uintptr_t};
|
||||||
use log::{error, trace};
|
use log::{error, trace};
|
||||||
use unwind as uw;
|
use unwind as uw;
|
||||||
|
|
@ -222,6 +220,8 @@ pub unsafe fn artiq_personality(
|
||||||
}
|
}
|
||||||
|
|
||||||
pub unsafe extern "C" fn raise(exception: *const Exception) -> ! {
|
pub unsafe extern "C" fn raise(exception: *const Exception) -> ! {
|
||||||
|
use cslice::AsCSlice;
|
||||||
|
|
||||||
let count = EXCEPTION_BUFFER.exception_count;
|
let count = EXCEPTION_BUFFER.exception_count;
|
||||||
let stack = &mut EXCEPTION_BUFFER.exception_stack;
|
let stack = &mut EXCEPTION_BUFFER.exception_stack;
|
||||||
let diff = exception as isize - EXCEPTION_BUFFER.exceptions.as_ptr() as isize;
|
let diff = exception as isize - EXCEPTION_BUFFER.exceptions.as_ptr() as isize;
|
||||||
|
|
@ -295,60 +295,6 @@ pub unsafe extern "C" fn raise(exception: *const Exception) -> ! {
|
||||||
unreachable!();
|
unreachable!();
|
||||||
}
|
}
|
||||||
|
|
||||||
fn read_exception_string<'a>(reader: &mut Cursor<&[u8]>) -> Result<CSlice<'a, u8>, ReadError> {
|
|
||||||
let len = reader.read_u32()? as usize;
|
|
||||||
if len == usize::MAX {
|
|
||||||
let data = reader.read_u32()?;
|
|
||||||
Ok(unsafe { CSlice::new(data as *const u8, len) })
|
|
||||||
} else {
|
|
||||||
let pos = reader.position();
|
|
||||||
let slice = unsafe {
|
|
||||||
let ptr = reader.get_ref().as_ptr().offset(pos as isize);
|
|
||||||
CSlice::new(ptr, len)
|
|
||||||
};
|
|
||||||
reader.set_position(pos + len);
|
|
||||||
Ok(slice)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn read_exception(raw_exception: &[u8]) -> Result<Exception, ReadError> {
|
|
||||||
let mut reader = Cursor::new(raw_exception);
|
|
||||||
|
|
||||||
let mut byte = reader.read_u8()?;
|
|
||||||
// to sync
|
|
||||||
while byte != 0x5a {
|
|
||||||
byte = reader.read_u8()?;
|
|
||||||
}
|
|
||||||
// skip sync bytes, 0x09 indicates exception
|
|
||||||
while byte != 0x09 {
|
|
||||||
byte = reader.read_u8()?;
|
|
||||||
}
|
|
||||||
let _len = reader.read_u32()?;
|
|
||||||
// ignore the remaining exceptions, stack traces etc. - unwinding from another device would be unwise anyway
|
|
||||||
Ok(Exception {
|
|
||||||
id: reader.read_u32()?,
|
|
||||||
message: read_exception_string(&mut reader)?,
|
|
||||||
param: [
|
|
||||||
reader.read_u64()? as i64,
|
|
||||||
reader.read_u64()? as i64,
|
|
||||||
reader.read_u64()? as i64,
|
|
||||||
],
|
|
||||||
file: read_exception_string(&mut reader)?,
|
|
||||||
line: reader.read_u32()?,
|
|
||||||
column: reader.read_u32()?,
|
|
||||||
function: read_exception_string(&mut reader)?,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn raise_raw(raw_exception: &[u8]) -> ! {
|
|
||||||
use crate::artiq_raise;
|
|
||||||
if let Ok(exception) = read_exception(raw_exception) {
|
|
||||||
unsafe { raise(&exception) };
|
|
||||||
} else {
|
|
||||||
artiq_raise!("SubkernelError", "Error passing exception");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub unsafe extern "C" fn resume() -> ! {
|
pub unsafe extern "C" fn resume() -> ! {
|
||||||
trace!("resume");
|
trace!("resume");
|
||||||
assert!(EXCEPTION_BUFFER.exception_count != 0);
|
assert!(EXCEPTION_BUFFER.exception_count != 0);
|
||||||
|
|
@ -475,30 +421,20 @@ extern "C" fn stop_fn(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Must be kept in sync with preallocate_runtime_exception_names() in `artiq.compiler.embedding`
|
// Must be kept in sync with preallocate_runtime_exception_names() in artiq/language/embedding_map.py
|
||||||
static EXCEPTION_ID_LOOKUP: [(&str, u32); 22] = [
|
static EXCEPTION_ID_LOOKUP: [(&str, u32); 12] = [
|
||||||
("RTIOUnderflow", 0),
|
("RuntimeError", 0),
|
||||||
("RTIOOverflow", 1),
|
("RTIOUnderflow", 1),
|
||||||
("RTIODestinationUnreachable", 2),
|
("RTIOOverflow", 2),
|
||||||
("DMAError", 3),
|
("RTIODestinationUnreachable", 3),
|
||||||
("I2CError", 4),
|
("DMAError", 4),
|
||||||
("CacheError", 5),
|
("I2CError", 5),
|
||||||
("SPIError", 6),
|
("CacheError", 6),
|
||||||
("SubkernelError", 7),
|
("SPIError", 7),
|
||||||
("AssertionError", 8),
|
("ZeroDivisionError", 8),
|
||||||
("AttributeError", 9),
|
("IndexError", 9),
|
||||||
("IndexError", 10),
|
("UnwrapNoneError", 10),
|
||||||
("IOError", 11),
|
("SubkernelError", 11),
|
||||||
("KeyError", 12),
|
|
||||||
("NotImplementedError", 13),
|
|
||||||
("OverflowError", 14),
|
|
||||||
("RuntimeError", 15),
|
|
||||||
("TimeoutError", 16),
|
|
||||||
("TypeError", 17),
|
|
||||||
("ValueError", 18),
|
|
||||||
("ZeroDivisionError", 19),
|
|
||||||
("LinAlgError", 20),
|
|
||||||
("UnwrapNoneError", 21),
|
|
||||||
];
|
];
|
||||||
|
|
||||||
pub fn get_exception_id(name: &str) -> u32 {
|
pub fn get_exception_id(name: &str) -> u32 {
|
||||||
|
|
@ -533,29 +469,3 @@ macro_rules! artiq_raise {
|
||||||
}};
|
}};
|
||||||
($name:expr, $message:expr) => {{ artiq_raise!($name, $message, 0, 0, 0) }};
|
($name:expr, $message:expr) => {{ artiq_raise!($name, $message, 0, 0, 0) }};
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Takes as input exception id from host
|
|
||||||
/// Generates a new exception with:
|
|
||||||
/// * `id` set to `exn_id`
|
|
||||||
/// * `message` set to corresponding exception name from `EXCEPTION_ID_LOOKUP`
|
|
||||||
///
|
|
||||||
/// The message is matched on host to ensure correct exception is being referred
|
|
||||||
/// This test checks the synchronization of exception ids for runtime errors
|
|
||||||
#[no_mangle]
|
|
||||||
pub extern "C" fn test_exception_id_sync(exn_id: u32) {
|
|
||||||
let message = EXCEPTION_ID_LOOKUP
|
|
||||||
.iter()
|
|
||||||
.find_map(|&(name, id)| if id == exn_id { Some(name) } else { None })
|
|
||||||
.unwrap_or("unallocated internal exception id");
|
|
||||||
|
|
||||||
let exn = Exception {
|
|
||||||
id: exn_id,
|
|
||||||
file: file!().as_c_slice(),
|
|
||||||
line: 0,
|
|
||||||
column: 0,
|
|
||||||
function: "test_exception_id_sync".as_c_slice(),
|
|
||||||
message: message.as_c_slice(),
|
|
||||||
param: [0, 0, 0],
|
|
||||||
};
|
|
||||||
unsafe { raise(&exn) };
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ use log::{info, warn};
|
||||||
use super::subkernel;
|
use super::subkernel;
|
||||||
use super::{cache,
|
use super::{cache,
|
||||||
core1::rtio_get_destination_status,
|
core1::rtio_get_destination_status,
|
||||||
dma, linalg,
|
dma,
|
||||||
rpc::{rpc_recv, rpc_send, rpc_send_async}};
|
rpc::{rpc_recv, rpc_send, rpc_send_async}};
|
||||||
use crate::{eh_artiq, i2c, rtio};
|
use crate::{eh_artiq, i2c, rtio};
|
||||||
|
|
||||||
|
|
@ -319,26 +319,6 @@ pub fn resolve(required: &[u8]) -> Option<u32> {
|
||||||
}
|
}
|
||||||
api!(yn = yn)
|
api!(yn = yn)
|
||||||
},
|
},
|
||||||
|
|
||||||
// linalg
|
|
||||||
api!(np_linalg_cholesky = linalg::np_linalg_cholesky),
|
|
||||||
api!(np_linalg_qr = linalg::np_linalg_qr),
|
|
||||||
api!(np_linalg_svd = linalg::np_linalg_svd),
|
|
||||||
api!(np_linalg_inv = linalg::np_linalg_inv),
|
|
||||||
api!(np_linalg_pinv = linalg::np_linalg_pinv),
|
|
||||||
api!(np_linalg_matrix_power = linalg::np_linalg_matrix_power),
|
|
||||||
api!(np_linalg_det = linalg::np_linalg_det),
|
|
||||||
api!(sp_linalg_lu = linalg::sp_linalg_lu),
|
|
||||||
api!(sp_linalg_schur = linalg::sp_linalg_schur),
|
|
||||||
api!(sp_linalg_hessenberg = linalg::sp_linalg_hessenberg),
|
|
||||||
|
|
||||||
/*
|
|
||||||
* syscall for unit tests
|
|
||||||
* Used in `artiq.tests.coredevice.test_exceptions.ExceptionTest.test_raise_exceptions_kernel`
|
|
||||||
* This syscall checks that the exception IDs used in the Python `EmbeddingMap` (in `artiq.language.embedding`)
|
|
||||||
* match the `EXCEPTION_ID_LOOKUP` defined in the firmware (`libksupport::src::eh_artiq`)
|
|
||||||
*/
|
|
||||||
api!(test_exception_id_sync = eh_artiq::test_exception_id_sync)
|
|
||||||
];
|
];
|
||||||
api.iter()
|
api.iter()
|
||||||
.find(|&&(exported, _)| exported.as_bytes() == required)
|
.find(|&&(exported, _)| exported.as_bytes() == required)
|
||||||
|
|
|
||||||
|
|
@ -1,440 +0,0 @@
|
||||||
// Uses `nalgebra` crate to invoke `np_linalg` and `sp_linalg` functions
|
|
||||||
// When converting between `nalgebra::Matrix` and `NDArray` following considerations are necessary
|
|
||||||
//
|
|
||||||
// * Both `nalgebra::Matrix` and `NDArray` require their content to be stored in row-major order
|
|
||||||
// * `NDArray` data pointer can be directly read and converted to `nalgebra::Matrix` (row and column number must be known)
|
|
||||||
// * `nalgebra::Matrix::as_slice` returns the content of matrix in column-major order and initial data needs to be transposed before storing it in `NDArray` data pointer
|
|
||||||
|
|
||||||
use alloc::vec::Vec;
|
|
||||||
use core::slice;
|
|
||||||
|
|
||||||
use nalgebra::DMatrix;
|
|
||||||
|
|
||||||
use crate::artiq_raise;
|
|
||||||
|
|
||||||
pub struct InputMatrix {
|
|
||||||
pub ndims: usize,
|
|
||||||
pub dims: *const usize,
|
|
||||||
pub data: *mut f64,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl InputMatrix {
|
|
||||||
fn get_dims(&mut self) -> Vec<usize> {
|
|
||||||
let dims = unsafe { slice::from_raw_parts(self.dims, self.ndims) };
|
|
||||||
dims.to_vec()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// # Safety
|
|
||||||
///
|
|
||||||
/// `mat1` should point to a valid 2DArray of `f64` floats in row-major order
|
|
||||||
#[no_mangle]
|
|
||||||
pub unsafe extern "C" fn np_linalg_cholesky(mat1: *mut InputMatrix, out: *mut InputMatrix) {
|
|
||||||
let mat1 = mat1.as_mut().unwrap();
|
|
||||||
let out = out.as_mut().unwrap();
|
|
||||||
|
|
||||||
if mat1.ndims != 2 {
|
|
||||||
artiq_raise!(
|
|
||||||
"ValueError",
|
|
||||||
"expected 2D Vector Input, but received {1}D input)",
|
|
||||||
0,
|
|
||||||
mat1.ndims as i64,
|
|
||||||
0
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
let dim1 = (*mat1).get_dims();
|
|
||||||
if dim1[0] != dim1[1] {
|
|
||||||
artiq_raise!(
|
|
||||||
"ValueError",
|
|
||||||
"last 2 dimensions of the array must be square: {1} != {2}",
|
|
||||||
0,
|
|
||||||
dim1[0] as i64,
|
|
||||||
dim1[1] as i64
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
let outdim = out.get_dims();
|
|
||||||
let out_slice = slice::from_raw_parts_mut(out.data, outdim[0] * outdim[1]);
|
|
||||||
let data_slice1 = slice::from_raw_parts_mut(mat1.data, dim1[0] * dim1[1]);
|
|
||||||
|
|
||||||
let matrix1 = DMatrix::from_row_slice(dim1[0], dim1[1], data_slice1);
|
|
||||||
let result = matrix1.cholesky();
|
|
||||||
match result {
|
|
||||||
Some(res) => {
|
|
||||||
out_slice.copy_from_slice(res.unpack().transpose().as_slice());
|
|
||||||
}
|
|
||||||
None => {
|
|
||||||
artiq_raise!("LinAlgError", "Matrix is not positive definite");
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/// # Safety
|
|
||||||
///
|
|
||||||
/// `mat1` should point to a valid 2DArray of `f64` floats in row-major order
|
|
||||||
#[no_mangle]
|
|
||||||
pub unsafe extern "C" fn np_linalg_qr(mat1: *mut InputMatrix, out_q: *mut InputMatrix, out_r: *mut InputMatrix) {
|
|
||||||
let mat1 = mat1.as_mut().unwrap();
|
|
||||||
let out_q = out_q.as_mut().unwrap();
|
|
||||||
let out_r = out_r.as_mut().unwrap();
|
|
||||||
|
|
||||||
if mat1.ndims != 2 {
|
|
||||||
artiq_raise!(
|
|
||||||
"ValueError",
|
|
||||||
"expected 2D Vector Input, but received {1}D input)",
|
|
||||||
0,
|
|
||||||
mat1.ndims as i64,
|
|
||||||
0
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
let dim1 = (*mat1).get_dims();
|
|
||||||
let outq_dim = (*out_q).get_dims();
|
|
||||||
let outr_dim = (*out_r).get_dims();
|
|
||||||
|
|
||||||
let data_slice1 = slice::from_raw_parts_mut(mat1.data, dim1[0] * dim1[1]);
|
|
||||||
let out_q_slice = slice::from_raw_parts_mut(out_q.data, outq_dim[0] * outq_dim[1]);
|
|
||||||
let out_r_slice = slice::from_raw_parts_mut(out_r.data, outr_dim[0] * outr_dim[1]);
|
|
||||||
|
|
||||||
// Refer to https://github.com/dimforge/nalgebra/issues/735
|
|
||||||
let matrix1 = DMatrix::from_row_slice(dim1[0], dim1[1], data_slice1);
|
|
||||||
|
|
||||||
let res = matrix1.qr();
|
|
||||||
let (q, r) = res.unpack();
|
|
||||||
|
|
||||||
// Uses different algo need to match numpy
|
|
||||||
out_q_slice.copy_from_slice(q.transpose().as_slice());
|
|
||||||
out_r_slice.copy_from_slice(r.transpose().as_slice());
|
|
||||||
}
|
|
||||||
|
|
||||||
/// # Safety
|
|
||||||
///
|
|
||||||
/// `mat1` should point to a valid 2DArray of `f64` floats in row-major order
|
|
||||||
#[no_mangle]
|
|
||||||
pub unsafe extern "C" fn np_linalg_svd(
|
|
||||||
mat1: *mut InputMatrix,
|
|
||||||
outu: *mut InputMatrix,
|
|
||||||
outs: *mut InputMatrix,
|
|
||||||
outvh: *mut InputMatrix,
|
|
||||||
) {
|
|
||||||
let mat1 = mat1.as_mut().unwrap();
|
|
||||||
let outu = outu.as_mut().unwrap();
|
|
||||||
let outs = outs.as_mut().unwrap();
|
|
||||||
let outvh = outvh.as_mut().unwrap();
|
|
||||||
|
|
||||||
if mat1.ndims != 2 {
|
|
||||||
artiq_raise!(
|
|
||||||
"ValueError",
|
|
||||||
"expected 2D Vector Input, but received {1}D input)",
|
|
||||||
0,
|
|
||||||
mat1.ndims as i64,
|
|
||||||
0
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
let dim1 = (*mat1).get_dims();
|
|
||||||
let outu_dim = (*outu).get_dims();
|
|
||||||
let outs_dim = (*outs).get_dims();
|
|
||||||
let outvh_dim = (*outvh).get_dims();
|
|
||||||
|
|
||||||
let data_slice1 = slice::from_raw_parts_mut(mat1.data, dim1[0] * dim1[1]);
|
|
||||||
let out_u_slice = slice::from_raw_parts_mut(outu.data, outu_dim[0] * outu_dim[1]);
|
|
||||||
let out_s_slice = slice::from_raw_parts_mut(outs.data, outs_dim[0]);
|
|
||||||
let out_vh_slice = slice::from_raw_parts_mut(outvh.data, outvh_dim[0] * outvh_dim[1]);
|
|
||||||
|
|
||||||
let matrix = DMatrix::from_row_slice(dim1[0], dim1[1], data_slice1);
|
|
||||||
let result = matrix.svd(true, true);
|
|
||||||
out_u_slice.copy_from_slice(result.u.unwrap().transpose().as_slice());
|
|
||||||
out_s_slice.copy_from_slice(result.singular_values.as_slice());
|
|
||||||
out_vh_slice.copy_from_slice(result.v_t.unwrap().transpose().as_slice());
|
|
||||||
}
|
|
||||||
|
|
||||||
/// # Safety
|
|
||||||
///
|
|
||||||
/// `mat1` should point to a valid 2DArray of `f64` floats in row-major order
|
|
||||||
#[no_mangle]
|
|
||||||
pub unsafe extern "C" fn np_linalg_inv(mat1: *mut InputMatrix, out: *mut InputMatrix) {
|
|
||||||
let mat1 = mat1.as_mut().unwrap();
|
|
||||||
let out = out.as_mut().unwrap();
|
|
||||||
|
|
||||||
if mat1.ndims != 2 {
|
|
||||||
artiq_raise!(
|
|
||||||
"ValueError",
|
|
||||||
"expected 2D Vector Input, but received {1}D input)",
|
|
||||||
0,
|
|
||||||
mat1.ndims as i64,
|
|
||||||
0
|
|
||||||
);
|
|
||||||
}
|
|
||||||
let dim1 = (*mat1).get_dims();
|
|
||||||
|
|
||||||
if dim1[0] != dim1[1] {
|
|
||||||
artiq_raise!(
|
|
||||||
"ValueError",
|
|
||||||
"last 2 dimensions of the array must be square: {1} != {2}",
|
|
||||||
0,
|
|
||||||
dim1[0] as i64,
|
|
||||||
dim1[1] as i64
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
let outdim = out.get_dims();
|
|
||||||
let out_slice = slice::from_raw_parts_mut(out.data, outdim[0] * outdim[1]);
|
|
||||||
let data_slice1 = slice::from_raw_parts_mut(mat1.data, dim1[0] * dim1[1]);
|
|
||||||
|
|
||||||
let matrix = DMatrix::from_row_slice(dim1[0], dim1[1], data_slice1);
|
|
||||||
if !matrix.is_invertible() {
|
|
||||||
artiq_raise!("LinAlgError", "no inverse for Singular Matrix");
|
|
||||||
}
|
|
||||||
let inv = matrix.try_inverse().unwrap();
|
|
||||||
out_slice.copy_from_slice(inv.transpose().as_slice());
|
|
||||||
}
|
|
||||||
|
|
||||||
/// # Safety
|
|
||||||
///
|
|
||||||
/// `mat1` should point to a valid 2DArray of `f64` floats in row-major order
|
|
||||||
#[no_mangle]
|
|
||||||
pub unsafe extern "C" fn np_linalg_pinv(mat1: *mut InputMatrix, out: *mut InputMatrix) {
|
|
||||||
let mat1 = mat1.as_mut().unwrap();
|
|
||||||
let out = out.as_mut().unwrap();
|
|
||||||
|
|
||||||
if mat1.ndims != 2 {
|
|
||||||
artiq_raise!(
|
|
||||||
"ValueError",
|
|
||||||
"expected 2D Vector Input, but received {1}D input)",
|
|
||||||
0,
|
|
||||||
mat1.ndims as i64,
|
|
||||||
0
|
|
||||||
);
|
|
||||||
}
|
|
||||||
let dim1 = (*mat1).get_dims();
|
|
||||||
let outdim = out.get_dims();
|
|
||||||
let out_slice = slice::from_raw_parts_mut(out.data, outdim[0] * outdim[1]);
|
|
||||||
let data_slice1 = slice::from_raw_parts_mut(mat1.data, dim1[0] * dim1[1]);
|
|
||||||
|
|
||||||
let matrix = DMatrix::from_row_slice(dim1[0], dim1[1], data_slice1);
|
|
||||||
let svd = matrix.svd(true, true);
|
|
||||||
let inv = svd.pseudo_inverse(1e-15);
|
|
||||||
|
|
||||||
match inv {
|
|
||||||
Ok(m) => {
|
|
||||||
out_slice.copy_from_slice(m.transpose().as_slice());
|
|
||||||
}
|
|
||||||
Err(_) => {
|
|
||||||
artiq_raise!("LinAlgError", "SVD computation does not converge");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// # Safety
|
|
||||||
///
|
|
||||||
/// `mat1` should point to a valid 2DArray of `f64` floats in row-major order
|
|
||||||
#[no_mangle]
|
|
||||||
pub unsafe extern "C" fn np_linalg_matrix_power(mat1: *mut InputMatrix, mat2: *mut InputMatrix, out: *mut InputMatrix) {
|
|
||||||
let mat1 = mat1.as_mut().unwrap();
|
|
||||||
let mat2 = mat2.as_mut().unwrap();
|
|
||||||
let out = out.as_mut().unwrap();
|
|
||||||
|
|
||||||
if mat1.ndims != 2 {
|
|
||||||
artiq_raise!(
|
|
||||||
"ValueError",
|
|
||||||
"expected 2D Vector Input, but received {1}D input)",
|
|
||||||
0,
|
|
||||||
mat1.ndims as i64,
|
|
||||||
0
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
let dim1 = (*mat1).get_dims();
|
|
||||||
let power = slice::from_raw_parts_mut(mat2.data, 1);
|
|
||||||
let power = power[0];
|
|
||||||
let outdim = out.get_dims();
|
|
||||||
let out_slice = slice::from_raw_parts_mut(out.data, outdim[0] * outdim[1]);
|
|
||||||
let data_slice1 = slice::from_raw_parts_mut(mat1.data, dim1[0] * dim1[1]);
|
|
||||||
let mut abs_power = power;
|
|
||||||
if abs_power < 0.0 {
|
|
||||||
abs_power = abs_power * -1.0;
|
|
||||||
}
|
|
||||||
let matrix1 = DMatrix::from_row_slice(dim1[0], dim1[1], data_slice1);
|
|
||||||
if !matrix1.is_square() {
|
|
||||||
artiq_raise!(
|
|
||||||
"ValueError",
|
|
||||||
"last 2 dimensions of the array must be square: {1} != {2}",
|
|
||||||
0,
|
|
||||||
dim1[0] as i64,
|
|
||||||
dim1[1] as i64
|
|
||||||
);
|
|
||||||
}
|
|
||||||
let mut result = matrix1.pow(abs_power as u32);
|
|
||||||
|
|
||||||
if power < 0.0 {
|
|
||||||
if !matrix1.is_invertible() {
|
|
||||||
artiq_raise!("LinAlgError", "no inverse for Singular Matrix");
|
|
||||||
}
|
|
||||||
result = result.try_inverse().unwrap();
|
|
||||||
}
|
|
||||||
out_slice.copy_from_slice(result.transpose().as_slice());
|
|
||||||
}
|
|
||||||
|
|
||||||
/// # Safety
|
|
||||||
///
|
|
||||||
/// `mat1` should point to a valid 2DArray of `f64` floats in row-major order
|
|
||||||
#[no_mangle]
|
|
||||||
pub unsafe extern "C" fn np_linalg_det(mat1: *mut InputMatrix, out: *mut InputMatrix) {
|
|
||||||
let mat1 = mat1.as_mut().unwrap();
|
|
||||||
let out = out.as_mut().unwrap();
|
|
||||||
|
|
||||||
if mat1.ndims != 2 {
|
|
||||||
artiq_raise!(
|
|
||||||
"ValueError",
|
|
||||||
"expected 2D Vector Input, but received {1}D input)",
|
|
||||||
0,
|
|
||||||
mat1.ndims as i64,
|
|
||||||
0
|
|
||||||
);
|
|
||||||
}
|
|
||||||
let dim1 = (*mat1).get_dims();
|
|
||||||
let out_slice = slice::from_raw_parts_mut(out.data, 1);
|
|
||||||
let data_slice1 = slice::from_raw_parts_mut(mat1.data, dim1[0] * dim1[1]);
|
|
||||||
|
|
||||||
let matrix = DMatrix::from_row_slice(dim1[0], dim1[1], data_slice1);
|
|
||||||
if !matrix.is_square() {
|
|
||||||
artiq_raise!(
|
|
||||||
"ValueError",
|
|
||||||
"last 2 dimensions of the array must be square: {1} != {2}",
|
|
||||||
0,
|
|
||||||
dim1[0] as i64,
|
|
||||||
dim1[1] as i64
|
|
||||||
);
|
|
||||||
}
|
|
||||||
out_slice[0] = matrix.determinant();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// # Safety
|
|
||||||
///
|
|
||||||
/// `mat1` should point to a valid 2DArray of `f64` floats in row-major order
|
|
||||||
#[no_mangle]
|
|
||||||
pub unsafe extern "C" fn sp_linalg_lu(mat1: *mut InputMatrix, out_l: *mut InputMatrix, out_u: *mut InputMatrix) {
|
|
||||||
let mat1 = mat1.as_mut().unwrap();
|
|
||||||
let out_l = out_l.as_mut().unwrap();
|
|
||||||
let out_u = out_u.as_mut().unwrap();
|
|
||||||
|
|
||||||
if mat1.ndims != 2 {
|
|
||||||
artiq_raise!(
|
|
||||||
"ValueError",
|
|
||||||
"expected 2D Vector Input, but received {1}D input)",
|
|
||||||
0,
|
|
||||||
mat1.ndims as i64,
|
|
||||||
0
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
let dim1 = (*mat1).get_dims();
|
|
||||||
let outl_dim = (*out_l).get_dims();
|
|
||||||
let outu_dim = (*out_u).get_dims();
|
|
||||||
|
|
||||||
let data_slice1 = slice::from_raw_parts_mut(mat1.data, dim1[0] * dim1[1]);
|
|
||||||
let out_l_slice = slice::from_raw_parts_mut(out_l.data, outl_dim[0] * outl_dim[1]);
|
|
||||||
let out_u_slice = slice::from_raw_parts_mut(out_u.data, outu_dim[0] * outu_dim[1]);
|
|
||||||
|
|
||||||
let matrix = DMatrix::from_row_slice(dim1[0], dim1[1], data_slice1);
|
|
||||||
let (_, l, u) = matrix.lu().unpack();
|
|
||||||
|
|
||||||
out_l_slice.copy_from_slice(l.transpose().as_slice());
|
|
||||||
out_u_slice.copy_from_slice(u.transpose().as_slice());
|
|
||||||
}
|
|
||||||
|
|
||||||
/// # Safety
|
|
||||||
///
|
|
||||||
/// `mat1` should point to a valid 2DArray of `f64` floats in row-major order
|
|
||||||
#[no_mangle]
|
|
||||||
pub unsafe extern "C" fn sp_linalg_schur(mat1: *mut InputMatrix, out_t: *mut InputMatrix, out_z: *mut InputMatrix) {
|
|
||||||
let mat1 = mat1.as_mut().unwrap();
|
|
||||||
let out_t = out_t.as_mut().unwrap();
|
|
||||||
let out_z = out_z.as_mut().unwrap();
|
|
||||||
|
|
||||||
if mat1.ndims != 2 {
|
|
||||||
artiq_raise!(
|
|
||||||
"ValueError",
|
|
||||||
"expected 2D Vector Input, but received {1}D input)",
|
|
||||||
0,
|
|
||||||
mat1.ndims as i64,
|
|
||||||
0
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
let dim1 = (*mat1).get_dims();
|
|
||||||
|
|
||||||
if dim1[0] != dim1[1] {
|
|
||||||
artiq_raise!(
|
|
||||||
"ValueError",
|
|
||||||
"last 2 dimensions of the array must be square: {1} != {2}",
|
|
||||||
0,
|
|
||||||
dim1[0] as i64,
|
|
||||||
dim1[1] as i64
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
let out_t_dim = (*out_t).get_dims();
|
|
||||||
let out_z_dim = (*out_z).get_dims();
|
|
||||||
|
|
||||||
let data_slice1 = slice::from_raw_parts_mut(mat1.data, dim1[0] * dim1[1]);
|
|
||||||
let out_t_slice = slice::from_raw_parts_mut(out_t.data, out_t_dim[0] * out_t_dim[1]);
|
|
||||||
let out_z_slice = slice::from_raw_parts_mut(out_z.data, out_z_dim[0] * out_z_dim[1]);
|
|
||||||
|
|
||||||
let matrix = DMatrix::from_row_slice(dim1[0], dim1[1], data_slice1);
|
|
||||||
let (z, t) = matrix.schur().unpack();
|
|
||||||
|
|
||||||
out_t_slice.copy_from_slice(t.transpose().as_slice());
|
|
||||||
out_z_slice.copy_from_slice(z.transpose().as_slice());
|
|
||||||
}
|
|
||||||
|
|
||||||
/// # Safety
|
|
||||||
///
|
|
||||||
/// `mat1` should point to a valid 2DArray of `f64` floats in row-major order
|
|
||||||
#[no_mangle]
|
|
||||||
pub unsafe extern "C" fn sp_linalg_hessenberg(
|
|
||||||
mat1: *mut InputMatrix,
|
|
||||||
out_h: *mut InputMatrix,
|
|
||||||
out_q: *mut InputMatrix,
|
|
||||||
) {
|
|
||||||
let mat1 = mat1.as_mut().unwrap();
|
|
||||||
let out_h = out_h.as_mut().unwrap();
|
|
||||||
let out_q = out_q.as_mut().unwrap();
|
|
||||||
|
|
||||||
if mat1.ndims != 2 {
|
|
||||||
artiq_raise!(
|
|
||||||
"ValueError",
|
|
||||||
"expected 2D Vector Input, but received {1}D input)",
|
|
||||||
0,
|
|
||||||
mat1.ndims as i64,
|
|
||||||
0
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
let dim1 = (*mat1).get_dims();
|
|
||||||
|
|
||||||
if dim1[0] != dim1[1] {
|
|
||||||
artiq_raise!(
|
|
||||||
"ValueError",
|
|
||||||
"last 2 dimensions of the array must be square: {1} != {2}",
|
|
||||||
0,
|
|
||||||
dim1[0] as i64,
|
|
||||||
dim1[1] as i64
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
let out_h_dim = (*out_h).get_dims();
|
|
||||||
let out_q_dim = (*out_q).get_dims();
|
|
||||||
|
|
||||||
let data_slice1 = slice::from_raw_parts_mut(mat1.data, dim1[0] * dim1[1]);
|
|
||||||
let out_h_slice = slice::from_raw_parts_mut(out_h.data, out_h_dim[0] * out_h_dim[1]);
|
|
||||||
let out_q_slice = slice::from_raw_parts_mut(out_q.data, out_q_dim[0] * out_q_dim[1]);
|
|
||||||
|
|
||||||
let matrix = DMatrix::from_row_slice(dim1[0], dim1[1], data_slice1);
|
|
||||||
let (q, h) = matrix.hessenberg().unpack();
|
|
||||||
|
|
||||||
out_h_slice.copy_from_slice(h.transpose().as_slice());
|
|
||||||
out_q_slice.copy_from_slice(q.transpose().as_slice());
|
|
||||||
}
|
|
||||||
|
|
@ -13,7 +13,6 @@ mod dma;
|
||||||
mod rpc;
|
mod rpc;
|
||||||
pub use dma::DmaRecorder;
|
pub use dma::DmaRecorder;
|
||||||
mod cache;
|
mod cache;
|
||||||
mod linalg;
|
|
||||||
#[cfg(has_drtio)]
|
#[cfg(has_drtio)]
|
||||||
mod subkernel;
|
mod subkernel;
|
||||||
|
|
||||||
|
|
@ -24,7 +23,6 @@ pub enum SubkernelStatus {
|
||||||
Timeout,
|
Timeout,
|
||||||
IncorrectState,
|
IncorrectState,
|
||||||
CommLost,
|
CommLost,
|
||||||
Exception(Vec<u8>),
|
|
||||||
OtherError,
|
OtherError,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -81,7 +79,6 @@ pub enum Message {
|
||||||
id: u32,
|
id: u32,
|
||||||
destination: u8,
|
destination: u8,
|
||||||
run: bool,
|
run: bool,
|
||||||
timestamp: u64,
|
|
||||||
},
|
},
|
||||||
#[cfg(has_drtio)]
|
#[cfg(has_drtio)]
|
||||||
SubkernelLoadRunReply {
|
SubkernelLoadRunReply {
|
||||||
|
|
@ -93,7 +90,9 @@ pub enum Message {
|
||||||
timeout: i64,
|
timeout: i64,
|
||||||
},
|
},
|
||||||
#[cfg(has_drtio)]
|
#[cfg(has_drtio)]
|
||||||
SubkernelAwaitFinishReply,
|
SubkernelAwaitFinishReply {
|
||||||
|
status: SubkernelStatus,
|
||||||
|
},
|
||||||
#[cfg(has_drtio)]
|
#[cfg(has_drtio)]
|
||||||
SubkernelMsgSend {
|
SubkernelMsgSend {
|
||||||
id: u32,
|
id: u32,
|
||||||
|
|
@ -110,10 +109,9 @@ pub enum Message {
|
||||||
},
|
},
|
||||||
#[cfg(has_drtio)]
|
#[cfg(has_drtio)]
|
||||||
SubkernelMsgRecvReply {
|
SubkernelMsgRecvReply {
|
||||||
|
status: SubkernelStatus,
|
||||||
count: u8,
|
count: u8,
|
||||||
},
|
},
|
||||||
#[cfg(has_drtio)]
|
|
||||||
SubkernelError(SubkernelStatus),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static CHANNEL_0TO1: Mutex<Option<sync_channel::Sender<'static, Message>>> = Mutex::new(None);
|
static CHANNEL_0TO1: Mutex<Option<sync_channel::Sender<'static, Message>>> = Mutex::new(None);
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ use alloc::vec::Vec;
|
||||||
use cslice::CSlice;
|
use cslice::CSlice;
|
||||||
|
|
||||||
use super::{Message, SubkernelStatus, KERNEL_CHANNEL_0TO1, KERNEL_CHANNEL_1TO0};
|
use super::{Message, SubkernelStatus, KERNEL_CHANNEL_0TO1, KERNEL_CHANNEL_1TO0};
|
||||||
use crate::{artiq_raise, eh_artiq, rpc::send_args, rtio::now_mu};
|
use crate::{artiq_raise, rpc::send_args};
|
||||||
|
|
||||||
pub extern "C" fn load_run(id: u32, destination: u8, run: bool) {
|
pub extern "C" fn load_run(id: u32, destination: u8, run: bool) {
|
||||||
unsafe {
|
unsafe {
|
||||||
|
|
@ -14,7 +14,6 @@ pub extern "C" fn load_run(id: u32, destination: u8, run: bool) {
|
||||||
id: id,
|
id: id,
|
||||||
destination: destination,
|
destination: destination,
|
||||||
run: run,
|
run: run,
|
||||||
timestamp: now_mu() as u64,
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
match unsafe { KERNEL_CHANNEL_0TO1.as_mut().unwrap() }.recv() {
|
match unsafe { KERNEL_CHANNEL_0TO1.as_mut().unwrap() }.recv() {
|
||||||
|
|
@ -37,18 +36,21 @@ pub extern "C" fn await_finish(id: u32, timeout: i64) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
match unsafe { KERNEL_CHANNEL_0TO1.as_mut().unwrap() }.recv() {
|
match unsafe { KERNEL_CHANNEL_0TO1.as_mut().unwrap() }.recv() {
|
||||||
Message::SubkernelAwaitFinishReply => (),
|
Message::SubkernelAwaitFinishReply {
|
||||||
Message::SubkernelError(SubkernelStatus::IncorrectState) => {
|
status: SubkernelStatus::NoError,
|
||||||
artiq_raise!("SubkernelError", "Subkernel not running")
|
} => (),
|
||||||
}
|
Message::SubkernelAwaitFinishReply {
|
||||||
Message::SubkernelError(SubkernelStatus::Timeout) => artiq_raise!("SubkernelError", "Subkernel timed out"),
|
status: SubkernelStatus::IncorrectState,
|
||||||
Message::SubkernelError(SubkernelStatus::CommLost) => {
|
} => artiq_raise!("SubkernelError", "Subkernel not running"),
|
||||||
artiq_raise!("SubkernelError", "Lost communication with satellite")
|
Message::SubkernelAwaitFinishReply {
|
||||||
}
|
status: SubkernelStatus::Timeout,
|
||||||
Message::SubkernelError(SubkernelStatus::OtherError) => {
|
} => artiq_raise!("SubkernelError", "Subkernel timed out"),
|
||||||
artiq_raise!("SubkernelError", "An error occurred during subkernel operation")
|
Message::SubkernelAwaitFinishReply {
|
||||||
}
|
status: SubkernelStatus::CommLost,
|
||||||
Message::SubkernelError(SubkernelStatus::Exception(raw_exception)) => eh_artiq::raise_raw(&raw_exception),
|
} => artiq_raise!("SubkernelError", "Lost communication with satellite"),
|
||||||
|
Message::SubkernelAwaitFinishReply {
|
||||||
|
status: SubkernelStatus::OtherError,
|
||||||
|
} => artiq_raise!("SubkernelError", "An error occurred during subkernel operation"),
|
||||||
_ => panic!("expected SubkernelAwaitFinishReply after SubkernelAwaitFinishRequest"),
|
_ => panic!("expected SubkernelAwaitFinishReply after SubkernelAwaitFinishRequest"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -90,22 +92,30 @@ pub extern "C" fn await_message(id: i32, timeout: i64, tags: &CSlice<u8>, min: u
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
match unsafe { KERNEL_CHANNEL_0TO1.as_mut().unwrap() }.recv() {
|
match unsafe { KERNEL_CHANNEL_0TO1.as_mut().unwrap() }.recv() {
|
||||||
Message::SubkernelMsgRecvReply { count } => {
|
Message::SubkernelMsgRecvReply {
|
||||||
|
status: SubkernelStatus::NoError,
|
||||||
|
count,
|
||||||
|
} => {
|
||||||
if min > count || count > max {
|
if min > count || count > max {
|
||||||
artiq_raise!("SubkernelError", "Received more or less arguments than required")
|
artiq_raise!("SubkernelError", "Received more or less arguments than required")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Message::SubkernelError(SubkernelStatus::IncorrectState) => {
|
Message::SubkernelMsgRecvReply {
|
||||||
artiq_raise!("SubkernelError", "Subkernel not running")
|
status: SubkernelStatus::IncorrectState,
|
||||||
}
|
..
|
||||||
Message::SubkernelError(SubkernelStatus::Timeout) => artiq_raise!("SubkernelError", "Subkernel timed out"),
|
} => artiq_raise!("SubkernelError", "Subkernel not running"),
|
||||||
Message::SubkernelError(SubkernelStatus::CommLost) => {
|
Message::SubkernelMsgRecvReply {
|
||||||
artiq_raise!("SubkernelError", "Lost communication with satellite")
|
status: SubkernelStatus::Timeout,
|
||||||
}
|
..
|
||||||
Message::SubkernelError(SubkernelStatus::OtherError) => {
|
} => artiq_raise!("SubkernelError", "Subkernel timed out"),
|
||||||
artiq_raise!("SubkernelError", "An error occurred during subkernel operation")
|
Message::SubkernelMsgRecvReply {
|
||||||
}
|
status: SubkernelStatus::CommLost,
|
||||||
Message::SubkernelError(SubkernelStatus::Exception(raw_exception)) => eh_artiq::raise_raw(&raw_exception),
|
..
|
||||||
|
} => artiq_raise!("SubkernelError", "Lost communication with satellite"),
|
||||||
|
Message::SubkernelMsgRecvReply {
|
||||||
|
status: SubkernelStatus::OtherError,
|
||||||
|
..
|
||||||
|
} => artiq_raise!("SubkernelError", "An error occurred during subkernel operation"),
|
||||||
_ => panic!("expected SubkernelMsgRecvReply after SubkernelMsgRecvRequest"),
|
_ => panic!("expected SubkernelMsgRecvReply after SubkernelMsgRecvRequest"),
|
||||||
}
|
}
|
||||||
// RpcRecvRequest should be called after this to receive message data
|
// RpcRecvRequest should be called after this to receive message data
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,6 @@ edition = "2018"
|
||||||
[features]
|
[features]
|
||||||
target_zc706 = ["libboard_zynq/target_zc706", "libsupport_zynq/target_zc706", "libconfig/target_zc706", "libboard_artiq/target_zc706"]
|
target_zc706 = ["libboard_zynq/target_zc706", "libsupport_zynq/target_zc706", "libconfig/target_zc706", "libboard_artiq/target_zc706"]
|
||||||
target_kasli_soc = ["libboard_zynq/target_kasli_soc", "libsupport_zynq/target_kasli_soc", "libconfig/target_kasli_soc", "libboard_artiq/target_kasli_soc"]
|
target_kasli_soc = ["libboard_zynq/target_kasli_soc", "libsupport_zynq/target_kasli_soc", "libconfig/target_kasli_soc", "libboard_artiq/target_kasli_soc"]
|
||||||
target_ebaz4205 = ["libboard_zynq/target_ebaz4205", "libsupport_zynq/target_ebaz4205", "libconfig/target_ebaz4205", "libboard_artiq/target_ebaz4205"]
|
|
||||||
default = ["target_zc706"]
|
default = ["target_zc706"]
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
|
|
|
||||||
|
|
@ -405,9 +405,8 @@ async fn handle_run_kernel(
|
||||||
id,
|
id,
|
||||||
destination: _,
|
destination: _,
|
||||||
run,
|
run,
|
||||||
timestamp,
|
|
||||||
} => {
|
} => {
|
||||||
let succeeded = match subkernel::load(aux_mutex, routing_table, timer, id, run, timestamp).await {
|
let succeeded = match subkernel::load(aux_mutex, routing_table, timer, id, run).await {
|
||||||
Ok(()) => true,
|
Ok(()) => true,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
error!("Error loading subkernel: {:?}", e);
|
error!("Error loading subkernel: {:?}", e);
|
||||||
|
|
@ -423,23 +422,33 @@ async fn handle_run_kernel(
|
||||||
#[cfg(has_drtio)]
|
#[cfg(has_drtio)]
|
||||||
kernel::Message::SubkernelAwaitFinishRequest { id, timeout } => {
|
kernel::Message::SubkernelAwaitFinishRequest { id, timeout } => {
|
||||||
let res = subkernel::await_finish(aux_mutex, routing_table, timer, id, timeout).await;
|
let res = subkernel::await_finish(aux_mutex, routing_table, timer, id, timeout).await;
|
||||||
let response = match res {
|
let status = match res {
|
||||||
Ok(res) => {
|
Ok(ref res) => {
|
||||||
if res.status == subkernel::FinishStatus::CommLost {
|
if res.status == subkernel::FinishStatus::CommLost {
|
||||||
kernel::Message::SubkernelError(kernel::SubkernelStatus::CommLost)
|
kernel::SubkernelStatus::CommLost
|
||||||
} else if let Some(exception) = res.exception {
|
} else if let Some(exception) = &res.exception {
|
||||||
kernel::Message::SubkernelError(kernel::SubkernelStatus::Exception(exception))
|
error!("Exception in subkernel");
|
||||||
|
match stream {
|
||||||
|
None => (),
|
||||||
|
Some(stream) => {
|
||||||
|
write_chunk(stream, exception).await?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// will not be called after exception is served
|
||||||
|
kernel::SubkernelStatus::OtherError
|
||||||
} else {
|
} else {
|
||||||
kernel::Message::SubkernelAwaitFinishReply
|
kernel::SubkernelStatus::NoError
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Err(SubkernelError::Timeout) => kernel::Message::SubkernelError(kernel::SubkernelStatus::Timeout),
|
Err(SubkernelError::Timeout) => kernel::SubkernelStatus::Timeout,
|
||||||
Err(SubkernelError::IncorrectState) => {
|
Err(SubkernelError::IncorrectState) => kernel::SubkernelStatus::IncorrectState,
|
||||||
kernel::Message::SubkernelError(kernel::SubkernelStatus::IncorrectState)
|
Err(_) => kernel::SubkernelStatus::OtherError,
|
||||||
}
|
|
||||||
Err(_) => kernel::Message::SubkernelError(kernel::SubkernelStatus::OtherError),
|
|
||||||
};
|
};
|
||||||
control.borrow_mut().tx.async_send(response).await;
|
control
|
||||||
|
.borrow_mut()
|
||||||
|
.tx
|
||||||
|
.async_send(kernel::Message::SubkernelAwaitFinishReply { status: status })
|
||||||
|
.await;
|
||||||
}
|
}
|
||||||
#[cfg(has_drtio)]
|
#[cfg(has_drtio)]
|
||||||
kernel::Message::SubkernelMsgSend { id, destination, data } => {
|
kernel::Message::SubkernelMsgSend { id, destination, data } => {
|
||||||
|
|
@ -460,23 +469,35 @@ async fn handle_run_kernel(
|
||||||
#[cfg(has_drtio)]
|
#[cfg(has_drtio)]
|
||||||
kernel::Message::SubkernelMsgRecvRequest { id, timeout, tags } => {
|
kernel::Message::SubkernelMsgRecvRequest { id, timeout, tags } => {
|
||||||
let message_received = subkernel::message_await(id as u32, timeout, timer).await;
|
let message_received = subkernel::message_await(id as u32, timeout, timer).await;
|
||||||
let response = match message_received {
|
let (status, count) = match message_received {
|
||||||
Ok(ref message) => kernel::Message::SubkernelMsgRecvReply { count: message.count },
|
Ok(ref message) => (kernel::SubkernelStatus::NoError, message.count),
|
||||||
Err(SubkernelError::Timeout) => kernel::Message::SubkernelError(kernel::SubkernelStatus::Timeout),
|
Err(SubkernelError::Timeout) => (kernel::SubkernelStatus::Timeout, 0),
|
||||||
Err(SubkernelError::IncorrectState) => {
|
Err(SubkernelError::IncorrectState) => (kernel::SubkernelStatus::IncorrectState, 0),
|
||||||
kernel::Message::SubkernelError(kernel::SubkernelStatus::IncorrectState)
|
Err(SubkernelError::CommLost) => (kernel::SubkernelStatus::CommLost, 0),
|
||||||
}
|
|
||||||
Err(SubkernelError::CommLost) => kernel::Message::SubkernelError(kernel::SubkernelStatus::CommLost),
|
|
||||||
Err(SubkernelError::SubkernelException) => {
|
Err(SubkernelError::SubkernelException) => {
|
||||||
|
error!("Exception in subkernel");
|
||||||
// just retrieve the exception
|
// just retrieve the exception
|
||||||
let status = subkernel::await_finish(aux_mutex, routing_table, timer, id as u32, timeout)
|
let status = subkernel::await_finish(aux_mutex, routing_table, timer, id as u32, timeout)
|
||||||
.await
|
.await
|
||||||
.unwrap();
|
.unwrap();
|
||||||
kernel::Message::SubkernelError(kernel::SubkernelStatus::Exception(status.exception.unwrap()))
|
match stream {
|
||||||
|
None => (),
|
||||||
|
Some(stream) => {
|
||||||
|
write_chunk(stream, &status.exception.unwrap()).await?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
(kernel::SubkernelStatus::OtherError, 0)
|
||||||
}
|
}
|
||||||
Err(_) => kernel::Message::SubkernelError(kernel::SubkernelStatus::OtherError),
|
Err(_) => (kernel::SubkernelStatus::OtherError, 0),
|
||||||
};
|
};
|
||||||
control.borrow_mut().tx.async_send(response).await;
|
control
|
||||||
|
.borrow_mut()
|
||||||
|
.tx
|
||||||
|
.async_send(kernel::Message::SubkernelMsgRecvReply {
|
||||||
|
status: status,
|
||||||
|
count: count,
|
||||||
|
})
|
||||||
|
.await;
|
||||||
if let Ok(message) = message_received {
|
if let Ok(message) = message_received {
|
||||||
// receive code almost identical to RPC recv, except we are not reading from a stream
|
// receive code almost identical to RPC recv, except we are not reading from a stream
|
||||||
let mut reader = Cursor::new(message.data);
|
let mut reader = Cursor::new(message.data);
|
||||||
|
|
@ -508,7 +529,7 @@ async fn handle_run_kernel(
|
||||||
.async_send(kernel::Message::RpcRecvReply(Ok(0)))
|
.async_send(kernel::Message::RpcRecvReply(Ok(0)))
|
||||||
.await;
|
.await;
|
||||||
i += 1;
|
i += 1;
|
||||||
if i < message.count {
|
if i < count {
|
||||||
current_tags = remaining_tags;
|
current_tags = remaining_tags;
|
||||||
} else {
|
} else {
|
||||||
break;
|
break;
|
||||||
|
|
@ -757,6 +778,7 @@ pub fn main(timer: GlobalTimer, cfg: Config) {
|
||||||
moninj::start(timer, &aux_mutex, &drtio_routing_table);
|
moninj::start(timer, &aux_mutex, &drtio_routing_table);
|
||||||
|
|
||||||
let control: Rc<RefCell<kernel::Control>> = Rc::new(RefCell::new(kernel::Control::start()));
|
let control: Rc<RefCell<kernel::Control>> = Rc::new(RefCell::new(kernel::Control::start()));
|
||||||
|
let idle_kernel = Rc::new(cfg.read("idle_kernel").ok());
|
||||||
if let Ok(buffer) = cfg.read("startup_kernel") {
|
if let Ok(buffer) = cfg.read("startup_kernel") {
|
||||||
info!("Loading startup kernel...");
|
info!("Loading startup kernel...");
|
||||||
let routing_table = drtio_routing_table.borrow();
|
let routing_table = drtio_routing_table.borrow();
|
||||||
|
|
@ -783,26 +805,13 @@ pub fn main(timer: GlobalTimer, cfg: Config) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let cfg = Rc::new(cfg);
|
mgmt::start(cfg);
|
||||||
let restart_idle = Rc::new(Semaphore::new(1, 1));
|
|
||||||
mgmt::start(cfg.clone(), restart_idle.clone());
|
|
||||||
|
|
||||||
task::spawn(async move {
|
task::spawn(async move {
|
||||||
let connection = Rc::new(Semaphore::new(1, 1));
|
let connection = Rc::new(Semaphore::new(1, 1));
|
||||||
let terminate = Rc::new(Semaphore::new(0, 1));
|
let terminate = Rc::new(Semaphore::new(0, 1));
|
||||||
let can_restart_idle = Rc::new(Semaphore::new(1, 1));
|
|
||||||
let restart_idle = restart_idle.clone();
|
|
||||||
loop {
|
loop {
|
||||||
let control = control.clone();
|
let mut stream = TcpStream::accept(1381, 0x10_000, 0x10_000).await.unwrap();
|
||||||
let mut maybe_stream = select_biased! {
|
|
||||||
s = (async {
|
|
||||||
TcpStream::accept(1381, 0x10_000, 0x10_000).await.unwrap()
|
|
||||||
}).fuse() => Some(s),
|
|
||||||
_ = (async {
|
|
||||||
restart_idle.async_wait().await;
|
|
||||||
can_restart_idle.async_wait().await;
|
|
||||||
}).fuse() => None
|
|
||||||
};
|
|
||||||
|
|
||||||
if connection.try_wait().is_none() {
|
if connection.try_wait().is_none() {
|
||||||
// there is an existing connection
|
// there is an existing connection
|
||||||
|
|
@ -810,58 +819,47 @@ pub fn main(timer: GlobalTimer, cfg: Config) {
|
||||||
connection.async_wait().await;
|
connection.async_wait().await;
|
||||||
}
|
}
|
||||||
|
|
||||||
let maybe_idle_kernel = cfg.read("idle_kernel").ok();
|
|
||||||
if maybe_idle_kernel.is_none() && maybe_stream.is_none() {
|
|
||||||
control.borrow_mut().restart(); // terminate idle kernel if running
|
|
||||||
}
|
|
||||||
|
|
||||||
let control = control.clone();
|
let control = control.clone();
|
||||||
|
let idle_kernel = idle_kernel.clone();
|
||||||
let connection = connection.clone();
|
let connection = connection.clone();
|
||||||
let terminate = terminate.clone();
|
let terminate = terminate.clone();
|
||||||
let can_restart_idle = can_restart_idle.clone();
|
|
||||||
let up_destinations = up_destinations.clone();
|
let up_destinations = up_destinations.clone();
|
||||||
let aux_mutex = aux_mutex.clone();
|
let aux_mutex = aux_mutex.clone();
|
||||||
let routing_table = drtio_routing_table.clone();
|
let routing_table = drtio_routing_table.clone();
|
||||||
|
|
||||||
// we make sure the value of terminate is 0 before we start
|
// we make sure the value of terminate is 0 before we start
|
||||||
let _ = terminate.try_wait();
|
let _ = terminate.try_wait();
|
||||||
let _ = can_restart_idle.try_wait();
|
|
||||||
task::spawn(async move {
|
task::spawn(async move {
|
||||||
let routing_table = routing_table.borrow();
|
let routing_table = routing_table.borrow();
|
||||||
select_biased! {
|
select_biased! {
|
||||||
_ = (async {
|
_ = (async {
|
||||||
if let Some(stream) = &mut maybe_stream {
|
let _ = handle_connection(&mut stream, control.clone(), &up_destinations, &aux_mutex, &routing_table, timer)
|
||||||
let _ = handle_connection(stream, control.clone(), &up_destinations, &aux_mutex, &routing_table, timer)
|
.await
|
||||||
.await
|
.map_err(|e| warn!("connection terminated: {}", e));
|
||||||
.map_err(|e| warn!("connection terminated: {}", e));
|
if let Some(buffer) = &*idle_kernel {
|
||||||
}
|
info!("Loading idle kernel");
|
||||||
can_restart_idle.signal();
|
let res = handle_flash_kernel(&buffer, &control, &up_destinations, &aux_mutex, &routing_table, timer)
|
||||||
match maybe_idle_kernel {
|
.await;
|
||||||
Some(buffer) => {
|
match res {
|
||||||
loop {
|
#[cfg(has_drtio)]
|
||||||
info!("loading idle kernel");
|
Err(Error::DestinationDown) => {
|
||||||
match handle_flash_kernel(&buffer, &control, &up_destinations, &aux_mutex, &routing_table, timer).await {
|
let mut countdown = timer.countdown();
|
||||||
Ok(_) => {
|
delay(&mut countdown, Milliseconds(500)).await;
|
||||||
info!("running idle kernel");
|
|
||||||
match handle_run_kernel(None, &control, &up_destinations, &aux_mutex, &routing_table, timer).await {
|
|
||||||
Ok(_) => info!("idle kernel finished"),
|
|
||||||
Err(_) => warn!("idle kernel running error")
|
|
||||||
}
|
|
||||||
},
|
|
||||||
Err(_) => warn!("idle kernel loading error")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
Err(_) => warn!("error loading idle kernel"),
|
||||||
None => info!("no idle kernel found")
|
_ => (),
|
||||||
|
}
|
||||||
|
info!("Running idle kernel");
|
||||||
|
let _ = handle_run_kernel(None, &control, &up_destinations, &aux_mutex, &routing_table, timer)
|
||||||
|
.await.map_err(|_| warn!("error running idle kernel"));
|
||||||
|
info!("Idle kernel terminated");
|
||||||
}
|
}
|
||||||
}).fuse() => (),
|
}).fuse() => (),
|
||||||
_ = terminate.async_wait().fuse() => ()
|
_ = terminate.async_wait().fuse() => ()
|
||||||
}
|
}
|
||||||
connection.signal();
|
connection.signal();
|
||||||
if let Some(stream) = maybe_stream {
|
let _ = stream.flush().await;
|
||||||
let _ = stream.flush().await;
|
let _ = stream.abort().await;
|
||||||
let _ = stream.abort().await;
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -910,8 +908,7 @@ pub fn soft_panic_main(timer: GlobalTimer, cfg: Config) -> ! {
|
||||||
|
|
||||||
Sockets::init(32);
|
Sockets::init(32);
|
||||||
|
|
||||||
let dummy = Rc::new(Semaphore::new(0, 1));
|
mgmt::start(cfg);
|
||||||
mgmt::start(Rc::new(cfg), dummy);
|
|
||||||
|
|
||||||
// getting eth settings disables the LED as it resets GPIO
|
// getting eth settings disables the LED as it resets GPIO
|
||||||
// need to re-enable it here
|
// need to re-enable it here
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ use libasync::{smoltcp::TcpStream, task};
|
||||||
use libboard_artiq::logger::{BufferLogger, LogBufferRef};
|
use libboard_artiq::logger::{BufferLogger, LogBufferRef};
|
||||||
use libboard_zynq::{slcr, smoltcp};
|
use libboard_zynq::{slcr, smoltcp};
|
||||||
use libconfig::Config;
|
use libconfig::Config;
|
||||||
use libcortex_a9::semaphore::Semaphore;
|
|
||||||
use log::{self, debug, error, info, warn, LevelFilter};
|
use log::{self, debug, error, info, warn, LevelFilter};
|
||||||
use num_derive::FromPrimitive;
|
use num_derive::FromPrimitive;
|
||||||
use num_traits::FromPrimitive;
|
use num_traits::FromPrimitive;
|
||||||
|
|
@ -112,12 +111,7 @@ async fn read_key(stream: &mut TcpStream) -> Result<String> {
|
||||||
Ok(String::from_utf8(buffer).unwrap())
|
Ok(String::from_utf8(buffer).unwrap())
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn handle_connection(
|
async fn handle_connection(stream: &mut TcpStream, pull_id: Rc<RefCell<u32>>, cfg: Rc<Config>) -> Result<()> {
|
||||||
stream: &mut TcpStream,
|
|
||||||
pull_id: Rc<RefCell<u32>>,
|
|
||||||
cfg: Rc<Config>,
|
|
||||||
restart_idle: Rc<Semaphore>,
|
|
||||||
) -> Result<()> {
|
|
||||||
if !expect(&stream, b"ARTIQ management\n").await? {
|
if !expect(&stream, b"ARTIQ management\n").await? {
|
||||||
return Err(Error::UnexpectedPattern);
|
return Err(Error::UnexpectedPattern);
|
||||||
}
|
}
|
||||||
|
|
@ -206,9 +200,6 @@ async fn handle_connection(
|
||||||
let value = cfg.write(&key, buffer);
|
let value = cfg.write(&key, buffer);
|
||||||
if value.is_ok() {
|
if value.is_ok() {
|
||||||
debug!("write success");
|
debug!("write success");
|
||||||
if key == "idle_kernel" {
|
|
||||||
restart_idle.signal();
|
|
||||||
}
|
|
||||||
write_i8(stream, Reply::Success as i8).await?;
|
write_i8(stream, Reply::Success as i8).await?;
|
||||||
} else {
|
} else {
|
||||||
// this is an error because we do not expect write to fail
|
// this is an error because we do not expect write to fail
|
||||||
|
|
@ -222,9 +213,6 @@ async fn handle_connection(
|
||||||
let value = cfg.remove(&key);
|
let value = cfg.remove(&key);
|
||||||
if value.is_ok() {
|
if value.is_ok() {
|
||||||
debug!("erase success");
|
debug!("erase success");
|
||||||
if key == "idle_kernel" {
|
|
||||||
restart_idle.signal();
|
|
||||||
}
|
|
||||||
write_i8(stream, Reply::Success as i8).await?;
|
write_i8(stream, Reply::Success as i8).await?;
|
||||||
} else {
|
} else {
|
||||||
warn!("erase failed");
|
warn!("erase failed");
|
||||||
|
|
@ -241,17 +229,17 @@ async fn handle_connection(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn start(cfg: Rc<Config>, restart_idle: Rc<Semaphore>) {
|
pub fn start(cfg: Config) {
|
||||||
task::spawn(async move {
|
task::spawn(async move {
|
||||||
let pull_id = Rc::new(RefCell::new(0u32));
|
let pull_id = Rc::new(RefCell::new(0u32));
|
||||||
|
let cfg = Rc::new(cfg);
|
||||||
loop {
|
loop {
|
||||||
let mut stream = TcpStream::accept(1380, 2048, 2048).await.unwrap();
|
let mut stream = TcpStream::accept(1380, 2048, 2048).await.unwrap();
|
||||||
let pull_id = pull_id.clone();
|
let pull_id = pull_id.clone();
|
||||||
let cfg = cfg.clone();
|
let cfg = cfg.clone();
|
||||||
let restart_idle = restart_idle.clone();
|
|
||||||
task::spawn(async move {
|
task::spawn(async move {
|
||||||
info!("received connection");
|
info!("received connection");
|
||||||
let _ = handle_connection(&mut stream, pull_id, cfg, restart_idle)
|
let _ = handle_connection(&mut stream, pull_id, cfg)
|
||||||
.await
|
.await
|
||||||
.map_err(|e| warn!("connection terminated: {:?}", e));
|
.map_err(|e| warn!("connection terminated: {:?}", e));
|
||||||
let _ = stream.flush().await;
|
let _ = stream.flush().await;
|
||||||
|
|
|
||||||
|
|
@ -102,7 +102,7 @@ mod remote_moninj {
|
||||||
overrd: i8,
|
overrd: i8,
|
||||||
value: i8,
|
value: i8,
|
||||||
) {
|
) {
|
||||||
let _lock = aux_mutex.async_lock().await;
|
let _lock = aux_mutex.lock();
|
||||||
drtioaux_async::send(
|
drtioaux_async::send(
|
||||||
linkno,
|
linkno,
|
||||||
&drtioaux_async::Packet::InjectionRequest {
|
&drtioaux_async::Packet::InjectionRequest {
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,6 @@
|
||||||
#[cfg(not(feature = "target_ebaz4205"))]
|
|
||||||
use embedded_hal::blocking::delay::DelayMs;
|
use embedded_hal::blocking::delay::DelayMs;
|
||||||
#[cfg(has_si5324)]
|
#[cfg(has_si5324)]
|
||||||
use ksupport::i2c;
|
use ksupport::i2c;
|
||||||
#[cfg(not(feature = "target_ebaz4205"))]
|
|
||||||
use libboard_artiq::pl;
|
use libboard_artiq::pl;
|
||||||
#[cfg(has_si5324)]
|
#[cfg(has_si5324)]
|
||||||
use libboard_artiq::si5324;
|
use libboard_artiq::si5324;
|
||||||
|
|
@ -12,9 +10,7 @@ use libboard_artiq::si549;
|
||||||
use libboard_zynq::i2c::I2c;
|
use libboard_zynq::i2c::I2c;
|
||||||
use libboard_zynq::timer::GlobalTimer;
|
use libboard_zynq::timer::GlobalTimer;
|
||||||
use libconfig::Config;
|
use libconfig::Config;
|
||||||
#[cfg(not(feature = "target_ebaz4205"))]
|
use log::{info, warn};
|
||||||
use log::info;
|
|
||||||
use log::warn;
|
|
||||||
|
|
||||||
#[derive(Debug, PartialEq, Copy, Clone)]
|
#[derive(Debug, PartialEq, Copy, Clone)]
|
||||||
#[allow(non_camel_case_types)]
|
#[allow(non_camel_case_types)]
|
||||||
|
|
@ -73,7 +69,7 @@ fn get_rtio_clock_cfg(cfg: &Config) -> RtioClock {
|
||||||
res
|
res
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(not(any(has_drtio, feature = "target_ebaz4205")))]
|
#[cfg(not(has_drtio))]
|
||||||
fn init_rtio(timer: &mut GlobalTimer) {
|
fn init_rtio(timer: &mut GlobalTimer) {
|
||||||
info!("Switching SYS clocks...");
|
info!("Switching SYS clocks...");
|
||||||
unsafe {
|
unsafe {
|
||||||
|
|
@ -433,7 +429,7 @@ pub fn init(timer: &mut GlobalTimer, cfg: &Config) {
|
||||||
#[cfg(has_drtio)]
|
#[cfg(has_drtio)]
|
||||||
init_drtio(timer);
|
init_drtio(timer);
|
||||||
|
|
||||||
#[cfg(not(any(has_drtio, feature = "target_ebaz4205")))]
|
#[cfg(not(has_drtio))]
|
||||||
init_rtio(timer);
|
init_rtio(timer);
|
||||||
|
|
||||||
#[cfg(all(has_si549, has_wrpll))]
|
#[cfg(all(has_si549, has_wrpll))]
|
||||||
|
|
|
||||||
|
|
@ -129,8 +129,6 @@ pub mod drtio {
|
||||||
| Packet::SubkernelLoadRunReply { destination, .. }
|
| Packet::SubkernelLoadRunReply { destination, .. }
|
||||||
| Packet::SubkernelMessage { destination, .. }
|
| Packet::SubkernelMessage { destination, .. }
|
||||||
| Packet::SubkernelMessageAck { destination, .. }
|
| Packet::SubkernelMessageAck { destination, .. }
|
||||||
| Packet::SubkernelException { destination, .. }
|
|
||||||
| Packet::SubkernelExceptionRequest { destination, .. }
|
|
||||||
| Packet::DmaPlaybackStatus { destination, .. }
|
| Packet::DmaPlaybackStatus { destination, .. }
|
||||||
| Packet::SubkernelFinished { destination, .. } => {
|
| Packet::SubkernelFinished { destination, .. } => {
|
||||||
if destination == 0 {
|
if destination == 0 {
|
||||||
|
|
@ -185,7 +183,10 @@ pub mod drtio {
|
||||||
|
|
||||||
async fn drain_buffer(linkno: u8, draining_time: Milliseconds, timer: GlobalTimer) {
|
async fn drain_buffer(linkno: u8, draining_time: Milliseconds, timer: GlobalTimer) {
|
||||||
let max_time = timer.get_time() + draining_time;
|
let max_time = timer.get_time() + draining_time;
|
||||||
while timer.get_time() < max_time {
|
loop {
|
||||||
|
if timer.get_time() > max_time {
|
||||||
|
return;
|
||||||
|
}
|
||||||
let _ = drtioaux_async::recv(linkno).await;
|
let _ = drtioaux_async::recv(linkno).await;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -792,7 +793,6 @@ pub mod drtio {
|
||||||
id: u32,
|
id: u32,
|
||||||
destination: u8,
|
destination: u8,
|
||||||
run: bool,
|
run: bool,
|
||||||
timestamp: u64,
|
|
||||||
) -> Result<(), Error> {
|
) -> Result<(), Error> {
|
||||||
let linkno = routing_table.0[destination as usize][0] - 1;
|
let linkno = routing_table.0[destination as usize][0] - 1;
|
||||||
let reply = aux_transact(
|
let reply = aux_transact(
|
||||||
|
|
@ -804,7 +804,6 @@ pub mod drtio {
|
||||||
source: 0,
|
source: 0,
|
||||||
destination: destination,
|
destination: destination,
|
||||||
run: run,
|
run: run,
|
||||||
timestamp,
|
|
||||||
},
|
},
|
||||||
timer,
|
timer,
|
||||||
)
|
)
|
||||||
|
|
@ -836,19 +835,13 @@ pub mod drtio {
|
||||||
linkno,
|
linkno,
|
||||||
routing_table,
|
routing_table,
|
||||||
&Packet::SubkernelExceptionRequest {
|
&Packet::SubkernelExceptionRequest {
|
||||||
source: 0,
|
|
||||||
destination: destination,
|
destination: destination,
|
||||||
},
|
},
|
||||||
timer,
|
timer,
|
||||||
)
|
)
|
||||||
.await?;
|
.await?;
|
||||||
match reply {
|
match reply {
|
||||||
Packet::SubkernelException {
|
Packet::SubkernelException { last, length, data } => {
|
||||||
destination: 0,
|
|
||||||
last,
|
|
||||||
length,
|
|
||||||
data,
|
|
||||||
} => {
|
|
||||||
remote_data.extend(&data[0..length as usize]);
|
remote_data.extend(&data[0..length as usize]);
|
||||||
if last {
|
if last {
|
||||||
return Ok(remote_data);
|
return Ok(remote_data);
|
||||||
|
|
|
||||||
|
|
@ -100,22 +100,12 @@ pub async fn load(
|
||||||
timer: GlobalTimer,
|
timer: GlobalTimer,
|
||||||
id: u32,
|
id: u32,
|
||||||
run: bool,
|
run: bool,
|
||||||
timestamp: u64,
|
|
||||||
) -> Result<(), Error> {
|
) -> Result<(), Error> {
|
||||||
if let Some(subkernel) = SUBKERNELS.async_lock().await.get_mut(&id) {
|
if let Some(subkernel) = SUBKERNELS.async_lock().await.get_mut(&id) {
|
||||||
if subkernel.state != SubkernelState::Uploaded {
|
if subkernel.state != SubkernelState::Uploaded {
|
||||||
return Err(Error::IncorrectState);
|
return Err(Error::IncorrectState);
|
||||||
}
|
}
|
||||||
drtio::subkernel_load(
|
drtio::subkernel_load(aux_mutex, routing_table, timer, id, subkernel.destination, run).await?;
|
||||||
aux_mutex,
|
|
||||||
routing_table,
|
|
||||||
timer,
|
|
||||||
id,
|
|
||||||
subkernel.destination,
|
|
||||||
run,
|
|
||||||
timestamp,
|
|
||||||
)
|
|
||||||
.await?;
|
|
||||||
if run {
|
if run {
|
||||||
subkernel.state = SubkernelState::Running;
|
subkernel.state = SubkernelState::Running;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -826,7 +826,6 @@ fn process_aux_packet(
|
||||||
destination: _destination,
|
destination: _destination,
|
||||||
id,
|
id,
|
||||||
run,
|
run,
|
||||||
timestamp,
|
|
||||||
} => {
|
} => {
|
||||||
forward!(
|
forward!(
|
||||||
router,
|
router,
|
||||||
|
|
@ -845,7 +844,7 @@ fn process_aux_packet(
|
||||||
// cannot run kernel while DDMA is running
|
// cannot run kernel while DDMA is running
|
||||||
succeeded = false;
|
succeeded = false;
|
||||||
} else {
|
} else {
|
||||||
succeeded |= kernel_manager.run(source, id, timestamp).is_ok();
|
succeeded |= kernel_manager.run(source, id).is_ok();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
router.send(
|
router.send(
|
||||||
|
|
@ -896,7 +895,6 @@ fn process_aux_packet(
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
drtioaux::Packet::SubkernelExceptionRequest {
|
drtioaux::Packet::SubkernelExceptionRequest {
|
||||||
source,
|
|
||||||
destination: _destination,
|
destination: _destination,
|
||||||
} => {
|
} => {
|
||||||
forward!(
|
forward!(
|
||||||
|
|
@ -909,46 +907,17 @@ fn process_aux_packet(
|
||||||
&packet,
|
&packet,
|
||||||
timer
|
timer
|
||||||
);
|
);
|
||||||
let mut data_slice: [u8; MASTER_PAYLOAD_MAX_SIZE] = [0; MASTER_PAYLOAD_MAX_SIZE];
|
let mut data_slice: [u8; SAT_PAYLOAD_MAX_SIZE] = [0; SAT_PAYLOAD_MAX_SIZE];
|
||||||
let meta = kernel_manager.exception_get_slice(&mut data_slice);
|
let meta = kernel_manager.exception_get_slice(&mut data_slice);
|
||||||
router.send(
|
drtioaux::send(
|
||||||
drtioaux::Packet::SubkernelException {
|
0,
|
||||||
destination: source,
|
&drtioaux::Packet::SubkernelException {
|
||||||
last: meta.status.is_last(),
|
last: meta.status.is_last(),
|
||||||
length: meta.len,
|
length: meta.len,
|
||||||
data: data_slice,
|
data: data_slice,
|
||||||
},
|
},
|
||||||
_routing_table,
|
|
||||||
*rank,
|
|
||||||
*self_destination,
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
drtioaux::Packet::SubkernelException {
|
|
||||||
destination: _destination,
|
|
||||||
last,
|
|
||||||
length,
|
|
||||||
data,
|
|
||||||
} => {
|
|
||||||
forward!(
|
|
||||||
router,
|
|
||||||
_routing_table,
|
|
||||||
_destination,
|
|
||||||
*rank,
|
|
||||||
*self_destination,
|
|
||||||
_repeaters,
|
|
||||||
&packet,
|
|
||||||
timer
|
|
||||||
);
|
|
||||||
kernel_manager.received_exception(
|
|
||||||
&data[..length as usize],
|
|
||||||
last,
|
|
||||||
router,
|
|
||||||
_routing_table,
|
|
||||||
*rank,
|
|
||||||
*self_destination,
|
|
||||||
);
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
drtioaux::Packet::SubkernelMessage {
|
drtioaux::Packet::SubkernelMessage {
|
||||||
source,
|
source,
|
||||||
destination: _destination,
|
destination: _destination,
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ use core::cmp::min;
|
||||||
#[cfg(has_drtio_routing)]
|
#[cfg(has_drtio_routing)]
|
||||||
use libboard_artiq::pl::csr;
|
use libboard_artiq::pl::csr;
|
||||||
use libboard_artiq::{drtio_routing, drtioaux,
|
use libboard_artiq::{drtio_routing, drtioaux,
|
||||||
drtioaux_proto::{PayloadStatus, MASTER_PAYLOAD_MAX_SIZE}};
|
drtioaux_proto::{PayloadStatus, MASTER_PAYLOAD_MAX_SIZE, SAT_PAYLOAD_MAX_SIZE}};
|
||||||
|
|
||||||
pub struct SliceMeta {
|
pub struct SliceMeta {
|
||||||
pub destination: u8,
|
pub destination: u8,
|
||||||
|
|
@ -57,6 +57,7 @@ impl Sliceable {
|
||||||
self.data.extend(data);
|
self.data.extend(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get_slice_fn!(get_slice_sat, SAT_PAYLOAD_MAX_SIZE);
|
||||||
get_slice_fn!(get_slice_master, MASTER_PAYLOAD_MAX_SIZE);
|
get_slice_fn!(get_slice_master, MASTER_PAYLOAD_MAX_SIZE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,10 +8,10 @@ use core_io::{Error as IoError, Write};
|
||||||
use cslice::AsCSlice;
|
use cslice::AsCSlice;
|
||||||
use dma::{Error as DmaError, Manager as DmaManager};
|
use dma::{Error as DmaError, Manager as DmaManager};
|
||||||
use io::{Cursor, ProtoWrite};
|
use io::{Cursor, ProtoWrite};
|
||||||
use ksupport::{eh_artiq, kernel, rpc, rtio};
|
use ksupport::{eh_artiq, kernel, rpc};
|
||||||
use libboard_artiq::{drtio_routing::RoutingTable,
|
use libboard_artiq::{drtio_routing::RoutingTable,
|
||||||
drtioaux,
|
drtioaux,
|
||||||
drtioaux_proto::{PayloadStatus, MASTER_PAYLOAD_MAX_SIZE},
|
drtioaux_proto::{PayloadStatus, MASTER_PAYLOAD_MAX_SIZE, SAT_PAYLOAD_MAX_SIZE},
|
||||||
pl::csr};
|
pl::csr};
|
||||||
use libboard_zynq::{time::Milliseconds, timer::GlobalTimer};
|
use libboard_zynq::{time::Milliseconds, timer::GlobalTimer};
|
||||||
use libcortex_a9::sync_channel::Receiver;
|
use libcortex_a9::sync_channel::Receiver;
|
||||||
|
|
@ -47,9 +47,6 @@ enum KernelState {
|
||||||
DmaAwait {
|
DmaAwait {
|
||||||
max_time: Milliseconds,
|
max_time: Milliseconds,
|
||||||
},
|
},
|
||||||
SubkernelRetrievingException {
|
|
||||||
destination: u8,
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
|
|
@ -126,11 +123,10 @@ struct MessageManager {
|
||||||
struct Session {
|
struct Session {
|
||||||
id: u32,
|
id: u32,
|
||||||
kernel_state: KernelState,
|
kernel_state: KernelState,
|
||||||
last_exception: Option<Sliceable>, // exceptions raised locally
|
last_exception: Option<Sliceable>,
|
||||||
external_exception: Option<Vec<u8>>, // exceptions from sub-subkernels
|
|
||||||
messages: MessageManager,
|
messages: MessageManager,
|
||||||
source: u8, // which destination requested running the kernel
|
source: u8, // which destination requested running the kernel
|
||||||
subkernels_finished: Vec<(u32, Option<u8>)>,
|
subkernels_finished: Vec<u32>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Session {
|
impl Session {
|
||||||
|
|
@ -139,7 +135,6 @@ impl Session {
|
||||||
id: id,
|
id: id,
|
||||||
kernel_state: KernelState::Absent,
|
kernel_state: KernelState::Absent,
|
||||||
last_exception: None,
|
last_exception: None,
|
||||||
external_exception: None,
|
|
||||||
messages: MessageManager::new(),
|
messages: MessageManager::new(),
|
||||||
source: 0,
|
source: 0,
|
||||||
subkernels_finished: Vec::new(),
|
subkernels_finished: Vec::new(),
|
||||||
|
|
@ -349,7 +344,7 @@ impl<'a> Manager<'_> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn run(&mut self, source: u8, id: u32, timestamp: u64) -> Result<(), Error> {
|
pub fn run(&mut self, source: u8, id: u32) -> Result<(), Error> {
|
||||||
if self.session.kernel_state != KernelState::Loaded || self.session.id != id {
|
if self.session.kernel_state != KernelState::Loaded || self.session.id != id {
|
||||||
self.load(id)?;
|
self.load(id)?;
|
||||||
}
|
}
|
||||||
|
|
@ -359,7 +354,6 @@ impl<'a> Manager<'_> {
|
||||||
csr::cri_con::selected_write(2);
|
csr::cri_con::selected_write(2);
|
||||||
}
|
}
|
||||||
|
|
||||||
rtio::at_mu(timestamp as i64);
|
|
||||||
self.control.tx.send(kernel::Message::StartRequest);
|
self.control.tx.send(kernel::Message::StartRequest);
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
@ -416,9 +410,9 @@ impl<'a> Manager<'_> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn exception_get_slice(&mut self, data_slice: &mut [u8; MASTER_PAYLOAD_MAX_SIZE]) -> SliceMeta {
|
pub fn exception_get_slice(&mut self, data_slice: &mut [u8; SAT_PAYLOAD_MAX_SIZE]) -> SliceMeta {
|
||||||
match self.session.last_exception.as_mut() {
|
match self.session.last_exception.as_mut() {
|
||||||
Some(exception) => exception.get_slice_master(data_slice),
|
Some(exception) => exception.get_slice_sat(data_slice),
|
||||||
None => SliceMeta {
|
None => SliceMeta {
|
||||||
destination: 0,
|
destination: 0,
|
||||||
len: 0,
|
len: 0,
|
||||||
|
|
@ -546,7 +540,7 @@ impl<'a> Manager<'_> {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
match self.process_external_messages(router, routing_table, rank, destination, timer) {
|
match self.process_external_messages(timer) {
|
||||||
Ok(()) => (),
|
Ok(()) => (),
|
||||||
Err(Error::AwaitingMessage) => return, // kernel still waiting, do not process kernel messages
|
Err(Error::AwaitingMessage) => return, // kernel still waiting, do not process kernel messages
|
||||||
Err(Error::KernelException(exception)) => {
|
Err(Error::KernelException(exception)) => {
|
||||||
|
|
@ -602,41 +596,6 @@ impl<'a> Manager<'_> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn check_finished_kernels(
|
|
||||||
&mut self,
|
|
||||||
id: u32,
|
|
||||||
router: &mut Router,
|
|
||||||
routing_table: &RoutingTable,
|
|
||||||
rank: u8,
|
|
||||||
self_destination: u8,
|
|
||||||
) {
|
|
||||||
for (i, (status, exception_source)) in self.session.subkernels_finished.iter().enumerate() {
|
|
||||||
if *status == id {
|
|
||||||
if exception_source.is_none() {
|
|
||||||
self.control.tx.send(kernel::Message::SubkernelAwaitFinishReply);
|
|
||||||
self.session.kernel_state = KernelState::Running;
|
|
||||||
self.session.subkernels_finished.swap_remove(i);
|
|
||||||
} else {
|
|
||||||
let destination = exception_source.unwrap();
|
|
||||||
self.session.external_exception = Some(Vec::new());
|
|
||||||
self.session.kernel_state = KernelState::SubkernelRetrievingException {
|
|
||||||
destination: destination,
|
|
||||||
};
|
|
||||||
router.route(
|
|
||||||
drtioaux::Packet::SubkernelExceptionRequest {
|
|
||||||
source: self_destination,
|
|
||||||
destination: destination,
|
|
||||||
},
|
|
||||||
&routing_table,
|
|
||||||
rank,
|
|
||||||
self_destination,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn subkernel_load_run_reply(&mut self, succeeded: bool) {
|
pub fn subkernel_load_run_reply(&mut self, succeeded: bool) {
|
||||||
if self.session.kernel_state == KernelState::SubkernelAwaitLoad {
|
if self.session.kernel_state == KernelState::SubkernelAwaitLoad {
|
||||||
self.control
|
self.control
|
||||||
|
|
@ -649,46 +608,16 @@ impl<'a> Manager<'_> {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn remote_subkernel_finished(&mut self, id: u32, with_exception: bool, exception_source: u8) {
|
pub fn remote_subkernel_finished(&mut self, id: u32, with_exception: bool, exception_source: u8) {
|
||||||
let exception_src = if with_exception { Some(exception_source) } else { None };
|
if with_exception {
|
||||||
self.session.subkernels_finished.push((id, exception_src));
|
self.kernel_stop();
|
||||||
}
|
self.last_finished = Some(SubkernelFinished {
|
||||||
|
source: self.session.source,
|
||||||
pub fn received_exception(
|
id: self.session.id,
|
||||||
&mut self,
|
with_exception: true,
|
||||||
exception_data: &[u8],
|
exception_source: exception_source,
|
||||||
last: bool,
|
})
|
||||||
router: &mut Router,
|
|
||||||
routing_table: &RoutingTable,
|
|
||||||
rank: u8,
|
|
||||||
self_destination: u8,
|
|
||||||
) {
|
|
||||||
if let KernelState::SubkernelRetrievingException { destination } = self.session.kernel_state {
|
|
||||||
self.session
|
|
||||||
.external_exception
|
|
||||||
.as_mut()
|
|
||||||
.unwrap()
|
|
||||||
.extend_from_slice(exception_data);
|
|
||||||
if last {
|
|
||||||
self.control
|
|
||||||
.tx
|
|
||||||
.send(kernel::Message::SubkernelError(kernel::SubkernelStatus::Exception(
|
|
||||||
self.session.external_exception.take().unwrap(),
|
|
||||||
)));
|
|
||||||
self.session.kernel_state = KernelState::Running;
|
|
||||||
} else {
|
|
||||||
/* fetch another slice */
|
|
||||||
router.route(
|
|
||||||
drtioaux::Packet::SubkernelExceptionRequest {
|
|
||||||
source: self_destination,
|
|
||||||
destination: destination,
|
|
||||||
},
|
|
||||||
routing_table,
|
|
||||||
rank,
|
|
||||||
self_destination,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
warn!("Received unsolicited exception data");
|
self.session.subkernels_finished.push(id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -813,7 +742,6 @@ impl<'a> Manager<'_> {
|
||||||
id,
|
id,
|
||||||
destination: sk_destination,
|
destination: sk_destination,
|
||||||
run,
|
run,
|
||||||
timestamp,
|
|
||||||
} => {
|
} => {
|
||||||
self.session.kernel_state = KernelState::SubkernelAwaitLoad;
|
self.session.kernel_state = KernelState::SubkernelAwaitLoad;
|
||||||
router.route(
|
router.route(
|
||||||
|
|
@ -822,7 +750,6 @@ impl<'a> Manager<'_> {
|
||||||
destination: sk_destination,
|
destination: sk_destination,
|
||||||
id: id,
|
id: id,
|
||||||
run: run,
|
run: run,
|
||||||
timestamp,
|
|
||||||
},
|
},
|
||||||
routing_table,
|
routing_table,
|
||||||
rank,
|
rank,
|
||||||
|
|
@ -853,35 +780,28 @@ impl<'a> Manager<'_> {
|
||||||
Ok(false)
|
Ok(false)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn process_external_messages(
|
fn process_external_messages(&mut self, timer: &GlobalTimer) -> Result<(), Error> {
|
||||||
&mut self,
|
|
||||||
router: &mut Router,
|
|
||||||
routing_table: &RoutingTable,
|
|
||||||
rank: u8,
|
|
||||||
self_destination: u8,
|
|
||||||
timer: &GlobalTimer,
|
|
||||||
) -> Result<(), Error> {
|
|
||||||
match &self.session.kernel_state {
|
match &self.session.kernel_state {
|
||||||
KernelState::MsgAwait { max_time, id, tags } => {
|
KernelState::MsgAwait { max_time, id, tags } => {
|
||||||
if let Some(max_time) = *max_time {
|
if let Some(max_time) = *max_time {
|
||||||
if timer.get_time() > max_time {
|
if timer.get_time() > max_time {
|
||||||
self.control
|
self.control.tx.send(kernel::Message::SubkernelMsgRecvReply {
|
||||||
.tx
|
status: kernel::SubkernelStatus::Timeout,
|
||||||
.send(kernel::Message::SubkernelError(kernel::SubkernelStatus::Timeout));
|
count: 0,
|
||||||
|
});
|
||||||
self.session.kernel_state = KernelState::Running;
|
self.session.kernel_state = KernelState::Running;
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if let Some(message) = self.session.messages.get_incoming(*id) {
|
if let Some(message) = self.session.messages.get_incoming(*id) {
|
||||||
self.control
|
self.control.tx.send(kernel::Message::SubkernelMsgRecvReply {
|
||||||
.tx
|
status: kernel::SubkernelStatus::NoError,
|
||||||
.send(kernel::Message::SubkernelMsgRecvReply { count: message.count });
|
count: message.count,
|
||||||
|
});
|
||||||
let tags = tags.clone();
|
let tags = tags.clone();
|
||||||
self.session.kernel_state = KernelState::Running;
|
self.session.kernel_state = KernelState::Running;
|
||||||
self.pass_message_to_kernel(&message, tags, timer)
|
self.pass_message_to_kernel(&message, tags, timer)
|
||||||
} else {
|
} else {
|
||||||
let id = *id;
|
|
||||||
self.check_finished_kernels(id, router, routing_table, rank, self_destination);
|
|
||||||
Err(Error::AwaitingMessage)
|
Err(Error::AwaitingMessage)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -897,18 +817,27 @@ impl<'a> Manager<'_> {
|
||||||
KernelState::SubkernelAwaitFinish { max_time, id } => {
|
KernelState::SubkernelAwaitFinish { max_time, id } => {
|
||||||
if let Some(max_time) = *max_time {
|
if let Some(max_time) = *max_time {
|
||||||
if timer.get_time() > max_time {
|
if timer.get_time() > max_time {
|
||||||
self.control
|
self.control.tx.send(kernel::Message::SubkernelAwaitFinishReply {
|
||||||
.tx
|
status: kernel::SubkernelStatus::Timeout,
|
||||||
.send(kernel::Message::SubkernelError(kernel::SubkernelStatus::Timeout));
|
});
|
||||||
self.session.kernel_state = KernelState::Running;
|
self.session.kernel_state = KernelState::Running;
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
let id = *id;
|
let mut i = 0;
|
||||||
self.check_finished_kernels(id, router, routing_table, rank, self_destination);
|
for status in &self.session.subkernels_finished {
|
||||||
|
if *status == *id {
|
||||||
|
self.control.tx.send(kernel::Message::SubkernelAwaitFinishReply {
|
||||||
|
status: kernel::SubkernelStatus::NoError,
|
||||||
|
});
|
||||||
|
self.session.kernel_state = KernelState::Running;
|
||||||
|
self.session.subkernels_finished.swap_remove(i);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
i += 1;
|
||||||
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
KernelState::SubkernelRetrievingException { .. } => Err(Error::AwaitingMessage),
|
|
||||||
KernelState::DmaAwait { max_time } | KernelState::DmaPendingAwait { max_time, .. } => {
|
KernelState::DmaAwait { max_time } | KernelState::DmaPendingAwait { max_time, .. } => {
|
||||||
if timer.get_time() > *max_time {
|
if timer.get_time() > *max_time {
|
||||||
self.control.tx.send(kernel::Message::DmaAwaitRemoteReply {
|
self.control.tx.send(kernel::Message::DmaAwaitRemoteReply {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue