Changeset 501

Timestamp:

Feb 8, 2015, 9:13:56 PM (10 years ago)

Author:

alain

Message:

Introduce user-level, distributed barriers and locks (quad-tree based).

Location:

soft/giet_vm/giet_libs

Files:

• barrier.c (deleted)
• barrier.h (deleted)
• stdio.c (modified) (4 diffs)
• stdio.h (modified) (3 diffs)
• user_barrier.c (added)
• user_barrier.h (added)
• user_lock.c (modified) (1 diff)

soft/giet_vm/giet_libs/stdio.c

@@ -253 +253 @@
 {
     va_list args;
-    const int channel = 0;
     volatile unsigned int sr_save;
 
     sys_call( SYSCALL_TTY_GET_LOCK,
-              channel,
+              0,
               (unsigned int)&sr_save,
               0, 0 );
 
     va_start( args, format );
-    int ret = __printf(format, channel, &args);
+    int ret = __printf(format, 0, &args);
     va_end( args );
 
     sys_call( SYSCALL_TTY_RELEASE_LOCK,
-              channel,
+              0,
               (unsigned int)&sr_save,
               0, 0 );
@@ -541 +540 @@
 //////////////////////////////////////////////////////////////////////////////////
 
-////////////////////////////////
-unsigned int giet_nic_rx_alloc()
+////////////////////////////////////////////////////
+unsigned int giet_nic_rx_alloc( unsigned int xmax,
+                                unsigned int ymax )
 {
     int channel = sys_call( SYSCALL_NIC_ALLOC,
                             1, 
-                            0, 0, 0 );
+                            xmax,
+                            ymax,
+                            0 );
     if ( channel < 0 ) giet_exit("error in giet_nic_rx_alloc()");
 
@@ -552 +554 @@
 }
 
-////////////////////////////////
-unsigned int giet_nic_tx_alloc()
+////////////////////////////////////////////////////
+unsigned int giet_nic_tx_alloc( unsigned int xmax,
+                                unsigned int ymax )
 {
     int channel = sys_call( SYSCALL_NIC_ALLOC,
-                            0, 
-                            0, 0, 0 );
+                            0,
+                            xmax,
+                            ymax,
+                            0 );
     if ( channel < 0 ) giet_exit("error in giet_nic_tx_alloc()");
 
@@ -772 +777 @@
 }
 
-///////////////////////////////////////////////
-void giet_proc_number( unsigned int  cluster_id, 
-                       unsigned int* buffer ) 
-{
-    if ( sys_call( SYSCALL_PROC_NUMBER, 
-                   cluster_id, 
-                   (unsigned int) buffer, 
-                   0, 0) )  giet_exit("ERROR in giet_proc_number()");
+/////////////////////////////////////////////////
+void giet_procs_number( unsigned int* x_size, 
+                        unsigned int* y_size,
+                        unsigned int* nprocs ) 
+{
+    if ( sys_call( SYSCALL_PROCS_NUMBER, 
+                   (unsigned int)x_size, 
+                   (unsigned int)y_size, 
+                   (unsigned int)nprocs, 
+                   0 ) )  giet_exit("ERROR in giet_procs_number()");
 }
 

soft/giet_vm/giet_libs/stdio.h

@@ -31 +31 @@
 #define SYSCALL_FBF_CMA_STOP      0x0D
 #define SYSCALL_EXIT              0x0E
-#define SYSCALL_PROC_NUMBER       0x0F
+#define SYSCALL_PROCS_NUMBER      0x0F
 
 #define SYSCALL_FBF_SYNC_WRITE    0x10
@@ -212 +212 @@
 //////////////////////////////////////////////////////////////////////////
 
-extern unsigned int giet_nic_rx_alloc();
-
-extern unsigned int giet_nic_tx_alloc();
+extern unsigned int giet_nic_rx_alloc( unsigned int xmax, unsigned int ymax );
+
+extern unsigned int giet_nic_tx_alloc( unsigned int xmax, unsigned int ymax );
 
 extern void giet_nic_rx_start( unsigned int channel );
@@ -272 +272 @@
 extern void giet_context_switch();
 
-extern void giet_procnumber( unsigned int cluster_xy,
-                             unsigned int buffer );
+extern void giet_procs_number( unsigned int* x_size,
+                               unsigned int* y_size,
+                               unsigned int* nprocs );
 
 extern void giet_vobj_get_vbase( char*         vspace_name, 

soft/giet_vm/giet_libs/user_lock.c

@@ -78 +78 @@
 void lock_release( user_lock_t* lock ) 
 {
-    unsigned int current = lock->current;
+    asm volatile( "sync" );
 
-    if ( current == (GIET_LOCK_MAX_TICKET - 1) ) lock->current = 0;
-    else                                         lock->current = current + 1;
+    lock->current = lock->current + 1;
 
 #if GIET_DEBUG_USER_LOCK