fix conflict

Signed-off-by: Zahira Ammarguellat <[email protected]>

Author: zahiraam

clang/lib/CodeGen/CodeGenFunction.cpp

@@ -739,12 +739,13 @@ void CodeGenFunction::EmitOpenCLKernelMetadata(const FunctionDecl *FD,
     Fn->setMetadata("stall_enable", llvm::MDNode::get(Context, AttrMDArgs));
   }
 
-  if (const auto *A = FD->getAttr<SYCLIntelFPGAMaxConcurrencyAttr>()) {
-    const auto *CE = cast<ConstantExpr>(A->getNThreadsExpr());
+  if (const auto* A = FD->getAttr<SYCLIntelFPGAMaxConcurrencyAttr>()) {
+    const auto* CE = cast<ConstantExpr>(A->getNThreadsExpr());
     llvm::APSInt ArgVal = CE->getResultAsAPSInt();
-    llvm::Metadata *AttrMDArgs[] = {
+    llvm::Metadata* AttrMDArgs[] = {
         llvm::ConstantAsMetadata::get(Builder.getInt32(ArgVal.getSExtValue()))};
     Fn->setMetadata("max_concurrency", llvm::MDNode::get(Context, AttrMDArgs));
+  }
 
   if (FD->hasAttr<SYCLIntelFPGADisableLoopPipeliningAttr>()) {
     llvm::Metadata *AttrMDArgs[] = {

clang/lib/Sema/SemaSYCL.cpp

@@ -565,14 +565,13 @@ class MarkDeviceFunction : public RecursiveASTVisitor<MarkDeviceFunction> {
         }
       }
 
-<<<<<<< HEAD
       // Attribute "max_concurrency" is applied to device functions only. The
       // attribute is not propagated to the caller.
       if (auto *A = FD->getAttr<SYCLIntelFPGAMaxConcurrencyAttr>())
         if (ParentFD == SYCLKernel) {
           Attrs.push_back(A);
         }
-=======
+
       // Attribute "disable_loop_pipelining" can be applied explicitly on
       // kernel function. Attribute should not be propagated from device
       // functions to kernel.
@@ -590,7 +589,6 @@ class MarkDeviceFunction : public RecursiveASTVisitor<MarkDeviceFunction> {
           Attrs.push_back(A);
         }
       }
->>>>>>> remote/sycl
 
       // TODO: vec_len_hint should be handled here
 
@@ -3544,12 +3542,9 @@ void Sema::MarkDevice(void) {
         case attr::Kind::SYCLIntelNoGlobalWorkOffset:
         case attr::Kind::SYCLIntelUseStallEnableClusters:
         case attr::Kind::SYCLIntelLoopFuse:
-<<<<<<< HEAD
         case attr::Kind::SYCLIntelFPGAMaxConcurrency:
-=======
         case attr::Kind::SYCLIntelFPGADisableLoopPipelining:
         case attr::Kind::SYCLIntelFPGAInitiationInterval:
->>>>>>> remote/sycl
         case attr::Kind::SYCLSimd: {
           if ((A->getKind() == attr::Kind::SYCLSimd) && KernelBody &&
               !KernelBody->getAttr<SYCLSimdAttr>()) {

clang/lib/Sema/SemaTemplateInstantiateDecl.cpp

@@ -959,10 +959,11 @@ void Sema::InstantiateAttrs(const MultiLevelTemplateArgumentList &TemplateArgs,
           *this, TemplateArgs, SYCLIntelMaxWorkGroupSize, New);
       continue;
     }
-    if (const auto *SYCLIntelMaxConcurrency =
+    if (const auto* SYCLIntelMaxConcurrency =
             dyn_cast<SYCLIntelFPGAMaxConcurrencyAttr>(TmplAttr)) {
       instantiateSYCLIntelFPGAMaxConcurrencyAttr(*this, TemplateArgs,
                                                  SYCLIntelMaxConcurrency, New);
+    }
     if (const auto *SYCLIntelFPGAInitiationInterval =
             dyn_cast<SYCLIntelFPGAInitiationIntervalAttr>(TmplAttr)) {
       instantiateSYCLIntelFPGAInitiationIntervalAttr(