diff example/word_count/spe/Exec.cc.vector @ 946:a8b6ee80c108

unify word count examples....
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Sun, 01 Aug 2010 21:05:35 +0900
parents 4615489c5faa
children
line wrap: on
line diff
--- a/example/word_count/spe/Exec.cc.vector	Sun Aug 01 19:29:27 2010 +0900
+++ b/example/word_count/spe/Exec.cc.vector	Sun Aug 01 21:05:35 2010 +0900
@@ -6,54 +6,65 @@
 /* これは必須 */
 SchedDefineTask(Exec);
 
-// typedef char *cvector __attribute__ ((vector_size (16)));
-typedef char *cvector;
+typedef char *cvector __attribute__ ((vector_size (16)));
+//   vectorize だと結果がよろしくない...
+//
+// typedef char *cvector;
 
 static int
 run(SchedTask *s, void *rbuf, void *wbuf)
 {
-    cvector i_data ;
-    i_data = (cvector)s->get_input(rbuf, 0);
+#ifdef SIMPLE_TASK
+    cvector i_data = (cvector)rbuf;
+    char* i_data0 = (char*)rbuf;
+    unsigned long long *o_data = (unsigned long long*)wbuf;
+    unsigned long long *head_tail_flag = o_data +2;
+    int length = s->read_size();
+#else
+    cvector i_data = (cvector)s->get_input(rbuf, 0);
+    char* i_data0 = (char*)s->get_input(rbuf, 0);
     unsigned long long *o_data = (unsigned long long*)s->get_output(wbuf, 0);
+    /*担当範囲の先頭、末尾が「改行、スペース」か、「それ以外の文字」かのフラグ*/
+    unsigned long long  *head_tail_flag = (unsigned long long*)s->get_output(wbuf,1);
     int length = (long)s->get_param(0);
-    int word_flag = 1-(long)s->get_param(1);
+#endif
+
+    static const char spaces[] = {0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20} ;
+    cvector const space = (cvector)spaces;
+    static const char newlines[] = {0x0a,0x0a,0x0a,0x0a,0x0a,0x0a,0x0a,0x0a,0x0a,0x0a,0x0a,0x0a,0x0a,0x0a,0x0a,0x0a};
+    cvector const newline = (cvector)newlines;
+
+    int word_flag = 0;
     int word_num = 0;
     int line_num = 0;
-    int i;
-    static char spaces[] = {0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20};
-    cvector space = (cvector)spaces;
-    static char  newlines []= {0x0a,0x0a,0x0a,0x0a,0x0a,0x0a,0x0a,0x0a,0x0a,0x0a,0x0a,0x0a,0x0a,0x0a,0x0a,0x0a};
-    cvector newline = (cvector)newlines;
-
-    // word_flag ==1 not in a word 
-    word_num -= word_flag;
+    int i = 0;
+    
+    /*文字なら1,スペースか改行なら0*/
+    char top = i_data0[0];
+    head_tail_flag[0] = ((top != 0x20) && (top != 0x0a));
+    word_num -= 1-head_tail_flag[0];
 
     for (; i < length; i++) {
-
-	    //s->printf("[SPE%d]%c",id,i_data[i]);
-
-
 	if (i_data[i] == space[i%16]) {
 	    //s->printf("スペース\n");
 	    word_flag = 1;
-	}
-
-	else if (i_data[i] == newline[i%16]) {
+	} else if (i_data[i] == newline[i%16]) {
 	    //s->printf("改行\n");
 	    line_num += 1;
 	    word_flag = 1;
-	}
-
-	else {
+	} else {
 	    word_num += word_flag;
 	    word_flag = 0;
 	}
-
     }
 
     word_num += word_flag;
+    /*文字なら1,スペースか改行なら0*/
+    //printf("last word %c",i_data[i-1]);
+    char end = i_data0[i-1];
+    head_tail_flag[1] = ((end != 0x20) && (end != 0x0a));
 
-    //s->printf("%d %d\n",word_num,line_num);
+    // s->printf("SPU word %d line %d\n",word_num,line_num);
 
     o_data[0] = (unsigned long long)word_num;
     o_data[1] = (unsigned long long)line_num;