Changeset 824 for soft

Timestamp:

Nov 26, 2016, 7:33:20 PM (8 years ago)

Author:

alain

Message:

bloup

Location:

soft/giet_vm/applications

Files:

• fft/fft.c (modified) (2 diffs)
• hello/Makefile (modified) (1 diff)
• hello/hello.ld (modified) (1 diff)
• raycast/main.c (deleted)
• raycast/raycast.c (modified) (2 diffs)
• raycast/raycast.py (modified) (2 diffs)
• transpose/Makefile (modified) (2 diffs)
• transpose/transpose.py (modified) (1 diff)

soft/giet_vm/applications/fft/fft.c

@@ -65 +65 @@
 // parameters
 
-#define DEFAULT_M               16
+#define DEFAULT_M               12
 #define VERBOSE                 0
 #define CHECK                   0
@@ -208 +208 @@
         {
             i         = x * y_size + y;
-            data[i]   = (double *)remote_malloc( data_size  , x , y ); 
-            trans[i]  = (double *)remote_malloc( data_size  , x , y ); 
-            bloup[i]  = (double *)remote_malloc( data_size  , x , y ); 
-            umain[i]  = (double *)remote_malloc( coefs_size , x , y ); 
-            twid[i]   = (double *)remote_malloc( data_size  , x , y ); 
+            data[i]   = (double *)remote_malloc( data_size  , 0 , 0 ); 
+            trans[i]  = (double *)remote_malloc( data_size  , 0 , 0 ); 
+            bloup[i]  = (double *)remote_malloc( data_size  , 0 , 0 ); 
+            umain[i]  = (double *)remote_malloc( coefs_size , 0 , 0 ); 
+            twid[i]   = (double *)remote_malloc( data_size  , 0 , 0 ); 
+//          data[i]   = (double *)remote_malloc( data_size  , x , y ); 
+//          trans[i]  = (double *)remote_malloc( data_size  , x , y ); 
+//          bloup[i]  = (double *)remote_malloc( data_size  , x , y ); 
+//          umain[i]  = (double *)remote_malloc( coefs_size , x , y ); 
+//          twid[i]   = (double *)remote_malloc( data_size  , x , y ); 
         }
     }

soft/giet_vm/applications/hello/Makefile

@@ -1 @@
-APP_NAME=hello
 
-USE+= stdio.o
+CC = mipsel-unknown-elf-gcc
+AS = mipsel-unknown-elf-as
+LD = mipsel-unknown-elf-ld
+DU = mipsel-unknown-elf-objdump
+AR = mipsel-unknown-elf-ar
 
-USES=$(patsubst %,$(BUILD_PATH)/$(LIB_NAME)/%,$(USE))
+APP_NAME = hello
 
-OBJS= main.o 
+LIBS = -L../../build/libs -luser
 
-all: $(APP_NAME).elf
+LIB_DEPS = ../../build/libs/libuser.a
 
-BIN_NAME_PATH=$(BUILD_PATH)$(APP_NAME).elf
+INCLUDES = -I. -I../.. -I../../giet_libs
 
-$(APP_NAME).elf: $(OBJS) $(APP_NAME).ld
-        $(LD) -o $(BIN_NAME_PATH) -T $(APP_NAME).ld $(OBJS) $(USES)
-        $(DU) -D $(BIN_NAME_PATH) > $@.txt
+OBJS= hello.o 
+
+appli.elf: $(OBJS) $(APP_NAME).ld $(LIBS_DEPS) $(APP_NAME).py
+        $(LD) -o $@ -T $(APP_NAME).ld $(OBJS) $(LIBS)
+        $(DU) -D $@ > $@.txt
 
 %.o: %.c 
-        $(CC)  $(INCLUDE) $(CFLAGS) $($*.o_CFLAGS) -c -o  $@ $<
-        $(DU) -D  $@ >  $@.txt
-
+        $(CC)  $(INCLUDES) $(CFLAGS) -c -o  $@ $<
 
 clean:
-        rm -f *.o *.elf *.txt core *~ 2>$(TRASH)
-        rm $(BIN_NAME_PATH) 2>$(TRASH)
+        rm -f *.o *.elf *.txt core *~

soft/giet_vm/applications/hello/hello.ld

@@ -3 +3 @@
 *****************************************************************************/
 
-seg_code_base      = 0x00400000;
-seg_data_base      = 0x00500000;        
+seg_code_base      = 0x10000000;
+seg_data_base      = 0x20000000;        
 
 /***************************************************************************

soft/giet_vm/applications/raycast/raycast.c

@@ -84 +84 @@
 
     // Allocate buffer and status for CMA
-    buf = malloc(FBUF_X_SIZE * FBUF_Y_SIZE);
+    buf = malloc(fbuf_x_size * fbuf_x_size);
     sts = malloc(64);
 
@@ -141 +141 @@
 
         // Wait last slice completion
-        while (slice_count < FBUF_X_SIZE)  giet_tty_printf(" ");
+        while (slice_count < fbuf_x_size)  giet_tty_printf(" ");
 
         // display image

soft/giet_vm/applications/raycast/raycast.py

@@ -34 +34 @@
 
     # define vsegs base & size
-    code_base  = 0x10000000
-    code_size  = 0x00010000     # 64 Kbytes 
+    code_base  = 0x10000000     # replicated in all clusters
+    code_size  = 0x00010000     # 64 Kbytes per cluster
     
-    data_base  = 0x20000000
-    data_size  = 0x00040000     # 256 Kbytes 
+    data_base  = 0x20000000     # non replicated
+    data_size  = 0x00040000     # 256 Kbytes in cluster 0
 
-    stack_base = 0x40000000 
-    stack_size = 0x00200000     # 2 Mbytes 
+    stack_base = 0x40000000     # distributed in all clusters
+    stack_size = 0x00010000     # 64 Kbytes per proc
 
-    heap_base  = 0x60000000 
-    heap_size  = 0x00400000     # 4 Mbytes
+    heap_base  = 0x60000000     # distributed in all clusters
+    heap_size  = 0x00400000     # 4 Mbytes per cluster
 
     # create vspace
@@ -73 +73 @@
                 for p in xrange( nprocs ):
                     proc_id = (((x * y_size) + y) * nprocs) + p
-                    size    = (stack_size / nprocs) & 0xFFFFF000
+                    size    = stack_size
                     base    = stack_base + (proc_id * size)
                     mapping.addVseg( vspace, 'raycast_stack_%d_%d_%d' % (x,y,p), 
                                      base, size, 'C_WU', vtype = 'BUFFER', 
                                      x = x , y = y , pseg = 'RAM',
-                                     local = True, big = True )   
+                                     local = True, big = False )   
 
     # heap vsegs : shared (one per cluster) 

soft/giet_vm/applications/transpose/Makefile

@@ -8 +8 @@
 APP_NAME = transpose
 
-OBJS= transpose.o 
+OBJS = transpose.o 
 
 LIBS= -L../../build/libs -luser
@@ -16 +16 @@
 LIB_DEPS = ../../build/libs/libuser.a
 
-appli.elf: $(OBJS) $(APP_NAME).ld $(LIBS_DEPS) 
+appli.elf: $(OBJS) $(APP_NAME).ld $(LIBS_DEPS) $(APP_NAME).py 
         $(LD) -o $@ -T $(APP_NAME).ld $(OBJS) $(LIBS)
         $(DU) -D $@ > $@.txt

soft/giet_vm/applications/transpose/transpose.py

@@ -15 +15 @@
 #    - The code vsegs are replicated on all clusters containing processors.
 #    - There is one heap vseg per cluster containing processors.
-#    - The stacks vsegs are distibuted on all clusters containing processors.
+#    - The stacks vsegs are distributed on all clusters containing processors.
 #  This mapping uses 5 platform parameters, (obtained from the "mapping" argument)
 #    - x_size    : number of clusters in a row