diff --git a/clang/lib/CodeGen/CGLoopInfo.cpp b/clang/lib/CodeGen/CGLoopInfo.cpp index aced7100617bf..62b1e7264873f 100644 --- a/clang/lib/CodeGen/CGLoopInfo.cpp +++ b/clang/lib/CodeGen/CGLoopInfo.cpp @@ -570,13 +570,6 @@ SmallVector LoopInfo::createMetadata( LoopProperties.push_back(MDNode::get(Ctx, Vals)); } - for (const auto &VC : Attrs.SYCLIntelFPGAVariantCount) { - Metadata *Vals[] = {MDString::get(Ctx, VC.first), - ConstantAsMetadata::get(ConstantInt::get( - llvm::Type::getInt32Ty(Ctx), VC.second))}; - LoopProperties.push_back(MDNode::get(Ctx, Vals)); - } - if (Attrs.SYCLMaxReinvocationDelayNCycles) { Metadata *Vals[] = { MDString::get(Ctx, "llvm.loop.intel.max_reinvocation_delay.count"), @@ -630,7 +623,6 @@ void LoopAttributes::clear() { SYCLMaxConcurrencyNThreads.reset(); SYCLLoopPipeliningDisable = false; SYCLMaxInterleavingNInvocations.reset(); - SYCLIntelFPGAVariantCount.clear(); SYCLMaxReinvocationDelayNCycles.reset(); SYCLLoopPipeliningEnable = false; UnrollCount = 0; @@ -665,8 +657,7 @@ LoopInfo::LoopInfo(BasicBlock *Header, const LoopAttributes &Attrs, Attrs.ArraySYCLIVDepInfo.empty() && Attrs.SYCLIInterval == 0 && !Attrs.SYCLMaxConcurrencyNThreads && Attrs.SYCLLoopPipeliningDisable == false && - !Attrs.SYCLMaxInterleavingNInvocations && - Attrs.SYCLIntelFPGAVariantCount.empty() && Attrs.UnrollCount == 0 && + !Attrs.SYCLMaxInterleavingNInvocations && Attrs.UnrollCount == 0 && !Attrs.SYCLMaxReinvocationDelayNCycles && !Attrs.SYCLLoopPipeliningEnable && Attrs.UnrollAndJamCount == 0 && !Attrs.PipelineDisabled && !Attrs.LICMDisabled && diff --git a/clang/lib/CodeGen/CGLoopInfo.h b/clang/lib/CodeGen/CGLoopInfo.h index f4579f2845ad6..0b2a2c3609f09 100644 --- a/clang/lib/CodeGen/CGLoopInfo.h +++ b/clang/lib/CodeGen/CGLoopInfo.h @@ -114,16 +114,6 @@ struct LoopAttributes { /// Value for llvm.loop.max_concurrency.count metadata. std::optional SYCLMaxConcurrencyNThreads; - /// Value for count variant (min/max/avg) and count metadata. - llvm::SmallVector, 2> - SYCLIntelFPGAVariantCount; - - /// Flag for llvm.loop.coalesce metadata. - bool SYCLLoopCoalesceEnable; - - /// Value for llvm.loop.coalesce.count metadata. - unsigned SYCLLoopCoalesceNLevels; - /// Flag for llvm.loop.intel.pipelining.enable, i32 0 metadata. bool SYCLLoopPipeliningDisable; @@ -157,9 +147,6 @@ struct LoopAttributes { /// Value for llvm.loop.pipeline.iicount metadata. unsigned PipelineInitiationInterval; - /// Flag for llvm.loop.fusion.disable metatdata. - bool SYCLNofusionEnable; - /// Value for 'llvm.loop.align' metadata. unsigned CodeAlign; @@ -382,16 +369,6 @@ class LoopInfoStack { StagedAttrs.SYCLMaxConcurrencyNThreads = C; } - /// Set flag of loop_coalesce for the next loop pushed. - void setSYCLLoopCoalesceEnable() { - StagedAttrs.SYCLLoopCoalesceEnable = true; - } - - /// Set value of coalesced levels for the next loop pushed. - void setSYCLLoopCoalesceNLevels(unsigned C) { - StagedAttrs.SYCLLoopCoalesceNLevels = C; - } - /// Set flag of disable_loop_pipelining for the next loop pushed. void setSYCLLoopPipeliningDisable() { StagedAttrs.SYCLLoopPipeliningDisable = true; @@ -407,11 +384,6 @@ class LoopInfoStack { StagedAttrs.SYCLSpeculatedIterationsNIterations = C; } - /// Set value of variant and loop count for the next loop pushed. - void setSYCLIntelFPGAVariantCount(const char *Var, unsigned int Count) { - StagedAttrs.SYCLIntelFPGAVariantCount.push_back({Var, Count}); - } - /// Set the unroll count for the next loop pushed. void setUnrollCount(unsigned C) { StagedAttrs.UnrollCount = C; } @@ -426,9 +398,6 @@ class LoopInfoStack { StagedAttrs.PipelineInitiationInterval = C; } - /// Set flag of nofusion for the next loop pushed. - void setSYCLNofusionEnable() { StagedAttrs.SYCLNofusionEnable = true; } - /// Set value of code align for the next loop pushed. void setCodeAlign(unsigned C) { StagedAttrs.CodeAlign = C; }