Skip to content

[OMM] Add D3D Flag RAYTRACING_PIPELINE_FLAG_ALLOW_OPACITY_MICROMAPS, and run d3dreflect tests #7239

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
bob80905 merged 13 commits into from
Mar 28, 2025
Merged

[OMM] Add D3D Flag RAYTRACING_PIPELINE_FLAG_ALLOW_OPACITY_MICROMAPS, and run d3dreflect tests #7239

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3644d41
first draft
bob80905 Mar 20, 2025
2c9ebf5
clang format
bob80905 Mar 20, 2025
8502636
add implicit ast / ast dump tests
bob80905 Mar 21, 2025
625f8d2
fiddle with reflect test
bob80905 Mar 22, 2025
d8385ec
a test
bob80905 Mar 24, 2025
8cc2154
some analysis
bob80905 Mar 25, 2025
2d5fd22
use new attr
bob80905 Mar 27, 2025
1969f85
check for attr
bob80905 Mar 28, 2025
c68f33a
detect subobjects in globals
bob80905 Mar 28, 2025
e38d869
remove unrecognized dxilver
bob80905 Mar 28, 2025
548df7d
rework gatherglobalswithinitializers to create separate subobj list
bob80905 Mar 28, 2025
8f4df9c
update logic, fix loop
bob80905 Mar 28, 2025
64f00ba
formatting
bob80905 Mar 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 27 additions & 23 deletions tools/clang/lib/Sema/SemaHLSLDiagnoseTU.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,8 @@ std::vector<FunctionDecl *> GetAllExportedFDecls(clang::Sema *self) {
}

void GatherGlobalsWithInitializers(
DeclContext *DC, llvm::SmallVectorImpl<VarDecl *> &GlobalsWithInit) {
DeclContext *DC, llvm::SmallVectorImpl<VarDecl *> &GlobalsWithInit,
llvm::SmallVectorImpl<VarDecl *> &SubObjects) {
for (auto *D : DC->decls()) {
// Skip built-ins and function decls.
if (D->isImplicit() || isa<FunctionDecl>(D))
Expand All @@ -310,11 +311,19 @@ void GatherGlobalsWithInitializers(
// Add if user-defined static or groupshared global with initializer.
if (VD->hasInit() && VD->hasGlobalStorage() &&
(VD->getStorageClass() == SC_Static ||
VD->hasAttr<HLSLGroupSharedAttr>()))
GlobalsWithInit.push_back(VD);
VD->hasAttr<HLSLGroupSharedAttr>())) {
// Place subobjects in a separate collection.
QualType QT = VD->getType();
if (const RecordType *RT = QT->getAs<RecordType>()) {
RecordDecl *RD = RT->getDecl();
if (RD->hasAttr<HLSLSubObjectAttr>())
SubObjects.push_back(VD);
Comment thread
tex3d marked this conversation as resolved.
} else
GlobalsWithInit.push_back(VD);
}
} else if (auto *DC = dyn_cast<DeclContext>(D)) {
// Recurse into DeclContexts like namespace, cbuffer, class/struct, etc.
GatherGlobalsWithInitializers(DC, GlobalsWithInit);
GatherGlobalsWithInitializers(DC, GlobalsWithInit, SubObjects);
}
}
}
Expand Down Expand Up @@ -592,14 +601,25 @@ void hlsl::DiagnoseTranslationUnit(clang::Sema *self) {
hlsl::ShaderModel::GetByName(self->getLangOpts().HLSLProfile.c_str());

llvm::SmallVector<VarDecl *, 16> GlobalsWithInit;
GatherGlobalsWithInitializers(self->getASTContext().getTranslationUnitDecl(),
GlobalsWithInit);

llvm::SmallVector<VarDecl *, 16> SubObjects;
std::set<FunctionDecl *> DiagnosedRecursiveDecls;
llvm::SmallPtrSet<CallExpr *, 16> DiagnosedCalls;
llvm::SmallPtrSet<DeclRefExpr *, 16> DeclAvailabilityChecked;
llvm::SmallSet<SourceLocation, 16> DiagnosedTypeLocs;

GatherGlobalsWithInitializers(self->getASTContext().getTranslationUnitDecl(),
GlobalsWithInit, SubObjects);

if (shaderModel->GetKind() == DXIL::ShaderKind::Library) {
for (VarDecl *VD : SubObjects) {
DXIL::NodeLaunchType NodeLaunchTy = DXIL::NodeLaunchType::Invalid;
HLSLReachableDiagnoseVisitor Visitor(
self, shaderModel, shaderModel->GetKind(), NodeLaunchTy, nullptr,
DiagnosedCalls, DeclAvailabilityChecked, DiagnosedTypeLocs);
Visitor.TraverseDecl(VD);
}
}
Comment thread
tex3d marked this conversation as resolved.

// for each FDecl, check for recursion
for (FunctionDecl *FDecl : FDeclsToCheck) {
CallGraphWithRecurseGuard callGraph;
Expand Down Expand Up @@ -732,20 +752,4 @@ void hlsl::DiagnoseTranslationUnit(clang::Sema *self) {
for (FunctionDecl *FD : callGraph.GetVisitedFunctions())
Visitor.TraverseDecl(FD);
}

if (shaderModel->GetKind() == DXIL::ShaderKind::Library) {
for (VarDecl *VD : GlobalsWithInit) {
DXIL::NodeLaunchType NodeLaunchTy = DXIL::NodeLaunchType::Invalid;
HLSLReachableDiagnoseVisitor Visitor(
self, shaderModel, shaderModel->GetKind(), NodeLaunchTy, nullptr,
DiagnosedCalls, DeclAvailabilityChecked, DiagnosedTypeLocs);
QualType QT = VD->getType();
if (const RecordType *RT = QT->getAs<RecordType>()) {
RecordDecl *RD = RT->getDecl();
if (!RD->hasAttr<HLSLSubObjectAttr>())
continue;
Visitor.TraverseDecl(VD);
}
}
}
}
Loading