Skip to content

release/20.x: [Clang][MicrosoftMangle] Implement mangling for ConstantMatrixType (#134930) #138017

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

Open
wants to merge 1 commit into
base: release/20.x
Choose a base branch
from
Open

release/20.x: [Clang][MicrosoftMangle] Implement mangling for ConstantMatrixType (#134930) #138017

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
17 changes: 16 additions & 1 deletion clang/lib/AST/MicrosoftMangle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3552,7 +3552,22 @@ void MicrosoftCXXNameMangler::mangleType(const DependentSizedExtVectorType *T,

void MicrosoftCXXNameMangler::mangleType(const ConstantMatrixType *T,
Qualifiers quals, SourceRange Range) {
Error(Range.getBegin(), "matrix type") << Range;
QualType EltTy = T->getElementType();
const BuiltinType *ET = EltTy->getAs<BuiltinType>();
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should also backport ccdd55c or manually delete this unused variable to keep the release branch CI green.


llvm::SmallString<64> TemplateMangling;
llvm::raw_svector_ostream Stream(TemplateMangling);
MicrosoftCXXNameMangler Extra(Context, Stream);

Stream << "?$";

Extra.mangleSourceName("__matrix");
Extra.mangleType(EltTy, Range, QMM_Escape);

Extra.mangleIntegerLiteral(llvm::APSInt::getUnsigned(T->getNumRows()));
Extra.mangleIntegerLiteral(llvm::APSInt::getUnsigned(T->getNumColumns()));

mangleArtificialTagType(TagTypeKind::Struct, TemplateMangling, {"__clang"});
}

void MicrosoftCXXNameMangler::mangleType(const DependentSizedMatrixType *T,
Expand Down
57 changes: 57 additions & 0 deletions clang/test/CodeGenCXX/mangle-ms-matrix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
// RUN: %clang_cc1 -fenable-matrix -fms-extensions -fcxx-exceptions -ffreestanding -target-feature +avx -emit-llvm %s -o - -triple=i686-pc-win32 | FileCheck %s
// RUN: %clang_cc1 -fenable-matrix -fms-extensions -fcxx-exceptions -ffreestanding -target-feature +avx -emit-llvm %s -o - -triple=i686-pc-win32 -fexperimental-new-constant-interpreter | FileCheck %s

typedef float __attribute__((matrix_type(4, 4))) m4x4f;
typedef float __attribute__((matrix_type(2, 2))) m2x2f;

typedef int __attribute__((matrix_type(4, 4))) m4x4i;
typedef int __attribute__((matrix_type(2, 2))) m2x2i;

void thow(int i) {
switch (i) {
case 0: throw m4x4f();
// CHECK: ??_R0U?$__matrix@M$03$03@__clang@@@8
// CHECK: _CT??_R0U?$__matrix@M$03$03@__clang@@@864
// CHECK: _CTA1U?$__matrix@M$03$03@__clang@@
// CHECK: _TI1U?$__matrix@M$03$03@__clang@@
case 1: throw m2x2f();
// CHECK: ??_R0U?$__matrix@M$01$01@__clang@@@8
// CHECK: _CT??_R0U?$__matrix@M$01$01@__clang@@@816
// CHECK: _CTA1U?$__matrix@M$01$01@__clang@@
// CHECK: _TI1U?$__matrix@M$01$01@__clang@@
case 2: throw m4x4i();
// CHECK: ??_R0U?$__matrix@H$03$03@__clang@@@8
// CHECK: _CT??_R0U?$__matrix@H$03$03@__clang@@@864
// CHECK: _CTA1U?$__matrix@H$03$03@__clang@@
// CHECK: _TI1U?$__matrix@H$03$03@__clang@@
case 3: throw m2x2i();
// CHECK: ??_R0U?$__matrix@H$01$01@__clang@@@8
// CHECK: _CT??_R0U?$__matrix@H$01$01@__clang@@@816
// CHECK: _CTA1U?$__matrix@H$01$01@__clang@@
// CHECK: _TI1U?$__matrix@H$01$01@__clang@@
}
}

void foo44f(m4x4f) {}
// CHECK: define dso_local void @"?foo44f@@YAXU?$__matrix@M$03$03@__clang@@@Z"

m4x4f rfoo44f() { return m4x4f(); }
// CHECK: define dso_local noundef <16 x float> @"?rfoo44f@@YAU?$__matrix@M$03$03@__clang@@XZ"

void foo22f(m2x2f) {}
// CHECK: define dso_local void @"?foo22f@@YAXU?$__matrix@M$01$01@__clang@@@Z"

m2x2f rfoo22f() { return m2x2f(); }
// CHECK: define dso_local noundef <4 x float> @"?rfoo22f@@YAU?$__matrix@M$01$01@__clang@@XZ"

void foo44i(m4x4i) {}
// CHECK: define dso_local void @"?foo44i@@YAXU?$__matrix@H$03$03@__clang@@@Z"

m4x4i rfoo44i() { return m4x4i(); }
// CHECK: define dso_local noundef <16 x i32> @"?rfoo44i@@YAU?$__matrix@H$03$03@__clang@@XZ"

void foo22i(m2x2i) {}
// CHECK: define dso_local void @"?foo22i@@YAXU?$__matrix@H$01$01@__clang@@@Z"

m2x2i rfoo22i() { return m2x2i(); }
// CHECK: define dso_local noundef <4 x i32> @"?rfoo22i@@YAU?$__matrix@H$01$01@__clang@@XZ"
Loading