[mlir][target] RAII wrap moduleToObject timer to ensure call clear function
#136142
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-mlir Author: Zichen Lu (MikaOvO) ChangesAs title, we need to call Full diff: https://github.com/llvm/llvm-project/pull/136142.diff 1 Files Affected:
diff --git a/mlir/lib/Target/LLVM/NVVM/Target.cpp b/mlir/lib/Target/LLVM/NVVM/Target.cpp
index 5a2b829fbd1bd..ea0c2b6663fbb 100644
--- a/mlir/lib/Target/LLVM/NVVM/Target.cpp
+++ b/mlir/lib/Target/LLVM/NVVM/Target.cpp
@@ -669,10 +669,6 @@ NVPTXSerializer::compileToBinaryNVPTX(const std::string &ptxCode) {
std::optional<SmallVector<char, 0>>
NVPTXSerializer::moduleToObject(llvm::Module &llvmModule) {
- llvm::Timer moduleToObjectTimer(
- "moduleToObjectTimer",
- "Timer for perf llvm-ir -> isa and isa -> binary.");
- moduleToObjectTimer.startTimer();
// Return LLVM IR if the compilation target is `offload`.
#define DEBUG_TYPE "serialize-to-llvm"
LLVM_DEBUG({
@@ -691,6 +687,18 @@ NVPTXSerializer::moduleToObject(llvm::Module &llvmModule) {
return std::nullopt;
#endif // LLVM_HAS_NVPTX_TARGET
+ auto timerDeleter = [](llvm::Timer *timer) {
+ if (timer != nullptr) {
+ timer->clear();
+ delete timer;
+ }
+ };
+ std::unique_ptr<llvm::Timer, decltype(timerDeleter)> moduleToObjectTimer(
+ new llvm::Timer("moduleToObjectTimer",
+ "Timer for perf llvm-ir -> isa and isa -> binary."),
+ timerDeleter);
+ moduleToObjectTimer->startTimer();
+
// Emit PTX code.
std::optional<llvm::TargetMachine *> targetMachine =
getOrCreateTargetMachine();
@@ -706,9 +714,9 @@ NVPTXSerializer::moduleToObject(llvm::Module &llvmModule) {
return std::nullopt;
}
- moduleToObjectTimer.stopTimer();
- llvmToISATimeInMs = moduleToObjectTimer.getTotalTime().getWallTime() * 1000;
- moduleToObjectTimer.clear();
+ moduleToObjectTimer->stopTimer();
+ llvmToISATimeInMs = moduleToObjectTimer->getTotalTime().getWallTime() * 1000;
+ moduleToObjectTimer->clear();
if (isaCallback)
isaCallback(serializedISA.value());
@@ -729,7 +737,7 @@ NVPTXSerializer::moduleToObject(llvm::Module &llvmModule) {
}
std::optional<SmallVector<char, 0>> result;
- moduleToObjectTimer.startTimer();
+ moduleToObjectTimer->startTimer();
// Compile to binary.
#if MLIR_ENABLE_NVPTXCOMPILER
result = compileToBinaryNVPTX(*serializedISA);
@@ -737,9 +745,9 @@ NVPTXSerializer::moduleToObject(llvm::Module &llvmModule) {
result = compileToBinary(*serializedISA);
#endif // MLIR_ENABLE_NVPTXCOMPILER
- moduleToObjectTimer.stopTimer();
- isaToBinaryTimeInMs = moduleToObjectTimer.getTotalTime().getWallTime() * 1000;
- moduleToObjectTimer.clear();
+ moduleToObjectTimer->stopTimer();
+ isaToBinaryTimeInMs =
+ moduleToObjectTimer->getTotalTime().getWallTime() * 1000;
return result;
}
|
|
@llvm/pr-subscribers-mlir-llvm Author: Zichen Lu (MikaOvO) ChangesAs title, we need to call Full diff: https://github.com/llvm/llvm-project/pull/136142.diff 1 Files Affected:
diff --git a/mlir/lib/Target/LLVM/NVVM/Target.cpp b/mlir/lib/Target/LLVM/NVVM/Target.cpp
index 5a2b829fbd1bd..ea0c2b6663fbb 100644
--- a/mlir/lib/Target/LLVM/NVVM/Target.cpp
+++ b/mlir/lib/Target/LLVM/NVVM/Target.cpp
@@ -669,10 +669,6 @@ NVPTXSerializer::compileToBinaryNVPTX(const std::string &ptxCode) {
std::optional<SmallVector<char, 0>>
NVPTXSerializer::moduleToObject(llvm::Module &llvmModule) {
- llvm::Timer moduleToObjectTimer(
- "moduleToObjectTimer",
- "Timer for perf llvm-ir -> isa and isa -> binary.");
- moduleToObjectTimer.startTimer();
// Return LLVM IR if the compilation target is `offload`.
#define DEBUG_TYPE "serialize-to-llvm"
LLVM_DEBUG({
@@ -691,6 +687,18 @@ NVPTXSerializer::moduleToObject(llvm::Module &llvmModule) {
return std::nullopt;
#endif // LLVM_HAS_NVPTX_TARGET
+ auto timerDeleter = [](llvm::Timer *timer) {
+ if (timer != nullptr) {
+ timer->clear();
+ delete timer;
+ }
+ };
+ std::unique_ptr<llvm::Timer, decltype(timerDeleter)> moduleToObjectTimer(
+ new llvm::Timer("moduleToObjectTimer",
+ "Timer for perf llvm-ir -> isa and isa -> binary."),
+ timerDeleter);
+ moduleToObjectTimer->startTimer();
+
// Emit PTX code.
std::optional<llvm::TargetMachine *> targetMachine =
getOrCreateTargetMachine();
@@ -706,9 +714,9 @@ NVPTXSerializer::moduleToObject(llvm::Module &llvmModule) {
return std::nullopt;
}
- moduleToObjectTimer.stopTimer();
- llvmToISATimeInMs = moduleToObjectTimer.getTotalTime().getWallTime() * 1000;
- moduleToObjectTimer.clear();
+ moduleToObjectTimer->stopTimer();
+ llvmToISATimeInMs = moduleToObjectTimer->getTotalTime().getWallTime() * 1000;
+ moduleToObjectTimer->clear();
if (isaCallback)
isaCallback(serializedISA.value());
@@ -729,7 +737,7 @@ NVPTXSerializer::moduleToObject(llvm::Module &llvmModule) {
}
std::optional<SmallVector<char, 0>> result;
- moduleToObjectTimer.startTimer();
+ moduleToObjectTimer->startTimer();
// Compile to binary.
#if MLIR_ENABLE_NVPTXCOMPILER
result = compileToBinaryNVPTX(*serializedISA);
@@ -737,9 +745,9 @@ NVPTXSerializer::moduleToObject(llvm::Module &llvmModule) {
result = compileToBinary(*serializedISA);
#endif // MLIR_ENABLE_NVPTXCOMPILER
- moduleToObjectTimer.stopTimer();
- isaToBinaryTimeInMs = moduleToObjectTimer.getTotalTime().getWallTime() * 1000;
- moduleToObjectTimer.clear();
+ moduleToObjectTimer->stopTimer();
+ isaToBinaryTimeInMs =
+ moduleToObjectTimer->getTotalTime().getWallTime() * 1000;
return result;
}
|
joker-eph
reviewed
Apr 17, 2025
mlir/lib/Target/LLVM/NVVM/Target.cpp
Outdated
| "Timer for perf llvm-ir -> isa and isa -> binary."), | ||
| timerDeleter); | ||
| moduleToObjectTimer->startTimer(); | ||
|
|
There was a problem hiding this comment.
Can't we just do the following:
auto clear = llvm::make_scope_exit([&]() { moduleToObjectTimer.clear(); });
There was a problem hiding this comment.
Modified. Could you help merge this? Thanks.
MikaOvO
force-pushed
the
mikaovo/raii_for_module_to_object_timer
branch
from
71dae28 to
cdbba68
Compare
MikaOvO
force-pushed
the
mikaovo/raii_for_module_to_object_timer
branch
from
cdbba68 to
ff92237
Compare
IanWood1
pushed a commit
to IanWood1/llvm-project
that referenced
this pull request
May 6, 2025
…function (llvm#136142) As title, we need to call `Timer::clear` to avoid extra log like this: ``` ===-------------------------------------------------------------------------=== ... ===-------------------------------------------------------------------------=== Total Execution Time: 0.0000 seconds (0.0000 wall clock) ---Wall Time--- --- Name --- ----- .... ----- Total ```
IanWood1
pushed a commit
to IanWood1/llvm-project
that referenced
this pull request
May 6, 2025
…function (llvm#136142) As title, we need to call `Timer::clear` to avoid extra log like this: ``` ===-------------------------------------------------------------------------=== ... ===-------------------------------------------------------------------------=== Total Execution Time: 0.0000 seconds (0.0000 wall clock) ---Wall Time--- --- Name --- ----- .... ----- Total ```
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As title, we need to call
Timer::clearto avoid extra log like this: