Changeset 34db7fa in mainline for kernel/test/fpu/mips2.c

Timestamp:

2006-12-12T12:32:02Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

96348adc

Parents:

df496c5

Message:

cleanup kernel tests infrastructure

File:

• kernel/test/fpu/mips2.c (modified) (5 diffs)

kernel/test/fpu/mips2.c

@@ -27 +27 @@
  */
 
+#ifdef mips32
+
 #include <print.h>
 #include <debug.h>
@@ -38 +40 @@
 #include <arch.h>
 
-#ifdef mips32
-
 #define THREADS         50
 #define DELAY           10000L
@@ -45 +45 @@
 
 static atomic_t threads_ok;
+static atomic_t threads_fault;
 static waitq_t can_start;
 
@@ -50 +51 @@
 {
         int i;
-        int arg __attribute__((aligned(16))) = (int)((unative_t) data);
+        int arg __attribute__((aligned(16))) = (int) ((unative_t) data);
         int after_arg __attribute__((aligned(16)));
-
+        
         thread_detach(THREAD);
         
         waitq_sleep(&can_start);
 
-        for (i = 0; i<ATTEMPTS; i++) {
-                __asm__ volatile (
+        for (i = 0; i < ATTEMPTS; i++) {
+                asm volatile (
                         "mtc1 %0,$1"
-                        :"=r"(arg)
-                        );
-
+                        : "=r" (arg)
+                );
+                
                 delay(DELAY);
-                __asm__ volatile (
+                
+                asm volatile (
                         "mfc1 %0, $1"
-                        :"=r"(after_arg)
-                        );
+                        : "=r" (after_arg)
+                );
                 
-                if(arg != after_arg)
-                        panic("General reg tid%d: arg(%d) != %d\n", 
-                              THREAD->tid, arg, after_arg);
+                if (arg != after_arg) {
+                        printf("General reg tid%d: arg(%d) != %d\n", THREAD->tid, arg, after_arg);
+                        atomic_inc(&threads_fault);
+                        break;
+                }
         }
-
         atomic_inc(&threads_ok);
 }
@@ -80 +83 @@
 {
         int i;
-        int arg __attribute__((aligned(16))) = (int)((unative_t) data);
+        int arg __attribute__((aligned(16))) = (int) ((unative_t) data);
         int after_arg __attribute__((aligned(16)));
-
+        
         thread_detach(THREAD);
-
+        
         waitq_sleep(&can_start);
 
-        for (i = 0; i<ATTEMPTS; i++) {
-                __asm__ volatile (
+        for (i = 0; i < ATTEMPTS; i++) {
+                asm volatile (
                         "mtc1 %0,$1"
-                        :"=r"(arg)
-                        );
+                        : "=r" (arg)
+                );
 
                 scheduler();
-                __asm__ volatile (
+                asm volatile (
                         "mfc1 %0,$1"
-                        :"=r"(after_arg)
-                        );
+                        : "=r" (after_arg)
+                );
                 
-                if(arg != after_arg)
-                        panic("General reg tid%d: arg(%d) != %d\n", 
-                              THREAD->tid, arg, after_arg);
+                if (arg != after_arg) {
+                        panic("General reg tid%d: arg(%d) != %d\n", THREAD->tid, arg, after_arg);
+                        atomic_inc(&threads_fault);
+                        break;
+                }
         }
-
         atomic_inc(&threads_ok);
 }
 
 
-void test_mips2(void)
+char * test_mips2(void)
 {
-        thread_t *t;
-        int i;
+        unsigned int i, total = 0;
+        
+        waitq_initialize(&can_start);
+        atomic_set(&threads_ok, 0);
+        atomic_set(&threads_fault, 0);
+        printf("Creating %d threads... ", 2 * THREADS);
 
-        waitq_initialize(&can_start);
-
-        printf("MIPS test #1\n");
-        printf("Creating %d threads... ", THREADS);
-
-        for (i=0; i<THREADS/2; i++) {  
-                if (!(t = thread_create(testit1, (void *)((unative_t)i*2), TASK, 0, "testit1")))
-                        panic("could not create thread\n");
+        for (i = 0; i < THREADS; i++) {
+                thread_t *t;
+                
+                if (!(t = thread_create(testit1, (void *) ((unative_t) 2 * i), TASK, 0, "testit1"))) {
+                        printf("could not create thread %d\n", 2 * i);
+                        break;
+                }
                 thread_ready(t);
-                if (!(t = thread_create(testit2, (void *)((unative_t)i*2+1), TASK, 0, "testit2")))
-                        panic("could not create thread\n");
+                total++;
+                
+                if (!(t = thread_create(testit2, (void *) ((unative_t) 2 * i + 1), TASK, 0, "testit2"))) {
+                        printf("could not create thread %d\n", 2 * i + 1);
+                        break;
+                }
                 thread_ready(t);
+                total++;
         }
-
         printf("ok\n");
-        
+                
         thread_sleep(1);
         waitq_wakeup(&can_start, WAKEUP_ALL);
-
-        while (atomic_get(&threads_ok) != THREADS)
-                ;
-                
-        printf("Test passed.\n");
-}
-
-#else
-
-void test_mips2(void)
-{
-        printf("This test is availaible only on MIPS32 platform.\n");
+        
+        while (atomic_get(&threads_ok) != total) {
+                printf("Threads left: %d\n", total - atomic_get(&threads_ok));
+                thread_sleep(1);
+        }
+        
+        if (atomic_get(&threads_fault) == 0)
+                return NULL;
+        
+        return "Test failed";
 }