Skip to content

Commit 0f5ee07

Browse files
frasercrmckfrasercrmck
authored
[SYCL] Move the rest of attribute handling to SemaSYCL (#15093)
This completes the work started by #14955.
1 parent 433e78f commit 0f5ee07

File tree

6 files changed

+1494
-1444
lines changed

6 files changed

+1494
-1444
lines changed

‎clang/include/clang/Sema/Sema.h‎

Lines changed: 0 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -4702,79 +4702,6 @@ class Sema final : public SemaBase {
47024702
/// Essentially, this just moves them to the current pool.
47034703
void redelayDiagnostics(sema::DelayedDiagnosticPool &pool);
47044704

4705-
SYCLWorkGroupSizeHintAttr *
4706-
MergeSYCLWorkGroupSizeHintAttr(Decl *D, const SYCLWorkGroupSizeHintAttr &A);
4707-
IntelReqdSubGroupSizeAttr *
4708-
MergeIntelReqdSubGroupSizeAttr(Decl *D, const IntelReqdSubGroupSizeAttr &A);
4709-
IntelNamedSubGroupSizeAttr *
4710-
MergeIntelNamedSubGroupSizeAttr(Decl *D, const IntelNamedSubGroupSizeAttr &A);
4711-
SYCLIntelNumSimdWorkItemsAttr *
4712-
MergeSYCLIntelNumSimdWorkItemsAttr(Decl *D,
4713-
const SYCLIntelNumSimdWorkItemsAttr &A);
4714-
SYCLIntelESimdVectorizeAttr *
4715-
MergeSYCLIntelESimdVectorizeAttr(Decl *D,
4716-
const SYCLIntelESimdVectorizeAttr &A);
4717-
SYCLIntelSchedulerTargetFmaxMhzAttr *MergeSYCLIntelSchedulerTargetFmaxMhzAttr(
4718-
Decl *D, const SYCLIntelSchedulerTargetFmaxMhzAttr &A);
4719-
SYCLIntelNoGlobalWorkOffsetAttr *MergeSYCLIntelNoGlobalWorkOffsetAttr(
4720-
Decl *D, const SYCLIntelNoGlobalWorkOffsetAttr &A);
4721-
SYCLIntelLoopFuseAttr *
4722-
MergeSYCLIntelLoopFuseAttr(Decl *D, const SYCLIntelLoopFuseAttr &A);
4723-
SYCLIntelMaxReplicatesAttr *
4724-
MergeSYCLIntelMaxReplicatesAttr(Decl *D, const SYCLIntelMaxReplicatesAttr &A);
4725-
SYCLIntelForcePow2DepthAttr *
4726-
MergeSYCLIntelForcePow2DepthAttr(Decl *D,
4727-
const SYCLIntelForcePow2DepthAttr &A);
4728-
SYCLIntelInitiationIntervalAttr *MergeSYCLIntelInitiationIntervalAttr(
4729-
Decl *D, const SYCLIntelInitiationIntervalAttr &A);
4730-
4731-
SYCLIntelMaxConcurrencyAttr *
4732-
MergeSYCLIntelMaxConcurrencyAttr(Decl *D,
4733-
const SYCLIntelMaxConcurrencyAttr &A);
4734-
SYCLIntelMaxGlobalWorkDimAttr *
4735-
MergeSYCLIntelMaxGlobalWorkDimAttr(Decl *D,
4736-
const SYCLIntelMaxGlobalWorkDimAttr &A);
4737-
SYCLIntelMinWorkGroupsPerComputeUnitAttr *
4738-
MergeSYCLIntelMinWorkGroupsPerComputeUnitAttr(
4739-
Decl *D, const SYCLIntelMinWorkGroupsPerComputeUnitAttr &A);
4740-
SYCLIntelMaxWorkGroupsPerMultiprocessorAttr *
4741-
MergeSYCLIntelMaxWorkGroupsPerMultiprocessorAttr(
4742-
Decl *D, const SYCLIntelMaxWorkGroupsPerMultiprocessorAttr &A);
4743-
SYCLIntelBankWidthAttr *
4744-
MergeSYCLIntelBankWidthAttr(Decl *D, const SYCLIntelBankWidthAttr &A);
4745-
SYCLIntelNumBanksAttr *
4746-
MergeSYCLIntelNumBanksAttr(Decl *D, const SYCLIntelNumBanksAttr &A);
4747-
SYCLDeviceHasAttr *MergeSYCLDeviceHasAttr(Decl *D,
4748-
const SYCLDeviceHasAttr &A);
4749-
SYCLUsesAspectsAttr *MergeSYCLUsesAspectsAttr(Decl *D,
4750-
const SYCLUsesAspectsAttr &A);
4751-
bool CheckMaxAllowedWorkGroupSize(const Expr *RWGSXDim, const Expr *RWGSYDim,
4752-
const Expr *RWGSZDim, const Expr *MWGSXDim,
4753-
const Expr *MWGSYDim, const Expr *MWGSZDim);
4754-
SYCLIntelMaxWorkGroupSizeAttr *
4755-
MergeSYCLIntelMaxWorkGroupSizeAttr(Decl *D,
4756-
const SYCLIntelMaxWorkGroupSizeAttr &A);
4757-
void CheckSYCLAddIRAttributesFunctionAttrConflicts(Decl *D);
4758-
SYCLAddIRAttributesFunctionAttr *MergeSYCLAddIRAttributesFunctionAttr(
4759-
Decl *D, const SYCLAddIRAttributesFunctionAttr &A);
4760-
SYCLAddIRAttributesKernelParameterAttr *
4761-
MergeSYCLAddIRAttributesKernelParameterAttr(
4762-
Decl *D, const SYCLAddIRAttributesKernelParameterAttr &A);
4763-
SYCLAddIRAttributesGlobalVariableAttr *
4764-
MergeSYCLAddIRAttributesGlobalVariableAttr(
4765-
Decl *D, const SYCLAddIRAttributesGlobalVariableAttr &A);
4766-
SYCLAddIRAnnotationsMemberAttr *
4767-
MergeSYCLAddIRAnnotationsMemberAttr(Decl *D,
4768-
const SYCLAddIRAnnotationsMemberAttr &A);
4769-
SYCLReqdWorkGroupSizeAttr *
4770-
MergeSYCLReqdWorkGroupSizeAttr(Decl *D, const SYCLReqdWorkGroupSizeAttr &A);
4771-
4772-
SYCLTypeAttr *MergeSYCLTypeAttr(Decl *D, const AttributeCommonInfo &CI,
4773-
SYCLTypeAttr::SYCLType TypeName);
4774-
4775-
SYCLIntelPipeIOAttr *MergeSYCLIntelPipeIOAttr(Decl *D,
4776-
const SYCLIntelPipeIOAttr &A);
4777-
47784705
bool CheckCountedByAttr(Scope *Scope, const FieldDecl *FD);
47794706
/// Check if IdxExpr is a valid parameter index for a function or
47804707
/// instance method D. May output an error.

‎clang/include/clang/Sema/SemaSYCL.h‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,124 @@ class SemaSYCL : public SemaBase {
419419
ParsedType ParsedTy);
420420

421421
void handleKernelAttr(Decl *D, const ParsedAttr &AL);
422+
void handleSYCLTypeAttr(Decl *D, const ParsedAttr &AL);
423+
void handleSYCLDeviceAttr(Decl *D, const ParsedAttr &AL);
424+
void handleSYCLDeviceIndirectlyCallableAttr(Decl *D, const ParsedAttr &AL);
425+
void handleSYCLGlobalVarAttr(Decl *D, const ParsedAttr &AL);
426+
void handleSYCLRegisterNumAttr(Decl *D, const ParsedAttr &AL);
427+
void handleSYCLIntelESimdVectorizeAttr(Decl *D, const ParsedAttr &AL);
428+
void handleSYCLDeviceHasAttr(Decl *D, const ParsedAttr &AL);
429+
void handleSYCLUsesAspectsAttr(Decl *D, const ParsedAttr &AL);
430+
void handleLaunchBoundsAttr(Decl *D, const ParsedAttr &AL);
431+
void handleSYCLWorkGroupSizeHintAttr(Decl *D, const ParsedAttr &AL);
432+
void handleSYCLReqdWorkGroupSizeAttr(Decl *D, const ParsedAttr &AL);
433+
void handleSYCLIntelMaxWorkGroupSizeAttr(Decl *D, const ParsedAttr &AL);
434+
void handleSYCLIntelMinWorkGroupsPerComputeUnitAttr(Decl *D,
435+
const ParsedAttr &AL);
436+
void handleSYCLIntelMaxWorkGroupsPerMultiprocessorAttr(Decl *D,
437+
const ParsedAttr &AL);
438+
void handleIntelReqdSubGroupSizeAttr(Decl *D, const ParsedAttr &AL);
439+
void handleIntelNamedSubGroupSizeAttr(Decl *D, const ParsedAttr &AL);
440+
void handleSYCLIntelNumSimdWorkItemsAttr(Decl *D, const ParsedAttr &AL);
441+
void handleSYCLIntelSchedulerTargetFmaxMhzAttr(Decl *D, const ParsedAttr &AL);
442+
void handleSYCLIntelMaxGlobalWorkDimAttr(Decl *D, const ParsedAttr &AL);
443+
void handleSYCLIntelNoGlobalWorkOffsetAttr(Decl *D, const ParsedAttr &AL);
444+
void handleSYCLIntelUseStallEnableClustersAttr(Decl *D, const ParsedAttr &AL);
445+
void handleSYCLIntelLoopFuseAttr(Decl *D, const ParsedAttr &AL);
446+
void handleSYCLIntelInitiationIntervalAttr(Decl *D, const ParsedAttr &AL);
447+
void handleSYCLIntelDoublePumpAttr(Decl *D, const ParsedAttr &AL);
448+
void handleSYCLIntelSinglePumpAttr(Decl *D, const ParsedAttr &AL);
449+
void handleSYCLIntelMemoryAttr(Decl *D, const ParsedAttr &AL);
450+
void handleSYCLIntelRegisterAttr(Decl *D, const ParsedAttr &AL);
451+
void handleSYCLIntelBankWidthAttr(Decl *D, const ParsedAttr &AL);
452+
void handleSYCLIntelNumBanksAttr(Decl *D, const ParsedAttr &AL);
453+
void handleSYCLIntelPrivateCopiesAttr(Decl *D, const ParsedAttr &AL);
454+
void handleSYCLIntelMaxReplicatesAttr(Decl *D, const ParsedAttr &AL);
455+
void handleIntelSimpleDualPortAttr(Decl *D, const ParsedAttr &AL);
456+
void handleSYCLIntelMergeAttr(Decl *D, const ParsedAttr &AL);
457+
void handleSYCLIntelBankBitsAttr(Decl *D, const ParsedAttr &AL);
458+
void handleSYCLIntelForcePow2DepthAttr(Decl *D, const ParsedAttr &AL);
459+
void handleSYCLIntelPipeIOAttr(Decl *D, const ParsedAttr &AL);
460+
void handleSYCLIntelMaxConcurrencyAttr(Decl *D, const ParsedAttr &AL);
461+
void handleSYCLAddIRAttributesFunctionAttr(Decl *D, const ParsedAttr &AL);
462+
void handleSYCLAddIRAttributesKernelParameterAttr(Decl *D,
463+
const ParsedAttr &AL);
464+
void handleSYCLAddIRAttributesGlobalVariableAttr(Decl *D,
465+
const ParsedAttr &AL);
466+
void handleSYCLAddIRAnnotationsMemberAttr(Decl *D, const ParsedAttr &AL);
467+
void handleSYCLIntelMaxWorkGroupSize(Decl *D, const ParsedAttr &AL);
468+
void handleSYCLIntelMinWorkGroupsPerComputeUnit(Decl *D,
469+
const ParsedAttr &AL);
470+
void handleSYCLIntelMaxWorkGroupsPerMultiprocessor(Decl *D,
471+
const ParsedAttr &AL);
472+
473+
void checkSYCLAddIRAttributesFunctionAttrConflicts(Decl *D);
474+
475+
SYCLReqdWorkGroupSizeAttr *
476+
mergeSYCLReqdWorkGroupSizeAttr(Decl *D, const SYCLReqdWorkGroupSizeAttr &A);
477+
SYCLIntelNumSimdWorkItemsAttr *
478+
mergeSYCLIntelNumSimdWorkItemsAttr(Decl *D,
479+
const SYCLIntelNumSimdWorkItemsAttr &A);
480+
SYCLIntelInitiationIntervalAttr *mergeSYCLIntelInitiationIntervalAttr(
481+
Decl *D, const SYCLIntelInitiationIntervalAttr &A);
482+
SYCLIntelSchedulerTargetFmaxMhzAttr *mergeSYCLIntelSchedulerTargetFmaxMhzAttr(
483+
Decl *D, const SYCLIntelSchedulerTargetFmaxMhzAttr &A);
484+
SYCLIntelMaxGlobalWorkDimAttr *
485+
mergeSYCLIntelMaxGlobalWorkDimAttr(Decl *D,
486+
const SYCLIntelMaxGlobalWorkDimAttr &A);
487+
SYCLIntelMinWorkGroupsPerComputeUnitAttr *
488+
mergeSYCLIntelMinWorkGroupsPerComputeUnitAttr(
489+
Decl *D, const SYCLIntelMinWorkGroupsPerComputeUnitAttr &A);
490+
SYCLIntelMaxWorkGroupsPerMultiprocessorAttr *
491+
mergeSYCLIntelMaxWorkGroupsPerMultiprocessorAttr(
492+
Decl *D, const SYCLIntelMaxWorkGroupsPerMultiprocessorAttr &A);
493+
SYCLIntelLoopFuseAttr *
494+
mergeSYCLIntelLoopFuseAttr(Decl *D, const SYCLIntelLoopFuseAttr &A);
495+
SYCLIntelESimdVectorizeAttr *
496+
mergeSYCLIntelESimdVectorizeAttr(Decl *D,
497+
const SYCLIntelESimdVectorizeAttr &A);
498+
SYCLIntelNoGlobalWorkOffsetAttr *mergeSYCLIntelNoGlobalWorkOffsetAttr(
499+
Decl *D, const SYCLIntelNoGlobalWorkOffsetAttr &A);
500+
SYCLIntelBankWidthAttr *
501+
mergeSYCLIntelBankWidthAttr(Decl *D, const SYCLIntelBankWidthAttr &A);
502+
SYCLIntelNumBanksAttr *
503+
mergeSYCLIntelNumBanksAttr(Decl *D, const SYCLIntelNumBanksAttr &A);
504+
SYCLIntelMaxReplicatesAttr *
505+
mergeSYCLIntelMaxReplicatesAttr(Decl *D, const SYCLIntelMaxReplicatesAttr &A);
506+
SYCLIntelForcePow2DepthAttr *
507+
mergeSYCLIntelForcePow2DepthAttr(Decl *D,
508+
const SYCLIntelForcePow2DepthAttr &A);
509+
SYCLIntelPipeIOAttr *mergeSYCLIntelPipeIOAttr(Decl *D,
510+
const SYCLIntelPipeIOAttr &A);
511+
SYCLIntelMaxConcurrencyAttr *
512+
mergeSYCLIntelMaxConcurrencyAttr(Decl *D,
513+
const SYCLIntelMaxConcurrencyAttr &A);
514+
SYCLAddIRAttributesFunctionAttr *mergeSYCLAddIRAttributesFunctionAttr(
515+
Decl *D, const SYCLAddIRAttributesFunctionAttr &A);
516+
SYCLAddIRAttributesKernelParameterAttr *
517+
mergeSYCLAddIRAttributesKernelParameterAttr(
518+
Decl *D, const SYCLAddIRAttributesKernelParameterAttr &A);
519+
SYCLAddIRAttributesGlobalVariableAttr *
520+
mergeSYCLAddIRAttributesGlobalVariableAttr(
521+
Decl *D, const SYCLAddIRAttributesGlobalVariableAttr &A);
522+
SYCLAddIRAnnotationsMemberAttr *
523+
mergeSYCLAddIRAnnotationsMemberAttr(Decl *D,
524+
const SYCLAddIRAnnotationsMemberAttr &A);
525+
SYCLDeviceHasAttr *mergeSYCLDeviceHasAttr(Decl *D,
526+
const SYCLDeviceHasAttr &A);
527+
SYCLUsesAspectsAttr *mergeSYCLUsesAspectsAttr(Decl *D,
528+
const SYCLUsesAspectsAttr &A);
529+
SYCLTypeAttr *mergeSYCLTypeAttr(Decl *D, const AttributeCommonInfo &CI,
530+
SYCLTypeAttr::SYCLType TypeName);
531+
SYCLWorkGroupSizeHintAttr *
532+
mergeSYCLWorkGroupSizeHintAttr(Decl *D, const SYCLWorkGroupSizeHintAttr &A);
533+
SYCLIntelMaxWorkGroupSizeAttr *
534+
mergeSYCLIntelMaxWorkGroupSizeAttr(Decl *D,
535+
const SYCLIntelMaxWorkGroupSizeAttr &A);
536+
IntelReqdSubGroupSizeAttr *
537+
mergeIntelReqdSubGroupSizeAttr(Decl *D, const IntelReqdSubGroupSizeAttr &A);
538+
IntelNamedSubGroupSizeAttr *
539+
mergeIntelNamedSubGroupSizeAttr(Decl *D, const IntelNamedSubGroupSizeAttr &A);
422540

423541
static OffloadArch getOffloadArch(const TargetInfo &TI);
424542
static bool hasDependentExpr(Expr **Exprs, const size_t ExprsSize);

‎clang/lib/Sema/SemaDecl.cpp‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2855,69 +2855,69 @@ static bool mergeDeclAttribute(Sema &S, NamedDecl *D,
28552855
else if (const auto *INA = dyn_cast<WebAssemblyImportNameAttr>(Attr))
28562856
NewAttr = S.Wasm().mergeImportNameAttr(D, *INA);
28572857
else if (const auto *A = dyn_cast<SYCLIntelLoopFuseAttr>(Attr))
2858-
NewAttr = S.MergeSYCLIntelLoopFuseAttr(D, *A);
2858+
NewAttr = S.SYCL().mergeSYCLIntelLoopFuseAttr(D, *A);
28592859
else if (const auto *TCBA = dyn_cast<EnforceTCBAttr>(Attr))
28602860
NewAttr = S.mergeEnforceTCBAttr(D, *TCBA);
28612861
else if (const auto *TCBLA = dyn_cast<EnforceTCBLeafAttr>(Attr))
28622862
NewAttr = S.mergeEnforceTCBLeafAttr(D, *TCBLA);
28632863
else if (const auto *A = dyn_cast<IntelReqdSubGroupSizeAttr>(Attr))
2864-
NewAttr = S.MergeIntelReqdSubGroupSizeAttr(D, *A);
2864+
NewAttr = S.SYCL().mergeIntelReqdSubGroupSizeAttr(D, *A);
28652865
else if (const auto *A = dyn_cast<IntelNamedSubGroupSizeAttr>(Attr))
2866-
NewAttr = S.MergeIntelNamedSubGroupSizeAttr(D, *A);
2866+
NewAttr = S.SYCL().mergeIntelNamedSubGroupSizeAttr(D, *A);
28672867
else if (const auto *A = dyn_cast<SYCLIntelNumSimdWorkItemsAttr>(Attr))
2868-
NewAttr = S.MergeSYCLIntelNumSimdWorkItemsAttr(D, *A);
2868+
NewAttr = S.SYCL().mergeSYCLIntelNumSimdWorkItemsAttr(D, *A);
28692869
else if (const auto *A = dyn_cast<SYCLIntelESimdVectorizeAttr>(Attr))
2870-
NewAttr = S.MergeSYCLIntelESimdVectorizeAttr(D, *A);
2870+
NewAttr = S.SYCL().mergeSYCLIntelESimdVectorizeAttr(D, *A);
28712871
else if (const auto *A = dyn_cast<SYCLIntelSchedulerTargetFmaxMhzAttr>(Attr))
2872-
NewAttr = S.MergeSYCLIntelSchedulerTargetFmaxMhzAttr(D, *A);
2872+
NewAttr = S.SYCL().mergeSYCLIntelSchedulerTargetFmaxMhzAttr(D, *A);
28732873
else if (const auto *A = dyn_cast<SYCLIntelNoGlobalWorkOffsetAttr>(Attr))
2874-
NewAttr = S.MergeSYCLIntelNoGlobalWorkOffsetAttr(D, *A);
2874+
NewAttr = S.SYCL().mergeSYCLIntelNoGlobalWorkOffsetAttr(D, *A);
28752875
else if (const auto *A = dyn_cast<SYCLIntelMaxReplicatesAttr>(Attr))
2876-
NewAttr = S.MergeSYCLIntelMaxReplicatesAttr(D, *A);
2876+
NewAttr = S.SYCL().mergeSYCLIntelMaxReplicatesAttr(D, *A);
28772877
else if (const auto *A = dyn_cast<SYCLIntelMaxConcurrencyAttr>(Attr))
2878-
NewAttr = S.MergeSYCLIntelMaxConcurrencyAttr(D, *A);
2878+
NewAttr = S.SYCL().mergeSYCLIntelMaxConcurrencyAttr(D, *A);
28792879
else if (const auto *A = dyn_cast<SYCLIntelForcePow2DepthAttr>(Attr))
2880-
NewAttr = S.MergeSYCLIntelForcePow2DepthAttr(D, *A);
2880+
NewAttr = S.SYCL().mergeSYCLIntelForcePow2DepthAttr(D, *A);
28812881
else if (const auto *A = dyn_cast<SYCLIntelInitiationIntervalAttr>(Attr))
2882-
NewAttr = S.MergeSYCLIntelInitiationIntervalAttr(D, *A);
2882+
NewAttr = S.SYCL().mergeSYCLIntelInitiationIntervalAttr(D, *A);
28832883
else if (const auto *A = dyn_cast<SYCLWorkGroupSizeHintAttr>(Attr))
2884-
NewAttr = S.MergeSYCLWorkGroupSizeHintAttr(D, *A);
2884+
NewAttr = S.SYCL().mergeSYCLWorkGroupSizeHintAttr(D, *A);
28852885
else if (const auto *A =
28862886
dyn_cast<SYCLIntelMinWorkGroupsPerComputeUnitAttr>(Attr))
2887-
NewAttr = S.MergeSYCLIntelMinWorkGroupsPerComputeUnitAttr(D, *A);
2887+
NewAttr = S.SYCL().mergeSYCLIntelMinWorkGroupsPerComputeUnitAttr(D, *A);
28882888
else if (const auto *A =
28892889
dyn_cast<SYCLIntelMaxWorkGroupsPerMultiprocessorAttr>(Attr))
2890-
NewAttr = S.MergeSYCLIntelMaxWorkGroupsPerMultiprocessorAttr(D, *A);
2890+
NewAttr = S.SYCL().mergeSYCLIntelMaxWorkGroupsPerMultiprocessorAttr(D, *A);
28912891
else if (const auto *A = dyn_cast<SYCLIntelMaxGlobalWorkDimAttr>(Attr))
2892-
NewAttr = S.MergeSYCLIntelMaxGlobalWorkDimAttr(D, *A);
2892+
NewAttr = S.SYCL().mergeSYCLIntelMaxGlobalWorkDimAttr(D, *A);
28932893
else if (const auto *BTFA = dyn_cast<BTFDeclTagAttr>(Attr))
28942894
NewAttr = S.mergeBTFDeclTagAttr(D, *BTFA);
28952895
else if (const auto *A = dyn_cast<SYCLIntelBankWidthAttr>(Attr))
2896-
NewAttr = S.MergeSYCLIntelBankWidthAttr(D, *A);
2896+
NewAttr = S.SYCL().mergeSYCLIntelBankWidthAttr(D, *A);
28972897
else if (const auto *A = dyn_cast<SYCLIntelNumBanksAttr>(Attr))
2898-
NewAttr = S.MergeSYCLIntelNumBanksAttr(D, *A);
2898+
NewAttr = S.SYCL().mergeSYCLIntelNumBanksAttr(D, *A);
28992899
else if (const auto *A = dyn_cast<SYCLDeviceHasAttr>(Attr))
2900-
NewAttr = S.MergeSYCLDeviceHasAttr(D, *A);
2900+
NewAttr = S.SYCL().mergeSYCLDeviceHasAttr(D, *A);
29012901
else if (const auto *A = dyn_cast<SYCLUsesAspectsAttr>(Attr))
2902-
NewAttr = S.MergeSYCLUsesAspectsAttr(D, *A);
2902+
NewAttr = S.SYCL().mergeSYCLUsesAspectsAttr(D, *A);
29032903
else if (const auto *A = dyn_cast<SYCLTypeAttr>(Attr))
2904-
NewAttr = S.MergeSYCLTypeAttr(D, *A, A->getType());
2904+
NewAttr = S.SYCL().mergeSYCLTypeAttr(D, *A, A->getType());
29052905
else if (const auto *A = dyn_cast<SYCLIntelPipeIOAttr>(Attr))
2906-
NewAttr = S.MergeSYCLIntelPipeIOAttr(D, *A);
2906+
NewAttr = S.SYCL().mergeSYCLIntelPipeIOAttr(D, *A);
29072907
else if (const auto *A = dyn_cast<SYCLIntelMaxWorkGroupSizeAttr>(Attr))
2908-
NewAttr = S.MergeSYCLIntelMaxWorkGroupSizeAttr(D, *A);
2908+
NewAttr = S.SYCL().mergeSYCLIntelMaxWorkGroupSizeAttr(D, *A);
29092909
else if (const auto *A = dyn_cast<SYCLAddIRAttributesFunctionAttr>(Attr))
2910-
NewAttr = S.MergeSYCLAddIRAttributesFunctionAttr(D, *A);
2910+
NewAttr = S.SYCL().mergeSYCLAddIRAttributesFunctionAttr(D, *A);
29112911
else if (const auto *A =
29122912
dyn_cast<SYCLAddIRAttributesKernelParameterAttr>(Attr))
2913-
NewAttr = S.MergeSYCLAddIRAttributesKernelParameterAttr(D, *A);
2913+
NewAttr = S.SYCL().mergeSYCLAddIRAttributesKernelParameterAttr(D, *A);
29142914
else if (const auto *A =
29152915
dyn_cast<SYCLAddIRAttributesGlobalVariableAttr>(Attr))
2916-
NewAttr = S.MergeSYCLAddIRAttributesGlobalVariableAttr(D, *A);
2916+
NewAttr = S.SYCL().mergeSYCLAddIRAttributesGlobalVariableAttr(D, *A);
29172917
else if (const auto *A = dyn_cast<SYCLAddIRAnnotationsMemberAttr>(Attr))
2918-
NewAttr = S.MergeSYCLAddIRAnnotationsMemberAttr(D, *A);
2918+
NewAttr = S.SYCL().mergeSYCLAddIRAnnotationsMemberAttr(D, *A);
29192919
else if (const auto *A = dyn_cast<SYCLReqdWorkGroupSizeAttr>(Attr))
2920-
NewAttr = S.MergeSYCLReqdWorkGroupSizeAttr(D, *A);
2920+
NewAttr = S.SYCL().mergeSYCLReqdWorkGroupSizeAttr(D, *A);
29212921
else if (const auto *NT = dyn_cast<HLSLNumThreadsAttr>(Attr))
29222922
NewAttr = S.HLSL().mergeNumThreadsAttr(D, *NT, NT->getX(), NT->getY(),
29232923
NT->getZ());

0 commit comments

Comments
 (0)