From 133272251f5e3dc03bc9682ed0c7847d7c0a2672 Mon Sep 17 00:00:00 2001 From: gejin Date: Wed, 3 Mar 2021 16:04:56 +0800 Subject: [PATCH 1/2] Move devicelib req mask collection into a LLVM pass Signed-off-by: gejin --- llvm/tools/sycl-post-link/CMakeLists.txt | 2 +- .../sycl-post-link/SYCLDeviceLibReqMask.cpp | 199 ++++++++++++++++++ .../sycl-post-link/SYCLDeviceLibReqMask.h | 50 +++++ llvm/tools/sycl-post-link/sycl-post-link.cpp | 192 +---------------- 4 files changed, 256 insertions(+), 187 deletions(-) create mode 100644 llvm/tools/sycl-post-link/SYCLDeviceLibReqMask.cpp create mode 100644 llvm/tools/sycl-post-link/SYCLDeviceLibReqMask.h diff --git a/llvm/tools/sycl-post-link/CMakeLists.txt b/llvm/tools/sycl-post-link/CMakeLists.txt index 926b58df2eb5b..07fba760ba8f9 100644 --- a/llvm/tools/sycl-post-link/CMakeLists.txt +++ b/llvm/tools/sycl-post-link/CMakeLists.txt @@ -21,7 +21,7 @@ add_llvm_tool(sycl-post-link sycl-post-link.cpp SPIRKernelParamOptInfo.cpp SpecConstants.cpp - + SYCLDeviceLibReqMask.cpp ADDITIONAL_HEADER_DIRS ${LLVMGenXIntrinsics_SOURCE_DIR}/GenXIntrinsics/include ${LLVMGenXIntrinsics_BINARY_DIR}/GenXIntrinsics/include diff --git a/llvm/tools/sycl-post-link/SYCLDeviceLibReqMask.cpp b/llvm/tools/sycl-post-link/SYCLDeviceLibReqMask.cpp new file mode 100644 index 0000000000000..8d4238e0f02ab --- /dev/null +++ b/llvm/tools/sycl-post-link/SYCLDeviceLibReqMask.cpp @@ -0,0 +1,199 @@ +//==----- SYCLDeviceLibReqMask.cpp - get SYCL devicelib required Info ------==// +// +// 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 +// +//===----------------------------------------------------------------------===// +// +// This pass 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 +// by input module indeed will be returned. This mask will be saved and used by +// SYCL runtime later. +//===----------------------------------------------------------------------===// + +#include "SYCLDeviceLibReqMask.h" + +static constexpr char DEVICELIB_FUNC_PREFIX[] = "__devicelib_"; + +char SYCLDeviceLibReqMaskPass::ID = 0; +// Please update SDLMap if any item is added to or removed from +// fallback device libraries in libdevice. +SYCLDeviceLibFuncMap SYCLDeviceLibReqMaskPass::SDLMap = { + {"__devicelib_acosf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_acoshf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_asinf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_asinhf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_atan2f", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_atanf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_atanhf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_cbrtf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_cosf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_coshf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_erfcf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_erff", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_exp2f", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_expf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_expm1f", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_fdimf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_fmaf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_fmodf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_frexpf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_hypotf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_ilogbf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_ldexpf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_lgammaf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_log10f", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_log1pf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_log2f", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_logbf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_logf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_modff", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_nextafterf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_powf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_remainderf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_remquof", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_scalbnf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_sinf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_sinhf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_sqrtf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_tanf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_tanhf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_tgammaf", DeviceLibExt::cl_intel_devicelib_math}, + {"__devicelib_acos", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_acosh", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_asin", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_asinh", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_atan", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_atan2", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_atanh", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_cbrt", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_cos", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_cosh", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_erf", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_erfc", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_exp", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_exp2", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_expm1", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_fdim", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_fma", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_fmod", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_frexp", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_hypot", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_ilogb", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_ldexp", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_lgamma", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_log", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_log10", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_log1p", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_log2", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_logb", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_modf", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_nextafter", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_pow", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_remainder", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_remquo", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_scalbn", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_sin", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_sinh", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_sqrt", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_tan", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_tanh", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib_tgamma", DeviceLibExt::cl_intel_devicelib_math_fp64}, + {"__devicelib___divsc3", DeviceLibExt::cl_intel_devicelib_complex}, + {"__devicelib___mulsc3", DeviceLibExt::cl_intel_devicelib_complex}, + {"__devicelib_cabsf", DeviceLibExt::cl_intel_devicelib_complex}, + {"__devicelib_cacosf", DeviceLibExt::cl_intel_devicelib_complex}, + {"__devicelib_cacoshf", DeviceLibExt::cl_intel_devicelib_complex}, + {"__devicelib_cargf", DeviceLibExt::cl_intel_devicelib_complex}, + {"__devicelib_casinf", DeviceLibExt::cl_intel_devicelib_complex}, + {"__devicelib_casinhf", DeviceLibExt::cl_intel_devicelib_complex}, + {"__devicelib_catanf", DeviceLibExt::cl_intel_devicelib_complex}, + {"__devicelib_catanhf", DeviceLibExt::cl_intel_devicelib_complex}, + {"__devicelib_ccosf", DeviceLibExt::cl_intel_devicelib_complex}, + {"__devicelib_ccoshf", DeviceLibExt::cl_intel_devicelib_complex}, + {"__devicelib_cexpf", DeviceLibExt::cl_intel_devicelib_complex}, + {"__devicelib_cimagf", DeviceLibExt::cl_intel_devicelib_complex}, + {"__devicelib_clogf", DeviceLibExt::cl_intel_devicelib_complex}, + {"__devicelib_cpolarf", DeviceLibExt::cl_intel_devicelib_complex}, + {"__devicelib_cpowf", DeviceLibExt::cl_intel_devicelib_complex}, + {"__devicelib_cprojf", DeviceLibExt::cl_intel_devicelib_complex}, + {"__devicelib_crealf", DeviceLibExt::cl_intel_devicelib_complex}, + {"__devicelib_csinf", DeviceLibExt::cl_intel_devicelib_complex}, + {"__devicelib_csinhf", DeviceLibExt::cl_intel_devicelib_complex}, + {"__devicelib_csqrtf", DeviceLibExt::cl_intel_devicelib_complex}, + {"__devicelib_ctanf", DeviceLibExt::cl_intel_devicelib_complex}, + {"__devicelib_ctanhf", DeviceLibExt::cl_intel_devicelib_complex}, + {"__devicelib___divdc3", DeviceLibExt::cl_intel_devicelib_complex_fp64}, + {"__devicelib___muldc3", DeviceLibExt::cl_intel_devicelib_complex_fp64}, + {"__devicelib_cabs", DeviceLibExt::cl_intel_devicelib_complex_fp64}, + {"__devicelib_cacos", DeviceLibExt::cl_intel_devicelib_complex_fp64}, + {"__devicelib_cacosh", DeviceLibExt::cl_intel_devicelib_complex_fp64}, + {"__devicelib_carg", DeviceLibExt::cl_intel_devicelib_complex_fp64}, + {"__devicelib_casin", DeviceLibExt::cl_intel_devicelib_complex_fp64}, + {"__devicelib_casinh", DeviceLibExt::cl_intel_devicelib_complex_fp64}, + {"__devicelib_catan", DeviceLibExt::cl_intel_devicelib_complex_fp64}, + {"__devicelib_catanh", DeviceLibExt::cl_intel_devicelib_complex_fp64}, + {"__devicelib_ccos", DeviceLibExt::cl_intel_devicelib_complex_fp64}, + {"__devicelib_ccosh", DeviceLibExt::cl_intel_devicelib_complex_fp64}, + {"__devicelib_cexp", DeviceLibExt::cl_intel_devicelib_complex_fp64}, + {"__devicelib_cimag", DeviceLibExt::cl_intel_devicelib_complex_fp64}, + {"__devicelib_clog", DeviceLibExt::cl_intel_devicelib_complex_fp64}, + {"__devicelib_cpolar", DeviceLibExt::cl_intel_devicelib_complex_fp64}, + {"__devicelib_cpow", DeviceLibExt::cl_intel_devicelib_complex_fp64}, + {"__devicelib_cproj", DeviceLibExt::cl_intel_devicelib_complex_fp64}, + {"__devicelib_creal", DeviceLibExt::cl_intel_devicelib_complex_fp64}, + {"__devicelib_csin", DeviceLibExt::cl_intel_devicelib_complex_fp64}, + {"__devicelib_csinh", DeviceLibExt::cl_intel_devicelib_complex_fp64}, + {"__devicelib_csqrt", DeviceLibExt::cl_intel_devicelib_complex_fp64}, + {"__devicelib_ctan", DeviceLibExt::cl_intel_devicelib_complex_fp64}, + {"__devicelib_ctanh", DeviceLibExt::cl_intel_devicelib_complex_fp64}, +}; + +// Each fallback device library corresponds to one bit in "require mask" which +// is an unsigned int32. getDeviceLibBit checks which fallback device library +// is required for FuncName and returns the corresponding bit. The corresponding +// mask for each fallback device library is: +// fallback-cassert: 0x1 +// fallback-cmath: 0x2 +// fallback-cmath-fp64: 0x4 +// fallback-complex: 0x8 +// fallback-complex-fp64: 0x10 +uint32_t +SYCLDeviceLibReqMaskPass::getDeviceLibBits(const std::string &FuncName) { + auto DeviceLibFuncIter = SDLMap.find(FuncName); + return ((DeviceLibFuncIter == SDLMap.end()) + ? 0 + : 0x1 << (static_cast(DeviceLibFuncIter->second) - + static_cast( + DeviceLibExt::cl_intel_devicelib_assert))); +} + +// 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 SYCLDeviceLibReqMaskPass::getModuleDeviceLibReqMask(const Module &M) { + // Device libraries will be enabled only for spir-v module. + if (!llvm::Triple(M.getTargetTriple()).isSPIR()) + return 0; + // 0x1 means sycl runtime will link and load libsycl-fallback-assert.spv as + // default. In fact, default link assert spv is not necessary but dramatic + // perf regression is observed if we don't link any device library. The perf + // regression is caused by a clang issue. + uint32_t ReqMask = 0x1; + for (const Function &SF : M) { + if (SF.getName().startswith(DEVICELIB_FUNC_PREFIX) && SF.isDeclaration()) { + assert(SF.getCallingConv() == CallingConv::SPIR_FUNC); + uint32_t DeviceLibBits = getDeviceLibBits(SF.getName().str()); + ReqMask |= DeviceLibBits; + } + } + return ReqMask; +} +bool SYCLDeviceLibReqMaskPass::runOnModule(Module &M) { + MReqMask = getModuleDeviceLibReqMask(M); + return false; +} diff --git a/llvm/tools/sycl-post-link/SYCLDeviceLibReqMask.h b/llvm/tools/sycl-post-link/SYCLDeviceLibReqMask.h new file mode 100644 index 0000000000000..c1e9ab5a0fe4d --- /dev/null +++ b/llvm/tools/sycl-post-link/SYCLDeviceLibReqMask.h @@ -0,0 +1,50 @@ +//===----- SYCLDeviceLibReqMask.h - get SYCL devicelib required Info -----=-==// +// +// 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 +// +//===----------------------------------------------------------------------===// +// +// This pass 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 +// by input module indeed will be returned. This mask will be saved and used by +// SYCL runtime later. +//===----------------------------------------------------------------------===// + +#pragma onece + +#include "llvm/ADT/Triple.h" +#include "llvm/IR/Module.h" +#include "llvm/IR/PassManager.h" +#include "llvm/Pass.h" +#include +using namespace llvm; + +// 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 +enum class DeviceLibExt : std::uint32_t { + cl_intel_devicelib_assert, + cl_intel_devicelib_math, + cl_intel_devicelib_math_fp64, + cl_intel_devicelib_complex, + cl_intel_devicelib_complex_fp64 +}; + +using SYCLDeviceLibFuncMap = std::unordered_map; +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; + static SYCLDeviceLibFuncMap SDLMap; + static uint32_t getDeviceLibBits(const std::string &FuncName); + static uint32_t getModuleDeviceLibReqMask(const Module &M); +}; diff --git a/llvm/tools/sycl-post-link/sycl-post-link.cpp b/llvm/tools/sycl-post-link/sycl-post-link.cpp index ea1ae9ee535b3..51d45d6a4fd9b 100644 --- a/llvm/tools/sycl-post-link/sycl-post-link.cpp +++ b/llvm/tools/sycl-post-link/sycl-post-link.cpp @@ -14,6 +14,7 @@ //===----------------------------------------------------------------------===// #include "SPIRKernelParamOptInfo.h" +#include "SYCLDeviceLibReqMask.h" #include "SpecConstants.h" #include "llvm/ADT/SetVector.h" @@ -54,18 +55,6 @@ cl::OptionCategory PostLinkCat{"sycl-post-link options"}; static constexpr char COL_CODE[] = "Code"; static constexpr char COL_SYM[] = "Symbols"; static constexpr char COL_PROPS[] = "Properties"; -static constexpr char DEVICELIB_FUNC_PREFIX[] = "__devicelib_"; - -// 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 -enum class DeviceLibExt : std::uint32_t { - cl_intel_devicelib_assert, - cl_intel_devicelib_math, - cl_intel_devicelib_math_fp64, - cl_intel_devicelib_complex, - cl_intel_devicelib_complex_fp64 -}; // InputFilename - The filename to read from. static cl::opt InputFilename{ @@ -179,138 +168,6 @@ struct ImagePropSaveInfo { bool EmitKernelParamInfo; bool IsEsimdKernel; }; -// Please update DeviceLibFuncMap if any item is added to or removed from -// fallback device libraries in libdevice. -static std::unordered_map DeviceLibFuncMap = { - {"__devicelib_acosf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_acoshf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_asinf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_asinhf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_atan2f", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_atanf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_atanhf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_cbrtf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_cosf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_coshf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_erfcf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_erff", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_exp2f", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_expf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_expm1f", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_fdimf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_fmaf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_fmodf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_frexpf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_hypotf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_ilogbf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_ldexpf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_lgammaf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_log10f", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_log1pf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_log2f", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_logbf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_logf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_modff", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_nextafterf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_powf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_remainderf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_remquof", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_scalbnf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_sinf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_sinhf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_sqrtf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_tanf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_tanhf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_tgammaf", DeviceLibExt::cl_intel_devicelib_math}, - {"__devicelib_acos", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_acosh", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_asin", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_asinh", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_atan", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_atan2", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_atanh", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_cbrt", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_cos", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_cosh", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_erf", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_erfc", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_exp", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_exp2", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_expm1", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_fdim", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_fma", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_fmod", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_frexp", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_hypot", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_ilogb", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_ldexp", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_lgamma", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_log", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_log10", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_log1p", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_log2", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_logb", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_modf", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_nextafter", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_pow", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_remainder", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_remquo", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_scalbn", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_sin", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_sinh", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_sqrt", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_tan", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_tanh", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib_tgamma", DeviceLibExt::cl_intel_devicelib_math_fp64}, - {"__devicelib___divsc3", DeviceLibExt::cl_intel_devicelib_complex}, - {"__devicelib___mulsc3", DeviceLibExt::cl_intel_devicelib_complex}, - {"__devicelib_cabsf", DeviceLibExt::cl_intel_devicelib_complex}, - {"__devicelib_cacosf", DeviceLibExt::cl_intel_devicelib_complex}, - {"__devicelib_cacoshf", DeviceLibExt::cl_intel_devicelib_complex}, - {"__devicelib_cargf", DeviceLibExt::cl_intel_devicelib_complex}, - {"__devicelib_casinf", DeviceLibExt::cl_intel_devicelib_complex}, - {"__devicelib_casinhf", DeviceLibExt::cl_intel_devicelib_complex}, - {"__devicelib_catanf", DeviceLibExt::cl_intel_devicelib_complex}, - {"__devicelib_catanhf", DeviceLibExt::cl_intel_devicelib_complex}, - {"__devicelib_ccosf", DeviceLibExt::cl_intel_devicelib_complex}, - {"__devicelib_ccoshf", DeviceLibExt::cl_intel_devicelib_complex}, - {"__devicelib_cexpf", DeviceLibExt::cl_intel_devicelib_complex}, - {"__devicelib_cimagf", DeviceLibExt::cl_intel_devicelib_complex}, - {"__devicelib_clogf", DeviceLibExt::cl_intel_devicelib_complex}, - {"__devicelib_cpolarf", DeviceLibExt::cl_intel_devicelib_complex}, - {"__devicelib_cpowf", DeviceLibExt::cl_intel_devicelib_complex}, - {"__devicelib_cprojf", DeviceLibExt::cl_intel_devicelib_complex}, - {"__devicelib_crealf", DeviceLibExt::cl_intel_devicelib_complex}, - {"__devicelib_csinf", DeviceLibExt::cl_intel_devicelib_complex}, - {"__devicelib_csinhf", DeviceLibExt::cl_intel_devicelib_complex}, - {"__devicelib_csqrtf", DeviceLibExt::cl_intel_devicelib_complex}, - {"__devicelib_ctanf", DeviceLibExt::cl_intel_devicelib_complex}, - {"__devicelib_ctanhf", DeviceLibExt::cl_intel_devicelib_complex}, - {"__devicelib___divdc3", DeviceLibExt::cl_intel_devicelib_complex_fp64}, - {"__devicelib___muldc3", DeviceLibExt::cl_intel_devicelib_complex_fp64}, - {"__devicelib_cabs", DeviceLibExt::cl_intel_devicelib_complex_fp64}, - {"__devicelib_cacos", DeviceLibExt::cl_intel_devicelib_complex_fp64}, - {"__devicelib_cacosh", DeviceLibExt::cl_intel_devicelib_complex_fp64}, - {"__devicelib_carg", DeviceLibExt::cl_intel_devicelib_complex_fp64}, - {"__devicelib_casin", DeviceLibExt::cl_intel_devicelib_complex_fp64}, - {"__devicelib_casinh", DeviceLibExt::cl_intel_devicelib_complex_fp64}, - {"__devicelib_catan", DeviceLibExt::cl_intel_devicelib_complex_fp64}, - {"__devicelib_catanh", DeviceLibExt::cl_intel_devicelib_complex_fp64}, - {"__devicelib_ccos", DeviceLibExt::cl_intel_devicelib_complex_fp64}, - {"__devicelib_ccosh", DeviceLibExt::cl_intel_devicelib_complex_fp64}, - {"__devicelib_cexp", DeviceLibExt::cl_intel_devicelib_complex_fp64}, - {"__devicelib_cimag", DeviceLibExt::cl_intel_devicelib_complex_fp64}, - {"__devicelib_clog", DeviceLibExt::cl_intel_devicelib_complex_fp64}, - {"__devicelib_cpolar", DeviceLibExt::cl_intel_devicelib_complex_fp64}, - {"__devicelib_cpow", DeviceLibExt::cl_intel_devicelib_complex_fp64}, - {"__devicelib_cproj", DeviceLibExt::cl_intel_devicelib_complex_fp64}, - {"__devicelib_creal", DeviceLibExt::cl_intel_devicelib_complex_fp64}, - {"__devicelib_csin", DeviceLibExt::cl_intel_devicelib_complex_fp64}, - {"__devicelib_csinh", DeviceLibExt::cl_intel_devicelib_complex_fp64}, - {"__devicelib_csqrt", DeviceLibExt::cl_intel_devicelib_complex_fp64}, - {"__devicelib_ctan", DeviceLibExt::cl_intel_devicelib_complex_fp64}, - {"__devicelib_ctanh", DeviceLibExt::cl_intel_devicelib_complex_fp64}, -}; static void error(const Twine &Msg) { errs() << "sycl-post-link: " << Msg << '\n'; @@ -535,55 +392,18 @@ saveResultModules(std::vector> &ResModules, return Res; } -// Each fallback device library corresponds to one bit in "require mask" which -// is an unsigned int32. getDeviceLibBit checks which fallback device library -// is required for FuncName and returns the corresponding bit. The corresponding -// mask for each fallback device library is: -// fallback-cassert: 0x1 -// fallback-cmath: 0x2 -// fallback-cmath-fp64: 0x4 -// fallback-complex: 0x8 -// fallback-complex-fp64: 0x10 -static uint32_t getDeviceLibBits(const std::string &FuncName) { - auto DeviceLibFuncIter = DeviceLibFuncMap.find(FuncName); - return ((DeviceLibFuncIter == DeviceLibFuncMap.end()) - ? 0 - : 0x1 << (static_cast(DeviceLibFuncIter->second) - - static_cast( - DeviceLibExt::cl_intel_devicelib_assert))); -} - -// 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. -static uint32_t getModuleReqMask(const Module &M) { - // Device libraries will be enabled only for spir-v module. - if (!llvm::Triple(M.getTargetTriple()).isSPIR()) - return 0; - // 0x1 means sycl runtime will link and load libsycl-fallback-assert.spv as - // default. In fact, default link assert spv is not necessary but dramatic - // perf regression is observed if we don't link any device library. The perf - // regression is caused by a clang issue. - uint32_t ReqMask = 0x1; - for (const Function &SF : M) { - if (SF.getName().startswith(DEVICELIB_FUNC_PREFIX) && SF.isDeclaration()) { - assert(SF.getCallingConv() == CallingConv::SPIR_FUNC); - uint32_t DeviceLibBits = getDeviceLibBits(SF.getName().str()); - ReqMask |= DeviceLibBits; - } - } - return ReqMask; -} - static string_vector saveDeviceImageProperty( const std::vector> &ResultModules, const ImagePropSaveInfo &ImgPSInfo) { string_vector Res; + legacy::PassManager GetSYCLDeviceLibReqMask; + SYCLDeviceLibReqMaskPass *SDLReqMaskPass = new SYCLDeviceLibReqMaskPass(); + GetSYCLDeviceLibReqMask.add(SDLReqMaskPass); for (size_t I = 0; I < ResultModules.size(); ++I) { llvm::util::PropertySetRegistry PropSet; if (ImgPSInfo.NeedDeviceLibReqMask) { - uint32_t MRMask = getModuleReqMask(*ResultModules[I]); + GetSYCLDeviceLibReqMask.run(*ResultModules[I]); + uint32_t MRMask = SDLReqMaskPass->getSYCLDeviceLibReqMask(); std::map RMEntry = {{"DeviceLibReqMask", MRMask}}; PropSet.add(llvm::util::PropertySetRegistry::SYCL_DEVICELIB_REQ_MASK, RMEntry); From c37c594b3ddf3baa590c22c46832030b5788c0e7 Mon Sep 17 00:00:00 2001 From: gejin Date: Thu, 4 Mar 2021 09:55:05 +0800 Subject: [PATCH 2/2] remove unnecessary include Signed-off-by: gejin --- llvm/tools/sycl-post-link/SYCLDeviceLibReqMask.cpp | 14 +++++++++----- llvm/tools/sycl-post-link/SYCLDeviceLibReqMask.h | 6 ------ llvm/tools/sycl-post-link/sycl-post-link.cpp | 7 ++++--- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/llvm/tools/sycl-post-link/SYCLDeviceLibReqMask.cpp b/llvm/tools/sycl-post-link/SYCLDeviceLibReqMask.cpp index 8d4238e0f02ab..e53dec1b2b009 100644 --- a/llvm/tools/sycl-post-link/SYCLDeviceLibReqMask.cpp +++ b/llvm/tools/sycl-post-link/SYCLDeviceLibReqMask.cpp @@ -15,13 +15,15 @@ //===----------------------------------------------------------------------===// #include "SYCLDeviceLibReqMask.h" +#include "llvm/ADT/Triple.h" +#include "llvm/IR/Module.h" static constexpr char DEVICELIB_FUNC_PREFIX[] = "__devicelib_"; -char SYCLDeviceLibReqMaskPass::ID = 0; +namespace { // Please update SDLMap if any item is added to or removed from // fallback device libraries in libdevice. -SYCLDeviceLibFuncMap SYCLDeviceLibReqMaskPass::SDLMap = { +SYCLDeviceLibFuncMap SDLMap = { {"__devicelib_acosf", DeviceLibExt::cl_intel_devicelib_math}, {"__devicelib_acoshf", DeviceLibExt::cl_intel_devicelib_math}, {"__devicelib_asinf", DeviceLibExt::cl_intel_devicelib_math}, @@ -161,8 +163,7 @@ SYCLDeviceLibFuncMap SYCLDeviceLibReqMaskPass::SDLMap = { // fallback-cmath-fp64: 0x4 // fallback-complex: 0x8 // fallback-complex-fp64: 0x10 -uint32_t -SYCLDeviceLibReqMaskPass::getDeviceLibBits(const std::string &FuncName) { +uint32_t getDeviceLibBits(const std::string &FuncName) { auto DeviceLibFuncIter = SDLMap.find(FuncName); return ((DeviceLibFuncIter == SDLMap.end()) ? 0 @@ -175,7 +176,7 @@ SYCLDeviceLibReqMaskPass::getDeviceLibBits(const std::string &FuncName) { // 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 SYCLDeviceLibReqMaskPass::getModuleDeviceLibReqMask(const Module &M) { +uint32_t getModuleDeviceLibReqMask(const Module &M) { // Device libraries will be enabled only for spir-v module. if (!llvm::Triple(M.getTargetTriple()).isSPIR()) return 0; @@ -193,6 +194,9 @@ uint32_t SYCLDeviceLibReqMaskPass::getModuleDeviceLibReqMask(const Module &M) { } return ReqMask; } +} // namespace + +char SYCLDeviceLibReqMaskPass::ID = 0; bool SYCLDeviceLibReqMaskPass::runOnModule(Module &M) { MReqMask = getModuleDeviceLibReqMask(M); return false; diff --git a/llvm/tools/sycl-post-link/SYCLDeviceLibReqMask.h b/llvm/tools/sycl-post-link/SYCLDeviceLibReqMask.h index c1e9ab5a0fe4d..712f05f927dc7 100644 --- a/llvm/tools/sycl-post-link/SYCLDeviceLibReqMask.h +++ b/llvm/tools/sycl-post-link/SYCLDeviceLibReqMask.h @@ -16,9 +16,6 @@ #pragma onece -#include "llvm/ADT/Triple.h" -#include "llvm/IR/Module.h" -#include "llvm/IR/PassManager.h" #include "llvm/Pass.h" #include using namespace llvm; @@ -44,7 +41,4 @@ class SYCLDeviceLibReqMaskPass : public ModulePass { private: uint32_t MReqMask; - static SYCLDeviceLibFuncMap SDLMap; - static uint32_t getDeviceLibBits(const std::string &FuncName); - static uint32_t getModuleDeviceLibReqMask(const Module &M); }; diff --git a/llvm/tools/sycl-post-link/sycl-post-link.cpp b/llvm/tools/sycl-post-link/sycl-post-link.cpp index 51d45d6a4fd9b..7acfb57b4b5e3 100644 --- a/llvm/tools/sycl-post-link/sycl-post-link.cpp +++ b/llvm/tools/sycl-post-link/sycl-post-link.cpp @@ -397,13 +397,14 @@ static string_vector saveDeviceImageProperty( const ImagePropSaveInfo &ImgPSInfo) { string_vector Res; legacy::PassManager GetSYCLDeviceLibReqMask; - SYCLDeviceLibReqMaskPass *SDLReqMaskPass = new SYCLDeviceLibReqMaskPass(); - GetSYCLDeviceLibReqMask.add(SDLReqMaskPass); + SYCLDeviceLibReqMaskPass *SDLReqMaskLegacyPass = + new SYCLDeviceLibReqMaskPass(); + GetSYCLDeviceLibReqMask.add(SDLReqMaskLegacyPass); for (size_t I = 0; I < ResultModules.size(); ++I) { llvm::util::PropertySetRegistry PropSet; if (ImgPSInfo.NeedDeviceLibReqMask) { GetSYCLDeviceLibReqMask.run(*ResultModules[I]); - uint32_t MRMask = SDLReqMaskPass->getSYCLDeviceLibReqMask(); + uint32_t MRMask = SDLReqMaskLegacyPass->getSYCLDeviceLibReqMask(); std::map RMEntry = {{"DeviceLibReqMask", MRMask}}; PropSet.add(llvm::util::PropertySetRegistry::SYCL_DEVICELIB_REQ_MASK, RMEntry);