changeset 963:86e50572561c

SgChange
author tkaito
date Thu, 05 Aug 2010 22:47:38 +0900
parents 9f9b2bbc9a10
children cf64bc1b8062
files example/Pipeline/ChangeLog example/Pipeline/Func.h example/Pipeline/Makefile example/Pipeline/Makefile.cell example/Pipeline/Makefile.def example/Pipeline/Makefile.linux example/Pipeline/Makefile.macosx example/Pipeline/README example/Pipeline/main.cc example/Pipeline/ppe/Twice.cc example/Pipeline/ppe/Twice.h example/Pipeline/ppe/task_init.cc example/Pipeline/spe-main example/Pipeline/spe/Makefile example/Pipeline/spe/Twice.cc example/Pipeline/spe/Twice.h example/Pipeline/spe/spe-main.cc example/Pipeline/twice
diffstat 16 files changed, 487 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/example/Pipeline/ChangeLog	Thu Aug 05 22:47:38 2010 +0900
@@ -0,0 +1,6 @@
+2008-05-27  Wataru MIYAGUNI  <gongo@cr.ie.u-ryukyu.ac.jp>
+
+	* memo
+	Fifo バージョンでは確認しました。
+	Cell バージョンは、Cerium がまだ未実装なのでそれから
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/example/Pipeline/Func.h	Thu Aug 05 22:47:38 2010 +0900
@@ -0,0 +1,4 @@
+enum {
+#include "SysTasks.h"
+    Twice,
+};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/example/Pipeline/Makefile	Thu Aug 05 22:47:38 2010 +0900
@@ -0,0 +1,24 @@
+default: macosx
+
+macosx: FORCE
+	@echo "Make for Mac OS X"
+	@$(MAKE) -f Makefile.macosx
+
+fifo64: FORCE
+	@echo "Make for Mac OS X 64bit mode"
+	@$(MAKE) -f Makefile.macosx ABIBIT=64
+
+linux: FORCE
+	@echo "Make for Linux"
+	@$(MAKE) -f Makefile.linux
+
+cell: FORCE
+	@echo "Make for PS3 (Cell)"
+	@$(MAKE) -f Makefile.cell
+
+FORCE:
+
+clean:
+	@$(MAKE) -f Makefile.macosx clean
+	@$(MAKE) -f Makefile.linux clean
+	@$(MAKE) -f Makefile.cell clean
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/example/Pipeline/Makefile.cell	Thu Aug 05 22:47:38 2010 +0900
@@ -0,0 +1,42 @@
+include ./Makefile.def
+
+ABIBIT = 32
+
+SRCS_TMP = $(wildcard *.cc)
+SRCS_EXCLUDE =  # 除外するファイルを書く
+SRCS = $(filter-out $(SRCS_EXCLUDE),$(SRCS_TMP))
+OBJS = $(SRCS:.cc=.o)
+
+TASK_DIR  = ppe
+TASK_SRCS_TMP = $(wildcard $(TASK_DIR)/*.cc)
+TASK_SRCS_EXCLUDE = 
+TASK_SRCS = $(filter-out $(TASK_DIR)/$(TASK_SRCS_EXCLUDE),$(TASK_SRCS_TMP))
+TASK_OBJS = $(TASK_SRCS:.cc=.o)
+
+CFLAGS += -m$(ABIBIT)
+LIBS += -lCellManager -lspe2 -lpthread -Wl,--gc-sections 
+
+.SUFFIXES: .cc .o
+
+.cc.o:
+	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
+
+all: $(TARGET) speobject
+
+$(TARGET): $(OBJS) $(TASK_OBJS)
+	$(CC) -o $@ $(OBJS) $(TASK_OBJS) $(LIBS)
+
+speobject:
+	cd spe; $(MAKE) ABIBIT=$(ABIBIT)
+
+link:
+	$(CC) -m$(ABIBIT) -o $(TARGET) $(OBJS) $(TASK_OBJS) $(LIBS)
+
+debug: $(TARGET)
+	sudo ppu-gdb ./$(TARGET) 
+
+clean:
+	rm -f $(TARGET) $(OBJS) $(TASK_OBJS)
+	rm -f *~ \#*
+	rm -f ppe/*~ ppe/\#*
+	cd spe; $(MAKE) clean
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/example/Pipeline/Makefile.def	Thu Aug 05 22:47:38 2010 +0900
@@ -0,0 +1,15 @@
+TARGET = twice
+
+# include/library path
+
+# ex  linux/ps3
+CERIUM = ../../../Cerium
+
+
+OPT= -g
+
+CC      = g++
+CFLAGS  = -Wall $(OPT) 
+
+INCLUDE = -I${CERIUM}/include/TaskManager -I. -I..
+LIBS = -L${CERIUM}/TaskManager
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/example/Pipeline/Makefile.linux	Thu Aug 05 22:47:38 2010 +0900
@@ -0,0 +1,36 @@
+include ./Makefile.def
+
+SRCS_TMP = $(wildcard *.cc)
+SRCS_EXCLUDE =  # 除外するファイルを書く
+SRCS = $(filter-out $(SRCS_EXCLUDE),$(SRCS_TMP))
+OBJS = $(SRCS:.cc=.o)
+
+TASK_DIR  = ppe
+TASK_SRCS_TMP = $(wildcard $(TASK_DIR)/*.cc)
+TASK_SRCS_EXCLUDE = 
+TASK_SRCS = $(filter-out $(TASK_DIR)/$(TASK_SRCS_EXCLUDE),$(TASK_SRCS_TMP))
+TASK_OBJS = $(TASK_SRCS:.cc=.o)
+
+LIBS += -lFifoManager
+
+.SUFFIXES: .cc .o
+
+.cc.o:
+	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
+
+all: $(TARGET)
+
+$(TARGET): $(OBJS) $(TASK_OBJS)
+	$(CC) -o $@ $(OBJS) $(TASK_OBJS) $(LIBS)
+
+link:
+	$(CC) -o $(TARGET) $(OBJS) $(TASK_OBJS) $(LIBS)
+
+debug: $(TARGET)
+	sudo gdb ./$(TARGET) 
+
+clean:
+	rm -f $(TARGET) $(OBJS) $(TASK_OBJS)
+	rm -f *~ \#*
+	rm -f ppe/*~ ppe/\#*
+	rm -f spe/*~ spe/\#*
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/example/Pipeline/Makefile.macosx	Thu Aug 05 22:47:38 2010 +0900
@@ -0,0 +1,37 @@
+include ./Makefile.def
+
+SRCS_TMP = $(wildcard *.cc)
+SRCS_EXCLUDE =  # 除外するファイルを書く
+SRCS = $(filter-out $(SRCS_EXCLUDE),$(SRCS_TMP))
+OBJS = $(SRCS:.cc=.o)
+
+TASK_DIR  = ppe
+TASK_SRCS_TMP = $(wildcard $(TASK_DIR)/*.cc)
+TASK_SRCS_EXCLUDE = 
+TASK_SRCS = $(filter-out $(TASK_DIR)/$(TASK_SRCS_EXCLUDE),$(TASK_SRCS_TMP))
+TASK_OBJS = $(TASK_SRCS:.cc=.o)
+
+LIBS += -lFifoManager `sdl-config --libs`
+CC += -m32
+
+.SUFFIXES: .cc .o
+
+.cc.o:
+	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
+
+all: $(TARGET)
+
+$(TARGET): $(OBJS) $(TASK_OBJS)
+	$(CC) -o $@ $(OBJS) $(TASK_OBJS) $(LIBS) $(OPT)
+
+link:
+	$(CC) -o $(TARGET) $(OBJS) $(TASK_OBJS) $(LIBS)
+
+debug: $(TARGET)
+	sudo gdb ./$(TARGET) 
+
+clean:
+	rm -f $(TARGET) $(OBJS) $(TASK_OBJS)
+	rm -f *~ \#*
+	rm -f ppe/*~ ppe/\#*
+	rm -f spe/*~ spe/\#*
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/example/Pipeline/README	Thu Aug 05 22:47:38 2010 +0900
@@ -0,0 +1,87 @@
+/*
+ * $Id: README,v 1.5 2008/10/20 10:02:01 gongo Exp $
+ */
+
+- 网荀
+
+int 帥鴻(Twice) с荀膣2菴障
+
+PPE->SPE  DMA 荵∫ main.cc  twice_init 
+吾сc篆<帥鴻眼
+若帥鴻茯
+
+-------------------------------------
+PPE 若帥
+-------------------------------------
+
+void *get_input(void *p, int index) 篏帥
+
+p  rbuf ャ障篁腆阪с吾綽荀<
+index create task  add_inData 障
+
+add_inData(data1, size1);
+add_inData(data2, size2);
+
+ц菴違翫
+
+data1 = get_input(rbuf, 0);
+data2 = get_input(rbuf, 0);
+
+у障
+
+-------------------------------------
+PPE 吾若帥
+-------------------------------------
+
+void *get_output(void *p, int index) 篏帥
+
+p  wbuf, index  input сс
+get_output уcс若帥吾違
+帥鴻腟篋緇add_outData ф絎≪鴻吾莨若障障
+
+
+- 絎茵号
+
+./twice [-cpu spe_num] [-length data_length]
+
+  -cpu     篏睡 SPU 
+           // 篁障潟<激с潟с
+           // 綏紊с翫茲違 2 c
+           // ャ井潟障茯違(ry
+
+  -length  荀膣
+
+
+- 絎茵箴
+
+% ./twice
+before ---
+ 0  1  2  3  4  5  6  7  8  9 10 11 
+after ---
+ 0  2  4  6  8 10 12 14 16 18 20 22 
+
+% ./twice -length 20
+before ---
+ 0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 
+after ---
+ 0  2  4  6  8 10 12 14 16 18 20 22 24 26 28 30 32 34 36 38
+
+% ./twice -length 15
+before ---
+ 0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 
+zsh: bus error  ./twice -length 15
+
+筝翫PS3筝(SPE篏帥c翫)с bus error 冴障
+宴 length c若帥ゃ違
+4ゃ(int) x 15 = 60 ゃ с
+PPE <-> SPE с DMA 荵∫泣ゃ冴
+1,2,4,8ゃ,  16ゃ違羆冴障c障
+泣ゃ冴茯ゃ翫筝 bus error 冴障
+莨冴荅潟篁罕
+
+Game_project/ps3/docs  PDF 
+
+Fixstars 泣ゃ
+http://cell.fixstars.com/ps3linux/index.php/3.3DMA荵∫若帥羝<
+
+荀違障
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/example/Pipeline/main.cc	Thu Aug 05 22:47:38 2010 +0900
@@ -0,0 +1,127 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "TaskManager.h"
+#include "Func.h"
+
+#define DATA_NUM 12
+
+extern void task_init();
+
+static int task = 1;
+
+const char *usr_help_str = "Usage: ./twice [-length data_length] [-count task_num]\n\
+  -length  Number of data (default DATA_NUM (Func.h))\n\
+  -count   Number of task (default 1)\n";
+
+
+void
+print_data(int *data, int size, const char *title)
+{
+    printf("%s ---\n", title);
+    for (int i = 0; i < size; i++) {
+	printf("%2d ", data[i]);
+    }
+    printf("\n");
+}
+
+/**
+ * 帥鴻腟篋緇 data1, data2 腆肴
+ */
+void
+twice_result(SchedTask *s, void *a, void *b)
+{
+    int* data = (int*)a;
+    int length = (long)b;
+    print_data(data, length, "after");
+    free(data);
+}
+
+int length = DATA_NUM;
+
+int
+init(int argc, char **argv)
+{
+    for (int i = 1; argv[i]; ++i) {
+        if (strcmp(argv[i], "-length") == 0) {
+            length = atoi(argv[++i]);
+        } else if (strcmp(argv[i], "-count") == 0) {
+            task = atoi(argv[++i]);
+        }
+    }
+
+    return 0;
+}
+int
+loop(SchedTask *m, void *a, void *b)
+{
+	buf = 1-buf;
+
+    HTask *next = m->create_task(Dummy,0,0,0,0);
+    next->wait_for(allexecute);
+    next->wait_for(rendering);	
+    next->set_post(loop, (void*)out, (void*)length);
+
+    // add Active Queue
+    next->spawn();    
+    	HTask *allexecute = m->create_task(Allexecute,(memaddr)data[buf],sizeof(int)*length, (memaddr)out[buf], sizeof(int)*length);
+    allexecute->set_param(0,(memaddr)next);
+
+    // add Active Queue
+    allexecute->spawn();    
+
+    HTask *rendering = m->create_task(Rendering,(memaddr)data[1-buf],sizeof(int)*length, (memaddr)out[1-buf], sizeof(int)*length);
+    
+    rendering->set_param(0,(memaddr)next); //renderingtask絲障wait_for 綽荀
+
+    // add Active Queue
+    rendering->spawn();    
+
+}
+
+void
+twice_init(TaskManager *manager)
+{
+    HTask *twice;
+
+    int *data = (int*)manager->allocate(sizeof(int)*length);
+    int *out  = (int*)manager->allocate(sizeof(int)*length);
+
+    for (int i = 0; i < length; i++) {
+	data[i] = i;
+    }
+
+    print_data(data, length, "before");
+
+    /**
+     * Create Task
+     *   create_task(Task ID);
+     */ 
+    twice = manager->create_task(Twice,(memaddr)data,sizeof(int)*length, (memaddr)out, sizeof(int)*length);
+    twice->set_cpu(SPE_ANY);
+    
+    twice->set_post(twice_result, (void*)out, (void*)length);
+
+    // add Active Queue
+    twice->spawn();    
+}
+
+int
+TMmain(TaskManager *manager,int argc, char *argv[])
+{
+    if (init(argc, argv) < 0) {
+	return -1;
+    }
+
+    // Task Register
+    //   ppe/task_init.cc
+    task_init();
+
+    for (int i = 0; i < task; ++i) {
+	twice_init(manager);
+    }
+
+    return 0;
+}
+
+/* end */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/example/Pipeline/ppe/Twice.cc	Thu Aug 05 22:47:38 2010 +0900
@@ -0,0 +1,26 @@
+#include <stdio.h>
+#include "SchedTask.h"
+#include "Twice.h"
+#include "Func.h"
+
+/* 綽 */
+SchedDefineTask(Twice);
+
+static int
+run(SchedTask *s,void *rbuf, void *wbuf)
+{
+    int *i_data;
+    int *o_data;
+    long length;
+
+    i_data = (int*)rbuf;
+    o_data = (int*)wbuf;
+    length = s->read_size()/sizeof(int);
+    
+    for (int i = 0; i < length; i++) {
+	o_data[i] = i_data[i] * 2;
+    }
+    s->printf("PPE %d end\n",s->get_cpuid());
+    
+    return 0;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/example/Pipeline/ppe/task_init.cc	Thu Aug 05 22:47:38 2010 +0900
@@ -0,0 +1,17 @@
+#include "Func.h"
+#include "Scheduler.h"
+
+/* 綽篏臀吾 */
+SchedExternTask(Twice);
+
+/**
+ * ∽違 ../spe/spe-main c
+ * у若喝冴違∽違
+ * 絅純∽医сk (SchedRegisterTask 綽)
+ */
+
+void
+task_init(void)
+{
+  SchedRegister(Twice);
+}
Binary file example/Pipeline/spe-main has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/example/Pipeline/spe/Makefile	Thu Aug 05 22:47:38 2010 +0900
@@ -0,0 +1,26 @@
+include ../Makefile.def
+
+TARGET = ../spe-main
+
+SRCS_TMP = $(wildcard *.cc)
+SRCS = $(filter-out $(SRCS_EXCLUDE),$(SRCS_TMP))
+OBJS = $(SRCS:.cc=.o)
+
+CC      = spu-g++ -DABIBIT=$(ABIBIT)  $(OPT)
+CFLAGS  = -g -Wall -fno-exceptions -fno-rtti #-DDEBUG
+INCLUDE = -I../${CERIUM}/include/TaskManager -I. -I..
+LIBS = -L../${CERIUM}/TaskManager -lspemanager
+
+.SUFFIXES: .cc .o
+
+.cc.o:
+	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
+
+all: $(TARGET)
+
+$(TARGET): $(OBJS)
+	$(CC) -o $@ $(OBJS) $(TASK_OBJS) $(LIBS) $(OPT)
+
+clean:
+	rm -f $(TARGET) $(OBJS)
+	rm -f *~ \#*
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/example/Pipeline/spe/Twice.cc	Thu Aug 05 22:47:38 2010 +0900
@@ -0,0 +1,26 @@
+#include <stdio.h>
+#include "SchedTask.h"
+#include "Twice.h"
+#include "Func.h"
+
+/* 綽 */
+SchedDefineTask(Twice);
+
+static int
+run(SchedTask *s,void *rbuf, void *wbuf)
+{
+    int *i_data;
+    int *o_data;
+    long length;
+
+    i_data = (int*)rbuf;
+    o_data = (int*)wbuf;
+    length = s->read_size()/sizeof(int);
+    
+    for (int i = 0; i < length; i++) {
+	o_data[i] = i_data[i] * 2;
+    }
+    s->printf("SPE %d end\n",s->get_cpuid());
+    
+    return 0;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/example/Pipeline/spe/spe-main.cc	Thu Aug 05 22:47:38 2010 +0900
@@ -0,0 +1,14 @@
+#include "Func.h"
+#include "SchedTask.h"
+
+SchedExternTask(Twice);
+
+/**
+ * ∽違 SpeScheduler 若違
+ * 綽∽医с蕁障
+ */
+void
+task_init(Scheduler *s)
+{
+    SchedRegister(Twice);
+}
Binary file example/Pipeline/twice has changed