Several improvements in performance reports

diff --git a/modules/ts/misc/concatlogs.py b/modules/ts/misc/concatlogs.py
new file mode 100644 (file)
index 0000000..56566b1
--- /dev/null
+++ b/modules/ts/misc/concatlogs.py
@@ -0,0 +1,43 @@
+from optparse import OptionParser
+import glob, sys, os
+
+if __name__ == "__main__":
+    parser = OptionParser()
+    parser.add_option("-o", "--output", dest="output", help="output file name", metavar="FILENAME", default=None)
+    (options, args) = parser.parse_args()
+
+    if not options.output:
+        sys.stderr.write("Error: output file name is not provided")
+        exit(-1)
+
+    files = []
+    for arg in args:
+        if ("*" in arg) or ("?" in arg):
+            files.extend([os.path.abspath(f) for f in glob.glob(arg)])
+        else:
+            files.append(os.path.abspath(arg))
+
+    html = None
+    for f in files:
+        try:
+            fobj = open(f)
+            if not fobj:
+                continue
+            text = fobj.read()
+            if not html:
+                html = text
+                continue
+            idx1 = text.find("<tbody>") + len("<tbody>")
+            idx2 = html.rfind("</tbody>")
+            html = html[:idx2] + text[idx1:]
+        except:
+            pass
+
+    if html:
+        idx1 = text.find("<title>") + len("<title>")
+        idx2 = html.find("</title>")
+        html = html[:idx1] + "OpenCV performance testing report" + html[idx2:]
+        open(options.output, "w").write(html)
+    else:
+        sys.stderr.write("Error: no input data")
+        exit(-1)

diff --git a/modules/ts/misc/summary.py b/modules/ts/misc/summary.py
index 582726a..60bfd29 100644 (file)
--- a/modules/ts/misc/summary.py
+++ b/modules/ts/misc/summary.py
@@ -2,6 +2,18 @@ import testlog_parser, sys, os, xml, glob, re
 from table_formatter import *
 from optparse import OptionParser
 
+def getSetName(tset, idx, columns, short = True):
+    if columns and len(columns) >= idx:
+        prefix = columns[idx]
+    else:
+        prefix = None
+    if short and prefix:
+        return prefix
+    name = tset[0].replace(".xml","").replace("_", "\n")
+    if prefix:
+        return prefix + "\n" + ("-"*int(len(prefix)*1.7)) + "\n" + name
+    return name
+
 if __name__ == "__main__":
     if len(sys.argv) < 2:
         print >> sys.stderr, "Usage:\n", os.path.basename(sys.argv[0]), "<log_name1>.xml [<log_name2>.xml ...]"
@@ -12,7 +24,10 @@ if __name__ == "__main__":
     parser.add_option("-m", "--metric", dest="metric", help="output metric", metavar="NAME", default="gmean")
     parser.add_option("-u", "--units", dest="units", help="units for output values (s, ms (default), mks, ns or ticks)", metavar="UNITS", default="ms")
     parser.add_option("-f", "--filter", dest="filter", help="regex to filter tests", metavar="REGEX", default=None)
+    parser.add_option("", "--module", dest="module", default=None, metavar="NAME", help="module prefix for test names")
+    parser.add_option("", "--columns", dest="columns", default=None, metavar="NAMES", help="comma-separated list of column aliases")
     parser.add_option("", "--no-relatives", action="store_false", dest="calc_relatives", default=True, help="do not output relative values")
+    parser.add_option("", "--with-cycles-reduction", action="store_true", dest="calc_cr", default=False, help="alos output cycle reduction percentages")
     parser.add_option("", "--show-all", action="store_true", dest="showall", default=False, help="also include empty and \"notrun\" lines")
     parser.add_option("", "--match", dest="match", default=None)
     parser.add_option("", "--match-replace", dest="match_replace", default="")
@@ -21,8 +36,11 @@ if __name__ == "__main__":
     options.generateHtml = detectHtmlOutputType(options.format)
     if options.metric not in metrix_table:
         options.metric = "gmean"
-    if options.metric.endswith("%"):
+    if options.metric.endswith("%") or options.metric.endswith("$"):
         options.calc_relatives = False
+        options.calc_cr = False
+    if options.columns:
+        options.columns = [s.strip() for s in options.columns.split(",")]
     
     # expand wildcards and filter duplicates
     files = []    
@@ -69,6 +87,8 @@ if __name__ == "__main__":
     for i in range(setsCount):
         for case in test_sets[i][1]:
             name = name_extractor(case)
+            if options.module:
+                name = options.module + "::" + name
             if name not in test_cases:
                 test_cases[name] = [None] * setsCount
             test_cases[name][i] = case
@@ -77,18 +97,26 @@ if __name__ == "__main__":
     getter = metrix_table[options.metric][1]
     if options.calc_relatives:
         getter_p = metrix_table[options.metric + "%"][1]
+    if options.calc_cr:
+        getter_cr = metrix_table[options.metric + "$"][1]
     tbl = table(metrix_table[options.metric][0])
     
     # header
     tbl.newColumn("name", "Name of Test", align = "left", cssclass = "col_name")
     i = 0
     for set in test_sets:
-        tbl.newColumn(str(i), set[0].replace(".xml","").replace("_", "\n"), align = "center")
+        tbl.newColumn(str(i), getSetName(set, i, options.columns, False), align = "center")
         i += 1
+    metric_sets = test_sets[1:]
+    if options.calc_cr:
+        i = 1
+        for set in metric_sets:
+            tbl.newColumn(str(i) + "$", getSetName(set, i, options.columns) + "\nvs\n" + getSetName(test_sets[0], 0, options.columns) + "\n(cycles reduction)", align = "center", cssclass = "col_cr")
+            i += 1
     if options.calc_relatives:
         i = 1
-        for set in test_sets[1:]:
-            tbl.newColumn(str(i) + "%", set[0].replace(".xml","").replace("_", "\n") + "\nvs\n" + test_sets[0][0].replace(".xml","").replace("_", "\n"), align = "center", cssclass = "col_rel")
+        for set in metric_sets:
+            tbl.newColumn(str(i) + "%", getSetName(set, i, options.columns) + "\nvs\n" + getSetName(test_sets[0], 0, options.columns) + "\n(x-factor)", align = "center", cssclass = "col_rel")
             i += 1
         
     # rows
@@ -106,6 +134,8 @@ if __name__ == "__main__":
                 tbl.newCell(str(i), "-")
                 if options.calc_relatives and i > 0:
                     tbl.newCell(str(i) + "%", "-")
+                if options.calc_cr and i > 0:
+                    tbl.newCell(str(i) + "$", "-")
             else:
                 status = case.get("status")
                 if status != "run":
@@ -114,33 +144,33 @@ if __name__ == "__main__":
                         needNewRow = True
                     if options.calc_relatives and i > 0:
                         tbl.newCell(str(i) + "%", "-", color = "red")
+                    if options.calc_cr and i > 0:
+                        tbl.newCell(str(i) + "$", "-", color = "red")
                 else:
                     val = getter(case, cases[0], options.units)
                     if options.calc_relatives and i > 0 and val:
                         valp = getter_p(case, cases[0], options.units)
                     else:
                         valp = None
+                    if options.calc_cr and i > 0 and val:
+                        valcr = getter_cr(case, cases[0], options.units)
+                    else:
+                        valcr = None
                     if not valp or i == 0:
                         color = None
                     elif valp > 1.05:
-                        color = "red"
-                    elif valp < 0.95:
                         color = "green"
+                    elif valp < 0.95:
+                        color = "red"
                     else:
                         color = None
                     if val:
                         needNewRow = True
-                        if options.metric.endswith("%"):
-                            tbl.newCell(str(i), "%.2f" % val, val, color = color)
-                        else:
-                            tbl.newCell(str(i), "%.3f %s" % (val, options.units), val, color = color)
-                    else:
-                        tbl.newCell(str(i), "-")
+                    tbl.newCell(str(i), formatValue(val, options.metric, options.units), val, color = color)
                     if options.calc_relatives and i > 0:
-                        if valp:
-                            tbl.newCell(str(i) + "%", "%.2f" % valp, valp, color = color, bold = color)
-                        else:
-                            tbl.newCell(str(i) + "%", "-")
+                        tbl.newCell(str(i) + "%", formatValue(valp, "%"), valp, color = color, bold = color)
+                    if options.calc_cr and i > 0:
+                        tbl.newCell(str(i) + "$", formatValue(valcr, "$"), valcr, color = color, bold = color)
     if not needNewRow:
         tbl.trimLastRow()
 

diff --git a/modules/ts/misc/table_formatter.py b/modules/ts/misc/table_formatter.py
index 1b652ff..aa3940e 100644 (file)
--- a/modules/ts/misc/table_formatter.py
+++ b/modules/ts/misc/table_formatter.py
@@ -461,11 +461,15 @@ $(function(){
       var cell
       var id = "t" + tblIdx + "r" + colIdx
       if (col.hasClass("col_name")){
-        cell = $("<th><input id='" + id + "' name='" + id + "' type='text' style='width:100%%' class='filter_col_name' title='Regular expression for name filtering'></input></th>")
+        cell = $("<th><input id='" + id + "' name='" + id + "' type='text' style='width:100%%' class='filter_col_name' title='Regular expression for name filtering (&quot;resize.*640x480&quot; - resize tests on VGA resolution)'></input></th>")
         hasAny = true
       }
       else if (col.hasClass("col_rel")){
-        cell = $("<th><input id='" + id + "' name='" + id + "' type='text' style='width:100%%' class='filter_col_rel' title='Filter all lines with speedup less than &lt;value&gt;'></input></th>")
+        cell = $("<th><input id='" + id + "' name='" + id + "' type='text' style='width:100%%' class='filter_col_rel' title='Filter out lines with a x-factor of acceleration less than Nx'></input></th>")
+        hasAny = true
+      }
+      else if (col.hasClass("col_cr")){
+        cell = $("<th><input id='" + id + "' name='" + id + "' type='text' style='width:100%%' class='filter_col_cr' title='Filter out lines with a percentage of acceleration less than N%%'></input></th>")
         hasAny = true
       }
       else
@@ -514,9 +518,27 @@ $(function(){
                 return pred(row)
              }
            } else if(flt.hasClass("filter_col_rel")) {
-              var percent = val.indexOf('.') < 0 ? parseInt(val)*0.01 : parseFloat(val)
+              var percent = parseFloat(val)
+              if (percent < 0) {
+                predicate = function(row) {
+                  var val = parseFloat($(row.get(colIdx)).text())
+                  if (!val || val >= 1 || val > 1+percent)
+                    return false
+                  return pred(row)
+               }
+              } else {
+                predicate = function(row) {
+                  var val = parseFloat($(row.get(colIdx)).text())
+                  if (!val || val < percent)
+                    return false
+                  return pred(row)
+               }
+              }
+           } else if(flt.hasClass("filter_col_cr")) {
+              var percent = parseFloat(val)
               predicate = function(row) {
-                if (abs(parseFloat($(row.get(colIdx)).text()) - 1) < percent)
+                var val = parseFloat($(row.get(colIdx)).text())
+                if (!val || val < percent)
                   return false
                 return pred(row)
              }
@@ -528,6 +550,10 @@ $(function(){
             if(!predicate($("td", tbl_row)))
                $(tbl_row).remove()
          })
+         if($("tbody tr", tbl).length == 0) {
+           $("<tr><td colspan='"+$("thead tr:first th", tbl).length+"'>No results mathing your search criteria</td></tr>")
+             .appendTo($("tbody", tbl))
+         }
       }
   })
 })
@@ -575,12 +601,23 @@ def getRelativeVal(test, test0, metric):
     if not test or not test0:
         return None
     val0 = test0.get(metric, "s")
+    if not val0:
+        return None
+    val =  test.get(metric, "s")
+    if not val or val == 0:
+        return None
+    return float(val0)/val
+
+def getCycleReduction(test, test0, metric):
+    if not test or not test0:
+        return None
+    val0 = test0.get(metric, "s")
     if not val0 or val0 == 0:
         return None
     val =  test.get(metric, "s")
     if not val:
         return None
-    return float(val)/val0
+    return (1.0-float(val)/val0)*100
 
         
 metrix_table = \
@@ -603,8 +640,24 @@ metrix_table = \
     "median%": ("Median (relative)", lambda test,test0,units: getRelativeVal(test, test0, "median")),
     "stddev%": ("Standard deviation (relative)", lambda test,test0,units: getRelativeVal(test, test0, "stddev")),
     "gstddev%": ("Standard deviation of Ln(time) (relative)", lambda test,test0,units: getRelativeVal(test, test0, "gstddev")),
+
+    "gmean$": ("Geometric mean (cycle reduction)", lambda test,test0,units: getCycleReduction(test, test0, "gmean")),
+    "mean$": ("Mean (cycle reduction)", lambda test,test0,units: getCycleReduction(test, test0, "mean")),
+    "min$": ("Min (cycle reduction)", lambda test,test0,units: getCycleReduction(test, test0, "min")),
+    "median$": ("Median (cycle reduction)", lambda test,test0,units: getCycleReduction(test, test0, "median")),
+    "stddev$": ("Standard deviation (cycle reduction)", lambda test,test0,units: getCycleReduction(test, test0, "stddev")),
+    "gstddev$": ("Standard deviation of Ln(time) (cycle reduction)", lambda test,test0,units: getCycleReduction(test, test0, "gstddev")),
 }
 
+def formatValue(val, metric, units = None):
+    if val is None:
+        return "-"
+    if metric.endswith("%"):
+        return "%.2f" % val
+    if metric.endswith("$"):
+        return "%.2f%%" % val
+    return "%.3f %s" % (val, units)
+
 if __name__ == "__main__":
     if len(sys.argv) < 2:
         print "Usage:\n", os.path.basename(sys.argv[0]), "<log_name>.xml"