[DNM] SIMD, take 2

include/swift/Runtime/BuiltinTypes.def

@@ -74,32 +74,43 @@ BUILTIN_VECTOR_TYPE(Bi16_, Int16, 4)
 BUILTIN_VECTOR_TYPE(Bi16_, Int16, 8)
 BUILTIN_VECTOR_TYPE(Bi16_, Int16, 16)
 BUILTIN_VECTOR_TYPE(Bi16_, Int16, 32)
+BUILTIN_VECTOR_TYPE(Bi16_, Int16, 64)
 
 // Int32 vector types
 BUILTIN_VECTOR_TYPE(Bi32_, Int32, 2)
 BUILTIN_VECTOR_TYPE(Bi32_, Int32, 3)
 BUILTIN_VECTOR_TYPE(Bi32_, Int32, 4)
 BUILTIN_VECTOR_TYPE(Bi32_, Int32, 8)
 BUILTIN_VECTOR_TYPE(Bi32_, Int32, 16)
+BUILTIN_VECTOR_TYPE(Bi32_, Int32, 32)
+BUILTIN_VECTOR_TYPE(Bi32_, Int32, 64)
 
 // Int64 vector types
 BUILTIN_VECTOR_TYPE(Bi64_, Int64, 2)
 BUILTIN_VECTOR_TYPE(Bi64_, Int64, 3)
 BUILTIN_VECTOR_TYPE(Bi64_, Int64, 4)
 BUILTIN_VECTOR_TYPE(Bi64_, Int64, 8)
+BUILTIN_VECTOR_TYPE(Bi64_, Int64, 16)
+BUILTIN_VECTOR_TYPE(Bi64_, Int64, 32)
+BUILTIN_VECTOR_TYPE(Bi64_, Int64, 64)
 
 // Float32 vector types
 BUILTIN_VECTOR_TYPE(Bf32_, FPIEEE32, 2)
 BUILTIN_VECTOR_TYPE(Bf32_, FPIEEE32, 3)
 BUILTIN_VECTOR_TYPE(Bf32_, FPIEEE32, 4)
 BUILTIN_VECTOR_TYPE(Bf32_, FPIEEE32, 8)
 BUILTIN_VECTOR_TYPE(Bf32_, FPIEEE32, 16)
+BUILTIN_VECTOR_TYPE(Bf32_, FPIEEE32, 32)
+BUILTIN_VECTOR_TYPE(Bf32_, FPIEEE32, 64)
 
 // Float64 vector types
 BUILTIN_VECTOR_TYPE(Bf64_, FPIEEE64, 2)
 BUILTIN_VECTOR_TYPE(Bf64_, FPIEEE64, 3)
 BUILTIN_VECTOR_TYPE(Bf64_, FPIEEE64, 4)
 BUILTIN_VECTOR_TYPE(Bf64_, FPIEEE64, 8)
+BUILTIN_VECTOR_TYPE(Bf64_, FPIEEE64, 16)
+BUILTIN_VECTOR_TYPE(Bf64_, FPIEEE64, 32)
+BUILTIN_VECTOR_TYPE(Bf64_, FPIEEE64, 64)
 
 #undef BUILTIN_VECTOR_TYPE
 #undef VECTOR_BUILTIN_SYMBOL_NAME

lib/IRGen/GenClangType.cpp

@@ -453,6 +453,7 @@ GenClangType::visitBoundGenericType(CanBoundGenericType type) {
     AutoreleasingUnsafeMutablePointer,
     Unmanaged,
     CFunctionPointer,
+    SIMD,
   } kind = llvm::StringSwitch<StructKind>(swiftStructDecl->getName().str())
     .Case("UnsafeMutablePointer", StructKind::UnsafeMutablePointer)
     .Case("UnsafePointer", StructKind::UnsafePointer)
@@ -461,6 +462,7 @@ GenClangType::visitBoundGenericType(CanBoundGenericType type) {
         StructKind::AutoreleasingUnsafeMutablePointer)
     .Case("Unmanaged", StructKind::Unmanaged)
     .Case("CFunctionPointer", StructKind::CFunctionPointer)
+    .StartsWith("SIMD", StructKind::SIMD)
     .Default(StructKind::Invalid);
 
   auto args = type.getGenericArgs();
@@ -472,7 +474,7 @@ GenClangType::visitBoundGenericType(CanBoundGenericType type) {
   case StructKind::Invalid:
     llvm_unreachable("Unexpected non-pointer generic struct type in imported"
                      " Clang module!");
-      
+
   case StructKind::UnsafeMutablePointer:
   case StructKind::Unmanaged:
   case StructKind::AutoreleasingUnsafeMutablePointer: {
@@ -499,6 +501,19 @@ GenClangType::visitBoundGenericType(CanBoundGenericType type) {
     auto fnPtrTy = clangCtx.getPointerType(functionTy);
     return getCanonicalType(fnPtrTy);
   }
+
+  case StructKind::SIMD: {
+    clang::QualType scalarTy = Converter.convert(IGM, loweredArgTy);
+    auto numEltsString = swiftStructDecl->getName().str();
+    numEltsString.consume_front("SIMD");
+    unsigned numElts;
+    bool failedParse = numEltsString.getAsInteger<unsigned>(10, numElts);
+    assert(!failedParse && "SIMD type name didn't end in count?");
+    (void) failedParse;
+    auto vectorTy = getClangASTContext().getVectorType(scalarTy, numElts,
+      clang::VectorType::VectorKind::GenericVector);
+    return getCanonicalType(vectorTy);
+  }
   }
 
   llvm_unreachable("Not a valid StructKind.");

stdlib/public/SDK/SceneKit/SceneKit.swift.gyb

@@ -51,13 +51,13 @@ extension SCNVector3 {
   }
 }
 
-extension float3 {
+extension SIMD3 where Scalar == Float {
   public init(_ v: SCNVector3) {
     self.init(Float(v.x), Float(v.y), Float(v.z))
   }
 }
 
-extension double3 {
+extension SIMD3 where Scalar == Double {
   public init(_ v: SCNVector3) {
     self.init(Double(v.x), Double(v.y), Double(v.z))
   }
@@ -86,13 +86,13 @@ extension SCNVector4 {
   }
 }
 
-extension float4 {
+extension SIMD4 where Scalar == Float {
   public init(_ v: SCNVector4) {
     self.init(Float(v.x), Float(v.y), Float(v.z), Float(v.w))
   }
 }
 
-extension double4 {
+extension SIMD4 where Scalar == Double {
   public init(_ v: SCNVector4) {
     self.init(Double(v.x), Double(v.y), Double(v.z), Double(v.w))
   }