[Mlir-commits] [mlir] [mlir][gpu] Add a symbol table field to TargetOptions and adjust GpuModuleToBinary (PR #65797)
llvmlistbot at llvm.org
llvmlistbot at llvm.org
Sat Sep 9 09:47:14 PDT 2023
llvmbot wrote:
@llvm/pr-subscribers-mlir
<details>
<summary>Changes</summary>
…oduleToBinary
This patch adds the option of building an optional symbol table for the top operation in the `gpu-module-to-binary` pass. This table is required by some target attributes. The table is not created by default, as other targets don't need it. The table is passed through `TargetOptions`.
This patch is required to integrate #65539 .
--
Full diff: https://github.com/llvm/llvm-project/pull/65797.diff
4 Files Affected:
- (modified) mlir/include/mlir/Dialect/GPU/IR/CompilationInterfaces.h (+14-3)
- (modified) mlir/include/mlir/Dialect/GPU/Transforms/Passes.td (+5-3)
- (modified) mlir/lib/Dialect/GPU/IR/GPUDialect.cpp (+10-4)
- (modified) mlir/lib/Dialect/GPU/Transforms/ModuleToBinary.cpp (+18-1)
<pre>
diff --git a/mlir/include/mlir/Dialect/GPU/IR/CompilationInterfaces.h b/mlir/include/mlir/Dialect/GPU/IR/CompilationInterfaces.h
index e0bf560dbd98b92..cd2287ecf239d36 100644
--- a/mlir/include/mlir/Dialect/GPU/IR/CompilationInterfaces.h
+++ b/mlir/include/mlir/Dialect/GPU/IR/CompilationInterfaces.h
@@ -20,6 +20,7 @@ class IRBuilderBase;
}
namespace mlir {
+class SymbolTable;
namespace LLVM {
class ModuleTranslation;
}
@@ -56,10 +57,11 @@ class TargetOptions {
/// Constructor initializing the toolkit path, the list of files to link to,
/// extra command line options & the compilation target. The default
- /// compilation target is `binary`.
+ /// compilation target is `binOrFatbin`.
TargetOptions(StringRef toolkitPath = {},
ArrayRef<std::string> linkFiles = {}, StringRef cmdOptions = {},
- CompilationTarget compilationTarget = binOrFatbin);
+ CompilationTarget compilationTarget = binOrFatbin,
+ function_ref<SymbolTable *()> symbolTableCallback = {});
/// Returns the typeID.
TypeID getTypeID() const;
@@ -80,12 +82,17 @@ class TargetOptions {
/// Returns the compilation target.
CompilationTarget getCompilationTarget() const;
+ /// Returns the parent symbol table if a callback was provided, else returns
+ /// nullptr.
+ SymbolTable *getParentTable() const;
+
protected:
/// Derived classes must use this constructor to initialize `typeID` to the
/// appropiate value: ie. `TargetOptions(TypeID::get<DerivedClass>())`.
TargetOptions(TypeID typeID, StringRef toolkitPath = {},
ArrayRef<std::string> linkFiles = {}, StringRef cmdOptions = {},
- CompilationTarget compilationTarget = binOrFatbin);
+ CompilationTarget compilationTarget = binOrFatbin,
+ function_ref<SymbolTable *()> symbolTableCallback = {});
/// Path to the target toolkit.
std::string toolkitPath;
@@ -100,6 +107,10 @@ class TargetOptions {
/// Compilation process target representation.
CompilationTarget compilationTarget;
+ /// Callback for obtaining the parent symbol table of all the GPU modules
+ /// being serialized.
+ function_ref<SymbolTable *()> symbolTableCallback;
+
private:
TypeID typeID;
};
diff --git a/mlir/include/mlir/Dialect/GPU/Transforms/Passes.td b/mlir/include/mlir/Dialect/GPU/Transforms/Passes.td
index ba8a6266604e46c..0bfb2750992058f 100644
--- a/mlir/include/mlir/Dialect/GPU/Transforms/Passes.td
+++ b/mlir/include/mlir/Dialect/GPU/Transforms/Passes.td
@@ -64,9 +64,11 @@ def GpuModuleToBinaryPass
with an object for every target.
The `format` argument can have the following values:
- 1. `offloading`, `llvm`: producing an offloading representation.
- 2. `assembly`, `isa`: producing assembly code.
- 3. `binary`, `bin`: producing binaries.
+ 1. `offloading`, `llvm`: produces an offloading representation.
+ 2. `assembly`, `isa`: produces assembly code.
+ 3. `binary`, `bin`: produces binaries.
+ 4. `fatbinary`, `fatbin`: produces fatbinaries.
+ 5. `binOrFatbin`: produces bins or fatbins, the target decides which.
}];
let options = [
Option<"offloadingHandler", "handler", "Attribute", "nullptr",
diff --git a/mlir/lib/Dialect/GPU/IR/GPUDialect.cpp b/mlir/lib/Dialect/GPU/IR/GPUDialect.cpp
index f417a083337fcaf..68423e74b7f328f 100644
--- a/mlir/lib/Dialect/GPU/IR/GPUDialect.cpp
+++ b/mlir/lib/Dialect/GPU/IR/GPUDialect.cpp
@@ -1982,17 +1982,19 @@ gpu::SelectObjectAttr::verify(function_ref<InFlightDiagnostic()> emitError,
TargetOptions::TargetOptions(StringRef toolkitPath,
ArrayRef<std::string> linkFiles,
StringRef cmdOptions,
- CompilationTarget compilationTarget)
+ CompilationTarget compilationTarget,
+ function_ref<SymbolTable *()> symbolTableCallback)
: TargetOptions(TypeID::get<TargetOptions>(), toolkitPath, linkFiles,
- cmdOptions, compilationTarget) {}
+ cmdOptions, compilationTarget, symbolTableCallback) {}
TargetOptions::TargetOptions(TypeID typeID, StringRef toolkitPath,
ArrayRef<std::string> linkFiles,
StringRef cmdOptions,
- CompilationTarget compilationTarget)
+ CompilationTarget compilationTarget,
+ function_ref<SymbolTable *()> symbolTableCallback)
: toolkitPath(toolkitPath.str()), linkFiles(linkFiles),
cmdOptions(cmdOptions.str()), compilationTarget(compilationTarget),
- typeID(typeID) {}
+ symbolTableCallback(symbolTableCallback), typeID(typeID) {}
TypeID TargetOptions::getTypeID() const { return typeID; }
@@ -2002,6 +2004,10 @@ ArrayRef<std::string> TargetOptions::getLinkFiles() const { return linkFiles; }
StringRef TargetOptions::getCmdOptions() const { return cmdOptions; }
+SymbolTable *TargetOptions::getParentTable() const {
+ return symbolTableCallback ? symbolTableCallback() : nullptr;
+}
+
std::pair<llvm::BumpPtrAllocator, SmallVector<const char *>>
TargetOptions::tokenizeCmdOptions() const {
std::pair<llvm::BumpPtrAllocator, SmallVector<const char *>> options;
diff --git a/mlir/lib/Dialect/GPU/Transforms/ModuleToBinary.cpp b/mlir/lib/Dialect/GPU/Transforms/ModuleToBinary.cpp
index 06b7dee6941e1f4..e29a1f0c3248d04 100644
--- a/mlir/lib/Dialect/GPU/Transforms/ModuleToBinary.cpp
+++ b/mlir/lib/Dialect/GPU/Transforms/ModuleToBinary.cpp
@@ -66,9 +66,26 @@ void GpuModuleToBinaryPass::runOnOperation() {
.Default(-1);
if (targetFormat == -1)
getOperation()->emitError() << "Invalid format specified.";
+
+ // Lazy symbol table builder callback.
+ std::optional<SymbolTable> parentTable;
+ auto lazyTableBuilder = [&]() -> SymbolTable * {
+ // Build the table if it has not been built.
+ if (!parentTable) {
+ Operation *table = SymbolTable::getNearestSymbolTable(getOperation());
+ // It's up to the target attribute to determine if failing to find a
+ // symbol table is an error.
+ if (!table)
+ return nullptr;
+ parentTable = SymbolTable(table);
+ }
+ return &parentTable.value();
+ };
+
TargetOptions targetOptions(
toolkitPath, linkFiles, cmdOptions,
- static_cast<TargetOptions::CompilationTarget>(targetFormat));
+ static_cast<TargetOptions::CompilationTarget>(targetFormat),
+ lazyTableBuilder);
if (failed(transformGpuModulesToBinaries(
getOperation(),
offloadingHandler ? dyn_cast<OffloadingLLVMTranslationAttrInterface>(
</pre>
</details>
https://github.com/llvm/llvm-project/pull/65797
More information about the Mlir-commits
mailing list