stv0g/metalsvm
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

add ping pong test and some bug fixes in the ICC part

Browse source
This commit is contained in:
Stefan Lankes 2011-04-24 07:27:27 -07:00
parent 29ab43f289
commit 3a0e42eef1
5 changed files with 131 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/x86/include/asm/icc.h
View file

@ -45,11 +45,14 @@ typedef struct {
uint32_t length;
} icc_header_t;
#define ICC_TYPE_IP (1 << 0)
#define ICC_TYPE_SVM (1 << 1)
#define ICC_TYPE_IP (1 << 0)
#define ICC_TYPE_SVM (1 << 1)
#define ICC_TYPE_PINGREQUEST (1 << 2)
#define ICC_TYPE_PINGRESPONSE (1 << 3)
int icc_init(void);
void check_icc(void);
int icc_ping();
void icc_check(void);
#endif

100
arch/x86/scc/icc.c
View file

@ -17,6 +17,7 @@
#include <metalsvm/processor.h>
#include <metalsvm/errno.h>
#include <asm/io.h>
#include <asm/irqflags.h>
#ifdef CONFIG_ROCKCREEK
#include <asm/RCCE.h>
#include <asm/iRCCE.h>
@ -29,6 +30,9 @@ static int num_ues, my_ue;
/* PSE bit for Pentium+ equals MPE (message buffer enable) flag in RCK! So, use it to create _PAGE_MPB symbol... */
#define _CR4_MPE 0x00000800
/* maximal number of SCC's cores */
#define MAX_SCC_CORES (NUM_ROWS*NUM_COLS*NUM_CORES)
/*
* This is the modified MPB program, which is part of the RCCE distribution (src/mpb.c).
*
@ -131,8 +135,102 @@ int icc_init(void)
return 0;
}
void check_icc(void)
int icc_ping(int ue)
{
icc_header_t ping_header = {ICC_TYPE_PINGREQUEST, 0, sizeof(uint64_t)};
uint64_t tsc;
uint32_t flags;
iRCCE_SEND_REQUEST send_request;
if (BUILTIN_EXPECT(ue == my_ue, 0))
return -EINVAL;
if (BUILTIN_EXPECT((ue < 0) || (ue >= num_ues), 0))
return -EINVAL;
tsc = rdtsc();
// iRCCE is not thread save => disable interrupts
flags = irq_nested_disable();
iRCCE_isend((char*) &ping_header, sizeof(icc_header_t), ue, NULL);
iRCCE_isend((char*) &tsc, sizeof(uint64_t), ue, &send_request);
// waiting for the completion
while(iRCCE_isend_test(&send_request, NULL) != iRCCE_SUCCESS)
icc_check(); // oh, we have time to check incoming requests
irq_nested_enable(flags);
return 0;
}
static void interpret_header(icc_header_t* header, int recv_ue)
{
//kprintf("Got ICC message %d from %d\n", header->type, recv_ue);
switch(header->type)
{
case ICC_TYPE_PINGREQUEST: {
icc_header_t response = {ICC_TYPE_PINGRESPONSE, 0, sizeof(uint64_t)};
iRCCE_RECV_REQUEST recv_req;
uint64_t tsc;
iRCCE_isend((char*) &response, sizeof(icc_header_t), recv_ue, NULL);
if (iRCCE_irecv((char*) &tsc, sizeof(uint64_t), recv_ue, &recv_req) != iRCCE_SUCCESS)
iRCCE_irecv_wait(&recv_req);
iRCCE_isend((char*) &tsc, sizeof(uint64_t), recv_ue, NULL);
iRCCE_isend_push();
}
break;
case ICC_TYPE_PINGRESPONSE: {
uint64_t start, end;
iRCCE_RECV_REQUEST recv_req;
if (iRCCE_irecv((char*) &start, sizeof(uint64_t), recv_ue, &recv_req) != iRCCE_SUCCESS)
iRCCE_irecv_wait(&recv_req);
end = rdtsc();
kprintf("Receive ping response. Ticks: %d\n", end-start);
}
break;
default:
kprintf("Receive unknown ICC message (%d)\n", header->type);
}
}
/*
* By entering this function, interrupts are already disables
* => No race by using the static variables
*/
void icc_check(void)
{
static icc_header_t header[MAX_SCC_CORES];
static iRCCE_RECV_REQUEST request[MAX_SCC_CORES];
static int8_t pending[MAX_SCC_CORES] = {[0 ... MAX_SCC_CORES-1] = 0};
int i, ret;
// pushes the progress of non-blocking communication requests
iRCCE_isend_push();
iRCCE_irecv_push();
for(i=0; i<num_ues; i++) {
if (i == my_ue)
continue;
if (!pending[i]) {
ret = iRCCE_irecv((char*) (header+i), sizeof(icc_header_t), i, request+i);
if (ret == iRCCE_SUCCESS)
interpret_header(header+i, i);
else
pending[i] = 1;
} else {
ret = iRCCE_irecv_test(request+i, NULL);
if (ret == iRCCE_SUCCESS) {
interpret_header(header+i, i);
pending[i] = 0;
}
}
}
}
#endif

2
include/metalsvm/tasks.h
View file

@ -143,7 +143,7 @@ static inline void check_workqueues(void)
uint32_t flags = irq_nested_disable();
#ifdef CONFIG_ROCKCREEK
check_icc();
icc_check();
#endif
irq_nested_enable(flags);

8
include/metalsvm/time.h
View file

@ -69,7 +69,13 @@ void timer_wait(unsigned int ticks);
*/
uint64_t get_clock_tick(void);
static inline void sleep(unsigned int i) { timer_wait(i*TIMER_FREQ); }
/** @brief sleep some seconds
*
* This function sleeps some seconds
*
* @paran sec Amount of seconds to wait
*/
static inline void sleep(unsigned int sec) { timer_wait(sec*TIMER_FREQ); }
#ifdef __cplusplus
}

18
kernel/tests.c
View file

@ -24,6 +24,9 @@
#include <metalsvm/semaphore.h>
#include <metalsvm/mailbox.h>
#include <metalsvm/syscall.h>
#ifdef CONFIG_ROCKCREEK
#include <asm/icc.h>
#endif
static sem_t consuming, producing;
static mailbox_int32_t mbox;
@ -83,6 +86,20 @@ static int STDCALL foo(void* arg)
return 42;
}
#ifdef CONFIG_ROCKCREEK
static int STDCALL ping(void* arg)
{
int i;
for(i=0; i<20; i++) {
icc_ping(1);
sleep(1);
}
return 0;
}
#endif
static int STDCALL join_test(void* arg)
{
tid_t id, ret;
@ -112,6 +129,7 @@ int test_init(void)
//create_kernel_task(NULL, join_test, NULL);
//create_kernel_task(NULL, producer, NULL);
//create_kernel_task(NULL, consumer, NULL);
//create_kernel_task(NULL, ping, NULL);
//create_user_task(NULL, "/bin/hello", argv);
create_user_task(NULL, "/bin/tests", argv);
//create_user_task(NULL, "/bin/jacobi", argv);