changeset 1770:bb7f5ae152c7 draft

minor fix
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Sat, 23 Nov 2013 03:05:43 +0900
parents 4baed436fc58
children 8bf0a27f5dff
files example/Bulk/Makefile.def example/Bulk/Makefile.macosx example/Bulk/main.cc
diffstat 3 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/example/Bulk/Makefile.def	Sat Nov 23 02:15:22 2013 +0900
+++ b/example/Bulk/Makefile.def	Sat Nov 23 03:05:43 2013 +0900
@@ -7,8 +7,8 @@
 # ex  linux/ps3
 CERIUM = ../../../Cerium
 
-CC      = g++
-OPT = -g # -O9
+CC      = clang++
+OPT = -g -O0 # -O9
 CFLAGS  =  -Wall $(OPT)  
 
 ABIBIT = 64
--- a/example/Bulk/Makefile.macosx	Sat Nov 23 02:15:22 2013 +0900
+++ b/example/Bulk/Makefile.macosx	Sat Nov 23 03:05:43 2013 +0900
@@ -13,8 +13,8 @@
 
 #LIBS += -lFifoManager `sdl-config --libs`
 CFLAGS += `sdl-config --cflags` `xml2-config --cflags`
-LIBS +=  -lFifoManager
-LIBS += `sdl-config --libs` `xml2-config --libs` -lSDL_image -Wl,-framework,OpenGL 
+LIBS +=  -lGpuManager
+LIBS += `sdl-config --libs` `xml2-config --libs` -lSDL_image -Wl,-framework,OpenGL -framework opencl
 
 CC += -m$(ABIBIT)
 
@@ -26,10 +26,10 @@
 all: $(TARGET)
 
 $(TARGET): $(OBJS) $(TASK_OBJS)
-	$(CC) -o $@ $(OBJS) $(TASK_OBJS) $(LIBS)
+	$(CC) $(OPT) -o $@ $(OBJS) $(TASK_OBJS) $(LIBS)
 
 link:
-	$(CC) -o $(TARGET) $(OBJS) $(TASK_OBJS) $(LIBS)
+	$(CC) $(OPT)  -o $(TARGET) $(OBJS) $(TASK_OBJS) $(LIBS)
 
 debug: $(TARGET)
 	sudo gdb ./$(TARGET) 
--- a/example/Bulk/main.cc	Sat Nov 23 02:15:22 2013 +0900
+++ b/example/Bulk/main.cc	Sat Nov 23 03:05:43 2013 +0900
@@ -8,10 +8,10 @@
 
 extern void task_init(void);
 
-static int length = DATA_NUM;
+static long length = DATA_NUM;
 static int task = 3;
 static int task_array_num = 3;
-static int block_num = 3;
+static long block_num = 3;
 
 const char *usr_help_str = "Usage: ./twice [-length data_length] [-task_array_num task_num]\n\
   -task_array_num Number of data in a block (default 16)\n\
@@ -46,7 +46,7 @@
 static int
 init(int argc, char **argv)
 {
-    int block_size = 16;
+    long block_size = 16;
     for (int i = 1; argv[i]; ++i) {
         if (strcmp(argv[i], "-task") == 0) {
             task = atoi(argv[++i]);
@@ -101,7 +101,7 @@
     t = 0;
     for(int i = 0;i<task_array_num;i++) {
         t = twice_main->next_task_array(Twice, t);
-        int block_size = length/block_num;
+        long block_size = length/block_num;
         t->set_param(0, (memaddr)block_num);
 
 	for(int j = 0;j<block_num;j++) {