[Lldb-commits] [lldb] r179559 - Sketch test now runs 10 times

[Enrico Granata]

Author: enrico
Date: Mon Apr 15 16:24:00 2013
New Revision: 179559

URL: http://llvm.org/viewvc/llvm-project?rev=179559&view=rev
Log:
Sketch test now runs 10 times
Data formatters test outputs stddev

Modified:
    lldb/trunk/tools/lldb-perf/darwin/formatters/formatters.cpp
    lldb/trunk/tools/lldb-perf/darwin/sketch/sketch.cpp

Modified: lldb/trunk/tools/lldb-perf/darwin/formatters/formatters.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-perf/darwin/formatters/formatters.cpp?rev=179559&r1=179558&r2=179559&view=diff
==============================================================================
--- lldb/trunk/tools/lldb-perf/darwin/formatters/formatters.cpp (original)
+++ lldb/trunk/tools/lldb-perf/darwin/formatters/formatters.cpp Mon Apr 15 16:24:00 2013
@@ -200,17 +200,17 @@ public:
     virtual void
     WriteResults (Results &results)
     {
-        m_dump_std_vector_measurement.WriteAverageValue(results);
-        m_dump_std_list_measurement.WriteAverageValue(results);
-        m_dump_std_map_measurement.WriteAverageValue(results);
-        m_dump_std_string_measurement.WriteAverageValue(results);
+        m_dump_std_vector_measurement.WriteAverageAndStandardDeviation(results);
+        m_dump_std_list_measurement.WriteAverageAndStandardDeviation(results);
+        m_dump_std_map_measurement.WriteAverageAndStandardDeviation(results);
+        m_dump_std_string_measurement.WriteAverageAndStandardDeviation(results);
         
-        m_dump_nsstring_measurement.WriteAverageValue(results);
-        m_dump_nsarray_measurement.WriteAverageValue(results);
-        m_dump_nsdictionary_measurement.WriteAverageValue(results);
-        m_dump_nsset_measurement.WriteAverageValue(results);
-        m_dump_nsbundle_measurement.WriteAverageValue(results);
-        m_dump_nsdate_measurement.WriteAverageValue(results);
+        m_dump_nsstring_measurement.WriteAverageAndStandardDeviation(results);
+        m_dump_nsarray_measurement.WriteAverageAndStandardDeviation(results);
+        m_dump_nsdictionary_measurement.WriteAverageAndStandardDeviation(results);
+        m_dump_nsset_measurement.WriteAverageAndStandardDeviation(results);
+        m_dump_nsbundle_measurement.WriteAverageAndStandardDeviation(results);
+        m_dump_nsdate_measurement.WriteAverageAndStandardDeviation(results);
         results.Write(m_out_path.c_str());
     }
     

Modified: lldb/trunk/tools/lldb-perf/darwin/sketch/sketch.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-perf/darwin/sketch/sketch.cpp?rev=179559&r1=179558&r2=179559&view=diff
==============================================================================
--- lldb/trunk/tools/lldb-perf/darwin/sketch/sketch.cpp (original)
+++ lldb/trunk/tools/lldb-perf/darwin/sketch/sketch.cpp Mon Apr 15 16:24:00 2013
@@ -201,11 +201,10 @@ public:
 	virtual void
 	TestStep (int counter, ActionWanted &next_action)
     {
-        switch (counter)
+        static int launch = 1;
+        switch (counter % 10)
         {
         case 0:
-            case 10:
-            case 20:
             {
                 DoTest ();
                 if (counter == 0)
@@ -215,8 +214,6 @@ public:
             break;
                 
         case 1:
-            case 11:
-            case 21:
             {
                 DoTest ();
                 m_run_expr_measurement(m_thread.GetFrameAtIndex(0),"properties");
@@ -229,8 +226,6 @@ public:
             break;
 
         case 2:
-            case 12:
-            case 22:
             {
                 DoTest ();
                 next_action.Continue();
@@ -238,8 +233,6 @@ public:
             break;
 
         case 3:
-            case 13:
-            case 23:
             {
                 DoTest ();
                 next_action.StepOver(m_thread);
@@ -247,9 +240,6 @@ public:
             break;
 
         case 4:
-            case 14:
-            case 24:
-                
             {
                 DoTest ();
                 m_run_expr_measurement(m_thread.GetFrameAtIndex(0),"layoutManager");
@@ -259,8 +249,6 @@ public:
             break;
         
         case 5:
-            case 15:
-            case 25:
             {
                 DoTest ();
                 next_action.StepOver(m_thread);
@@ -268,8 +256,6 @@ public:
             break;
 
         case 6:
-            case 16:
-            case 26:
             {
                 DoTest ();
                 next_action.StepOver(m_thread);
@@ -277,8 +263,6 @@ public:
             break;
 
         case 7:
-            case 17:
-            case 27:
             {
                 DoTest ();
                 m_run_expr_measurement(m_thread.GetFrameAtIndex(0),"@\"an NSString\"");
@@ -289,8 +273,6 @@ public:
             break;
 
         case 8:
-            case 18:
-            case 28:
             {
                 DoTest ();
                 m_run_expr_measurement(m_thread.GetFrameAtIndex(0),"[graphics description]");
@@ -299,9 +281,11 @@ public:
             }
             break;
         case 9:
-            case 19:
             {
-                next_action.Relaunch(GetLaunchInfo());
+                if (++launch < 10)
+                    next_action.Relaunch(GetLaunchInfo());
+                else
+                    next_action.Kill();
                 break;
             }