release/20.x: [Clang][MicrosoftMangle] Implement mangling for ConstantMatrixType (#134930) #138017
+72
−1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@rnk What do you think about merging this PR to the release branch? |
|
@llvm/pr-subscribers-clang Author: None (llvmbot) ChangesBackport f5a30f1 Requested by: @tstellar Full diff: https://github.com/llvm/llvm-project/pull/138017.diff 2 Files Affected:
diff --git a/clang/lib/AST/MicrosoftMangle.cpp b/clang/lib/AST/MicrosoftMangle.cpp
index 42b735ccf4a2c..74c995f2f97f0 100644
--- a/clang/lib/AST/MicrosoftMangle.cpp
+++ b/clang/lib/AST/MicrosoftMangle.cpp
@@ -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>();
+
+ 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,
diff --git a/clang/test/CodeGenCXX/mangle-ms-matrix.cpp b/clang/test/CodeGenCXX/mangle-ms-matrix.cpp
new file mode 100644
index 0000000000000..b244aa6e33cfa
--- /dev/null
+++ b/clang/test/CodeGenCXX/mangle-ms-matrix.cpp
@@ -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"
\ No newline at end of file
|
|
|
rnk
approved these changes
Apr 30, 2025
clang/lib/AST/MicrosoftMangle.cpp
Outdated
| @@ -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>(); | |||
There was a problem hiding this comment.
You should also backport ccdd55c or manually delete this unused variable to keep the release branch CI green.
There was a problem hiding this comment.
Is there a backport request for this?
There was a problem hiding this comment.
I've added this commit to the PR now.
…lvm#134930) This pull request implements mangling for ConstantMatrixType, allowing matrices to be used on Windows. Related issues: llvm#53158, llvm#127127 This example code: ```cpp #include <typeinfo> #include <stdio.h> typedef float Matrix4 __attribute__((matrix_type(4, 4))); int main() { printf("%s\n", typeid(Matrix4).name()); } ``` Outputs this: ``` struct __clang::__matrix<float,4,4> ``` (cherry picked from commit f5a30f1)
…x patch (cherry picked from commit ccdd55c)
|
@tstellar (or anyone else). If you would like to add a note about this fix in the release notes (completely optional). Please reply to this comment with a one or two sentence description of the fix. When you are done, please add the release:note label to this PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport f5a30f1
Requested by: @tstellar