-
Notifications
You must be signed in to change notification settings - Fork 14.4k
[offload][SYCL] Add Module splitting by categories. #131347
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from 6 commits
ede5e8c
c764d7f
c69c62e
483933b
141c039
1729c50
0b6f17f
c249af1
7ad079e
7c96d33
04de3db
877db4b
4987388
2e89d50
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
//===-------- SplitModuleByCategory.h - module split ------------*- C++ -*-===// | ||
// | ||
// 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 | ||
// | ||
//===----------------------------------------------------------------------===// | ||
// Functionality to split a module by categories. | ||
//===----------------------------------------------------------------------===// | ||
|
||
#ifndef LLVM_TRANSFORM_UTILS_SPLIT_MODULE_BY_CATEGORY_H | ||
#define LLVM_TRANSFORM_UTILS_SPLIT_MODULE_BY_CATEGORY_H | ||
|
||
#include "llvm/ADT/STLFunctionalExtras.h" | ||
|
||
#include <memory> | ||
#include <optional> | ||
#include <string> | ||
|
||
namespace llvm { | ||
|
||
class Module; | ||
class Function; | ||
|
||
/// Splits the given module \p M using the given \p FunctionCategorizer. | ||
asudarsa marked this conversation as resolved.
Show resolved
Hide resolved
|
||
/// \p FunctionCategorizer returns integer category for an input Function. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. A side note, I think it'd be more helpful (at least putting on my AMD hat) to be able to determine where a global variable goes as well, if we'd like to make this pass generic to support all potential targets. The reason is, for AMDGPU, we probably need to categorize all functions that could potentially reference a global variable in the sam module, due to the lowering of LDS (shared) variables. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Leave this for later. |
||
/// It may return std::nullopt if a function doesn't have a category. | ||
/// Module's functions are being grouped by categories. Every such group | ||
/// populates a call graph containing group's functions themselves and all | ||
/// reachable functions and globals. Split outputs are populated from each call | ||
/// graph associated with some category. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Two comments:
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
In SYCL case We could replace There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nullopt is fine, but include the meaning in the comment. EDIT: you did. |
||
/// | ||
/// Every split output is being passed to \p Callback for further possible | ||
/// processing. | ||
/// | ||
/// Currently, the supported targets are SPIRV, AMDGPU and NVPTX. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please update this comment. I am not sure if the targets are restrictive. I think the restriction is whether the input module has recursive calls or not. Thanks There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Agreed. Now we have call backs so it should just work for all. Update: This is probably because There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Yes and the algorithm was implemented with assumption that the input is a heterogenous program, which usually don't have recursion. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
FWIW, "usually" is doing the heavy lifting here. Please do not assume anything about GPU codes that is not required. So, recursion should be assumed to happen. |
||
void splitModuleByCategory( | ||
std::unique_ptr<Module> M, | ||
function_ref<std::optional<int>(const Function &F)> FunctionCategorizer, | ||
function_ref<void(std::unique_ptr<Module> Part)> Callback); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It might be helpful to pass the category to the callback in addition to the module. But if this is not needed right now, we can do this later. |
||
|
||
} // namespace llvm | ||
|
||
#endif // LLVM_TRANSFORM_UTILS_SPLIT_MODULE_BY_CATEGORY_H |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,340 @@ | ||
//===-------- SplitModuleByCategory.cpp - split a module by categories ----===// | ||
// | ||
// 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 | ||
// | ||
//===----------------------------------------------------------------------===// | ||
// See comments in the header. | ||
//===----------------------------------------------------------------------===// | ||
|
||
#include "llvm/Transforms/Utils/SplitModuleByCategory.h" | ||
#include "llvm/ADT/SetVector.h" | ||
#include "llvm/ADT/SmallPtrSet.h" | ||
#include "llvm/ADT/StringExtras.h" | ||
#include "llvm/IR/Constants.h" | ||
#include "llvm/IR/Function.h" | ||
#include "llvm/IR/InstIterator.h" | ||
#include "llvm/IR/Instructions.h" | ||
#include "llvm/IR/Module.h" | ||
#include "llvm/Support/Debug.h" | ||
#include "llvm/Transforms/Utils/Cloning.h" | ||
|
||
#include <map> | ||
#include <string> | ||
#include <utility> | ||
|
||
using namespace llvm; | ||
|
||
#define DEBUG_TYPE "split-module-by-category" | ||
|
||
namespace { | ||
|
||
// A vector that contains a group of function with the same category. | ||
using EntryPointSet = SetVector<const Function *>; | ||
|
||
/// Represents a group of functions with one category. | ||
struct EntryPointGroup { | ||
int ID; | ||
EntryPointSet Functions; | ||
|
||
EntryPointGroup() = default; | ||
EntryPointGroup(const EntryPointGroup &) = default; | ||
EntryPointGroup &operator=(const EntryPointGroup &) = default; | ||
EntryPointGroup(EntryPointGroup &&) = default; | ||
EntryPointGroup &operator=(EntryPointGroup &&) = default; | ||
maksimsab marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
EntryPointGroup(int ID, EntryPointSet Functions = EntryPointSet()) | ||
maksimsab marked this conversation as resolved.
Show resolved
Hide resolved
|
||
: ID(ID), Functions(std::move(Functions)) {} | ||
|
||
void clear() { Functions.clear(); } | ||
|
||
#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP) | ||
LLVM_DUMP_METHOD void dump() const { | ||
constexpr size_t INDENT = 4; | ||
dbgs().indent(INDENT) << "ENTRY POINTS" | ||
<< " " << ID << " {\n"; | ||
for (const Function *F : Functions) | ||
dbgs().indent(INDENT) << " " << F->getName() << "\n"; | ||
|
||
dbgs().indent(INDENT) << "}\n"; | ||
} | ||
#endif | ||
}; | ||
|
||
/// Annotates an llvm::Module with information necessary to perform and track | ||
/// the result of code (llvm::Module instances) splitting: | ||
/// - entry points group from the module. | ||
class ModuleDesc { | ||
std::unique_ptr<Module> M; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I assume There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
EntryPointGroup EntryPoints; | ||
|
||
public: | ||
ModuleDesc() = delete; | ||
ModuleDesc(const ModuleDesc &) = delete; | ||
ModuleDesc &operator=(const ModuleDesc &) = delete; | ||
ModuleDesc(ModuleDesc &&) = default; | ||
ModuleDesc &operator=(ModuleDesc &&) = default; | ||
maksimsab marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
ModuleDesc(std::unique_ptr<Module> M, | ||
EntryPointGroup EntryPoints = EntryPointGroup()) | ||
maksimsab marked this conversation as resolved.
Show resolved
Hide resolved
|
||
: M(std::move(M)), EntryPoints(std::move(EntryPoints)) { | ||
assert(this->M && "Module should be non-null"); | ||
} | ||
|
||
Module &getModule() { return *M; } | ||
const Module &getModule() const { return *M; } | ||
|
||
std::unique_ptr<Module> releaseModule() { | ||
EntryPoints.clear(); | ||
return std::move(M); | ||
} | ||
|
||
#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP) | ||
LLVM_DUMP_METHOD void dump() const { | ||
dbgs() << "ModuleDesc[" << M->getName() << "] {\n"; | ||
EntryPoints.dump(); | ||
dbgs() << "}\n"; | ||
} | ||
#endif | ||
}; | ||
|
||
bool isKernel(const Function &F) { | ||
return F.getCallingConv() == CallingConv::SPIR_KERNEL || | ||
F.getCallingConv() == CallingConv::AMDGPU_KERNEL || | ||
F.getCallingConv() == CallingConv::PTX_Kernel; | ||
} | ||
|
||
// Represents "dependency" or "use" graph of global objects (functions and | ||
// global variables) in a module. It is used during device code split to | ||
// understand which global variables and functions (other than entry points) | ||
// should be included into a split module. | ||
// | ||
// Nodes of the graph represent LLVM's GlobalObjects, edges "A" -> "B" represent | ||
// the fact that if "A" is included into a module, then "B" should be included | ||
// as well. | ||
// | ||
// Examples of dependencies which are represented in this graph: | ||
// - Function FA calls function FB | ||
// - Function FA uses global variable GA | ||
// - Global variable GA references (initialized with) function FB | ||
// - Function FA stores address of a function FB somewhere | ||
// | ||
// The following cases are treated as dependencies between global objects: | ||
// 1. Global object A is used within by a global object B in any way (store, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. "within by" There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could you please explain your point here? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I find the language weird, or the grammar broken. "used within by a global object" is not something I can parse. "used within a global object" works for me, "used by a global object" works as well. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. changed that. |
||
// bitcast, phi node, call, etc.): "A" -> "B" edge will be added to the | ||
// graph; | ||
// 2. function A performs an indirect call of a function with signature S and | ||
// there is a function B with signature S. "A" -> "B" edge will be added to | ||
// the graph; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is a slippery slope. I'm fine with it for now but in reality this doesn't work. We do allow, and execute, way more than perfect signature matches. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm curious what cases you mean which are allowed to be executed. I've added a test recently called |
||
class DependencyGraph { | ||
public: | ||
using GlobalSet = SmallPtrSet<const GlobalValue *, 16>; | ||
|
||
DependencyGraph(const Module &M) { | ||
// Group functions by their signature to handle case (2) described above | ||
DenseMap<const FunctionType *, DependencyGraph::GlobalSet> | ||
FuncTypeToFuncsMap; | ||
for (const auto &F : M.functions()) { | ||
// Kernels can't be called (either directly or indirectly). | ||
if (isKernel(F)) | ||
continue; | ||
|
||
FuncTypeToFuncsMap[F.getFunctionType()].insert(&F); | ||
} | ||
|
||
for (const auto &F : M.functions()) { | ||
maksimsab marked this conversation as resolved.
Show resolved
Hide resolved
|
||
// case (1), see comment above the class definition | ||
for (const Value *U : F.users()) | ||
addUserToGraphRecursively(cast<const User>(U), &F); | ||
|
||
// case (2), see comment above the class definition | ||
for (const auto &I : instructions(F)) { | ||
const auto *CI = dyn_cast<CallInst>(&I); | ||
maksimsab marked this conversation as resolved.
Show resolved
Hide resolved
|
||
if (!CI || !CI->isIndirectCall()) // Direct calls were handled above | ||
continue; | ||
|
||
const FunctionType *Signature = CI->getFunctionType(); | ||
const auto &PotentialCallees = FuncTypeToFuncsMap[Signature]; | ||
Graph[&F].insert(PotentialCallees.begin(), PotentialCallees.end()); | ||
maksimsab marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
} | ||
|
||
// And every global variable (but their handling is a bit simpler) | ||
for (const auto &GV : M.globals()) | ||
maksimsab marked this conversation as resolved.
Show resolved
Hide resolved
|
||
for (const Value *U : GV.users()) | ||
addUserToGraphRecursively(cast<const User>(U), &GV); | ||
} | ||
|
||
iterator_range<GlobalSet::const_iterator> | ||
dependencies(const GlobalValue *Val) const { | ||
auto It = Graph.find(Val); | ||
return (It == Graph.end()) | ||
? make_range(EmptySet.begin(), EmptySet.end()) | ||
: make_range(It->second.begin(), It->second.end()); | ||
} | ||
|
||
private: | ||
void addUserToGraphRecursively(const User *Root, const GlobalValue *V) { | ||
SmallVector<const User *, 8> WorkList; | ||
WorkList.push_back(Root); | ||
|
||
while (!WorkList.empty()) { | ||
const User *U = WorkList.pop_back_val(); | ||
if (const auto *I = dyn_cast<const Instruction>(U)) { | ||
const auto *UFunc = I->getFunction(); | ||
maksimsab marked this conversation as resolved.
Show resolved
Hide resolved
|
||
Graph[UFunc].insert(V); | ||
} else if (isa<const Constant>(U)) { | ||
if (const auto *GV = dyn_cast<const GlobalVariable>(U)) | ||
Graph[GV].insert(V); | ||
// This could be a global variable or some constant expression (like | ||
// bitcast or gep). We trace users of this constant further to reach | ||
// global objects they are used by and add them to the graph. | ||
for (const auto *UU : U->users()) | ||
WorkList.push_back(UU); | ||
} else | ||
llvm_unreachable("Unhandled type of function user"); | ||
maksimsab marked this conversation as resolved.
Show resolved
Hide resolved
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This should trigger on metadata, doesn't it? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. From the inheritance hierarchy [1] it doesn't look like we can get a metadata from |
||
} | ||
} | ||
|
||
DenseMap<const GlobalValue *, GlobalSet> Graph; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: this There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. That would require me to use void addUserToGraphRecursively(const User *Root, const GlobalValue *V) {
SmallVector<User *, 8> WorkList;
WorkList.push_back(const_cast<User *>(Root));
/// ...
} Would that be ok in LLVM style? |
||
SmallPtrSet<const GlobalValue *, 1> EmptySet; | ||
}; | ||
|
||
void collectFunctionsAndGlobalVariablesToExtract( | ||
SetVector<const GlobalValue *> &GVs, const Module &M, | ||
const EntryPointGroup &ModuleEntryPoints, const DependencyGraph &DG) { | ||
// We start with module entry points | ||
for (const auto *F : ModuleEntryPoints.Functions) | ||
maksimsab marked this conversation as resolved.
Show resolved
Hide resolved
|
||
GVs.insert(F); | ||
|
||
// Non-discardable global variables are also include into the initial set | ||
for (const auto &GV : M.globals()) | ||
if (!GV.isDiscardableIfUnused()) | ||
GVs.insert(&GV); | ||
|
||
// GVs has SetVector type. This type inserts a value only if it is not yet | ||
// present there. So, recursion is not expected here. | ||
size_t Idx = 0; | ||
while (Idx < GVs.size()) { | ||
const GlobalValue *Obj = GVs[Idx++]; | ||
|
||
for (const GlobalValue *Dep : DG.dependencies(Obj)) { | ||
if (const auto *Func = dyn_cast<const Function>(Dep)) { | ||
if (!Func->isDeclaration()) | ||
GVs.insert(Func); | ||
} else | ||
GVs.insert(Dep); // Global variables are added unconditionally | ||
maksimsab marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
} | ||
} | ||
|
||
ModuleDesc extractSubModule(const Module &M, | ||
const SetVector<const GlobalValue *> &GVs, | ||
EntryPointGroup ModuleEntryPoints) { | ||
// For each group of entry points collect all dependencies. | ||
maksimsab marked this conversation as resolved.
Show resolved
Hide resolved
|
||
ValueToValueMapTy VMap; | ||
// Clone definitions only for needed globals. Others will be added as | ||
// declarations and removed later. | ||
std::unique_ptr<Module> SubM = CloneModule( | ||
M, VMap, [&](const GlobalValue *GV) { return GVs.count(GV); }); | ||
maksimsab marked this conversation as resolved.
Show resolved
Hide resolved
|
||
// Replace entry points with cloned ones. | ||
EntryPointSet NewEPs; | ||
const EntryPointSet &EPs = ModuleEntryPoints.Functions; | ||
std::for_each(EPs.begin(), EPs.end(), [&](const Function *F) { | ||
maksimsab marked this conversation as resolved.
Show resolved
Hide resolved
|
||
NewEPs.insert(cast<Function>(VMap[F])); | ||
}); | ||
ModuleEntryPoints.Functions = std::move(NewEPs); | ||
return ModuleDesc{std::move(SubM), std::move(ModuleEntryPoints)}; | ||
} | ||
|
||
// The function produces a copy of input LLVM IR module M with only those | ||
// functions and globals that can be called from entry points that are specified | ||
// in ModuleEntryPoints vector, in addition to the entry point functions. | ||
ModuleDesc extractCallGraph(const Module &M, EntryPointGroup ModuleEntryPoints, | ||
const DependencyGraph &DG) { | ||
SetVector<const GlobalValue *> GVs; | ||
collectFunctionsAndGlobalVariablesToExtract(GVs, M, ModuleEntryPoints, DG); | ||
|
||
ModuleDesc SplitM = extractSubModule(M, GVs, std::move(ModuleEntryPoints)); | ||
LLVM_DEBUG(SplitM.dump()); | ||
return SplitM; | ||
} | ||
|
||
using EntryPointGroupVec = SmallVector<EntryPointGroup>; | ||
|
||
/// Module Splitter. | ||
/// It gets a module (in a form of module descriptor, to get additional info) | ||
/// and a collection of entry points groups. Each group specifies subset entry | ||
/// points from input module that should be included in a split module. | ||
class ModuleSplitter { | ||
private: | ||
ModuleDesc Input; | ||
maksimsab marked this conversation as resolved.
Show resolved
Hide resolved
|
||
EntryPointGroupVec Groups; | ||
DependencyGraph DG; | ||
|
||
private: | ||
EntryPointGroup drawEntryPointGroup() { | ||
assert(Groups.size() > 0 && "Reached end of entry point groups list."); | ||
EntryPointGroup Group = std::move(Groups.back()); | ||
Groups.pop_back(); | ||
return Group; | ||
} | ||
|
||
public: | ||
ModuleSplitter(ModuleDesc MD, EntryPointGroupVec GroupVec) | ||
maksimsab marked this conversation as resolved.
Show resolved
Hide resolved
|
||
: Input(std::move(MD)), Groups(std::move(GroupVec)), | ||
DG(Input.getModule()) { | ||
assert(!Groups.empty() && "Entry points groups collection is empty!"); | ||
} | ||
|
||
/// Gets next subsequence of entry points in an input module and provides | ||
/// split submodule containing these entry points and their dependencies. | ||
ModuleDesc getNextSplit() { | ||
return extractCallGraph(Input.getModule(), drawEntryPointGroup(), DG); | ||
} | ||
|
||
/// Check that there are still submodules to split. | ||
bool hasMoreSplits() const { return Groups.size() > 0; } | ||
}; | ||
|
||
EntryPointGroupVec | ||
selectEntryPointGroups(const Module &M, | ||
function_ref<std::optional<int>(const Function &F)> FC) { | ||
// std::map is used here to ensure stable ordering of entry point groups, | ||
// which is based on their contents, this greatly helps LIT tests | ||
std::map<int, EntryPointSet> EntryPointsMap; | ||
|
||
for (const auto &F : M.functions()) { | ||
if (auto Category = FC(F); Category) { | ||
auto It = EntryPointsMap.find(*Category); | ||
if (It == EntryPointsMap.end()) | ||
It = EntryPointsMap.emplace(*Category, EntryPointSet()).first; | ||
maksimsab marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
It->second.insert(&F); | ||
} | ||
} | ||
|
||
EntryPointGroupVec Groups; | ||
Groups.reserve(EntryPointsMap.size()); | ||
// Start with properties of a source module | ||
for (auto &[Key, EntryPoints] : EntryPointsMap) | ||
Groups.emplace_back(Key, std::move(EntryPoints)); | ||
|
||
return Groups; | ||
} | ||
|
||
} // namespace | ||
|
||
void llvm::splitModuleByCategory( | ||
std::unique_ptr<Module> M, | ||
function_ref<std::optional<int>(const Function &F)> FunctionCategorizer, | ||
function_ref<void(std::unique_ptr<Module> Part)> Callback) { | ||
EntryPointGroupVec Groups = selectEntryPointGroups(*M, FunctionCategorizer); | ||
ModuleDesc MD = std::move(M); | ||
ModuleSplitter Splitter(std::move(MD), std::move(Groups)); | ||
maksimsab marked this conversation as resolved.
Show resolved
Hide resolved
|
||
while (Splitter.hasMoreSplits()) { | ||
ModuleDesc MD = Splitter.getNextSplit(); | ||
Callback(std::move(MD.releaseModule())); | ||
} | ||
} |
Uh oh!
There was an error while loading. Please reload this page.