[llvm] r350661 - [llvm-mca] Improve debugging (NFC)
Evandro Menezes via llvm-commits
llvm-commits at lists.llvm.org
Tue Jan 8 14:29:38 PST 2019
Author: evandro
Date: Tue Jan 8 14:29:38 2019
New Revision: 350661
URL: http://llvm.org/viewvc/llvm-project?rev=350661&view=rev
Log:
[llvm-mca] Improve debugging (NFC)
Modified:
llvm/trunk/include/llvm/MCA/Instruction.h
llvm/trunk/lib/MCA/HardwareUnits/ResourceManager.cpp
llvm/trunk/lib/MCA/InstrBuilder.cpp
Modified: llvm/trunk/include/llvm/MCA/Instruction.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MCA/Instruction.h?rev=350661&r1=350660&r2=350661&view=diff
==============================================================================
--- llvm/trunk/include/llvm/MCA/Instruction.h (original)
+++ llvm/trunk/include/llvm/MCA/Instruction.h Tue Jan 8 14:29:38 2019
@@ -28,6 +28,7 @@
#include <memory>
namespace llvm {
+
namespace mca {
constexpr int UNKNOWN_CYCLES = -512;
@@ -347,6 +348,11 @@ struct InstrDesc {
InstrDesc() = default;
InstrDesc(const InstrDesc &Other) = delete;
InstrDesc &operator=(const InstrDesc &Other) = delete;
+
+#ifndef NDEBUG
+ // Original instruction name for debugging purposes.
+ StringRef Name;
+#endif
};
/// Base class for instructions consumed by the simulation pipeline.
Modified: llvm/trunk/lib/MCA/HardwareUnits/ResourceManager.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MCA/HardwareUnits/ResourceManager.cpp?rev=350661&r1=350660&r2=350661&view=diff
==============================================================================
--- llvm/trunk/lib/MCA/HardwareUnits/ResourceManager.cpp (original)
+++ llvm/trunk/lib/MCA/HardwareUnits/ResourceManager.cpp Tue Jan 8 14:29:38 2019
@@ -169,6 +169,7 @@ unsigned ResourceManager::getNumUnits(ui
// Second, is the specific sub-resource ID.
ResourceRef ResourceManager::selectPipe(uint64_t ResourceID) {
unsigned Index = getResourceStateIndex(ResourceID);
+ assert(Index < Resources.size() && "Invalid resource use!");
ResourceState &RS = *Resources[Index];
assert(RS.isReady() && "No available units to select!");
Modified: llvm/trunk/lib/MCA/InstrBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MCA/InstrBuilder.cpp?rev=350661&r1=350660&r2=350661&view=diff
==============================================================================
--- llvm/trunk/lib/MCA/InstrBuilder.cpp (original)
+++ llvm/trunk/lib/MCA/InstrBuilder.cpp Tue Jan 8 14:29:38 2019
@@ -558,6 +558,9 @@ InstrBuilder::createInstrDescImpl(const
populateWrites(*ID, MCI, SchedClassID);
populateReads(*ID, MCI, SchedClassID);
+#ifndef NDEBUG
+ ID->Name = MCII.getName(Opcode);
+#endif
LLVM_DEBUG(dbgs() << "\t\tMaxLatency=" << ID->MaxLatency << '\n');
LLVM_DEBUG(dbgs() << "\t\tNumMicroOps=" << ID->NumMicroOps << '\n');
More information about the llvm-commits
mailing list