Changeset 627 for trunk/user/sort

Timestamp:

May 1, 2019, 5:13:47 PM (6 years ago)

Author:

alain

Message:

Replace the queuelock protectingthe FAT by a rwlock in the FATFS.

File:

• trunk/user/sort/sort.c (modified) (12 diffs)

trunk/user/sort/sort.c

@@ -29 +29 @@
 #include <hal_macros.h>
 
-#define ARRAY_LENGTH        1024       // number of items
+#define ARRAY_LENGTH        4096       // number of items
 #define MAX_THREADS         1024       // 16 * 16 * 4
 
 #define USE_DQT_BARRIER     1          // use DQT barrier if non zero
 #define DISPLAY_ARRAY       0          // display items values before and after
-#define VERBOSE             0          // for debug
-#define INTERACTIVE_MODE    0          // for debug
+#define DEBUG_MAIN          1          // trace main function
+#define DEBUG_SORT          0          // trace sort function
+#define INTERACTIVE_MODE    0          // activate idbg() during instrumentation
 #define CHECK_RESULT        0          // for debug
 #define INSTRUMENTATION     1          // register computation times on file
@@ -163 +164 @@
     pthread_barrier_wait( &barrier ); 
 
-#if VERBOSE
+#if DEBUG_SORT
+if( thread_uid == 0 )
 printf("\n[sort] thread[%d] exit barrier 0\n", thread_uid );
 #endif
@@ -170 +172 @@
     unsigned int  stages     = __builtin_ctz( threads ) + 1;
 
-#if VERBOSE
+#if DEBUG_SORT
+if( thread_uid == 0 )
 printf("\n[sort] thread[%d] : start\n", thread_uid );
 #endif
@@ -176 +179 @@
     bubbleSort( array0, items, items * thread_uid );
 
-#if VERBOSE
+#if DEBUG_SORT
+if( thread_uid == 0 )
 printf("\n[sort] thread[%d] : stage 0 completed\n", thread_uid );
 #endif
@@ -183 +187 @@
     pthread_barrier_wait( &barrier ); 
 
-#if VERBOSE
+#if DEBUG_SORT
+if( thread_uid == 0 )
 printf("\n[sort] thread[%d] exit barrier 0\n", thread_uid );
 #endif
@@ -213 +218 @@
         {
 
-#if VERBOSE
+#if DEBUG_SORT
+if( thread_uid == 0 )
 printf("\n[sort] thread[%d] : stage %d start\n", thread_uid , i );
 #endif
@@ -223 +229 @@
                    items * thread_uid );
 
-#if VERBOSE
+#if DEBUG_SORT
+if( thread_uid == 0 )
 printf("\n[sort] thread[%d] : stage %d completed\n", thread_uid , i );
 #endif
@@ -231 +238 @@
         pthread_barrier_wait( &barrier );
 
-#if VERBOSE
+#if DEBUG_SORT
+if( thread_uid == 0 )
 printf("\n[sort] thread[%d] exit barrier %d\n", thread_uid , i );
 #endif
@@ -328 +336 @@
     }
 
-#if VERBOSE
+#if DEBUG_MAIN
 printf("\n[sort] main completes barrier init\n");
 #endif
@@ -338 +346 @@
     }
 
-#if VERBOSE
+#if DEBUG_MAIN
 printf("\n[sort] main completes array init\n");
 #endif
@@ -376 +384 @@
                     else
                     {
-#if VERBOSE
+#if DEBUG_MAIN
 printf("\n[sort] main created thread %x \n", thread_uid );
 #endif
@@ -388 +396 @@
     get_cycle( &seq_end_cycle );
 
-#if VERBOSE
+#if DEBUG_MAIN
 printf("\n[sort] main completes sequencial init at cycle %d\n",
 (unsigned int)seq_end_cycle );