Much more cleanup on the performance testing infrastructure:

- Added new abtract Results class to keep CoreFoundation out of the tests. There are many subclasses for different settings:
    Results::Result::Dictionary
    Results::Result::Array
    Results::Result::Unsigned
    Results::Result::Double
    Results::Result::String
- Gauge<T> can now write themselves out via a templatized write to results function:
    template <class T>
    Results::ResultSP GetResult (const char *description, T value);
  
- There are four specializations of this so far:
    template <>
    Results::ResultSP GetResult (const char *description, double value);

    template <>
    Results::ResultSP GetResult (const char *description, uint64_t value);

    template <>
    Results::ResultSP GetResult (const char *description, std::string value);

    template <>
    Results::ResultSP GetResult (const char *description, MemoryStats value);
- Don't emit the virtual memory reading from the task info call as it really doesn't mean much as it includes way too much (shared cache + other stuff we don't have control over)
- Fixed other test cases to build correctly and use the new classes



git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@177696 91177308-0d34-0410-b5e6-96231b3b80d8

Author: Greg Clayton

tools/lldb-perf/common/clang/build-clang.sh

@@ -1,10 +1,26 @@
 #!/bin/bash
 
-mkdir llvm-build
+if [ -d "llvm-build" ]; then
+    echo "Using existing 'llvm-build' directory..."    
+else
+    mkdir llvm-build
+fi
+
 cd llvm-build
-svn co --revision 176809 http://llvm.org/svn/llvm-project/llvm/trunk llvm
-( cd llvm/tools ; svn co --revision 176809 http://llvm.org/svn/llvm-project/cfe/trunk clang )
-mkdir build
-cd build
-../llvm/configure --enable-targets=x86_64,arm --build=x86_64-apple-darwin10 --enable-optimized --disable-assertions
-make -j8
+
+if [ -d "llvm" ]; then
+    echo "Using existing 'llvm' directory..."
+else
+    svn co --revision 176809 http://llvm.org/svn/llvm-project/llvm/trunk llvm
+    ( cd llvm/tools ; svn co --revision 176809 http://llvm.org/svn/llvm-project/cfe/trunk clang )
+fi
+
+if [ ! -d "build" ]; then
+    mkdir build
+    cd build
+    ../llvm/configure --enable-targets=x86_64,arm --build=x86_64-apple-darwin10 --disable-optimized --disable-assertions --enable-libcpp
+    make -j8 DEBUG_SYMBOLS=1
+fi
+
+
+

tools/lldb-perf/common/clang/lldb_perf_clang.cpp

@@ -7,14 +7,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <CoreFoundation/CoreFoundation.h>
-
 #include "lldb-perf/lib/Timer.h"
 #include "lldb-perf/lib/Metric.h"
 #include "lldb-perf/lib/Measurement.h"
+#include "lldb-perf/lib/Results.h"
 #include "lldb-perf/lib/TestCase.h"
 #include "lldb-perf/lib/Xcode.h"
-
 #include <iostream>
 #include <unistd.h>
 #include <fstream>
@@ -24,11 +22,15 @@ using namespace lldb_perf;
 class ClangTest : public TestCase
 {
 public:
-    ClangTest () : TestCase()
+    ClangTest () :
+        TestCase(),
+        m_set_bp_main_by_name(CreateTimeMeasurement([this] () -> void
+            {
+                m_target.BreakpointCreateByName("main");
+                m_target.BreakpointCreateByName("malloc");
+            }, "breakpoint1-relative-time", "Elapsed time to set a breakpoint at main by name, run and hit the breakpoint.")),
+        m_delta_memory("breakpoint1-memory-delta", "Memory increase that occurs due to setting a breakpoint at main by name.")
     {
-        m_set_bp_main_by_name = CreateTimeMeasurement([this] () -> void {
-            m_target.BreakpointCreateByName("main");
-        }, "break at \"main\"", "time set a breakpoint at main by name, run and hit the breakpoint");
     }
 
     virtual
@@ -39,13 +41,10 @@ class ClangTest : public TestCase
     virtual bool
 	Setup (int argc, const char** argv)
     {
+        SetVerbose(true);
         m_app_path.assign(argv[1]);
         m_out_path.assign(argv[2]);
-        m_target = m_debugger.CreateTarget(m_app_path.c_str());
-        m_set_bp_main_by_name();
-        const char *clang_argv[] = { "clang --version", NULL };
-        SBLaunchInfo launch_info(clang_argv);
-        return Launch (launch_info);
+        return true;
     }
 
     void
@@ -59,71 +58,53 @@ class ClangTest : public TestCase
         switch (counter)
         {
             case 0:
-                m_target.BreakpointCreateByLocation("fmts_tester.mm", 68);
-                next_action.Continue();
+                {
+                    m_total_memory.Start();
+                    m_target = m_debugger.CreateTarget(m_app_path.c_str());
+                    const char *clang_argv[] = { "clang --version", NULL };
+                    m_delta_memory.Start();
+                    m_set_bp_main_by_name();
+                    m_delta_memory.Stop();
+                    SBLaunchInfo launch_info(clang_argv);
+                    Launch (launch_info);
+                }
                 break;
             case 1:
-                DoTest ();
-                next_action.Continue();
+                next_action.StepOver(m_thread);
                 break;
             case 2:
-                DoTest ();
-                next_action.Continue();
+                next_action.StepOver(m_thread);
                 break;
             case 3:
-                DoTest ();
-                next_action.Continue();
-                break;
-            case 4:
-                DoTest ();
-                next_action.Continue();
-                break;
-            case 5:
-                DoTest ();
-                next_action.Continue();
-                break;
-            case 6:
-                DoTest ();
-                next_action.Continue();
-                break;
-            case 7:
-                DoTest ();
-                next_action.Continue();
-                break;
-            case 8:
-                DoTest ();
-                next_action.Continue();
-                break;
-            case 9:
-                DoTest ();
-                next_action.Continue();
-                break;
-            case 10:
-                DoTest ();
-                next_action.Continue();
+                next_action.StepOver(m_thread);
                 break;
             default:
+                m_total_memory.Stop();
                 next_action.Kill();
                 break;
         }
     }
 
     void
-    Results ()
+    WriteResults (Results &results)
     {
-        CFCMutableArray array;
-        m_set_bp_main_by_name.Write(array);
-
-        CFDataRef xmlData = CFPropertyListCreateData(kCFAllocatorDefault, array.get(), kCFPropertyListXMLFormat_v1_0, 0, NULL);
+        Results::Dictionary& results_dict = results.GetDictionary();
 
-        CFURLRef file = CFURLCreateFromFileSystemRepresentation(NULL, (const UInt8*)m_out_path.c_str(), m_out_path.size(), FALSE);
+        m_set_bp_main_by_name.WriteAverageValue(results);
+        m_delta_memory.WriteAverageValue(results);
+
+        results_dict.Add ("breakpoint1-memory-total",
+                          "The total memory that the current process is using after setting the first breakpoint.",
+                          m_total_memory.GetStopValue().GetResult(NULL, NULL));
 
-        CFURLWriteDataAndPropertiesToResource(file,xmlData,NULL,NULL);
+        results.Write(m_out_path.c_str());
     }
 
 private:
     // C++ formatters
     TimeMeasurement<std::function<void()>> m_set_bp_main_by_name;
+    MemoryMeasurement<std::function<void()>> m_delta_memory;
+    MemoryGauge m_total_memory;
     std::string m_app_path;
     std::string m_out_path;
 

tools/lldb-perf/common/stepping/lldb-perf-stepping.cpp

@@ -22,7 +22,7 @@ class StepTest : public TestCase
     virtual
     ~StepTest() {}
 
-    virtual void
+    virtual bool
     Setup (int argc, const char **argv)
     {
         m_app_path.assign(argv[1]);
@@ -33,14 +33,29 @@ class StepTest : public TestCase
         const char* file_arg = m_app_path.c_str();
         const char* empty = nullptr;
         const char* args[] = {file_arg, empty};
+        SBLaunchInfo launch_info (args);
 
-        Launch (args,".");
+        return Launch (launch_info);
     }
 
-private:
     void
     DoOneStep (int sequence)
     {
+        
+    }
+    
+
+    void
+    WriteResults (Results &results)
+    {
+//        results.Write(m_out_path.c_str());
+    }
+    
+
+private:
+    virtual void
+	TestStep (int counter, ActionWanted &next_action)
+    {
 
     }
 
@@ -61,7 +76,7 @@ int main(int argc, const char * argv[])
         return -1;
     }
 
-    StepTest skt;
-    TestCase::Run(skt,argc,argv);
+    StepTest test;
+    TestCase::Run(test,argc,argv);
     return 0;
 }

tools/lldb-perf/darwin/formatters/formatters.cpp

@@ -197,27 +197,21 @@ class FormattersTest : public TestCase
         }
     }
 
-    void
-    Results ()
+    virtual void
+    WriteResults (Results &results)
     {
-        CFCMutableArray array;
-        m_dump_std_vector_measurement.Write(array);
-        m_dump_std_list_measurement.Write(array);
-        m_dump_std_map_measurement.Write(array);
-        m_dump_std_string_measurement.Write(array);
-
-        m_dump_nsstring_measurement.Write(array);
-        m_dump_nsarray_measurement.Write(array);
-        m_dump_nsdictionary_measurement.Write(array);
-        m_dump_nsset_measurement.Write(array);
-        m_dump_nsbundle_measurement.Write(array);
-        m_dump_nsdate_measurement.Write(array);
-
-        CFDataRef xmlData = CFPropertyListCreateData(kCFAllocatorDefault, array.get(), kCFPropertyListXMLFormat_v1_0, 0, NULL);
-        
-        CFURLRef file = CFURLCreateFromFileSystemRepresentation(NULL, (const UInt8*)m_out_path.c_str(), m_out_path.size(), FALSE);
-        
-        CFURLWriteDataAndPropertiesToResource(file,xmlData,NULL,NULL);
+        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_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);
+        results.Write(m_out_path.c_str());
     }
 
 private:

tools/lldb-perf/darwin/sketch/sketch.cpp

@@ -179,21 +179,15 @@ class SketchTest : public TestCase
         }
     }
 
-    void
-    Results ()
+    virtual void
+    WriteResults (Results &results)
     {
-        CFCMutableArray array;
-        m_fetch_frames_measurement.Write(array);
-        m_file_line_bp_measurement.Write(array);
-        m_fetch_modules_measurement.Write(array);
-        m_fetch_vars_measurement.Write(array);
-        m_run_expr_measurement.Write(array);
-
-        CFDataRef xmlData = CFPropertyListCreateData(kCFAllocatorDefault, array.get(), kCFPropertyListXMLFormat_v1_0, 0, NULL);
-        
-        CFURLRef file = CFURLCreateFromFileSystemRepresentation(NULL, (const UInt8*)m_out_path.c_str(), m_out_path.size(), FALSE);
-        
-        CFURLWriteDataAndPropertiesToResource(file,xmlData,NULL,NULL);
+        m_fetch_frames_measurement.WriteAverageValue(results);
+        m_file_line_bp_measurement.WriteAverageValue(results);
+        m_fetch_modules_measurement.WriteAverageValue(results);
+        m_fetch_vars_measurement.WriteAverageValue(results);
+        m_run_expr_measurement.WriteAverageValue(results);
+        results.Write(m_out_path.c_str());
     }
 
 private:

tools/lldb-perf/lib/Gauge.cpp

@@ -0,0 +1,52 @@
+//===-- Gauge.cpp -----------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "Gauge.h"
+
+template <>
+lldb_perf::Results::ResultSP
+lldb_perf::GetResult (const char *description, double value)
+{
+    if (description && description[0])
+    {
+        std::unique_ptr<Results::Dictionary> value_dict_ap (new Results::Dictionary ());
+        value_dict_ap->AddString("description", NULL, description);
+        value_dict_ap->AddDouble("value", NULL, value);
+        return Results::ResultSP (value_dict_ap.release());
+    }
+    return Results::ResultSP (new Results::Double (NULL, NULL, value));
+}
+
+template <>
+lldb_perf::Results::ResultSP
+lldb_perf::GetResult (const char *description, uint64_t value)
+{
+    if (description && description[0])
+    {
+        std::unique_ptr<Results::Dictionary> value_dict_ap (new Results::Dictionary ());
+        value_dict_ap->AddString("description", NULL, description);
+        value_dict_ap->AddUnsigned("value", NULL, value);
+        return Results::ResultSP (value_dict_ap.release());
+    }
+    return Results::ResultSP (new Results::Unsigned (NULL, NULL, value));
+}
+
+template <>
+lldb_perf::Results::ResultSP
+lldb_perf::GetResult (const char *description, std::string value)
+{
+    if (description && description[0])
+    {
+        std::unique_ptr<Results::Dictionary> value_dict_ap (new Results::Dictionary ());
+        value_dict_ap->AddString("description", NULL, description);
+        value_dict_ap->AddString("value", NULL, value.c_str());
+        return Results::ResultSP (value_dict_ap.release());
+    }
+    return Results::ResultSP (new Results::String (NULL, NULL, value.c_str()));
+}