Resolve of merge (conflict) 85815e7 Add an entry point wrapper around…

… functions (llvm pass) (#.. '"master"' -> '"xmain-web"' (20 commits) (KhronosGroup#103)

* Resolve of merge (conflict) 85815e7 Add an entry point wrapper around functions (llvm pass) (#.. '"master"' -> '"xmain-web"' (20 commits)

  CONFLICT (content): Merge conflict in lib/SPIRV/SPIRVRegularizeLLVM.cpp

  commit 85815e7
  Author: Dave Airlie <airlied@redhat.com>
  Date:   Tue Jan 25 10:17:44 2022 +1000

      Add an entry point wrapper around functions (llvm pass) (KhronosGroup#1149)

      SPIR-V spec states:
      "It is invalid for any function to be targeted by both an OpEntryPoint instruction
      and an OpFunctionCall instruction."

      In order to satisfy SPIR-V that entrypoints and functions
      must be different, this introduces an entrypoint wrapper around
      functions at the LLVM IR level, then fixes up a few things like
      naming at the SPIRV translation.

* Resolve conflicts

Co-authored-by: iclsrc <ia.compiler.tools.git@intel.com>
Co-authored-by: Sergey Semenov <sergey.semenov@intel.com>

lib/SPIRV/SPIRVRegularizeLLVM.cpp

@@ -546,11 +546,8 @@ bool SPIRVRegularizeLLVMBase::runRegularizeLLVM(Module &Module) {
 bool SPIRVRegularizeLLVMBase::regularize() {
   eraseUselessFunctions(M);
   lowerFuncPtr(M);
-<<<<<<< HEAD
-  expandSYCLHalfUsing(M);
-=======
   addKernelEntryPoint(M);
->>>>>>> 85815e725ce5bdc970b812b4bbff73d4b2a44046
+  expandSYCLHalfUsing(M);
 
   for (auto I = M->begin(), E = M->end(); I != E;) {
     Function *F = &(*I++);