Changeset 629 for trunk/user/fft

Timestamp:

May 17, 2019, 9:27:04 AM (6 years ago)

Author:

alain

Message:

Remove the "giant" rwlock protecting the GPT, and
use the GPT_LOCKED attribute in each PTE to prevent
concurrent modifications of one GPT entry.
The version number has been incremented to 2.1.

File:

• trunk/user/fft/fft.c (modified) (15 diffs)

trunk/user/fft/fft.c

@@ -538 +538 @@
         exit(0);
     }
-    printf("\n[sort] file <%s> closed\n", path );
+    printf("\n[fft] file <%s> closed\n", path );
 
     exit( 0 );
@@ -570 +570 @@
 
 #if DEBUG_SLAVE
-printf("\n[fft] %s : thread %x enter / cycle %d\n",
+printf("\n[fft] %s : thread %d enter / cycle %d\n",
 __FUNCTION__, MyNum, (unsigned int)parallel_start );
 #endif
+
+    // BARRIER
+    get_cycle( &barrier_start );
+    pthread_barrier_wait( &barrier );
+    get_cycle( &barrier_stop );
+    sync_time[MyNum] += (barrier_stop - barrier_start);
+
+// printf("\n[@@@] %s : thread %d exit first barrier / cycle %d\n",
+// __FUNCTION__, MyNum, (unsigned int)barrier_stop );
 
     // allocate and initialise local array upriv[] 
@@ -592 +601 @@
     FFT1D( 1 , data , trans , upriv , twid , MyNum , MyFirst , MyLast );
 
-    // BARRIER
-    get_cycle( &barrier_start );
-    pthread_barrier_wait( &barrier );
-    get_cycle( &barrier_stop );
-
-    sync_time[MyNum] += (barrier_stop - barrier_start);
-
 #if CHECK 
 get_cycle( &barrier_start );
 pthread_barrier_wait( &barrier );
 get_cycle( &barrier_stop );
-
 sync_time[MyNum] += (long)(barrier_stop - barrier_start);
-
 FFT1D( -1 , data , trans , upriv , twid , MyNum , MyFirst , MyLast );
 #endif
@@ -688 +688 @@
 {
     unsigned int         i , j;
-    double       cks;
     unsigned int         c_id;
     unsigned int         c_offset;
+    double               cks;
 
     cks = 0.0;
@@ -849 +849 @@
 unsigned long long cycle;
 get_cycle( &cycle );
-printf("\n[fft] %s : thread %x enter / first %d / last %d / cycle %d\n",
+printf("\n[fft] %s : thread %d enter / first %d / last %d / cycle %d\n",
 __FUNCTION__, MyNum, MyFirst, MyLast, (unsigned int)cycle );
 #endif
@@ -858 +858 @@
 #if( DEBUG_FFT1D & 1 )
 get_cycle( &cycle );
-printf("\n[fft] %s : thread %x after first transpose / cycle %d\n",
+printf("\n[fft] %s : thread %d after first transpose / cycle %d\n",
 __FUNCTION__, MyNum, (unsigned int)cycle );
 if( PRINT_ARRAY ) PrintArray( tmp , N );
@@ -871 +871 @@
 #if( DEBUG_FFT1D & 1 )
 get_cycle( &cycle );
-printf("\n[fft] %s : thread %x exit barrier after first transpose / cycle %d\n",
+printf("\n[fft] %s : thread %d exit barrier after first transpose / cycle %d\n",
 __FUNCTION__, MyNum, (unsigned int)cycle );
 #endif
@@ -884 +884 @@
 
 #if( DEBUG_FFT1D & 1 )
-printf("\n[fft] %s : thread %x after first twiddle\n", __FUNCTION__, MyNum);
+printf("\n[fft] %s : thread %d after first twiddle\n", __FUNCTION__, MyNum);
 if( PRINT_ARRAY ) PrintArray( tmp , N );
 #endif
@@ -894 +894 @@
 
 #if( DEBUG_FFT1D & 1 )
-printf("\n[fft] %s : thread %x exit barrier after first twiddle\n", __FUNCTION__, MyNum);
+printf("\n[fft] %s : thread %d exit barrier after first twiddle\n", __FUNCTION__, MyNum);
 #endif
 
@@ -903 +903 @@
 
 #if( DEBUG_FFT1D & 1 )
-printf("\n[fft] %s : thread %x after second transpose\n", __FUNCTION__, MyNum);
+printf("\n[fft] %s : thread %d after second transpose\n", __FUNCTION__, MyNum);
 if( PRINT_ARRAY ) PrintArray( x , N );
 #endif
@@ -913 +913 @@
 
 #if( DEBUG_FFT1D & 1 )
-printf("\n[fft] %s : thread %x exit barrier after second transpose\n", __FUNCTION__, MyNum);
+printf("\n[fft] %s : thread %d exit barrier after second transpose\n", __FUNCTION__, MyNum);
 #endif
 
@@ -926 +926 @@
 
 #if( DEBUG_FFT1D & 1 )
-printf("\n[fft] %s : thread %x after FFT on rows\n", __FUNCTION__, MyNum);
+printf("\n[fft] %s : thread %d after FFT on rows\n", __FUNCTION__, MyNum);
 if( PRINT_ARRAY ) PrintArray( x , N );
 #endif
@@ -936 +936 @@
 
 #if( DEBUG_FFT1D & 1 )
-printf("\n[fft] %s : thread %x exit barrier after FFT on rows\n", __FUNCTION__, MyNum);
+printf("\n[fft] %s : thread %d exit barrier after FFT on rows\n", __FUNCTION__, MyNum);
 #endif
     sync_time[MyNum] += (long)(barrier_stop - barrier_start);
@@ -954 +954 @@
 
 #if( DEBUG_FFT1D & 1 )
-printf("\n[fft] %s : thread %x exit barrier after third transpose\n", __FUNCTION__, MyNum);
+printf("\n[fft] %s : thread %d exit barrier after third transpose\n", __FUNCTION__, MyNum);
 #endif
 
@@ -964 +964 @@
 
 #if DEBUG_FFT1D
-printf("\n[fft] %s : thread %x completed\n", __FUNCTION__, MyNum);
+printf("\n[fft] %s : thread %d completed\n", __FUNCTION__, MyNum);
 if( PRINT_ARRAY ) PrintArray( x , N );
 #endif