Changeset 142

Timestamp:

06/07/10 05:25:23 (3 years ago)

Author:

faltet

Message:

Added a new suite in bench.c called debugsuite that is
appropriate for debugging purposes.

Now, the extremesuite can be used for running the complete
(and extremely long) suite.

Location:

trunk

Files:

• RELEASE_NOTES.txt (modified) (1 diff)
• bench/bench.c (modified) (7 diffs)

trunk/RELEASE_NOTES.txt

@@ -15 +15 @@
 - Fixed several failures exposed by the extremesuite.  The problem was a
   bad check for limits in the buffer size while compressing.
+
+- Added a new suite in bench.c called ``debugsuite`` that is
+  appropriate for debugging purposes.  Now, the ``extremesuite`` can be
+  used for running the complete (and extremely long) suite.
 
 

trunk/bench/bench.c

@@ -296 +296 @@
   int hard_suite = 0;
   int extreme_suite = 0;
+  int debug_suite = 0;
   int nthreads = 1;                     /* The number of threads */
   int size = 2*MB;                      /* Buffer size */
@@ -304 +305 @@
   struct timeval last, current;
   float totaltime;
-  char *usage = "Usage: bench ['single' | 'suite' | 'hardsuite' | 'extremesuite'] [nthreads [bufsize(bytes) [typesize [sbits ]]]]";
+  char *usage = "Usage: bench ['single' | 'suite' | 'hardsuite' | 'extremesuite' | 'debugsuite'] [nthreads [bufsize(bytes) [typesize [sbits ]]]]";
 
 
@@ -326 +327 @@
     workingset = 32*MB;
     niter = 1;
+    /* Values here are ending points for loops */
+    nthreads = 4;
+    size = 16*MB;
+    elsize = 32;
+    rshift = 32;
+  }
+  else if (strcmp(argv[1], "debugsuite") == 0) {
+    debug_suite = 1;
+    workingset = 32*MB;
+    niter = 1;
     /* Warning: values here are starting points for loops.  This is
        useful for debugging. */
@@ -365 +376 @@
   }
   else if (hard_suite) {
-    for (rshift_ = 0; rshift_ < rshift; rshift_ += 5) {
+    for (rshift_ = 0; rshift_ <= rshift; rshift_ += 5) {
       for (elsize_ = 1; elsize_ <= elsize; elsize_ *= 2) {
         /* The next loop is for getting sizes that are not power of 2 */
@@ -374 +385 @@
             for (nthreads_ = 1; nthreads_ <= nthreads; nthreads_++) {
               do_bench(nthreads_, size_+i, elsize_, rshift_);
-              gettimeofday(&current, NULL);
-              totaltime = getseconds(last, current);
-              printf("Elapsed time:\t %6.1f s.  Processed data: %.1f GB\n",
-                     totaltime, totalsize / GB);
+              gettimeofday(&current, NULL);
+              totaltime = getseconds(last, current);
+              printf("Elapsed time:\t %6.1f s.  Processed data: %.1f GB\n",
+                     totaltime, totalsize / GB);
             }
           }
@@ -385 +396 @@
   }
   else if (extreme_suite) {
+    for (rshift_ = 0; rshift_ <= rshift; rshift_++) {
+      for (elsize_ = 1; elsize_ <= elsize; elsize_++) {
+        /* The next loop is for getting sizes that are not power of 2 */
+        for (i = -elsize_*2; i <= elsize_*2; i += elsize_) {
+          for (size_ = 32*KB; size_ <= size; size_ *= 2) {
+            nchunks = get_nchunks(size_+i, workingset);
+            for (nthreads_ = 1; nthreads_ <= nthreads; nthreads_++) {
+              do_bench(nthreads_, size_+i, elsize_, rshift_);
+              gettimeofday(&current, NULL);
+              totaltime = getseconds(last, current);
+              printf("Elapsed time:\t %6.1f s.  Processed data: %.1f GB\n",
+                     totaltime, totalsize / GB);
+            }
+          }
+        }
+      }
+    }
+  }
+  else if (debug_suite) {
     for (rshift_ = rshift; rshift_ <= 32; rshift_++) {
       for (elsize_ = elsize; elsize_ <= 32; elsize_++) {
@@ -393 +423 @@
             for (nthreads_ = nthreads; nthreads_ <= 4; nthreads_++) {
               do_bench(nthreads_, size_+i, elsize_, rshift_);
-              gettimeofday(&current, NULL);
-              totaltime = getseconds(last, current);
-              printf("Elapsed time:\t %6.1f s.  Processed data: %.1f GB\n",
-                     totaltime, totalsize / GB);
+              gettimeofday(&current, NULL);
+              totaltime = getseconds(last, current);
+              printf("Elapsed time:\t %6.1f s.  Processed data: %.1f GB\n",
+                     totaltime, totalsize / GB);
             }
           }