1 files changed, 32 insertions, 3 deletions

diff --git a/pm_data_analysis/pm_data_analyzer.py b/pm_data_analysis/pm_data_analyzer.py
index f6730de..63baa27 100755
--- a/pm_data_analysis/pm_data_analyzer.py
+++ b/pm_data_analysis/pm_data_analyzer.py
@@ -41,6 +41,8 @@ to NONCHIP"),
     o(None, "--limit-offchip", dest="noffchip", action="store", type="int",
         help="Limit the number of offchip sample used in statistics \
 to NOFFCHIP"),
+    o("-a", "--autocap", dest="autocap", action="store_true",
+        help="Autodetect the minimum number of samples to use for statistics"),
     o("-r", "--read-valid-data", dest="read_valid", action="store_true",
         help="read already processed data from file"),
     o("-v", "--verbose", dest="verbose", action="store_true"),
@@ -100,6 +102,7 @@ class Overhead:
 class Analyzer(defapp.App):
     def __init__(self):
         defapp.App.__init__(self, options, defaults, no_std_opts=True)
+        self.min_sample_wss = {}
         self.lsamples = {}
         if self.options.npreempt:
             self.lsamples['preemption'] = self.options.npreempt
@@ -172,9 +175,30 @@ class Analyzer(defapp.App):
             for i in self.valid_ovds:
                 print "samples(%(0)s) = %(1)d" % {"0":i[1], "1":len(i[0])}
 
-        if self.options.verbose:
+        count_sample = {}
+        if self.options.autocap or self.options.verbose:
             for i in self.valid_ovds:
-                print "samples(%(0)s) = %(1)d" % {"0":i[1], "1":len(i[0])}
+                if self.options.verbose:
+                    print "samples(%(0)s) = %(1)d" % {"0":i[1], "1":len(i[0])}
+                count_sample[i[1]] = len(i[0])
+
+            if self.options.autocap:
+                if conf['wss'] in self.min_sample_wss:
+                    # it is normally sufficient to check num samples for
+                    # preemptions to get tss with min num samples in wss
+                    if self.min_sample_wss[conf['wss']]['preemption'] > \
+                            count_sample['preemption']:
+                        self.min_sample_wss[conf['wss']] = {'tss':conf['tss'],
+                            'preemption':count_sample['preemption'],
+                            'onchip':count_sample['onchip'],
+                            'offchip':count_sample['offchip'],
+                            'l2cache':count_sample['l2cache']}
+                else:
+                    self.min_sample_wss[conf['wss']] = {'tss':conf['tss'],
+                        'preemption':count_sample['preemption'],
+                        'onchip':count_sample['onchip'],
+                        'offchip':count_sample['offchip'],
+                        'l2cache':count_sample['l2cache']}
 
         # serialize valid overheads
         for i in self.valid_ovds:
@@ -220,8 +244,13 @@ class Analyzer(defapp.App):
                         print "Computing %(0)s stat only on %(1)d samples" % \
                             {"0":i[1],
                             "1":nsamples}
-
                     vector = i[0][0:nsamples]
+            elif self.options.autocap: # we can also autocompute the cap
+                nsamples = self.min_sample_wss[conf['wss']][i[1]]
+                if self.options.verbose:
+                    print "Computing %(0)s stat only on %(1)d samples" % \
+                        {"0":i[1], "1":nsamples}
+                vector = i[0][0:nsamples]
             else:
                 vector = i[0]