Skip to content

Commit 41a107a

Browse files
authored
[SYCLPostLink][NFC] Fix a few coding style issues. (#20265)
Apply a few style suggestions from clang-tidy.
1 parent 2067c31 commit 41a107a

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

llvm/include/llvm/SYCLPostLink/ModuleSplitter.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ class Function;
3333

3434
namespace cl {
3535
class OptionCategory;
36-
}
36+
} // namespace cl
3737

3838
namespace module_split {
3939

40-
constexpr char SYCL_ESIMD_SPLIT_MD_NAME[] = "sycl-esimd-split-status";
40+
constexpr char SyclEsimdSplitMdName[] = "sycl-esimd-split-status";
4141
constexpr std::array<const char *, 2> SYCLDeviceLibs = {
4242
"libsycl-fallback-bfloat16.bc", "libsycl-native-bfloat16.bc"};
4343

@@ -144,7 +144,7 @@ class ModuleDesc {
144144
: M(std::move(M)), IsTopLevel(true), Name(Name) {
145145
// DeviceLib module doesn't include any entry point,it can be constructed
146146
// using ctor without any entry point related parameter.
147-
for (auto Fn : SYCLDeviceLibs) {
147+
for (const auto *Fn : SYCLDeviceLibs) {
148148
if (StringRef(Fn) == Name) {
149149
IsSYCLDeviceLib = true;
150150
break;

llvm/lib/SYCLPostLink/ComputeModuleRuntimeInfo.cpp

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include "llvm/ADT/SmallString.h"
1212
#include "llvm/ADT/SmallVector.h"
1313
#include "llvm/ADT/StringSet.h"
14-
#include "llvm/Demangle/Demangle.h"
1514
#include "llvm/IR/PassInstrumentation.h"
1615
#include "llvm/SYCLLowerIR/CompileTimePropertiesPass.h"
1716
#include "llvm/SYCLLowerIR/DeviceGlobals.h"
@@ -32,7 +31,7 @@ namespace llvm::sycl {
3231
namespace {
3332
module_split::SyclEsimdSplitStatus
3433
getSYCLESIMDSplitStatusFromMetadata(const Module &M) {
35-
auto *SplitMD = M.getNamedMetadata(module_split::SYCL_ESIMD_SPLIT_MD_NAME);
34+
auto *SplitMD = M.getNamedMetadata(module_split::SyclEsimdSplitMdName);
3635
assert(SplitMD && "Unexpected metadata");
3736
auto *MDOp = SplitMD->getOperand(0);
3837
assert(MDOp && "Unexpected metadata operand");
@@ -67,7 +66,7 @@ bool isModuleUsingTsan(const Module &M) {
6766
// Optional.
6867
// Otherwise, it returns an Optional containing a list of reached
6968
// SPIR kernel function's names.
70-
std::optional<std::vector<StringRef>>
69+
static std::optional<std::vector<StringRef>>
7170
traverseCGToFindSPIRKernels(const Function *StartingFunction) {
7271
std::queue<const Function *> FunctionsToVisit;
7372
std::unordered_set<const Function *> VisitedFunctions;
@@ -106,7 +105,8 @@ traverseCGToFindSPIRKernels(const Function *StartingFunction) {
106105

107106
return {std::move(KernelNames)};
108107
}
109-
std::vector<StringRef> getKernelNamesUsingAssert(const Module &M) {
108+
109+
static std::vector<StringRef> getKernelNamesUsingAssert(const Module &M) {
110110
auto *DevicelibAssertFailFunction = M.getFunction("__devicelib_assert_fail");
111111
if (!DevicelibAssertFailFunction)
112112
return {};
@@ -131,8 +131,8 @@ std::vector<StringRef> getKernelNamesUsingAssert(const Module &M) {
131131
// Gets 1- to 3-dimension work-group related information for function Func.
132132
// Returns an empty vector if not present.
133133
template <typename T>
134-
std::vector<T> getKernelWorkGroupMetadata(const Function &Func,
135-
const char *MDName) {
134+
static std::vector<T> getKernelWorkGroupMetadata(const Function &Func,
135+
const char *MDName) {
136136
MDNode *WorkGroupMD = Func.getMetadata(MDName);
137137
if (!WorkGroupMD)
138138
return {};
@@ -149,8 +149,8 @@ std::vector<T> getKernelWorkGroupMetadata(const Function &Func,
149149
// Gets a single-dimensional piece of information for function Func.
150150
// Returns std::nullopt if metadata is not present.
151151
template <typename T>
152-
std::optional<T> getKernelSingleEltMetadata(const Function &Func,
153-
const char *MDName) {
152+
static std::optional<T> getKernelSingleEltMetadata(const Function &Func,
153+
const char *MDName) {
154154
if (MDNode *MaxDimMD = Func.getMetadata(MDName)) {
155155
assert(MaxDimMD->getNumOperands() == 1 && "Malformed node.");
156156
return mdconst::extract<ConstantInt>(MaxDimMD->getOperand(0))
@@ -543,6 +543,7 @@ PropSetRegTy computeModuleProperties(const Module &M,
543543

544544
return PropSet;
545545
}
546+
546547
std::string computeModuleSymbolTable(const Module &M,
547548
const EntryPointSet &EntryPoints) {
548549

llvm/lib/SYCLPostLink/ModuleSplitter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,7 @@ void ModuleDesc::dump() const {
861861
void ModuleDesc::saveSplitInformationAsMetadata() {
862862
// Add metadata to the module so we can identify what kind of SYCL/ESIMD split
863863
// later.
864-
auto *SplitMD = M->getOrInsertNamedMetadata(SYCL_ESIMD_SPLIT_MD_NAME);
864+
auto *SplitMD = M->getOrInsertNamedMetadata(SyclEsimdSplitMdName);
865865
auto *SplitMDOp = MDNode::get(
866866
M->getContext(), ConstantAsMetadata::get(ConstantInt::get(
867867
Type::getInt8Ty(M->getContext()),

0 commit comments

Comments
 (0)