Changes to show Timer Wall - IO time as well in parboil scripts

llvm/test/VISC/parboil/driver/options.py

@@ -352,19 +352,19 @@ def time_options(progname, cmd, args):
 
         configs = [
                     ('spmv',    {   'VERSION'   : ["visc", "opencl_nvidia"],
-                                    'TEST'      : [("small", 10), ("medium", 10), ("large", 2)]
+                                    'TEST'      : [("small", 20), ("medium", 20), ("large", 10)]
                                 }
                     )
                     ,('sgemm',   {   'VERSION'   : ["visc", "opencl_base"],
-                                    'TEST'      : [("small", 10), ("medium", 2)]
+                                    'TEST'      : [("small", 20), ("medium", 10)]
                                 }
                     )
                    ,('lbm',     {   'VERSION'   : ["visc", "opencl_nvidia"],
-                                    'TEST'      : [("short", 1), ("long", 1)]
+                                    'TEST'      : [("short", 10), ("long", 10)]
                                 }
                     )
                    ,('stencil', {   'VERSION'   : ["visc", "opencl_base"],
-                                    'TEST'      : [("small", 2), ("default", 1)]
+                                    'TEST'      : [("small", 10), ("default", 10)]
                                 }
                     )
                   ]

llvm/test/VISC/parboil/parboilParser.py

@@ -109,15 +109,14 @@ def getTests(app, csvDict):
 # test sizes
 def printTotalExecutionTimeTable(csvDict):
   print 'application,visc,opencl'
-  t1 = 'GenVISC_Timer'
-  t2 = 'Final'
-  cat = 'Timer Wall Time'
+  t = 'Final'
+  cat = 'Timer Wall - IO'
   for app in csvDict.iterkeys():
     v1 = 'visc'
     v2 = getOpenCLVersionName(app)
     tests = getTests(app, csvDict)
     for test in tests:
-      print "{0:s}-{1:s},{2:s},{3:s}".format(app, test, csvDict[app][v1][test][t1][cat], csvDict[app][v2][test][t2][cat])
+      print "{0:s}-{1:s},{2:s},{3:s}".format(app, test, csvDict[app][v1][test][t][cat], csvDict[app][v2][test][t][cat])
 
 def plotTotalExecutionTimeTable(csvDict):
   global num_figs
@@ -177,11 +176,11 @@ def printTimerDecomposition(csvDict, isVisc):
              ('Final', 'Pthread Create'), 
              ('Final', 'Copy Scalar Arguments'), 
              ('Final', 'WorkGroup Size Calculation'), 
-             ('Final', 'IO'), 
              ('Final', 'Output Pack'), 
              ('Parboil', 'Mem_Untrack'), 
              ('Parboil', 'Clear_Ctx'),
              ('Final', 'Timer Wall - IO'),
+             ('Final', 'IO'), 
              ('GenVISC_Timer', 'Timer Wall Time')]
   else: 
     timers =[('Final', 'Init_Ctx'),
@@ -195,7 +194,6 @@ def printTimerDecomposition(csvDict, isVisc):
              ('Final', 'Compute'), 
              ('Final', 'Setup'), 
              ('Final', 'Read_Output'), 
-             ('Final', 'IO'), 
              ('Final', 'Pthread_Create'), 
              ('Final', 'Kernel'), 
              ('Final', 'Mem_Free'), 
@@ -205,6 +203,7 @@ def printTimerDecomposition(csvDict, isVisc):
              ('Final', 'Mem_Untrack'),
              ('Final', 'Clear_Ctx'),
              ('Final', 'Timer Wall - IO'),
+             ('Final', 'IO'), 
              ('Final', 'Timer Wall Time')]
 
   line = "Category,"