Merge remote-tracking branch 'intel/sycl' into private/asachkov/mock-all-pi-entry-points

Author: steffenlarsen

llvm/include/llvm/SYCLLowerIR/SYCLPropagateAspectsUsage.h

@@ -0,0 +1,28 @@
+//===---- SYCLPropagateAspectsUsage.cpp - SYCLPropagateAspectsUsage Pass --===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// Pass propagates optional kernel features metadata through a module call graph
+//
+//===----------------------------------------------------------------------===//
+//
+#ifndef LLVM_SYCL_PROPAGATE_ASPECTS_USAGE_H
+#define LLVM_SYCL_PROPAGATE_ASPECTS_USAGE_H
+
+#include "llvm/IR/PassManager.h"
+
+namespace llvm {
+
+class SYCLPropagateAspectsUsagePass
+    : public PassInfoMixin<SYCLPropagateAspectsUsagePass> {
+public:
+  PreservedAnalyses run(Module &M, ModuleAnalysisManager &);
+};
+
+} // namespace llvm
+
+#endif // LLVM_SYCL_PROPAGATE_ASPECTS_USAGE_H

llvm/lib/Passes/PassBuilder.cpp

@@ -84,6 +84,7 @@
 #include "llvm/SYCLLowerIR/LowerWGLocalMemory.h"
 #include "llvm/SYCLLowerIR/LowerWGScope.h"
 #include "llvm/SYCLLowerIR/MutatePrintfAddrspace.h"
+#include "llvm/SYCLLowerIR/SYCLPropagateAspectsUsage.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/ErrorHandling.h"

llvm/lib/Passes/PassRegistry.def

@@ -136,6 +136,7 @@ MODULE_PASS("SPIRITTAnnotations", SPIRITTAnnotationsPass())
 MODULE_PASS("deadargelim-sycl", DeadArgumentEliminationSYCLPass())
 MODULE_PASS("sycllowerwglocalmemory", SYCLLowerWGLocalMemoryPass())
 MODULE_PASS("lower-esimd-kernel-attrs", SYCLFixupESIMDKernelWrapperMDPass())
+MODULE_PASS("sycl-propagate-aspects-usage", SYCLPropagateAspectsUsagePass())
 #undef MODULE_PASS
 
 #ifndef MODULE_PASS_WITH_PARAMS

llvm/lib/SYCLLowerIR/CMakeLists.txt

@@ -58,6 +58,7 @@ add_llvm_component_library(LLVMSYCLLowerIR
   LowerWGScope.cpp
   LowerWGLocalMemory.cpp
   MutatePrintfAddrspace.cpp
+  SYCLPropagateAspectsUsage.cpp
 
   LocalAccessorToSharedMemory.cpp
   GlobalOffset.cpp

llvm/lib/SYCLLowerIR/LowerInvokeSimd.cpp

@@ -250,14 +250,15 @@ bool collectUsesLookTrhoughMemAndCasts(Value *V,
   for (const Use *U : TmpVUses) {
     User *UU = U->getUser();
     assert(!isCast(UU));
+
     auto *St = dyn_cast<StoreInst>(UU);
 
     if (!St) {
       Uses.insert(U);
       continue;
     }
     // Current user is a store (of V) instruction, see if...
-    assert((V = St->getValueOperand()) &&
+    assert((V == St->getValueOperand()) &&
            "bad V param in collectUsesLookTrhoughMemAndCasts");
     Value *Addr = stripCasts(St->getPointerOperand());