Changeset 85 for trunk/platforms/caba-xxx-ccxcachemulti-mipsel/soft

Timestamp:

Sep 3, 2010, 3:57:30 PM (14 years ago)

Author:

simerabe

Message:

removing duplicate ring_signals_2

File:

• trunk/platforms/caba-xxx-ccxcachemulti-mipsel/soft/main.c (modified) (5 diffs)

trunk/platforms/caba-xxx-ccxcachemulti-mipsel/soft/main.c

@@ -2 +2 @@
 #include "stdio.h"
 #include "stdlib.h"
-#include "matrice.h"
+//#include "matrice.h"
 
 #include "../segmentation.h"
 
-#define NPROCS 4
-#define SIZE 1000 
+#define NPROCS 1
+#define SIZE 50 
 #define SORT_TYPE 0 // shellSort
 
 volatile int nprocs=NPROCS;
 
-/*
+
 unsigned int gQSortNum0[200] = {
   251,  24, 113, 170, 215,  60,  83,  30, 115,  48, 169, 210,  49,  92, 101,  58,  21, 184, 225,   6,
@@ -24 +24 @@
   186, 149,  86, 155, 200, 239, 118, 119,  28,  77, 254,  19, 176, 183,  78, 145, 132,   5,  90, 117,
   152, 127, 218, 153,  20,  67, 178,   3, 128, 185, 254,  95, 172, 139, 246, 123, 104,  15,  42, 169 };
-*/
 
-unsigned int SortArr0[NPROCS*(SIZE+200)];
 
-void SORT(unsigned int *base, unsigned int n, int type);
-void insertion_sort(unsigned int *base, unsigned int n); // type 2
-void selection_sort(unsigned int *base, unsigned int n); // type 1
-void bubble_sort(unsigned int *base, unsigned int n);    // type 3
+unsigned int SortArr0[NPROCS*(SIZE+50)];
+
 void shellSortPhase(unsigned int a[],unsigned int length, int gap);
 void shellSort(unsigned int *base, unsigned int n);     // type 0
@@ -57 +53 @@
         i=1;
         puts("Memory copy \n");
-        SortArray = SortArr0 + p*(SIZE+200);
+        SortArray = SortArr0 + p*(SIZE+50);
         memcpy(SortArray, gQSortNum0 + p*SIZE,SIZE*4);
-        //memcpy(SortArray, gQSortNum0,SIZE*4);
 
         puts("Sort... \n");
-        SORT((unsigned int *) (SortArray), (unsigned int) SIZE, SORT_TYPE);
+        shellSort((unsigned int *) (SortArray), (unsigned int) SIZE);
 
         for (j = 1; j < SIZE; j++)
@@ -81 +76 @@
   }
 
-  
-// puts("Display the sorted array : \n");
-// for(j = 0; j < SIZE; j++)
-// {
-//   puti(SortArray[j]);
-//   putchar('\n');
-// }
-
-//  printf( "------------------------------ \n");
-//  printf( "nombre cycles cpu : %i\n", end_cycle-beg_cycle);
-//  printf( "------------------------------ \n");
-
 
   while(1);
 }
 
-
-//---- insertion sort : non adapté pour tableaux de grande taille (> 100) --
-void insertion_sort(unsigned int *base, unsigned int n) 
-{
-    /* Spécifications externes : Tri du tableau base par insertion séquentielle */
-    int i,p,j;
-    int x;
-
-    puts("Insertion Sort\n");
-
-    for (i = 1; i < n; i++) 
-    {
-
-        putchar('-'); // added for debug
-
-        /* stockage de la valeur en i */
-        x = base[i]; 
- 
-        /* recherche du plus petit indice p inférieur à i tel que base[p] >= base[i] */
-        for(p = 0; base[p] < x; p++);
-        /* p pointe une valeur de base supérieure à celle en i */ 
- 
-        /* décalage avant des valeurs de base entre p et i */         
-        for (j = i-1; j >= p; j--) {
-            base[j+1] = base[j]; 
-        }   
- 
-        base[p] = x; /* insertion de la valeur stockée à la place vacante */
-
-        putchar('+'); // added for debug
-
-    }
-}
-
-//------ simple_sort -------------------------------
-void selection_sort(unsigned int *base, unsigned int n)
-{
-     int i, min, j , x;
-     puts("Selection Sort\n");
-
-     for(i = 0 ; i < n - 1 ; i++)
-     {
-
-         putchar('-'); // added for debug
-
-         min = i;
-
-         
-         for(j = i+1 ; j < n ; j++)
-         {
-        
-            if(base[j] < base[min])
-                  min = j;
-            
-         }
-
-         if(min != i)
-         {
-             x = base[i];
-             base[i] = base[min];
-             base[min] = x;
-         }
-
-         putchar('+'); // added for debug
-
-     }
-}
-//-------------------------------
-void bubble_sort(unsigned int *base, unsigned int n)
-{
-        int i   = 0; /* Indice de répétition du tri */
-        int j   = 0; /* Variable de boucle */
-        int tmp = 0; /* Variable de stockage temporaire */
-        int en_desordre = 1; /* Booléen marquant l'arrêt du tri si le tableau est ordonné */
-
-        puts("Bubble Sort\n");
-
-        /* Boucle de répétition du tri et le test qui arrête le tri dès que le tableau est ordonné */
-        for(i = 0 ; (i < n) && en_desordre; i++)
-        {
-                putchar('-'); // added for debug
-
-                /* Supposons le tableau ordonné */
-                en_desordre = 0;
-                /* Vérification des éléments des places j et j-1 */
-                for(j = 1 ; j < n - i ; j++)
-                {
-                        /* Si les 2 éléments sont mal triés */
-                        if(base[j] < base[j-1])
-                        {
-                                /* Inversion des 2 éléments */
-                                tmp = base[j-1];
-                                base[j-1] = base[j];
-                                base[j] = tmp;
- 
-                                /* Le tableau n'est toujours pas trié */
-                                en_desordre = 1;
-                        }
-                }
-
-                putchar('+'); // added for debug
-        }
-
-}
 //------------------------------------------------------
 /*
@@ -242 +121 @@
 }
 
-//-------------------------------------*/
-void SORT(unsigned int *base, unsigned int n, int type)
-{
-  switch(type)
-  {
-  case 0:
-    shellSort(base, n);
-    break;
-  case 1:
-    selection_sort(base, n);
-    break;
-  case 2:
-    insertion_sort(base, n);
-    break;
-  case 3:
-    bubble_sort(base, n);
-    break;
-  default:
-    break;
-  }
-}