Resubmit: RenderScript command for printing allocation contents

[EwanCrawford]

Summary

Previous patch http://reviews.llvm.org/D13699 broke TestDataFormatterSmartArray.py
Resolved in in this patch by adding the new enum eFormatVectorOfFloat16 to FormatManager.

I'm not too familiar with DataFormatter code, so +Enrico as he's code owner.

lldb/trunk/include/lldb/lldb-enumerations.h

enum Format
         eFormatVectorOfSInt8,
         eFormatVectorOfUInt8,
         eFormatVectorOfSInt16,
         eFormatVectorOfUInt16,
         eFormatVectorOfSInt32,
         eFormatVectorOfUInt32,
         eFormatVectorOfSInt64,
         eFormatVectorOfUInt64,
+        eFormatVectorOfFloat16,
         eFormatVectorOfFloat32,
         eFormatVectorOfFloat64,
         eFormatVectorOfUInt128,
         eFormatComplexInteger,      // Integer complex type
         eFormatCharArray,           // Print characters with no single quotes, used for character arrays that can contain non printable characters
         eFormatAddressInfo,         // Describe what an address points to (func + offset with file/line, symbol + offset, data, etc)
         eFormatHexFloat,            // ISO C99 hex float string
         eFormatInstruction,         // Disassemble an opcode

lldb/trunk/source/Commands/CommandObjectMemory.cpp

FinalizeSettings (Target *target, OptionGroupFormat& format_options)
             case eFormatVectorOfSInt8:
             case eFormatVectorOfUInt8:
             case eFormatVectorOfSInt16:
             case eFormatVectorOfUInt16:
             case eFormatVectorOfSInt32:
             case eFormatVectorOfUInt32:
             case eFormatVectorOfSInt64:
             case eFormatVectorOfUInt64:
+            case eFormatVectorOfFloat16:
             case eFormatVectorOfFloat32:
             case eFormatVectorOfFloat64:
             case eFormatVectorOfUInt128:
                 if (!byte_size_option_set)
                     byte_size_value = 128;
                 if (!num_per_line_option_set)
                     m_num_per_line = 1;
                 if (!count_option_set)

lldb/trunk/source/Core/DataExtractor.cpp

// implementation details they should not care about ||
             break;
 
         case eFormatVectorOfUInt64:
             s->PutChar('{');
             offset = Dump (s, offset, eFormatHex,     sizeof(uint64_t), item_byte_size / sizeof(uint64_t), item_byte_size / sizeof(uint64_t), LLDB_INVALID_ADDRESS, 0, 0);
             s->PutChar('}');
             break;
 
+        case eFormatVectorOfFloat16:
+            s->PutChar('{');
+            offset = Dump (s, offset, eFormatFloat,       2, item_byte_size / 2, item_byte_size / 2, LLDB_INVALID_ADDRESS, 0, 0);
+            s->PutChar('}');
+            break;
+
         case eFormatVectorOfFloat32:
             s->PutChar('{');
             offset = Dump (s, offset, eFormatFloat,       4, item_byte_size / 4, item_byte_size / 4, LLDB_INVALID_ADDRESS, 0, 0);
             s->PutChar('}');
             break;
 
         case eFormatVectorOfFloat64:
             s->PutChar('{');

lldb/trunk/source/DataFormatters/FormatManager.cpp

g_format_infos[] =
     { eFormatVectorOfSInt8  , '\0'  , "int8_t[]"            },
     { eFormatVectorOfUInt8  , '\0'  , "uint8_t[]"           },
     { eFormatVectorOfSInt16 , '\0'  , "int16_t[]"           },
     { eFormatVectorOfUInt16 , '\0'  , "uint16_t[]"          },
     { eFormatVectorOfSInt32 , '\0'  , "int32_t[]"           },
     { eFormatVectorOfUInt32 , '\0'  , "uint32_t[]"          },
     { eFormatVectorOfSInt64 , '\0'  , "int64_t[]"           },
     { eFormatVectorOfUInt64 , '\0'  , "uint64_t[]"          },
+    { eFormatVectorOfFloat16, '\0'  , "float16[]"           },
     { eFormatVectorOfFloat32, '\0'  , "float32[]"           },
     { eFormatVectorOfFloat64, '\0'  , "float64[]"           },
     { eFormatVectorOfUInt128, '\0'  , "uint128_t[]"         },
     { eFormatComplexInteger , 'I'   , "complex integer"     },
     { eFormatCharArray      , 'a'   , "character array"     },
     { eFormatAddressInfo    , 'A'   , "address"             },
     { eFormatHexFloat       , '\0'  , "hex float"           },
     { eFormatInstruction    , 'i'   , "instruction"         },
switch(vector_format)
             
         case eFormatVectorOfUInt8:
         case eFormatVectorOfUInt16:
         case eFormatVectorOfUInt32:
         case eFormatVectorOfUInt64:
         case eFormatVectorOfUInt128:
             return eFormatHex;
             
+        case eFormatVectorOfFloat16:
         case eFormatVectorOfFloat32:
         case eFormatVectorOfFloat64:
             return eFormatFloat;
             
         default:
             return lldb::eFormatInvalid;
     }
 }

lldb/trunk/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h

public:
     bool ProbeModules(const ModuleList module_list);
 
     void DumpModules(Stream &strm) const;
 
     void DumpContexts(Stream &strm) const;
 
     void DumpKernels(Stream &strm) const;
 
+    bool DumpAllocation(Stream &strm, StackFrame* frame_ptr, const uint32_t id);
+
     void ListAllocations(Stream &strm, StackFrame* frame_ptr, bool recompute);
 
     void AttemptBreakpointAtKernelName(Stream &strm, const char *name, Error &error, lldb::TargetSP target);
 
     void SetBreakAllKernels(bool do_break, lldb::TargetSP target);
 
     void Status(Stream &strm) const;
 
private:
     void HookCallback(RuntimeHook* hook_info, ExecutionContext& context);
 
     bool GetArgSimple(ExecutionContext& context, uint32_t arg, uint64_t* data);
 
     void CaptureScriptInit1(RuntimeHook* hook_info, ExecutionContext& context);
     void CaptureAllocationInit1(RuntimeHook* hook_info, ExecutionContext& context);
     void CaptureSetGlobalVar1(RuntimeHook* hook_info, ExecutionContext& context);
 
+    AllocationDetails* FindAllocByID(Stream &strm, const uint32_t alloc_id);
+
     //
     // Helper functions for jitting the runtime
     //
     bool JITDataPointer(AllocationDetails* allocation, StackFrame* frame_ptr,
                         unsigned int x = 0, unsigned int y = 0, unsigned int z = 0);
 
     bool JITTypePointer(AllocationDetails* allocation, StackFrame* frame_ptr);
 
     bool JITTypePacked(AllocationDetails* allocation, StackFrame* frame_ptr);
 
     bool JITElementPacked(AllocationDetails* allocation, StackFrame* frame_ptr);
 
+    bool JITAllocationSize(AllocationDetails* allocation, StackFrame* frame_ptr, const uint32_t elem_size);
+
+    bool JITAllocationStride(AllocationDetails* allocation, StackFrame* frame_ptr);
+
     // Search for a script detail object using a target address.
     // If a script does not currently exist this function will return nullptr.
     // If 'create' is true and there is no previous script with this address,
     // then a new Script detail object will be created for this address and returned.
     ScriptDetails* LookUpScript(lldb::addr_t address, bool create);
 
     // Search for a previously saved allocation detail object using a target address.
     // If an allocation does not exist for this address then nullptr will be returned.
     // If 'create' is true and there is no previous allocation then a new allocation
     // detail object will be created for this address and returned.
     AllocationDetails* LookUpAllocation(lldb::addr_t address, bool create);
 };
 
 } // namespace lldb_private
 
 #endif // liblldb_RenderScriptRuntime_h_

lldb/trunk/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp

 //===-- RenderScriptRuntime.cpp ---------------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 #include "RenderScriptRuntime.h"
 
 #include "lldb/Core/ConstString.h"
 #include "lldb/Core/Debugger.h"
 #include "lldb/Core/Error.h"
 #include "lldb/Core/Log.h"
 #include "lldb/Core/PluginManager.h"
+#include "lldb/Host/StringConvert.h"
 #include "lldb/Symbol/Symbol.h"
 #include "lldb/Symbol/Type.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/Target.h"
 #include "lldb/Interpreter/Args.h"
 #include "lldb/Interpreter/Options.h"
 #include "lldb/Interpreter/CommandInterpreter.h"
 #include "lldb/Interpreter/CommandReturnObject.h"
enum DataType
 
     // Maps Allocation DataType enum and vector size to printable strings
     // using mapping from RenderScript numerical types summary documentation
     static const char* RsDataTypeToString[][4];
 
     // Maps Allocation DataKind enum to printable strings
     static const char* RsDataKindToString[];
 
+    // Maps allocation types to format sizes for printing.
+    static const unsigned int RSTypeToFormat[][3];
+
     // Give each allocation an ID as a way
     // for commands to reference it.
     const unsigned int id;
 
     empirical_type<DataType> type;            // Type of each data pointer stored by the allocation
     empirical_type<DataKind> type_kind;       // Defines pixel type if Allocation is created from an image
     empirical_type<uint32_t> type_vec_size;   // Vector size of each data point, e.g '4' for uchar4
     empirical_type<Dimension> dimension;      // Dimensions of the Allocation
     empirical_type<lldb::addr_t> address;     // Pointer to address of the RS Allocation
     empirical_type<lldb::addr_t> data_ptr;    // Pointer to the data held by the Allocation
     empirical_type<lldb::addr_t> type_ptr;    // Pointer to the RS Type of the Allocation
     empirical_type<lldb::addr_t> element_ptr; // Pointer to the RS Element of the Type
     empirical_type<lldb::addr_t> context;     // Pointer to the RS Context of the Allocation
+    empirical_type<uint32_t> size;            // Size of the allocation
+    empirical_type<uint32_t> stride;          // Stride between rows of the allocation
 
     // Give each allocation an id, so we can reference it in user commands.
     AllocationDetails(): id(ID++)
     {
     }
 
 };
 
const char* RenderScriptRuntime::AllocationDetails::RsDataTypeToString[][4] =
     {"long", "long2", "long3", "long4"},
     {"uchar", "uchar2", "uchar3", "uchar4"},
     {"ushort", "ushort2", "ushort3", "ushort4"},
     {"uint", "uint2", "uint3", "uint4"},
     {"ulong", "ulong2", "ulong3", "ulong4"},
     {"bool", "bool2", "bool3", "bool4"}
 };
 
+// Used as an index into the RSTypeToFormat array elements
+enum TypeToFormatIndex {
+   eFormatSingle = 0,
+   eFormatVector,
+   eElementSize
+};
+
+// { format enum of single element, format enum of element vector, size of element}
+const unsigned int RenderScriptRuntime::AllocationDetails::RSTypeToFormat[][3] =
+{
+    {eFormatHex, eFormatHex, 1}, // RS_TYPE_NONE
+    {eFormatFloat, eFormatVectorOfFloat16, 2}, // RS_TYPE_FLOAT_16
+    {eFormatFloat, eFormatVectorOfFloat32, sizeof(float)}, // RS_TYPE_FLOAT_32
+    {eFormatFloat, eFormatVectorOfFloat64, sizeof(double)}, // RS_TYPE_FLOAT_64
+    {eFormatDecimal, eFormatVectorOfSInt8, sizeof(int8_t)}, // RS_TYPE_SIGNED_8
+    {eFormatDecimal, eFormatVectorOfSInt16, sizeof(int16_t)}, // RS_TYPE_SIGNED_16
+    {eFormatDecimal, eFormatVectorOfSInt32, sizeof(int32_t)}, // RS_TYPE_SIGNED_32
+    {eFormatDecimal, eFormatVectorOfSInt64, sizeof(int64_t)}, // RS_TYPE_SIGNED_64
+    {eFormatDecimal, eFormatVectorOfUInt8, sizeof(uint8_t)}, // RS_TYPE_UNSIGNED_8
+    {eFormatDecimal, eFormatVectorOfUInt16, sizeof(uint16_t)}, // RS_TYPE_UNSIGNED_16
+    {eFormatDecimal, eFormatVectorOfUInt32, sizeof(uint32_t)}, // RS_TYPE_UNSIGNED_32
+    {eFormatDecimal, eFormatVectorOfUInt64, sizeof(uint64_t)}, // RS_TYPE_UNSIGNED_64
+    {eFormatBoolean, eFormatBoolean, sizeof(bool)} // RS_TYPE_BOOL
+};
+
 //------------------------------------------------------------------
 // Static Functions
 //------------------------------------------------------------------
 LanguageRuntime *
 RenderScriptRuntime::CreateInstance(Process *process, lldb::LanguageType language)
 {
 
     if (language == eLanguageTypeExtRenderScript)
RenderScriptRuntime::JITElementPacked(AllocationDetails* allocation, StackFrame* frame_ptr)
 
     if (log)
         log->Printf("RenderScriptRuntime::JITElementPacked - data type %u, pixel type %u, vector size %u",
                     *allocation->type.get(), *allocation->type_kind.get(), *allocation->type_vec_size.get());
 
     return true;
 }
 
+// JITs the RS runtime for the address of the last element in the allocation.
+// The `elem_size` paramter represents the size of a single element, including padding.
+// Which is needed as an offset from the last element pointer.
+// Using this offset minus the starting address we can calculate the size of the allocation.
+// Returns true on success, false otherwise
+bool
+RenderScriptRuntime::JITAllocationSize(AllocationDetails* allocation, StackFrame* frame_ptr,
+                                       const uint32_t elem_size)
+{
+    Log* log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
+
+    if (!allocation->address.isValid() || !allocation->dimension.isValid()
+        || !allocation->data_ptr.isValid())
+    {
+        if (log)
+            log->Printf("RenderScriptRuntime::JITAllocationSize - Failed to find allocation details");
+        return false;
+    }
+
+    const char* expr_cstr = runtimeExpressions[eExprGetOffsetPtr];
+    const int max_expr_size = 512; // Max expression size
+    char buffer[max_expr_size];
+
+    // Find dimensions
+    unsigned int dim_x = allocation->dimension.get()->dim_1;
+    unsigned int dim_y = allocation->dimension.get()->dim_2;
+    unsigned int dim_z = allocation->dimension.get()->dim_3;
+
+    // Calculate last element
+    dim_x = dim_x == 0 ? 0 : dim_x - 1;
+    dim_y = dim_y == 0 ? 0 : dim_y - 1;
+    dim_z = dim_z == 0 ? 0 : dim_z - 1;
+
+    int chars_written = snprintf(buffer, max_expr_size, expr_cstr, *allocation->address.get(),
+                                 dim_x, dim_y, dim_z);
+    if (chars_written < 0)
+    {
+        if (log)
+            log->Printf("RenderScriptRuntime::JITAllocationSize - Encoding error in snprintf()");
+        return false;
+    }
+    else if (chars_written >= max_expr_size)
+    {
+        if (log)
+            log->Printf("RenderScriptRuntime::JITAllocationSize - Expression too long");
+        return false;
+    }
+
+    uint64_t result = 0;
+    if (!EvalRSExpression(buffer, frame_ptr, &result))
+        return false;
+
+    addr_t mem_ptr = static_cast<lldb::addr_t>(result);
+    // Find pointer to last element and add on size of an element
+    allocation->size = static_cast<uint32_t>(mem_ptr - *allocation->data_ptr.get()) + elem_size;
+
+    return true;
+}
+
+// JITs the RS runtime for information about the stride between rows in the allocation.
+// This is done to detect padding, since allocated memory is 16-byte aligned.
+// Returns true on success, false otherwise
+bool
+RenderScriptRuntime::JITAllocationStride(AllocationDetails* allocation, StackFrame* frame_ptr)
+{
+    Log* log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
+
+    if (!allocation->address.isValid() || !allocation->data_ptr.isValid())
+    {
+        if (log)
+            log->Printf("RenderScriptRuntime::JITAllocationStride - Failed to find allocation details");
+        return false;
+    }
+
+    const char* expr_cstr = runtimeExpressions[eExprGetOffsetPtr];
+    const int max_expr_size = 512; // Max expression size
+    char buffer[max_expr_size];
+
+    int chars_written = snprintf(buffer, max_expr_size, expr_cstr, *allocation->address.get(),
+                                 0, 1, 0);
+    if (chars_written < 0)
+    {
+        if (log)
+            log->Printf("RenderScriptRuntime::JITAllocationStride - Encoding error in snprintf()");
+        return false;
+    }
+    else if (chars_written >= max_expr_size)
+    {
+        if (log)
+            log->Printf("RenderScriptRuntime::JITAllocationStride - Expression too long");
+        return false;
+    }
+
+    uint64_t result = 0;
+    if (!EvalRSExpression(buffer, frame_ptr, &result))
+        return false;
+
+    addr_t mem_ptr = static_cast<lldb::addr_t>(result);
+    allocation->stride = static_cast<uint32_t>(mem_ptr - *allocation->data_ptr.get());
+
+    return true;
+}
+
 // JIT all the current runtime info regarding an allocation
 bool
 RenderScriptRuntime::RefreshAllocation(AllocationDetails* allocation, StackFrame* frame_ptr)
 {
     // GetOffsetPointer()
     if (!JITDataPointer(allocation, frame_ptr))
         return false;
 
for (const auto &module : m_rsmodules)
         {
             strm.Indent(kernel.m_name.AsCString());
             strm.EOL();
         }
     }
     strm.IndentLess();
 }
 
+RenderScriptRuntime::AllocationDetails*
+RenderScriptRuntime::FindAllocByID(Stream &strm, const uint32_t alloc_id)
+{
+    AllocationDetails* alloc = nullptr;
+
+    // See if we can find allocation using id as an index;
+    if (alloc_id <= m_allocations.size() && alloc_id != 0
+        && m_allocations[alloc_id-1]->id == alloc_id)
+    {
+        alloc = m_allocations[alloc_id-1].get();
+        return alloc;
+    }
+
+    // Fallback to searching
+    for (const auto & a : m_allocations)
+    {
+       if (a->id == alloc_id)
+       {
+           alloc = a.get();
+           break;
+       }
+    }
+
+    if (alloc == nullptr)
+    {
+        strm.Printf("Error: Couldn't find allocation with id matching %u", alloc_id);
+        strm.EOL();
+    }
+
+    return alloc;
+}
+
+// Prints the contents of an allocation to the output stream, which may be a file
+bool
+RenderScriptRuntime::DumpAllocation(Stream &strm, StackFrame* frame_ptr, const uint32_t id)
+{
+    Log* log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
+
+    // Check we can find the desired allocation
+    AllocationDetails* alloc = FindAllocByID(strm, id);
+    if (!alloc)
+        return false; // FindAllocByID() will print error message for us here
+
+    if (log)
+        log->Printf("RenderScriptRuntime::DumpAllocation - Found allocation 0x%" PRIx64, *alloc->address.get());
+
+    // Check we have information about the allocation, if not calculate it
+    if (!alloc->data_ptr.isValid() || !alloc->type.isValid() ||
+        !alloc->type_vec_size.isValid() || !alloc->dimension.isValid())
+    {
+        if (log)
+            log->Printf("RenderScriptRuntime::DumpAllocation - Allocation details not calculated yet, jitting info");
+
+        // JIT all the allocation information
+        if (!RefreshAllocation(alloc, frame_ptr))
+        {
+            strm.Printf("Error: Couldn't JIT allocation details");
+            strm.EOL();
+            return false;
+        }
+    }
+
+    // Establish format and size of each data element
+    const unsigned int vec_size = *alloc->type_vec_size.get();
+    const AllocationDetails::DataType type = *alloc->type.get();
+
+    assert(type >= AllocationDetails::RS_TYPE_NONE && type <= AllocationDetails::RS_TYPE_BOOLEAN
+                                                   && "Invalid allocation type");
+
+    lldb::Format format = vec_size == 1 ? static_cast<lldb::Format>(AllocationDetails::RSTypeToFormat[type][eFormatSingle])
+                                        : static_cast<lldb::Format>(AllocationDetails::RSTypeToFormat[type][eFormatVector]);
+
+    const unsigned int data_size = vec_size * AllocationDetails::RSTypeToFormat[type][eElementSize];
+    // Renderscript pads vector 3 elements to vector 4
+    const unsigned int elem_padding = vec_size == 3 ? AllocationDetails::RSTypeToFormat[type][eElementSize] : 0;
+
+    if (log)
+        log->Printf("RenderScriptRuntime::DumpAllocation - Element size %u bytes, element padding %u bytes",
+                    data_size, elem_padding);
+
+    // Calculate stride between rows as there may be padding at end of rows since
+    // allocated memory is 16-byte aligned
+    if (!alloc->stride.isValid())
+    {
+        if (alloc->dimension.get()->dim_2 == 0) // We only have one dimension
+            alloc->stride = 0;
+        else if (!JITAllocationStride(alloc, frame_ptr))
+        {
+            strm.Printf("Error: Couldn't calculate allocation row stride");
+            strm.EOL();
+            return false;
+        }
+    }
+    const unsigned int stride = *alloc->stride.get();
+
+    // Calculate data size
+    if (!alloc->size.isValid() && !JITAllocationSize(alloc, frame_ptr, data_size + elem_padding))
+    {
+        strm.Printf("Error: Couldn't calculate allocation size");
+        strm.EOL();
+        return false;
+    }
+    const unsigned int size = *alloc->size.get(); //size of last element
+
+    if (log)
+        log->Printf("RenderScriptRuntime::DumpAllocation - stride %u bytes, size %u bytes", stride, size);
+
+    // Allocate a buffer to copy data into
+    uint8_t* buffer = new uint8_t[size];
+    if (!buffer)
+    {
+        strm.Printf("Error: Couldn't allocate a %u byte buffer to read memory into", size);
+        strm.EOL();
+        return false;
+    }
+
+    // Read Memory into buffer
+    Error error;
+    Process* process = GetProcess();
+    const addr_t data_ptr = *alloc->data_ptr.get();
+    const uint32_t archByteSize = process->GetTarget().GetArchitecture().GetAddressByteSize();
+    DataExtractor alloc_data(buffer, size, process->GetByteOrder(), archByteSize);
+
+    if (log)
+        log->Printf("RenderScriptRuntime::DumpAllocation - Reading %u bytes of allocation data from 0x%" PRIx64,
+                    size, data_ptr);
+
+    // Read the inferior memory
+    process->ReadMemory(data_ptr, buffer, size, error);
+    if (error.Fail())
+    {
+        strm.Printf("Error: Couldn't read %u bytes of allocation data from 0x%" PRIx64, size, data_ptr);
+        strm.EOL();
+        delete[] buffer; // remember to free memory
+        return false;
+    }
+
+    // Find dimensions used to index loops, so need to be non-zero
+    unsigned int dim_x = alloc->dimension.get()->dim_1;
+    dim_x = dim_x == 0 ? 1 : dim_x;
+
+    unsigned int dim_y = alloc->dimension.get()->dim_2;
+    dim_y = dim_y == 0 ? 1 : dim_y;
+
+    unsigned int dim_z = alloc->dimension.get()->dim_3;
+    dim_z = dim_z == 0 ? 1 : dim_z;
+
+    unsigned int offset = 0;   // Offset in buffer to next element to be printed
+    unsigned int prev_row = 0; // Offset to the start of the previous row
+
+    // Iterate over allocation dimensions, printing results to user
+    strm.Printf("Data (X, Y, Z):");
+    for (unsigned int z = 0; z < dim_z; ++z)
+    {
+        for (unsigned int y = 0; y < dim_y; ++y)
+        {
+            // Use stride to index start of next row.
+            if (!(y==0 && z==0))
+                offset = prev_row + stride;
+            prev_row = offset;
+
+            // Print each element in the row individually
+            for (unsigned int x = 0; x < dim_x; ++x)
+            {
+                strm.Printf("\n(%u, %u, %u) = ", x, y, z);
+                alloc_data.Dump(&strm, offset, format, data_size, 1, 1, LLDB_INVALID_ADDRESS, 0, 0);
+                offset += data_size + elem_padding;
+            }
+        }
+    }
+    strm.EOL();
+
+    delete[] buffer;
+    return true;
+}
+
 // Prints infomation regarding all the currently loaded allocations.
 // These details are gathered by jitting the runtime, which has as latency.
 void
 RenderScriptRuntime::ListAllocations(Stream &strm, StackFrame* frame_ptr, bool recompute)
 {
     strm.Printf("RenderScript Allocations:");
     strm.EOL();
     strm.IndentMore();
CommandObjectRenderScriptRuntimeContext(CommandInterpreter &interpreter)
                                  NULL)
     {
         LoadSubCommand("dump", CommandObjectSP(new CommandObjectRenderScriptRuntimeContextDump(interpreter)));
     }
 
     ~CommandObjectRenderScriptRuntimeContext() {}
 };
 
+
+class CommandObjectRenderScriptRuntimeAllocationDump : public CommandObjectParsed
+{
+  private:
+  public:
+    CommandObjectRenderScriptRuntimeAllocationDump(CommandInterpreter &interpreter)
+        : CommandObjectParsed(interpreter, "renderscript allocation dump",
+                              "Displays the contents of a particular allocation", "renderscript allocation dump <ID>",
+                              eCommandRequiresProcess | eCommandProcessMustBeLaunched), m_options(interpreter)
+    {
+    }
+
+    virtual Options*
+    GetOptions()
+    {
+        return &m_options;
+    }
+
+    class CommandOptions : public Options
+    {
+      public:
+        CommandOptions(CommandInterpreter &interpreter) : Options(interpreter)
+        {
+        }
+
+        virtual
+        ~CommandOptions()
+        {
+        }
+
+        virtual Error
+        SetOptionValue(uint32_t option_idx, const char *option_arg)
+        {
+            Error error;
+            const int short_option = m_getopt_table[option_idx].val;
+
+            switch (short_option)
+            {
+                case 'f':
+                    m_outfile.SetFile(option_arg, true);
+                    if (m_outfile.Exists())
+                    {
+                        m_outfile.Clear();
+                        error.SetErrorStringWithFormat("file already exists: '%s'", option_arg);
+                    }
+                    break;
+                default:
+                    error.SetErrorStringWithFormat("unrecognized option '%c'", short_option);
+                    break;
+            }
+            return error;
+        }
+
+        void
+        OptionParsingStarting()
+        {
+            m_outfile.Clear();
+        }
+
+        const OptionDefinition*
+        GetDefinitions()
+        {
+            return g_option_table;
+        }
+
+        static OptionDefinition g_option_table[];
+        FileSpec m_outfile;
+    };
+
+    ~CommandObjectRenderScriptRuntimeAllocationDump() {}
+
+    bool
+    DoExecute(Args &command, CommandReturnObject &result)
+    {
+        const size_t argc = command.GetArgumentCount();
+        if (argc < 1)
+        {
+            result.AppendErrorWithFormat("'%s' takes 1 argument, an allocation ID. As well as an optional -f argument",
+                                         m_cmd_name.c_str());
+            result.SetStatus(eReturnStatusFailed);
+            return false;
+        }
+
+        RenderScriptRuntime *runtime =
+          static_cast<RenderScriptRuntime *>(m_exe_ctx.GetProcessPtr()->GetLanguageRuntime(eLanguageTypeExtRenderScript));
+
+        const char* id_cstr = command.GetArgumentAtIndex(0);
+        bool convert_complete = false;
+        const uint32_t id = StringConvert::ToUInt32(id_cstr, UINT32_MAX, 0, &convert_complete);
+        if (!convert_complete)
+        {
+            result.AppendErrorWithFormat("invalid allocation id argument '%s'", id_cstr);
+            result.SetStatus(eReturnStatusFailed);
+            return false;
+        }
+
+        Stream* output_strm = nullptr;
+        StreamFile outfile_stream;
+        const FileSpec &outfile_spec = m_options.m_outfile; // Dump allocation to file instead
+        if (outfile_spec)
+        {
+            // Open output file
+            char path[256];
+            outfile_spec.GetPath(path, sizeof(path));
+            if (outfile_stream.GetFile().Open(path, File::eOpenOptionWrite | File::eOpenOptionCanCreate).Success())
+            {
+                output_strm = &outfile_stream;
+                result.GetOutputStream().Printf("Results written to '%s'", path);
+                result.GetOutputStream().EOL();
+            }
+            else
+            {
+                result.AppendErrorWithFormat("Couldn't open file '%s'", path);
+                result.SetStatus(eReturnStatusFailed);
+                return false;
+            }
+        }
+        else
+            output_strm = &result.GetOutputStream();
+
+        assert(output_strm != nullptr);
+        bool success = runtime->DumpAllocation(*output_strm, m_exe_ctx.GetFramePtr(), id);
+
+        if (success)
+            result.SetStatus(eReturnStatusSuccessFinishResult);
+        else
+            result.SetStatus(eReturnStatusFailed);
+
+        return true;
+    }
+
+    private:
+        CommandOptions m_options;
+};
+
+OptionDefinition
+CommandObjectRenderScriptRuntimeAllocationDump::CommandOptions::g_option_table[] =
+{
+    { LLDB_OPT_SET_1, false, "file", 'f', OptionParser::eRequiredArgument, NULL, NULL, 0, eArgTypeFilename,
+      "Print results to specified file instead of command line."},
+    { 0, false, NULL, 0, 0, NULL, NULL, 0, eArgTypeNone, NULL }
+};
+
+
 class CommandObjectRenderScriptRuntimeAllocationList : public CommandObjectParsed
 {
   public:
     CommandObjectRenderScriptRuntimeAllocationList(CommandInterpreter &interpreter)
         : CommandObjectParsed(interpreter, "renderscript allocation list",
                               "List renderscript allocations and their information.", "renderscript allocation list",
                               eCommandRequiresProcess | eCommandProcessMustBeLaunched), m_options(interpreter)
     {

 {
   private:
   public:
     CommandObjectRenderScriptRuntimeAllocation(CommandInterpreter &interpreter)
         : CommandObjectMultiword(interpreter, "renderscript allocation", "Commands that deal with renderscript allocations.",
                                  NULL)
     {
         LoadSubCommand("list", CommandObjectSP(new CommandObjectRenderScriptRuntimeAllocationList(interpreter)));
+        LoadSubCommand("dump", CommandObjectSP(new CommandObjectRenderScriptRuntimeAllocationDump(interpreter)));
     }
 
     ~CommandObjectRenderScriptRuntimeAllocation() {}
 };
 
 
 class CommandObjectRenderScriptRuntimeStatus : public CommandObjectParsed
 {