[SYCL][NFC] Simplify SYCLDeviceLibReqMask

Pass manager infrastructure usage replaced with helper function getSYCLDeviceLibReqMask.

Closes #5362.

Author: arcolight

llvm/tools/sycl-post-link/SYCLDeviceLibReqMask.cpp

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// This pass goes through input module's function list to detect all SYCL
+// This function goes through input module's function list to detect all SYCL
 // devicelib functions invoked. Each devicelib function invoked is included in
 // one 'fallback' SPIR-V library loaded by SYCL runtime. After scanning all
 // functions in input module, a mask telling which SPIR-V libraries are needed
@@ -192,13 +192,15 @@ uint32_t getDeviceLibBits(const std::string &FuncName) {
                             DeviceLibExt::cl_intel_devicelib_assert)));
 }
 
+} // namespace
+
 // For each device image module, we go through all functions which meets
 // 1. The function name has prefix "__devicelib_"
 // 2. The function is declaration which means it doesn't have function body
 // And we don't expect non-spirv functions with "__devicelib_" prefix.
-uint32_t getModuleDeviceLibReqMask(const Module &M) {
+uint32_t llvm::getSYCLDeviceLibReqMask(const Module &M) {
   // Device libraries will be enabled only for spir-v module.
-  if (!llvm::Triple(M.getTargetTriple()).isSPIR())
+  if (!Triple(M.getTargetTriple()).isSPIR())
     return 0;
   uint32_t ReqMask = 0;
   for (const Function &SF : M) {
@@ -210,10 +212,3 @@ uint32_t getModuleDeviceLibReqMask(const Module &M) {
   }
   return ReqMask;
 }
-} // namespace
-
-char SYCLDeviceLibReqMaskPass::ID = 0;
-bool SYCLDeviceLibReqMaskPass::runOnModule(Module &M) {
-  MReqMask = getModuleDeviceLibReqMask(M);
-  return false;
-}

llvm/tools/sycl-post-link/SYCLDeviceLibReqMask.h

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// This pass goes through input module's function list to detect all SYCL
+// This function goes through input module's function list to detect all SYCL
 // devicelib functions invoked. Each devicelib function invoked is included in
 // one 'fallback' SPIR-V library loaded by SYCL runtime. After scanning all
 // functions in input module, a mask telling which SPIR-V libraries are needed
@@ -16,12 +16,12 @@
 
 #pragma once
 
-#include "llvm/Pass.h"
-
 #include <cstdint>
 
 namespace llvm {
 
+class Module;
+
 // DeviceLibExt is shared between sycl-post-link tool and sycl runtime.
 // If any change is made here, need to sync with DeviceLibExt definition
 // in sycl/source/detail/program_manager/program_manager.hpp
@@ -34,15 +34,6 @@ enum class DeviceLibExt : std::uint32_t {
   cl_intel_devicelib_cstring,
 };
 
-class SYCLDeviceLibReqMaskPass : public ModulePass {
-public:
-  static char ID;
-  SYCLDeviceLibReqMaskPass() : ModulePass(ID) { MReqMask = 0; }
-  bool runOnModule(Module &M) override;
-  uint32_t getSYCLDeviceLibReqMask() { return MReqMask; }
-
-private:
-  uint32_t MReqMask;
-};
+uint32_t getSYCLDeviceLibReqMask(const Module &M);
 
 } // namespace llvm

llvm/tools/sycl-post-link/sycl-post-link.cpp

@@ -623,11 +623,7 @@ void saveModuleProperties(Module &M, const EntryPointGroup &ModuleEntryPoints,
   PropSetRegTy PropSet;
 
   {
-    legacy::PassManager GetSYCLDeviceLibReqMask;
-    auto *SDLReqMaskLegacyPass = new SYCLDeviceLibReqMaskPass();
-    GetSYCLDeviceLibReqMask.add(SDLReqMaskLegacyPass);
-    GetSYCLDeviceLibReqMask.run(M);
-    uint32_t MRMask = SDLReqMaskLegacyPass->getSYCLDeviceLibReqMask();
+    uint32_t MRMask = getSYCLDeviceLibReqMask(M);
     std::map<StringRef, uint32_t> RMEntry = {{"DeviceLibReqMask", MRMask}};
     PropSet.add(PropSetRegTy::SYCL_DEVICELIB_REQ_MASK, RMEntry);
   }