Changeset 459 for trunk/user/sort

Timestamp:

Aug 13, 2018, 1:43:20 PM (6 years ago)

Author:

alain

Message:

Introduce the math library, to support the floating point
data used by the multi-thread fft application.
Fix several bugs regarding the FPU context save/restore.
Introduce support for the %f format in printf.

Location:

trunk/user/sort

Files:

• Makefile (modified) (2 diffs)
• sort.c (modified) (4 diffs)

trunk/user/sort/Makefile

@@ -1 +1 @@
 ############################################################################
-# Makefile for the ALMOS-MKH "sort" application
+# Makefile for the "sort" application running on ALMOS-MKH
 ############################################################################
 
@@ -15 +15 @@
            -I$(LIBPTHREAD_INCLUDE)  \
            -I$(LIBALMOSMKH_INCLUDE) \
-           -I$(SHARED_INCLUDE)
+           -I$(SHARED_INCLUDE)      \
+           -I$(HAL_INCLUDE)
 
 compile: dirs build/sort.elf
 
 build/sort.elf : $(OBJS) sort.ld
-        $(LD) -o $@ -T sort.ld $(OBJS) -L$(LIBC) -L$(LIBPTHREAD) -L$(LIBALMOSMKH) -lc -lpthread -lalmosmkh -lpthread -lc
+        $(LD) -o $@ -T sort.ld $(OBJS) -L$(LIBC) -L$(LIBPTHREAD) -L$(LIBALMOSMKH) \
+        -lc -lpthread -lalmosmkh -lpthread -lc
         $(DU) -D $@ > $@.txt
 

trunk/user/sort/sort.c

@@ -26 +26 @@
 #include <pthread.h>
 #include <almosmkh.h>
+#include <hal_macros.h>
 
 #define ARRAY_LENGTH        0x400    // 1024 values
@@ -33 +34 @@
 #define DISPLAY_ARRAY       0
 #define INTERACTIVE_MODE    0
-
-///////////////////////////////////////////////////////
-// macros for fixed format cxy <=> (x,y) translation
-// TODO these macros are only for TSAR architecture... 
-///////////////////////////////////////////////////////
-
-#define CXY_FROM_XY( x , y )  ((x<<4) + y)
-
-#define X_FROM_CXY( cxy )     ((cxy>>4) & 0xF)
-
-#define Y_FROM_CXY( cxy )     (cxy & 0xF)
 
 /////////////////////////////////////////////////////////////
@@ -239 +229 @@
     // get core coordinates and user index for the main thread
     get_core( &main_cxy , & main_lid );
-    main_x   = X_FROM_CXY( main_cxy );
-    main_y   = Y_FROM_CXY( main_cxy );
+    main_x   = HAL_X_FROM_CXY( main_cxy );
+    main_y   = HAL_Y_FROM_CXY( main_cxy );
     main_uid = (((main_x * y_size) + main_y) * ncores) + main_lid; 
 
@@ -308 +298 @@
                 // set thread attributes for all threads
                 attr[thread_uid].attributes = PT_ATTR_CLUSTER_DEFINED | PT_ATTR_CORE_DEFINED;
-                attr[thread_uid].cxy        = CXY_FROM_XY( x , y );
+                attr[thread_uid].cxy        = HAL_CXY_FROM_XY( x , y );
                 attr[thread_uid].lid        = lid;