Changeset 2970 in Sophya for trunk/Eval

Timestamp:

Jun 9, 2006, 5:58:27 PM (19 years ago)

Author:

ansari

Message:

modifs mineures Progs cpupower.c .java corrige, complete , Reza 9/6/2006

Location:

trunk/Eval/Speed

Files:

• cpupower.c (modified) (1 diff)
• cpupower.java (modified) (4 diffs)

trunk/Eval/Speed/cpupower.c

@@ -30 +30 @@
 {
   T_Type s=0;
-  int i,k;
+  int k;
   /*  printf("--- fop_0: Simple Loop: z[k] = x[k]*y[i] --- \n"); */
-  for(k=0; k<SZ; k++) z[k] = x[k]*y[99];
+  for(k=0; k<SZ; k++) z[k] = x[k]*y[k];
   N_OP += SZ;
   return;

trunk/Eval/Speed/cpupower.java

@@ -14 +14 @@
     }
     Integer aOp = new Integer(args[0]);
+    int ope = aOp.intValue();
     Integer N;
     if (args.length > 1) N  = new Integer(args[1]);
-    else N = new Integer("20000");
+    else {
+        if (ope == 0) N = new Integer("1000000");
+        else if (ope >= 4) N = new Integer("2000");
+        else N = new Integer("20000");
+    }
     int sz = N.intValue();
     if (sz < 10) sz = 20000;
-    int ope = aOp.intValue();
     System.out.println("Java CPUPower: OPE= " + ope + " SZ= " + sz);    
     CPUPower cpup = new CPUPower(sz);
@@ -54 +58 @@
   }
 
-  public void Compute(int ope) { 
+  public void Compute(int ope) {
+    int i;
     OPE = ope;
     System.out.println("CPUPower.Compute() OPE= " + OPE );
@@ -62 +67 @@
     else if (OPE == 3)  fop3();
     else if (OPE == 2)  fop2();
-    else fop1();
+    else if (OPE == 1)  fop1();
+    else for(i=0; i<100; i++) fop0();
     tm = System.currentTimeMillis();
     dtm = tm-tml;
@@ -70 +76 @@
     System.out.println("CPUPower.Compute() N_OP= " + N_OP + " Time= " + dtm + "  ms ");
     System.out.println("CPUPower.Compute()  Time= " + dtm + "  ms  -> MFLOPS= " + mflops); 
+  }
+
+  public void fop0() {
+      //    System.out.println("CPUPower.fop0(): Double Loop: z[k] = Somme_i(x[k]*y[i]) --");
+    int k;
+    double s = 0.;
+    for(k=0; k<SZ; k++) z[k] = x[k]*y[k];
+    N_OP += SZ;
+    return;
   }