runtime/kernel: store DMA and cache buffer on core0. #86

pca006132 · 2020-08-05T12:29:22+08:00

pca006132 commented

2020-08-05 12:29:22 +08:00

Compiles, and tested with the example DMA, need more testing.

Closes #77.

Compiles, and tested with the example DMA, need more testing. Closes #77.

pca006132 commented

2020-08-05 14:31:28 +08:00

This PR also fixes the crash in #83 and memory corruption mentioned in https://github.com/m-labs/artiq/issues/1167.

However, 2 DMA tests still failed.

======================================================================
FAIL: test_dma_delta (test_rtio.DMATest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/pca006132/code/artiq/artiq/test/coredevice/test_rtio.py", line 699, in test_dma_delta
    self.assertEqual(exp.delta, 1000200)
AssertionError: 0 != 1000200

----------------------------------------------------------------------

======================================================================
FAIL: test_dma_trace (test_rtio.DMATest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/pca006132/code/artiq/artiq/test/coredevice/test_rtio.py", line 683, in test_dma_trace
    self.assertEqual(dump.messages[0].channel, 1)
AssertionError: 5 != 1

----------------------------------------------------------------------

This PR also fixes the crash in #83 and memory corruption mentioned in https://github.com/m-labs/artiq/issues/1167. However, 2 DMA tests still failed. ``` ====================================================================== FAIL: test_dma_delta (test_rtio.DMATest) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/pca006132/code/artiq/artiq/test/coredevice/test_rtio.py", line 699, in test_dma_delta self.assertEqual(exp.delta, 1000200) AssertionError: 0 != 1000200 ---------------------------------------------------------------------- ``` ``` ====================================================================== FAIL: test_dma_trace (test_rtio.DMATest) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/pca006132/code/artiq/artiq/test/coredevice/test_rtio.py", line 683, in test_dma_trace self.assertEqual(dump.messages[0].channel, 1) AssertionError: 5 != 1 ---------------------------------------------------------------------- ```

sb10q commented

2020-08-05 14:32:51 +08:00

This PR also fixes the crash in #83

Do you know why it crashed before?

> This PR also fixes the crash in #83 Do you know why it crashed before?

sb10q reviewed 2020-08-05 15:07:31 +08:00

src/runtime/src/comms.rs Outdated

						
				@ -333,6 +354,10 @@ pub fn main(timer: GlobalTimer, cfg: &config::Config) {

				        }

				    };

				    // initialize stores

sb10q commented

2020-08-05 15:07:31 +08:00

Can't we use the const initializer? I upgraded rustc and enabled the feature for BTreeMap and it seems to work fine.

pca006132 commented

2020-08-05 15:19:37 +08:00

OK, my rust-analyzer did not show the initializer is const so I thought we have not updated that. Would fix.

pca006132 commented

2020-08-05 15:23:47 +08:00

This PR also fixes the crash in #83

Do you know why it crashed before?

Not sure, I guess there could be relocation happend in the BTree between getting the data and using the data which invalidates the pointer.

> > This PR also fixes the crash in #83 > > Do you know why it crashed before? Not sure, I guess there could be relocation happend in the BTree between getting the data and using the data which invalidates the pointer.

sb10q closed this pull request

2020-08-05 18:32:39 +08:00

Sign in to join this conversation.

No reviewers