https://github.com/hekota updated
https://github.com/llvm/llvm-project/pull/135120
>From 85001dcbc184491dfb24e9d2a39df46fd4c9a363 Mon Sep 17 00:00:00 2001
From: Helena Kotas <heko...@microsoft.com>
Date: Wed, 9 Apr 2025 18:17:26 -0700
Subject: [PATCH 1/2] Initialize resources by constructors
- add resource record constructor with explicit binding
- completes implementation of default resource constructor
- removes resource initialization for Codegen for resource records
- cbuffer still needs to be initialized in Codegen because it does not have a
resource class type
---
clang/include/clang/Basic/Builtins.td | 12 ++
clang/include/clang/Sema/SemaHLSL.h | 1 +
clang/lib/CodeGen/CGHLSLBuiltins.cpp | 18 ++
clang/lib/CodeGen/CGHLSLRuntime.cpp | 78 ++++-----
clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.cpp | 36 +++-
clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.h | 1 +
clang/lib/Sema/HLSLExternalSemaSource.cpp | 3 +-
clang/lib/Sema/SemaDecl.cpp | 6 +-
clang/lib/Sema/SemaHLSL.cpp | 89 ++++++++++
.../test/AST/HLSL/StructuredBuffers-AST.hlsl | 60 ++++++-
clang/test/AST/HLSL/TypedBuffers-AST.hlsl | 5 +-
.../ByteAddressBuffers-constructors.hlsl | 129 +++++++++++---
.../builtins/RWBuffer-constructor-opt.hlsl | 2 +-
.../builtins/RWBuffer-constructor.hlsl | 117 ++++++++++++-
.../StructuredBuffers-constructors.hlsl | 159 ++++++++++++------
clang/test/CodeGenHLSL/cbuffer.hlsl | 8 +-
.../CodeGenHLSL/cbuffer_with_packoffset.hlsl | 4 +-
clang/test/CodeGenHLSL/resource-bindings.hlsl | 52 +++---
.../hlsl_resource_handle_attrs.hlsl | 4 +-
19 files changed, 610 insertions(+), 174 deletions(-)
diff --git a/clang/include/clang/Basic/Builtins.td
b/clang/include/clang/Basic/Builtins.td
index 868e5b92acdc9..5e92715f59e57 100644
--- a/clang/include/clang/Basic/Builtins.td
+++ b/clang/include/clang/Basic/Builtins.td
@@ -4789,6 +4789,18 @@ def HLSLResourceGetPointer : LangBuiltin<"HLSL_LANG"> {
let Prototype = "void(...)";
}
+def HLSLResourceCreatePoisonHandle : LangBuiltin<"HLSL_LANG"> {
+ let Spellings = ["__builtin_hlsl_resource_createpoisonhandle"];
+ let Attributes = [NoThrow];
+ let Prototype = "void(...)";
+}
+
+def HLSLResourceCreateHandleFromBinding : LangBuiltin<"HLSL_LANG"> {
+ let Spellings = ["__builtin_hlsl_resource_createhandlefrombinding"];
+ let Attributes = [NoThrow];
+ let Prototype = "void(...)";
+}
+
def HLSLAll : LangBuiltin<"HLSL_LANG"> {
let Spellings = ["__builtin_hlsl_all"];
let Attributes = [NoThrow, Const];
diff --git a/clang/include/clang/Sema/SemaHLSL.h
b/clang/include/clang/Sema/SemaHLSL.h
index f333fe30e8da0..a913d6cce62bd 100644
--- a/clang/include/clang/Sema/SemaHLSL.h
+++ b/clang/include/clang/Sema/SemaHLSL.h
@@ -105,6 +105,7 @@ class SemaHLSL : public SemaBase {
HLSLParamModifierAttr::Spelling Spelling);
void ActOnTopLevelFunction(FunctionDecl *FD);
void ActOnVariableDeclarator(VarDecl *VD);
+ bool ActOnUninitializedVarDecl(VarDecl *D);
void ActOnEndOfTranslationUnit(TranslationUnitDecl *TU);
void CheckEntryPoint(FunctionDecl *FD);
void CheckSemanticAnnotation(FunctionDecl *EntryPoint, const Decl *Param,
diff --git a/clang/lib/CodeGen/CGHLSLBuiltins.cpp
b/clang/lib/CodeGen/CGHLSLBuiltins.cpp
index 99c62808c323d..c652f435781f0 100644
--- a/clang/lib/CodeGen/CGHLSLBuiltins.cpp
+++ b/clang/lib/CodeGen/CGHLSLBuiltins.cpp
@@ -287,6 +287,24 @@ Value *CodeGenFunction::EmitHLSLBuiltinExpr(unsigned
BuiltinID,
RetTy, CGM.getHLSLRuntime().getCreateResourceGetPointerIntrinsic(),
ArrayRef<Value *>{HandleOp, IndexOp});
}
+ case Builtin::BI__builtin_hlsl_resource_createpoisonhandle: {
+ llvm::Type *HandleTy = CGM.getTypes().ConvertType(E->getType());
+ return llvm::PoisonValue::get(HandleTy);
+ }
+ case Builtin::BI__builtin_hlsl_resource_createhandlefrombinding: {
+ llvm::Type *HandleTy = CGM.getTypes().ConvertType(E->getType());
+ Value *SpaceNoOp = EmitScalarExpr(E->getArg(1));
+ Value *RegisterNoOp = EmitScalarExpr(E->getArg(2));
+ Value *RangeOp = EmitScalarExpr(E->getArg(3));
+ Value *IndexOp = EmitScalarExpr(E->getArg(4));
+ // FIXME: NonUniformResourceIndex bit is not yet implemented
+ Value *NonUniform =
+ llvm::ConstantInt::get(llvm::Type::getInt1Ty(getLLVMContext()), false);
+ return Builder.CreateIntrinsic(
+ HandleTy, CGM.getHLSLRuntime().getCreateHandleFromBindingIntrinsic(),
+ ArrayRef<Value *>{SpaceNoOp, RegisterNoOp, RangeOp, IndexOp,
+ NonUniform});
+ }
case Builtin::BI__builtin_hlsl_all: {
Value *Op0 = EmitScalarExpr(E->getArg(0));
return Builder.CreateIntrinsic(
diff --git a/clang/lib/CodeGen/CGHLSLRuntime.cpp
b/clang/lib/CodeGen/CGHLSLRuntime.cpp
index 3b1810b62a2cd..c7fb6b57c47dc 100644
--- a/clang/lib/CodeGen/CGHLSLRuntime.cpp
+++ b/clang/lib/CodeGen/CGHLSLRuntime.cpp
@@ -41,8 +41,9 @@ using namespace llvm;
using llvm::hlsl::CBufferRowSizeInBytes;
-static void createResourceInitFn(CodeGenModule &CGM, llvm::GlobalVariable *GV,
- unsigned Slot, unsigned Space);
+static void initializeBufferFromBinding(CodeGenModule &CGM,
+ llvm::GlobalVariable *GV, unsigned
Slot,
+ unsigned Space);
namespace {
@@ -255,14 +256,14 @@ void CGHLSLRuntime::addBuffer(const HLSLBufferDecl
*BufDecl) {
// Add globals for constant buffer elements and create metadata nodes
emitBufferGlobalsAndMetadata(BufDecl, BufGV);
- // Resource initialization
+ // Initialize cbuffer from binding (implicit or explicit)
const HLSLResourceBindingAttr *RBA =
BufDecl->getAttr<HLSLResourceBindingAttr>();
// FIXME: handle implicit binding if no binding attribute is found
// (llvm/llvm-project#110722)
if (RBA)
- createResourceInitFn(CGM, BufGV, RBA->getSlotNumber(),
- RBA->getSpaceNumber());
+ initializeBufferFromBinding(CGM, BufGV, RBA->getSlotNumber(),
+ RBA->getSpaceNumber());
}
llvm::TargetExtType *
@@ -494,15 +495,15 @@ void CGHLSLRuntime::generateGlobalCtorDtorCalls() {
}
}
-static void createResourceInitFn(CodeGenModule &CGM, llvm::GlobalVariable *GV,
- unsigned Slot, unsigned Space) {
- LLVMContext &Ctx = CGM.getLLVMContext();
- llvm::Type *Int1Ty = llvm::Type::getInt1Ty(Ctx);
+static void initializeBuffer(CodeGenModule &CGM, llvm::GlobalVariable *GV,
+ Intrinsic::ID IntrID,
+ ArrayRef<llvm::Value *> Args) {
+ LLVMContext &Ctx = CGM.getLLVMContext();
llvm::Function *InitResFunc = llvm::Function::Create(
llvm::FunctionType::get(CGM.VoidTy, false),
llvm::GlobalValue::InternalLinkage,
- ("_init_resource_" + GV->getName()).str(), CGM.getModule());
+ ("_init_buffer_" + GV->getName()).str(), CGM.getModule());
InitResFunc->addFnAttr(llvm::Attribute::AlwaysInline);
llvm::BasicBlock *EntryBB =
@@ -511,28 +512,12 @@ static void createResourceInitFn(CodeGenModule &CGM,
llvm::GlobalVariable *GV,
const DataLayout &DL = CGM.getModule().getDataLayout();
Builder.SetInsertPoint(EntryBB);
- // Make sure the global variable is resource handle (cbuffer) or
- // resource class (=class where the first element is a resource handle).
+ // Make sure the global variable is buffer resource handle
llvm::Type *HandleTy = GV->getValueType();
- assert((HandleTy->isTargetExtTy() ||
- (HandleTy->isStructTy() &&
- HandleTy->getStructElementType(0)->isTargetExtTy())) &&
- "unexpected type of the global");
- if (!HandleTy->isTargetExtTy())
- HandleTy = HandleTy->getStructElementType(0);
+ assert(HandleTy->isTargetExtTy() && "unexpected type of the buffer global");
- llvm::Value *Args[] = {
- llvm::ConstantInt::get(CGM.IntTy, Space), /* reg_space */
- llvm::ConstantInt::get(CGM.IntTy, Slot), /* lower_bound */
- // FIXME: resource arrays are not yet implemented
- llvm::ConstantInt::get(CGM.IntTy, 1), /* range_size */
- llvm::ConstantInt::get(CGM.IntTy, 0), /* index */
- // FIXME: NonUniformResourceIndex bit is not yet implemented
- llvm::ConstantInt::get(Int1Ty, false) /* non-uniform */
- };
llvm::Value *CreateHandle = Builder.CreateIntrinsic(
- /*ReturnType=*/HandleTy,
- CGM.getHLSLRuntime().getCreateHandleFromBindingIntrinsic(), Args,
nullptr,
+ /*ReturnType=*/HandleTy, IntrID, Args, nullptr,
Twine(GV->getName()).concat("_h"));
llvm::Value *HandleRef = Builder.CreateStructGEP(GV->getValueType(), GV, 0);
@@ -543,26 +528,25 @@ static void createResourceInitFn(CodeGenModule &CGM,
llvm::GlobalVariable *GV,
CGM.AddCXXGlobalInit(InitResFunc);
}
-void CGHLSLRuntime::handleGlobalVarDefinition(const VarDecl *VD,
- llvm::GlobalVariable *GV) {
-
- // If the global variable has resource binding, create an init function
- // for the resource
- const HLSLResourceBindingAttr *RBA = VD->getAttr<HLSLResourceBindingAttr>();
- if (!RBA)
- // FIXME: collect unbound resources for implicit binding resolution later
- // on?
- return;
-
- if (!VD->getType().getTypePtr()->isHLSLResourceRecord())
- // FIXME: Only simple declarations of resources are supported for now.
- // Arrays of resources or resources in user defined classes are
- // not implemented yet.
- return;
-
- createResourceInitFn(CGM, GV, RBA->getSlotNumber(), RBA->getSpaceNumber());
+static void initializeBufferFromBinding(CodeGenModule &CGM,
+ llvm::GlobalVariable *GV, unsigned
Slot,
+ unsigned Space) {
+ llvm::Type *Int1Ty = llvm::Type::getInt1Ty(CGM.getLLVMContext());
+ llvm::Value *Args[] = {
+ llvm::ConstantInt::get(CGM.IntTy, Space), /* reg_space */
+ llvm::ConstantInt::get(CGM.IntTy, Slot), /* lower_bound */
+ llvm::ConstantInt::get(CGM.IntTy, 1), /* range_size */
+ llvm::ConstantInt::get(CGM.IntTy, 0), /* index */
+ llvm::ConstantInt::get(Int1Ty, false) /* non-uniform */
+ };
+ initializeBuffer(CGM, GV,
+ CGM.getHLSLRuntime().getCreateHandleFromBindingIntrinsic(),
+ Args);
}
+void CGHLSLRuntime::handleGlobalVarDefinition(const VarDecl *VD,
+ llvm::GlobalVariable *GV) {}
+
llvm::Instruction *CGHLSLRuntime::getConvergenceToken(BasicBlock &BB) {
if (!CGM.shouldEmitConvergenceTokens())
return nullptr;
diff --git a/clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.cpp
b/clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.cpp
index 2d3e1088557ab..4fd01404b012e 100644
--- a/clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.cpp
+++ b/clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.cpp
@@ -400,6 +400,7 @@ void BuiltinTypeMethodBuilder::createDecl() {
// create params & set them to the function prototype
SmallVector<ParmVarDecl *> ParmDecls;
+ unsigned CurScopeDepth = DeclBuilder.SemaRef.getCurScope()->getDepth();
auto FnProtoLoc =
Method->getTypeSourceInfo()->getTypeLoc().getAs<FunctionProtoTypeLoc>();
for (int I = 0, E = Params.size(); I != E; I++) {
@@ -414,6 +415,7 @@ void BuiltinTypeMethodBuilder::createDecl() {
HLSLParamModifierAttr::Create(AST, SourceRange(), MP.Modifier);
Parm->addAttr(Mod);
}
+ Parm->setScopeInfo(CurScopeDepth, I);
ParmDecls.push_back(Parm);
FnProtoLoc.setParam(I, Parm);
}
@@ -447,10 +449,14 @@ BuiltinTypeMethodBuilder::callBuiltin(StringRef
BuiltinName,
AST, NestedNameSpecifierLoc(), SourceLocation(), FD, false,
FD->getNameInfo(), AST.BuiltinFnTy, VK_PRValue);
+ auto *ImpCast = ImplicitCastExpr::Create(
+ AST, AST.getPointerType(FD->getType()), CK_BuiltinFnToFnPtr, DRE,
nullptr,
+ VK_PRValue, FPOptionsOverride());
+
if (ReturnType.isNull())
ReturnType = FD->getReturnType();
- Expr *Call = CallExpr::Create(AST, DRE, Args, ReturnType, VK_PRValue,
+ Expr *Call = CallExpr::Create(AST, ImpCast, Args, ReturnType, VK_PRValue,
SourceLocation(), FPOptionsOverride());
StmtsList.push_back(Call);
return *this;
@@ -632,11 +638,33 @@ BuiltinTypeDeclBuilder
&BuiltinTypeDeclBuilder::addDefaultHandleConstructor() {
if (Record->isCompleteDefinition())
return *this;
- // FIXME: initialize handle to poison value; this can be added after
- // resource constructor from binding is implemented, otherwise the handle
- // value will get overwritten.
+ using PH = BuiltinTypeMethodBuilder::PlaceHolder;
+ QualType HandleType = getResourceHandleField()->getType();
return BuiltinTypeMethodBuilder(*this, "", SemaRef.getASTContext().VoidTy,
false, true)
+ .callBuiltin("__builtin_hlsl_resource_createpoisonhandle", HandleType,
+ PH::Handle)
+ .assign(PH::Handle, PH::LastStmt)
+ .finalize();
+}
+
+BuiltinTypeDeclBuilder &
+BuiltinTypeDeclBuilder::addHandleConstructorFromBinding() {
+ if (Record->isCompleteDefinition())
+ return *this;
+
+ using PH = BuiltinTypeMethodBuilder::PlaceHolder;
+ ASTContext &AST = SemaRef.getASTContext();
+ QualType HandleType = getResourceHandleField()->getType();
+
+ return BuiltinTypeMethodBuilder(*this, "", AST.VoidTy, false, true)
+ .addParam("spaceNo", AST.UnsignedIntTy)
+ .addParam("registerNo", AST.UnsignedIntTy)
+ .addParam("range", AST.IntTy)
+ .addParam("index", AST.UnsignedIntTy)
+ .callBuiltin("__builtin_hlsl_resource_createhandlefrombinding",
+ HandleType, PH::Handle, PH::_0, PH::_1, PH::_2, PH::_3)
+ .assign(PH::Handle, PH::LastStmt)
.finalize();
}
diff --git a/clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.h
b/clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.h
index dbf54dfd9ecd9..db617dc53c899 100644
--- a/clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.h
+++ b/clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.h
@@ -78,6 +78,7 @@ class BuiltinTypeDeclBuilder {
// Builtin types methods
BuiltinTypeDeclBuilder &addDefaultHandleConstructor();
+ BuiltinTypeDeclBuilder &addHandleConstructorFromBinding();
// Builtin types methods
BuiltinTypeDeclBuilder &addLoadMethods();
diff --git a/clang/lib/Sema/HLSLExternalSemaSource.cpp
b/clang/lib/Sema/HLSLExternalSemaSource.cpp
index f5477ac912693..f09232a9db4da 100644
--- a/clang/lib/Sema/HLSLExternalSemaSource.cpp
+++ b/clang/lib/Sema/HLSLExternalSemaSource.cpp
@@ -131,7 +131,8 @@ static BuiltinTypeDeclBuilder setupBufferType(CXXRecordDecl
*Decl, Sema &S,
bool RawBuffer) {
return BuiltinTypeDeclBuilder(S, Decl)
.addHandleMember(RC, IsROV, RawBuffer)
- .addDefaultHandleConstructor();
+ .addDefaultHandleConstructor()
+ .addHandleConstructorFromBinding();
}
// This function is responsible for constructing the constraint expression for
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 540f5f23fe89a..22699644c0a1a 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -14345,10 +14345,8 @@ void Sema::ActOnUninitializedDecl(Decl *RealDecl) {
Var->getType().getAddressSpace() == LangAS::opencl_local)
return;
- // In HLSL, objects in the hlsl_constant address space are initialized
- // externally, so don't synthesize an implicit initializer.
- if (getLangOpts().HLSL &&
- Var->getType().getAddressSpace() == LangAS::hlsl_constant)
+ // Handle HLSL uninitialized decls
+ if (getLangOpts().HLSL && HLSL().ActOnUninitializedVarDecl(Var))
return;
// C++03 [dcl.init]p9:
diff --git a/clang/lib/Sema/SemaHLSL.cpp b/clang/lib/Sema/SemaHLSL.cpp
index fe600386e6fa9..fb786e1429020 100644
--- a/clang/lib/Sema/SemaHLSL.cpp
+++ b/clang/lib/Sema/SemaHLSL.cpp
@@ -32,6 +32,7 @@
#include "clang/Sema/ParsedAttr.h"
#include "clang/Sema/Sema.h"
#include "clang/Sema/Template.h"
+#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringExtras.h"
@@ -305,6 +306,10 @@ static bool isResourceRecordTypeOrArrayOf(const Type *Ty) {
return HLSLAttributedResourceType::findHandleTypeOnResource(Ty) != nullptr;
}
+static bool isResourceRecordTypeOrArrayOf(VarDecl *VD) {
+ return isResourceRecordTypeOrArrayOf(VD->getType().getTypePtr());
+}
+
// Returns true if the type is a leaf element type that is not valid to be
// included in HLSL Buffer, such as a resource class, empty struct, zero-sized
// array, or a builtin intangible type. Returns false it is a valid leaf
element
@@ -2385,6 +2390,29 @@ bool SemaHLSL::CheckBuiltinFunctionCall(unsigned
BuiltinID, CallExpr *TheCall) {
break;
}
+ case Builtin::BI__builtin_hlsl_resource_createpoisonhandle: {
+ if (SemaRef.checkArgCount(TheCall, 1) ||
+ CheckResourceHandle(&SemaRef, TheCall, 0))
+ return true;
+ // use the type of the handle (arg0) as a return type
+ QualType ResourceTy = TheCall->getArg(0)->getType();
+ TheCall->setType(ResourceTy);
+ break;
+ }
+ case Builtin::BI__builtin_hlsl_resource_createhandlefrombinding: {
+ ASTContext &AST = SemaRef.getASTContext();
+ if (SemaRef.checkArgCount(TheCall, 5) ||
+ CheckResourceHandle(&SemaRef, TheCall, 0) ||
+ CheckArgTypeMatches(&SemaRef, TheCall->getArg(1), AST.UnsignedIntTy) ||
+ CheckArgTypeMatches(&SemaRef, TheCall->getArg(2), AST.UnsignedIntTy) ||
+ CheckArgTypeMatches(&SemaRef, TheCall->getArg(3), AST.IntTy) ||
+ CheckArgTypeMatches(&SemaRef, TheCall->getArg(4), AST.UnsignedIntTy))
+ return true;
+ // use the type of the handle (arg0) as a return type
+ QualType ResourceTy = TheCall->getArg(0)->getType();
+ TheCall->setType(ResourceTy);
+ break;
+ }
case Builtin::BI__builtin_hlsl_and:
case Builtin::BI__builtin_hlsl_or: {
if (SemaRef.checkArgCount(TheCall, 2))
@@ -3179,6 +3207,67 @@ void SemaHLSL::ActOnVariableDeclarator(VarDecl *VD) {
}
}
+static bool initVarDeclWithConstructor(Sema &S, VarDecl *VD,
+ MutableArrayRef<Expr *> Args) {
+ InitializedEntity Entity = InitializedEntity::InitializeVariable(VD);
+ InitializationKind Kind = InitializationKind::CreateDirect(
+ VD->getLocation(), SourceLocation(), SourceLocation());
+
+ InitializationSequence InitSeq(S, Entity, Kind, Args);
+ ExprResult Init = InitSeq.Perform(S, Entity, Kind, Args);
+
+ if (!Init.get())
+ return false;
+
+ VD->setInit(S.MaybeCreateExprWithCleanups(Init.get()));
+ VD->setInitStyle(VarDecl::CallInit);
+ S.CheckCompleteVariableDeclaration(VD);
+ return true;
+}
+
+static bool initGlobalResourceDecl(Sema &S, VarDecl *VD) {
+ HLSLResourceBindingAttr *RBA = VD->getAttr<HLSLResourceBindingAttr>();
+ if (!RBA)
+ // FIXME: add support for implicit binding (llvm/llvm-project#110722)
+ return false;
+
+ ASTContext &AST = S.getASTContext();
+ uint64_t UIntTySize = AST.getTypeSize(AST.UnsignedIntTy);
+ uint64_t IntTySize = AST.getTypeSize(AST.IntTy);
+ Expr *Args[] = {
+ IntegerLiteral::Create(AST,
+ llvm::APInt(UIntTySize, RBA->getSpaceNumber()),
+ AST.UnsignedIntTy, SourceLocation()),
+ IntegerLiteral::Create(AST, llvm::APInt(UIntTySize,
RBA->getSlotNumber()),
+ AST.UnsignedIntTy, SourceLocation()),
+ IntegerLiteral::Create(AST, llvm::APInt(IntTySize, 1), AST.IntTy,
+ SourceLocation()),
+ IntegerLiteral::Create(AST, llvm::APInt(UIntTySize, 0),
AST.UnsignedIntTy,
+ SourceLocation())};
+
+ return initVarDeclWithConstructor(S, VD, Args);
+}
+
+// Returns true in the initialization has been handled;
+// Return false to let Clang handle the default initializaton.
+bool SemaHLSL::ActOnUninitializedVarDecl(VarDecl *VD) {
+ // Objects in the hlsl_constant address space are initialized
+ // externally, so don't synthesize an implicit initializer.
+ if (VD->getType().getAddressSpace() == LangAS::hlsl_constant)
+ return true;
+
+ // Initialize resources
+ if (!isResourceRecordTypeOrArrayOf(VD))
+ return false;
+
+ // FIXME: We currectly support only simple resources - no arrays of resources
+ // or resources in user defined structs).
+ if (VD->getType()->isHLSLResourceRecord())
+ return initGlobalResourceDecl(SemaRef, VD);
+
+ return false;
+}
+
// Walks though the global variable declaration, collects all resource binding
// requirements and adds them to Bindings
void SemaHLSL::collectResourceBindingsOnVarDecl(VarDecl *VD) {
diff --git a/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl
b/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl
index dcead068f481e..a07613ca2c729 100644
--- a/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl
+++ b/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl
@@ -89,12 +89,51 @@ RESOURCE<float> Buffer;
// CHECK-SAME{LITERAL}: [[hlsl::raw_buffer]]
// CHECK-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
+// Default constructor
+
+// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void ()' inline
+// CHECK-NEXT: CompoundStmt
+// CHECK-NEXT: BinaryOperator {{.*}} '='
+// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
+// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit
this
+// CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
+// CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
+// CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}}
'__builtin_hlsl_resource_createpoisonhandle'
+// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
+// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit
this
+// CHECK-NEXT: AlwaysInlineAttr
+
+// Constructor from binding
+
+// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void (unsigned
int, unsigned int, int, unsigned int)' inline
+// CHECK-NEXT: ParmVarDecl {{.*}} spaceNo 'unsigned int'
+// CHECK-NEXT: ParmVarDecl {{.*}} registerNo 'unsigned int'
+// CHECK-NEXT: ParmVarDecl {{.*}} range 'int'
+// CHECK-NEXT: ParmVarDecl {{.*}} index 'unsigned int'
+// CHECK-NEXT: CompoundStmt {{.*}}
+// CHECK-NEXT: BinaryOperator {{.*}} '='
+// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
+// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit
this
+// CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
+// CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
+// CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}}
'__builtin_hlsl_resource_createhandlefrombinding'
+// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
+// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit
this
+// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'spaceNo'
'unsigned int'
+// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'registerNo'
'unsigned int'
+// CHECK-NEXT: DeclRefExpr {{.*}} 'int' ParmVar {{.*}} 'range' 'int'
+// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'index'
'unsigned int'
+// CHECK-NEXT: AlwaysInlineAttr
+
+// Subsctript operators
+
// CHECK-SUBSCRIPT: CXXMethodDecl {{.*}} operator[] 'const element_type
&(unsigned int) const'
// CHECK-SUBSCRIPT-NEXT: ParmVarDecl {{.*}} Index 'unsigned int'
// CHECK-SUBSCRIPT-NEXT: CompoundStmt
// CHECK-SUBSCRIPT-NEXT: ReturnStmt
// CHECK-SUBSCRIPT-NEXT: UnaryOperator {{.*}} 'element_type' prefix '*' cannot
overflow
// CHECK-SUBSCRIPT-NEXT: CallExpr {{.*}} 'element_type *'
+// CHECK-SUBSCRIPT-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
// CHECK-SUBSCRIPT-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function
{{.*}} '__builtin_hlsl_resource_getpointer' 'void (...) noexcept'
// CHECK-SUBSCRIPT-NEXT: MemberExpr {{.*}} '__hlsl_resource_t
// CHECK-SUBSCRIPT-SAME{LITERAL}: [[hlsl::resource_class(
@@ -111,6 +150,7 @@ RESOURCE<float> Buffer;
// CHECK-SUBSCRIPT-NEXT: ReturnStmt
// CHECK-SUBSCRIPT-NEXT: UnaryOperator {{.*}} 'element_type' prefix '*' cannot
overflow
// CHECK-SUBSCRIPT-NEXT: CallExpr {{.*}} 'element_type *'
+// CHECK-SUBSCRIPT-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
// CHECK-SUBSCRIPT-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function
{{.*}} '__builtin_hlsl_resource_getpointer' 'void (...) noexcept'
// CHECK-SUBSCRIPT-NEXT: MemberExpr {{.*}} '__hlsl_resource_t
// CHECK-SUBSCRIPT-SAME{LITERAL}: [[hlsl::resource_class(
@@ -124,12 +164,15 @@ RESOURCE<float> Buffer;
// CHECK-NOSUBSCRIPT-NOT: CXXMethodDecl {{.*}} operator[] 'const element_type
&(unsigned int) const'
// CHECK-NOSUBSCRIPT-NOT: CXXMethodDecl {{.*}} operator[] 'element_type
&(unsigned int)'
+// Load method
+
// CHECK-LOAD: CXXMethodDecl {{.*}} Load 'element_type (unsigned int)'
// CHECK-LOAD-NEXT: ParmVarDecl {{.*}} Index 'unsigned int'
// CHECK-LOAD-NEXT: CompoundStmt
// CHECK-LOAD-NEXT: ReturnStmt
// CHECK-LOAD-NEXT: UnaryOperator {{.*}} 'element_type' prefix '*' cannot
overflow
// CHECK-LOAD-NEXT: CallExpr {{.*}} 'element_type *'
+// CHECK-LOAD-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
// CHECK-LOAD-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}}
'__builtin_hlsl_resource_getpointer' 'void (...) noexcept'
// CHECK-LOAD-NEXT: MemberExpr {{.*}} '__hlsl_resource_t
// CHECK-LOAD-SAME{LITERAL}: [[hlsl::resource_class(
@@ -139,10 +182,13 @@ RESOURCE<float> Buffer;
// CHECK-LOAD-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'Index'
'unsigned int'
// CHECK-LOAD-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
+// IncrementCounter method
+
// CHECK-COUNTER: CXXMethodDecl {{.*}} IncrementCounter 'unsigned int ()'
// CHECK-COUNTER-NEXT: CompoundStmt
// CHECK-COUNTER-NEXT: ReturnStmt
// CHECK-COUNTER-NEXT: CallExpr {{.*}} 'unsigned int'
+// CHECK-COUNTER-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
// CHECK-COUNTER-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}}
'__builtin_hlsl_buffer_update_counter' 'unsigned int (...) noexcept'
// CHECK-COUNTER-NEXT: MemberExpr {{.*}} '__hlsl_resource_t
// CHECK-COUNTER-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
@@ -152,10 +198,13 @@ RESOURCE<float> Buffer;
// CHECK-COUNTER-NEXT: IntegerLiteral {{.*}} 'int' 1
// CHECK-COUNTER-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
+// DecrementCounter method
+
// CHECK-COUNTER-NEXT: CXXMethodDecl {{.*}} DecrementCounter 'unsigned int ()'
// CHECK-COUNTER-NEXT: CompoundStmt
// CHECK-COUNTER-NEXT: ReturnStmt
// CHECK-COUNTER-NEXT: CallExpr {{.*}} 'unsigned int'
+// CHECK-COUNTER-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
// CHECK-COUNTER-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}}
'__builtin_hlsl_buffer_update_counter' 'unsigned int (...) noexcept'
// CHECK-COUNTER-NEXT: MemberExpr {{.*}} '__hlsl_resource_t
// CHECK-COUNTER-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
@@ -165,12 +214,15 @@ RESOURCE<float> Buffer;
// CHECK-COUNTER-NEXT: IntegerLiteral {{.*}} 'int' -1
// CHECK-COUNTER-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
+// Append method
+
// CHECK-APPEND: CXXMethodDecl {{.*}} Append 'void (element_type)'
// CHECK-APPEND-NEXT: ParmVarDecl {{.*}} value 'element_type'
// CHECK-APPEND-NEXT: CompoundStmt
// CHECK-APPEND-NEXT: BinaryOperator {{.*}} 'element_type' '='
// CHECK-APPEND-NEXT: UnaryOperator {{.*}} 'element_type' prefix '*' cannot
overflow
// CHECK-APPEND-NEXT: CallExpr {{.*}} 'element_type *'
+// CHECK-APPEND-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
// CHECK-APPEND-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}}
'__builtin_hlsl_resource_getpointer' 'void (...) noexcept'
// CHECK-APPEND-NEXT: MemberExpr {{.*}} '__hlsl_resource_t
// CHECK-APPEND-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
@@ -178,6 +230,7 @@ RESOURCE<float> Buffer;
// CHECK-APPEND-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue
.__handle
// CHECK-APPEND-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue
implicit this
// CHECK-APPEND-NEXT: CallExpr {{.*}} 'unsigned int'
+// CHECK-APPEND-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
// CHECK-APPEND-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}}
'__builtin_hlsl_buffer_update_counter' 'unsigned int (...) noexcept'
// CHECK-APPEND-NEXT: MemberExpr {{.*}} '__hlsl_resource_t
// CHECK-APPEND-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
@@ -187,11 +240,14 @@ RESOURCE<float> Buffer;
// CHECK-APPEND-NEXT: IntegerLiteral {{.*}} 'int' 1
// CHECK-APPEND-NEXT: DeclRefExpr {{.*}} 'element_type' ParmVar {{.*}} 'value'
'element_type'
+// Consume method
+
// CHECK-CONSUME: CXXMethodDecl {{.*}} Consume 'element_type ()'
// CHECK-CONSUME-NEXT: CompoundStmt
// CHECK-CONSUME-NEXT: ReturnStmt
// CHECK-CONSUME-NEXT: UnaryOperator {{.*}} 'element_type' prefix '*' cannot
overflow
// CHECK-CONSUME-NEXT: CallExpr {{.*}} 'element_type *'
+// CHECK-CONSUME-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
// CHECK-CONSUME-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}}
'__builtin_hlsl_resource_getpointer' 'void (...) noexcept'
// CHECK-CONSUME-NEXT: MemberExpr {{.*}} '__hlsl_resource_t
// CHECK-CONSUME-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
@@ -199,6 +255,7 @@ RESOURCE<float> Buffer;
// CHECK-CONSUME-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue
.__handle
// CHECK-CONSUME-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue
implicit this
// CHECK-CONSUME-NEXT: CallExpr {{.*}} 'unsigned int'
+// CHECK-CONSUME-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
// CHECK-CONSUME-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}}
'__builtin_hlsl_buffer_update_counter' 'unsigned int (...) noexcept'
// CHECK-CONSUME-NEXT: MemberExpr {{.*}} '__hlsl_resource_t
// CHECK-CONSUME-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
@@ -208,11 +265,10 @@ RESOURCE<float> Buffer;
// CHECK-CONSUME-NEXT: IntegerLiteral {{.*}} 'int' -1
// CHECK: ClassTemplateSpecializationDecl {{.*}} class [[RESOURCE]] definition
-
// CHECK: TemplateArgument type 'float'
// CHECK-NEXT: BuiltinType {{.*}} 'float'
// CHECK-NEXT: FinalAttr {{.*}} Implicit final
-// CHECK-NEXT: FieldDecl {{.*}} implicit __handle '__hlsl_resource_t
+// CHECK-NEXT: FieldDecl {{.*}} implicit referenced __handle '__hlsl_resource_t
// CHECK-SRV-SAME{LITERAL}: [[hlsl::resource_class(SRV)]]
// CHECK-UAV-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
// CHECK-ROV-SAME{LITERAL}: [[hlsl::is_rov]]
diff --git a/clang/test/AST/HLSL/TypedBuffers-AST.hlsl
b/clang/test/AST/HLSL/TypedBuffers-AST.hlsl
index f665b06d691e8..41fd7d7d2ba2a 100644
--- a/clang/test/AST/HLSL/TypedBuffers-AST.hlsl
+++ b/clang/test/AST/HLSL/TypedBuffers-AST.hlsl
@@ -62,6 +62,7 @@ RESOURCE<float> Buffer;
// CHECK-NEXT: ReturnStmt
// CHECK-NEXT: UnaryOperator {{.*}} 'element_type' prefix '*' cannot overflow
// CHECK-NEXT: CallExpr {{.*}} 'element_type *'
+// CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
// CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}}
'__builtin_hlsl_resource_getpointer' 'void (...) noexcept'
// CHECK-NEXT: MemberExpr {{.*}} '__hlsl_resource_t
// CHECK-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
@@ -77,6 +78,7 @@ RESOURCE<float> Buffer;
// CHECK-NEXT: ReturnStmt
// CHECK-NEXT: UnaryOperator {{.*}} 'element_type' prefix '*' cannot overflow
// CHECK-NEXT: CallExpr {{.*}} 'element_type *'
+// CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
// CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}}
'__builtin_hlsl_resource_getpointer' 'void (...) noexcept'
// CHECK-NEXT: MemberExpr {{.*}} '__hlsl_resource_t
// CHECK-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
@@ -92,6 +94,7 @@ RESOURCE<float> Buffer;
// CHECK-NEXT: ReturnStmt
// CHECK-NEXT: UnaryOperator {{.*}} 'element_type' prefix '*' cannot overflow
// CHECK-NEXT: CallExpr {{.*}} 'element_type *'
+// CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
// CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}}
'__builtin_hlsl_resource_getpointer' 'void (...) noexcept'
// CHECK-NEXT: MemberExpr {{.*}} '__hlsl_resource_t
// CHECK-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
@@ -106,6 +109,6 @@ RESOURCE<float> Buffer;
// CHECK: TemplateArgument type 'float'
// CHECK-NEXT: BuiltinType {{.*}} 'float'
// CHECK-NEXT: FinalAttr {{.*}} Implicit final
-// CHECK-NEXT: FieldDecl {{.*}} implicit __handle '__hlsl_resource_t
+// CHECK-NEXT: FieldDecl {{.*}} implicit referenced __handle '__hlsl_resource_t
// CHECK-UAV-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
// CHECK-SAME{LITERAL}: [[hlsl::contained_type(float)]]
diff --git
a/clang/test/CodeGenHLSL/builtins/ByteAddressBuffers-constructors.hlsl
b/clang/test/CodeGenHLSL/builtins/ByteAddressBuffers-constructors.hlsl
index 926a37c689517..8853c2948ae54 100644
--- a/clang/test/CodeGenHLSL/builtins/ByteAddressBuffers-constructors.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/ByteAddressBuffers-constructors.hlsl
@@ -1,34 +1,117 @@
// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -emit-llvm
-disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-DXIL
+// FIXME: SPIR-V codegen of llvm.spv.resource.handlefrombinding and resource
types is not yet implemented
// RUN-DISABLED: %clang_cc1 -triple spirv-vulkan-library -x hlsl -emit-llvm
-disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-SPIRV
-// NOTE: SPIRV codegen for resource types is not yet implemented
+// NOTE: Itanium ABI for C++ requires Clang to generate 2 constructors types
to support polymorphism:
+// - C1 - Complete object constructor - constructs the complete object,
including virtual base classes.
+// - C2 - Base object constructor - creates the object itself and initializes
data members and non-virtual base classes.
+// The constructors are distinquished by C1/C2 designators in their mangled
name.
+//
https://itanium-cxx-abi.github.io/cxx-abi/abi.html#mangling-special-ctor-dtor
-ByteAddressBuffer Buffer0: register(t0);
-RWByteAddressBuffer Buffer1: register(u1, space2);
-RasterizerOrderedByteAddressBuffer Buffer2: register(u3, space4);
+// Resource with explicit binding
+ByteAddressBuffer Buf1: register(t1, space2);
-// CHECK: "class.hlsl::ByteAddressBuffer" = type { target("dx.RawBuffer", i8,
0, 0) }
-// CHECK: "class.hlsl::RWByteAddressBuffer" = type { target("dx.RawBuffer",
i8, 1, 0) }
-// CHECK: "class.hlsl::RasterizerOrderedByteAddressBuffer" = type {
target("dx.RawBuffer", i8, 1, 1) }
+// Resource with implicit binding
+RWByteAddressBuffer Buf2;
-// CHECK: @_ZL7Buffer0 = internal global %"class.hlsl::ByteAddressBuffer"
poison, align 4
-// CHECK: @_ZL7Buffer1 = internal global %"class.hlsl::RWByteAddressBuffer"
poison, align 4
-// CHECK: @_ZL7Buffer2 = internal global
%"class.hlsl::RasterizerOrderedByteAddressBuffer" poison, align 4
+export void foo() {
+ // Local resource declaration
+ RasterizerOrderedByteAddressBuffer Buf3;
+}
-// CHECK; define internal void @_init_resource_Buffer0()
-// CHECK-DXIL: [[H:%.*]] = call target("dx.RawBuffer", i8, 0, 0)
@llvm.dx.resource.handlefrombinding.tdx.RawBuffer_i8_0_0t(i32 0, i32 0, i32 1,
i32 0, i1 false)
-// CHECK-DXIL: store target("dx.RawBuffer", i8, 0, 0) [[H]], ptr @_ZL7Buffer0,
align 4
+// CHECK: %"class.hlsl::ByteAddressBuffer" = type { target("dx.RawBuffer", i8,
0, 0) }
+// CHECK: %"class.hlsl::RWByteAddressBuffer" = type { target("dx.RawBuffer",
i8, 1, 0) }
+// CHECK: %"class.hlsl::RasterizerOrderedByteAddressBuffer" = type {
target("dx.RawBuffer", i8, 1, 1) }
-// CHECK; define internal void @_init_resource_Buffer1()
-// CHECK-DXIL: [[H:%.*]] = call target("dx.RawBuffer", i8, 1, 0)
@llvm.dx.resource.handlefrombinding.tdx.RawBuffer_i8_1_0t(i32 2, i32 1, i32 1,
i32 0, i1 false)
-// CHECK-DXIL: store target("dx.RawBuffer", i8, 1, 0) [[H]], ptr @_ZL7Buffer1,
align 4
+// CHECK: @_ZL4Buf1 = internal global %"class.hlsl::ByteAddressBuffer" poison,
align 4
+// CHECK: @_ZL4Buf2 = internal global %"class.hlsl::RWByteAddressBuffer"
poison, align 4
-// CHECK; define internal void @_init_resource_Buffer2()
-// CHECK-DXIL: [[H:%.*]] = call target("dx.RawBuffer", i8, 1, 1)
@llvm.dx.resource.handlefrombinding.tdx.RawBuffer_i8_1_1t(i32 4, i32 3, i32 1,
i32 0, i1 false)
-// CHECK-DXIL: store target("dx.RawBuffer", i8, 1, 1) [[H]], ptr @_ZL7Buffer2,
align 4
+// Buf1 initialization part 1 - global init function that calls
ByteAddressBuffer C1 constructor with explicit binding
+// CHECK: define internal void @__cxx_global_var_init()
+// CHECK-NEXT: entry:
+// CHECK-NEXT: call void @_ZN4hlsl17ByteAddressBufferC1Ejjij(ptr noundef
nonnull align 4 dereferenceable(4) @_ZL4Buf1,
+// CHECK-SAME: i32 noundef 2, i32 noundef 1, i32 noundef 1, i32 noundef 0)
+// Buf1 initialization part 2 - body of ByteAddressBuffer C1 constructor with
explicit binding that calls the C2 constructor
+// CHECK: define linkonce_odr void @_ZN4hlsl17ByteAddressBufferC1Ejjij(ptr
noundef nonnull align 4 dereferenceable(4) %this,
+// CHECK-SAME: i32 noundef %spaceNo, i32 noundef %registerNo, i32 noundef
%range, i32 noundef %index)
+// CHECK-NEXT: entry:
+// CHECK-NEXT: %this.addr = alloca ptr, align 4
+// CHECK-NEXT: %spaceNo.addr = alloca i32, align 4
+// CHECK-NEXT: %registerNo.addr = alloca i32, align 4
+// CHECK-NEXT: %range.addr = alloca i32, align 4
+// CHECK-NEXT: %index.addr = alloca i32, align 4
+// CHECK-NEXT: store ptr %this, ptr %this.addr, align 4
+// CHECK-NEXT: store i32 %spaceNo, ptr %spaceNo.addr, align 4
+// CHECK-NEXT: store i32 %registerNo, ptr %registerNo.addr, align 4
+// CHECK-NEXT: store i32 %range, ptr %range.addr, align 4
+// CHECK-NEXT: store i32 %index, ptr %index.addr, align 4
+// CHECK-NEXT: %this1 = load ptr, ptr %this.addr, align 4
+// CHECK-NEXT: %0 = load i32, ptr %spaceNo.addr, align 4
+// CHECK-NEXT: %1 = load i32, ptr %registerNo.addr, align 4
+// CHECK-NEXT: %2 = load i32, ptr %range.addr, align 4
+// CHECK-NEXT: %3 = load i32, ptr %index.addr, align 4
+// CHECK: call void @_ZN4hlsl17ByteAddressBufferC2Ejjij(ptr noundef nonnull
align 4 dereferenceable(4) %this1,
+// CHECK-SAME: i32 noundef %0, i32 noundef %1, i32 noundef %2, i32 noundef %3)
+// CHECK-NEXT: ret void
+
+// Buf2 initialization part 1 - FIXME: constructor with implicit binding does
not exist yet;
+// the global init function currently calls the default RWByteAddressBuffer C1
constructor
+// CHECK: define internal void @__cxx_global_var_init.1()
+// CHECK-NEXT: entry:
+// CHECK-NEXT: call void @_ZN4hlsl19RWByteAddressBufferC1Ev(ptr noundef
nonnull align 4 dereferenceable(4) @_ZL4Buf2)
+
+// Buf3 initialization part 1 - local variable declared in function foo() is
initialized by
+// RasterizerOrderedByteAddressBuffer C1 default constructor
+// CHECK: define void @_Z3foov() #2 {
+// CHECK-NEXT: entry:
+// CHECK-NEXT: %Buf3 = alloca
%"class.hlsl::RasterizerOrderedByteAddressBuffer", align 4
+// CHECK-NEXT: call void @_ZN4hlsl34RasterizerOrderedByteAddressBufferC1Ev(ptr
noundef nonnull align 4 dereferenceable(4) %Buf3)
+
+// Buf3 initialization part 2 - body of RasterizerOrderedByteAddressBuffer
default C1 constructor that
+// calls the default C2 constructor
+// CHECK: define linkonce_odr void
@_ZN4hlsl34RasterizerOrderedByteAddressBufferC1Ev(ptr noundef nonnull align 4
dereferenceable(4) %this)
+// CHECK-NEXT: entry:
+// CHECK-NEXT: %this.addr = alloca ptr, align 4
+// CHECK-NEXT: store ptr %this, ptr %this.addr, align 4
+// CHECK-NEXT: %this1 = load ptr, ptr %this.addr, align 4
+// CHECK: call void @_ZN4hlsl34RasterizerOrderedByteAddressBufferC2Ev(ptr
noundef nonnull align 4 dereferenceable(4) %this1)
+// CHECK-NEXT: ret void
+
+// Buf1 initialization part 3 - ByteAddressBuffer C2 constructor with explicit
binding that initializes
+// handle with @llvm.dx.resource.handlefrombinding
+// CHECK: define linkonce_odr void @_ZN4hlsl17ByteAddressBufferC2Ejjij(ptr
noundef nonnull align 4 dereferenceable(4) %this,
+// CHECK-SAME: i32 noundef %spaceNo, i32 noundef %registerNo, i32 noundef
%range, i32 noundef %index)
+// CHECK-NEXT: entry:
+// CHECK-NEXT: %this.addr = alloca ptr, align 4
+// CHECK-NEXT: %spaceNo.addr = alloca i32, align 4
+// CHECK-NEXT: %registerNo.addr = alloca i32, align 4
+// CHECK-NEXT: %range.addr = alloca i32, align 4
+// CHECK-NEXT: %index.addr = alloca i32, align 4
+// CHECK-NEXT: store ptr %this, ptr %this.addr, align 4
+// CHECK-NEXT: store i32 %spaceNo, ptr %spaceNo.addr, align 4
+// CHECK-NEXT: store i32 %registerNo, ptr %registerNo.addr, align 4
+// CHECK-NEXT: store i32 %range, ptr %range.addr, align 4
+// CHECK-NEXT: store i32 %index, ptr %index.addr, align 4
+// CHECK-NEXT: %this1 = load ptr, ptr %this.addr, align 4
+// CHECK-NEXT: %0 = load i32, ptr %spaceNo.addr, align 4
+// CHECK-NEXT: %1 = load i32, ptr %registerNo.addr, align 4
+// CHECK-NEXT: %2 = load i32, ptr %range.addr, align 4
+// CHECK-NEXT: %3 = load i32, ptr %index.addr, align 4
+// CHECK-DXIL-NEXT: %4 = call target("dx.RawBuffer", i8, 0, 0)
@llvm.dx.resource.handlefrombinding.tdx.RawBuffer_i8_0_0t(
+// CHECK-SAME: i32 %0, i32 %1, i32 %2, i32 %3, i1 false)
+// CHECK-NEXT: %__handle = getelementptr inbounds nuw
%"class.hlsl::ByteAddressBuffer", ptr %this1, i32 0, i32 0
+// CHECK-DXIL-NEXT: store target("dx.RawBuffer", i8, 0, 0) %4, ptr %__handle,
align 4
+// CHECK-NEXT: ret void
+
+// Buf3 initialization part 3 - body of RasterizerOrderedByteAddressBuffer
default C2 constructor that
+// initializes handle to poison
+// CHECK: define linkonce_odr void
@_ZN4hlsl34RasterizerOrderedByteAddressBufferC2Ev(ptr noundef nonnull align 4
dereferenceable(4) %this)
+// CHECK: %__handle = getelementptr inbounds nuw
%"class.hlsl::RasterizerOrderedByteAddressBuffer", ptr %this1, i32 0, i32 0
+// CHECK: store target("dx.RawBuffer", i8, 1, 1) poison, ptr %__handle, align 4
+
+// Module initialization
// CHECK: define internal void
@_GLOBAL__sub_I_ByteAddressBuffers_constructors.hlsl()
-// CHECK: entry:
-// CHECK: call void @_init_resource__ZL7Buffer0()
-// CHECK: call void @_init_resource__ZL7Buffer1()
-// CHECK: call void @_init_resource__ZL7Buffer2()
+// CHECK-NEXT: entry:
+// CHECK-NEXT: call void @__cxx_global_var_init()
+// CHECK-NEXT: call void @__cxx_global_var_init.1()
diff --git a/clang/test/CodeGenHLSL/builtins/RWBuffer-constructor-opt.hlsl
b/clang/test/CodeGenHLSL/builtins/RWBuffer-constructor-opt.hlsl
index 56c523f6bc8cf..8a08536ce133c 100644
--- a/clang/test/CodeGenHLSL/builtins/RWBuffer-constructor-opt.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/RWBuffer-constructor-opt.hlsl
@@ -1,7 +1,7 @@
// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -emit-llvm
-O3 -o - %s | FileCheck %s
// RUN: %clang_cc1 -triple spirv-vulkan-compute -x hlsl -emit-llvm -O3 -o - %s
| FileCheck %s
-// All referenced to an unused resource should be removed by optimizations.
+// All references to unused resources should be removed by optimizations.
RWBuffer<float> Buf : register(u5, space3);
[shader("compute")]
diff --git a/clang/test/CodeGenHLSL/builtins/RWBuffer-constructor.hlsl
b/clang/test/CodeGenHLSL/builtins/RWBuffer-constructor.hlsl
index 5324176a7b9bb..c704a3b05b3b4 100644
--- a/clang/test/CodeGenHLSL/builtins/RWBuffer-constructor.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/RWBuffer-constructor.hlsl
@@ -1,20 +1,119 @@
// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -emit-llvm
-disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-DXIL
-// FIXME: SPIR-V codegen of llvm.spv.resource.handlefrombinding is not yet
implemented
+// FIXME: SPIR-V codegen of llvm.spv.resource.handlefrombinding and resource
types is not yet implemented
// RUN-DISABLED: %clang_cc1 -triple spirv-vulkan-library -x hlsl -emit-llvm
-disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-SPIRV
-// NOTE: SPIRV codegen for resource types is not yet implemented
+// NOTE: Itanium ABI for C++ requires Clang to generate 2 constructors types
to support polymorphism:
+// - C1 - Complete object constructor - constructs the complete object,
including virtual base classes.
+// - C2 - Base object constructor - creates the object itself and initializes
data members and non-virtual base classes.
+// The constructors are distinquished by C1/C2 designators in their mangled
name.
+//
https://itanium-cxx-abi.github.io/cxx-abi/abi.html#mangling-special-ctor-dtor
-RWBuffer<float> Buf : register(u5, space3);
+// Resource with explicit binding
+RWBuffer<float> Buf1 : register(u5, space3);
+
+// Resource with implicit binding
+RWBuffer<double> Buf2;
+
+export void foo() {
+ // Local resource declaration
+ RWBuffer<int> Buf3;
+}
// CHECK: %"class.hlsl::RWBuffer" = type { target("dx.TypedBuffer", float, 1,
0, 0) }
-// CHECK: @_ZL3Buf = internal global %"class.hlsl::RWBuffer" poison, align 4
+// CHECK: %"class.hlsl::RWBuffer.0" = type { target("dx.TypedBuffer", double,
1, 0, 0) }
+// CHECK: %"class.hlsl::RWBuffer.1" = type { target("dx.TypedBuffer", i32, 1,
0, 1) }
+
+// CHECK: @_ZL4Buf1 = internal global %"class.hlsl::RWBuffer" poison, align 4
+// CHECK: @_ZL4Buf2 = internal global %"class.hlsl::RWBuffer.0" poison, align 4
+
+// Buf1 initialization part 1 - global init function that calls
RWBuffer<float> C1 constructor with explicit binding
+// CHECK: define internal void @__cxx_global_var_init()
+// CHECK-NEXT: entry:
+// CHECK-NEXT: call void @_ZN4hlsl8RWBufferIfEC1Ejjij(ptr noundef nonnull
align 4 dereferenceable(4) @_ZL4Buf1,
+// CHECK-SAME: i32 noundef 3, i32 noundef 5, i32 noundef 1, i32 noundef 0)
+
+// Buf1 initialization part 2 - body of RWBuffer<float> C1 constructor with
explicit binding that calls the C2 constructor
+// CHECK: define linkonce_odr void @_ZN4hlsl8RWBufferIfEC1Ejjij(ptr noundef
nonnull align 4 dereferenceable(4) %this,
+// CHECK-SAME: i32 noundef %spaceNo, i32 noundef %registerNo, i32 noundef
%range, i32 noundef %index)
+// CHECK-NEXT: entry:
+// CHECK-NEXT: %this.addr = alloca ptr, align 4
+// CHECK-NEXT: %spaceNo.addr = alloca i32, align 4
+// CHECK-NEXT: %registerNo.addr = alloca i32, align 4
+// CHECK-NEXT: %range.addr = alloca i32, align 4
+// CHECK-NEXT: %index.addr = alloca i32, align 4
+// CHECK-NEXT: store ptr %this, ptr %this.addr, align 4
+// CHECK-NEXT: store i32 %spaceNo, ptr %spaceNo.addr, align 4
+// CHECK-NEXT: store i32 %registerNo, ptr %registerNo.addr, align 4
+// CHECK-NEXT: store i32 %range, ptr %range.addr, align 4
+// CHECK-NEXT: store i32 %index, ptr %index.addr, align 4
+// CHECK-NEXT: %this1 = load ptr, ptr %this.addr, align 4
+// CHECK-NEXT: %0 = load i32, ptr %spaceNo.addr, align 4
+// CHECK-NEXT: %1 = load i32, ptr %registerNo.addr, align 4
+// CHECK-NEXT: %2 = load i32, ptr %range.addr, align 4
+// CHECK-NEXT: %3 = load i32, ptr %index.addr, align 4
+// CHECK-NEXT: call void @_ZN4hlsl8RWBufferIfEC2Ejjij(ptr noundef nonnull
align 4 dereferenceable(4) %this1,
+// CHECK-SAME: i32 noundef %0, i32 noundef %1, i32 noundef %2, i32 noundef %3)
+// CHECK-NEXT: ret void
-// CHECK: define internal void @_init_resource__ZL3Buf()
-// CHECK-DXIL: [[H:%.*]] = call target("dx.TypedBuffer", float, 1, 0, 0)
@llvm.dx.resource.handlefrombinding.tdx.TypedBuffer_f32_1_0_0t(i32 3, i32 5,
i32 1, i32 0, i1 false)
-// CHECK-DXIL: store target("dx.TypedBuffer", float, 1, 0, 0) [[H]], ptr
@_ZL3Buf, align 4
+// Buf2 initialization part 1 - FIXME: constructor with implicit binding does
not exist yet;
+// the global init function currently calls the default RWBufer<double> C1
constructor
+// CHECK: define internal void @__cxx_global_var_init.1() #0 {
+// CHECK-NEXT: entry:
+// CHECK-NEXT: call void @_ZN4hlsl8RWBufferIdEC1Ev(ptr noundef nonnull align 4
dereferenceable(4) @_ZL4Buf2)
-// CHECK: define linkonce_odr void @_ZN4hlsl8RWBufferIfEC2Ev(ptr noundef
nonnull align 4 dereferenceable(4) %this)
+// Buf3 initialization part 1 - local variable declared in function foo() is
initialized by RWBuffer<int> C1 default constructor
+// CHECK: define void @_Z3foov()
// CHECK-NEXT: entry:
+// CHECK-NEXT: %Buf3 = alloca %"class.hlsl::RWBuffer.1", align 4
+// CHECK-NEXT: call void @_ZN4hlsl8RWBufferIiEC1Ev(ptr noundef nonnull align 4
dereferenceable(4) %Buf3)
+// Buf3 initialization part 2 - body of RWBuffer<int> default C1 constructor
that calls the default C2 constructor
+// CHECK: define linkonce_odr void @_ZN4hlsl8RWBufferIiEC1Ev(ptr noundef
nonnull align 4 dereferenceable(4) %this)
+// CHECK-NEXT: entry:
+// CHECK-NEXT: %this.addr = alloca ptr, align 4
+// CHECK-NEXT: store ptr %this, ptr %this.addr, align 4
+// CHECK-NEXT: %this1 = load ptr, ptr %this.addr, align 4
+// CHECK-NEXT: call void @_ZN4hlsl8RWBufferIiEC2Ev(ptr noundef nonnull align 4
dereferenceable(4) %this1)
+// CHECK-NEXT: ret void
+
+// Buf1 initialization part 3 - body of RWBuffer<float> C2 constructor with
explicit binding that initializes
+// handle with @llvm.dx.resource.handlefrombinding
+// CHECK: define linkonce_odr void @_ZN4hlsl8RWBufferIfEC2Ejjij(ptr noundef
nonnull align 4 dereferenceable(4) %this,
+// CHECK-SAME: i32 noundef %spaceNo, i32 noundef %registerNo, i32 noundef
%range, i32 noundef %index)
+// CHECK-NEXT: entry:
+// CHECK-NEXT: %this.addr = alloca ptr, align 4
+// CHECK-NEXT: %spaceNo.addr = alloca i32, align 4
+// CHECK-NEXT: %registerNo.addr = alloca i32, align 4
+// CHECK-NEXT: %range.addr = alloca i32, align 4
+// CHECK-NEXT: %index.addr = alloca i32, align 4
+// CHECK-NEXT: store ptr %this, ptr %this.addr, align 4
+// CHECK-NEXT: store i32 %spaceNo, ptr %spaceNo.addr, align 4
+// CHECK-NEXT: store i32 %registerNo, ptr %registerNo.addr, align 4
+// CHECK-NEXT: store i32 %range, ptr %range.addr, align 4
+// CHECK-NEXT: store i32 %index, ptr %index.addr, align 4
+// CHECK-NEXT: %this1 = load ptr, ptr %this.addr, align 4
+// CHECK-NEXT: %0 = load i32, ptr %spaceNo.addr, align 4
+// CHECK-NEXT: %1 = load i32, ptr %registerNo.addr, align 4
+// CHECK-NEXT: %2 = load i32, ptr %range.addr, align 4
+// CHECK-NEXT: %3 = load i32, ptr %index.addr, align 4
+// CHECK-DXIL-NEXT: %4 = call target("dx.TypedBuffer", float, 1, 0, 0)
@llvm.dx.resource.handlefrombinding.tdx.TypedBuffer_f32_1_0_0t(
+// CHECK-DXIL-SAME: i32 %0, i32 %1, i32 %2, i32 %3, i1 false)
+// CHECK-NEXT: %__handle = getelementptr inbounds nuw %"class.hlsl::RWBuffer",
ptr %this1, i32 0, i32 0
+// CHECK-DXIL-NEXT: store target("dx.TypedBuffer", float, 1, 0, 0) %4, ptr
%__handle, align 4
+// CHECK-NEXT: ret void
+
+// Buf3 initialization part 3 - body of RWBuffer<int> default C2 constructor
that initializes handle to poison
+// CHECK: define linkonce_odr void @_ZN4hlsl8RWBufferIiEC2Ev(ptr noundef
nonnull align 4 dereferenceable(4) %this)
+// CHECK-NEXT: entry:
+// CHECK-NEXT: %this.addr = alloca ptr, align 4
+// CHECK-NEXT: store ptr %this, ptr %this.addr, align 4
+// CHECK-NEXT: %this1 = load ptr, ptr %this.addr, align 4
+// CHECK-NEXT: %__handle = getelementptr inbounds nuw
%"class.hlsl::RWBuffer.1", ptr %this1, i32 0, i32 0
+// CHECK-NEXT: store target("dx.TypedBuffer", i32, 1, 0, 1) poison, ptr
%__handle, align 4
+// CHECK-NEXT: ret void
+
+// Module initialization
// CHECK: define internal void @_GLOBAL__sub_I_RWBuffer_constructor.hlsl()
-// CHECK: call void @_init_resource__ZL3Buf()
+// CHECK-NEXT: entry:
+// CHECK-NEXT: call void @__cxx_global_var_init()
+// CHECK-NEXT: call void @__cxx_global_var_init.1()
diff --git
a/clang/test/CodeGenHLSL/builtins/StructuredBuffers-constructors.hlsl
b/clang/test/CodeGenHLSL/builtins/StructuredBuffers-constructors.hlsl
index 8a1429fd1a6fc..3c41f3583ac1a 100644
--- a/clang/test/CodeGenHLSL/builtins/StructuredBuffers-constructors.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/StructuredBuffers-constructors.hlsl
@@ -1,70 +1,121 @@
// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -emit-llvm
-disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-DXIL
-// RUN: %clang_cc1 -triple spirv-vulkan-library -x hlsl -emit-llvm -DSPIRV
-disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-SPIRV
+// FIXME: SPIR-V codegen of llvm.spv.resource.handlefrombinding and resource
types is not yet implemented
+// RUN-DISABLED: %clang_cc1 -triple spirv-vulkan-library -x hlsl -emit-llvm
-disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-SPIRV
+// NOTE: Itanium ABI for C++ requires Clang to generate 2 constructors types
to support polymorphism:
+// - C1 - Complete object constructor - constructs the complete object,
including virtual base classes.
+// - C2 - Base object constructor - creates the object itself and initializes
data members and non-virtual base classes.
+// The constructors are distinquished by C1/C2 designators in their mangled
name.
+//
https://itanium-cxx-abi.github.io/cxx-abi/abi.html#mangling-special-ctor-dtor
-StructuredBuffer<float> Buf : register(t10);
-RWStructuredBuffer<float> Buf2 : register(u5, space1);
+// Resource with explicit binding
+StructuredBuffer<float> Buf1 : register(t10, space2);
-#ifndef SPIRV
-// NOTE: SPIRV codegen for these resource types is not implemented yet.
-AppendStructuredBuffer<float> Buf3 : register(u3);
-ConsumeStructuredBuffer<float> Buf4 : register(u4);
-RasterizerOrderedStructuredBuffer<float> Buf5 : register(u1, space2);
-#endif
+// Resource with implicit binding
+RWStructuredBuffer<float> Buf2;
-// CHECK-DXIL: %"class.hlsl::StructuredBuffer" = type { target("dx.RawBuffer",
float, 0, 0) }
-// CHECK-DXIL: %"class.hlsl::RWStructuredBuffer" = type {
target("dx.RawBuffer", float, 1, 0) }
-// CHECK-DXIL: %"class.hlsl::AppendStructuredBuffer" = type {
target("dx.RawBuffer", float, 1, 0) }
-// CHECK-DXIL: %"class.hlsl::ConsumeStructuredBuffer" = type {
target("dx.RawBuffer", float, 1, 0) }
-// CHECK-DXIL: %"class.hlsl::RasterizerOrderedStructuredBuffer" = type {
target("dx.RawBuffer", float, 1, 1) }
+export void foo() {
+ AppendStructuredBuffer<float> Buf3;
+}
-// CHECK-SPIRV: %"class.hlsl::StructuredBuffer" = type {
target("spirv.VulkanBuffer", [0 x float], 12, 0) }
-// CHECK-SPIRV: %"class.hlsl::RWStructuredBuffer" = type {
target("spirv.VulkanBuffer", [0 x float], 12, 1) }
+// CHECK: %"class.hlsl::StructuredBuffer" = type { target("dx.RawBuffer",
float, 0, 0) }
+// CHECK: %"class.hlsl::RWStructuredBuffer" = type { target("dx.RawBuffer",
float, 1, 0) }
+// CHECK: %"class.hlsl::AppendStructuredBuffer" = type {
target("dx.RawBuffer", float, 1, 0) }
+// CHECK: @_ZL4Buf1 = internal global %"class.hlsl::StructuredBuffer" poison,
align 4
+// CHECK: @_ZL4Buf2 = internal global %"class.hlsl::RWStructuredBuffer"
poison, align 4
-// CHECK: @_ZL3Buf = internal global %"class.hlsl::StructuredBuffer" poison
-// CHECK: @_ZL4Buf2 = internal global %"class.hlsl::RWStructuredBuffer" poison
-// CHECK-DXIL: @_ZL4Buf3 = internal global
%"class.hlsl::AppendStructuredBuffer" poison, align 4
-// CHECK-DXIL: @_ZL4Buf4 = internal global
%"class.hlsl::ConsumeStructuredBuffer" poison, align 4
-// CHECK-DXIL: @_ZL4Buf5 = internal global
%"class.hlsl::RasterizerOrderedStructuredBuffer" poison, align 4
+// Buf1 initialization part 1 - global init function that calls
StructuredBuffer<float> C1 constructor
+// with explicit binding
+// CHECK: define internal void @__cxx_global_var_init()
+// CHECK-NEXT: entry:
+// CHECK-NEXT: call void @_ZN4hlsl16StructuredBufferIfEC1Ejjij(ptr noundef
nonnull align 4 dereferenceable(4) @_ZL4Buf1, i32 noundef 2, i32 noundef 10,
i32 noundef 1, i32 noundef 0)
-// CHECK: define internal void @_init_resource__ZL3Buf()
-// CHECK-DXIL: [[H:%.*]] = call target("dx.RawBuffer", float, 0, 0)
@llvm.dx.resource.handlefrombinding.tdx.RawBuffer_f32_0_0t(i32 0, i32 10, i32
1, i32 0, i1 false)
-// CHECK-DXIL: store target("dx.RawBuffer", float, 0, 0) [[H]], ptr @_ZL3Buf,
align 4
-// CHECK-SPIRV: [[H:%.*]] = call target("spirv.VulkanBuffer", [0 x float], 12,
0) @llvm.spv.resource.handlefrombinding.tspirv.VulkanBuffer_a0f32_12_0t(i32 0,
i32 10, i32 1, i32 0, i1 false)
-// CHECK-SPIRV: store target("spirv.VulkanBuffer", [0 x float], 12, 0) [[H]],
ptr @_ZL3Buf, align 8
+// Buf1 initialization part 2 - body of StructuredBuffer<float> C1 constructor
with explicit binding
+// that calls the C2 constructor
+// CHECK: define linkonce_odr void @_ZN4hlsl16StructuredBufferIfEC1Ejjij(ptr
noundef nonnull align 4 dereferenceable(4) %this,
+// CHECK-SAME: i32 noundef %spaceNo, i32 noundef %registerNo, i32 noundef
%range, i32 noundef %index)
+// CHECK-NEXT: entry:
+// CHECK-NEXT: %this.addr = alloca ptr, align 4
+// CHECK-NEXT: %spaceNo.addr = alloca i32, align 4
+// CHECK-NEXT: %registerNo.addr = alloca i32, align 4
+// CHECK-NEXT: %range.addr = alloca i32, align 4
+// CHECK-NEXT: %index.addr = alloca i32, align 4
+// CHECK-NEXT: store ptr %this, ptr %this.addr, align 4
+// CHECK-NEXT: store i32 %spaceNo, ptr %spaceNo.addr, align 4
+// CHECK-NEXT: store i32 %registerNo, ptr %registerNo.addr, align 4
+// CHECK-NEXT: store i32 %range, ptr %range.addr, align 4
+// CHECK-NEXT: store i32 %index, ptr %index.addr, align 4
+// CHECK-NEXT: %this1 = load ptr, ptr %this.addr, align 4
+// CHECK-NEXT: %0 = load i32, ptr %spaceNo.addr, align 4
+// CHECK-NEXT: %1 = load i32, ptr %registerNo.addr, align 4
+// CHECK-NEXT: %2 = load i32, ptr %range.addr, align 4
+// CHECK-NEXT: %3 = load i32, ptr %index.addr, align 4
+// CHECK: call void @_ZN4hlsl16StructuredBufferIfEC2Ejjij(ptr noundef nonnull
align 4 dereferenceable(4) %this1,
+// CHECK-SAME: i32 noundef %0, i32 noundef %1, i32 noundef %2, i32 noundef %3)
+// CHECK-NEXT: ret void
-// CHECK: define internal void @_init_resource__ZL4Buf2()
-// CHECK-DXIL: [[H:%.*]] = call target("dx.RawBuffer", float, 1, 0)
@llvm.dx.resource.handlefrombinding.tdx.RawBuffer_f32_1_0t(i32 1, i32 5, i32 1,
i32 0, i1 false)
-// CHECK-DXIL: store target("dx.RawBuffer", float, 1, 0) [[H]], ptr @_ZL4Buf2,
align 4
-// CHECK-SPIRV: [[H:%.*]] = call target("spirv.VulkanBuffer", [0 x float], 12,
1) @llvm.spv.resource.handlefrombinding.tspirv.VulkanBuffer_a0f32_12_1t(i32 1,
i32 5, i32 1, i32 0, i1 false)
-// CHECK-SPIRV: store target("spirv.VulkanBuffer", [0 x float], 12, 1) [[H]],
ptr @_ZL4Buf2, align 8
+// Buf2 initialization part 1 - FIXME: constructor with implicit binding does
not exist yet;
+// the global init function currently calls the default
RWStructuredBufer<double> C1 constructor
+// CHECK: define internal void @__cxx_global_var_init.1()
+// CHECK-NEXT: entry:
+// CHECK-NEXT: call void @_ZN4hlsl18RWStructuredBufferIfEC1Ev(ptr noundef
nonnull align 4 dereferenceable(4) @_ZL4Buf2)
-// CHECK-DXIL: define internal void @_init_resource__ZL4Buf3()
-// CHECK-DXIL: [[H:%.*]] = call target("dx.RawBuffer", float, 1, 0)
@llvm.dx.resource.handlefrombinding.tdx.RawBuffer_f32_1_0t(i32 0, i32 3, i32 1,
i32 0, i1 false)
-// CHECK-DXIL: store target("dx.RawBuffer", float, 1, 0) [[H]], ptr @_ZL4Buf3,
align 4
+// Buf3 initialization part 1 - local variable declared in function foo() is
initialized by
+// AppendStructuredBuffer<float> C1 default constructor
+// CHECK: define void @_Z3foov()
+// CHECK-NEXT: entry:
+// CHECK-NEXT: %Buf3 = alloca %"class.hlsl::AppendStructuredBuffer", align 4
+// CHECK-NEXT: call void @_ZN4hlsl22AppendStructuredBufferIfEC1Ev(ptr noundef
nonnull align 4 dereferenceable(4) %Buf3)
-// CHECK-DXIL: define internal void @_init_resource__ZL4Buf4()
-// CHECK-DXIL: [[H:%.*]] = call target("dx.RawBuffer", float, 1, 0)
@llvm.dx.resource.handlefrombinding.tdx.RawBuffer_f32_1_0t(i32 0, i32 4, i32 1,
i32 0, i1 false)
-// CHECK-DXIL: store target("dx.RawBuffer", float, 1, 0) [[H]], ptr @_ZL4Buf4,
align 4
+// Buf3 initialization part 2 - body of AppendStructuredBuffer<float> default
C1 constructor that calls
+// the default C2 constructor
+// CHECK: define linkonce_odr void
@_ZN4hlsl22AppendStructuredBufferIfEC1Ev(ptr noundef nonnull align 4
dereferenceable(4) %this)
+// CHECK-NEXT: entry:
+// CHECK-NEXT: %this.addr = alloca ptr, align 4
+// CHECK-NEXT: store ptr %this, ptr %this.addr, align 4
+// CHECK-NEXT: %this1 = load ptr, ptr %this.addr, align 4
+// CHECK: call void @_ZN4hlsl22AppendStructuredBufferIfEC2Ev(ptr noundef
nonnull align 4 dereferenceable(4) %this1)
+// CHECK-NEXT: ret void
-// CHECK-DXIL: define internal void @_init_resource__ZL4Buf5()
-// CHECK-DXIL: [[H:%.*]] = call target("dx.RawBuffer", float, 1, 1)
@llvm.dx.resource.handlefrombinding.tdx.RawBuffer_f32_1_1t(i32 2, i32 1, i32 1,
i32 0, i1 false)
-// CHECK-DXIL: store target("dx.RawBuffer", float, 1, 1) [[H]], ptr @_ZL4Buf5,
align 4
+// Buf1 initialization part 3 - body of AppendStructuredBuffer<float> C2
constructor with explicit binding
+// that initializes handle with @llvm.dx.resource.handlefrombinding
+// CHECK: define linkonce_odr void @_ZN4hlsl16StructuredBufferIfEC2Ejjij(ptr
noundef nonnull align 4 dereferenceable(4) %this,
+// CHECK-SAME: i32 noundef %spaceNo, i32 noundef %registerNo, i32 noundef
%range, i32 noundef %index)
+// CHECK-NEXT: entry:
+// CHECK-NEXT: %this.addr = alloca ptr, align 4
+// CHECK-NEXT: %spaceNo.addr = alloca i32, align 4
+// CHECK-NEXT: %registerNo.addr = alloca i32, align 4
+// CHECK-NEXT: %range.addr = alloca i32, align 4
+// CHECK-NEXT: %index.addr = alloca i32, align 4
+// CHECK-NEXT: store ptr %this, ptr %this.addr, align 4
+// CHECK-NEXT: store i32 %spaceNo, ptr %spaceNo.addr, align 4
+// CHECK-NEXT: store i32 %registerNo, ptr %registerNo.addr, align 4
+// CHECK-NEXT: store i32 %range, ptr %range.addr, align 4
+// CHECK-NEXT: store i32 %index, ptr %index.addr, align 4
+// CHECK-NEXT: %this1 = load ptr, ptr %this.addr, align 4
+// CHECK-NEXT: %0 = load i32, ptr %spaceNo.addr, align 4
+// CHECK-NEXT: %1 = load i32, ptr %registerNo.addr, align 4
+// CHECK-NEXT: %2 = load i32, ptr %range.addr, align 4
+// CHECK-NEXT: %3 = load i32, ptr %index.addr, align 4
+// CHECK-DXIL-NEXT: %4 = call target("dx.RawBuffer", float, 0, 0)
@llvm.dx.resource.handlefrombinding.tdx.RawBuffer_f32_0_0t(
+// CHECK-DXIL-SAME: i32 %0, i32 %1, i32 %2, i32 %3, i1 false)
+// CHECK-NEXT: %__handle = getelementptr inbounds nuw
%"class.hlsl::StructuredBuffer", ptr %this1, i32 0, i32 0
+// CHECK-DXIL-NEXT: store target("dx.RawBuffer", float, 0, 0) %4, ptr
%__handle, align 4
+// CHECK-NEXT: ret void
-// CHECK: define linkonce_odr void @_ZN4hlsl16StructuredBufferIfEC2Ev(ptr
noundef nonnull align {{[48]}} dereferenceable({{[48]}}) %this)
+// Buf3 initialization part 3 - body of AppendStructuredBuffer<float> default
C2 constructor that
+// initializes handle to poison
+// CHECK: define linkonce_odr void
@_ZN4hlsl22AppendStructuredBufferIfEC2Ev(ptr noundef nonnull align 4
dereferenceable(4) %this)
// CHECK-NEXT: entry:
-// CHECK-DXIL: define linkonce_odr void
@_ZN4hlsl18RWStructuredBufferIfEC2Ev(ptr noundef nonnull align 4
dereferenceable(4) %this)
-// CHECK-DXIL-NEXT: entry:
-// CHECK-DXIL: define linkonce_odr void
@_ZN4hlsl22AppendStructuredBufferIfEC2Ev(ptr noundef nonnull align 4
dereferenceable(4) %this)
-// CHECK-DXIL-NEXT: entry:
-// CHECK-DXIL: define linkonce_odr void
@_ZN4hlsl23ConsumeStructuredBufferIfEC2Ev(ptr noundef nonnull align 4
dereferenceable(4) %this)
-// CHECK-DXIL: define linkonce_odr void
@_ZN4hlsl33RasterizerOrderedStructuredBufferIfEC2Ev(ptr noundef nonnull align 4
dereferenceable(4) %this)
-// CHECK-DXIL-NEXT: entry:
+// CHECK-NEXT: %this.addr = alloca ptr, align 4
+// CHECK-NEXT: store ptr %this, ptr %this.addr, align 4
+// CHECK-NEXT: %this1 = load ptr, ptr %this.addr, align 4
+// CHECK: %__handle = getelementptr inbounds nuw
%"class.hlsl::AppendStructuredBuffer", ptr %this1, i32 0, i32 0
+// CHECK: store target("dx.RawBuffer", float, 1, 0) poison, ptr %__handle,
align 4
-// CHECK: define {{.*}} void
@_GLOBAL__sub_I_StructuredBuffers_constructors.hlsl()
-// CHECK: call {{.*}} @_init_resource__ZL3Buf()
-// CHECK: call {{.*}} @_init_resource__ZL4Buf2()
-// CHECK-DXIL: call void @_init_resource__ZL4Buf3()
-// CHECK-DXIL: call void @_init_resource__ZL4Buf4()
-// CHECK-DXIL: call void @_init_resource__ZL4Buf5()
+// Module initialization
+// CHECK: define internal void
@_GLOBAL__sub_I_StructuredBuffers_constructors.hlsl()
+// CHECK-NEXT: entry:
+// CHECK-NEXT: call void @__cxx_global_var_init()
+// CHECK-NEXT: call void @__cxx_global_var_init.1()
diff --git a/clang/test/CodeGenHLSL/cbuffer.hlsl
b/clang/test/CodeGenHLSL/cbuffer.hlsl
index 0a0465cc44e91..0fb36d16fee0a 100644
--- a/clang/test/CodeGenHLSL/cbuffer.hlsl
+++ b/clang/test/CodeGenHLSL/cbuffer.hlsl
@@ -267,13 +267,13 @@ cbuffer CB_C {
double D4;
}
-// CHECK: define internal void @_init_resource_CBScalars.cb()
+// CHECK: define internal void @_init_buffer_CBScalars.cb()
// CHECK-NEXT: entry:
// CHECK-NEXT: %[[HANDLE1:.*]] = call target("dx.CBuffer", target("dx.Layout",
%__cblayout_CBScalars, 56, 0, 8, 16, 24, 32, 36, 40, 48))
// CHECK-SAME:
@llvm.dx.resource.handlefrombinding.tdx.CBuffer_tdx.Layout_s___cblayout_CBScalarss_56_0_8_16_24_32_36_40_48tt(i32
5, i32 1, i32 1, i32 0, i1 false)
// CHECK-NEXT: store target("dx.CBuffer", target("dx.Layout",
%__cblayout_CBScalars, 56, 0, 8, 16, 24, 32, 36, 40, 48)) %CBScalars.cb_h, ptr
@CBScalars.cb, align 4
-// CHECK: define internal void @_init_resource_CBArrays.cb()
+// CHECK: define internal void @_init_buffer_CBArrays.cb()
// CHECK-NEXT: entry:
// CHECK-NEXT: %[[HANDLE2:.*]] = call target("dx.CBuffer", target("dx.Layout",
%__cblayout_CBArrays, 708, 0, 48, 112, 176, 224, 608, 624, 656))
// CHECK-SAME:
@llvm.dx.resource.handlefrombinding.tdx.CBuffer_tdx.Layout_s___cblayout_CBArrayss_708_0_48_112_176_224_608_624_656tt(i32
0, i32 2, i32 1, i32 0, i1 false)
@@ -288,8 +288,8 @@ void main() {
// CHECK: define internal void @_GLOBAL__sub_I_cbuffer.hlsl()
// CHECK-NEXT: entry:
-// CHECK-NEXT: call void @_init_resource_CBScalars.cb()
-// CHECK-NEXT: call void @_init_resource_CBArrays.cb()
+// CHECK-NEXT: call void @_init_buffer_CBScalars.cb()
+// CHECK-NEXT: call void @_init_buffer_CBArrays.cb()
// CHECK: !hlsl.cbs = !{![[CBSCALARS:[0-9]+]], ![[CBVECTORS:[0-9]+]],
![[CBARRAYS:[0-9]+]], ![[CBTYPEDEFARRAY:[0-9]+]], ![[CBSTRUCTS:[0-9]+]],
![[CBCLASSES:[0-9]+]],
// CHECK-SAME: ![[CBMIX:[0-9]+]], ![[CB_A:[0-9]+]], ![[CB_B:[0-9]+]],
![[CB_C:[0-9]+]]}
diff --git a/clang/test/CodeGenHLSL/cbuffer_with_packoffset.hlsl
b/clang/test/CodeGenHLSL/cbuffer_with_packoffset.hlsl
index c0a77564b141a..11ca7b6724ae4 100644
--- a/clang/test/CodeGenHLSL/cbuffer_with_packoffset.hlsl
+++ b/clang/test/CodeGenHLSL/cbuffer_with_packoffset.hlsl
@@ -27,7 +27,7 @@ cbuffer CB : register(b0) {
float2 y : packoffset(c5);
}
-// CHECK: define internal void @_init_resource_CB.cb()
+// CHECK: define internal void @_init_buffer_CB.cb()
// CHECK-NEXT: entry:
// CHECK-NEXT: %CB.cb_h = call target("dx.CBuffer", target("dx.Layout",
%__cblayout_CB, 176, 16, 168, 88))
// CHECK-SAME:
@llvm.dx.resource.handlefrombinding.tdx.CBuffer_tdx.Layout_s___cblayout_CBs_176_16_168_88tt(i32
3, i32 1, i32 1, i32 0, i1 false)
@@ -39,7 +39,7 @@ float foo() {
}
// CHECK: define internal void @_GLOBAL__sub_I_cbuffer_with_packoffset.hlsl()
// CHECK-NEXT: entry:
-// CHECK-NEXT: call void @_init_resource_CB.cb()
+// CHECK-NEXT: call void @_init_buffer_CB.cb()
[numthreads(4,1,1)]
void main() {
diff --git a/clang/test/CodeGenHLSL/resource-bindings.hlsl
b/clang/test/CodeGenHLSL/resource-bindings.hlsl
index 3342fb55a59a4..d8e105ed7e98c 100644
--- a/clang/test/CodeGenHLSL/resource-bindings.hlsl
+++ b/clang/test/CodeGenHLSL/resource-bindings.hlsl
@@ -1,34 +1,46 @@
// RUN: %clang_cc1 -triple dxil--shadermodel6.6-compute -x hlsl
-finclude-default-header -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s
-// CHECK: define internal void @_init_resource__ZL4U0S0()
-// CHECK: [[H:%.*]] = call target("dx.TypedBuffer", <4 x float>, 1, 0, 0)
@llvm.dx.resource.handlefrombinding.tdx.TypedBuffer_v4f32_1_0_0t(i32 0, i32 0,
i32 1, i32 0, i1 false)
-// CHECK: store target("dx.TypedBuffer", <4 x float>, 1, 0, 0) [[H]], ptr
@_ZL4U0S0, align 4
+// CHECK: %"class.hlsl::RWBuffer" = type { target("dx.TypedBuffer", <4 x
float>, 1, 0, 0) }
+// CHECK: %"class.hlsl::RWBuffer.0" = type { target("dx.TypedBuffer", float,
1, 0, 0) }
+// CHECK: %"class.hlsl::StructuredBuffer" = type { target("dx.RawBuffer", i32,
0, 0) }
+// CHECK: %"class.hlsl::RWStructuredBuffer" = type { target("dx.RawBuffer",
%struct.S, 1, 0) }
+
+// CHECK: @_ZL4U0S0 = internal global %"class.hlsl::RWBuffer" poison, align 4
+// CHECK: @_ZL4U5S3 = internal global %"class.hlsl::RWBuffer.0" poison, align 4
+// CHECK: @_ZL4T2S2 = internal global %"class.hlsl::StructuredBuffer" poison,
align 4
+// CHECK: @_ZL4T3S0 = internal global %"class.hlsl::RWStructuredBuffer"
poison, align 4
+
+// CHECK: %[[HANDLE:.*]] = call target("dx.TypedBuffer", <4 x float>, 1, 0, 0)
+// CHECK-SAME:
@llvm.dx.resource.handlefrombinding.tdx.TypedBuffer_v4f32_1_0_0t(
+// CHECK-SAME: i32 %{{[0-9]+}}, i32 %{{[0-9]+}}, i32 %{{[0-9]+}}, i32
%{{[0-9]+}}, i1 false)
+// CHECK: %[[HANDLE_PTR:.*]] = getelementptr inbounds nuw
%"class.hlsl::RWBuffer", ptr %this{{[0-9]*}}, i32 0, i32 0
+// CHECK: store target("dx.TypedBuffer", <4 x float>, 1, 0, 0) %[[HANDLE]],
ptr %[[HANDLE_PTR]], align 4
RWBuffer<float4> U0S0 : register(u0);
-// CHECK: define internal void @_init_resource__ZL4U5S3()
-// CHECK: [[H:%.*]] = call target("dx.TypedBuffer", float, 1, 0, 0)
@llvm.dx.resource.handlefrombinding.tdx.TypedBuffer_f32_1_0_0t(i32 3, i32 5,
i32 1, i32 0, i1 false)
-// CHECK: store target("dx.TypedBuffer", float, 1, 0, 0) [[H]], ptr @_ZL4U5S3,
align 4
+// CHECK: %[[HANDLE:.*]] = call target("dx.TypedBuffer", float, 1, 0, 0)
+// CHECK-SAME: @llvm.dx.resource.handlefrombinding.tdx.TypedBuffer_f32_1_0_0t(
+// CHECK-SAME: i32 %{{[0-9]+}}, i32 %{{[0-9]+}}, i32 %{{[0-9]+}}, i32
%{{[0-9]+}}, i1 false)
+// CHECK: %[[HANDLE_PTR:.*]] = getelementptr inbounds nuw
%"class.hlsl::RWBuffer.0", ptr %this{{[0-9]*}}, i32 0, i32 0
+// CHECK: store target("dx.TypedBuffer", float, 1, 0, 0) %[[HANDLE]], ptr
%[[HANDLE_PTR]], align 4
RWBuffer<float> U5S3 : register(u5, space3);
-// CHECK: define internal void @_init_resource__ZL4T2S2()
-// CHECK: [[H:%.*]] = call target("dx.RawBuffer", i32, 0, 0)
@llvm.dx.resource.handlefrombinding.tdx.RawBuffer_i32_0_0t(i32 2, i32 2, i32 1,
i32 0, i1 false)
-// CHECK: store target("dx.RawBuffer", i32, 0, 0) [[H]], ptr @_ZL4T2S2, align 4
+// CHECK: %[[HANDLE:.*]] = call target("dx.RawBuffer", i32, 0, 0)
+// CHECK-SAME: @llvm.dx.resource.handlefrombinding.tdx.RawBuffer_i32_0_0t(
+// CHECK-SAME: i32 %{{[0-9]+}}, i32 %{{[0-9]+}}, i32 %{{[0-9]+}}, i32
%{{[0-9]+}}, i1 false)
+// CHECK: %[[HANDLE_PTR:.*]] = getelementptr inbounds nuw
%"class.hlsl::StructuredBuffer", ptr %this{{[0-9]*}}, i32 0, i32 0
+// CHECK: store target("dx.RawBuffer", i32, 0, 0) %[[HANDLE]], ptr
%[[HANDLE_PTR]], align 4
StructuredBuffer<int> T2S2 : register(t2, space2);
+
+// CHECK: %[[HANDLE:.*]] = call target("dx.RawBuffer", %struct.S, 1, 0)
+// CHECK-SAME:
@llvm.dx.resource.handlefrombinding.tdx.RawBuffer_s_struct.Ss_1_0t(
+// CHECK-SAME: i32 %{{[0-9]+}}, i32 %{{[0-9]+}}, i32 %{{[0-9]+}}, i32
%{{[0-9]+}}, i1 false)
+// CHECK: %[[HANDLE_PTR:.*]] = getelementptr inbounds nuw
%"class.hlsl::RWStructuredBuffer", ptr %this{{[0-9]*}}, i32 0, i32 0
+// CHECK: store target("dx.RawBuffer", %struct.S, 1, 0) %[[HANDLE]], ptr
%[[HANDLE_PTR]], align 4
struct S {
float4 f;
int i;
};
-
-// CHECK: define internal void @_init_resource__ZL4T3S0()
-// CHECK: [[H:%.*]] = call target("dx.RawBuffer", %struct.S, 0, 0)
@llvm.dx.resource.handlefrombinding.tdx.RawBuffer_s_struct.Ss_0_0t(i32 0, i32
3, i32 1, i32 0, i1 false)
-// CHECK: store target("dx.RawBuffer", %struct.S, 0, 0) [[H]], ptr @_ZL4T3S0,
align 4
-StructuredBuffer<S> T3S0 : register(t3);
-
-// CHECK: define void @main()
-// CHECK: call void @_init_resource__ZL4U0S0()
-// CHECK: call void @_init_resource__ZL4U5S3()
-// CHECK: call void @_init_resource__ZL4T2S2()
-// CHECK: call void @_init_resource__ZL4T3S0()
+RWStructuredBuffer<S> T3S0 : register(u3);
[numthreads(4,1,1)]
void main() {}
diff --git a/clang/test/ParserHLSL/hlsl_resource_handle_attrs.hlsl
b/clang/test/ParserHLSL/hlsl_resource_handle_attrs.hlsl
index b5737f5dac8a9..36e70bc686be8 100644
--- a/clang/test/ParserHLSL/hlsl_resource_handle_attrs.hlsl
+++ b/clang/test/ParserHLSL/hlsl_resource_handle_attrs.hlsl
@@ -3,7 +3,7 @@
// CHECK: ClassTemplateSpecializationDecl {{.*}} class RWBuffer definition
implicit_instantiation
// CHECK: TemplateArgument type 'float'
// CHECK: BuiltinType {{.*}} 'float'
-// CHECK: FieldDecl {{.*}} implicit __handle '__hlsl_resource_t
+// CHECK: FieldDecl {{.*}} implicit referenced __handle '__hlsl_resource_t
// CHECK-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
// CHECK-SAME{LITERAL}: [[hlsl::contained_type(float)]]
RWBuffer<float> Buffer1;
@@ -12,7 +12,7 @@ RWBuffer<float> Buffer1;
// CHECK: TemplateArgument type 'vector<float, 4>'
// CHECK: ExtVectorType {{.*}} 'vector<float, 4>' 4
// CHECK: BuiltinType {{.*}} 'float'
-// CHECK: FieldDecl {{.*}} implicit __handle '__hlsl_resource_t
+// CHECK: FieldDecl {{.*}} implicit referenced __handle '__hlsl_resource_t
// CHECK-SAME{LITERAL}: [[hlsl::resource_class(UAV)]
// CHECK-SAME{LITERAL}: [[hlsl::is_rov]]
// CHECK-SAME{LITERAL}: [[hlsl::contained_type(vector<float, 4>)]]
>From 752ed77e6199810f8803699cfb6e2225a4bc09bf Mon Sep 17 00:00:00 2001
From: Helena Kotas <heko...@microsoft.com>
Date: Wed, 9 Apr 2025 21:06:03 -0700
Subject: [PATCH 2/2] flip register & space, add more tests, cleanup empty
function
---
clang/lib/CodeGen/CGHLSLBuiltins.cpp | 4 +-
clang/lib/CodeGen/CGHLSLRuntime.cpp | 3 --
clang/lib/CodeGen/CGHLSLRuntime.h | 1 -
clang/lib/CodeGen/CodeGenModule.cpp | 3 --
clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.cpp | 2 +-
clang/lib/Sema/SemaHLSL.cpp | 8 ++--
.../test/AST/HLSL/ByteAddressBuffers-AST.hlsl | 36 +++++++++++++++++
.../test/AST/HLSL/StructuredBuffers-AST.hlsl | 4 +-
clang/test/AST/HLSL/TypedBuffers-AST.hlsl | 40 +++++++++++++++++++
.../ByteAddressBuffers-constructors.hlsl | 24 +++++------
.../builtins/RWBuffer-constructor.hlsl | 24 +++++------
.../StructuredBuffers-constructors.hlsl | 25 ++++++------
12 files changed, 122 insertions(+), 52 deletions(-)
diff --git a/clang/lib/CodeGen/CGHLSLBuiltins.cpp
b/clang/lib/CodeGen/CGHLSLBuiltins.cpp
index c652f435781f0..dfcade7a074ca 100644
--- a/clang/lib/CodeGen/CGHLSLBuiltins.cpp
+++ b/clang/lib/CodeGen/CGHLSLBuiltins.cpp
@@ -293,8 +293,8 @@ Value *CodeGenFunction::EmitHLSLBuiltinExpr(unsigned
BuiltinID,
}
case Builtin::BI__builtin_hlsl_resource_createhandlefrombinding: {
llvm::Type *HandleTy = CGM.getTypes().ConvertType(E->getType());
- Value *SpaceNoOp = EmitScalarExpr(E->getArg(1));
- Value *RegisterNoOp = EmitScalarExpr(E->getArg(2));
+ Value *RegisterNoOp = EmitScalarExpr(E->getArg(1));
+ Value *SpaceNoOp = EmitScalarExpr(E->getArg(2));
Value *RangeOp = EmitScalarExpr(E->getArg(3));
Value *IndexOp = EmitScalarExpr(E->getArg(4));
// FIXME: NonUniformResourceIndex bit is not yet implemented
diff --git a/clang/lib/CodeGen/CGHLSLRuntime.cpp
b/clang/lib/CodeGen/CGHLSLRuntime.cpp
index c7fb6b57c47dc..450213fcec676 100644
--- a/clang/lib/CodeGen/CGHLSLRuntime.cpp
+++ b/clang/lib/CodeGen/CGHLSLRuntime.cpp
@@ -544,9 +544,6 @@ static void initializeBufferFromBinding(CodeGenModule &CGM,
Args);
}
-void CGHLSLRuntime::handleGlobalVarDefinition(const VarDecl *VD,
- llvm::GlobalVariable *GV) {}
-
llvm::Instruction *CGHLSLRuntime::getConvergenceToken(BasicBlock &BB) {
if (!CGM.shouldEmitConvergenceTokens())
return nullptr;
diff --git a/clang/lib/CodeGen/CGHLSLRuntime.h
b/clang/lib/CodeGen/CGHLSLRuntime.h
index 68151c0f0ea24..4d6db3f5d9f3e 100644
--- a/clang/lib/CodeGen/CGHLSLRuntime.h
+++ b/clang/lib/CodeGen/CGHLSLRuntime.h
@@ -150,7 +150,6 @@ class CGHLSLRuntime {
void emitEntryFunction(const FunctionDecl *FD, llvm::Function *Fn);
void setHLSLFunctionAttributes(const FunctionDecl *FD, llvm::Function *Fn);
- void handleGlobalVarDefinition(const VarDecl *VD, llvm::GlobalVariable *Var);
llvm::Instruction *getConvergenceToken(llvm::BasicBlock &BB);
diff --git a/clang/lib/CodeGen/CodeGenModule.cpp
b/clang/lib/CodeGen/CodeGenModule.cpp
index 8f9cf965af2b9..395b5c3ecc695 100644
--- a/clang/lib/CodeGen/CodeGenModule.cpp
+++ b/clang/lib/CodeGen/CodeGenModule.cpp
@@ -5698,9 +5698,6 @@ void CodeGenModule::EmitGlobalVarDefinition(const VarDecl
*D,
getCUDARuntime().handleVarRegistration(D, *GV);
}
- if (LangOpts.HLSL)
- getHLSLRuntime().handleGlobalVarDefinition(D, GV);
-
GV->setInitializer(Init);
if (emitter)
emitter->finalize(GV);
diff --git a/clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.cpp
b/clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.cpp
index 4fd01404b012e..a680d6efcd67d 100644
--- a/clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.cpp
+++ b/clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.cpp
@@ -658,8 +658,8 @@ BuiltinTypeDeclBuilder::addHandleConstructorFromBinding() {
QualType HandleType = getResourceHandleField()->getType();
return BuiltinTypeMethodBuilder(*this, "", AST.VoidTy, false, true)
- .addParam("spaceNo", AST.UnsignedIntTy)
.addParam("registerNo", AST.UnsignedIntTy)
+ .addParam("spaceNo", AST.UnsignedIntTy)
.addParam("range", AST.IntTy)
.addParam("index", AST.UnsignedIntTy)
.callBuiltin("__builtin_hlsl_resource_createhandlefrombinding",
diff --git a/clang/lib/Sema/SemaHLSL.cpp b/clang/lib/Sema/SemaHLSL.cpp
index fb786e1429020..299733f8c107f 100644
--- a/clang/lib/Sema/SemaHLSL.cpp
+++ b/clang/lib/Sema/SemaHLSL.cpp
@@ -3207,7 +3207,7 @@ void SemaHLSL::ActOnVariableDeclarator(VarDecl *VD) {
}
}
-static bool initVarDeclWithConstructor(Sema &S, VarDecl *VD,
+static bool initVarDeclWithCtor(Sema &S, VarDecl *VD,
MutableArrayRef<Expr *> Args) {
InitializedEntity Entity = InitializedEntity::InitializeVariable(VD);
InitializationKind Kind = InitializationKind::CreateDirect(
@@ -3235,17 +3235,17 @@ static bool initGlobalResourceDecl(Sema &S, VarDecl
*VD) {
uint64_t UIntTySize = AST.getTypeSize(AST.UnsignedIntTy);
uint64_t IntTySize = AST.getTypeSize(AST.IntTy);
Expr *Args[] = {
+ IntegerLiteral::Create(AST, llvm::APInt(UIntTySize,
RBA->getSlotNumber()),
+ AST.UnsignedIntTy, SourceLocation()),
IntegerLiteral::Create(AST,
llvm::APInt(UIntTySize, RBA->getSpaceNumber()),
AST.UnsignedIntTy, SourceLocation()),
- IntegerLiteral::Create(AST, llvm::APInt(UIntTySize,
RBA->getSlotNumber()),
- AST.UnsignedIntTy, SourceLocation()),
IntegerLiteral::Create(AST, llvm::APInt(IntTySize, 1), AST.IntTy,
SourceLocation()),
IntegerLiteral::Create(AST, llvm::APInt(UIntTySize, 0),
AST.UnsignedIntTy,
SourceLocation())};
- return initVarDeclWithConstructor(S, VD, Args);
+ return initVarDeclWithCtor(S, VD, Args);
}
// Returns true in the initialization has been handled;
diff --git a/clang/test/AST/HLSL/ByteAddressBuffers-AST.hlsl
b/clang/test/AST/HLSL/ByteAddressBuffers-AST.hlsl
index 38e5b6281c42e..c8b584171f007 100644
--- a/clang/test/AST/HLSL/ByteAddressBuffers-AST.hlsl
+++ b/clang/test/AST/HLSL/ByteAddressBuffers-AST.hlsl
@@ -42,5 +42,41 @@ RESOURCE Buffer;
// CHECK-SAME{LITERAL}: [[hlsl::raw_buffer]]
// CHECK-SAME{LITERAL}: [[hlsl::contained_type(char8_t)]]
+// Default constructor
+
+// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]] 'void ()' inline
+// CHECK-NEXT: CompoundStmt
+// CHECK-NEXT: BinaryOperator {{.*}} '='
+// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]' lvalue implicit this
+// CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
+// CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
+// CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}}
'__builtin_hlsl_resource_createpoisonhandle'
+// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]' lvalue implicit this
+// CHECK-NEXT: AlwaysInlineAttr
+
+// Constructor from binding
+
+// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]] 'void (unsigned int, unsigned
int, int, unsigned int)' inline
+// CHECK-NEXT: ParmVarDecl {{.*}} registerNo 'unsigned int'
+// CHECK-NEXT: ParmVarDecl {{.*}} spaceNo 'unsigned int'
+// CHECK-NEXT: ParmVarDecl {{.*}} range 'int'
+// CHECK-NEXT: ParmVarDecl {{.*}} index 'unsigned int'
+// CHECK-NEXT: CompoundStmt {{.*}}
+// CHECK-NEXT: BinaryOperator {{.*}} '='
+// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]' lvalue implicit this
+// CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
+// CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
+// CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}}
'__builtin_hlsl_resource_createhandlefrombinding'
+// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]' lvalue implicit this
+// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'registerNo'
'unsigned int'
+// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'spaceNo'
'unsigned int'
+// CHECK-NEXT: DeclRefExpr {{.*}} 'int' ParmVar {{.*}} 'range' 'int'
+// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'index'
'unsigned int'
+// CHECK-NEXT: AlwaysInlineAttr
+
// CHECK-NOSUBSCRIPT-NOT: CXXMethodDecl {{.*}} operator[] 'const element_type
&(unsigned int) const'
// CHECK-NOSUBSCRIPT-NOT: CXXMethodDecl {{.*}} operator[] 'element_type
&(unsigned int)'
diff --git a/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl
b/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl
index a07613ca2c729..c02a064f7c853 100644
--- a/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl
+++ b/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl
@@ -106,8 +106,8 @@ RESOURCE<float> Buffer;
// Constructor from binding
// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void (unsigned
int, unsigned int, int, unsigned int)' inline
-// CHECK-NEXT: ParmVarDecl {{.*}} spaceNo 'unsigned int'
// CHECK-NEXT: ParmVarDecl {{.*}} registerNo 'unsigned int'
+// CHECK-NEXT: ParmVarDecl {{.*}} spaceNo 'unsigned int'
// CHECK-NEXT: ParmVarDecl {{.*}} range 'int'
// CHECK-NEXT: ParmVarDecl {{.*}} index 'unsigned int'
// CHECK-NEXT: CompoundStmt {{.*}}
@@ -119,8 +119,8 @@ RESOURCE<float> Buffer;
// CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}}
'__builtin_hlsl_resource_createhandlefrombinding'
// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit
this
-// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'spaceNo'
'unsigned int'
// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'registerNo'
'unsigned int'
+// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'spaceNo'
'unsigned int'
// CHECK-NEXT: DeclRefExpr {{.*}} 'int' ParmVar {{.*}} 'range' 'int'
// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'index'
'unsigned int'
// CHECK-NEXT: AlwaysInlineAttr
diff --git a/clang/test/AST/HLSL/TypedBuffers-AST.hlsl
b/clang/test/AST/HLSL/TypedBuffers-AST.hlsl
index 41fd7d7d2ba2a..075bdbace2e01 100644
--- a/clang/test/AST/HLSL/TypedBuffers-AST.hlsl
+++ b/clang/test/AST/HLSL/TypedBuffers-AST.hlsl
@@ -56,6 +56,44 @@ RESOURCE<float> Buffer;
// CHECK-UAV-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
// CHECK-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
+// Default constructor
+
+// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void ()' inline
+// CHECK-NEXT: CompoundStmt
+// CHECK-NEXT: BinaryOperator {{.*}} '='
+// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
+// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit
this
+// CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
+// CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
+// CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}}
'__builtin_hlsl_resource_createpoisonhandle'
+// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
+// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit
this
+// CHECK-NEXT: AlwaysInlineAttr
+
+// Constructor from binding
+
+// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void (unsigned
int, unsigned int, int, unsigned int)' inline
+// CHECK-NEXT: ParmVarDecl {{.*}} registerNo 'unsigned int'
+// CHECK-NEXT: ParmVarDecl {{.*}} spaceNo 'unsigned int'
+// CHECK-NEXT: ParmVarDecl {{.*}} range 'int'
+// CHECK-NEXT: ParmVarDecl {{.*}} index 'unsigned int'
+// CHECK-NEXT: CompoundStmt {{.*}}
+// CHECK-NEXT: BinaryOperator {{.*}} '='
+// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
+// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit
this
+// CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
+// CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
+// CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}}
'__builtin_hlsl_resource_createhandlefrombinding'
+// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
+// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit
this
+// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'registerNo'
'unsigned int'
+// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'spaceNo'
'unsigned int'
+// CHECK-NEXT: DeclRefExpr {{.*}} 'int' ParmVar {{.*}} 'range' 'int'
+// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'index'
'unsigned int'
+// CHECK-NEXT: AlwaysInlineAttr
+
+// Subsctript operators
+
// CHECK: CXXMethodDecl {{.*}} operator[] 'const element_type &(unsigned int)
const'
// CHECK-NEXT: ParmVarDecl {{.*}} Index 'unsigned int'
// CHECK-NEXT: CompoundStmt
@@ -88,6 +126,8 @@ RESOURCE<float> Buffer;
// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'Index'
'unsigned int'
// CHECK-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
+// Load method
+
// CHECK-NEXT: CXXMethodDecl {{.*}} Load 'element_type (unsigned int)'
// CHECK-NEXT: ParmVarDecl {{.*}} Index 'unsigned int'
// CHECK-NEXT: CompoundStmt
diff --git
a/clang/test/CodeGenHLSL/builtins/ByteAddressBuffers-constructors.hlsl
b/clang/test/CodeGenHLSL/builtins/ByteAddressBuffers-constructors.hlsl
index 8853c2948ae54..80bf907180af4 100644
--- a/clang/test/CodeGenHLSL/builtins/ByteAddressBuffers-constructors.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/ByteAddressBuffers-constructors.hlsl
@@ -30,25 +30,25 @@ export void foo() {
// CHECK: define internal void @__cxx_global_var_init()
// CHECK-NEXT: entry:
// CHECK-NEXT: call void @_ZN4hlsl17ByteAddressBufferC1Ejjij(ptr noundef
nonnull align 4 dereferenceable(4) @_ZL4Buf1,
-// CHECK-SAME: i32 noundef 2, i32 noundef 1, i32 noundef 1, i32 noundef 0)
+// CHECK-SAME: i32 noundef 1, i32 noundef 2, i32 noundef 1, i32 noundef 0)
// Buf1 initialization part 2 - body of ByteAddressBuffer C1 constructor with
explicit binding that calls the C2 constructor
// CHECK: define linkonce_odr void @_ZN4hlsl17ByteAddressBufferC1Ejjij(ptr
noundef nonnull align 4 dereferenceable(4) %this,
-// CHECK-SAME: i32 noundef %spaceNo, i32 noundef %registerNo, i32 noundef
%range, i32 noundef %index)
+// CHECK-SAME: i32 noundef %registerNo, i32 noundef %spaceNo, i32 noundef
%range, i32 noundef %index)
// CHECK-NEXT: entry:
// CHECK-NEXT: %this.addr = alloca ptr, align 4
-// CHECK-NEXT: %spaceNo.addr = alloca i32, align 4
// CHECK-NEXT: %registerNo.addr = alloca i32, align 4
+// CHECK-NEXT: %spaceNo.addr = alloca i32, align 4
// CHECK-NEXT: %range.addr = alloca i32, align 4
// CHECK-NEXT: %index.addr = alloca i32, align 4
// CHECK-NEXT: store ptr %this, ptr %this.addr, align 4
-// CHECK-NEXT: store i32 %spaceNo, ptr %spaceNo.addr, align 4
// CHECK-NEXT: store i32 %registerNo, ptr %registerNo.addr, align 4
+// CHECK-NEXT: store i32 %spaceNo, ptr %spaceNo.addr, align 4
// CHECK-NEXT: store i32 %range, ptr %range.addr, align 4
// CHECK-NEXT: store i32 %index, ptr %index.addr, align 4
// CHECK-NEXT: %this1 = load ptr, ptr %this.addr, align 4
-// CHECK-NEXT: %0 = load i32, ptr %spaceNo.addr, align 4
-// CHECK-NEXT: %1 = load i32, ptr %registerNo.addr, align 4
+// CHECK-NEXT: %0 = load i32, ptr %registerNo.addr, align 4
+// CHECK-NEXT: %1 = load i32, ptr %spaceNo.addr, align 4
// CHECK-NEXT: %2 = load i32, ptr %range.addr, align 4
// CHECK-NEXT: %3 = load i32, ptr %index.addr, align 4
// CHECK: call void @_ZN4hlsl17ByteAddressBufferC2Ejjij(ptr noundef nonnull
align 4 dereferenceable(4) %this1,
@@ -81,25 +81,25 @@ export void foo() {
// Buf1 initialization part 3 - ByteAddressBuffer C2 constructor with explicit
binding that initializes
// handle with @llvm.dx.resource.handlefrombinding
// CHECK: define linkonce_odr void @_ZN4hlsl17ByteAddressBufferC2Ejjij(ptr
noundef nonnull align 4 dereferenceable(4) %this,
-// CHECK-SAME: i32 noundef %spaceNo, i32 noundef %registerNo, i32 noundef
%range, i32 noundef %index)
+// CHECK-SAME: i32 noundef %registerNo, i32 noundef %spaceNo, i32 noundef
%range, i32 noundef %index)
// CHECK-NEXT: entry:
// CHECK-NEXT: %this.addr = alloca ptr, align 4
-// CHECK-NEXT: %spaceNo.addr = alloca i32, align 4
// CHECK-NEXT: %registerNo.addr = alloca i32, align 4
+// CHECK-NEXT: %spaceNo.addr = alloca i32, align 4
// CHECK-NEXT: %range.addr = alloca i32, align 4
// CHECK-NEXT: %index.addr = alloca i32, align 4
// CHECK-NEXT: store ptr %this, ptr %this.addr, align 4
-// CHECK-NEXT: store i32 %spaceNo, ptr %spaceNo.addr, align 4
// CHECK-NEXT: store i32 %registerNo, ptr %registerNo.addr, align 4
+// CHECK-NEXT: store i32 %spaceNo, ptr %spaceNo.addr, align 4
// CHECK-NEXT: store i32 %range, ptr %range.addr, align 4
// CHECK-NEXT: store i32 %index, ptr %index.addr, align 4
// CHECK-NEXT: %this1 = load ptr, ptr %this.addr, align 4
-// CHECK-NEXT: %0 = load i32, ptr %spaceNo.addr, align 4
-// CHECK-NEXT: %1 = load i32, ptr %registerNo.addr, align 4
+// CHECK-NEXT: %0 = load i32, ptr %registerNo.addr, align 4
+// CHECK-NEXT: %1 = load i32, ptr %spaceNo.addr, align 4
// CHECK-NEXT: %2 = load i32, ptr %range.addr, align 4
// CHECK-NEXT: %3 = load i32, ptr %index.addr, align 4
// CHECK-DXIL-NEXT: %4 = call target("dx.RawBuffer", i8, 0, 0)
@llvm.dx.resource.handlefrombinding.tdx.RawBuffer_i8_0_0t(
-// CHECK-SAME: i32 %0, i32 %1, i32 %2, i32 %3, i1 false)
+// CHECK-DXIL-SAME: i32 %1, i32 %0, i32 %2, i32 %3, i1 false)
// CHECK-NEXT: %__handle = getelementptr inbounds nuw
%"class.hlsl::ByteAddressBuffer", ptr %this1, i32 0, i32 0
// CHECK-DXIL-NEXT: store target("dx.RawBuffer", i8, 0, 0) %4, ptr %__handle,
align 4
// CHECK-NEXT: ret void
diff --git a/clang/test/CodeGenHLSL/builtins/RWBuffer-constructor.hlsl
b/clang/test/CodeGenHLSL/builtins/RWBuffer-constructor.hlsl
index c704a3b05b3b4..8cf1337dcaf87 100644
--- a/clang/test/CodeGenHLSL/builtins/RWBuffer-constructor.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/RWBuffer-constructor.hlsl
@@ -30,25 +30,25 @@ export void foo() {
// CHECK: define internal void @__cxx_global_var_init()
// CHECK-NEXT: entry:
// CHECK-NEXT: call void @_ZN4hlsl8RWBufferIfEC1Ejjij(ptr noundef nonnull
align 4 dereferenceable(4) @_ZL4Buf1,
-// CHECK-SAME: i32 noundef 3, i32 noundef 5, i32 noundef 1, i32 noundef 0)
+// CHECK-SAME: i32 noundef 5, i32 noundef 3, i32 noundef 1, i32 noundef 0)
// Buf1 initialization part 2 - body of RWBuffer<float> C1 constructor with
explicit binding that calls the C2 constructor
// CHECK: define linkonce_odr void @_ZN4hlsl8RWBufferIfEC1Ejjij(ptr noundef
nonnull align 4 dereferenceable(4) %this,
-// CHECK-SAME: i32 noundef %spaceNo, i32 noundef %registerNo, i32 noundef
%range, i32 noundef %index)
+// CHECK-SAME: i32 noundef %registerNo, i32 noundef %spaceNo, i32 noundef
%range, i32 noundef %index)
// CHECK-NEXT: entry:
// CHECK-NEXT: %this.addr = alloca ptr, align 4
-// CHECK-NEXT: %spaceNo.addr = alloca i32, align 4
// CHECK-NEXT: %registerNo.addr = alloca i32, align 4
+// CHECK-NEXT: %spaceNo.addr = alloca i32, align 4
// CHECK-NEXT: %range.addr = alloca i32, align 4
// CHECK-NEXT: %index.addr = alloca i32, align 4
// CHECK-NEXT: store ptr %this, ptr %this.addr, align 4
-// CHECK-NEXT: store i32 %spaceNo, ptr %spaceNo.addr, align 4
// CHECK-NEXT: store i32 %registerNo, ptr %registerNo.addr, align 4
+// CHECK-NEXT: store i32 %spaceNo, ptr %spaceNo.addr, align 4
// CHECK-NEXT: store i32 %range, ptr %range.addr, align 4
// CHECK-NEXT: store i32 %index, ptr %index.addr, align 4
// CHECK-NEXT: %this1 = load ptr, ptr %this.addr, align 4
-// CHECK-NEXT: %0 = load i32, ptr %spaceNo.addr, align 4
-// CHECK-NEXT: %1 = load i32, ptr %registerNo.addr, align 4
+// CHECK-NEXT: %0 = load i32, ptr %registerNo.addr, align 4
+// CHECK-NEXT: %1 = load i32, ptr %spaceNo.addr, align 4
// CHECK-NEXT: %2 = load i32, ptr %range.addr, align 4
// CHECK-NEXT: %3 = load i32, ptr %index.addr, align 4
// CHECK-NEXT: call void @_ZN4hlsl8RWBufferIfEC2Ejjij(ptr noundef nonnull
align 4 dereferenceable(4) %this1,
@@ -79,25 +79,25 @@ export void foo() {
// Buf1 initialization part 3 - body of RWBuffer<float> C2 constructor with
explicit binding that initializes
// handle with @llvm.dx.resource.handlefrombinding
// CHECK: define linkonce_odr void @_ZN4hlsl8RWBufferIfEC2Ejjij(ptr noundef
nonnull align 4 dereferenceable(4) %this,
-// CHECK-SAME: i32 noundef %spaceNo, i32 noundef %registerNo, i32 noundef
%range, i32 noundef %index)
+// CHECK-SAME: i32 noundef %registerNo, i32 noundef %spaceNo, i32 noundef
%range, i32 noundef %index)
// CHECK-NEXT: entry:
// CHECK-NEXT: %this.addr = alloca ptr, align 4
-// CHECK-NEXT: %spaceNo.addr = alloca i32, align 4
// CHECK-NEXT: %registerNo.addr = alloca i32, align 4
+// CHECK-NEXT: %spaceNo.addr = alloca i32, align 4
// CHECK-NEXT: %range.addr = alloca i32, align 4
// CHECK-NEXT: %index.addr = alloca i32, align 4
// CHECK-NEXT: store ptr %this, ptr %this.addr, align 4
-// CHECK-NEXT: store i32 %spaceNo, ptr %spaceNo.addr, align 4
// CHECK-NEXT: store i32 %registerNo, ptr %registerNo.addr, align 4
+// CHECK-NEXT: store i32 %spaceNo, ptr %spaceNo.addr, align 4
// CHECK-NEXT: store i32 %range, ptr %range.addr, align 4
// CHECK-NEXT: store i32 %index, ptr %index.addr, align 4
// CHECK-NEXT: %this1 = load ptr, ptr %this.addr, align 4
-// CHECK-NEXT: %0 = load i32, ptr %spaceNo.addr, align 4
-// CHECK-NEXT: %1 = load i32, ptr %registerNo.addr, align 4
+// CHECK-NEXT: %0 = load i32, ptr %registerNo.addr, align 4
+// CHECK-NEXT: %1 = load i32, ptr %spaceNo.addr, align 4
// CHECK-NEXT: %2 = load i32, ptr %range.addr, align 4
// CHECK-NEXT: %3 = load i32, ptr %index.addr, align 4
// CHECK-DXIL-NEXT: %4 = call target("dx.TypedBuffer", float, 1, 0, 0)
@llvm.dx.resource.handlefrombinding.tdx.TypedBuffer_f32_1_0_0t(
-// CHECK-DXIL-SAME: i32 %0, i32 %1, i32 %2, i32 %3, i1 false)
+// CHECK-DXIL-SAME: i32 %1, i32 %0, i32 %2, i32 %3, i1 false)
// CHECK-NEXT: %__handle = getelementptr inbounds nuw %"class.hlsl::RWBuffer",
ptr %this1, i32 0, i32 0
// CHECK-DXIL-NEXT: store target("dx.TypedBuffer", float, 1, 0, 0) %4, ptr
%__handle, align 4
// CHECK-NEXT: ret void
diff --git
a/clang/test/CodeGenHLSL/builtins/StructuredBuffers-constructors.hlsl
b/clang/test/CodeGenHLSL/builtins/StructuredBuffers-constructors.hlsl
index 3c41f3583ac1a..ec94991ea4801 100644
--- a/clang/test/CodeGenHLSL/builtins/StructuredBuffers-constructors.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/StructuredBuffers-constructors.hlsl
@@ -29,26 +29,27 @@ export void foo() {
// with explicit binding
// CHECK: define internal void @__cxx_global_var_init()
// CHECK-NEXT: entry:
-// CHECK-NEXT: call void @_ZN4hlsl16StructuredBufferIfEC1Ejjij(ptr noundef
nonnull align 4 dereferenceable(4) @_ZL4Buf1, i32 noundef 2, i32 noundef 10,
i32 noundef 1, i32 noundef 0)
+// CHECK-NEXT: call void @_ZN4hlsl16StructuredBufferIfEC1Ejjij(ptr noundef
nonnull align 4 dereferenceable(4) @_ZL4Buf1,
+// CHECK-SAME: i32 noundef 10, i32 noundef 2, i32 noundef 1, i32 noundef 0)
// Buf1 initialization part 2 - body of StructuredBuffer<float> C1 constructor
with explicit binding
// that calls the C2 constructor
// CHECK: define linkonce_odr void @_ZN4hlsl16StructuredBufferIfEC1Ejjij(ptr
noundef nonnull align 4 dereferenceable(4) %this,
-// CHECK-SAME: i32 noundef %spaceNo, i32 noundef %registerNo, i32 noundef
%range, i32 noundef %index)
+// CHECK-SAME: i32 noundef %registerNo, i32 noundef %spaceNo, i32 noundef
%range, i32 noundef %index)
// CHECK-NEXT: entry:
// CHECK-NEXT: %this.addr = alloca ptr, align 4
-// CHECK-NEXT: %spaceNo.addr = alloca i32, align 4
// CHECK-NEXT: %registerNo.addr = alloca i32, align 4
+// CHECK-NEXT: %spaceNo.addr = alloca i32, align 4
// CHECK-NEXT: %range.addr = alloca i32, align 4
// CHECK-NEXT: %index.addr = alloca i32, align 4
// CHECK-NEXT: store ptr %this, ptr %this.addr, align 4
-// CHECK-NEXT: store i32 %spaceNo, ptr %spaceNo.addr, align 4
// CHECK-NEXT: store i32 %registerNo, ptr %registerNo.addr, align 4
+// CHECK-NEXT: store i32 %spaceNo, ptr %spaceNo.addr, align 4
// CHECK-NEXT: store i32 %range, ptr %range.addr, align 4
// CHECK-NEXT: store i32 %index, ptr %index.addr, align 4
// CHECK-NEXT: %this1 = load ptr, ptr %this.addr, align 4
-// CHECK-NEXT: %0 = load i32, ptr %spaceNo.addr, align 4
-// CHECK-NEXT: %1 = load i32, ptr %registerNo.addr, align 4
+// CHECK-NEXT: %0 = load i32, ptr %registerNo.addr, align 4
+// CHECK-NEXT: %1 = load i32, ptr %spaceNo.addr, align 4
// CHECK-NEXT: %2 = load i32, ptr %range.addr, align 4
// CHECK-NEXT: %3 = load i32, ptr %index.addr, align 4
// CHECK: call void @_ZN4hlsl16StructuredBufferIfEC2Ejjij(ptr noundef nonnull
align 4 dereferenceable(4) %this1,
@@ -81,25 +82,25 @@ export void foo() {
// Buf1 initialization part 3 - body of AppendStructuredBuffer<float> C2
constructor with explicit binding
// that initializes handle with @llvm.dx.resource.handlefrombinding
// CHECK: define linkonce_odr void @_ZN4hlsl16StructuredBufferIfEC2Ejjij(ptr
noundef nonnull align 4 dereferenceable(4) %this,
-// CHECK-SAME: i32 noundef %spaceNo, i32 noundef %registerNo, i32 noundef
%range, i32 noundef %index)
+// CHECK-SAME: i32 noundef %registerNo, i32 noundef %spaceNo, i32 noundef
%range, i32 noundef %index)
// CHECK-NEXT: entry:
// CHECK-NEXT: %this.addr = alloca ptr, align 4
-// CHECK-NEXT: %spaceNo.addr = alloca i32, align 4
// CHECK-NEXT: %registerNo.addr = alloca i32, align 4
+// CHECK-NEXT: %spaceNo.addr = alloca i32, align 4
// CHECK-NEXT: %range.addr = alloca i32, align 4
// CHECK-NEXT: %index.addr = alloca i32, align 4
// CHECK-NEXT: store ptr %this, ptr %this.addr, align 4
-// CHECK-NEXT: store i32 %spaceNo, ptr %spaceNo.addr, align 4
// CHECK-NEXT: store i32 %registerNo, ptr %registerNo.addr, align 4
+// CHECK-NEXT: store i32 %spaceNo, ptr %spaceNo.addr, align 4
// CHECK-NEXT: store i32 %range, ptr %range.addr, align 4
// CHECK-NEXT: store i32 %index, ptr %index.addr, align 4
// CHECK-NEXT: %this1 = load ptr, ptr %this.addr, align 4
-// CHECK-NEXT: %0 = load i32, ptr %spaceNo.addr, align 4
-// CHECK-NEXT: %1 = load i32, ptr %registerNo.addr, align 4
+// CHECK-NEXT: %0 = load i32, ptr %registerNo.addr, align 4
+// CHECK-NEXT: %1 = load i32, ptr %spaceNo.addr, align 4
// CHECK-NEXT: %2 = load i32, ptr %range.addr, align 4
// CHECK-NEXT: %3 = load i32, ptr %index.addr, align 4
// CHECK-DXIL-NEXT: %4 = call target("dx.RawBuffer", float, 0, 0)
@llvm.dx.resource.handlefrombinding.tdx.RawBuffer_f32_0_0t(
-// CHECK-DXIL-SAME: i32 %0, i32 %1, i32 %2, i32 %3, i1 false)
+// CHECK-DXIL-SAME: i32 %1, i32 %0, i32 %2, i32 %3, i1 false)
// CHECK-NEXT: %__handle = getelementptr inbounds nuw
%"class.hlsl::StructuredBuffer", ptr %this1, i32 0, i32 0
// CHECK-DXIL-NEXT: store target("dx.RawBuffer", float, 0, 0) %4, ptr
%__handle, align 4
// CHECK-NEXT: ret void
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
