python3kgae updated this revision to Diff 450217.
python3kgae added a comment.
Add -fcgl to make test work without DirectX backend.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D124752/new/
https://reviews.llvm.org/D124752
Files:
clang/lib/AST/Mangle.cpp
clang/lib/CodeGen/CGHLSLRuntime.cpp
clang/lib/CodeGen/CGHLSLRuntime.h
clang/lib/CodeGen/CodeGenModule.cpp
clang/test/CodeGenHLSL/entry.hlsl
clang/test/CodeGenHLSL/shader_type_attr.hlsl
Index: clang/test/CodeGenHLSL/shader_type_attr.hlsl
===================================================================
--- /dev/null
+++ clang/test/CodeGenHLSL/shader_type_attr.hlsl
@@ -0,0 +1,11 @@
+// RUN: %clang --driver-mode=dxc -Tlib_6_x -fcgl -Fo - %s | FileCheck %s
+
+// Make sure not mangle entry.
+// CHECK:define void @foo()
+// Make sure add function attribute.
+// CHECK:"dx.shader"="compute"
+[shader("compute")]
+[numthreads(1,1,1)]
+void foo() {
+
+}
Index: clang/test/CodeGenHLSL/entry.hlsl
===================================================================
--- /dev/null
+++ clang/test/CodeGenHLSL/entry.hlsl
@@ -0,0 +1,10 @@
+// RUN: %clang --driver-mode=dxc -Tcs_6_1 -Efoo -fcgl -Fo - %s | FileCheck %s
+
+// Make sure not mangle entry.
+// CHECK:define void @foo()
+// Make sure add function attribute.
+// CHECK:"dx.shader"="compute"
+[numthreads(1,1,1)]
+void foo() {
+
+}
Index: clang/lib/CodeGen/CodeGenModule.cpp
===================================================================
--- clang/lib/CodeGen/CodeGenModule.cpp
+++ clang/lib/CodeGen/CodeGenModule.cpp
@@ -1678,6 +1678,10 @@
/*AttrOnCallSite=*/false, IsThunk);
F->setAttributes(PAL);
F->setCallingConv(static_cast<llvm::CallingConv::ID>(CallingConv));
+ if (getLangOpts().HLSL) {
+ if (const FunctionDecl *FD = dyn_cast_or_null<FunctionDecl>(GD.getDecl()))
+ getHLSLRuntime().setHLSLFnuctionAttributes(F, FD);
+ }
}
static void removeImageAccessQualifier(std::string& TyName) {
Index: clang/lib/CodeGen/CGHLSLRuntime.h
===================================================================
--- clang/lib/CodeGen/CGHLSLRuntime.h
+++ clang/lib/CodeGen/CGHLSLRuntime.h
@@ -20,12 +20,15 @@
namespace llvm {
class Value;
class GlobalVariable;
+class Function;
} // namespace llvm
namespace clang {
class CallExpr;
class Type;
class VarDecl;
+class FunctionDecl;
+
namespace CodeGen {
class CodeGenModule;
@@ -43,6 +46,8 @@
void annotateHLSLResource(const VarDecl *D, llvm::GlobalVariable *GV);
void finishCodeGen();
+
+ void setHLSLFnuctionAttributes(llvm::Function *, const FunctionDecl *);
};
} // namespace CodeGen
Index: clang/lib/CodeGen/CGHLSLRuntime.cpp
===================================================================
--- clang/lib/CodeGen/CGHLSLRuntime.cpp
+++ clang/lib/CodeGen/CGHLSLRuntime.cpp
@@ -86,3 +86,12 @@
Ctx, {ValueAsMetadata::get(GV), MDString::get(Ctx, QT.getAsString()),
ConstantAsMetadata::get(B.getInt32(Counter))}));
}
+
+void clang::CodeGen::CGHLSLRuntime::setHLSLFnuctionAttributes(
+ llvm::Function *F, const FunctionDecl *FD) {
+ if (HLSLShaderAttr *ShaderAttr = FD->getAttr<HLSLShaderAttr>()) {
+ const StringRef ShaderAttrKindStr = "dx.shader";
+ F->addFnAttr(ShaderAttrKindStr,
+ ShaderAttr->ConvertShaderTypeToStr(ShaderAttr->getType()));
+ }
+}
Index: clang/lib/AST/Mangle.cpp
===================================================================
--- clang/lib/AST/Mangle.cpp
+++ clang/lib/AST/Mangle.cpp
@@ -133,6 +133,10 @@
if (isa<MSGuidDecl>(D))
return true;
+ // HLSL shader entry function never need to be mangled.
+ if (getASTContext().getLangOpts().HLSL && D->hasAttr<HLSLShaderAttr>())
+ return false;
+
return shouldMangleCXXName(D);
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
