Merge pull request swiftlang#1303 from dcci/simd-50

apple-llvm-split-commit: a13041f1f6d3a8c7e10b41b8eed39bf1b74390b8
apple-llvm-split-dir: lldb/

Author: swift-ci

lldb/lit/SwiftREPL/SIMD.test

@@ -1,6 +1,5 @@
-// Test formatters for Accelerate/simd.
+// Test formatters for SIMD.
 // REQUIRES: darwin
-// REQUIRES: rdar46330565
 
 // RUN: %lldb --repl < %s | FileCheck %s
 
@@ -169,3 +168,10 @@ simd_quatf(vector: colf4)
 
 simd_quatd(vector: cold4)
 // CHECK: $R{{.*}}: simd_quatd = (1.500000e+00, 2.000000e+00, 3.000000e+00, 4.000000e+00)
+
+// Test the new SIMD types
+let tinky = SIMD2<Int>(1, 2)
+// CHECK: {{tinky}}: SIMD2<Int> = (1, 2)
+
+let patatino = SIMD4<Double>(1.5, 2.5, 3.5, 4.5)
+// CHECK: {{patatino}}: SIMD4<Double> = (1.5, 2.5, 3.5, 4.5)

lldb/packages/Python/lldbsuite/test/lang/swift/accelerate_simd/TestAccelerateSIMD.py

@@ -13,5 +13,4 @@
 from lldbsuite.test.decorators import *
 
 lldbinline.MakeInlineTest(__file__, globals(),
-                          decorators=[swiftTest,skipUnlessDarwin,
-                                      skipIf(bugnumber=46330565)])
+                          decorators=[swiftTest,skipUnlessDarwin])

lldb/packages/Python/lldbsuite/test/lang/swift/accelerate_simd/main.swift

@@ -1,21 +1,12 @@
-// main.swift
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-// -----------------------------------------------------------------------------
-
 import simd
 
 func main() -> Int {
-  let d4 = simd_double4(1.5, 2, 3, 4) //%self.expect('frame variable d4', substrs=['1.5', '2', '3', '4'])
-  print(d4)
-  return 0
+  let d4 = simd_double4(1.5, 2, 3, 4) 
+  let patatino = SIMD4<Int>(1,2,3,4)
+  let tinky = SIMD2<Int>(12, 24)
+  return 0 //%self.expect('frame variable d4', substrs=['1.5', '2', '3', '4'])
+           //%self.expect('frame var patatino', substrs=['(1, 2, 3, 4)'])
+           //%self.expect('frame var tinky', substrs=['(12, 24)'])
 }
 
 main()

lldb/source/Plugins/Language/Swift/SwiftFormatters.cpp

@@ -18,6 +18,7 @@
 #include "lldb/Target/SwiftLanguageRuntime.h"
 #include "lldb/Utility/DataBufferHeap.h"
 #include "lldb/Utility/Status.h"
+#include "swift/AST/Types.h"
 #include "swift/Demangling/ManglingMacros.h"
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/StringRef.h"
@@ -979,8 +980,9 @@ llvm::Optional<std::vector<std::string>>
 ReadVector(Process &process, ValueObject &valobj,
            const SIMDElementFormatter &formatter, unsigned num_elements) {
   Status error;
+  static ConstString g_storage("_storage");
   static ConstString g_value("_value");
-  ValueObjectSP value_sp = valobj.GetChildAtNamePath({g_value});
+  ValueObjectSP value_sp = valobj.GetChildAtNamePath({g_storage, g_value});
   if (!value_sp)
     return llvm::None;
 
@@ -1032,17 +1034,76 @@ void PrintMatrix(Stream &stream,
 
 } // end anonymous namespace
 
-bool lldb_private::formatters::swift::AccelerateSIMD_SummaryProvider(
+bool lldb_private::formatters::swift::SIMDVector_SummaryProvider(
     ValueObject &valobj, Stream &stream, const TypeSummaryOptions &options) {
   Status error;
   ProcessSP process_sp(valobj.GetProcessSP());
   if (!process_sp)
     return false;
+  Process &process = *process_sp.get();
+
+  // SIMD vector contains an inner member `_storage` which is an opaque
+  // container. Given SIMD is always in the form SIMDX<Type> where X is a
+  // positive integer, we can calculate the number of elements and the
+  // dynamic archetype (and hence its size). Everything follows naturally
+  // as the elements are laid out in a contigous buffer without padding.
+  CompilerType simd_type = valobj.GetCompilerType();
+  void *type_buffer = reinterpret_cast<void *>(simd_type.GetOpaqueQualType());
+  llvm::Optional<uint64_t> opt_type_size = simd_type.GetByteSize(nullptr);
+  if (!opt_type_size)
+    return false;
+  uint64_t type_size = *opt_type_size;
+
+  auto swift_type = reinterpret_cast<::swift::TypeBase *>(type_buffer);
+  auto bound_type = dyn_cast<::swift::BoundGenericType>(swift_type);
+  if (!bound_type)
+    return false;
+  auto generic_args = bound_type->getGenericArgs();
+  lldbassert(generic_args.size() == 1 && "broken SIMD type");
+  if (generic_args.size() != 1)
+    return false;
+  auto swift_arg_type = generic_args[0];
+  CompilerType arg_type(swift_arg_type);
+
+  llvm::Optional<uint64_t> opt_arg_size = arg_type.GetByteSize(nullptr);
+  if (!opt_arg_size)
+    return false;
+  uint64_t arg_size = *opt_arg_size;
+
+  DataExtractor storage_buf;
+  uint64_t len = valobj.GetData(storage_buf, error);
+  lldbassert(len == type_size && "extracted less bytes than requested");
+  if (len < type_size)
+    return false;
+
+  uint64_t num_elements = type_size / arg_size;
+  std::vector<std::string> elem_vector;
+  for (int i = 0; i < num_elements; ++i) {
+    DataExtractor elem_extractor(storage_buf, i * arg_size, arg_size);
+    auto simd_elem = ValueObject::CreateValueObjectFromData(
+        "simd_elem", elem_extractor, valobj.GetExecutionContextRef(), arg_type);
+    if (!simd_elem || simd_elem->GetError().Fail())
+      return false;
+
+    auto synthetic = simd_elem->GetSyntheticValue();
+    const char *value_string = synthetic->GetValueAsCString();
+    elem_vector.push_back(value_string);
+  }
 
+  return PrintRow(stream, elem_vector);
+}
+
+bool lldb_private::formatters::swift::LegacySIMD_SummaryProvider(
+    ValueObject &valobj, Stream &stream, const TypeSummaryOptions &options) {
+  Status error;
+  ProcessSP process_sp(valobj.GetProcessSP());
+  if (!process_sp)
+    return false;
   Process &process = *process_sp.get();
 
   // Get the type name without the "simd.simd_" prefix.
   ConstString full_type_name = valobj.GetTypeName();
+
   llvm::StringRef type_name = full_type_name.GetStringRef();
   if (type_name.startswith("simd."))
     type_name = type_name.drop_front(5);

lldb/source/Plugins/Language/Swift/SwiftFormatters.h

@@ -90,8 +90,11 @@ bool CountableClosedRange_SummaryProvider(ValueObject &valobj, Stream &stream,
 bool StridedRangeGenerator_SummaryProvider(ValueObject &valobj, Stream &stream,
                                            const TypeSummaryOptions &options);
 
-bool AccelerateSIMD_SummaryProvider(ValueObject &valobj, Stream &stream,
-                                    const TypeSummaryOptions &options);
+bool SIMDVector_SummaryProvider(ValueObject &valobj, Stream &stream,
+                                const TypeSummaryOptions &options);
+
+bool LegacySIMD_SummaryProvider(ValueObject &valobj, Stream &stream,
+                                const TypeSummaryOptions &options);
 
 bool GLKit_SummaryProvider(ValueObject &valobj, Stream &stream,
                            const TypeSummaryOptions &options);

lldb/source/Plugins/Language/Swift/SwiftLanguage.cpp

@@ -538,14 +538,21 @@ static void LoadSwiftFormatters(lldb::TypeCategoryImplSP swift_category_sp) {
       .SetDontShowChildren(true)
       .SetHideItemNames(true)
       .SetShowMembersOneLiner(false);
-  const char *accelSIMDTypes = "^(simd\\.)?(simd_)?("
-                               "(int|uint|float|double)[234]|"
-                               "(float|double)[234]x[234]|"
-                               "quat(f|d)"
-                               ")$";
+  const char *SIMDTypes = "^(simd\\.)?(simd_)?("
+                          "(int|uint|float|double)[234]|"
+                          "(float|double)[234]x[234]|"
+                          "quat(f|d)"
+                          ")$";
+
+  const char *newSIMDTypes = "^SIMD[0-9]+<.*>$";
+
+  AddCXXSummary(swift_category_sp,
+                lldb_private::formatters::swift::LegacySIMD_SummaryProvider,
+                "SIMD (legacy) summary provider", ConstString(SIMDTypes),
+                simd_summary_flags, true);
   AddCXXSummary(swift_category_sp,
-                lldb_private::formatters::swift::AccelerateSIMD_SummaryProvider,
-                "Accelerate/SIMD summary provider", ConstString(accelSIMDTypes),
+                lldb_private::formatters::swift::SIMDVector_SummaryProvider,
+                "Vector SIMD summary provider", ConstString(newSIMDTypes),
                 simd_summary_flags, true);
 
   const char *GLKitTypes = "^(GLKMatrix[234]|GLKVector[234]|GLKQuaternion)$";