Mercurial > hg > Game > Cerium

changeset 1892:a32179f5b743 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Gpu worked
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Sat, 04 Jan 2014 19:24:57 +0900
parents e0d465efc57e
children b72db78232bc
files TaskManager/Fifo/FifoTaskManagerFactory.cc TaskManager/Fifo/FifoTaskManagerImplFactory.cc TaskManager/Makefile.def TaskManager/Makefile.gpu
diffstat 4 files changed, 14 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/TaskManager/Fifo/FifoTaskManagerFactory.cc	Sat Jan 04 19:24:57 2014 +0900
@@ -0,0 +1,9 @@
+#include "FifoTaskManagerImpl.h"
+
+TaskManagerImpl*
+create_impl(int num, int gpu, int useRefDma)
+{
+	num = 0;
+        return new FifoTaskManagerImpl(num);
+}
+
--- a/TaskManager/Fifo/FifoTaskManagerImplFactory.cc	Sat Jan 04 19:10:32 2014 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-#include "FifoTaskManagerImpl.h"
-
-TaskManagerImpl*
-create_impl(int num, int gpu, int useRefDma)
-{
-	num = 0;
-        return new FifoTaskManagerImpl(num);
-}
-
--- a/TaskManager/Makefile.def	Sat Jan 04 19:10:32 2014 +0900
+++ b/TaskManager/Makefile.def	Sat Jan 04 19:24:57 2014 +0900
@@ -21,19 +21,19 @@
 
 IMPL_FIFO_DIR  = Fifo
 IMPL_FIFO_SRCS = $(wildcard $(IMPL_FIFO_DIR)/*.cc)
-IMPL_FIFO_OBJS = $(IMPL_FIFO_SRCS:.cc=.o)
+IMPL_FIFO_OBJS = $(filter-out $(IMPL_FIFO_DIR)/FifoTaskManagerFactory.o,$(IMPL_FIFO_SRCS:.cc=.o))
 
 IMPL_CELL_DIR  = Cell
 IMPL_CELL_SRCS = $(IMPL_FIFO_SRCS) $(wildcard $(IMPL_CELL_DIR)/*.cc)
-IMPL_CELL_OBJS = $(IMPL_CELL_SRCS:.cc=.o)
+IMPL_CELL_OBJS = $(filter-out $(IMPL_CELL_DIR)/CellTaskManagerFactory.o,$(IMPL_CELL_SRCS:.cc=.o))
 
 IMPL_GPU_DIR  = Gpu
 IMPL_GPU_SRCS = $(wildcard $(IMPL_GPU_DIR)/*.cc)
-IMPL_GPU_OBJS = $(IMPL_GPU_SRCS:.cc=.o)
+IMPL_GPU_OBJS = $(filter-out $(IMPL_GPU_DIR)/GpuTaskManagerFactory.o,$(IMPL_GPU_SRCS:.cc=.o))
 
 IMPL_MANYCORE_DIR  = ManyCore
 IMPL_MANYCORE_SRCS = $(wildcard $(IMPL_MANYCORE_DIR)/*.cc)
-IMPL_MANYCORE_OBJS = $(IMPL_MANYCORE_SRCS:.cc=.o)
+IMPL_MANYCORE_OBJS = $(filter-out $(IMPL_MANYCORE_DIR)/ManyCoreTaskManagerFactory.o,$(IMPL_MANYCORE_SRCS:.cc=.o))
 
 ABIBIT = 64
 
--- a/TaskManager/Makefile.gpu	Sat Jan 04 19:10:32 2014 +0900
+++ b/TaskManager/Makefile.gpu	Sat Jan 04 19:24:57 2014 +0900
@@ -19,7 +19,7 @@
 
 ALL_OBJS = $(KERN_MAIN_OBJS) $(KERN_PPE_OBJS) $(KERN_SCHED_OBJS) \
 	$(KERN_SYSTASK_OBJS) $(IMPL_FIFO_OBJS) $(KERN_MEM_OBJS) \
-	$(IMPL_GPU_OBJS) Cell/CellTaskManagerImpl.o  
+	$(IMPL_MANYCORE_OBJS) $(IMPL_GPU_OBJS) Cell/spe/SpeTaskManagerImpl.o Cell/CellTaskManagerImpl.o Gpu/GpuTaskManagerFactory.o
 
 Makefile.dep: 
 	make -f Makefile.gpu depend