Changeset 638 for trunk

Timestamp:

Jul 18, 2019, 6:48:08 PM (5 years ago)

Author:

alain

Message:

Fix a bug in the FFT work function (wrong upriv buffer allocation).

Location:

trunk

Files:

• kernel/fs/fatfs.h (modified) (1 diff)
• kernel/syscalls/shared_include/shared_pthread.h (modified) (1 diff)
• libs/libalmosmkh/almosmkh.c (modified) (1 diff)
• params-hard.mk (modified) (1 diff)
• user/fft/fft.c (modified) (5 diffs)
• user/ksh/ksh.c (modified) (2 diffs)

trunk/kernel/fs/fatfs.h

@@ -171 +171 @@
 
 /*****************************************************************************************
- * This structure defines a FATFS specific context (extension to VFS context).
+ * This structure defines a FATFS specific context extension to the VFS context.
  * This fatfs context is replicated in all clusters.
  *

trunk/kernel/syscalls/shared_include/shared_pthread.h

@@ -98 +98 @@
 /******************************************************************************************* 
  * These typedef and enum define the shared informations related to POSIX barriers.
- * The following struct is NOT used in the current implementation or the POSIX barrier
- * that is based on a - non scalable - single shared variable.
- * It can be used by another implementation, based on a distributed quadtree implemented
- * in user space, and relying on a busy waiting policy.
+ * The following struct is only used in the QDT implementation or the POSIX barrier.
  ******************************************************************************************/
 

trunk/libs/libalmosmkh/almosmkh.c

@@ -34 +34 @@
 
 #define  DEBUG_REMOTE_MALLOC     0
-#define  DEBUG_PTHREAD_PARALLEL  1
+#define  DEBUG_PTHREAD_PARALLEL  0
  
 //////////////////////////////////////////////////////////////////////////////////////

trunk/params-hard.mk

@@ -2 +2 @@
 
 ARCH      = /Users/alain/soc/tsar-trunk-svn-2013/platforms/tsar_generic_iob
-X_SIZE    = 2
-Y_SIZE    = 2
-NB_PROCS  = 2
+X_SIZE    = 1
+Y_SIZE    = 1
+NB_PROCS  = 1
 NB_TTYS   = 2
 IOC_TYPE  = IOC_BDV

trunk/user/fft/fft.c

@@ -97 +97 @@
 #define CHECK                   0               
 #define DEBUG_MAIN              1               // trace main() function (detailed if odd)
-#define DEBUG_WORK              1               // trace work() function (detailed if odd)
+#define DEBUG_WORK              0               // trace work() function (detailed if odd)
 #define DEBUG_FFT1D             0               // trace FFT1D() function (detailed if odd)
 #define DEBUG_ROW               0               // trace FFTRow() function (detailed if odd)
@@ -548 +548 @@
 #endif
 
-    // core 0 allocate memory from the local cluster
+    // thread on core 0 allocates memory from the local cluster
     // for the distributed data[], trans[], twid[] buffers
-    // and for the private upriv[] buffer
     if( lid == 0 )
     {
-        unsigned int data_size  = (N / nclusters) * 2 * sizeof(double);
+        unsigned int data_size = (N / nclusters) * 2 * sizeof(double);
         unsigned int coefs_size = (rootN - 1) * 2 * sizeof(double);  
 
-        data[cid]   = (double *)malloc( data_size ); 
-        trans[cid]  = (double *)malloc( data_size ); 
-        twid[cid]   = (double *)malloc( data_size ); 
-
-        upriv       = (double *)malloc( coefs_size );
-    }
-
-    // BARRIER
+        data[cid] = (double *)malloc( data_size ); 
+        if( data[cid] == NULL )
+        {
+            printf("\n[fft_error] in work : cannot allocate data[%d] buffer\n", cid );
+            pthread_barrier_wait( parent_barrier );
+            pthread_exit( NULL );
+        }
+        
+        trans[cid] = (double *)malloc( data_size ); 
+        if( trans[cid] == NULL )
+        {
+            printf("\n[fft_error] in work : cannot allocate trans[%d] buffer\n", cid );
+            pthread_barrier_wait( parent_barrier );
+            pthread_exit( NULL );
+        }
+        
+        twid[cid] = (double *)malloc( data_size ); 
+        if( twid[cid] == NULL )
+        {
+            printf("\n[fft_error] in work : cannot allocate twid[%d] buffer\n", cid );
+            pthread_barrier_wait( parent_barrier );
+            pthread_exit( NULL );
+        }
+    }
+
+    // BARRIER to wait distributed buffers allocation
     get_cycle( &barrier_start );
     pthread_barrier_wait( &barrier );
@@ -570 +587 @@
 
 #if DEBUG_WORK
-printf("\n[fft] %s : thread %d exit first barrier / cycle %d\n",
+printf("\n[fft] %s : thread %d exit barrier for buffer allocation / cycle %d\n",
 __FUNCTION__, tid, (unsigned int)barrier_stop );
 #endif
 
-    // all threads initialize data[] local array
+    // all threads contribute to data[] local array initialisation
     InitD( data , MODE , tid ); 
 
-    // all threads initialize twid[] local array
+    // all threads contribute to data[] local array initialisation
     InitT( twid , tid );
     
-    // all threads initialise private upriv[] array 
-    InitU( upriv );
-
-    // BARRIER
+    // BARRIER to wait distributed buffers initialisation
     get_cycle( &barrier_start );
     pthread_barrier_wait( &barrier );
@@ -590 +604 @@
 
 #if DEBUG_WORK
-printf("\n[fft] %s : thread %d exit second barrier / cycle %d\n",
+printf("\n[fft] %s : thread %d exit barrier for buffer initialisation / cycle %d\n",
 __FUNCTION__, tid, (unsigned int)barrier_stop );
 #endif
 
-    // compute first and last rows handled by the thread
+    // all threads allocate memory from the local cluster
+    // for the private upriv[] buffer
+    upriv = (double *)malloc( (rootN - 1) * 2 * sizeof(double) );
+    if( upriv == NULL )
+    {
+        printf("\n[fft_error] in work : cannot allocate trans[%d] buffer\n", cid );
+        pthread_barrier_wait( parent_barrier );
+        pthread_exit( NULL );
+    }
+
+    // all threads initialise the private upriv[] array 
+    InitU( upriv );
+
+    // all threads compute first and last rows handled by the thread
     MyFirst = rootN * tid / nthreads;
     MyLast  = rootN * (tid + 1) / nthreads;
 
-    // perform forward FFT 
+    // all threads perform forward FFT 
     FFT1D( 1 , data , trans , upriv , twid , tid , MyFirst , MyLast );
 
@@ -808 +835 @@
     unsigned int    base; 
     unsigned int    n1;
-    double  phi;
+    double          phi;
 
     for (q = 0 ; ((unsigned int)(1 << q) < N) ; q++) 

trunk/user/ksh/ksh.c

@@ -1203 +1203 @@
 
 
-/* 2. second direct command
+// 2. second direct command
 if( sem_wait( &semaphore ) )
 {
@@ -1216 +1216 @@
 strcpy( cmd , "load bin/user/fft.elf" );
 execute( cmd );
-*/
+//