Skip to content

[cxx-interop] Support SIMD types in reverse interop #83586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 22, 2025
Merged

[cxx-interop] Support SIMD types in reverse interop #83586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions lib/IRGen/IRABIDetailsProvider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#include "clang/CodeGen/ModuleBuilder.h"
#include "clang/CodeGen/SwiftCallingConv.h"
#include "llvm/IR/DerivedTypes.h"
#include <optional>

using namespace swift;
using namespace irgen;
Expand All @@ -59,14 +60,25 @@ getPrimitiveTypeFromLLVMType(ASTContext &ctx, const llvm::Type *type) {
default:
return std::nullopt;
}
} else if (type->isFloatTy()) {
}
if (type->isFloatTy()) {
return ctx.getFloatType();
} else if (type->isDoubleTy()) {
}
if (type->isDoubleTy()) {
return ctx.getDoubleType();
} else if (type->isPointerTy()) {
}
if (type->isPointerTy()) {
return ctx.getOpaquePointerType();
}
// FIXME: Handle vector type.
if (const auto *vecTy = dyn_cast<llvm::VectorType>(type)) {
auto elemTy = getPrimitiveTypeFromLLVMType(ctx, vecTy->getElementType());
if (!elemTy)
return std::nullopt;
auto elemCount = vecTy->getElementCount();
if (!elemCount.isFixed())
return std::nullopt;
return BuiltinVectorType::get(ctx, *elemTy, elemCount.getFixedValue());
}
return std::nullopt;
}

Expand Down
82 changes: 58 additions & 24 deletions lib/PrintAsClang/PrimitiveTypeMapping.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,16 @@
#include "PrimitiveTypeMapping.h"
#include "swift/AST/ASTContext.h"
#include "swift/AST/Decl.h"
#include "swift/AST/Identifier.h"
#include "swift/AST/Module.h"
#include "swift/Basic/Assertions.h"
#include "swift/ClangImporter/ClangImporter.h"
#include <optional>

using namespace swift;

/// Find the implementation of the named type in the named module if loaded.
static TypeDecl *findTypeInModuleByName(ASTContext &ctx,
Identifier moduleName,
static TypeDecl *findTypeInModuleByName(ASTContext &ctx, Identifier moduleName,
Identifier typeName) {
auto module = ctx.getLoadedModule(moduleName);
if (!module)
Expand Down Expand Up @@ -69,18 +70,15 @@ void PrimitiveTypeMapping::initialize(ASTContext &ctx) {

// Map stdlib types.
#define MAP(SWIFT_NAME, CLANG_REPR, NEEDS_NULLABILITY) \
addMappedType(ctx.StdlibModuleName, \
ctx.getIdentifier(#SWIFT_NAME), \
addMappedType(ctx.StdlibModuleName, ctx.getIdentifier(#SWIFT_NAME), \
{CLANG_REPR, std::optional<StringRef>(CLANG_REPR), \
std::optional<StringRef>(CLANG_REPR), NEEDS_NULLABILITY})
#define MAP_C(SWIFT_NAME, OBJC_REPR, C_REPR, NEEDS_NULLABILITY) \
addMappedType(ctx.StdlibModuleName, \
ctx.getIdentifier(#SWIFT_NAME), \
addMappedType(ctx.StdlibModuleName, ctx.getIdentifier(#SWIFT_NAME), \
{OBJC_REPR, std::optional<StringRef>(C_REPR), \
std::optional<StringRef>(C_REPR), NEEDS_NULLABILITY})
#define MAP_CXX(SWIFT_NAME, OBJC_REPR, C_REPR, CXX_REPR, NEEDS_NULLABILITY) \
addMappedType(ctx.StdlibModuleName, \
ctx.getIdentifier(#SWIFT_NAME), \
addMappedType(ctx.StdlibModuleName, ctx.getIdentifier(#SWIFT_NAME), \
{OBJC_REPR, std::optional<StringRef>(C_REPR), \
std::optional<StringRef>(CXX_REPR), NEEDS_NULLABILITY})

Expand Down Expand Up @@ -140,10 +138,10 @@ void PrimitiveTypeMapping::initialize(ASTContext &ctx) {
{"BOOL", std::nullopt, std::nullopt, false});
addMappedType(ctx.Id_ObjectiveC, ctx.getIdentifier("Selector"),
{"SEL", std::nullopt, std::nullopt, true});
addMappedType(ctx.Id_ObjectiveC,
ctx.getIdentifier(swift::getSwiftName(
KnownFoundationEntity::NSZone)),
{"struct _NSZone *", std::nullopt, std::nullopt, true});
addMappedType(
ctx.Id_ObjectiveC,
ctx.getIdentifier(swift::getSwiftName(KnownFoundationEntity::NSZone)),
{"struct _NSZone *", std::nullopt, std::nullopt, true});

addMappedType(ctx.Id_Darwin, ctx.getIdentifier("DarwinBoolean"),
{"Boolean", std::nullopt, std::nullopt, false});
Expand All @@ -157,17 +155,33 @@ void PrimitiveTypeMapping::initialize(ASTContext &ctx) {
// Use typedefs we set up for SIMD vector types.
#define MAP_SIMD_TYPE(BASENAME, _, __) \
StringRef simd2##BASENAME = "swift_" #BASENAME "2"; \
addMappedType(ctx.Id_simd, ctx.getIdentifier(#BASENAME "2"), \
{simd2##BASENAME, simd2##BASENAME, simd2##BASENAME, false}, \
/*applyToUnderlying*/false); \
addMappedType( \
ctx.Id_simd, ctx.getIdentifier(#BASENAME "2"), \
{simd2##BASENAME, simd2##BASENAME, simd2##BASENAME, false, true}, \
/*applyToUnderlying*/ false); \
addMappedType( \
ctx.Id_simd, ctx.getIdentifier("simd_" #BASENAME "2"), \
{simd2##BASENAME, simd2##BASENAME, simd2##BASENAME, false, true}, \
/*applyToUnderlying*/ false); \
StringRef simd3##BASENAME = "swift_" #BASENAME "3"; \
addMappedType(ctx.Id_simd, ctx.getIdentifier(#BASENAME "3"), \
{simd3##BASENAME, simd3##BASENAME, simd3##BASENAME, false}, \
/*applyToUnderlying*/false); \
addMappedType( \
ctx.Id_simd, ctx.getIdentifier(#BASENAME "3"), \
{simd3##BASENAME, simd3##BASENAME, simd3##BASENAME, false, true}, \
/*applyToUnderlying*/ false); \
addMappedType( \
ctx.Id_simd, ctx.getIdentifier("simd_" #BASENAME "3"), \
{simd3##BASENAME, simd3##BASENAME, simd3##BASENAME, false, true}, \
/*applyToUnderlying*/ false); \
StringRef simd4##BASENAME = "swift_" #BASENAME "4"; \
addMappedType(ctx.Id_simd, ctx.getIdentifier(#BASENAME "4"), \
{simd4##BASENAME, simd4##BASENAME, simd4##BASENAME, false}, \
/*applyToUnderlying*/false);
addMappedType( \
ctx.Id_simd, ctx.getIdentifier(#BASENAME "4"), \
{simd4##BASENAME, simd4##BASENAME, simd4##BASENAME, false, true}, \
/*applyToUnderlying*/ false); \
addMappedType( \
ctx.Id_simd, ctx.getIdentifier("simd_" #BASENAME "4"), \
{simd4##BASENAME, simd4##BASENAME, simd4##BASENAME, false, true}, \
/*applyToUnderlying*/ false);

#include "swift/ClangImporter/SIMDMappedTypes.def"
static_assert(SWIFT_MAX_IMPORTED_SIMD_ELEMENTS == 4,
"must add or remove special name mappings if max number of "
Expand All @@ -192,15 +206,17 @@ PrimitiveTypeMapping::getMappedTypeInfoOrNull(const TypeDecl *typeDecl) {
std::optional<PrimitiveTypeMapping::ClangTypeInfo>
PrimitiveTypeMapping::getKnownObjCTypeInfo(const TypeDecl *typeDecl) {
if (auto *typeInfo = getMappedTypeInfoOrNull(typeDecl))
return ClangTypeInfo{typeInfo->objcName, typeInfo->canBeNullable};
return ClangTypeInfo{typeInfo->objcName, typeInfo->canBeNullable,
typeInfo->simd};
return std::nullopt;
}

std::optional<PrimitiveTypeMapping::ClangTypeInfo>
PrimitiveTypeMapping::getKnownCTypeInfo(const TypeDecl *typeDecl) {
if (auto *typeInfo = getMappedTypeInfoOrNull(typeDecl)) {
if (typeInfo->cName)
return ClangTypeInfo{*typeInfo->cName, typeInfo->canBeNullable};
return ClangTypeInfo{*typeInfo->cName, typeInfo->canBeNullable,
typeInfo->simd};
}
return std::nullopt;
}
Expand All @@ -209,7 +225,25 @@ std::optional<PrimitiveTypeMapping::ClangTypeInfo>
PrimitiveTypeMapping::getKnownCxxTypeInfo(const TypeDecl *typeDecl) {
if (auto *typeInfo = getMappedTypeInfoOrNull(typeDecl)) {
if (typeInfo->cxxName)
return ClangTypeInfo{*typeInfo->cxxName, typeInfo->canBeNullable};
return ClangTypeInfo{*typeInfo->cxxName, typeInfo->canBeNullable,
typeInfo->simd};
}
return std::nullopt;
}

std::optional<PrimitiveTypeMapping::ClangTypeInfo>
PrimitiveTypeMapping::getKnownSIMDTypeInfo(Type t, ASTContext &ctx) {
auto vecTy = t->getAs<BuiltinVectorType>();
if (!vecTy)
return std::nullopt;

auto elemTy = vecTy->getElementType();
auto numElems = vecTy->getNumElements();

std::string elemTyName = elemTy.getString();
// While the element type starts with an upper case, vector types start with
// lower case.
elemTyName[0] = std::tolower(elemTyName[0]);
Identifier swiftName = ctx.getIdentifier("swift_" + elemTyName + std::to_string(numElems));
return ClangTypeInfo{swiftName.str(), false, true};
}
10 changes: 8 additions & 2 deletions lib/PrintAsClang/PrimitiveTypeMapping.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,21 @@ namespace swift {

class ASTContext;
class TypeDecl;
class Type;

/// Provides a mapping from Swift's primitive types to C / Objective-C / C++
/// primitive types.
///
/// Certain types have mappings that differ in different language modes.
/// For example, Swift's `Int` maps to `NSInteger` for Objective-C declarations,
/// but to something like `intptr_t` or `swift::Int` for C and C++ declarations.
/// For example, Swift's `Int` maps to `NSInteger` for Objective-C
/// declarations, but to something like `intptr_t` or `swift::Int` for C and
/// C++ declarations.
class PrimitiveTypeMapping {
public:
struct ClangTypeInfo {
StringRef name;
bool canBeNullable;
bool simd;
};

/// Returns the Objective-C type name and nullability for the given Swift
Expand All @@ -47,6 +50,8 @@ class PrimitiveTypeMapping {
/// primitive type declaration, or \c None if no such type name exists.
std::optional<ClangTypeInfo> getKnownCxxTypeInfo(const TypeDecl *typeDecl);

std::optional<ClangTypeInfo> getKnownSIMDTypeInfo(Type t, ASTContext &ctx);

private:
void initialize(ASTContext &ctx);

Expand All @@ -58,6 +63,7 @@ class PrimitiveTypeMapping {
// The C++ name of the Swift type.
std::optional<StringRef> cxxName;
bool canBeNullable;
bool simd = false;
};

FullClangTypeInfo *getMappedTypeInfoOrNull(const TypeDecl *typeDecl);
Expand Down
Loading