Mercurial > hg > Game > Cerium

changeset 1152:df293d433633 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
measure
author yutaka@localhost.localdomain
date Fri, 11 Mar 2011 02:24:01 +0900
parents 6b3eb488614b
children 16c795222988 1ede991d6da3
files Renderer/Engine/Makefile.def Renderer/Engine/viewer.cc TaskManager/Makefile.def TaskManager/kernel/ppe/TaskManagerImpl.cc TaskManager/kernel/schedule/Scheduler.cc
diffstat 5 files changed, 19 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/Renderer/Engine/Makefile.def	Thu Mar 03 19:58:22 2011 +0900
+++ b/Renderer/Engine/Makefile.def	Fri Mar 11 02:24:01 2011 +0900
@@ -5,7 +5,7 @@
 ABIBIT = 64 
 ABI = -m$(ABIBIT)
 CC      = g++
-OPT	=  -O9 -g 
+OPT	=  -O9 -g #-DUSE_TASKARRAY  #-DUSE_PIPELINE #
 
 CFLAGS  = -Wall $(ABI) $(OPT)  #  -DDEBUG
 
--- a/Renderer/Engine/viewer.cc	Thu Mar 03 19:58:22 2011 +0900
+++ b/Renderer/Engine/viewer.cc	Fri Mar 11 02:24:01 2011 +0900
@@ -394,7 +394,7 @@
     task_next->spawn(); // draw_task
 
 }
-
+     
 
 SchedDefineTask1(DRAW_TASK, draw_task);
 
@@ -596,7 +596,7 @@
         int rangey = (starty + split_screen_h - 1 > this->height)
             ? this->height - starty + 1 : split_screen_h;
 
-#if 1
+#ifdef USE_TASKARRAY
 
 	// mem_flag は spe 側で黒い部分を 0 で埋めるフラグ
 	if(spack->info.size > 0 || mem_flag == 1) {
@@ -637,7 +637,9 @@
 	  task_draw_array->spawn_task_array(task_draw->next());
 	  task_draw_array->set_cpu(SPE_ANY);
 	  //task_draw_array->wait_for(data_update_wait);
-	  //task_next->wait_for(task_draw_array);
+#ifndef USE_PIPELINE
+	  task_next->wait_for(task_draw_array);
+#endif
 	  task_draw_array->spawn();
 
 	  
@@ -685,7 +687,9 @@
 	}
 
 	    task_draw->set_cpu(SPE_ANY);
+#ifndef USE_PIPELINE
             task_next->wait_for(task_draw);
+#endif
             task_draw->spawn();
 
             startx += split_screen_w;
--- a/TaskManager/Makefile.def	Thu Mar 03 19:58:22 2011 +0900
+++ b/TaskManager/Makefile.def	Fri Mar 11 02:24:01 2011 +0900
@@ -29,8 +29,9 @@
 
 ABIBIT = 64
 
-OPT = -g  -DMAIL_QUEUE
-# -DEARLY_TOUCH
+OPT = -O9 #-DUSE_CACHE #-DTASK_LIST_MAIL #-DEARLY_TOUCH #-DMAIL_QUEUE
+# 
+
 # -g -DTASK_LIST_MAIL -O9
 
 CC     = g++   
--- a/TaskManager/kernel/ppe/TaskManagerImpl.cc	Thu Mar 03 19:58:22 2011 +0900
+++ b/TaskManager/kernel/ppe/TaskManagerImpl.cc	Fri Mar 11 02:24:01 2011 +0900
@@ -68,7 +68,7 @@
 #ifdef EARLY_TOUCH
         if (rbuf) {
 	    if ((unsigned long)rbuf&0xf) {
-	      this->printf("Data is not aligned. command = %d, addr = 0x%lx, size = %ld\n",
+	      printf("Data is not aligned. command = %d, addr = 0x%lx, size = %ld\n",
 		     cmd, (unsigned long)rbuf, r_size);
 	    }
 	    char *p = (char *)rbuf; char b = *p;
@@ -76,7 +76,7 @@
         }
         if (wbuf) {
 	    if ((unsigned long)wbuf&0xf) {
-	      this->printf("Data is not aligned. command = %d, addr = 0x%lx, size = %ld\n",
+	      printf("Data is not aligned. command = %d, addr = 0x%lx, size = %ld\n",
 		     cmd, (unsigned long)wbuf, w_size);
 	    }
 	    char *p = (char *)wbuf; char b = *p;
@@ -256,11 +256,13 @@
 check_wait(TaskManagerImpl *tm, QueueInfo<TaskQueue> *wait_i) {
     for(TaskQueue *t = wait_i->getFirst(); t; t = wait_i->getNext(t)) {
 	if (!tm->waitTaskQueue->find(t->task)) {
-	    this->printf("stray waiting task%d %lx\n",t->task->command, (long)t->task);
+	  //this->printf("stray waiting task%d %lx\n",t->task->command, (long)t->task);
+	  printf("stray waiting task%d %lx\n",t->task->command, (long)t->task);
 	} else if (tm->activeTaskQueue->find(t->task)) {
-	    this->printf(" active task%d in waiting queue %lx\n",t->task->command, (long)t->task);
+	  //this->printf(" active task%d in waiting queue %lx\n",t->task->command, (long)t->task);
+	  printf(" active task%d in waiting queue %lx\n",t->task->command, (long)t->task);
 	} else
-	    this->printf(".");
+	    printf(".");
     }
 }
 #endif
--- a/TaskManager/kernel/schedule/Scheduler.cc	Thu Mar 03 19:58:22 2011 +0900
+++ b/TaskManager/kernel/schedule/Scheduler.cc	Fri Mar 11 02:24:01 2011 +0900
@@ -415,7 +415,7 @@
     MemorySegment *s = hash->get(addr);
     
 
-#if 1
+#ifdef USE_CACHE
     if (s) {
 
       hash_hit_count += 1;