Changeset 626 for trunk/user/sort

Timestamp:

Apr 29, 2019, 7:25:09 PM (6 years ago)

Author:

alain

Message:

This version has been tested on the sort multithreaded application
for TSAR_IOB architectures ranging from 1 to 8 clusters.
It fixes three bigs bugs:
1) the dev_ioc device API has been modified: the dev_ioc_sync_read()
and dev_ioc_sync_write() function use now extended pointers on the
kernel buffer to access a mapper stored in any cluster.
2) the hal_uspace API has been modified: the hal_copy_to_uspace()
and hal_copy_from_uspace() functions use now a (cxy,ptr) couple
to identify the target buffer (equivalent to an extended pointer.
3) an implementation bug has been fixed in the assembly code contained
in the hal_copy_to_uspace() and hal_copy_from_uspace() functions.

File:

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

trunk/user/sort/sort.c

@@ -29 +29 @@
 #include <hal_macros.h>
 
-#define ARRAY_LENGTH        256        // number of items
+#define ARRAY_LENGTH        1024       // number of items
 #define MAX_THREADS         1024       // 16 * 16 * 4
 
@@ -38 +38 @@
 #define CHECK_RESULT        0          // for debug
 #define INSTRUMENTATION     1          // register computation times on file
+#define IDBG                0          // activate interactive debug in main
 
 /////////////////////////////////////////////////////////////
@@ -439 +440 @@
 #if INSTRUMENTATION
 
-    char   name[64];
-    char   path[128];
+    char               name[64];
+    char               path[128];
+    unsigned long long instru_cycle;
 
     // build a file name from n_items / n_clusters / n_cores
@@ -461 +463 @@
            name, sequencial, parallel );
 
+#if IDBG
+idbg();
+#endif
+
     // open file
+    get_cycle( &instru_cycle );
     FILE * stream = fopen( path , NULL );
+
     if( stream == NULL )
     {
-        printf("\n[sort error] cannot open instrumentation file <%s>\n", name );
+        printf("\n[sort error] cannot open instrumentation file <%s>\n", path );
         exit(0);
     }
 
-    printf("\n[sort] file %s successfully open\n", path);
+    printf("\n[sort] file <%s> open at cycle %d\n", path, (unsigned int)instru_cycle );
+
+#if IDBG
+idbg();
+#endif
 
     // register results to file
+    get_cycle( &instru_cycle );
     int ret = fprintf( stream , "\n----- %s -----\n"
                                 " - sequencial : %d cycles\n"
@@ -477 +490 @@
     if( ret < 0 )
     {
-        printf("\n[sort error] cannot write to instrumentation file <%s>\n", name );
+        printf("\n[sort error] cannot write to instrumentation file <%s>\n", path );
         exit(0);
     }
 
-    printf("\n[sort] file %s successfully written\n", path);
+    printf("\n[sort] file <%s> written at cycle %d\n", path, (unsigned int)instru_cycle );
+
+#if IDBG
+idbg();
+#endif
 
     // close instrumentation file
-
-    if( fclose( stream ) )
-    {
-        printf("\n[sort error] cannot close the file <%s>\n", name );
+    get_cycle( &instru_cycle );
+    ret = fclose( stream );
+
+    if( ret )
+    {
+        printf("\n[sort error] cannot close instrumentation file <%s>\n", path );
         exit(0);
     }
 
-    printf("\n[sort] file %s successfully closed\n", path);
+    printf("\n[sort] file <%s> closed at cycle %d\n", path, (unsigned int)instru_cycle );
 
 #endif