Index: /soft/giet_vm/dhrystone/dhry.h =================================================================== --- /soft/giet_vm/dhrystone/dhry.h (revision 270) +++ /soft/giet_vm/dhrystone/dhry.h (revision 271) @@ -363,4 +363,5 @@ #include #include +#include typedef int One_Thirty; Index: /soft/giet_vm/giet_drivers/xcu_driver.c =================================================================== --- /soft/giet_vm/giet_drivers/xcu_driver.c (revision 270) +++ /soft/giet_vm/giet_drivers/xcu_driver.c (revision 271) @@ -170,5 +170,5 @@ //////////////////////////////////////////////////////////////////////////////// unsigned int _xcu_timer_start( unsigned int cluster_xy, - unsigned int proc_id, + unsigned int pti_index, unsigned int period ) { @@ -178,10 +178,9 @@ if (x >= X_SIZE) return 1; if (y >= Y_SIZE) return 1; - if (proc_id >= NB_PROCS_MAX) return 1; #if USE_XICU unsigned int* xcu_address = (unsigned int *) ((unsigned int)&seg_xcu_base + (cluster_xy * (unsigned int)&vseg_cluster_increment)); - xcu_address[XICU_REG(XICU_PTI_PER, proc_id)] = period; + xcu_address[XICU_REG(XICU_PTI_PER, pti_index)] = period; return 0; #else @@ -200,17 +199,16 @@ ////////////////////////////////////////////////////////////////////////////// unsigned int _xcu_timer_stop( unsigned int cluster_xy, - unsigned int proc_id) -{ - // parameters checking - unsigned int x = cluster_xy >> Y_WIDTH; - unsigned int y = cluster_xy & ((1<= X_SIZE) return 1; - if (y >= Y_SIZE) return 1; - if (proc_id >= NB_PROCS_MAX) return 1; + unsigned int pti_index) +{ + // parameters checking + unsigned int x = cluster_xy >> Y_WIDTH; + unsigned int y = cluster_xy & ((1<= X_SIZE) return 1; + if (y >= Y_SIZE) return 1; #if USE_XICU unsigned int * xcu_address = (unsigned int *) ((unsigned int)&seg_xcu_base + (cluster_xy * (unsigned int)&vseg_cluster_increment)); - xcu_address[XICU_REG(XICU_PTI_PER, proc_id)] = 0; + xcu_address[XICU_REG(XICU_PTI_PER, pti_index)] = 0; return 0; #else @@ -231,19 +229,18 @@ ////////////////////////////////////////////////////////////////////////////// unsigned int _xcu_timer_reset_irq( unsigned int cluster_xy, - unsigned int proc_id ) -{ - // parameters checking - unsigned int x = cluster_xy >> Y_WIDTH; - unsigned int y = cluster_xy & ((1<= X_SIZE) return 1; - if (y >= Y_SIZE) return 1; - if (proc_id >= NB_PROCS_MAX) return 1; - -#if USE_XICU - unsigned int * xcu_address = (unsigned int *) ((unsigned int)&seg_xcu_base + - (cluster_xy * (unsigned int)&vseg_cluster_increment)); - - unsigned int bloup = xcu_address[XICU_REG(XICU_PTI_ACK, proc_id)]; - bloup++; // to avoid a warning + unsigned int pti_index ) +{ + // parameters checking + unsigned int x = cluster_xy >> Y_WIDTH; + unsigned int y = cluster_xy & ((1<= X_SIZE) return 1; + if (y >= Y_SIZE) return 1; + +#if USE_XICU + volatile unsigned int * xcu_address = + (unsigned int *) ((unsigned int)&seg_xcu_base + + (cluster_xy * (unsigned int)&vseg_cluster_increment)); + + xcu_address[XICU_REG(XICU_PTI_ACK, pti_index)]; return 0; #else @@ -265,12 +262,11 @@ ///////////////////////////////////////////////////////////////////////////// unsigned int _xcu_timer_reset_cpt( unsigned int cluster_xy, - unsigned int proc_id ) -{ - // parameters checking - unsigned int x = cluster_xy >> Y_WIDTH; - unsigned int y = cluster_xy & ((1<= X_SIZE) return 1; - if (y >= Y_SIZE) return 1; - if (proc_id >= NB_PROCS_MAX) return 1; + unsigned int pti_index ) +{ + // parameters checking + unsigned int x = cluster_xy >> Y_WIDTH; + unsigned int y = cluster_xy & ((1<= X_SIZE) return 1; + if (y >= Y_SIZE) return 1; #if USE_XICU @@ -278,10 +274,10 @@ (cluster_xy * (unsigned int)&vseg_cluster_increment)); - unsigned int period = xcu_address[XICU_REG(XICU_PTI_PER, proc_id)]; + unsigned int period = xcu_address[XICU_REG(XICU_PTI_PER, pti_index)]; // we write 0 first because if the timer is currently running, // the corresponding timer counter is not reset - xcu_address[XICU_REG(XICU_PTI_PER, proc_id)] = 0; - xcu_address[XICU_REG(XICU_PTI_PER, proc_id)] = period; + xcu_address[XICU_REG(XICU_PTI_PER, pti_index)] = 0; + xcu_address[XICU_REG(XICU_PTI_PER, pti_index)] = period; return 0; #else Index: /soft/giet_vm/giet_kernel/ctx_handler.c =================================================================== --- /soft/giet_vm/giet_kernel/ctx_handler.c (revision 270) +++ /soft/giet_vm/giet_kernel/ctx_handler.c (revision 271) @@ -119,7 +119,7 @@ // reset timer counter #if USE_XICU - _xcu_timer_reset_cpt(cluster_id, local_id); + _xcu_timer_reset_cpt(cluster_id, NB_PROCS_MAX + local_id); #else - _timer_reset_cpt(cluster_id, local_id); + _timer_reset_cpt(cluster_id, NB_PROCS_MAX + local_id); #endif Index: /soft/giet_vm/giet_kernel/kernel_init.c =================================================================== --- /soft/giet_vm/giet_kernel/kernel_init.c (revision 270) +++ /soft/giet_vm/giet_kernel/kernel_init.c (revision 271) @@ -290,10 +290,24 @@ } + // the ISR_SWITCH irq index must be NB_PROCS_MAX + local_pid because + // the first NB_PROCS_MAX irqs are used by the WAKEUP ones + if (isr_switch_index != (NB_PROCS_MAX + local_pid)) + { + _tty_get_lock( 0 ); + _puts("\n[GIET ERROR] ISR_SWITCH wrong index for processor "); + _putx(global_pid); + _puts("\n. It should be NB_PROCS_MAX + local_pid ="); + _putd(NB_PROCS_MAX + local_pid); + _puts("\n"); + _tty_release_lock( 0 ); + _exit(); + } + // start system timer unsigned int ko; #if USE_XICU - ko = _xcu_timer_start( cluster_xy, local_pid, GIET_TICK_VALUE ); + ko = _xcu_timer_start( cluster_xy, isr_switch_index, GIET_TICK_VALUE ); #else - ko = _timer_start( cluster_xy, local_pid, GIET_TICK_VALUE ); + ko = _timer_start( cluster_xy, isr_switch_index, GIET_TICK_VALUE ); #endif if ( ko ) Index: /soft/giet_vm/giet_libs/srl.h =================================================================== --- /soft/giet_vm/giet_libs/srl.h (revision 270) +++ /soft/giet_vm/giet_libs/srl.h (revision 271) @@ -10,5 +10,5 @@ #include "mapping_info.h" #include "stdio.h" -#include "utils.h" +#include "stdlib.h" #include "libsrl/srl_public_types.h" Index: /soft/giet_vm/giet_libs/stdio.c =================================================================== --- /soft/giet_vm/giet_libs/stdio.c (revision 270) +++ /soft/giet_vm/giet_libs/stdio.c (revision 271) @@ -13,5 +13,4 @@ #include #include - //////////////////////////////////////////////////////////////////////////////////// @@ -823,34 +822,4 @@ } } -/////////////////////////////////////////////////////////////////////////////////// -// memcpy() -/////////////////////////////////////////////////////////////////////////////////// -inline void* memcpy( void* dest, - const void* source, - unsigned int size ) -{ - unsigned int* dst = dest; - const unsigned int* src = source; - - // word-by-word copy - if (!((unsigned int) dst & 3) && !((unsigned int) src & 3)) - { - while (size > 3) - { - *dst++ = *src++; - size -= 4; - } - } - - unsigned char * cdst = (unsigned char *) dst; - unsigned char * csrc = (unsigned char *) src; - - /* byte-by-byte copy */ - while (size--) - { - *cdst++ = *csrc++; - } - return dest; -} // Local Variables: Index: /soft/giet_vm/giet_libs/stdlib.c =================================================================== --- /soft/giet_vm/giet_libs/stdlib.c (revision 270) +++ /soft/giet_vm/giet_libs/stdlib.c (revision 271) @@ -5,4 +5,6 @@ // Copyright (c) UPMC-LIP6 /////////////////////////////////////////////////////////////////////////////////// + +#include /////////////////////////////////////////////////////////////////////////////////// @@ -31,4 +33,39 @@ } +//////////////////////////////////////////////////////////////////////////////////////// +// mempcy() +// GCC requires this function. Taken from MutekH. +//////////////////////////////////////////////////////////////////////////////////////// +void * memcpy(void *_dst, const void * _src, unsigned int size) { + unsigned int * dst = _dst; + const unsigned int * src = _src; + if (!((unsigned int) dst & 3) && !((unsigned int) src & 3) ) + while (size > 3) { + *dst++ = *src++; + size -= 4; + } + + unsigned char *cdst = (unsigned char*)dst; + unsigned char *csrc = (unsigned char*)src; + + while (size--) { + *cdst++ = *csrc++; + } + return _dst; +} + + +//////////////////////////////////////////////////////////////////////////////////////// +// mempcy() +// GCC requires this function. Taken from MutekH. +//////////////////////////////////////////////////////////////////////////////////////// +inline void * memset(void * dst, int s, unsigned int count) { + char * a = (char *) dst; + while (count--){ + *a++ = (char)s; + } + return dst; +} + // Local Variables: // tab-width: 4 Index: /soft/giet_vm/giet_libs/stdlib.h =================================================================== --- /soft/giet_vm/giet_libs/stdlib.h (revision 270) +++ /soft/giet_vm/giet_libs/stdlib.h (revision 271) @@ -10,4 +10,16 @@ int atoi (char * str); + +//////////////////////////////////////////////////////////////////////////////////////// +// mempcy() +// GCC requires this function. Taken from MutekH. +//////////////////////////////////////////////////////////////////////////////////////// +void * memcpy(void *_dst, const void * _src, unsigned int size); + +//////////////////////////////////////////////////////////////////////////////////////// +// mempcy() +// GCC requires this function. Taken from MutekH. +//////////////////////////////////////////////////////////////////////////////////////// +inline void * memset(void * dst, int s, unsigned int count); #endif Index: /soft/giet_vm/mappings/4c_1p_iob_sort.xml =================================================================== --- /soft/giet_vm/mappings/4c_1p_iob_sort.xml (revision 270) +++ /soft/giet_vm/mappings/4c_1p_iob_sort.xml (revision 271) @@ -281,23 +281,31 @@ + - + + - + + - + + - - - - + + + + + + + + Index: /soft/giet_vm/mappings/4c_1p_sort.xml =================================================================== --- /soft/giet_vm/mappings/4c_1p_sort.xml (revision 270) +++ /soft/giet_vm/mappings/4c_1p_sort.xml (revision 271) @@ -59,24 +59,24 @@ + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - @@ -255,23 +255,31 @@ + - + + - + + - + + - - - - + + + + + + + + Index: /soft/giet_vm/mappings/4c_1p_sort_chiplet.xml =================================================================== --- /soft/giet_vm/mappings/4c_1p_sort_chiplet.xml (revision 270) +++ /soft/giet_vm/mappings/4c_1p_sort_chiplet.xml (revision 271) @@ -32,5 +32,5 @@ - + @@ -208,23 +208,31 @@ + - + + - + + - + + - - - - + + + + + + + + Index: ft/giet_vm/mappings/4c_2p_40_sort.xml =================================================================== --- /soft/giet_vm/mappings/4c_2p_40_sort.xml (revision 270) +++ (revision ) @@ -1,264 +1,0 @@ - - - - -*** This first section describes an instance of the "tsar_generic_xbar" architecture -*** with 4 clusters, 2 processor per cluster and 40 bits physical address. - - - - - - - - -*** Boot ROM and non replicated peripherals - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*** segments used by the boot code / A[31:28] = 0xB / Identity mapping - - - - - - - - - - - - - - -*** Non replicated peripherals / A[31:28] = 0xB / Identity mapping - - - - - - - - - - - - - - -*** segments used by the kernel / A[31:28] = 0x8 - - - - - - - - - - - - - - -*** Replicated ICUS / A[31:28] = 0xE / Increment = 0x10000 - - - - - - - - - - - - - - -*** Replicated DMAs / A[31:28] = 0xD / Increment = 0x10000 - - - - - - - - - - - - - - -*** Replicated schedulers / A[31:28] = 0xF / Increment = 0x10000 - - - - - - - - - - - - - -*** - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: /soft/giet_vm/sort/main.c =================================================================== --- /soft/giet_vm/sort/main.c (revision 270) +++ /soft/giet_vm/sort/main.c (revision 271) @@ -38,10 +38,10 @@ ////////////////////////////////////////////////////////////////////////// -// The NPROCS constant must be modified depending on the desired number of +// The NTHREADS constant must be modified depending on the desired number of // threads -#define NPROCS 4 -#define ARRAY_LENGTH (NPROCS * 128) -#define IPP (ARRAY_LENGTH / NPROCS) // ITEMS PER PROCESSOR +#define NTHREADS 8 +#define ARRAY_LENGTH (NTHREADS * 128) +#define IPT (ARRAY_LENGTH / NTHREADS) // ITEMS PER THREAD //////////////////////////////////////////////////////////////////////////////// @@ -89,5 +89,5 @@ /////////////////////////////////////////////////// // This application support at most 256 processors -// Number of barriers = log2(NPROCS) +// Number of barriers = log2(NTHREADS) giet_barrier_t barrier[8]; @@ -101,12 +101,12 @@ int i; - task0_printf("[ Thread 0 ] Starting SORT application\n"); + printf("[ Thread %d ] Initializing vector and barriers...\n\r", thread_id); /////////////////////////// // Barriers Initialization - for (i = 0; i < __builtin_ctz(NPROCS); i++) - { - barrier_init(&barrier[i], NPROCS >> i); + for (i = 0; i < __builtin_ctz(NTHREADS); i++) + { + barrier_init(&barrier[i], NTHREADS >> i); } @@ -114,5 +114,5 @@ // Array Initialization - for (i = IPP * thread_id; i < IPP * (thread_id + 1); i++) + for (i = IPT * thread_id; i < IPT * (thread_id + 1); i++) { array0[i] = rand(); @@ -124,9 +124,9 @@ printf("[ Thread %d ] Stage 0: Processor Sorting...\n\r", thread_id); - bubbleSort(array0, IPP, IPP * thread_id); + bubbleSort(array0, IPT, IPT * thread_id); printf("[ Thread %d ] Finishing Stage 0\n\r", thread_id); - for (i = 0; i < __builtin_ctz(NPROCS); i++) + for (i = 0; i < __builtin_ctz(NTHREADS); i++) { asm volatile ("sync"); @@ -153,8 +153,8 @@ merge(src_array, dst_array - , IPP << i - , IPP * thread_id - , IPP * (thread_id + (1 << i)) - , IPP * thread_id + , IPT << i + , IPT * thread_id + , IPT * (thread_id + (1 << i)) + , IPT * thread_id );