M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

runtime: support rtio data wider than 64 bit

This commit is contained in:
Robert Jördens 2016-11-18 17:08:33 +01:00
parent 342b9e977e
commit 641f07119f
3 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
artiq/coredevice/rtio.py
View File

@ -1,5 +1,5 @@
from artiq.language.core import syscall from artiq.language.core import syscall
from artiq.language.types import TInt64, TInt32, TNone from artiq.language.types import TInt64, TInt32, TNone, TList
@syscall(flags={"nowrite"}) @syscall(flags={"nowrite"})
@ -8,6 +8,12 @@ def rtio_output(time_mu: TInt64, channel: TInt32, addr: TInt32, data: TInt32
raise NotImplementedError("syscall not simulated") raise NotImplementedError("syscall not simulated")
@syscall(flags={"nowrite"})
def rtio_output_list(time_mu: TInt64, channel: TInt32, addr: TInt32,
data: TList(TInt32)) -> TNone:
raise NotImplementedError("syscall not simulated")
@syscall(flags={"nowrite"}) @syscall(flags={"nowrite"})
def rtio_input_timestamp(timeout_mu: TInt64, channel: TInt32) -> TInt64: def rtio_input_timestamp(timeout_mu: TInt64, channel: TInt32) -> TInt64:
raise NotImplementedError("syscall not simulated") raise NotImplementedError("syscall not simulated")

28
artiq/runtime/rtio.c
View File

@ -58,7 +58,27 @@ void rtio_output(long long int timestamp, int channel, unsigned int addr,
#ifdef CSR_RTIO_O_ADDRESS_ADDR #ifdef CSR_RTIO_O_ADDRESS_ADDR
rtio_o_address_write(addr); rtio_o_address_write(addr);
#endif #endif
rtio_o_data_write(data); MMPTR(CSR_RTIO_O_DATA_ADDR) = data;
rtio_o_we_write(1);
status = rtio_o_status_read();
if(status)
rtio_process_exceptional_status(timestamp, channel, status);
}
void rtio_output_list(long long int timestamp, int channel,
unsigned int addr, struct artiq_list data)
{
int status, i;
volatile unsigned int *p = &MMPTR(CSR_RTIO_O_DATA_ADDR);
rtio_chan_sel_write(channel);
rtio_o_timestamp_write(timestamp);
#ifdef CSR_RTIO_O_ADDRESS_ADDR
rtio_o_address_write(addr);
#endif
for(i=0;i<data.length;i++)
*p++ = *data.elements++;
rtio_o_we_write(1); rtio_o_we_write(1);
status = rtio_o_status_read(); status = rtio_o_status_read();
if(status) if(status)
@ -116,7 +136,7 @@ unsigned int rtio_input_data(int channel)
} }
} }
data = rtio_i_data_read(); data = MMPTR(CSR_RTIO_I_DATA_ADDR);
rtio_i_re_write(1); rtio_i_re_write(1);
return data; return data;
} }
@ -140,14 +160,14 @@ void rtio_log_va(long long int timestamp, const char *fmt, va_list args)
word <<= 8; word <<= 8;
word |= *buf & 0xff; word |= *buf & 0xff;
if(*buf == 0) { if(*buf == 0) {
rtio_o_data_write(word); MMPTR(CSR_RTIO_O_DATA_ADDR) = word;
rtio_o_we_write(1); rtio_o_we_write(1);
break; break;
} }
buf++; buf++;
i++; i++;
if(i == 4) { if(i == 4) {
rtio_o_data_write(word); MMPTR(CSR_RTIO_O_DATA_ADDR) = word;
rtio_o_we_write(1); rtio_o_we_write(1);
word = 0; word = 0;
i = 0; i = 0;

9
artiq/runtime/rtio.h
View File

@ -11,12 +11,21 @@
#define RTIO_I_STATUS_EMPTY 1 #define RTIO_I_STATUS_EMPTY 1
#define RTIO_I_STATUS_OVERFLOW 2 #define RTIO_I_STATUS_OVERFLOW 2
struct artiq_list {
int32_t length;
int32_t *elements;
};
void rtio_init(void); void rtio_init(void);
long long int rtio_get_counter(void); long long int rtio_get_counter(void);
void rtio_log(long long int timestamp, const char *format, ...); void rtio_log(long long int timestamp, const char *format, ...);
void rtio_log_va(long long int timestamp, const char *format, va_list args); void rtio_log_va(long long int timestamp, const char *format, va_list args);
void rtio_output(long long int timestamp, int channel, unsigned int address, void rtio_output(long long int timestamp, int channel, unsigned int address,
unsigned int data); unsigned int data);
void rtio_output_list(long long int timestamp, int channel,
unsigned int addr, struct artiq_list data);
/* /*
* Waits at least until timeout and returns the timestamp of the first * Waits at least until timeout and returns the timestamp of the first